From 40aac31efaed0061dd39a31f924e4d80c8babd1c Mon Sep 17 00:00:00 2001 From: CaMer0n Date: Mon, 31 Aug 2009 02:49:02 +0000 Subject: [PATCH] Emotes and other prefs were missing from default_install.xml. --- e107_files/default_install.xml | 317 ++++++++++++++++++++++++++++++++- e107_handlers/pref_class.php | 8 +- e107_handlers/xml_class.php | 7 +- install_.php | 20 ++- 4 files changed, 335 insertions(+), 17 deletions(-) diff --git a/e107_files/default_install.xml b/e107_files/default_install.xml index 8cd31a725..65dbf5ba7 100644 --- a/e107_files/default_install.xml +++ b/e107_files/default_install.xml @@ -1,6 +1,5 @@ - - + 1 0 @@ -139,7 +138,7 @@ City, State, Country [b]Email:[/b] sales@mydomain.com 255 - (Replaced during Install) + e107, which is released under the terms of the GNU GPL License.]]> English English e107 Website System @@ -194,6 +193,318 @@ City, State, Country 0 0 1 + 'cry.png', +)]]> + 'cry.png', +)]]> + 'cry.png', +)]]> + 'cry.png', +)]]> + 'mad.png', +)]]> + 'mad.png', +)]]> + 'mad.png', +)]]> + 'smile.png', +)]]> + 'smile.png', +)]]> + 'smile.png', +)]]> + 'frown.png', +)]]> + 'frown.png', +)]]> + 'frown.png', +)]]> + 'grin.png', +)]]> + 'grin.png', +)]]> + 'grin.png', +)]]> + 'confused.png', +)]]> + 'confused.png', +)]]> + 'confused.png', +)]]> + 'special.png', +)]]> + 'dead.png', +)]]> + 'dead.png', +)]]> + 'dead.png', +)]]> + 'dead.png', +)]]> + 'dead.png', +)]]> + 'dead.png', +)]]> + 'gah.png', +)]]> + 'gah.png', +)]]> + 'gah.png', +)]]> + 'idea.png', +)]]> + 'idea.png', +)]]> + 'idea.png', +)]]> + 'neutral.png', +)]]> + 'neutral.png', +)]]> + 'neutral.png', +)]]> + 'question.png', +)]]> + 'rolleyes.png', +)]]> + 'rolleyes.png', +)]]> + 'rolleyes.png', +)]]> + 'shades.png', +)]]> + 'shades.png', +)]]> + 'shades.png', +)]]> + 'suprised.png', +)]]> + 'suprised.png', +)]]> + 'suprised.png', +)]]> + 'tongue.png', +)]]> + 'tongue.png', +)]]> + 'tongue.png', +)]]> + 'tongue.png', +)]]> + 'tongue.png', +)]]> + 'tongue.png', +)]]> + 'wink.png', +)]]> + 'wink.png', +)]]> + 'wink.png', +)]]> + 'ill.png', +)]]> + 'amazed.png', +)]]> + 'cry.png', +)]]> + 'dodge.png', +)]]> + 'alien.png', +)]]> + 'heart.png', +)]]> + Date / Time + Latest Comments + 50 + 10 + [more ...] + 0 + 20 + [more ...] + 1 + Latest Forum Posts + 50 + 10 + [more ...] + 0 + Update menu Settings + + array ( + 'id' => 0, + 'dir' => 'core', + 'class' => '0', + ), + 'download' => + array ( + 'id' => 2, + 'dir' => 'core', + 'class' => '0', + ), +)]]> + + array ( + 'class' => '0', + 'pre_title' => '0', + 'pre_title_alt' => '', + 'chars' => '150', + 'results' => '10', + 'order' => '1', + ), + 'comments' => + array ( + 'class' => '0', + 'pre_title' => '1', + 'pre_title_alt' => '', + 'chars' => '150', + 'results' => '10', + 'order' => '2', + ), + 'users' => + array ( + 'class' => '0', + 'pre_title' => '1', + 'pre_title_alt' => '', + 'chars' => '150', + 'results' => '10', + 'order' => '3', + ), + 'downloads' => + array ( + 'class' => '0', + 'pre_title' => '1', + 'pre_title_alt' => '', + 'chars' => '150', + 'results' => '10', + 'order' => '4', + ), + 'pages' => + array ( + 'class' => '0', + 'chars' => '150', + 'results' => '10', + 'pre_title' => '0', + 'pre_title_alt' => '', + 'order' => '5', + ), +)]]> + 0 + 1 + 1 + + 0 + 2 + 0 + 60 + 1 + + array ( + 'class' => '254', + 'email' => '', + ), + 'userveri' => + array ( + 'class' => '254', + 'email' => '', + ), + 'login' => + array ( + 'class' => '254', + 'email' => '', + ), + 'logout' => + array ( + 'class' => '254', + 'email' => '', + ), + 'flood' => + array ( + 'class' => '254', + 'email' => '', + ), + 'subnews' => + array ( + 'class' => '254', + 'email' => '', + ), + 'newspost' => + array ( + 'class' => '254', + 'email' => '', + ), + 'newsupd' => + array ( + 'class' => '254', + 'email' => '', + ), + 'newsdel' => + array ( + 'class' => '254', + 'email' => '', + ), +)]]> diff --git a/e107_handlers/pref_class.php b/e107_handlers/pref_class.php index 773a3b81f..f8d1f68bd 100644 --- a/e107_handlers/pref_class.php +++ b/e107_handlers/pref_class.php @@ -9,9 +9,9 @@ * e107 Preference Handler * * $Source: /cvs_backup/e107_0.8/e107_handlers/pref_class.php,v $ - * $Revision: 1.14 $ - * $Date: 2009-08-27 23:37:24 $ - * $Author: secretr $ + * $Revision: 1.15 $ + * $Date: 2009-08-31 02:49:01 $ + * $Author: e107coders $ */ if (!defined('e107_INIT')) { exit; } @@ -615,7 +615,7 @@ final class e_core_pref extends e_pref * * @var array */ - protected $aliases = array( + public $aliases = array( 'core' => 'SitePrefs', 'core_backup' => 'SitePrefs_Backup', 'core_old' => 'pref', diff --git a/e107_handlers/xml_class.php b/e107_handlers/xml_class.php index 60c795eee..b3bd4cb30 100644 --- a/e107_handlers/xml_class.php +++ b/e107_handlers/xml_class.php @@ -9,8 +9,8 @@ * Simple XML Parser * * $Source: /cvs_backup/e107_0.8/e107_handlers/xml_class.php,v $ - * $Revision: 1.17 $ - * $Date: 2009-08-31 02:00:51 $ + * $Revision: 1.18 $ + * $Date: 2009-08-31 02:49:02 $ * $Author: e107coders $ */ @@ -636,7 +636,8 @@ class xmlClass } $ret = array(); - + + //FIXME - doesn't appear to be saving other prefs - only core prefs. if(vartrue($xmlArray['prefs']) && $only !='database') // Save Core Prefs { foreach($xmlArray['prefs'] as $type=>$array) diff --git a/install_.php b/install_.php index 1f90e1036..c4d27b5d4 100644 --- a/install_.php +++ b/install_.php @@ -9,8 +9,8 @@ * Installation file * * $Source: /cvs_backup/e107_0.8/install_.php,v $ -* $Revision: 1.29 $ -* $Date: 2009-08-31 02:07:08 $ +* $Revision: 1.30 $ +* $Date: 2009-08-31 02:49:02 $ * $Author: e107coders $ * */ @@ -770,7 +770,12 @@ class e_install if(varset($_POST['generate_content'])) { - $this->previous_steps['prefs']['generate_content'] = $_POST['generate_content']; + $this->previous_steps['generate_content'] = $_POST['generate_content']; + } + + if(varset($_POST['install_plugins'])) + { + $this->previous_steps['install_plugins'] = $_POST['install_plugins']; } // Validate. @@ -782,6 +787,7 @@ class e_install { $this->required['sitetheme'] = LANINS_114; // 'Please select a theme.'; } + if(vartrue($this->required['sitetheme']) || vartrue($this->required['sitename'])) { return $this->stage_6(); @@ -789,10 +795,10 @@ class e_install // Data is okay - Continue. - $this->previous_steps['prefs']['sitename'] = $_POST['sitename']; - $this->previous_steps['prefs']['sitetheme'] = $_POST['sitetheme']; - $this->previous_steps['generate_content'] = $_POST['generate_content']; - $this->previous_steps['install_plugins'] = $_POST['install_plugins']; + // $this->previous_steps['prefs']['sitename'] = $_POST['sitename']; + // $this->previous_steps['prefs']['sitetheme'] = $_POST['sitetheme']; + // $this->previous_steps['generate_content'] = $_POST['generate_content']; + $this->template->SetTag("installation_heading", LANINS_001); $this->template->SetTag("stage_pre", LANINS_002);