diff --git a/e107_admin/ad_links.php b/e107_admin/ad_links.php index eb88e59c8..f94078d91 100644 --- a/e107_admin/ad_links.php +++ b/e107_admin/ad_links.php @@ -9,8 +9,8 @@ * Admin Navigation * * $Source: /cvs_backup/e107_0.8/e107_admin/ad_links.php,v $ - * $Revision: 1.17 $ - * $Date: 2009-08-30 08:23:47 $ + * $Revision: 1.18 $ + * $Date: 2009-09-18 23:13:59 $ * $Author: e107coders $ */ @@ -130,9 +130,7 @@ if (!defined('E_16_ADPASS')) { if (!defined('E_16_BANLIST')) { define('E_16_BANLIST', ""); } -if (!defined('E_16_BANNER')) { - define('E_16_BANNER', ""); -} + if (!defined('E_16_CACHE')) { define('E_16_CACHE', ""); } @@ -157,9 +155,7 @@ if (!defined('E_16_DATAB')) { if (!defined('E_16_DOCS')) { define('E_16_DOCS', ""); } -if (!defined('E_16_DOWNL')) { - define('E_16_DOWNL', ""); -} + if (!defined('E_16_EMOTE')) { define('E_16_EMOTE', ""); } @@ -285,9 +281,7 @@ if (!defined('E_32_ADPASS')) { if (!defined('E_32_BANLIST')) { define('E_32_BANLIST', ""); } -if (!defined('E_32_BANNER')) { - define('E_32_BANNER', ""); -} + if (!defined('E_32_CACHE')) { define('E_32_CACHE', ""); } @@ -300,18 +294,16 @@ if (!defined('E_32_CRON')) { if (!defined('E_32_CUST')) { define('E_32_CUST', ""); } -if (!defined('E_32_CUSTOMFIELD')) { +/*if (!defined('E_32_CUSTOMFIELD')) { define('E_32_CUSTOMFIELD', ""); -} +}*/ if (!defined('E_32_DATAB')) { define('E_32_DATAB', ""); } if (!defined('E_32_DOCS')) { define('E_32_DOCS', ""); } -if (!defined('E_32_DOWNL')) { - define('E_32_DOWNL', ""); -} + if (!defined('E_32_EMOTE')) { define('E_32_EMOTE', ""); } @@ -434,16 +426,15 @@ $e_icon_array = array( 'admin' => E_32_ADMIN, 'admin_pass' => E_32_ADPASS, 'banlist' => E_32_BANLIST, - 'banner' => E_32_BANNER, 'cache' => E_32_CACHE, 'comment' => E_32_COMMENT, 'credits' => E_32_CREDITS, 'cron' => E_32_CRON, 'custom' => E_32_CUST, - 'custom_field' => E_32_CUSTOMFIELD, + // 'custom_field' => E_32_CUSTOMFIELD, 'database' => E_32_DATAB, 'docs' => E_32_DOCS, - 'download' => E_32_DOWNL, + //'download' => E_32_DOWNL, 'emoticon' => E_32_EMOTE, 'filemanage' => E_32_FILE, 'fileinspector' => E_32_INSPECT, @@ -560,11 +551,10 @@ $array_functions = array( 0 => array(e_ADMIN.'administrator.php', ADLAN_8, ADLAN_9, '3', 2, E_16_ADMIN, E_32_ADMIN), 1 => array(e_ADMIN.'updateadmin.php', ADLAN_10, ADLAN_11, '', 2, E_16_ADPASS, E_32_ADPASS), 2 => array(e_ADMIN.'banlist.php', ADLAN_34, ADLAN_35, '4', 2, E_16_BANLIST, E_32_BANLIST), - 3 => array(e_ADMIN.'banner.php', ADLAN_54, ADLAN_55, 'D', 3, E_16_BANNER, E_32_BANNER), 4 => array(e_ADMIN.'cache.php', ADLAN_74, ADLAN_75, 'C', 1, E_16_CACHE, E_32_CACHE), 5 => array(e_ADMIN.'cpage.php', ADLAN_42, ADLAN_43, '5|J', 3, E_16_CUST, E_32_CUST), 6 => array(e_ADMIN.'db.php', ADLAN_44, ADLAN_45, '0', 4, E_16_DATAB, E_32_DATAB), - 7 => array(e_ADMIN.'download.php', ADLAN_24, ADLAN_25, 'R', 3, E_16_DOWNL, E_32_DOWNL), +// 7 => array(e_ADMIN.'download.php', ADLAN_24, ADLAN_25, 'R', 3, E_16_DOWNL, E_32_DOWNL), 8 => array(e_ADMIN.'emoticon.php', ADLAN_58, ADLAN_59, 'F', 1, E_16_EMOTE, E_32_EMOTE), 9 => array(e_ADMIN.'filemanager.php', ADLAN_30, ADLAN_31, '6', 5, E_16_FILE, E_32_FILE), 10 => array(e_ADMIN.'frontpage.php', ADLAN_60, ADLAN_61, 'G', 1, E_16_FRONT, E_32_FRONT), @@ -592,9 +582,10 @@ $array_functions = array( 32 => array(e_ADMIN.'eurl.php', ADLAN_159, ADLAN_160, 'L', 1, E_16_EURL, E_32_EURL), 33 => array(e_ADMIN.'plugin.php', ADLAN_98, ADLAN_99, 'Z', 5 , E_16_PLUGMANAGER, E_32_PLUGMANAGER), 34 => array(e_ADMIN.'docs.php', ADLAN_12, ADLAN_13, '', 20, E_16_DOCS, E_32_DOCS), - 35 => array('#TODO', 'System Info', 'System Information', '', 20, '', ''), - 36 => array(e_ADMIN.'credits.php', LAN_CREDITS, LAN_CREDITS, '', 20, '', ''), - 37 => array(e_ADMIN.'custom_field.php', ADLAN_161, ADLAN_162, 'U', 4, E_16_CUSTOMFIELD, E_32_CUSTOMFIELD), +// TODO System Info. +// 35 => array('#TODO', 'System Info', 'System Information', '', 20, '', ''), + 36 => array(e_ADMIN.'credits.php', LAN_CREDITS, LAN_CREDITS, '', 20, E_16_CREDITS, E_32_CREDITS), +// 37 => array(e_ADMIN.'custom_field.php', ADLAN_161, ADLAN_162, 'U', 4, E_16_CUSTOMFIELD, E_32_CUSTOMFIELD), 38 => array(e_ADMIN.'comment.php', LAN_COMMENTMAN, LAN_COMMENTMAN, 'B', 5, E_16_COMMENT, E_32_COMMENT) ); diff --git a/e107_admin/admin.php b/e107_admin/admin.php index 0eb9b2f04..46d15c351 100644 --- a/e107_admin/admin.php +++ b/e107_admin/admin.php @@ -11,8 +11,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_admin/admin.php,v $ -| $Revision: 1.16 $ -| $Date: 2009-09-10 21:08:39 $ +| $Revision: 1.17 $ +| $Date: 2009-09-18 23:14:00 $ | $Author: e107coders $ +----------------------------------------------------------------------------+ */ @@ -236,14 +236,17 @@ function convert_core_icons($newarray) // Put core button array in the same for { foreach($newarray as $key=>$val) { - $key = "e-".basename($val[0],".php"); - $val['icon'] = $val[5]; - $val['icon_32'] = $val[6]; - $val['title'] = $val[1]; - $val['link'] = $val[0]; - $val['caption'] = $val['2']; - $val['perms'] = $val['3']; - $array_functions_assoc[$key] = $val; + if(varset($val[0])) + { + $key = "e-".basename($val[0],".php"); + $val['icon'] = $val[5]; + $val['icon_32'] = $val[6]; + $val['title'] = $val[1]; + $val['link'] = $val[0]; + $val['caption'] = $val['2']; + $val['perms'] = $val['3']; + $array_functions_assoc[$key] = $val; + } } return $array_functions_assoc; diff --git a/e107_admin/includes/infopanel.php b/e107_admin/includes/infopanel.php index b86130f6e..5032b7e80 100644 --- a/e107_admin/includes/infopanel.php +++ b/e107_admin/includes/infopanel.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_admin/includes/infopanel.php,v $ - | $Revision: 1.11 $ - | $Date: 2009-09-14 21:54:16 $ - | $Author: secretr $ + | $Revision: 1.12 $ + | $Date: 2009-09-18 23:14:00 $ + | $Author: e107coders $ +----------------------------------------------------------------------------+ */ if (!defined('e107_INIT')) @@ -219,6 +219,8 @@ function render_infopanel_icons() $frm = e107::getSingleton('e_form'); global $iconlist,$pluglist, $user_pref; $text = ""; + + foreach ($iconlist as $key=>$icon) { if (getperms($icon['perms'])) @@ -256,7 +258,7 @@ function render_infopanel_menu_options() { while ($row = e107::getDb()->db_Fetch()) { - $checked = (in_array($row['menu_name'], $settings)) ? true : false; + $checked = ($settings && in_array($row['menu_name'], $settings)) ? true : false; $text .= "
"; $text .= $frm->checkbox_label($row['menu_name'], "e-mymenus[]", $row['menu_name'], $checked); $text .= "
"; diff --git a/e107_handlers/plugin_class.php b/e107_handlers/plugin_class.php index 351dd5ec6..d6b32526f 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.88 $ -| $Date: 2009-09-17 01:47:20 $ +| $Revision: 1.89 $ +| $Date: 2009-09-18 23:14:00 $ | $Author: e107coders $ +----------------------------------------------------------------------------+ */ @@ -35,7 +35,7 @@ class e107plugin "e_latest", "e_status", "e_search", - "e_sc", + "e_shortcode", "e_module", "e_comment", "e_sql", @@ -1307,7 +1307,7 @@ class e107plugin if($function == 'install' || $function == 'upgrade') { - $sql->db_Update('plugin', "plugin_installflag = 1, plugin_addons = '{$eplug_addons}', plugin_version = '{$plug_vars['@attributes']['version']}' WHERE plugin_id = ".$id); + $sql->db_Update('plugin', "plugin_installflag = 1, plugin_addons = '{$eplug_addons}', plugin_version = '{$plug_vars['@attributes']['version']}', plugin_category ='".$this->manage_category($plug_vars['category'])."', plugin_releaseUrl= '".varset($plug_vars['@attributes']['releaseUrl'])."' WHERE plugin_id = ".$id); $p_installed[$plug['plugin_path']] = $plug_vars['@attributes']['version']; e107::getConfig('core')->setPref('plug_installed',$p_installed)->save(); @@ -1315,7 +1315,7 @@ class e107plugin if($function == 'uninstall') { - $sql->db_Update('plugin', "plugin_installflag = 0, plugin_addons = '{$eplug_addons}', plugin_version = '{$plug_vars['@attributes']['version']}' WHERE plugin_id = ".$id); + $sql->db_Update('plugin', "plugin_installflag = 0, plugin_addons = '{$eplug_addons}', plugin_version = '{$plug_vars['@attributes']['version']}', plugin_category ='".$this->manage_category($plug_vars['category'])."', plugin_releaseUrl= '".varset($plug_vars['@attributes']['releaseUrl'])."' WHERE plugin_id = ".$id); unset($p_installed[$plug['plugin_path']]); e107::getConfig('core')->setPref('plug_installed',$p_installed)->save(); } diff --git a/e107_plugins/rss_menu/rss_template.php b/e107_plugins/rss_menu/rss_template.php index 2bc5542ac..d7c8b95e4 100644 --- a/e107_plugins/rss_menu/rss_template.php +++ b/e107_plugins/rss_menu/rss_template.php @@ -31,41 +31,46 @@ if(!isset($RSS_LIST_FOOTER)) // Admin : rss listing if(!isset($RSS_ADMIN_LIST_HEADER)) { + $RSS_ADMIN_LIST_HEADER = "
- +
+ - - - - - - - - "; + + + + + + + + + + "; } if(!isset($RSS_ADMIN_LIST_TABLE)) { $RSS_ADMIN_LIST_TABLE = " - - - - - - - + + + + + + + "; } if(!isset($RSS_ADMIN_LIST_FOOTER)) { $RSS_ADMIN_LIST_FOOTER = " - +
{RSS_ADMIN_CAPTION=id,RSS_LAN_ADMIN_2}{RSS_ADMIN_CAPTION=name,RSS_LAN_ADMIN_4}{RSS_ADMIN_CAPTION=path,RSS_LAN_ADMIN_3}{RSS_ADMIN_CAPTION=url,RSS_LAN_ADMIN_5}".RSS_LAN_ADMIN_12."{RSS_ADMIN_CAPTION=limit,RSS_LAN_ADMIN_7}".LAN_OPTIONS."
{RSS_ADMIN_CAPTION=id,RSS_LAN_ADMIN_2}{RSS_ADMIN_CAPTION=name,RSS_LAN_ADMIN_4}{RSS_ADMIN_CAPTION=path,RSS_LAN_ADMIN_3}{RSS_ADMIN_CAPTION=url,RSS_LAN_ADMIN_5}".RSS_LAN_ADMIN_12."{RSS_ADMIN_CAPTION=limit,RSS_LAN_ADMIN_7}".LAN_OPTIONS."
{RSS_ADMIN_ID}{RSS_ADMIN_NAME}{RSS_ADMIN_PATH}{RSS_ADMIN_URL}{RSS_ADMIN_TOPICID}{RSS_ADMIN_LIMIT}{RSS_ADMIN_OPTIONS}{RSS_ADMIN_ID}{RSS_ADMIN_NAME}{RSS_ADMIN_PATH}{RSS_ADMIN_URL}{RSS_ADMIN_TOPICID}{RSS_ADMIN_LIMIT}{RSS_ADMIN_OPTIONS}
+ {RSS_ADMIN_LIMITBUTTON}
";