From 9c6cfc0b86716b8e5a62ee241a19ef850922e44a Mon Sep 17 00:00:00 2001 From: Cameron Date: Fri, 10 Jul 2015 15:41:07 -0700 Subject: [PATCH] Issue #6 Language-file optimization. --- class2.php | 1 + e107_admin/lancheck.php | 7 +++--- e107_admin/language.php | 8 +++---- e107_core/templates/search_template.php | 4 ++-- e107_handlers/language_class.php | 23 +++++++++++++++++++ e107_languages/English/English.php | 1 + e107_languages/English/lan_search.php | 2 +- .../search_menu/languages/English.php | 14 ----------- e107_plugins/search_menu/search_menu.php | 10 ++++---- search.php | 4 ++-- 10 files changed, 44 insertions(+), 30 deletions(-) delete mode 100644 e107_plugins/search_menu/languages/English.php diff --git a/class2.php b/class2.php index e7217f1fd..219f01eb6 100644 --- a/class2.php +++ b/class2.php @@ -641,6 +641,7 @@ if(is_readable($customLan2)) // FASTER - if exist, should be done 'once' by the } unset($customLan, $customLan2); +$lng->bcDefs(); // defined v1.x definitions for old templates. $sql->db_Mark_Time('Start: Global Language Files'); if(isset($pref['lan_global_list'])) diff --git a/e107_admin/lancheck.php b/e107_admin/lancheck.php index 0ccd4acd9..c9dc3d8b7 100644 --- a/e107_admin/lancheck.php +++ b/e107_admin/lancheck.php @@ -1269,7 +1269,7 @@ class lancheck else { $this->checkLog('file',1); - $this->newFile(e_LANGUAGEDIR.$checklan."/".$subdir.$lnk,$checklan); + // $this->newFile(e_LANGUAGEDIR.$checklan."/".$subdir.$lnk,$checklan); $text .= " {$lnk} ".LAN_CHECK_4.""; // file missing. @@ -1694,8 +1694,9 @@ class lancheck $f2 = $lan."_custom.php"; $root_file = e_LANGUAGEDIR.$lan."/".$lan."_custom.php"; } - - + + $this->newFile($dir2.$f2,$lan); + $writable = (is_writable($dir2)) ? TRUE : FALSE; $trans = $this->get_lan_file_phrases($dir1,$dir2,$f1,$f2); $keys = array_keys($trans); diff --git a/e107_admin/language.php b/e107_admin/language.php index a6f360472..732478d10 100644 --- a/e107_admin/language.php +++ b/e107_admin/language.php @@ -20,10 +20,10 @@ e107::coreLan('language', true); $e_sub_cat = 'language'; - if(!empty($_GET['iframe'])) - { - define('e_IFRAME', true); - } +if(!empty($_GET['iframe'])) +{ + define('e_IFRAME', true); +} diff --git a/e107_core/templates/search_template.php b/e107_core/templates/search_template.php index a381bc54a..544e68ca6 100644 --- a/e107_core/templates/search_template.php +++ b/e107_core/templates/search_template.php @@ -13,11 +13,11 @@ if(!isset($SEARCH_SHORTCODE)) { $SEARCH_SHORTCODE = " - "; + "; /* // Image Version Example $SEARCH_SHORTCODE = " - "; + "; */ } diff --git a/e107_handlers/language_class.php b/e107_handlers/language_class.php index 0d06ed471..59a0c54a6 100644 --- a/e107_handlers/language_class.php +++ b/e107_handlers/language_class.php @@ -665,4 +665,27 @@ class language{ return $this->list; } + + + + public function bcDefs() + { + + $bcList = array( + 'LAN_180' => 'LAN_SEARCH' + + ); + + + foreach($bcList as $old => $new) + { + if(!defined($old) && defined($new)) + { + define($old, constant($new)); + } + + } + + } + } diff --git a/e107_languages/English/English.php b/e107_languages/English/English.php index eda74a606..ca033909c 100644 --- a/e107_languages/English/English.php +++ b/e107_languages/English/English.php @@ -112,6 +112,7 @@ define("LAN_TITLE", "Title"); define("LAN_USER", "User"); define("LAN_EMAIL","Email address"); define("LAN_WROTE", "wrote"); // as in John wrote.." "; +define("LAN_SEARCH", "Search"); define("LAN_ENTER_USRNAME_EMAIL", "Please enter your username or email"); // admin php hover field admin name define("LAN_PWD_REQUIRED", "Password is required"); // admin php hover field admin password diff --git a/e107_languages/English/lan_search.php b/e107_languages/English/lan_search.php index a7729af50..0ea28ee82 100644 --- a/e107_languages/English/lan_search.php +++ b/e107_languages/English/lan_search.php @@ -9,7 +9,7 @@ define("PAGE_NAME", "Search"); define("LAN_140", "Members"); -define("LAN_180", "Search"); +// define("LAN_180", "Search"); define("LAN_192", "All categories"); define("LAN_193", "Event Calendar"); define("LAN_194", "All Categories"); diff --git a/e107_plugins/search_menu/languages/English.php b/e107_plugins/search_menu/languages/English.php deleted file mode 100644 index 6cf72ac36..000000000 --- a/e107_plugins/search_menu/languages/English.php +++ /dev/null @@ -1,14 +0,0 @@ - \ No newline at end of file diff --git a/e107_plugins/search_menu/search_menu.php b/e107_plugins/search_menu/search_menu.php index 022be9359..f86acc0b5 100644 --- a/e107_plugins/search_menu/search_menu.php +++ b/e107_plugins/search_menu/search_menu.php @@ -16,7 +16,9 @@ if (!defined('e107_INIT')) { exit; } -include_lan(e_PLUGIN."search_menu/languages/".e_LANGUAGE.".php"); +// include_lan(e_PLUGIN."search_menu/languages/".e_LANGUAGE.".php"); + + if (strstr(e_PAGE, "news.php")) { $page = 0; } elseif(strstr(e_PAGE, "comment.php")) { @@ -46,11 +48,11 @@ if (isset($custom_query[1]) && $custom_query[1] != '') $image_file = ($custom_query[1] != 'default') ? $custom_query[1] : e_PLUGIN_ABS.'search_menu/images/search.png'; $width = (isset($custom_query[2]) && $custom_query[2]) ? $custom_query[2] : '16'; $height = (isset($custom_query[3]) && $custom_query[3]) ? $custom_query[3] : '16'; - $search_button = ""; + $search_button = ""; } else { - $search_button = ""; + $search_button = ""; } if (isset($custom_query[5]) && $custom_query[5]) { @@ -108,6 +110,6 @@ if (isset($searchflat) && $searchflat) { echo $text; } else { - $ns->tablerender(LAN_180." ".SITENAME, "
".$text."
", 'search'); + $ns->tablerender(LAN_SEARCH." ".SITENAME, "
".$text."
", 'search'); } ?> \ No newline at end of file diff --git a/search.php b/search.php index 8367bb3d6..2ec4d86b1 100644 --- a/search.php +++ b/search.php @@ -174,7 +174,7 @@ class search extends e_shortcode function sc_search_main_submit($parm='') { - return " + return " "; } @@ -1110,7 +1110,7 @@ if ($search_prefs['selector'] == 1) $SEARCH_VARS->SEARCH_MAIN_UNCHECKALL = ""; } */ -//$SEARCH_VARS->SEARCH_MAIN_SUBMIT = ""; +//$SEARCH_VARS->SEARCH_MAIN_SUBMIT = ""; //$SEARCH_VARS->ENHANCED_ICON = "".LAN_SEARCH_23."";