X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/4fd0b8093465acb7951d707f6aa19d4e71e04aec..cd86d83c4781a5c3024f794390fc1127dbffc501:/install.php?ds=sidebyside

diff --git a/install.php b/install.php
index b729be5..a5e5420 100644
--- a/install.php
+++ b/install.php
@@ -26,82 +26,6 @@ require(JIRAFEAU_ROOT . 'lib/settings.php');
 require(JIRAFEAU_ROOT . 'lib/functions.php');
 require(JIRAFEAU_ROOT . 'lib/lang.php');
 
-/**
- * Prepend used functions
- **/
-
-function jirafeau_quoted($str)
-{
-    return QUOTE . str_replace(QUOTE, "\'", $str) . QUOTE;
-}
-
-function jirafeau_export_cfg($cfg)
-{
-    $content = '<?php' . NL;
-    $content .= '/* ' . t('This file was generated by the install process. ' .
-               'You can edit it. Please see config.original.php to understand the ' .
-               'configuration items.') . ' */' . NL;
-    $content .= '$cfg = ' . var_export($cfg, true) . ';';
-
-    $fileWrite = file_put_contents(JIRAFEAU_CFG, $content);
-
-    if (false === $fileWrite) {
-        jirafeau_fatal_error(t('Can not write local configuration file'));
-    }
-}
-
-function jirafeau_mkdir($path)
-{
-    return !(!file_exists($path) && !@mkdir($path, 0755));
-}
-
-/**
- * Returns true whether the path is writable or we manage to make it
- * so, which essentially is the same thing.
- * @param $path is the file or directory to be tested.
- * @return true if $path is writable.
- */
-function jirafeau_is_writable($path)
-{
-    /* "@" gets rid of error messages. */
-    return is_writable($path) || @chmod($path, 0777);
-}
-
-function jirafeau_check_var_dir($path)
-{
-    $mkdir_str1 = t('CANNOT_CREATE_DIR') . ':';
-    $mkdir_str2 = t('MANUAL_CREATE');
-    $write_str1 = t('DIR_NOT_W') . ':';
-    $write_str2 = t('You should give the write permission to the web server on ' .
-                    'this directory.');
-    $solution_str = t('HERE_SOLUTION') . ':';
-
-    if (!jirafeau_mkdir($path) || !jirafeau_is_writable($path)) {
-        return array('has_error' => true,
-                      'why' => $mkdir_str1 . '<br /><code>' .
-                               $path . '</code><br />' . $solution_str .
-                               '<br />' . $mkdir_str2);
-    }
-
-    foreach (array('files', 'links', 'async') as $subdir) {
-        $subpath = $path.$subdir;
-
-        if (!jirafeau_mkdir($subpath) || !jirafeau_is_writable($subpath)) {
-            return array('has_error' => true,
-                          'why' => $mkdir_str1 . '<br /><code>' .
-                                   $subpath . '</code><br />' . $solution_str .
-                                   '<br />' . $mkdir_str2);
-        }
-    }
-
-    return array('has_error' => false, 'why' => '');
-}
-
-function jirafeau_add_ending_slash($path)
-{
-    return $path . ((substr($path, -1) == '/') ? '' : '/');
-}
-
 /**
  * Check installation
  **/
@@ -225,8 +149,11 @@ case 2:
         <td class = "field"><input type = "text" name = "web_root"
         id = "input_web_root" value = "<?php
         echo(empty($cfg['web_root']) ?
-          $_SERVER['HTTP_HOST'] . str_replace(basename(__FILE__),
-          '', $_SERVER['REQUEST_URI']) : $cfg['web_root']);
+          $_SERVER['HTTP_HOST'] . str_replace(
+              basename(__FILE__),
+              '',
+              $_SERVER['REQUEST_URI']
+          ) : $cfg['web_root']);
       ?>" size = "40" /></td>
         </tr> <tr> <td class = "info" colspan = "2"><?php
         echo t('DATA_DIR_EXPLAINATION');