diff options
| -rw-r--r-- | index.php | 2 | ||||
| -rw-r--r-- | install/testargs.php | 2 | ||||
| -rwxr-xr-x | mod/setup.php (renamed from mod/install.php) | 10 | ||||
| -rw-r--r-- | view/tpl/install_checks.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/install_db.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/install_settings.tpl | 2 |
6 files changed, 10 insertions, 10 deletions
@@ -120,7 +120,7 @@ if(! x($_SESSION,'sysmsg_info')) if($install) - $a->module = 'install'; + $a->module = 'setup'; else check_config($a); diff --git a/install/testargs.php b/install/testargs.php index a8af836d0..4c9bce4e9 100644 --- a/install/testargs.php +++ b/install/testargs.php @@ -15,7 +15,7 @@ */ -if((argc() > 1) && isset(argv(1))) +if(($argc > 1) && isset($argv[1])) echo $argv[1]; else echo ''; diff --git a/mod/install.php b/mod/setup.php index 82c58d467..e6b8e852a 100755 --- a/mod/install.php +++ b/mod/setup.php @@ -3,9 +3,9 @@ $install_wizard_pass=1; -function install_init(&$a){ +function setup_init(&$a){ - // $baseurl/install/testrwrite to test if rewite in .htaccess is working + // $baseurl/setup/testrwrite to test if rewite in .htaccess is working if (argc() ==2 && argv(1)=="testrewrite") { echo "ok"; killme(); @@ -16,7 +16,7 @@ function install_init(&$a){ } -function install_post(&$a) { +function setup_post(&$a) { global $install_wizard_pass, $db; switch($install_wizard_pass) { @@ -113,7 +113,7 @@ function get_db_errno() { return mysql_errno(); } -function install_content(&$a) { +function setup_content(&$a) { global $install_wizard_pass, $db; $o = ''; @@ -439,7 +439,7 @@ function check_htaccess(&$checks) { $status = true; $help = ""; if (function_exists('curl_init')){ - $test = fetch_url($a->get_baseurl()."/install/testrewrite"); + $test = fetch_url($a->get_baseurl()."/setup/testrewrite"); if ($test!="ok") { $status = false; $help = t('Url rewrite in .htaccess is not working. Check your server configuration.'); diff --git a/view/tpl/install_checks.tpl b/view/tpl/install_checks.tpl index 176611d4b..1d8a4b263 100644 --- a/view/tpl/install_checks.tpl +++ b/view/tpl/install_checks.tpl @@ -1,6 +1,6 @@ <h1>$title</h1> <h2>$pass</h2> -<form action="$baseurl/index.php?q=install" method="post"> +<form action="$baseurl/index.php?q=setup" method="post"> <table> {{ for $checks as $check }} <tr><td>$check.title </td><td><span class="icon s22 {{if $check.status}}on{{else}}{{if$check.required}}off{{else}}yellow{{endif}}{{endif}}"></td><td>{{if $check.required}}(required){{endif}}</td></tr> diff --git a/view/tpl/install_db.tpl b/view/tpl/install_db.tpl index 1302b5a70..dd8ba1302 100644 --- a/view/tpl/install_db.tpl +++ b/view/tpl/install_db.tpl @@ -13,7 +13,7 @@ $info_03 <h3 class="error-message">$status</h3> {{ endif }} -<form id="install-form" action="$baseurl/install" method="post"> +<form id="install-form" action="$baseurl/setup" method="post"> <input type="hidden" name="phpath" value="$phpath" /> <input type="hidden" name="pass" value="3" /> diff --git a/view/tpl/install_settings.tpl b/view/tpl/install_settings.tpl index 1b9ae6e13..ba39b99c5 100644 --- a/view/tpl/install_settings.tpl +++ b/view/tpl/install_settings.tpl @@ -7,7 +7,7 @@ <h3 class="error-message">$status</h3> {{ endif }} -<form id="install-form" action="$baseurl/install" method="post"> +<form id="install-form" action="$baseurl/setup" method="post"> <input type="hidden" name="phpath" value="$phpath" /> <input type="hidden" name="dbhost" value="$dbhost" /> |