X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/ae3f16cbe0c99669de1d733304eef514cf27d6b1..refs/merge-requests/104/head:/install.php?ds=inline diff --git a/install.php b/install.php index 8d5f6fb..6dbefb5 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 = ' true, - 'why' => $mkdir_str1 . '
' . - $path . '
' . $solution_str . - '
' . $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 . '
' . - $subpath . '
' . $solution_str . - '
' . $mkdir_str2); - } - } - - return array('has_error' => false, 'why' => ''); -} - -function jirafeau_add_ending_slash($path) -{ - return $path . ((substr($path, -1) == '/') ? '' : '/'); -} - /** * Check installation **/ @@ -123,23 +47,13 @@ require(JIRAFEAU_ROOT . 'lib/template/header.php'); if (!file_exists(JIRAFEAU_CFG)) { // show an error if it is not possible to create the file if (!@touch(JIRAFEAU_CFG)) { - jirafeau_fatal_error( - t('The local configuration file could not be created. Create a ' . - 'lib/config.local.php file and give the write ' . - 'permission to the web server (preferred solution), or give the ' . - 'write permission to the web server on the lib ' . - 'directory.') - ); + jirafeau_fatal_error(t('CONF_SOLUTION')); } } // is the local configuration writable? if (!is_writable(JIRAFEAU_CFG) && !@chmod(JIRAFEAU_CFG, '0666')) { - jirafeau_fatal_error( - t('The local configuration is not writable by the web server. ' . - 'Give the write permission to the web server on the ' . - 'lib/config.local.php file.') - ); + jirafeau_fatal_error(t('CONF_SOLUTION_2')); } /** @@ -196,7 +110,7 @@ default: > + id = "admin_password" size = "40" autocomplete = "new-password"/> @@ -224,9 +138,7 @@ case 2: ?>