diff --git a/e107_admin/sql/core_sql.php b/e107_admin/sql/core_sql.php index fd76ee903..88057804b 100644 --- a/e107_admin/sql/core_sql.php +++ b/e107_admin/sql/core_sql.php @@ -9,9 +9,9 @@ * Core SQL * * $Source: /cvs_backup/e107_0.8/e107_admin/sql/core_sql.php,v $ - * $Revision: 1.25 $ - * $Date: 2009-09-14 20:21:06 $ - * $Author: secretr $ + * $Revision: 1.26 $ + * $Date: 2009-09-17 01:47:19 $ + * $Author: e107coders $ */ header("location:../index.php"); @@ -164,84 +164,6 @@ CREATE TABLE dblog ( # -------------------------------------------------------- -# -# Table structure for table `download` -# - -CREATE TABLE download ( - download_id int(10) unsigned NOT NULL auto_increment, - download_name varchar(100) NOT NULL default '', - download_url varchar(255) NOT NULL default '', - download_author varchar(100) NOT NULL default '', - download_author_email varchar(200) NOT NULL default '', - download_author_website varchar(200) NOT NULL default '', - download_description text NOT NULL, - download_filesize varchar(20) NOT NULL default '', - download_requested int(10) unsigned NOT NULL default '0', - download_category int(10) unsigned NOT NULL default '0', - download_active tinyint(3) unsigned NOT NULL default '0', - download_datestamp int(10) unsigned NOT NULL default '0', - download_thumb varchar(150) NOT NULL default '', - download_image varchar(150) NOT NULL default '', - download_comment tinyint(3) unsigned NOT NULL default '0', - download_class varchar(255) NOT NULL default '0', - download_mirror text NOT NULL, - download_mirror_type tinyint(1) unsigned NOT NULL default '0', - download_visible varchar(255) NOT NULL default '0', - PRIMARY KEY (download_id), - UNIQUE KEY download_name (download_name), - KEY download_category (download_category) -) TYPE=MyISAM; -# -------------------------------------------------------- - -# -# Table structure for table `download_category` -# - -CREATE TABLE download_category ( - download_category_id int(10) unsigned NOT NULL auto_increment, - download_category_name varchar(100) NOT NULL default '', - download_category_description text NOT NULL, - download_category_icon varchar(100) NOT NULL default '', - download_category_parent int(10) unsigned NOT NULL default '0', - download_category_class varchar(255) NOT NULL default '0', - download_category_order int(10) unsigned NOT NULL default '0', - PRIMARY KEY (download_category_id) -) TYPE=MyISAM; -# -------------------------------------------------------- - -# -# Table structure for table `download_mirror` -# - -CREATE TABLE download_mirror ( - mirror_id int(10) unsigned NOT NULL auto_increment, - mirror_name varchar(200) NOT NULL default '', - mirror_url varchar(255) NOT NULL default '', - mirror_image varchar(200) NOT NULL default '', - mirror_location varchar(100) NOT NULL default '', - mirror_description text NOT NULL, - mirror_count int(10) unsigned NOT NULL default '0', - PRIMARY KEY (mirror_id) -) TYPE=MyISAM; -# -------------------------------------------------------- - -# -# Table structure for table `download_requests` -# -CREATE TABLE download_requests ( - download_request_id int(10) unsigned NOT NULL auto_increment, - download_request_userid int(10) unsigned NOT NULL default '0', - download_request_ip varchar(45) NOT NULL default '', - download_request_download_id int(10) unsigned NOT NULL default '0', - download_request_datestamp int(10) unsigned NOT NULL default '0', - PRIMARY KEY (download_request_id), - KEY download_request_userid (download_request_userid), - KEY download_request_download_id (download_request_download_id), - KEY download_request_datestamp (download_request_datestamp) -) TYPE=MyISAM; -# -------------------------------------------------------- - # # Table structure for table `generic` # @@ -418,7 +340,7 @@ CREATE TABLE plugin ( # -------------------------------------------------------- # -# Table structure for table `rate` +# Table structure for table `preset` # CREATE TABLE preset ( @@ -446,19 +368,6 @@ CREATE TABLE rate ( ) TYPE=MyISAM; # -------------------------------------------------------- -# -# Table structure for table `rbinary` -# - -CREATE TABLE rbinary ( - binary_id int(10) unsigned NOT NULL auto_increment, - binary_name varchar(200) NOT NULL default '', - binary_filetype varchar(100) NOT NULL default '', - binary_data longblob NOT NULL, - PRIMARY KEY (binary_id) -) TYPE=MyISAM; -# -------------------------------------------------------- - # # Table structure for table `session` # diff --git a/e107_admin/update_routines.php b/e107_admin/update_routines.php index 603417798..ac2292486 100644 --- a/e107_admin/update_routines.php +++ b/e107_admin/update_routines.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_admin/update_routines.php,v $ -| $Revision: 1.51 $ -| $Date: 2009-09-13 20:22:39 $ -| $Author: secretr $ +| $Revision: 1.52 $ +| $Date: 2009-09-17 01:47:20 $ +| $Author: e107coders $ +----------------------------------------------------------------------------+ */ @@ -912,7 +912,7 @@ function update_needed($message='') { $tmp = debug_backtrace(); //$ns->tablerender("", "
Update required in ".basename(__FILE__)." on line ".$tmp[0]['line']."
"); - $emessage->add("Update required in ".basename(__FILE__)." on line ".$tmp[0]['line'], E_MESSAGE_DEBUG); + $emessage->add("Update required in ".basename(__FILE__)." on line ".$tmp[0]['line']." (".$message.")", E_MESSAGE_DEBUG); } return FALSE; } diff --git a/e107_handlers/plugin_class.php b/e107_handlers/plugin_class.php index 9c1239521..351dd5ec6 100644 --- a/e107_handlers/plugin_class.php +++ b/e107_handlers/plugin_class.php @@ -11,8 +11,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_handlers/plugin_class.php,v $ -| $Revision: 1.87 $ -| $Date: 2009-09-17 00:13:39 $ +| $Revision: 1.88 $ +| $Date: 2009-09-17 01:47:20 $ | $Author: e107coders $ +----------------------------------------------------------------------------+ */ @@ -1508,7 +1508,7 @@ class e107plugin $plug['plug_action'] = 'install'; - if ($plug['plugin_installflag'] == FALSE) + if (!vartrue($plug['plugin_installflag'])) { $_path = e_PLUGIN.$plug['plugin_path'].'/'; if(file_exists($_path.'plugin.xml')) diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php index 97b452b0f..590c508d3 100644 --- a/e107_handlers/theme_handler.php +++ b/e107_handlers/theme_handler.php @@ -9,8 +9,8 @@ * e107 Admin Theme Handler * * $Source: /cvs_backup/e107_0.8/e107_handlers/theme_handler.php,v $ - * $Revision: 1.52 $ - * $Date: 2009-09-17 00:13:39 $ + * $Revision: 1.53 $ + * $Date: 2009-09-17 01:47:20 $ * $Author: e107coders $ */ @@ -1058,7 +1058,7 @@ class themeHandler{ if($core->save()) { //TODO LANs - $emessage->add(TPVLAN_3." '".$themeArray[$this -> id]." v".$version."'", E_MESSAGE_SUCCESS); + $emessage->add(TPVLAN_3." '".$name." v".$version."'", E_MESSAGE_SUCCESS); $emessage->add("Default Layout: ".$deflayout,E_MESSAGE_SUCCESS); $emessage->add("Custom Pages: ".$customPages,E_MESSAGE_SUCCESS); diff --git a/install_.php b/install_.php index 5d6e4f34b..c4eebdd7c 100644 --- a/install_.php +++ b/install_.php @@ -9,8 +9,8 @@ * Installation file * * $Source: /cvs_backup/e107_0.8/install_.php,v $ -* $Revision: 1.39 $ -* $Date: 2009-09-17 00:13:40 $ +* $Revision: 1.40 $ +* $Date: 2009-09-17 01:47:20 $ * $Author: e107coders $ * */ @@ -420,7 +420,7 @@ class e_install else { $this->template->SetTag("stage_title", LANINS_037.($this->previous_steps['mysql']['createdb'] == 1 ? LANINS_038 : "")); - if (!@mysql_connect($this->previous_steps['mysql']['server'], $this->previous_steps['mysql']['user'], $this->previous_steps['mysql']['password'])) + if (!$res = @mysql_connect($this->previous_steps['mysql']['server'], $this->previous_steps['mysql']['user'], $this->previous_steps['mysql']['password'])) { $success = FALSE; $page_content = LANINS_041.nl2br("\n\n".LANINS_083."\n".mysql_error().""); @@ -438,6 +438,11 @@ class e_install } */ // Do brute force for now - Should be enough + + $DB_ALREADY_EXISTS = mysql_select_db($this->previous_steps['mysql']['db'], $res); + + //TODO Add option to continue install even if DB exists. + if($this->previous_steps['mysql']['createdb'] == 1) { $query = 'CREATE DATABASE '.$this->previous_steps['mysql']['db'].' CHARACTER SET `utf8` '; @@ -447,10 +452,10 @@ class e_install $query = 'ALTER DATABASE '.$this->previous_steps['mysql']['db'].' CHARACTER SET `utf8` '; } - if ( ! $this->dbqry($query)) + if (!$this->dbqry($query)) { $success = FALSE; - $page_content .= "

".LANINS_043.nl2br("\n\n".LANINS_083."\n".mysql_error().""); + $page_content .= "

".LANINS_043.nl2br("\n\n".LANINS_083."\n".mysql_error().""); } else { @@ -476,6 +481,7 @@ class e_install private function stage_4() { global $e_forms; + $this->stage = 4; $this->template->SetTag("installation_heading", LANINS_001); @@ -906,7 +912,7 @@ class e_install else { $errors = $this->create_tables(); - $this->import_configuration(); + if ($errors == true) { @@ -914,6 +920,7 @@ class e_install } else { + $this->import_configuration(); $page = nl2br(LANINS_069)."
"; $e_forms->add_button("submit", LANINS_035); } @@ -966,6 +973,8 @@ class e_install $tp = e107::getParser(); + + define('PREVIEWTHEMENAME',""); // Notice Removal. include_lan($this->e107->e107_dirs['LANGUAGES_DIRECTORY'].$this->previous_steps['language']."/lan_prefs.php"); include_lan($this->e107->e107_dirs['LANGUAGES_DIRECTORY'].$this->previous_steps['language']."/admin/lan_theme.php"); @@ -982,6 +991,7 @@ class e_install { foreach($themeInfo['plugins']['plugin'] as $k=>$plug) { + echo "
Name: ".$plug['@attributes']['name']; $this->install_plugin($plug['@attributes']['name']); } }