harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mv mod_install to mod_setup, conflict with name of install dir

Browse Source
This commit is contained in:
friendica 2012-11-03 14:59:46 -07:00
parent 7915e597ec
commit f5b1eee177
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.php
View File

@ -120,7 +120,7 @@ if(! x($_SESSION,'sysmsg_info'))
if($install)
$a->module = 'install';
$a->module = 'setup';
else
check_config($a);

2
install/testargs.php
View File

@ -15,7 +15,7 @@
*/
if((argc() > 1) && isset(argv(1)))
if(($argc > 1) && isset($argv[1]))
echo $argv[1];
else
echo '';

10
mod/install.php → mod/setup.php
View File

@ -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.');

2
view/tpl/install_checks.tpl
View File

@ -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>

2
view/tpl/install_db.tpl
View File

@ -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" />

2
view/tpl/install_settings.tpl
View File

@ -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" />