mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 06:07:32 +02:00
Code Issues Releases Wiki Activity

Some error fixes during install.

Browse Source
This commit is contained in:
CaMer0n
2009-10-21 03:53:27 +00:00
parent 8415a49036
commit 2e71f54abb
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
install_.php
View File

@@ -9,9 +9,9 @@
* Installation file * Installation file
* *
* $Source: /cvs_backup/e107_0.8/install_.php,v $ * $Source: /cvs_backup/e107_0.8/install_.php,v $
* $Revision: 1.43 $ * $Revision: 1.44 $
* $Date: 2009-09-29 21:25:01 $ * $Date: 2009-10-21 03:53:27 $
* $Author: e107steved $ * $Author: e107coders $
* *
*/ */
@@ -200,7 +200,11 @@ class e_install
$this->get_lan_file(); $this->get_lan_file();
$this->post_data = $_POST; $this->post_data = $_POST;
$this->template->SetTag("required", ""); $this->template->SetTag("required", "");
if(isset($this->previous_steps['language']))
{
define("e_LANGUAGE", $this->previous_steps['language']);
}
} }
@@ -946,7 +950,7 @@ class e_install
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']);
$themeImportFile = array(); $themeImportFile = array();
@@ -955,7 +959,7 @@ class e_install
$themeImportFile[3] = $this->e107->e107_dirs['FILES_DIRECTORY']. "default_install.xml"; $themeImportFile[3] = $this->e107->e107_dirs['FILES_DIRECTORY']. "default_install.xml";
if($this->previous_steps['generate_content']==1) if(vartrue($this->previous_steps['generate_content']))
{ {
foreach($themeImportFile as $file) foreach($themeImportFile as $file)
{ {
@@ -983,7 +987,7 @@ class e_install
e107::getSingleton('e107plugin')->update_plugins_table(); e107::getSingleton('e107plugin')->update_plugins_table();
// Install Theme-required plugins // Install Theme-required plugins
if($this->previous_steps['install_plugins']==1) if(vartrue($this->previous_steps['install_plugins']))
{ {
if($themeInfo = $this->get_theme_xml($this->previous_steps['prefs']['sitetheme'])) if($themeInfo = $this->get_theme_xml($this->previous_steps['prefs']['sitetheme']))
{ {
@@ -1129,6 +1133,7 @@ class e_install
function get_theme_xml($theme_folder) function get_theme_xml($theme_folder)
{ {
if(!defined("SITEURL")) if(!defined("SITEURL"))
{ {
define("SITEURL",""); define("SITEURL","");
@@ -1139,9 +1144,14 @@ class e_install
{ {
return FALSE; return FALSE;
} }
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);
// require_once($this->e107->e107_dirs['HANDLERS_DIRECTORY']."xml_class.php"); // require_once($this->e107->e107_dirs['HANDLERS_DIRECTORY']."xml_class.php");
// $xml = new xmlClass; // $xml = new xmlClass;
// $xmlArray = $xml->loadXMLfile($path,'advanced'); // $xmlArray = $xml->loadXMLfile($path,'advanced');