diff --git a/class2.php b/class2.php index be952626e..39bd01f2b 100644 --- a/class2.php +++ b/class2.php @@ -566,10 +566,28 @@ if(is_readable($customLan)) // FASTER - if exist, should be done 'once' by the c } unset($customLan); +$sql->db_Mark_Time('Start: Global Language Files'); +if(isset($pref['lan_global_list'])) +{ + foreach($pref['lan_global_list'] as $path) + { + e107::plugLan($path,'global',true); + } +} + + + +$sql->db_Mark_Time('Start: CHAPT challenge'); + + e107::getSession() ->challenge() // Create a unique challenge string for CHAP login ->check(); // Token protection + + + + // // N: misc setups: online user tracking, cache // diff --git a/e107_admin/admin_log.php b/e107_admin/admin_log.php index 9b69c4c64..c2a7405f5 100644 --- a/e107_admin/admin_log.php +++ b/e107_admin/admin_log.php @@ -49,12 +49,16 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE); // Main language file should automatically be loaded // Load language files for log messages include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_log_messages.php'); //... for core functions -if(is_array($pref['logLanguageFile'])) //... and for any plugins which support it + +if(is_array($pref['lan_log_list'])) //... and for any plugins which support it { - foreach($pref['logLanguageFile'] as $path => $file) + foreach($pref['lan_log_list'] as $path => $file) { $file = str_replace('--LAN--', e_LANGUAGE, $file); - include_lan(e_PLUGIN.$path.'/'.$file); + + echo "orig = ".$file." "; + e107::lan($path,'log',true); + //include_lan(e_PLUGIN.$path.'/'.$file); } } diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php index 7e67abc18..2652c36af 100644 --- a/e107_admin/plugin.php +++ b/e107_admin/plugin.php @@ -913,6 +913,13 @@ class pluginManager{ foreach($pluginList as $plug) { e107::loadLanFiles($plug['plugin_path'],'admin'); + + if($this->action == "avail") + { + e107::lan($plug['plugin_path'],'global', true); // Load language files. + } + + $_path = e_PLUGIN.$plug['plugin_path'].'/'; diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php index f322956ec..4e30e7c25 100644 --- a/e107_handlers/e107_class.php +++ b/e107_handlers/e107_class.php @@ -2076,6 +2076,7 @@ class e107 * e107::plugLan('forum', 'lan_forum'); * * // import defeinitions from /e107_plugins/featurebox/languages/[CurrentLanguage]_admin_featurebox.php + * // OR /e107_plugins/featurebox/languages/[CurrentLanguage]/[CurrentLanguage]_admin_featurebox.php (auto-detected) * e107::plugLan('featurebox', 'admin_featurebox', true); * * // import defeinitions from /e107_plugins/myplug/languages/[CurrentLanguage].php @@ -2111,9 +2112,17 @@ class e107 $fname = e_LANGUAGE; } - $path = e_PLUGIN.$plugin.'/languages/'.$fname.'.php'; + if($flat === true && is_dir(e_PLUGIN.$plugin."/languages/".e_LANGUAGE)) // support for alt_auth/languages/English/English_log.php etc. + { + $path = e_PLUGIN.$plugin.'/languages/'.e_LANGUAGE.'/'.$fname.'.php'; + } + else + { + $path = e_PLUGIN.$plugin.'/languages/'.$fname.'.php'; + } + + e107::getMessage()->addDebug("Attempting to Load: ".$path); - //echo "path = ".$path.'
'; e107::setRegistry($cstring, true); self::includeLan($path, false); @@ -2187,7 +2196,8 @@ class e107 self::themeLan($fname, null); break; default : - self::plugLan($type,$fname, false); + $opt = ($options === true) ? true : false; + self::plugLan($type,$fname, $opt); break; } diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php index 9a7977b4a..70bcaacd6 100644 --- a/e107_handlers/e_parse_class.php +++ b/e107_handlers/e_parse_class.php @@ -1313,7 +1313,7 @@ class e_parse // The check for '::' is a workaround for a bug in the Zend Optimiser 3.3.0 and PHP 5.2.4 combination // - causes crashes if '::' in site name //TODO - marj - find a way to use language method here XOR remove the limit of 24 characters. - if($opts['defs'] && (strlen($text) < 25) && ((strpos($text, '::') === FALSE) && defined(trim($text)))) + if($opts['defs'] && (strlen($text) < 35) && ((strpos($text, '::') === FALSE) && defined(trim($text)))) { return constant(trim($text)); } diff --git a/e107_handlers/message_handler.php b/e107_handlers/message_handler.php index 7ca38a427..c3ed19640 100644 --- a/e107_handlers/message_handler.php +++ b/e107_handlers/message_handler.php @@ -259,7 +259,7 @@ class eMessage * @param boolean $session * @return eMessage */ - public function addDebug($message, $mstack = 'default', $session = false) + public function addDebug($message, $mstack = 'default', $session = false) //TODO Add different types of DEBUG depending on the debug mode. { return $this->addStack($message, $mstack, E_MESSAGE_DEBUG, $session); } diff --git a/e107_handlers/plugin_class.php b/e107_handlers/plugin_class.php index 926ac2b8c..127be4d97 100644 --- a/e107_handlers/plugin_class.php +++ b/e107_handlers/plugin_class.php @@ -279,12 +279,24 @@ class e107plugin $plug_info = $this->plug_vars; $eplug_addons = $this->getAddons($plugin_path); - //Ensure the plugin path lives in the same folder as is configured in the plugin.php/plugin.xml + //Ensure the plugin path lives in the same folder as is configured in the plugin.php/plugin.xml - no longer relevant. if ($plugin_path == $plug_info['folder']) { if (array_key_exists($plugin_path, $pluginDBList)) { // Update the addons needed by the plugin $pluginDBList[$plugin_path]['status'] = 'exists'; + + // Check for name (lan) changes + if (vartrue($plug_info['@attributes']['lan']) && $pluginDBList[$plugin_path]['plugin_name'] != $plug_info['@attributes']['lan']) + { + // print_a($plug_info); + $pluginDBList[$plugin_path]['status'] = 'update'; + $pluginDBList[$plugin_path]['plugin_name'] = $plug_info['@attributes']['lan']; + $this->plugFolder = $plugin_path; + $this->XmlLanguageFiles('upgrade'); + } + + // Check for missing plugin_category in plugin table. if ($pluginDBList[$plugin_path]['plugin_category'] == '' || $pluginDBList[$plugin_path]['plugin_category'] != $plug_info['category']) @@ -787,7 +799,7 @@ class e107plugin $sql = e107::getDb(); $tp = e107::getParser(); - + if (!is_numeric($link_class)) { $link_class = strtolower($link_class); @@ -797,9 +809,10 @@ class e107plugin $plug_perm['mainadmin'] = e_UC_MAINADMIN; $plug_perm['admin'] = e_UC_ADMIN; $plug_perm['nobody'] = e_UC_NOBODY; - $link_class = ($plug_perm[$link_class]) ? $plug_perm[$link_class] : e_UC_PUBLIC; + $link_class = ($plug_perm[$link_class]) ? intval($plug_perm[$link_class]) : e_UC_PUBLIC; } + $link_url = $tp->toDB($link_url, true); $link_name = $tp->toDB($link_name, true); $path = str_replace("../", "", $link_url); // This should clean up 'non-standard' links @@ -818,7 +831,7 @@ class e107plugin 'link_order' => $link_t + 1, 'link_parent' => '0', 'link_open' => '0', - 'link_class' => $link_class, + 'link_class' => vartrue($linkclass,'0'), 'link_function' => '' ); return $sql->db_Insert('links', $linkData); // TODO: Add the _FIELD_DEFS array @@ -1246,6 +1259,9 @@ class e107plugin $path = e_PLUGIN.$plug['plugin_path'].'/'; $this->plugFolder = $plug['plugin_path']; + + + $this->unInstallOpts = $options; $addons = explode(',', $plug['plugin_addons']); @@ -1274,12 +1290,8 @@ class e107plugin $canContinue = FALSE; } - - - if (varset($plug_vars['languageFiles'])) - { - $this->XmlLanguageFiles($function, $plug_vars['languageFiles'], 'pre'); // First of all, see if there's a language file specific to install - } + // Load install longuage file and set lan_global pref. + $this->XmlLanguageFiles($function, $plug_vars['languageFiles'], 'pre'); // First of all, see if there's a language file specific to install // Next most important, if installing or upgrading, check that any dependencies are met if ($canContinue && ($function != 'uninstall') && isset($plug_vars['dependencies'])) @@ -1558,40 +1570,69 @@ class e107plugin * @param object $tag * @return none */ - function XmlLanguageFiles($function, $tag, $when = '') + function XmlLanguageFiles($function, $tag='', $when = '') { $core = e107::getConfig('core'); - - foreach ($tag['file'] as $val) + + $updated = false; + + $path_a = e_PLUGIN.$this->plugFolder."/languages/English_install.php"; // always check for English so we have a fall-bak + $path_b = e_PLUGIN.$this->plugFolder."/languages/English/English_install.php"; + + if(file_exists($path_a) || file_exists($path_b)) { - $att = $val['@attributes']; - - if ($when == 'pre') // just check for install language file BEFORE install. - - { - if ($att['type'] == 'install') - { - $file = str_replace('--LAN--', e_LANGUAGE, $att['path']); - $fullpath_file = e_PLUGIN.$this->plugFolder."/".$file; - include_lan($fullpath_file); - return; - } - } - elseif ($att['type'] == 'log') - { - switch ($function) - { - case 'install': - case 'upgrade': - case 'refresh': - $core->setPref('logLanguageFile/'.$this->plugFolder, $att['path']); - break; - case 'uninstall': - $core->removePref('logLanguageFile/'.$this->plugFolder); - break; - } - } + e107::lan($this->plugFolder,'install',true); } + + $path_a = e_PLUGIN.$this->plugFolder."/languages/English_global.php"; // always check for English so we have a fall-bak + $path_b = e_PLUGIN.$this->plugFolder."/languages/English/English_global.php"; + + if(file_exists($path_a) || file_exists($path_b)) + { + switch ($function) + { + case 'install': + case 'upgrade': + case 'refresh': + e107::getMessage()->addDebug("Adding ".$this->plugFolder." to lan_global_list"); + e107::lan($this->plugFolder,'global',true); + $core->setPref('lan_global_list/'.$this->plugFolder, $this->plugFolder); + $updated = true; + break; + case 'uninstall': + $core->removePref('lan_global_list/'.$this->plugFolder); + $update = true; + break; + } + } + + + $path_a = e_PLUGIN.$this->plugFolder."/languages/English_log.php"; // always check for English so we have a fall-bak + $path_b = e_PLUGIN.$this->plugFolder."/languages/English/English_log.php"; + + if(file_exists($path_a) || file_exists($path_b)) + { + switch ($function) + { + case 'install': + case 'upgrade': + case 'refresh': + $core->setPref('lan_log_list/'.$this->plugFolder, $this->plugFolder); + $updated = true; + break; + case 'uninstall': + $core->removePref('lan_log_list/'.$this->plugFolder); + $updated = true; + break; + } + } + + + if($updated === true) + { + $core->save(); //FIXME do this quietly without an s-message + } + } /** @@ -1610,7 +1651,7 @@ class e107plugin $linkName = (defset($link['@value'])) ? constant($link['@value']) : $link['@value']; $remove = (varset($attrib['deprecate']) == 'true') ? TRUE : FALSE; $url = $attrib['url']; - $perm = (isset($attrib['perm']) ? $attrib['perm'] : 0); + $perm = (isset($attrib['perm']) ? $attrib['perm'] : 'everyone'); switch ($function) { @@ -2360,6 +2401,9 @@ class e107plugin $bbcodeList = array_merge($bbcodeList, $bbcodeClassList); $sqlList = $fl->get_files(e_PLUGIN.$plugin_path, '_sql\.php$', "standard", 1); + + + // Search Shortcodes foreach ($shortcodeList as $sc) diff --git a/e107_handlers/pref_class.php b/e107_handlers/pref_class.php index 43bb454c1..47c405c0e 100644 --- a/e107_handlers/pref_class.php +++ b/e107_handlers/pref_class.php @@ -491,7 +491,7 @@ class e_pref extends e_front_model * * @param boolean $from_post merge post data * @param boolean $force - * @param boolean $session_messages use session messages + * @param boolean $session_messages use session messages //FIXME Appears to be ignored on "Settings successfully saved."; * @return boolean|integer 0 - no change, true - saved, false - error */ public function save($from_post = true, $force = false, $session_messages = false) diff --git a/e107_handlers/userclass_class.php b/e107_handlers/userclass_class.php index 90bbddd63..9ab1b7a57 100644 --- a/e107_handlers/userclass_class.php +++ b/e107_handlers/userclass_class.php @@ -691,6 +691,12 @@ class user_class { $style = " style='text-indent:".(1.2*$nest_level)."em'"; } + + $id = "{$treename}_{$classnum}"; + + return "
\n"; + return "
".$this->class_tree[$classnum]['userclass_name'].' ('.$this->class_tree[$classnum]['userclass_description'].")
\n"; } diff --git a/e107_plugins/_blank/languages/English_global.php b/e107_plugins/_blank/languages/English_global.php new file mode 100644 index 000000000..c3967a67a --- /dev/null +++ b/e107_plugins/_blank/languages/English_global.php @@ -0,0 +1,10 @@ + \ No newline at end of file diff --git a/e107_plugins/_blank/plugin.xml b/e107_plugins/_blank/plugin.xml index 0a7146dce..f418998e9 100644 --- a/e107_plugins/_blank/plugin.xml +++ b/e107_plugins/_blank/plugin.xml @@ -1,14 +1,14 @@ - + - A Blank Plugin to help you get started in plugin development + A Blank Plugin to help you get started in plugin development misc - Configure Blank + LAN_CONGIGURE Blank Prefs - Blank + LAN_PLUGIN__BLANK_LINK 1 diff --git a/e107_plugins/banner/languages/English_admin_banner.php b/e107_plugins/banner/languages/English_admin_banner.php index 3695d8219..216983a29 100644 --- a/e107_plugins/banner/languages/English_admin_banner.php +++ b/e107_plugins/banner/languages/English_admin_banner.php @@ -7,10 +7,10 @@ * */ define("BNRLAN_1", "Banner #%d deleted."); -define("BNRLAN_2", "Please confirm you wish to delete this banner - once deleted it cannot be retrieved"); -define("BNRLAN_5", "Confirm Delete Banner"); +define("BNRLAN_2", "Please confirm you wish to delete this banner - once deleted it cannot be retrieved"); //FIXME Use Generic +define("BNRLAN_5", "Confirm Delete Banner"); //FIXME Use Generic define("BNRLAN_6", "Delete cancelled."); -define("BNRLAN_7", "Existing Banners"); +define("BNRLAN_7", "Existing Banners"); //FIXME Use Generic define("BNRLAN_8", "Banner ID"); define("BNRLAN_9", "Client"); define("BNRLAN_10", "Clickthroughs"); @@ -21,8 +21,8 @@ define("BNRLAN_15", "No banners yet."); define("BNRLAN_16", "Unlimited"); define("BNRLAN_17", "None"); define("BNRLAN_21", "Ends"); -define("BNRLAN_22", "Update Banner"); -define("BNRLAN_23", "Add New Banner"); +define("BNRLAN_22", "Update Banner"); //FIXME Use Generic +define("BNRLAN_23", "Add New Banner"); //FIXME Use Generic define("BNRLAN_24", "Campaign"); define("BNRLAN_27", "Client"); @@ -47,12 +47,12 @@ define("BNRLAN_58", "Banner front page"); define("BNRLAN_59", "Create new banner"); define("BNRLAN_60", "campaigns"); define("BNRLAN_61", "Banner menu"); -define("BNRLAN_62", "Banner Options"); -define("BNRLAN_63", "Banner Created"); -define("BNRLAN_64", "Banner Updated"); +define("BNRLAN_62", "Banner Options"); //FIXME Use Generic +define("BNRLAN_63", "Banner Created"); //FIXME Use Generic +define("BNRLAN_64", "Banner Updated"); //FIXME Use Generic define("BANNER_MENU_L1", "Advertisement"); -define("BANNER_MENU_L2", "Banner menu configuration saved"); +define("BANNER_MENU_L2", "Banner menu configuration saved"); //FIXME Use Generic define("BANNER_MENU_L3", "Caption"); //define("BANNER_MENU_L5", "Banner Configuration"); define("BANNER_MENU_L6", "choose campaigns to show in menu"); @@ -79,5 +79,5 @@ define("BNRLAN_67", "No campaigns yet."); define("BNRLAN_68", "Banner Menu Configuration"); // Plugin manager -define("BNRLAN_100", "Add advertising banners to your e107 website"); + ?> \ No newline at end of file diff --git a/e107_plugins/banner/languages/English_global.php b/e107_plugins/banner/languages/English_global.php new file mode 100644 index 000000000..7aca6e063 --- /dev/null +++ b/e107_plugins/banner/languages/English_global.php @@ -0,0 +1,8 @@ + \ No newline at end of file diff --git a/e107_plugins/banner/plugin.xml b/e107_plugins/banner/plugin.xml index b4b60e41b..339b107e5 100644 --- a/e107_plugins/banner/plugin.xml +++ b/e107_plugins/banner/plugin.xml @@ -1,16 +1,12 @@ - + Add advertising banners to your e107 website - Add advertising banners to your e107 website + Add advertising banners to your e107 website banners advertise - - - - content Copyright e107 Inc e107.org, Licensed under GPL (http://www.gnu.org/licenses/gpl.txt) diff --git a/e107_plugins/calendar_menu/languages/English_global.php b/e107_plugins/calendar_menu/languages/English_global.php new file mode 100644 index 000000000..e01e3bb22 --- /dev/null +++ b/e107_plugins/calendar_menu/languages/English_global.php @@ -0,0 +1,9 @@ + \ No newline at end of file diff --git a/e107_plugins/calendar_menu/languages/English_install.php b/e107_plugins/calendar_menu/languages/English_install.php index fb200608b..15735373f 100644 --- a/e107_plugins/calendar_menu/languages/English_install.php +++ b/e107_plugins/calendar_menu/languages/English_install.php @@ -21,7 +21,7 @@ define('EC_ADINST_LAN_02', "Calendar event imminent:\n\n{EC_MAIL_CATEGORY}\n\n{E For further details see the calendar entry on the web site:\n{EC_MAIL_LINK=Click Here}\n\n {EC_MAIL_CONTACT} for further details"); define('EC_ADINST_LAN_03', 'Default category - mailout messages are used if none defined for any other category'); define('EC_ADINST_LAN_04', 'To activate please go to your menus screen and select the calendar_menu into one of your menu areas.'); -define('EC_ADINST_LAN_05', 'Configure Event Calendar'); +// define('EC_ADINST_LAN_05', 'Configure Event Calendar'); define('EC_ADINST_LAN_06', 'Default category entered'); define('EC_ADINST_LAN_07', 'Error adding default category'); define('EC_ADINST_LAN_08', 'Default category already in DB'); diff --git a/e107_plugins/calendar_menu/plugin.xml b/e107_plugins/calendar_menu/plugin.xml index fe0f76dcd..bc72af44c 100644 --- a/e107_plugins/calendar_menu/plugin.xml +++ b/e107_plugins/calendar_menu/plugin.xml @@ -1,24 +1,20 @@ - + - This plugin is a fully featured event calendar with calendar menu. + This plugin is a fully featured event calendar with calendar menu. readme.pdf content - - - - - EC_ADINST_LAN_05 + LAN_PLUGIN_CALENDAR_MENU_CONFIG EC_ADLAN_A11 EC_ADLAN_A100 EC_ADLAN_A141 EC_ADLAN_A173 - Calendar + LAN_PLUGIN_CALENDAR_MENU_LINK - + 254 254 0 @@ -56,5 +52,5 @@ 0 0 0 - + \ No newline at end of file diff --git a/e107_plugins/chatbox_menu/languages/English/English_global.php b/e107_plugins/chatbox_menu/languages/English/English_global.php new file mode 100644 index 000000000..76a7701be --- /dev/null +++ b/e107_plugins/chatbox_menu/languages/English/English_global.php @@ -0,0 +1,15 @@ + \ No newline at end of file diff --git a/e107_plugins/chatbox_menu/languages/English/admin_chatbox_menu.php b/e107_plugins/chatbox_menu/languages/English/admin_chatbox_menu.php index d9564217e..610bae942 100644 --- a/e107_plugins/chatbox_menu/languages/English/admin_chatbox_menu.php +++ b/e107_plugins/chatbox_menu/languages/English/admin_chatbox_menu.php @@ -53,17 +53,11 @@ define("CHBLAN_36", "Chatbox Display options"); define("CHBLAN_37", "Normal chatbox"); define("CHBLAN_38", "Use javascript code to update posts dynamically (AJAX)"); define('CHBLAN_39', 'Nothing changed - not updated'); -define('CHBLAN_40', 'Chatbox'); -define('CHBLAN_41', 'Chatbox Menu'); -define('CHBLAN_42', ''); -define('CHBLAN_43', ''); +// define('CHBLAN_40', 'Chatbox'); +// define('CHBLAN_41', 'Chatbox Menu'); + + -// Admin Log -define('LAN_AL_CHBLAN_01','Chatbox settings updated'); -define('LAN_AL_CHBLAN_02','Chatbox pruned'); -define('LAN_AL_CHBLAN_03','Chatbox posts recalculated'); -define('LAN_AL_CHBLAN_04',''); -define('LAN_AL_CHBLAN_05',''); ?> \ No newline at end of file diff --git a/e107_plugins/chatbox_menu/plugin.xml b/e107_plugins/chatbox_menu/plugin.xml index 782f9061b..1ee860ea8 100644 --- a/e107_plugins/chatbox_menu/plugin.xml +++ b/e107_plugins/chatbox_menu/plugin.xml @@ -1,13 +1,9 @@ - - + - Chatbox Menu + Chatbox Menu content Copyright e107 Inc e107.org, Licensed under GPL (http://www.gnu.org/licenses/gpl.txt) - - - LAN_CONFIGURE diff --git a/e107_plugins/faqs/plugin.xml b/e107_plugins/faqs/plugin.xml index d965d7d5a..2055ca61b 100644 --- a/e107_plugins/faqs/plugin.xml +++ b/e107_plugins/faqs/plugin.xml @@ -1,16 +1,16 @@ - + - A simple plugin to add Frequently Asked Questions to your website. + A simple plugin to add Frequently Asked Questions to your website. Copyright e107 Inc e107.org, Licensed under GPL (http://www.gnu.org/licenses/gpl.txt) content - FAQs + LAN_PLUGIN_FAQS_NAME - FAQs + LAN_PLUGIN_FAQS_NAME 255 diff --git a/e107_plugins/featurebox/languages/English_admin_featurebox.php b/e107_plugins/featurebox/languages/English_admin_featurebox.php index d5dce978c..76b75d21f 100644 --- a/e107_plugins/featurebox/languages/English_admin_featurebox.php +++ b/e107_plugins/featurebox/languages/English_admin_featurebox.php @@ -34,12 +34,5 @@ define("FBLAN_24", "Plain"); define("FBLAN_25", "Template"); //FIXME LAN - use generic. define("FBLAN_26", "you can use a different template for each message, add templates to e107_plugins/featurebox/templates/ folder"); -// Admin log messages -define('LAN_AL_FBLAN_01', 'Featurebox created'); //FIXME LAN - use generic. -define('LAN_AL_FBLAN_02', 'Featurebox updated'); //FIXME LAN - use generic. -define('LAN_AL_FBLAN_03', 'Featurebox deleted'); //FIXME LAN - use generic. -// Install/uninstall messages -define('FBLAN_INSTALL_01', 'Adding Default category table data.'); -define('FBLAN_INSTALL_02', 'Adding Default table data.'); ?> \ No newline at end of file diff --git a/e107_plugins/featurebox/languages/English_global.php b/e107_plugins/featurebox/languages/English_global.php new file mode 100644 index 000000000..aa1154574 --- /dev/null +++ b/e107_plugins/featurebox/languages/English_global.php @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/e107_plugins/gsitemap/languages/English_admin_gsitemap.php b/e107_plugins/gsitemap/languages/English_admin_gsitemap.php index da24dbcf9..792dccec6 100644 --- a/e107_plugins/gsitemap/languages/English_admin_gsitemap.php +++ b/e107_plugins/gsitemap/languages/English_admin_gsitemap.php @@ -58,11 +58,5 @@ define("GSLAN_40", "Google Sitemap Entries"); define('GSLAN_41', "Google Sitemap. For more information on the Sitemap protocol, go to http://www.sitemaps.org/ or Google's page About Sitemaps"); define('GSLAN_42', 'Installation Successful..'); -// Admin log messages -//------------------- -define('LAN_AL_GSMAP_01', 'Import sitelinks'); -define('LAN_AL_GSMAP_02', 'Sitemap link deleted'); -define('LAN_AL_GSMAP_03', 'Sitemap link added'); -define('LAN_AL_GSMAP_04', 'Sitemap link updated'); -define('LAN_AL_GSMAP_05', ''); + ?> \ No newline at end of file diff --git a/e107_plugins/gsitemap/languages/English_log.php b/e107_plugins/gsitemap/languages/English_log.php new file mode 100644 index 000000000..5041a40a5 --- /dev/null +++ b/e107_plugins/gsitemap/languages/English_log.php @@ -0,0 +1,11 @@ + \ No newline at end of file diff --git a/e107_plugins/import/languages/English_admin_import.php b/e107_plugins/import/languages/English_admin_import.php index 6ea0057d9..49a7f09d0 100644 --- a/e107_plugins/import/languages/English_admin_import.php +++ b/e107_plugins/import/languages/English_admin_import.php @@ -27,8 +27,8 @@ if (!defined('e107_INIT')) { exit; } //define('LAN_CONTINUE','Continue'); Now global definition -define('LAN_CONVERT_01','Import into e107'); -define('LAN_CONVERT_02','Import data from Wordpress, Joomla, Drupal, Blogspot, RSS and other formats.'); +// define('LAN_CONVERT_01','Import into e107'); +// define('LAN_CONVERT_02','Import data from Wordpress, Joomla, Drupal, Blogspot, RSS and other formats.'); define('LAN_CONVERT_03','You must start with a clean E107 database, other than the main admin user (ID=1)'); define('LAN_CONVERT_04','Field(s) left blank, please go back and re-enter values.'); define('LAN_CONVERT_05','Running this script may empty many of your E107 tables - make sure you have a full backup before continuing!'); diff --git a/e107_plugins/import/plugin.xml b/e107_plugins/import/plugin.xml index 55dd994e0..7f072e2c6 100644 --- a/e107_plugins/import/plugin.xml +++ b/e107_plugins/import/plugin.xml @@ -1,8 +1,7 @@ - - + - Import data from Wordpress, Joomla, Drupal, Blogpost, RSS and other formats. + Import data from Wordpress, Joomla, Drupal, Blogpost, RSS and other formats. tools Copyright e107 Inc e107.org, Licensed under GPL (http://www.gnu.org/licenses/gpl.txt) diff --git a/e107_plugins/list_new/languages/English_admin_list_new.php b/e107_plugins/list_new/languages/English_admin_list_new.php index ca85f2789..91cccd28f 100644 --- a/e107_plugins/list_new/languages/English_admin_list_new.php +++ b/e107_plugins/list_new/languages/English_admin_list_new.php @@ -24,11 +24,11 @@ if (!defined("PAGE_NAME")) { define("PAGE_NAME", "List New Items"); } -define("LIST_PLUGIN_1", "List"); +// define("LIST_PLUGIN_1", "List"); define("LIST_PLUGIN_2", "This plugin allows you to view a list of recent additions in all e107 categories. You can either view the list with data since your last visit, or view a general latest additions list. Besides the page a menu is also present. Every section is configurable in the admin area."); define("LIST_PLUGIN_3", "Configure Main Menu"); define("LIST_PLUGIN_4", "The List_new plugin is now ready to be used."); -define("LIST_PLUGIN_5", "list"); + define("LIST_PLUGIN_6", "This plugin is not installed."); define("LIST_ADMIN_1", "recent"); diff --git a/e107_plugins/list_new/plugin.xml b/e107_plugins/list_new/plugin.xml index eaa68b867..946251cee 100644 --- a/e107_plugins/list_new/plugin.xml +++ b/e107_plugins/list_new/plugin.xml @@ -11,7 +11,7 @@ LIST_PLUGIN_3 - LIST_PLUGIN_5 + LIST_PLUGIN_1 diff --git a/e107_plugins/log/languages/English.php b/e107_plugins/log/languages/English.php index f93c1d84f..f06947542 100644 --- a/e107_plugins/log/languages/English.php +++ b/e107_plugins/log/languages/English.php @@ -49,7 +49,7 @@ define("ADSTAT_L30", "Site Referrals"); define("ADSTAT_L31", "Search Engine Query Strings"); define("ADSTAT_L32", "Referred from"); define("ADSTAT_L33", "Visits in last"); -define("ADSTAT_L34", "Visits"); +// define("ADSTAT_L34", "Visits"); // see English_globa.php define("ADSTAT_L35", "Unique visits in last"); define("ADSTAT_L36", "days by page"); define("ADSTAT_L37", "Visits by month"); diff --git a/e107_plugins/log/languages/English_admin_log.php b/e107_plugins/log/languages/English_admin_log.php index c68361e52..2c546a3ce 100644 --- a/e107_plugins/log/languages/English_admin_log.php +++ b/e107_plugins/log/languages/English_admin_log.php @@ -48,8 +48,8 @@ define("ADSTAT_L29", "Page Name"); define("ADSTAT_L30", "Check to remove"); define("ADSTAT_L31", "Remove selected pages"); define("ADSTAT_L32", "Page Tidy"); -define("ADSTAT_L33", "Configure Statistics Logging"); -define("ADSTAT_L34", "Site Stats"); +// define("ADSTAT_L33", "Configure Statistics Logging"); see English_global.php +// define("ADSTAT_L34", "Site Stats"); define ('ADSTAT_L35', 'Options'); define ('ADSTAT_L36', 'Data Export'); define ('ADSTAT_L37', 'Create export file'); @@ -102,13 +102,6 @@ define ('ADSTAT_L83', 'Following log ID entries removed:'); define ('ADSTAT_L84', ''); define ('ADSTAT_L85', ''); -// Messages for log entries -define('LAN_AL_STAT_01', 'Stats - reset'); -define('LAN_AL_STAT_02', 'Stats - settings changed'); -define('LAN_AL_STAT_03', 'Stats - pages removed'); -define('LAN_AL_STAT_04', 'Stats - historic data removed'); -define('LAN_AL_STAT_05', ''); -define('LAN_AL_STAT_06', ''); -define('LAN_AL_STAT_07', ''); + ?> \ No newline at end of file diff --git a/e107_plugins/log/languages/English_global.php b/e107_plugins/log/languages/English_global.php new file mode 100644 index 000000000..537f604ec --- /dev/null +++ b/e107_plugins/log/languages/English_global.php @@ -0,0 +1,10 @@ + \ No newline at end of file diff --git a/e107_plugins/log/languages/English_log.php b/e107_plugins/log/languages/English_log.php new file mode 100644 index 000000000..608098389 --- /dev/null +++ b/e107_plugins/log/languages/English_log.php @@ -0,0 +1,11 @@ + \ No newline at end of file diff --git a/e107_plugins/log/plugin.xml b/e107_plugins/log/plugin.xml index bcd3debcc..3cb72c583 100644 --- a/e107_plugins/log/plugin.xml +++ b/e107_plugins/log/plugin.xml @@ -1,16 +1,12 @@ - - + - This plugin will log all visits to your site, and build detailed statistic screens based on the information gathered. - - - + This plugin will log all visits to your site, and build detailed statistic screens based on the information gathered. - ADSTAT_L33 + LAN_PLUGIN_LOG_CONFIGURE - ADSTAT_L34 + LAN_PLUGIN_LOG_LINK 0 diff --git a/e107_plugins/pm/pm_shortcodes.php b/e107_plugins/pm/pm_shortcodes.php index 749493c1c..20e0648ae 100755 --- a/e107_plugins/pm/pm_shortcodes.php +++ b/e107_plugins/pm/pm_shortcodes.php @@ -175,13 +175,13 @@ class pm_handler_shortcodes public function sc_pm_post_button() { - return ""; + return ""; } public function sc_pm_preview_button() { - return ""; + return ""; }