diff --git a/e107_admin/admin.php b/e107_admin/admin.php index 7456d3170..4af3b4460 100644 --- a/e107_admin/admin.php +++ b/e107_admin/admin.php @@ -3,7 +3,7 @@ + ----------------------------------------------------------------------------+ | e107 website system | -| ©Steve Dunstan 2001-2002 +| �Steve Dunstan 2001-2002 | http://e107.org | jalist@e107.org | @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_admin/admin.php,v $ -| $Revision: 1.13 $ -| $Date: 2009-08-28 16:11:01 $ -| $Author: marj_nl_fr $ +| $Revision: 1.14 $ +| $Date: 2009-08-31 13:12:02 $ +| $Author: e107coders $ +----------------------------------------------------------------------------+ */ require_once('../class2.php'); @@ -366,6 +366,10 @@ function getPluginLinks($iconSize = E_16_PLUGMANAGER, $linkStyle = 'adminb') unset($eplug_conffile, $eplug_name, $eplug_caption, $eplug_icon_small); } } + else + { + $plugin_array = array(); + } ksort($plugin_array, SORT_STRING); // To FIX, without changing the current key format, sort by 'title' diff --git a/e107_admin/db.php b/e107_admin/db.php index 1594cbd17..853f80fb8 100644 --- a/e107_admin/db.php +++ b/e107_admin/db.php @@ -9,8 +9,8 @@ * Administration - Database Utilities * * $Source: /cvs_backup/e107_0.8/e107_admin/db.php,v $ - * $Revision: 1.25 $ - * $Date: 2009-08-31 02:00:50 $ + * $Revision: 1.26 $ + * $Date: 2009-08-31 13:12:03 $ * $Author: e107coders $ * */ @@ -54,13 +54,13 @@ if(isset($_POST['trigger_db_execute'])) } } -if(isset($_POST['db_update']) || $_GET['mode']=='db_update') +if(isset($_POST['db_update']) || varset($_GET['mode'])=='db_update') { header("location: ".e_ADMIN."e107_update.php"); exit(); } -if(isset($_POST['verify_sql']) || $_GET['mode']=='verify_sql') +if(isset($_POST['verify_sql']) || varset($_GET['mode'])=='verify_sql') { header("location: ".e_ADMIN."db_verify.php"); exit(); @@ -142,7 +142,7 @@ class system_tools $this->del_pref_val(); } - if(isset($_POST['verify_sql_record']) || $_GET['mode']=='verify_sql_record' || isset($_POST['check_verify_sql_record']) || isset($_POST['delete_verify_sql_record'])) + if(isset($_POST['verify_sql_record']) || varset($_GET['mode'])=='verify_sql_record' || isset($_POST['check_verify_sql_record']) || isset($_POST['delete_verify_sql_record'])) { // $this->verify_sql_record(); - currently performed in db_verify.php } @@ -667,14 +667,6 @@ function exportXmlFile($prefs,$tables,$debug=FALSE) -function importTables() -{ - // TODO - Import of table data. - -} - - - function table_list() { // grab default language lists. diff --git a/e107_admin/header.php b/e107_admin/header.php index f43f71bd0..779e06eab 100644 --- a/e107_admin/header.php +++ b/e107_admin/header.php @@ -12,9 +12,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_admin/header.php,v $ -| $Revision: 1.44 $ -| $Date: 2009-08-19 14:39:56 $ -| $Author: secretr $ +| $Revision: 1.45 $ +| $Date: 2009-08-31 13:12:03 $ +| $Author: e107coders $ +---------------------------------------------------------------+ */ @@ -308,7 +308,7 @@ if (!isset($no_core_css) || !$no_core_css) echo "\n"; // --- Load plugin Meta files and eplug_ before others -------- -if (is_array($pref['e_meta_list'])) +if (vartrue($pref['e_meta_list'])) { foreach($pref['e_meta_list'] as $val) { @@ -498,7 +498,7 @@ function e_admin_menu($title, $active_page, $e107_vars, $tmpl = array(), $sub_li $search[9] = '/\{LINK_IMAGE\}(.*?)/si'; foreach (array_keys($e107_vars) as $act) { - if(($e107_vars[$act]['perm']!='') && !getperms($e107_vars[$act]['perm'])) // check perms first. + if(vartrue($e107_vars[$act]['perm']) && !getperms($e107_vars[$act]['perm'])) // check perms first. { continue; } @@ -531,7 +531,7 @@ function e_admin_menu($title, $active_page, $e107_vars, $tmpl = array(), $sub_li $replace[6] = ''; $replace[7] = varset($e107_vars[$act]['link_class']); $replace[8] = ''; - $replace[9] = $e107_vars[$act]['image']; + $replace[9] = varset($e107_vars[$act]['image']); if(varsettrue($e107_vars[$act]['sub'])) { diff --git a/e107_admin/includes/infopanel.php b/e107_admin/includes/infopanel.php index 340a50cbf..8cc408e48 100644 --- a/e107_admin/includes/infopanel.php +++ b/e107_admin/includes/infopanel.php @@ -4,7 +4,7 @@ + ----------------------------------------------------------------------------+ | e107 website system | -| ©Steve Dunstan 2001-2002 +| �Steve Dunstan 2001-2002 | http://e107.org | jalist@e107.org | @@ -12,8 +12,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_admin/includes/infopanel.php,v $ -| $Revision: 1.6 $ -| $Date: 2009-08-05 14:20:41 $ +| $Revision: 1.7 $ +| $Date: 2009-08-31 13:12:03 $ | $Author: e107coders $ +----------------------------------------------------------------------------+ */ @@ -72,11 +72,13 @@ $iconlist[$key] = array("title"=>$funcinfo[1],"icon"=>$funcinfo[5]); // , $funci $buts .= render_links($funcinfo[0], $funcinfo[1], $funcinfo[2], $funcinfo[3], $funcinfo[6], "classis"); }*/ - - - +if(!vartrue($user_pref['core-infopanel-mye107'])) // Set default icons. +{ + $user_pref['core-infopanel-mye107'] = $pref['core-infopanel-default']; +} $iconlist = array_merge($array_functions_assoc,getPluginLinks(E_16_PLUGMANAGER,"array")); + $text .= "
diff --git a/e107_files/default_install.xml b/e107_files/default_install.xml index 65dbf5ba7..6d61890ed 100644 --- a/e107_files/default_install.xml +++ b/e107_files/default_install.xml @@ -7,7 +7,7 @@ 1 style.css 0 - classis + infopanel jayya 0 0 @@ -27,6 +27,24 @@ 0 0 e107cookie + 'e-administrator', + 1 => 'e-cpage', + 2 => 'e-filemanager', + 3 => 'e-frontpage', + 4 => 'e-image', + 5 => 'e-mailout', + 6 => 'e-menus', + 7 => 'e-meta', + 8 => 'e-newspost', + 9 => 'e-plugin', + 10 => 'e-prefs', + 11 => 'e-links', + 12 => 'e-theme', + 13 => 'e-userclass2', + 14 => 'e-users', + 15 => 'e-wmessage', +)]]> 0 0 0 diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php index 33e04e438..8ce88e8de 100644 --- a/e107_handlers/e107_class.php +++ b/e107_handlers/e107_class.php @@ -9,8 +9,8 @@ * e107 Main * * $Source: /cvs_backup/e107_0.8/e107_handlers/e107_class.php,v $ - * $Revision: 1.40 $ - * $Date: 2009-08-29 02:44:39 $ + * $Revision: 1.41 $ + * $Date: 2009-08-31 13:12:03 $ * $Author: e107coders $ */ @@ -107,7 +107,8 @@ class e107 'e_jshelper' => '{e_HANDLER}js_helper.php', 'e_menu' => '{e_HANDLER}menu_class.php', 'e107plugin' => '{e_HANDLER}plugin_class.php', - 'xmlClass' => '{e_HANDLER}xml_class.php' + 'xmlClass' => '{e_HANDLER}xml_class.php', + 'eMessage' => '{e_HANDLER}message_handler.php' ); diff --git a/e107_handlers/xml_class.php b/e107_handlers/xml_class.php index b3bd4cb30..db891ad70 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.18 $ - * $Date: 2009-08-31 02:49:02 $ + * $Revision: 1.19 $ + * $Date: 2009-08-31 13:12:03 $ * $Author: e107coders $ */ @@ -637,7 +637,7 @@ class xmlClass $ret = array(); - //FIXME - doesn't appear to be saving other prefs - only core prefs. + //FIXME - doesn't work from install_.php. if(vartrue($xmlArray['prefs']) && $only !='database') // Save Core Prefs { foreach($xmlArray['prefs'] as $type=>$array) @@ -645,7 +645,8 @@ class xmlClass foreach ($array as $val) { $value = (substr($val['@value'],0,7) == "array (") ? e107::getArrayStorage()->ReadArray($val['@value']) : $val['@value']; - e107::getConfig($type)->set($val['@attributes']['name'], $value); + e107::getConfig($type)->set($val['@attributes']['name'], $value); + } e107::getConfig($type)->save(FALSE);