mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 12:48:26 +02:00
Code Issues Releases Wiki Activity

Install improvements

Browse Source 
auto create of e107_config.php during install, a few LAN-fixes,
improvements on readability, /tbody-tag fix, added descriptions to
various functions
This commit is contained in:
nlstart
2012-12-27 11:52:24 +01:00
parent da79f95c3d
commit 4c06aa27b7
2 changed files with 3315 additions and 3344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_languages/English/lan_installer.php
View File

@@ -176,7 +176,9 @@ define("LANINS_117", "Website Preferences");
define("LANINS_118", "Install Plugins"); define("LANINS_118", "Install Plugins");
define("LANINS_119", "Install all plugins that the theme may require."); define("LANINS_119", "Install all plugins that the theme may require.");
define("LANINS_120", "8"); define("LANINS_120", "8");
define('LANINS_121', 'e107_config.php is not an empty file'); define("LANINS_121", "e107_config.php is not an empty file");
define('LANINS_122', 'You might have an existing installation'); define("LANINS_122", "You might have an existing installation");
define("LANINS_123", "Optional: Your public name or alias. Leave blank to use the user name");
define("LANINS_124", "Please choose a password of at least 8 characters");

311
install_.php
View File

@@ -26,8 +26,6 @@ define('MIN_PHP_VERSION', '5.0');
define('MIN_MYSQL_VERSION', '4.1.2'); define('MIN_MYSQL_VERSION', '4.1.2');
define('MAKE_INSTALL_LOG', false); define('MAKE_INSTALL_LOG', false);
// ensure CHARSET is UTF-8 if used // ensure CHARSET is UTF-8 if used
//define('CHARSET', 'utf-8'); //define('CHARSET', 'utf-8');
@@ -69,8 +67,6 @@ function e107_ini_set($var, $value)
} }
} }
// setup some php options // setup some php options
e107_ini_set('magic_quotes_runtime', 0); e107_ini_set('magic_quotes_runtime', 0);
e107_ini_set('magic_quotes_sybase', 0); e107_ini_set('magic_quotes_sybase', 0);
@@ -80,14 +76,12 @@ e107_ini_set('session.use_trans_sid', 0);
define('MAGIC_QUOTES_GPC', (ini_get('magic_quotes_gpc') ? true : false)); define('MAGIC_QUOTES_GPC', (ini_get('magic_quotes_gpc') ? true : false));
$php_version = phpversion(); $php_version = phpversion();
if(version_compare($php_version, MIN_PHP_VERSION, "<")) if(version_compare($php_version, MIN_PHP_VERSION, "<"))
{ {
die('A newer version of PHP is required'); die('A minimum version of PHP '.MIN_PHP_VERSION.' is required');
} }
// Ensure that '.' is the first part of the include path // Ensure that '.' is the first part of the include path
$inc_path = explode(PATH_SEPARATOR, ini_get('include_path')); $inc_path = explode(PATH_SEPARATOR, ini_get('include_path'));
if($inc_path[0] != ".") if($inc_path[0] != ".")
@@ -126,17 +120,13 @@ if($functions_ok == true && function_exists("realpath") == false)
} }
if($functions_ok == false) if($functions_ok == false)
{ {
die("e107 requires the realpath() function to be enabled and your host appears to have disabled it. This function is required for some <b>important</b> security checks and <b>There is NO workaround</b>. Please contact your host for more information."); die("e107 requires the realpath() function to be enabled and your host appears to have disabled it. This function is required for some <b>important</b> security checks and there is <b>NO workaround</b>. Please contact your host for more information.");
} }
//obsolete $installer_folder_name = 'e107_install'; //obsolete $installer_folder_name = 'e107_install';
include_once("./{$HANDLERS_DIRECTORY}core_functions.php"); include_once("./{$HANDLERS_DIRECTORY}core_functions.php");
include_once("./{$HANDLERS_DIRECTORY}e107_class.php"); include_once("./{$HANDLERS_DIRECTORY}e107_class.php");
function check_class($whatever) function check_class($whatever)
{ {
return TRUE; return TRUE;
@@ -157,7 +147,6 @@ $e107 = e107::getInstance();
$e107->initInstall($e107_paths, realpath(dirname(__FILE__)), $override); $e107->initInstall($e107_paths, realpath(dirname(__FILE__)), $override);
unset($e107_paths,$override); unset($e107_paths,$override);
### NEW Register Autoload - do it asap ### NEW Register Autoload - do it asap
if(!function_exists('spl_autoload_register')) if(!function_exists('spl_autoload_register'))
{ {
@@ -198,8 +187,6 @@ $e_install->template->SetTag("files_dir_http", e_FILE_ABS);
$e_install->renderPage(); $e_install->renderPage();
/** /**
* Set Cookie * Set Cookie
* @param string $name * @param string $name
@@ -230,10 +217,9 @@ class e_install
var $dbLink = NULL; // DB link - needed for PHP5.3 bug var $dbLink = NULL; // DB link - needed for PHP5.3 bug
var $session = null; var $session = null;
// public function __construct() // public function __construct()
function e_install() function e_install()
{ {
// notice removal, required from various core routines // notice removal, required from various core routines
define('USERID', 1); define('USERID', 1);
define('USER', true); define('USER', true);
@@ -250,7 +236,7 @@ class e_install
$this->logFile = dirname(__FILE__).'/e107InstallLog.log'; $this->logFile = dirname(__FILE__).'/e107InstallLog.log';
} }
} }
// $this->logLine('Query string: '); // $this->logLine('Query string: ');
$this->template = new SimpleTemplate(); $this->template = new SimpleTemplate();
while (@ob_end_clean()); while (@ob_end_clean());
global $e107; global $e107;
@@ -273,13 +259,8 @@ class e_install
define("e_LANGUAGE", $this->previous_steps['language']); define("e_LANGUAGE", $this->previous_steps['language']);
include_lan(e_LANGUAGEDIR.e_LANGUAGE."/admin/lan_admin.php"); include_lan(e_LANGUAGEDIR.e_LANGUAGE."/admin/lan_admin.php");
} }
} }
/** /**
* Write a line of text to the log file (if enabled) - prepend time/date, append \n * Write a line of text to the log file (if enabled) - prepend time/date, append \n
* Can always call this routine - it will return if logging disabled * Can always call this routine - it will return if logging disabled
@@ -295,8 +276,6 @@ class e_install
fclose($logfp); fclose($logfp);
} }
function renderPage() function renderPage()
{ {
if(!isset($_POST['stage'])) if(!isset($_POST['stage']))
@@ -371,8 +350,6 @@ class e_install
} }
} }
private function stage_1() private function stage_1()
{ {
global $e_forms; global $e_forms;
@@ -390,13 +367,18 @@ class e_install
$e_forms->add_select_item("language", $this->get_languages(), "English"); $e_forms->add_select_item("language", $this->get_languages(), "English");
$this->finish_form(); $this->finish_form();
$e_forms->add_button("start", LANINS_035); $e_forms->add_button("start", LANINS_035);
$this->template->SetTag("stage_content", "<div style='text-align: center;'><div class='alert alert-info alert-block'><label for='language'>".LANINS_005."</label></div>\n<br /><br /><br />\n".$e_forms->return_form()."</div>"); $output = "
<div style='text-align: center;'>
<div class='alert alert-info alert-block'>
<label for='language'>".LANINS_005."</label>
</div>\n
<br /><br /><br />\n
".$e_forms->return_form()."
</div>";
$this->template->SetTag("stage_content", $output);
$this->logLine('Stage 1 completed'); $this->logLine('Stage 1 completed');
} }
private function stage_2() private function stage_2()
{ {
global $e_forms; global $e_forms;
@@ -411,20 +393,19 @@ class e_install
$this->template->SetTag("percent", 25); $this->template->SetTag("percent", 25);
$this->template->SetTag("bartype", 'warning'); $this->template->SetTag("bartype", 'warning');
// $this->template->SetTag("onload", "document.getElementById('name').focus()");
// $this->template->SetTag("onload", "document.getElementById('name').focus()");
// $page_info = nl2br(LANINS_023); // $page_info = nl2br(LANINS_023);
$page_info = "<div class='alert alert-block alert-info'>Please fill in the form below with your MySQL details. If you do not know this information, please contact your hosting provider. You may hover over each field for additional information.</div>"; $page_info = "<div class='alert alert-block alert-info'>Please fill in the form below with your MySQL details. If you do not know this information, please contact your hosting provider. You may hover over each field for additional information.</div>";
$e_forms->start_form("versions", $_SERVER['PHP_SELF'].($_SERVER['QUERY_STRING'] == "debug" ? "?debug" : "")); $e_forms->start_form("versions", $_SERVER['PHP_SELF'].($_SERVER['QUERY_STRING'] == "debug" ? "?debug" : ""));
$output = " $output = "
<div style='width: 100%; padding-left: auto; padding-right: auto;'> <div style='width: 100%; padding-left: auto; padding-right: auto;'>
<table class='table table-striped' > <table class='table table-striped' >
<tr> <tr>
<td style='border-top: 1px solid #999;'><label for='server'>".LANINS_024."</label></td> <td style='border-top: 1px solid #999;'><label for='server'>".LANINS_024."</label></td>
<td style='border-top: 1px solid #999;'> <td style='border-top: 1px solid #999;'>
<input class='tbox' type='text' id='server' name='server' autofocus size='40' value='localhost' maxlength='100' required='required' /> <input class='tbox' type='text' id='server' name='server' autofocus size='40' value='localhost' maxlength='100' required='required' />
<span class='field-help'>".LANINS_030."</span></td> <span class='field-help'>".LANINS_030."</span>
</td>
</tr> </tr>
<tr> <tr>
@@ -434,6 +415,7 @@ class e_install
<span class='field-help'>".LANINS_031."</span> <span class='field-help'>".LANINS_031."</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td><label for='password'>".LANINS_026."</label></td> <td><label for='password'>".LANINS_026."</label></td>
<td> <td>
@@ -448,10 +430,9 @@ class e_install
<input type='text' name='db' size='20' id='db' value='' maxlength='100' required='required' /> <input type='text' name='db' size='20' id='db' value='' maxlength='100' required='required' />
<label class='checkbox inline'><input type='checkbox' name='createdb' value='1' />".LANINS_028."</label> <label class='checkbox inline'><input type='checkbox' name='createdb' value='1' />".LANINS_028."</label>
<span class='field-help'>".LANINS_033."</span> <span class='field-help'>".LANINS_033."</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td><label for='prefix'>".LANINS_029."</label></td> <td><label for='prefix'>".LANINS_029."</label></td>
<td> <td>
@@ -471,9 +452,13 @@ class e_install
$this->logLine('Stage 2 completed'); $this->logLine('Stage 2 completed');
} }
/**
* Replace hash paths and create folders if needed.
private function updatePaths() // replace hash paths and create folders if needed. *
* @param none
* @return none
*/
private function updatePaths()
{ {
$hash = e107::makeSiteHash($this->previous_steps['mysql']['db'],$this->previous_steps['mysql']['prefix']); $hash = e107::makeSiteHash($this->previous_steps['mysql']['db'],$this->previous_steps['mysql']['prefix']);
$this->e107->site_path = $hash; $this->e107->site_path = $hash;
@@ -493,10 +478,8 @@ class e_install
@mkdir($this->e107->e107_dirs[$dir]); @mkdir($this->e107->e107_dirs[$dir]);
} }
} }
} }
private function stage_3() private function stage_3()
{ {
global $e_forms; global $e_forms;
@@ -531,7 +514,6 @@ class e_install
$e_forms->start_form("versions", $_SERVER['PHP_SELF'].($_SERVER['QUERY_STRING'] == "debug" ? "?debug" : "")); $e_forms->start_form("versions", $_SERVER['PHP_SELF'].($_SERVER['QUERY_STRING'] == "debug" ? "?debug" : ""));
$head = LANINS_039."<br /><br />\n"; $head = LANINS_039."<br /><br />\n";
$output = " $output = "
<div style='width: 100%; padding-left: auto; padding-right: auto;'> <div style='width: 100%; padding-left: auto; padding-right: auto;'>
<table cellspacing='0'> <table cellspacing='0'>
<tr> <tr>
@@ -539,22 +521,26 @@ class e_install
<td style='border-top: 1px solid #999;'><input class='tbox' type='text' id='server' name='server' size='40' value='{$this->previous_steps['mysql']['server']}' maxlength='100' /></td> <td style='border-top: 1px solid #999;'><input class='tbox' type='text' id='server' name='server' size='40' value='{$this->previous_steps['mysql']['server']}' maxlength='100' /></td>
<td style='width: 40%; border-top: 1px solid #999;'>".LANINS_030."</td> <td style='width: 40%; border-top: 1px solid #999;'>".LANINS_030."</td>
</tr> </tr>
<tr> <tr>
<td><label for='name'>".LANINS_025."</label></td> <td><label for='name'>".LANINS_025."</label></td>
<td><input class='tbox' type='text' name='name' id='name' size='40' value='{$this->previous_steps['mysql']['user']}' maxlength='100' onload='this.focus()' /></td> <td><input class='tbox' type='text' name='name' id='name' size='40' value='{$this->previous_steps['mysql']['user']}' maxlength='100' onload='this.focus()' /></td>
<td>".LANINS_031."</td> <td>".LANINS_031."</td>
</tr> </tr>
<tr> <tr>
<td><label for='password'>".LANINS_026."</label></td> <td><label for='password'>".LANINS_026."</label></td>
<td><input class='tbox' type='password' name='password' id='password' size='40' value='{$this->previous_steps['mysql']['password']}' maxlength='100' /></td> <td><input class='tbox' type='password' name='password' id='password' size='40' value='{$this->previous_steps['mysql']['password']}' maxlength='100' /></td>
<td>".LANINS_032."</td> <td>".LANINS_032."</td>
</tr> </tr>
<tr> <tr>
<td><label for='db'>".LANINS_027."</label></td> <td><label for='db'>".LANINS_027."</label></td>
<td><input type='text' name='db' id='db' size='20' value='{$this->previous_steps['mysql']['db']}' maxlength='100' /> <td><input type='text' name='db' id='db' size='20' value='{$this->previous_steps['mysql']['db']}' maxlength='100' />
<br /><label class='defaulttext'><input type='checkbox' name='createdb'".($this->previous_steps['mysql']['createdb'] == 1 ? " checked='checked'" : "")." value='1' />".LANINS_028."</label></td> <br /><label class='defaulttext'><input type='checkbox' name='createdb'".($this->previous_steps['mysql']['createdb'] == 1 ? " checked='checked'" : "")." value='1' />".LANINS_028."</label></td>
<td>".LANINS_033."</td> <td>".LANINS_033."</td>
</tr> </tr>
<tr> <tr>
<td><label for='prefix'>".LANINS_029."</label></td> <td><label for='prefix'>".LANINS_029."</label></td>
<td><input type='text' name='prefix' id='prefix' size='20' value='{$this->previous_steps['mysql']['prefix']}' maxlength='100' /></td> <td><input type='text' name='prefix' id='prefix' size='20' value='{$this->previous_steps['mysql']['prefix']}' maxlength='100' /></td>
@@ -643,14 +629,10 @@ class e_install
$this->logLine('Stage 3 completed'); $this->logLine('Stage 3 completed');
} }
private function stage_4() private function stage_4()
{ {
global $e_forms; global $e_forms;
$this->stage = 4; $this->stage = 4;
$this->logLine('Stage 4 started'); $this->logLine('Stage 4 started');
@@ -762,16 +744,19 @@ class e_install
<td style='width: 40%;'>{$perms_errors}</td> <td style='width: 40%;'>{$perms_errors}</td>
<td class='{$permColor}' style='width: 40%;'>{$perms_notes}</td> <td class='{$permColor}' style='width: 40%;'>{$perms_notes}</td>
</tr> </tr>
<tr> <tr>
<td>".LANINS_015."</td> <td>".LANINS_015."</td>
<td>{$php_version}</td> <td>{$php_version}</td>
<td class='{$PHPColor}'>{$php_help}</td> <td class='{$PHPColor}'>{$php_help}</td>
</tr> </tr>
<tr> <tr>
<td>".LANINS_016."</td> <td>".LANINS_016."</td>
<td>{$mysql_note}</td> <td>{$mysql_note}</td>
<td class='{$mysqlColor}'>{$mysql_help}</td> <td class='{$mysqlColor}'>{$mysql_help}</td>
</tr> </tr>
<tr> <tr>
<td>".LANINS_050."</td> <td>".LANINS_050."</td>
<td>".($xml_installed ? LANINS_051 : LANINS_052)."</td> <td>".($xml_installed ? LANINS_051 : LANINS_052)."</td>
@@ -783,14 +768,11 @@ class e_install
$this->logLine('Stage 4 completed'); $this->logLine('Stage 4 completed');
} }
/** /**
* Install stage 5 - collect Admin Login Data. * Install stage 5 - collect Admin Login Data.
* *
* @return string HTML form of stage 5. * @return string HTML form of stage 5.
*/ */
private function stage_5() private function stage_5()
{ {
global $e_forms; global $e_forms;
@@ -825,7 +807,7 @@ class e_install
<td><label for='d_name'>".LANINS_074."</label></td> <td><label for='d_name'>".LANINS_074."</label></td>
<td> <td>
<input class='tbox' type='text' name='d_name' id='d_name' size='30' placeholder='Administrator' value='".(isset($this->previous_steps['admin']['display']) ? $this->previous_steps['admin']['display'] : "")."' maxlength='60' /> <input class='tbox' type='text' name='d_name' id='d_name' size='30' placeholder='Administrator' value='".(isset($this->previous_steps['admin']['display']) ? $this->previous_steps['admin']['display'] : "")."' maxlength='60' />
<span class='field-help'>Optional: Your public name or alias. Leave blank to use the user name</span> <span class='field-help'>".LANINS_123."</span>
</td> </td>
</tr> </tr>
@@ -833,7 +815,7 @@ class e_install
<td><label for='pass1'>".LANINS_076."</label></td> <td><label for='pass1'>".LANINS_076."</label></td>
<td> <td>
<input type='password' name='pass1' size='30' id='pass1' value='' maxlength='60' required='required' /> <input type='password' name='pass1' size='30' id='pass1' value='' maxlength='60' required='required' />
<span class='field-help'>Please choose a password of at least 8 characters</span> <span class='field-help'>".LANINS_124."</span>
</td> </td>
</tr> </tr>
@@ -874,9 +856,7 @@ class e_install
$this->stage = 6; $this->stage = 6;
$this->logLine('Stage 6 started'); $this->logLine('Stage 6 started');
// -------------------- Save Step 5 Data ------------------------- // -------------------- Save Step 5 Data -------------------------
if(!vartrue($this->previous_steps['admin']['user']) || varset($_POST['u_name'])) if(!vartrue($this->previous_steps['admin']['user']) || varset($_POST['u_name']))
{ {
$_POST['u_name'] = str_replace(array("'", '"'), "", $_POST['u_name']); $_POST['u_name'] = str_replace(array("'", '"'), "", $_POST['u_name']);
@@ -917,9 +897,7 @@ class e_install
} }
} }
// ------------- Validate Step 5 Data. -------------------------- // ------------- Validate Step 5 Data. --------------------------
if(!vartrue($this->previous_steps['admin']['user']) || !vartrue($this->previous_steps['admin']['password'])) if(!vartrue($this->previous_steps['admin']['user']) || !vartrue($this->previous_steps['admin']['password']))
{ {
$this->required['u_name'] = LANINS_086; // $this->required['u_name'] = LANINS_086; //
@@ -937,9 +915,7 @@ class e_install
define('USEREMAIL', $this->previous_steps['admin']['email']); define('USEREMAIL', $this->previous_steps['admin']['email']);
} }
// ------------- Step 6 Form -------------------------------- // ------------- Step 6 Form --------------------------------
$this->display_required(); $this->display_required();
$this->template->SetTag("installation_heading", LANINS_001); $this->template->SetTag("installation_heading", LANINS_001);
$this->template->SetTag("stage_pre", LANINS_002); $this->template->SetTag("stage_pre", LANINS_002);
@@ -949,7 +925,6 @@ class e_install
$this->template->SetTag("percent", 70); $this->template->SetTag("percent", 70);
$this->template->SetTag("bartype", 'warning'); $this->template->SetTag("bartype", 'warning');
$e_forms->start_form("pref_info", $_SERVER['PHP_SELF'].($_SERVER['QUERY_STRING'] == "debug" ? "?debug" : "")); $e_forms->start_form("pref_info", $_SERVER['PHP_SELF'].($_SERVER['QUERY_STRING'] == "debug" ? "?debug" : ""));
$output = " $output = "
<div style='width: 100%; padding-left: auto; padding-right: auto; margin-bottom:20px'> <div style='width: 100%; padding-left: auto; padding-right: auto; margin-bottom:20px'>
@@ -963,8 +938,8 @@ class e_install
<td> <td>
<input class='tbox' type='text' autofocus placeholder=\"My Website\" required='required' name='sitename' id='sitename' size='30' value='".(vartrue($_POST['sitename']) ? $_POST['sitename'] : "")."' maxlength='60' /> <input class='tbox' type='text' autofocus placeholder=\"My Website\" required='required' name='sitename' id='sitename' size='30' value='".(vartrue($_POST['sitename']) ? $_POST['sitename'] : "")."' maxlength='60' />
</td> </td>
</tr> </tr>
<tr> <tr>
<td><label>".LANINS_109."</label><br />".LANINS_110."</td> <td><label>".LANINS_109."</label><br />".LANINS_110."</td>
<td> <td>
@@ -985,29 +960,39 @@ class e_install
$title = vartrue($themeInfo['@attributes']['name']); $title = vartrue($themeInfo['@attributes']['name']);
$category = vartrue($themeInfo['category']); $category = vartrue($themeInfo['category']);
$output .= "<tr> $output .= "
<td><label class='radio'><input type='radio' name='sitetheme' value='{$val}' required='required' />{$title}</label></td> <tr>
<td>
<label class='radio'><input type='radio' name='sitetheme' value='{$val}' required='required' />{$title}</label>
</td>
<td>{$category}</td> <td>{$category}</td>
</tr>"; </tr>";
} }
$output .= "</table></td> $output .= "
</tbody>
</table>
</td>
</tr> </tr>
<tr> <tr>
<td><label for='install_plugins'>".LANINS_118."</label></td> <td><label for='install_plugins'>".LANINS_118."</label></td>
<td><input type='checkbox' name='install_plugins' checked='checked' id='install_plugins' value='1' /> <td>
<input type='checkbox' name='install_plugins' checked='checked' id='install_plugins' value='1' />
<span class='field-help'>".LANINS_119."</span> <span class='field-help'>".LANINS_119."</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td><label for='generate_content'>".LANINS_111."</label></td> <td><label for='generate_content'>".LANINS_111."</label></td>
<td><input type='checkbox' name='generate_content' checked='checked' id='generate_content' value='1' /> <td>
<input type='checkbox' name='generate_content' checked='checked' id='generate_content' value='1' />
<span class='field-help'>".LANINS_112."</span> <span class='field-help'>".LANINS_112."</span>
</td> </td>
</tr> </tr>
</tbody>
</table> </table>
<br /><br />
</div> </div>
\n"; \n";
$e_forms->add_plain_html($output); $e_forms->add_plain_html($output);
@@ -1017,8 +1002,6 @@ class e_install
$this->logLine('Stage 6 completed'); $this->logLine('Stage 6 completed');
} }
private function stage_7() private function stage_7()
{ {
global $e_forms; global $e_forms;
@@ -1056,7 +1039,7 @@ class e_install
$this->previous_steps['install_plugins'] = $_POST['install_plugins']; $this->previous_steps['install_plugins'] = $_POST['install_plugins'];
} }
// Validate. // Validate
if(!vartrue($this->previous_steps['prefs']['sitename'])) if(!vartrue($this->previous_steps['prefs']['sitename']))
{ {
$this->required['sitename'] = LANINS_113; // 'Please enter a website name.'; // should be used to highlight the required field. (using css for example) $this->required['sitename'] = LANINS_113; // 'Please enter a website name.'; // should be used to highlight the required field. (using css for example)
@@ -1077,7 +1060,6 @@ class e_install
// $this->previous_steps['prefs']['sitetheme'] = $_POST['sitetheme']; // $this->previous_steps['prefs']['sitetheme'] = $_POST['sitetheme'];
// $this->previous_steps['generate_content'] = $_POST['generate_content']; // $this->previous_steps['generate_content'] = $_POST['generate_content'];
$this->template->SetTag("installation_heading", LANINS_001); $this->template->SetTag("installation_heading", LANINS_001);
$this->template->SetTag("stage_pre", LANINS_002); $this->template->SetTag("stage_pre", LANINS_002);
$this->template->SetTag("stage_num", LANINS_058); $this->template->SetTag("stage_num", LANINS_058);
@@ -1091,28 +1073,21 @@ class e_install
$e_forms->add_button("submit", LANINS_035); $e_forms->add_button("submit", LANINS_035);
$this->template->SetTag("stage_content", $page.$e_forms->return_form()); $this->template->SetTag("stage_content", $page.$e_forms->return_form());
$this->logLine('Stage 7 completed'); $this->logLine('Stage 7 completed');
} }
/** /**
* Stage 8 - actually create database and set up the site * Stage 8 - actually create database and set up the site
* *
@return none * @return none
*/ */
private function stage_8() private function stage_8()
{ {
global $e_forms; global $e_forms;
$system_dir = str_replace("/".$this->e107->site_path,"",$this->e107->e107_dirs['SYSTEM_DIRECTORY']); $system_dir = str_replace("/".$this->e107->site_path,"",$this->e107->e107_dirs['SYSTEM_DIRECTORY']);
$media_dir = str_replace("/".$this->e107->site_path,"",$this->e107->e107_dirs['MEDIA_DIRECTORY']); $media_dir = str_replace("/".$this->e107->site_path,"",$this->e107->e107_dirs['MEDIA_DIRECTORY']);
// required for various core routines // required for various core routines
if(!defined('USERNAME')) if(!defined('USERNAME'))
{ {
@@ -1136,7 +1111,7 @@ class e_install
/* /*
* e107 website system * e107 website system
* *
* Copyright (C) 2008-2010 e107 Inc (e107.org) * Copyright (C) 2008-".date('Y')." e107 Inc (e107.org)
* Released under the terms and conditions of the * Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
* *
@@ -1162,9 +1137,6 @@ class e_install
\$MEDIA_DIRECTORY = '{$media_dir}'; \$MEDIA_DIRECTORY = '{$media_dir}';
\$SYSTEM_DIRECTORY = '{$system_dir}'; \$SYSTEM_DIRECTORY = '{$system_dir}';
"; ";
$config_result = $this->write_config($config_file); $config_result = $this->write_config($config_file);
@@ -1185,7 +1157,6 @@ class e_install
$page = $errors."<br />"; $page = $errors."<br />";
$alertType = 'error'; $alertType = 'error';
} }
else else
{ {
$alertType = 'success'; $alertType = 'success';
@@ -1198,7 +1169,6 @@ class e_install
$page .= "<p class='text-warning'>".$htaccessError."</p>"; $page .= "<p class='text-warning'>".$htaccessError."</p>";
} }
$e_forms->add_button('submit', LANINS_035); $e_forms->add_button('submit', LANINS_035);
} }
} }
@@ -1207,7 +1177,11 @@ class e_install
$this->logLine('Stage 8 completed'); $this->logLine('Stage 8 completed');
} }
// Handle the .htaccess file; /**
* htaccess - handle the .htaccess file
*
* @return string $error
*/
protected function htaccess() protected function htaccess()
{ {
$error = ""; $error = "";
@@ -1223,30 +1197,14 @@ class e_install
rename(".htaccess","e107.htaccess"); rename(".htaccess","e107.htaccess");
$error = "DEBUG: Rename from e107.htaccess to .htaccess was successful"; $error = "DEBUG: Rename from e107.htaccess to .htaccess was successful";
} }
} }
else else
{ {
$error = "IMPORTANT: Please copy and paste the contents of the <b>e107.htaccess</b> into your <b>.htaccess</b> file. Please take care NOT to overwrite any existing data that may be in it."; $error = "IMPORTANT: Please copy and paste the contents of the <b>e107.htaccess</b> into your <b>.htaccess</b> file. Please take care NOT to overwrite any existing data that may be in it.";
} }
return $error; return $error;
} }
/** /**
* Import and generate preferences and default content. * Import and generate preferences and default content.
* *
@@ -1279,7 +1237,7 @@ class e_install
// $e_SELF = $_SERVER['PHP_SELF']; // $e_SELF = $_SERVER['PHP_SELF'];
// $e_HTTP = preg_replace("#".$udirs."#i", "", substr($e_SELF, 0, strrpos($e_SELF, "/"))."/"); // $e_HTTP = preg_replace("#".$udirs."#i", "", substr($e_SELF, 0, strrpos($e_SELF, "/"))."/");
//define("MAGIC_QUOTES_GPC", (ini_get('magic_quotes_gpc') ? true : false)); // define("MAGIC_QUOTES_GPC", (ini_get('magic_quotes_gpc') ? true : false));
// define('CHARSET', 'utf-8'); // define('CHARSET', 'utf-8');
// define("e_LANGUAGE", $this->previous_steps['language']); // define("e_LANGUAGE", $this->previous_steps['language']);
// define('e_SELF', 'http://'.$_SERVER['HTTP_HOST']) . ($_SERVER['PHP_SELF'] ? $_SERVER['PHP_SELF'] : $_SERVER['SCRIPT_FILENAME']); // define('e_SELF', 'http://'.$_SERVER['HTTP_HOST']) . ($_SERVER['PHP_SELF'] ? $_SERVER['PHP_SELF'] : $_SERVER['SCRIPT_FILENAME']);
@@ -1303,8 +1261,6 @@ class e_install
} }
} }
$tp = e107::getParser(); $tp = e107::getParser();
define('PREVIEWTHEMENAME',""); // Notice Removal. define('PREVIEWTHEMENAME',""); // Notice Removal.
@@ -1325,7 +1281,7 @@ class e_install
} }
//Create default plugin-table entries. //Create default plugin-table entries.
// e107::getConfig('core')->clearPrefCache(); // e107::getConfig('core')->clearPrefCache();
e107::getPlugin()->update_plugins_table('update'); e107::getPlugin()->update_plugins_table('update');
$this->logLine('Plugins table updated'); $this->logLine('Plugins table updated');
@@ -1404,7 +1360,6 @@ class e_install
$this->logLine('Admin user created'); $this->logLine('Admin user created');
mysql_close($this->dbLink); mysql_close($this->dbLink);
return false; return false;
} }
/** /**
@@ -1421,7 +1376,6 @@ class e_install
return; return;
} }
/** /**
* Check a DB name or table prefix - anything starting with a numeric followed by 'e' causes problems. * Check a DB name or table prefix - anything starting with a numeric followed by 'e' causes problems.
* Return TRUE if acceptable, FALSE if unacceptable * Return TRUE if acceptable, FALSE if unacceptable
@@ -1440,12 +1394,10 @@ class e_install
return TRUE; return TRUE;
} }
/** /**
* Check an array of db-related fields for illegal characters * checkDbFields - Check an array of db-related fields for illegal characters
* *
* @param array $fields
* @return boolean TRUE for OK, FALSE for invalid character * @return boolean TRUE for OK, FALSE for invalid character
*/ */
function checkDbFields($fields) function checkDbFields($fields)
@@ -1464,7 +1416,6 @@ class e_install
return TRUE; return TRUE;
} }
function get_lan_file() function get_lan_file()
{ {
if(!isset($this->previous_steps['language'])) if(!isset($this->previous_steps['language']))
@@ -1475,27 +1426,35 @@ class e_install
include_lan($this->e107->e107_dirs['LANGUAGES_DIRECTORY'].$this->previous_steps['language']."/lan_installer.php"); include_lan($this->e107->e107_dirs['LANGUAGES_DIRECTORY'].$this->previous_steps['language']."/lan_installer.php");
// $this->lan_file = "{$this->e107->e107_dirs['LANGUAGES_DIRECTORY']}{$this->previous_steps['language']}/lan_installer.php"; // $this->lan_file = "{$this->e107->e107_dirs['LANGUAGES_DIRECTORY']}{$this->previous_steps['language']}/lan_installer.php";
// if(is_readable($this->lan_file)) // if(is_readable($this->lan_file))
{ // {
// include($this->lan_file); // include($this->lan_file);
} // }
// elseif(is_readable("{$this->e107->e107_dirs['LANGUAGES_DIRECTORY']}English/lan_installer.php")) // elseif(is_readable("{$this->e107->e107_dirs['LANGUAGES_DIRECTORY']}English/lan_installer.php"))
{ // {
// include("{$this->e107->e107_dirs['LANGUAGES_DIRECTORY']}English/lan_installer.php"); // include("{$this->e107->e107_dirs['LANGUAGES_DIRECTORY']}English/lan_installer.php");
} // }
// else // else
// { // {
// $this->raise_error("Fatal: Could not get valid language file for installation."); // $this->raise_error("Fatal: Could not get valid language file for installation.");
// } // }
} }
/**
* get_languages - check language folder for language names
*
* @param none
* @return array $lanlist
*/
function get_languages() function get_languages()
{ {
$handle = opendir("{$this->e107->e107_dirs['LANGUAGES_DIRECTORY']}"); $handle = opendir($this->e107->e107_dirs['LANGUAGES_DIRECTORY']);
$lanlist = array();
while ($file = readdir($handle)) while ($file = readdir($handle))
{ {
if ($file != "." && $file != ".." && $file != "/" && $file != "CVS" && $file != 'index.html') if ($file != "." && $file != ".." && $file != "/" && $file != "CVS" && $file != 'index.html')
{ {
if(file_exists("./{$this->e107->e107_dirs['LANGUAGES_DIRECTORY']}{$file}/lan_installer.php")){ if(file_exists("./{$this->e107->e107_dirs['LANGUAGES_DIRECTORY']}{$file}/lan_installer.php"))
{
$lanlist[] = $file; $lanlist[] = $file;
} }
} }
@@ -1504,30 +1463,38 @@ class e_install
return $lanlist; return $lanlist;
} }
/**
* get_themes - check theme folder for theme names
*
* @param none
* @return array $themelist
*/
function get_themes() function get_themes()
{ {
$handle = opendir($this->e107->e107_dirs['THEMES_DIRECTORY']); $handle = opendir($this->e107->e107_dirs['THEMES_DIRECTORY']);
$lanlist = array(); $themelist = array();
while ($file = readdir($handle)) while ($file = readdir($handle))
{ {
if (is_dir($this->e107->e107_dirs['THEMES_DIRECTORY'].$file) && $file !='_blank') if (is_dir($this->e107->e107_dirs['THEMES_DIRECTORY'].$file) && $file !='_blank')
{ {
if(is_readable("./{$this->e107->e107_dirs['THEMES_DIRECTORY']}{$file}/theme.xml")) if(is_readable("./{$this->e107->e107_dirs['THEMES_DIRECTORY']}{$file}/theme.xml"))
{ {
$lanlist[] = $file; $themelist[] = $file;
} }
} }
} }
closedir($handle); closedir($handle);
return $lanlist; return $themelist;
} }
/**
* get_theme_xml - check theme.xml file of specific theme
*
* @param string $theme_folder
* @return array $xmlArray OR boolean FALSE if result is no array
*/
function get_theme_xml($theme_folder) function get_theme_xml($theme_folder)
{ {
if(!defined("SITEURL")) if(!defined("SITEURL"))
{ {
define("SITEURL",""); define("SITEURL","");
@@ -1541,18 +1508,20 @@ class e_install
require_once($this->e107->e107_dirs['HANDLERS_DIRECTORY']."theme_handler.php"); require_once($this->e107->e107_dirs['HANDLERS_DIRECTORY']."theme_handler.php");
$tm = new themeHandler; $tm = new themeHandler;
$xmlArray = $tm->parse_theme_xml($theme_folder); $xmlArray = $tm->parse_theme_xml($theme_folder);
// $xml = e107::getXml(); // $xml = e107::getXml();
// $xmlArray = $xml->loadXMLfile($path,'advanced'); // $xmlArray = $xml->loadXMLfile($path,'advanced');
return (is_array($xmlArray)) ? $xmlArray : FALSE; return (is_array($xmlArray)) ? $xmlArray : FALSE;
} }
/**
* finish_form - pass data along forms
*
* @param string $force_stage [optional]
* @return none
*/
function finish_form($force_stage = false) function finish_form($force_stage = false)
{ {
global $e_forms; global $e_forms;
@@ -1563,7 +1532,12 @@ class e_install
$e_forms->add_hidden_data("stage", ($force_stage ? $force_stage : ($this->stage + 1))); $e_forms->add_hidden_data("stage", ($force_stage ? $force_stage : ($this->stage + 1)));
} }
/**
* check_writable_perms - check writable permissions
*
* @param string $list [default 'must_write']
* @return array $bad_files
*/
function check_writable_perms($list = 'must_write') function check_writable_perms($list = 'must_write')
{ {
$bad_files = array(); $bad_files = array();
@@ -1572,6 +1546,12 @@ class e_install
$system_dirs['MEDIA_DIRECTORY'] = str_replace("[hash]/","", $system_dirs['MEDIA_DIRECTORY']); $system_dirs['MEDIA_DIRECTORY'] = str_replace("[hash]/","", $system_dirs['MEDIA_DIRECTORY']);
$system_dirs['SYSTEM_DIRECTORY'] = str_replace("[hash]/","", $system_dirs['SYSTEM_DIRECTORY']); $system_dirs['SYSTEM_DIRECTORY'] = str_replace("[hash]/","", $system_dirs['SYSTEM_DIRECTORY']);
$e107_config = 'e107_config.php';
if (!file_exists($e107_config))
{ // fix to create empty config file before it is checked
file_put_contents($e107_config, '');
}
$data['must_write'] = 'e107_config.php|{$MEDIA_DIRECTORY}|{$SYSTEM_DIRECTORY}'; // all-sub folders are created on-the-fly $data['must_write'] = 'e107_config.php|{$MEDIA_DIRECTORY}|{$SYSTEM_DIRECTORY}'; // all-sub folders are created on-the-fly
$data['can_write'] = '{$PLUGINS_DIRECTORY}|{$THEMES_DIRECTORY}'; $data['can_write'] = '{$PLUGINS_DIRECTORY}|{$THEMES_DIRECTORY}';
@@ -1600,7 +1580,6 @@ class e_install
*/ */
public function create_tables() public function create_tables()
{ {
$link = mysql_connect($this->previous_steps['mysql']['server'], $this->previous_steps['mysql']['user'], $this->previous_steps['mysql']['password']); $link = mysql_connect($this->previous_steps['mysql']['server'], $this->previous_steps['mysql']['user'], $this->previous_steps['mysql']['password']);
if(!$link) if(!$link)
{ {
@@ -1649,10 +1628,7 @@ class e_install
} }
return FALSE; return FALSE;
//TODO - remove - Everything below this point should no longer be required. See import_configuration(); //TODO - remove - Everything below this point should no longer be required. See import_configuration();
/* /*
$datestamp = time(); $datestamp = time();
@@ -1799,7 +1775,8 @@ class e_install
function write_config($data) function write_config($data)
{ {
$fp = @fopen("e107_config.php", "w"); $e107_config = 'e107_config.php';
$fp = @fopen($e107_config, 'w');
if (!@fwrite($fp, $data)) if (!@fwrite($fp, $data))
{ {
@fclose ($fp); @fclose ($fp);
@@ -1827,8 +1804,8 @@ class e_install
} }
} }
class e_forms { class e_forms
{
var $form; var $form;
var $opened; var $opened;
@@ -1884,10 +1861,8 @@ class e_forms {
} }
} }
function create_tables_unattended() function create_tables_unattended()
{ {
//If username or password not specified, exit //If username or password not specified, exit
if(!isset($_GET['username']) || !isset($_GET['password'])) if(!isset($_GET['username']) || !isset($_GET['password']))
{ {
@@ -1937,12 +1912,10 @@ function create_tables_unattended()
$einstall->create_tables(); $einstall->create_tables();
$einstall->import_configuration(); $einstall->import_configuration();
return true; return true;
} }
class SimpleTemplate class SimpleTemplate
{ {
var $Tags = array(); var $Tags = array();
var $open_tag = "{"; var $open_tag = "{";
var $close_tag = "}"; var $close_tag = "}";
@@ -1993,20 +1966,20 @@ function template_data()
{ {
/* /*
$data = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\"> $data = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
<html xmlns=\"http://www.w3.org/1999/xhtml\"> <html xmlns=\"http://www.w3.org/1999/xhtml\">
<head> <head>
<title>{installation_heading} :: {stage_pre}{stage_num} - {stage_title}</title> <title>{installation_heading} :: {stage_pre}{stage_num} - {stage_title}</title>
<meta http-equiv=\"Content-type\" content=\"text/html; charset=utf-8\" /> <meta http-equiv=\"Content-type\" content=\"text/html; charset=utf-8\" />
<meta http-equiv=\"content-style-type\" content=\"text/css\" /> <meta http-equiv=\"content-style-type\" content=\"text/css\" />
<link rel=\"stylesheet\" href=\"{installer_css_http}\" type=\"text/css\" /> <link rel=\"stylesheet\" href=\"{installer_css_http}\" type=\"text/css\" />
</head> </head>
<body onload=\"{onload}\"> <body onload=\"{onload}\">
<!-- Installer theme is a ripped version of 'Leaf' by Que, based on the nucleus cms theme by Ivan Fong aka Stanch. --> <!-- Installer theme is a ripped version of 'Leaf' by Que, based on the nucleus cms theme by Ivan Fong aka Stanch. -->
<div id=\"header\"> <div id=\"header\">
<h1>{installation_heading}</h1> <h1>{installation_heading}</h1>
</div> </div>
<div id=\"wrapper\"> <div id=\"wrapper\">
<div id=\"container\"> <div id=\"container\">
<div id=\"content\"> <div id=\"content\">
<div class=\"contentbody\"> <div class=\"contentbody\">
<h3>{stage_pre}{stage_num} - {stage_title}</h3> <h3>{stage_pre}{stage_num} - {stage_title}</h3>
@@ -2016,18 +1989,17 @@ function template_data()
{debug_info} {debug_info}
</div> </div>
</div> </div>
</div> </div>
<div class=\"clearing\">&nbsp;</div> <div class=\"clearing\">&nbsp;</div>
</div> </div>
<div id=\"footer\">&nbsp;</div> <div id=\"footer\">&nbsp;</div>
</body> </body>
</html>"; </html>";
*/ */
$data = '<!DOCTYPE html>
$data = '<!DOCTYPE html> <html lang="en">
<html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>{installation_heading} :: {stage_pre}{stage_num} - {stage_title}</title> <title>{installation_heading} :: {stage_pre}{stage_num} - {stage_title}</title>
@@ -2077,7 +2049,7 @@ $data = '<!DOCTYPE html>
</div> </div>
<div class="footer"> <div class="footer">
<p class="pull-left">&copy; e107 Inc. 2012</p> <p class="pull-left">&copy; e107 Inc. '.date("Y").'</p>
<p class="pull-right">Version: '.e_VERSION.'</p> <p class="pull-right">Version: '.e_VERSION.'</p>
</div> </div>
<div>{debug_info}</div> <div>{debug_info}</div>
@@ -2091,11 +2063,8 @@ $data = '<!DOCTYPE html>
<script type="text/javascript" src="'.e_JS.'core/admin.jquery.js"></script> <script type="text/javascript" src="'.e_JS.'core/admin.jquery.js"></script>
<script type="text/javascript" src="'.e_JS.'core/all.jquery.js"></script> <script type="text/javascript" src="'.e_JS.'core/all.jquery.js"></script>
</body> </body>
</html> </html>
'; ';
return $data; return $data;
} }