From 43d0211590ed221bd4b085091309fc93af1d4721 Mon Sep 17 00:00:00 2001 From: Cameron Date: Mon, 23 Jan 2017 09:41:23 -0800 Subject: [PATCH] Code cleanup: deprecated include_lan() --- comment.php | 2 +- contact.php | 2 +- e107_admin/admin_log.php | 4 ++-- e107_admin/cpage.php | 2 +- e107_admin/language.php | 2 +- e107_admin/prefs.php | 2 +- e107_admin/update_routines.php | 2 +- e107_core/bbcodes/quote.bb | 2 +- e107_core/shortcodes/single/custom.php | 2 +- e107_core/shortcodes/single/email.sc | 2 +- e107_core/shortcodes/single/search.sc | 2 +- e107_core/shortcodes/single/user_extended.php | 2 +- e107_core/shortcodes/single/user_extended_old.sc | 4 ++-- e107_handlers/comment_class.php | 2 +- e107_handlers/date_handler.php | 2 +- e107_handlers/db_verify_class.php | 2 +- e107_handlers/e107_class.php | 2 +- e107_handlers/emailprint_class.php | 4 ++-- e107_handlers/login.php | 2 +- e107_handlers/mail_manager_class.php | 2 +- e107_handlers/media_class.php | 2 +- e107_handlers/notify_class.php | 2 +- e107_handlers/rate_class.php | 2 +- e107_handlers/sitelinks_class.php | 2 +- e107_handlers/theme_handler.php | 6 +++--- e107_handlers/upload_handler.php | 2 +- e107_handlers/user_handler.php | 2 +- e107_handlers/user_select_class.php | 2 +- e107_handlers/userclass_class.php | 2 +- e107_plugins/alt_auth/alt_auth_conf.php | 4 ++-- e107_plugins/alt_auth/e107db_conf.php | 4 ++-- e107_plugins/alt_auth/e_help.php | 6 +++--- e107_plugins/alt_auth/importdb_conf.php | 4 ++-- e107_plugins/alt_auth/ldap_conf.php | 4 ++-- e107_plugins/alt_auth/otherdb_conf.php | 4 ++-- e107_plugins/alt_auth/radius_conf.php | 4 ++-- e107_plugins/banner/e_help.php | 2 +- e107_plugins/blogcalendar_menu/archive.php | 2 +- e107_plugins/blogcalendar_menu/config.php | 2 +- e107_plugins/clock_menu/config.php | 2 +- e107_plugins/comment_menu/config.php | 2 +- e107_plugins/forum/forum_mod.php | 2 +- e107_plugins/list_new/list_class.php | 2 +- e107_plugins/log/admin_config.php | 4 ++-- e107_plugins/log/e_help.php | 2 +- e107_plugins/log/stats_csv.php | 2 +- e107_plugins/login_menu/config.php | 2 +- e107_plugins/metaweblog/admin_config.php | 2 +- e107_plugins/metaweblog/e_help.php | 2 +- e107_plugins/newforumposts_main/admin_config.php | 2 +- e107_plugins/newforumposts_main/newforumposts_main.php | 2 +- e107_plugins/news/news.php | 4 ++-- e107_plugins/newsfeed/e_help.php | 2 +- e107_plugins/newsfeed/newsfeed.php | 2 +- e107_plugins/newsfeed/newsfeed_menu.php | 2 +- e107_plugins/newsletter/e_mailout.php | 2 +- e107_plugins/newsletter/nl_archive.php | 2 +- e107_plugins/online/config.php | 2 +- e107_plugins/online/lastseen_menu.php | 2 +- e107_plugins/online/online_menu.php | 2 +- e107_plugins/pm/e_cron.php | 2 +- e107_plugins/pm/e_shortcode.php | 2 +- e107_plugins/pm/pm.php | 2 +- e107_plugins/pm/pm_shortcodes.php | 2 +- e107_plugins/poll/admin_config.php | 2 +- e107_plugins/poll/oldpolls.php | 2 +- e107_plugins/poll/poll_class.php | 2 +- e107_plugins/poll/poll_menu.php | 2 +- e107_plugins/rss_menu/admin_prefs.php | 2 +- e107_plugins/rss_menu/rss.php | 2 +- e107_plugins/trackback/admin_config.php | 2 +- e107_plugins/user/usertheme_menu_config.php | 2 +- e107_themes/bootstrap3/theme_shortcodes.php | 2 +- e107_themes/voux/theme_shortcodes.php | 2 +- email.php | 2 +- login.php | 2 +- membersonly.php | 2 +- news.php | 4 ++-- online.php | 2 +- rate.php | 2 +- signup.php | 4 ++-- sitedown.php | 2 +- submitnews.php | 2 +- upload.php | 2 +- user.php | 2 +- usersettings.php | 6 +++--- 86 files changed, 105 insertions(+), 105 deletions(-) diff --git a/comment.php b/comment.php index 0b406ece6..3c1376b7d 100644 --- a/comment.php +++ b/comment.php @@ -22,7 +22,7 @@ */ require_once('class2.php'); -include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE); +e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE); if (vartrue(e107::getPref('comments_disabled'))) { diff --git a/contact.php b/contact.php index 757202ce4..989bc271c 100644 --- a/contact.php +++ b/contact.php @@ -24,7 +24,7 @@ if(!check_class($active) && empty($contactInfo)) require_once(e_HANDLER."secure_img_handler.php"); $sec_img = new secure_image; -include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE); +e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE); define('PAGE_NAME', LANCONTACT_00); diff --git a/e107_admin/admin_log.php b/e107_admin/admin_log.php index 7d376f7b7..b29f2ba9d 100644 --- a/e107_admin/admin_log.php +++ b/e107_admin/admin_log.php @@ -40,7 +40,7 @@ if(is_array($pref['lan_log_list'])) //... and for any plugins which support it // echo "orig = ".$file." "; //e107::lan($path,'log',true); - include_lan(e_PLUGIN.$path.'/languages/'.$file); + e107::includeLan(e_PLUGIN.$path.'/languages/'.$file); } } @@ -861,7 +861,7 @@ if(is_array($pref['lan_log_list'])) //... and for any plugins which support it // echo "orig = ".$file." "; //e107::lan($path,'log',true); - include_lan(e_PLUGIN.$path.'/languages/'.$file); + e107::includeLan(e_PLUGIN.$path.'/languages/'.$file); } } diff --git a/e107_admin/cpage.php b/e107_admin/cpage.php index 1bad12573..68ca99ea9 100644 --- a/e107_admin/cpage.php +++ b/e107_admin/cpage.php @@ -20,7 +20,7 @@ e107::css('inline'," "); e107::coreLan('cpage', true); -include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_page.php'); +e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_page.php'); $e_sub_cat = 'custom'; diff --git a/e107_admin/language.php b/e107_admin/language.php index 2859733f1..63687cc7e 100644 --- a/e107_admin/language.php +++ b/e107_admin/language.php @@ -634,7 +634,7 @@ require_once ("auth.php"); $frm = e107::getForm(); $mes = e107::getMessage(); -include_lan(e_LANGUAGEDIR.e_LANGUAGE."/admin/lan_lancheck.php"); +e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE."/admin/lan_lancheck.php"); require_once(e_ADMIN."lancheck.php"); require_once(e_HANDLER."language_class.php"); diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php index a116f6f90..a5737ed54 100644 --- a/e107_admin/prefs.php +++ b/e107_admin/prefs.php @@ -1575,7 +1575,7 @@ $text .= " // File Uploads - include_lan(e_LANGUAGEDIR.e_LANGUAGE."/admin/lan_upload.php"); + e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE."/admin/lan_upload.php"); require_once(e_HANDLER."upload_handler.php"); diff --git a/e107_admin/update_routines.php b/e107_admin/update_routines.php index 0ffab483a..68b8755b5 100644 --- a/e107_admin/update_routines.php +++ b/e107_admin/update_routines.php @@ -21,7 +21,7 @@ require_once('../class2.php'); require_once(e_HANDLER.'db_table_admin_class.php'); -include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_e107_update.php'); +e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_e107_update.php'); // Modified update routine - combines checking and update code into one block per function // - reduces code size typically 30%. // - keeping check and update code together should improve clarity/reduce mis-types etc diff --git a/e107_core/bbcodes/quote.bb b/e107_core/bbcodes/quote.bb index 292dc74ce..4a7270705 100644 --- a/e107_core/bbcodes/quote.bb +++ b/e107_core/bbcodes/quote.bb @@ -1,6 +1,6 @@ //getClass('quote'); -include_lan(e_LANGUAGEDIR.e_LANGUAGE."/lan_parser_functions.php"); +e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE."/lan_parser_functions.php"); if(deftrue('BOOTSTRAP')) { diff --git a/e107_core/shortcodes/single/custom.php b/e107_core/shortcodes/single/custom.php index cc628efd4..2e632d2dc 100644 --- a/e107_core/shortcodes/single/custom.php +++ b/e107_core/shortcodes/single/custom.php @@ -9,7 +9,7 @@ function custom_shortcode($parm) { case 'login': case 'login noprofile': - include_lan(e_PLUGIN.'login_menu/languages/'.e_LANGUAGE.'.php'); + e107::includeLan(e_PLUGIN.'login_menu/languages/'.e_LANGUAGE.'.php'); $ret = ''; $sep = (defined('LOGINC_SEP')) ? LOGINC_SEP : ".:."; diff --git a/e107_core/shortcodes/single/email.sc b/e107_core/shortcodes/single/email.sc index b2eacb001..43a6e319e 100644 --- a/e107_core/shortcodes/single/email.sc +++ b/e107_core/shortcodes/single/email.sc @@ -1,4 +1,4 @@ -include_lan(e_LANGUAGEDIR.e_LANGUAGE."/lan_user.php"); +e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE."/lan_user.php"); global $tp; if (substr($parm, -5) == '-link') diff --git a/e107_core/shortcodes/single/search.sc b/e107_core/shortcodes/single/search.sc index 1b992e290..0675eb171 100644 --- a/e107_core/shortcodes/single/search.sc +++ b/e107_core/shortcodes/single/search.sc @@ -1,7 +1,7 @@ //.[text|value|icon|text_value].} * EXAMPLE: {USER_EXTENDED=user_gender.value.5} will show the value of the extended field user_gender for user #5 */ -include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_user_extended.php'); +e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_user_extended.php'); $parms = explode('.', $parm); global $currentUser, $tp, $loop_uid, $e107, $sc_style; if(isset($loop_uid) && intval($loop_uid) == 0) { return ''; } @@ -49,7 +49,7 @@ if($udata['user_admin'] == 1) /** * @todo - must be a better way of picking up the 'Miscellaneous' category */ -include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_user.php'); +e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_user.php'); if (($parms[1] != 'icon') && ($parms[0] != LAN_USER_44)) { $ret_cause = 0; diff --git a/e107_handlers/comment_class.php b/e107_handlers/comment_class.php index c4cb75263..ca2233937 100644 --- a/e107_handlers/comment_class.php +++ b/e107_handlers/comment_class.php @@ -16,7 +16,7 @@ if (!defined('e107_INIT')) { exit; } -include_lan(e_LANGUAGEDIR.e_LANGUAGE."/lan_comment.php"); +e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE."/lan_comment.php"); global $comment_shortcodes; require_once (e_CORE."shortcodes/batch/comment_shortcodes.php"); /** diff --git a/e107_handlers/date_handler.php b/e107_handlers/date_handler.php index 902886759..0f788d1f7 100644 --- a/e107_handlers/date_handler.php +++ b/e107_handlers/date_handler.php @@ -14,7 +14,7 @@ */ if (!defined('e107_INIT')) { exit; } -include_lan(e_LANGUAGEDIR.e_LANGUAGE."/lan_date.php"); +e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE."/lan_date.php"); class convert { diff --git a/e107_handlers/db_verify_class.php b/e107_handlers/db_verify_class.php index 7e10a28e1..aea5091b6 100644 --- a/e107_handlers/db_verify_class.php +++ b/e107_handlers/db_verify_class.php @@ -17,7 +17,7 @@ if (!defined('e107_INIT')) { exit; } -include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_db_verify.php'); +e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_db_verify.php'); class db_verify { diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php index 94a260947..ee112ee8d 100644 --- a/e107_handlers/e107_class.php +++ b/e107_handlers/e107_class.php @@ -2764,7 +2764,7 @@ class e107 /** * Load language file, replacement of include_lan() - * + * @outdated use e107::lan() or e107::coreLan(), e107::plugLan(), e107::themeLan() * @param string $path * @param boolean $force * @return string diff --git a/e107_handlers/emailprint_class.php b/e107_handlers/emailprint_class.php index 56324e6a2..9caa8dde8 100644 --- a/e107_handlers/emailprint_class.php +++ b/e107_handlers/emailprint_class.php @@ -16,8 +16,8 @@ if (!defined('e107_INIT')) { exit; } -include_lan(e_LANGUAGEDIR.e_LANGUAGE."/lan_print.php"); -include_lan(e_LANGUAGEDIR.e_LANGUAGE."/lan_email.php"); +e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE."/lan_print.php"); +e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE."/lan_email.php"); class emailprint { diff --git a/e107_handlers/login.php b/e107_handlers/login.php index 839ca0c33..acc1ccab2 100644 --- a/e107_handlers/login.php +++ b/e107_handlers/login.php @@ -15,7 +15,7 @@ if (!defined('e107_INIT')) { exit; } // require_once(e_HANDLER.'user_handler.php'); //shouldn't be necessary -include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_login.php'); +e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_login.php'); // TODO - class constants define ('LOGIN_TRY_OTHER', 2); // Try some other authentication method diff --git a/e107_handlers/mail_manager_class.php b/e107_handlers/mail_manager_class.php index 93b4d9030..59a93c0db 100644 --- a/e107_handlers/mail_manager_class.php +++ b/e107_handlers/mail_manager_class.php @@ -97,7 +97,7 @@ Variables relating to DB values all begin 'mail_' - others are internal (volatil if (!defined('e107_INIT')) { exit; } -include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_mailout.php'); // May be needed by anything loading this class +e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_mailout.php'); // May be needed by anything loading this class define('MAIL_STATUS_SENT', 0); // Mail sent. Email handler happy, but may have bounced (or may be yet to bounce) define('MAIL_STATUS_BOUNCED', 1); diff --git a/e107_handlers/media_class.php b/e107_handlers/media_class.php index adc0acdb0..d43fd0309 100644 --- a/e107_handlers/media_class.php +++ b/e107_handlers/media_class.php @@ -37,7 +37,7 @@ class e_media $this->logging = true; } - include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_image.php'); + e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_image.php'); } diff --git a/e107_handlers/notify_class.php b/e107_handlers/notify_class.php index 5b14eddac..784384132 100644 --- a/e107_handlers/notify_class.php +++ b/e107_handlers/notify_class.php @@ -23,7 +23,7 @@ class notify function __construct() { - include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_notify.php'); + e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_notify.php'); if(empty($this->notify_prefs)) { diff --git a/e107_handlers/rate_class.php b/e107_handlers/rate_class.php index f58fbc10d..fb6e6092c 100644 --- a/e107_handlers/rate_class.php +++ b/e107_handlers/rate_class.php @@ -11,7 +11,7 @@ if (!defined('e107_INIT')) { exit; } -include_lan(e_LANGUAGEDIR.e_LANGUAGE."/lan_rate.php"); +e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE."/lan_rate.php"); class rater { diff --git a/e107_handlers/sitelinks_class.php b/e107_handlers/sitelinks_class.php index f657a5138..7067ff9f7 100644 --- a/e107_handlers/sitelinks_class.php +++ b/e107_handlers/sitelinks_class.php @@ -9,7 +9,7 @@ */ if (!defined('e107_INIT')) { exit; } -include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_sitelinks.php'); +e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_sitelinks.php'); class sitelinks { diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php index 12d77b775..dfa2cc876 100644 --- a/e107_handlers/theme_handler.php +++ b/e107_handlers/theme_handler.php @@ -653,7 +653,7 @@ class themeHandler { $key = key($_POST['installplugin']); - include_lan(e_LANGUAGEDIR.e_LANGUAGE."/admin/lan_plugin.php"); + e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE."/admin/lan_plugin.php"); require_once (e_HANDLER."plugin_class.php"); $eplug = new e107plugin; @@ -664,7 +664,7 @@ class themeHandler if(isset($_POST['setMenuPreset'])) { $key = key($_POST['setMenuPreset']); - include_lan(e_LANGUAGEDIR.e_LANGUAGE."/admin/lan_menus.php"); + e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE."/admin/lan_menus.php"); require_once (e_HANDLER."menumanager_class.php"); $men = new e_menuManager(); $men->curLayout = $key; @@ -2290,7 +2290,7 @@ class themeHandler function showPreview() { - include_lan(e_LANGUAGEDIR.e_LANGUAGE."/admin/lan_theme.php"); + e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE."/admin/lan_theme.php"); $text = "
".TPVLAN_1.".

"; global $ns; $ns->tablerender(TPVLAN_2, $text); diff --git a/e107_handlers/upload_handler.php b/e107_handlers/upload_handler.php index 936b53926..5735d1582 100644 --- a/e107_handlers/upload_handler.php +++ b/e107_handlers/upload_handler.php @@ -30,7 +30,7 @@ if (!defined('e107_INIT')) exit; } -include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_upload_handler.php'); +e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_upload_handler.php'); //define("UH_DEBUG",TRUE); diff --git a/e107_handlers/user_handler.php b/e107_handlers/user_handler.php index c21ac88f0..7097a530a 100644 --- a/e107_handlers/user_handler.php +++ b/e107_handlers/user_handler.php @@ -46,7 +46,7 @@ define ('PASSWORD_DEFAULT_TYPE',PASSWORD_E107_MD5); //define ('PASSWORD_DEFAULT_TYPE',PASSWORD_E107_SALT); // Required language file - if not loaded elsewhere, uncomment next line -include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_user.php'); +e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_user.php'); class UserHandler { diff --git a/e107_handlers/user_select_class.php b/e107_handlers/user_select_class.php index 0e2a8f988..7362309f0 100644 --- a/e107_handlers/user_select_class.php +++ b/e107_handlers/user_select_class.php @@ -15,7 +15,7 @@ /* @DEPRECATED - SUBJECT TO REMOVAL */ // Possible replacements: $frm->userpicker(); -include_lan(e_LANGUAGEDIR.e_LANGUAGE."/lan_user_select.php"); +e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE."/lan_user_select.php"); class user_select { diff --git a/e107_handlers/userclass_class.php b/e107_handlers/userclass_class.php index b18ab31b4..760dde674 100644 --- a/e107_handlers/userclass_class.php +++ b/e107_handlers/userclass_class.php @@ -21,7 +21,7 @@ if (!defined('e107_INIT')) { exit; } -include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_userclass.php'); +e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_userclass.php'); /* diff --git a/e107_plugins/alt_auth/alt_auth_conf.php b/e107_plugins/alt_auth/alt_auth_conf.php index 2361df210..8598accbb 100755 --- a/e107_plugins/alt_auth/alt_auth_conf.php +++ b/e107_plugins/alt_auth/alt_auth_conf.php @@ -37,7 +37,7 @@ if(!getperms('P') || !e107::isInstalled('alt_auth')) require_once(e_HANDLER.'form_handler.php'); $frm = e107::getForm(); require_once(e_ADMIN.'auth.php'); -include_lan(e_PLUGIN.'alt_auth/languages/'.e_LANGUAGE.'/admin_alt_auth.php'); +e107::includeLan(e_PLUGIN.'alt_auth/languages/'.e_LANGUAGE.'/admin_alt_auth.php'); define('ALT_AUTH_ACTION', 'main'); require_once(e_PLUGIN.'alt_auth/alt_auth_adminmenu.php'); require_once(e_HANDLER.'user_extended_class.php'); @@ -178,7 +178,7 @@ $ns->tablerender(LAN_ALT_3, $text); if ($euf->userCount) { - include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_user_extended.php'); + e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_user_extended.php'); $fl = &$euf->fieldDefinitions; $text = "
diff --git a/e107_plugins/alt_auth/e107db_conf.php b/e107_plugins/alt_auth/e107db_conf.php index 12462d581..e612bc567 100644 --- a/e107_plugins/alt_auth/e107db_conf.php +++ b/e107_plugins/alt_auth/e107db_conf.php @@ -23,8 +23,8 @@ $eplug_admin = true; require_once('../../class2.php'); require_once(e_ADMIN.'auth.php'); require_once(e_HANDLER.'form_handler.php'); -include_lan(e_PLUGIN.'alt_auth/languages/'.e_LANGUAGE.'/admin_e107db_conf.php'); -include_lan(e_PLUGIN.'alt_auth/languages/'.e_LANGUAGE.'/admin_alt_auth.php'); +e107::includeLan(e_PLUGIN.'alt_auth/languages/'.e_LANGUAGE.'/admin_e107db_conf.php'); +e107::includeLan(e_PLUGIN.'alt_auth/languages/'.e_LANGUAGE.'/admin_alt_auth.php'); define('ALT_AUTH_ACTION', 'e107db'); require_once(e_PLUGIN.'alt_auth/alt_auth_adminmenu.php'); require_once(e_PLUGIN.'alt_auth/extended_password_handler.php'); diff --git a/e107_plugins/alt_auth/e_help.php b/e107_plugins/alt_auth/e_help.php index 13ad6a423..cf43e1b34 100644 --- a/e107_plugins/alt_auth/e_help.php +++ b/e107_plugins/alt_auth/e_help.php @@ -28,13 +28,13 @@ define('ALT_AUTH_PATH', e_PLUGIN.'alt_auth/'); if (e_PAGE == 'alt_auth_conf.php') { - include_lan(ALT_AUTH_PATH.'languages/'.e_LANGUAGE.'/admin_alt_auth.php'); + e107::includeLan(ALT_AUTH_PATH.'languages/'.e_LANGUAGE.'/admin_alt_auth.php'); $ns -> tablerender('help',LAN_ALT_AUTH_HELP); } else { - include_lan(ALT_AUTH_PATH.'languages/'.e_LANGUAGE.'/admin_'.e_PAGE); - if (!defined('LAN_ALT_VALIDATE_HELP')) include_lan(ALT_AUTH_PATH.'languages/'.e_LANGUAGE.'/admin_alt_auth.php'); + e107::includeLan(ALT_AUTH_PATH.'languages/'.e_LANGUAGE.'/admin_'.e_PAGE); + if (!defined('LAN_ALT_VALIDATE_HELP')) e107::includeLan(ALT_AUTH_PATH.'languages/'.e_LANGUAGE.'/admin_alt_auth.php'); $ns -> tablerender('help',LAN_AUTHENTICATE_HELP.'

'.(defined('SHOW_COPY_HELP') ? LAN_ALT_COPY_HELP : '').(defined('SHOW_CONVERSION_HELP') ? LAN_ALT_CONVERSION_HELP : '').LAN_ALT_VALIDATE_HELP); } diff --git a/e107_plugins/alt_auth/importdb_conf.php b/e107_plugins/alt_auth/importdb_conf.php index c4c7a7c2e..d9350e2ff 100644 --- a/e107_plugins/alt_auth/importdb_conf.php +++ b/e107_plugins/alt_auth/importdb_conf.php @@ -25,8 +25,8 @@ $eplug_admin = true; require_once('../../class2.php'); require_once(e_ADMIN.'auth.php'); require_once(e_HANDLER.'form_handler.php'); -include_lan(e_PLUGIN.'alt_auth/languages/'.e_LANGUAGE.'/admin_importdb_conf.php'); -include_lan(e_PLUGIN.'alt_auth/languages/'.e_LANGUAGE.'/admin_alt_auth.php'); +e107::includeLan(e_PLUGIN.'alt_auth/languages/'.e_LANGUAGE.'/admin_importdb_conf.php'); +e107::includeLan(e_PLUGIN.'alt_auth/languages/'.e_LANGUAGE.'/admin_alt_auth.php'); define('ALT_AUTH_ACTION', 'importdb'); require_once(e_PLUGIN.'alt_auth/alt_auth_adminmenu.php'); require_once(e_PLUGIN.'alt_auth/extended_password_handler.php'); diff --git a/e107_plugins/alt_auth/ldap_conf.php b/e107_plugins/alt_auth/ldap_conf.php index 2dbd4dd63..9ee37f13e 100755 --- a/e107_plugins/alt_auth/ldap_conf.php +++ b/e107_plugins/alt_auth/ldap_conf.php @@ -24,8 +24,8 @@ $eplug_admin = true; require_once('../../class2.php'); require_once(e_ADMIN.'auth.php'); require_once(e_HANDLER.'form_handler.php'); -include_lan(e_PLUGIN.'alt_auth/languages/'.e_LANGUAGE.'/admin_ldap_conf.php'); -include_lan(e_PLUGIN.'alt_auth/languages/'.e_LANGUAGE.'/admin_alt_auth.php'); +e107::includeLan(e_PLUGIN.'alt_auth/languages/'.e_LANGUAGE.'/admin_ldap_conf.php'); +e107::includeLan(e_PLUGIN.'alt_auth/languages/'.e_LANGUAGE.'/admin_alt_auth.php'); define('ALT_AUTH_ACTION', 'ldap'); require_once(e_PLUGIN.'alt_auth/alt_auth_adminmenu.php'); diff --git a/e107_plugins/alt_auth/otherdb_conf.php b/e107_plugins/alt_auth/otherdb_conf.php index 50738ee38..93c2c757a 100644 --- a/e107_plugins/alt_auth/otherdb_conf.php +++ b/e107_plugins/alt_auth/otherdb_conf.php @@ -24,8 +24,8 @@ $eplug_admin = true; require_once('../../class2.php'); require_once(e_ADMIN.'auth.php'); require_once(e_HANDLER.'form_handler.php'); -include_lan(e_PLUGIN.'alt_auth/languages/'.e_LANGUAGE.'/admin_otherdb_conf.php'); -include_lan(e_PLUGIN.'alt_auth/languages/'.e_LANGUAGE.'/admin_alt_auth.php'); +e107::includeLan(e_PLUGIN.'alt_auth/languages/'.e_LANGUAGE.'/admin_otherdb_conf.php'); +e107::includeLan(e_PLUGIN.'alt_auth/languages/'.e_LANGUAGE.'/admin_alt_auth.php'); define('ALT_AUTH_ACTION', 'otherdb'); require_once(e_PLUGIN.'alt_auth/alt_auth_adminmenu.php'); require_once(e_PLUGIN.'alt_auth/extended_password_handler.php'); diff --git a/e107_plugins/alt_auth/radius_conf.php b/e107_plugins/alt_auth/radius_conf.php index 5cb57fabb..e735dbe58 100644 --- a/e107_plugins/alt_auth/radius_conf.php +++ b/e107_plugins/alt_auth/radius_conf.php @@ -20,8 +20,8 @@ $eplug_admin = true; require_once("../../class2.php"); require_once(e_ADMIN."auth.php"); require_once(e_HANDLER."form_handler.php"); -include_lan(e_PLUGIN.'alt_auth/languages/'.e_LANGUAGE.'/admin_radius_conf.php'); -include_lan(e_PLUGIN.'alt_auth/languages/'.e_LANGUAGE.'/admin_alt_auth.php'); +e107::includeLan(e_PLUGIN.'alt_auth/languages/'.e_LANGUAGE.'/admin_radius_conf.php'); +e107::includeLan(e_PLUGIN.'alt_auth/languages/'.e_LANGUAGE.'/admin_alt_auth.php'); define("ALT_AUTH_ACTION", "radius"); require_once(e_PLUGIN."alt_auth/alt_auth_adminmenu.php"); $mes = e107::getMessage(); diff --git a/e107_plugins/banner/e_help.php b/e107_plugins/banner/e_help.php index 920a17e0f..aef545643 100644 --- a/e107_plugins/banner/e_help.php +++ b/e107_plugins/banner/e_help.php @@ -15,7 +15,7 @@ if (!e107::isInstalled('banner')) return; } -include_lan(e_PLUGIN.'banner/languages/'.e_LANGUAGE.'admin_banner.php'); +e107::includeLan(e_PLUGIN.'banner/languages/'.e_LANGUAGE.'admin_banner.php'); $ns->tablerender(BNRLAN_HELP_01, BNRLAN_HELP_02); ?> diff --git a/e107_plugins/blogcalendar_menu/archive.php b/e107_plugins/blogcalendar_menu/archive.php index fc7de5d93..9c96b7aeb 100644 --- a/e107_plugins/blogcalendar_menu/archive.php +++ b/e107_plugins/blogcalendar_menu/archive.php @@ -20,7 +20,7 @@ require_once("../../class2.php"); require_once(e_HANDLER."userclass_class.php"); -include_lan(e_PLUGIN."blogcalendar_menu/languages/".e_LANGUAGE.".php"); +e107::includeLan(e_PLUGIN."blogcalendar_menu/languages/".e_LANGUAGE.".php"); require_once("calendar.php"); require_once("functions.php"); require_once(HEADERF); diff --git a/e107_plugins/blogcalendar_menu/config.php b/e107_plugins/blogcalendar_menu/config.php index 21e9ed25a..c9a829681 100644 --- a/e107_plugins/blogcalendar_menu/config.php +++ b/e107_plugins/blogcalendar_menu/config.php @@ -13,7 +13,7 @@ $eplug_admin = TRUE; require_once("../../class2.php"); require_once(e_HANDLER."userclass_class.php"); -include_lan(e_PLUGIN."blogcalendar_menu/languages/".e_LANGUAGE.".php"); +e107::includeLan(e_PLUGIN."blogcalendar_menu/languages/".e_LANGUAGE.".php"); if (!getperms("1")) { e107::redirect('admin'); diff --git a/e107_plugins/clock_menu/config.php b/e107_plugins/clock_menu/config.php index ba2302f6c..f56718880 100644 --- a/e107_plugins/clock_menu/config.php +++ b/e107_plugins/clock_menu/config.php @@ -19,7 +19,7 @@ if (!getperms('1')) exit ; } require_once(e_ADMIN.'auth.php'); -include_lan(e_PLUGIN.'clock_menu/languages/admin/'.e_LANGUAGE.'.php'); +e107::includeLan(e_PLUGIN.'clock_menu/languages/admin/'.e_LANGUAGE.'.php'); $frm = e107::getForm(); $mes = e107::getMessage(); diff --git a/e107_plugins/comment_menu/config.php b/e107_plugins/comment_menu/config.php index 71f5fa1f3..730b5b13b 100644 --- a/e107_plugins/comment_menu/config.php +++ b/e107_plugins/comment_menu/config.php @@ -14,7 +14,7 @@ $eplug_admin = TRUE; require_once("../../class2.php"); require_once(e_HANDLER."userclass_class.php"); -include_lan(e_PLUGIN."comment_menu/languages/".e_LANGUAGE.".php"); +e107::includeLan(e_PLUGIN."comment_menu/languages/".e_LANGUAGE.".php"); if (!getperms("1")) { e107::redirect('admin'); diff --git a/e107_plugins/forum/forum_mod.php b/e107_plugins/forum/forum_mod.php index 158fb0284..3b70547de 100644 --- a/e107_plugins/forum/forum_mod.php +++ b/e107_plugins/forum/forum_mod.php @@ -9,7 +9,7 @@ */ if (!defined('e107_INIT')) { exit(); } -include_lan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_forum_admin.php'); +e107::includeLan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_forum_admin.php'); function forum_thread_moderate($p) { diff --git a/e107_plugins/list_new/list_class.php b/e107_plugins/list_new/list_class.php index f23c436fd..2740d62f8 100644 --- a/e107_plugins/list_new/list_class.php +++ b/e107_plugins/list_new/list_class.php @@ -49,7 +49,7 @@ class listclass $this->e107 = e107::getInstance(); //language - include_lan($this->plugin_dir."languages/".e_LANGUAGE.".php"); + e107::includeLan($this->plugin_dir."languages/".e_LANGUAGE.".php"); //template if (is_readable(THEME."list_template.php")) diff --git a/e107_plugins/log/admin_config.php b/e107_plugins/log/admin_config.php index 1072ad67d..3a5e845be 100644 --- a/e107_plugins/log/admin_config.php +++ b/e107_plugins/log/admin_config.php @@ -88,8 +88,8 @@ if(e_AJAX_REQUEST && varset($_GET['action']) == 'rebuild') define('LogFlagFile', 'LogFlag.php'); -include_lan(e_PLUGIN.'log/languages/'.e_LANGUAGE.'.php'); -include_lan(e_PLUGIN.'log/languages/'.e_LANGUAGE.'_admin.php'); +e107::includeLan(e_PLUGIN.'log/languages/'.e_LANGUAGE.'.php'); +e107::includeLan(e_PLUGIN.'log/languages/'.e_LANGUAGE.'_admin.php'); if(!is_writable(e_LOG)) { diff --git a/e107_plugins/log/e_help.php b/e107_plugins/log/e_help.php index 62c9f7f1b..fd4d468d1 100644 --- a/e107_plugins/log/e_help.php +++ b/e107_plugins/log/e_help.php @@ -23,7 +23,7 @@ if (!defined('e107_INIT')) { exit; } -include_lan(e_PLUGIN.'log/languages/'.e_LANGUAGE."_log_help.php"); +e107::includeLan(e_PLUGIN.'log/languages/'.e_LANGUAGE."_log_help.php"); if (e_QUERY) list($action,$junk) = explode('.',e_QUERY); else $action = 'list'; diff --git a/e107_plugins/log/stats_csv.php b/e107_plugins/log/stats_csv.php index fb2ffd332..7198328b8 100644 --- a/e107_plugins/log/stats_csv.php +++ b/e107_plugins/log/stats_csv.php @@ -37,7 +37,7 @@ if (($action != 'export') || $params) exit; } -include_lan(e_PLUGIN.'log/languages/'.e_LANGUAGE.'_admin_log.php'); // LANs may be needed for error messages +e107::includeLan(e_PLUGIN.'log/languages/'.e_LANGUAGE.'_admin_log.php'); // LANs may be needed for error messages // List of the non-page-based info which is gathered - historically only 'all-time' stats, now we support monthly as well. (Here, only keys are used for validation) diff --git a/e107_plugins/login_menu/config.php b/e107_plugins/login_menu/config.php index 12a600ed4..c92a78e7d 100644 --- a/e107_plugins/login_menu/config.php +++ b/e107_plugins/login_menu/config.php @@ -32,7 +32,7 @@ if (!getperms('4')) exit() ; } -include_lan(e_PLUGIN.'login_menu/languages/'.e_LANGUAGE.'.php'); +e107::includeLan(e_PLUGIN.'login_menu/languages/'.e_LANGUAGE.'.php'); require_once(e_ADMIN.'auth.php'); require_once(e_PLUGIN.'login_menu/login_menu_class.php'); diff --git a/e107_plugins/metaweblog/admin_config.php b/e107_plugins/metaweblog/admin_config.php index fb42f7d5f..5288248a6 100644 --- a/e107_plugins/metaweblog/admin_config.php +++ b/e107_plugins/metaweblog/admin_config.php @@ -12,7 +12,7 @@ require_once("../../class2.php"); if(!getperms("P")){ e107::redirect('admin');exit; } -include_lan(e_PLUGIN."metaweblog/languages/".e_LANGUAGE.".php"); +e107::includeLan(e_PLUGIN."metaweblog/languages/".e_LANGUAGE.".php"); require_once(e_ADMIN."auth.php"); $text = "
".XMLRPC_HELP_011."
"; diff --git a/e107_plugins/metaweblog/e_help.php b/e107_plugins/metaweblog/e_help.php index fcd0d274e..4116d8cc8 100644 --- a/e107_plugins/metaweblog/e_help.php +++ b/e107_plugins/metaweblog/e_help.php @@ -3,7 +3,7 @@ // BEGIN CONFIGURATION AREA //--------------------------------------------------------------- if (!defined('e107_INIT')){ exit; } -include_lan(e_PLUGIN."metaweblog/languages/".e_LANGUAGE.".php"); +e107::includeLan(e_PLUGIN."metaweblog/languages/".e_LANGUAGE.".php"); $helptitle = XMLRPC_HELP_001; // diff --git a/e107_plugins/newforumposts_main/admin_config.php b/e107_plugins/newforumposts_main/admin_config.php index 5d8102f18..ea3d7e948 100644 --- a/e107_plugins/newforumposts_main/admin_config.php +++ b/e107_plugins/newforumposts_main/admin_config.php @@ -17,7 +17,7 @@ if(!getperms('1')) require_once (e_HANDLER.'userclass_class.php'); -include_lan(e_PLUGIN.'newforumposts_main/languages/'.e_LANGUAGE.'.php'); +e107::includeLan(e_PLUGIN.'newforumposts_main/languages/'.e_LANGUAGE.'.php'); require_once (e_ADMIN.'auth.php'); $frm = e107::getForm(); diff --git a/e107_plugins/newforumposts_main/newforumposts_main.php b/e107_plugins/newforumposts_main/newforumposts_main.php index ec553e765..955436f7d 100644 --- a/e107_plugins/newforumposts_main/newforumposts_main.php +++ b/e107_plugins/newforumposts_main/newforumposts_main.php @@ -18,7 +18,7 @@ if(!defined('e107_INIT')) { exit();} require_once (e_HANDLER.'userclass_class.php'); $query = ($pref['nfp_posts'] ? 'thread_lastpost' : 'thread_datestamp'); -include_lan(e_PLUGIN.'newforumposts_main/languages/'.e_LANGUAGE.'.php'); +e107::includeLan(e_PLUGIN.'newforumposts_main/languages/'.e_LANGUAGE.'.php'); $path = e_PLUGIN.'forum/'; global $sql, $ns; diff --git a/e107_plugins/news/news.php b/e107_plugins/news/news.php index cd7a4970c..6eccc4f47 100644 --- a/e107_plugins/news/news.php +++ b/e107_plugins/news/news.php @@ -40,8 +40,8 @@ class news_front { global $NEWSHEADER; - include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE); - include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_news.php'); // Temporary + e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE); + e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_news.php'); // Temporary $this->pref = e107::getPref(); diff --git a/e107_plugins/newsfeed/e_help.php b/e107_plugins/newsfeed/e_help.php index 020aeacc6..781a116c3 100644 --- a/e107_plugins/newsfeed/e_help.php +++ b/e107_plugins/newsfeed/e_help.php @@ -20,6 +20,6 @@ if (!e107::isInstalled('newsfeed')) return; } -include_lan(e_PLUGIN.'newsfeed/languages/'.e_LANGUAGE.'_admin_newsfeed.php'); +e107::includeLan(e_PLUGIN.'newsfeed/languages/'.e_LANGUAGE.'_admin_newsfeed.php'); $ns->tablerender(NFLAN_43, e107::getParser()->toHTML(NFLAN_42, true) ); ?> \ No newline at end of file diff --git a/e107_plugins/newsfeed/newsfeed.php b/e107_plugins/newsfeed/newsfeed.php index 543af12e3..00e54bddd 100644 --- a/e107_plugins/newsfeed/newsfeed.php +++ b/e107_plugins/newsfeed/newsfeed.php @@ -25,7 +25,7 @@ if (!e107::isInstalled('newsfeed')) exit; } -include_lan(e_PLUGIN.'newsfeed/languages/'.e_LANGUAGE.'_newsfeed.php'); +e107::includeLan(e_PLUGIN.'newsfeed/languages/'.e_LANGUAGE.'_newsfeed.php'); if(!class_exists('newsfeedClass')) { require(e_PLUGIN.'newsfeed/newsfeed_functions.php'); diff --git a/e107_plugins/newsfeed/newsfeed_menu.php b/e107_plugins/newsfeed/newsfeed_menu.php index 756273d35..dd5f962a7 100644 --- a/e107_plugins/newsfeed/newsfeed_menu.php +++ b/e107_plugins/newsfeed/newsfeed_menu.php @@ -20,7 +20,7 @@ if (!e107::isInstalled('newsfeed')) return ''; } -include_lan(e_PLUGIN.'newsfeed/languages/'.e_LANGUAGE.'_newsfeed.php'); +e107::includeLan(e_PLUGIN.'newsfeed/languages/'.e_LANGUAGE.'_newsfeed.php'); if(!class_exists('newsfeedClass')) { diff --git a/e107_plugins/newsletter/e_mailout.php b/e107_plugins/newsletter/e_mailout.php index 32c6a28f7..e185d6d1c 100644 --- a/e107_plugins/newsletter/e_mailout.php +++ b/e107_plugins/newsletter/e_mailout.php @@ -23,7 +23,7 @@ if (!defined('e107_INIT')) { exit; } -include_lan(e_PLUGIN.'/newsletter/languages/English_admin_newsletter.php'); +e107::includeLan(e_PLUGIN.'/newsletter/languages/English_admin_newsletter.php'); /* Class for newsletter mailout function diff --git a/e107_plugins/newsletter/nl_archive.php b/e107_plugins/newsletter/nl_archive.php index a31ef618c..c258d8042 100644 --- a/e107_plugins/newsletter/nl_archive.php +++ b/e107_plugins/newsletter/nl_archive.php @@ -16,7 +16,7 @@ if (!e107::isInstalled('newsletter') || !ADMIN) e107::redirect(); exit(); } -include_lan(e_PLUGIN.'newsletter/languages/'.e_LANGUAGE.'.php'); +e107::includeLan(e_PLUGIN.'newsletter/languages/'.e_LANGUAGE.'.php'); require_once(HEADERF); $sql = e107::getDb(); diff --git a/e107_plugins/online/config.php b/e107_plugins/online/config.php index 864a2f42c..f5484e945 100644 --- a/e107_plugins/online/config.php +++ b/e107_plugins/online/config.php @@ -12,7 +12,7 @@ $eplug_admin = TRUE; require_once('../../class2.php'); -include_lan(e_PLUGIN.'online/languages/'.e_LANGUAGE.'.php'); +e107::includeLan(e_PLUGIN.'online/languages/'.e_LANGUAGE.'.php'); if (!getperms('1')) { diff --git a/e107_plugins/online/lastseen_menu.php b/e107_plugins/online/lastseen_menu.php index 2f4149182..12de7faf2 100644 --- a/e107_plugins/online/lastseen_menu.php +++ b/e107_plugins/online/lastseen_menu.php @@ -16,7 +16,7 @@ if (!defined('e107_INIT')) { exit; } -include_lan(e_PLUGIN.'online/languages/'.e_LANGUAGE.'.php'); +e107::includeLan(e_PLUGIN.'online/languages/'.e_LANGUAGE.'.php'); if(class_exists('online_shortcodes')) { diff --git a/e107_plugins/online/online_menu.php b/e107_plugins/online/online_menu.php index 0418a7275..bd6a12566 100644 --- a/e107_plugins/online/online_menu.php +++ b/e107_plugins/online/online_menu.php @@ -17,7 +17,7 @@ global $menu_pref; $tp = e107::getParser(); -include_lan(e_PLUGIN.'online/languages/'.e_LANGUAGE.'.php'); +e107::includeLan(e_PLUGIN.'online/languages/'.e_LANGUAGE.'.php'); require_once(e_PLUGIN.'online/online_shortcodes.php'); $mode = empty($menu_pref['online_show_memberlist_extended']) ? 'default' : 'extended'; diff --git a/e107_plugins/pm/e_cron.php b/e107_plugins/pm/e_cron.php index 1d3fbee77..004758547 100644 --- a/e107_plugins/pm/e_cron.php +++ b/e107_plugins/pm/e_cron.php @@ -26,7 +26,7 @@ if (!defined('e107_INIT')) { exit; } -include_lan(e_PLUGIN.'/pm/languages/English_mailer.php'); +e107::includeLan(e_PLUGIN.'/pm/languages/English_mailer.php'); class pm_cron // include plugin-folder in the name. { diff --git a/e107_plugins/pm/e_shortcode.php b/e107_plugins/pm/e_shortcode.php index 889d9752d..9686205dd 100644 --- a/e107_plugins/pm/e_shortcode.php +++ b/e107_plugins/pm/e_shortcode.php @@ -23,7 +23,7 @@ class pm_shortcodes extends e_shortcode function __construct() { - include_lan(e_PLUGIN.'pm/languages/'.e_LANGUAGE.'.php'); + e107::includeLan(e_PLUGIN.'pm/languages/'.e_LANGUAGE.'.php'); require_once(e_PLUGIN."pm/pm_func.php"); $this->pm = new pmbox_manager(); diff --git a/e107_plugins/pm/pm.php b/e107_plugins/pm/pm.php index 946c08100..dd2797309 100755 --- a/e107_plugins/pm/pm.php +++ b/e107_plugins/pm/pm.php @@ -40,7 +40,7 @@ if(vartrue($_POST['keyword'])) e107::css('pm','pm.css'); require_once(e_PLUGIN.'pm/pm_class.php'); require_once(e_PLUGIN.'pm/pm_func.php'); -include_lan(e_PLUGIN.'pm/languages/'.e_LANGUAGE.'.php'); +e107::includeLan(e_PLUGIN.'pm/languages/'.e_LANGUAGE.'.php'); e107::getScParser(); // require_once(e_PLUGIN.'pm/shortcodes/batch/pm_shortcodes.php'); diff --git a/e107_plugins/pm/pm_shortcodes.php b/e107_plugins/pm/pm_shortcodes.php index dc0f72283..d2f2fc912 100644 --- a/e107_plugins/pm/pm_shortcodes.php +++ b/e107_plugins/pm/pm_shortcodes.php @@ -28,7 +28,7 @@ //if (!defined('e107_INIT')) { exit; } -include_lan(e_PLUGIN.'pm/languages/'.e_LANGUAGE.'.php'); +e107::includeLan(e_PLUGIN.'pm/languages/'.e_LANGUAGE.'.php'); include_once(e_PLUGIN.'pm/pm_func.php'); // register_shortcode('pm_handler_shortcodes', true); diff --git a/e107_plugins/poll/admin_config.php b/e107_plugins/poll/admin_config.php index 4db764403..63115174d 100644 --- a/e107_plugins/poll/admin_config.php +++ b/e107_plugins/poll/admin_config.php @@ -17,7 +17,7 @@ if (!getperms("P") || !e107::isInstalled('poll')) } $e_sub_cat = 'poll'; -include_lan(e_PLUGIN.'poll/languages/'.e_LANGUAGE.'_admin_poll.php'); +e107::includeLan(e_PLUGIN.'poll/languages/'.e_LANGUAGE.'_admin_poll.php'); require_once(e_ADMIN."auth.php"); require_once(e_PLUGIN."poll/poll_class.php"); require_once(e_HANDLER."userclass_class.php"); diff --git a/e107_plugins/poll/oldpolls.php b/e107_plugins/poll/oldpolls.php index e769fdf63..d3e3686b5 100644 --- a/e107_plugins/poll/oldpolls.php +++ b/e107_plugins/poll/oldpolls.php @@ -23,7 +23,7 @@ if(!defined("USER_WIDTH") && !deftrue('BOOTSTRAP')) define("USER_WIDTH","width:95%"); } -include_lan(e_PLUGIN."poll/languages/".e_LANGUAGE.".php"); +e107::includeLan(e_PLUGIN."poll/languages/".e_LANGUAGE.".php"); if(e_QUERY) { diff --git a/e107_plugins/poll/poll_class.php b/e107_plugins/poll/poll_class.php index bd77293d8..26b92ad52 100644 --- a/e107_plugins/poll/poll_class.php +++ b/e107_plugins/poll/poll_class.php @@ -10,7 +10,7 @@ if (!defined('e107_INIT')) { exit; } -include_lan(e_PLUGIN.'poll/languages/'.e_LANGUAGE.'.php'); +e107::includeLan(e_PLUGIN.'poll/languages/'.e_LANGUAGE.'.php'); define('POLLCLASS', TRUE); define('POLL_MODE_COOKIE', 0); define('POLL_MODE_IP', 1); diff --git a/e107_plugins/poll/poll_menu.php b/e107_plugins/poll/poll_menu.php index 174280aef..5a3365d34 100644 --- a/e107_plugins/poll/poll_menu.php +++ b/e107_plugins/poll/poll_menu.php @@ -34,7 +34,7 @@ if(!isset($poll) || !is_object($poll)) if(!defined("POLL_1")) { /* if menu is being called from comments, lan files have to be included manually ... */ - include_lan(e_PLUGIN."poll/languages/".e_LANGUAGE.".php"); + e107::includeLan(e_PLUGIN."poll/languages/".e_LANGUAGE.".php"); } if (empty($poll_to_show)) diff --git a/e107_plugins/rss_menu/admin_prefs.php b/e107_plugins/rss_menu/admin_prefs.php index fcc6aca79..e6aa46a01 100644 --- a/e107_plugins/rss_menu/admin_prefs.php +++ b/e107_plugins/rss_menu/admin_prefs.php @@ -31,7 +31,7 @@ if(!getperms("P") || !e107::isInstalled('rss_menu')) } -include_lan(e_PLUGIN."rss_menu/languages/".e_LANGUAGE."_admin_rss_menu.php"); +e107::includeLan(e_PLUGIN."rss_menu/languages/".e_LANGUAGE."_admin_rss_menu.php"); diff --git a/e107_plugins/rss_menu/rss.php b/e107_plugins/rss_menu/rss.php index 1c1f13e69..a6dba21af 100644 --- a/e107_plugins/rss_menu/rss.php +++ b/e107_plugins/rss_menu/rss.php @@ -47,7 +47,7 @@ if (!is_object($tp->e_bb)) */ // Get language file -include_lan(e_PLUGIN.'rss_menu/languages/'.e_LANGUAGE.'_admin_rss_menu.php'); +e107::includeLan(e_PLUGIN.'rss_menu/languages/'.e_LANGUAGE.'_admin_rss_menu.php'); // Get template if (is_readable(THEME.'rss_template.php')) diff --git a/e107_plugins/trackback/admin_config.php b/e107_plugins/trackback/admin_config.php index cafd2b97c..c06c52fea 100644 --- a/e107_plugins/trackback/admin_config.php +++ b/e107_plugins/trackback/admin_config.php @@ -19,7 +19,7 @@ if (!getperms("P") || !e107::isInstalled('trackback')) exit() ; } -include_lan(e_PLUGIN."trackback/languages/".e_LANGUAGE."_admin_trackback.php"); +e107::includeLan(e_PLUGIN."trackback/languages/".e_LANGUAGE."_admin_trackback.php"); require_once(e_ADMIN."auth.php"); $frm = e107::getForm(); diff --git a/e107_plugins/user/usertheme_menu_config.php b/e107_plugins/user/usertheme_menu_config.php index 0b0146e34..a9bd3ee0e 100644 --- a/e107_plugins/user/usertheme_menu_config.php +++ b/e107_plugins/user/usertheme_menu_config.php @@ -10,7 +10,7 @@ $eplug_admin = TRUE; require_once("../../class2.php"); -include_lan(e_PLUGIN."user_menu/languages/".e_LANGUAGE.".php"); +e107::includeLan(e_PLUGIN."user_menu/languages/".e_LANGUAGE.".php"); require_once(e_HANDLER.'userclass_class.php'); global $e_userclass; diff --git a/e107_themes/bootstrap3/theme_shortcodes.php b/e107_themes/bootstrap3/theme_shortcodes.php index d256ac0c6..8f6f452d8 100644 --- a/e107_themes/bootstrap3/theme_shortcodes.php +++ b/e107_themes/bootstrap3/theme_shortcodes.php @@ -86,7 +86,7 @@ class theme_shortcodes extends e_shortcode return ''; } - include_lan(e_PLUGIN."login_menu/languages/".e_LANGUAGE.".php"); + e107::includeLan(e_PLUGIN."login_menu/languages/".e_LANGUAGE.".php"); $tp = e107::getParser(); require(e_PLUGIN."login_menu/login_menu_shortcodes.php"); // don't use 'require_once'. diff --git a/e107_themes/voux/theme_shortcodes.php b/e107_themes/voux/theme_shortcodes.php index aef79a448..74772233a 100644 --- a/e107_themes/voux/theme_shortcodes.php +++ b/e107_themes/voux/theme_shortcodes.php @@ -98,7 +98,7 @@ class theme_shortcodes extends e_shortcode return ''; } - include_lan(e_PLUGIN."login_menu/languages/".e_LANGUAGE.".php"); + e107::includeLan(e_PLUGIN."login_menu/languages/".e_LANGUAGE.".php"); $tp = e107::getParser(); require(e_PLUGIN."login_menu/login_menu_shortcodes.php"); // don't use 'require_once'. diff --git a/email.php b/email.php index 81f425f60..6cde64263 100644 --- a/email.php +++ b/email.php @@ -23,7 +23,7 @@ if (!check_class(varset($pref['email_item_class'],e_UC_MEMBER))) exit(); } -include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE); +e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE); require_once(HEADERF); diff --git a/login.php b/login.php index ae0d315b8..b186de6ba 100644 --- a/login.php +++ b/login.php @@ -34,7 +34,7 @@ if ((USER || e_LOGIN != e_SELF || (empty($pref['user_reg']) && empty($pref['soci exit(); } -include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE); +e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE); if(!defined('e_IFRAME')) define('e_IFRAME',true); require_once(HEADERF); diff --git a/membersonly.php b/membersonly.php index 317d4fa96..b12d4b492 100644 --- a/membersonly.php +++ b/membersonly.php @@ -18,7 +18,7 @@ */ require_once("class2.php"); - include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE); + e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE); if(deftrue('BOOTSTRAP')) //v2.x { diff --git a/news.php b/news.php index 11d2ef83e..224bc5f33 100644 --- a/news.php +++ b/news.php @@ -31,7 +31,7 @@ if(!deftrue('e_LEGACY_NEWS')) // subject to removal at any time. // --------------------- everything below this point will be removed in future -------------------------- -include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE); +e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE); require_once(e_HANDLER."news_class.php"); //require_once(e_HANDLER."comment_class.php"); @@ -44,7 +44,7 @@ if (isset($NEWSHEADER)) exit; } -include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_news.php'); // Temporary +e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_news.php'); // Temporary $cacheString = 'news.php_default_'; $action = ''; diff --git a/online.php b/online.php index 29a582fde..8fa8deac8 100644 --- a/online.php +++ b/online.php @@ -26,7 +26,7 @@ */ require_once('class2.php'); -include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE); +e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE); require_once(HEADERF); diff --git a/rate.php b/rate.php index 43b5920cb..405c56013 100644 --- a/rate.php +++ b/rate.php @@ -12,7 +12,7 @@ // DIRTY - needs input validation, streaky require_once("class2.php"); -include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE); +e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE); if(!e_AJAX_REQUEST) // Legacy method. diff --git a/signup.php b/signup.php index 5d550ebd3..5834110b7 100644 --- a/signup.php +++ b/signup.php @@ -417,12 +417,12 @@ class signup } else { - include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE); + e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE); } } else { - include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE); + e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE); } // When user clicks twice on the email activation link or admin manually activated the account already. diff --git a/sitedown.php b/sitedown.php index 387465aff..0f45c3895 100644 --- a/sitedown.php +++ b/sitedown.php @@ -22,7 +22,7 @@ if (!varset($pref['maintainance_flag']) && !getperms('0')) // Allow main admin t header('Content-type: text/html; charset=utf-8'); -include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE); +e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE); // require_once(e_CORE.'shortcodes/batch/sitedown_shortcodes.php'); diff --git a/submitnews.php b/submitnews.php index 67454576e..74cfd0d66 100644 --- a/submitnews.php +++ b/submitnews.php @@ -15,7 +15,7 @@ if(!empty($_POST) && !isset($_POST['e-token'])) $_POST['e-token'] = ''; } require_once("class2.php"); -include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE); +e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE); require_once(HEADERF); diff --git a/upload.php b/upload.php index 6c8ca1846..41e637902 100644 --- a/upload.php +++ b/upload.php @@ -9,7 +9,7 @@ */ require_once("class2.php"); -include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE); +e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE); if (!$pref['upload_enabled'] || $pref['upload_class'] == 255) { diff --git a/user.php b/user.php index 4064223c9..1706ac045 100644 --- a/user.php +++ b/user.php @@ -15,7 +15,7 @@ //HCL define('PAGE_NAME', 'Members'); require_once("class2.php"); -include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE); +e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE); // Next bit is to fool PM plugin into doing things global $user; diff --git a/usersettings.php b/usersettings.php index 90a9ea51d..99a7a3ec6 100644 --- a/usersettings.php +++ b/usersettings.php @@ -27,7 +27,7 @@ require_once ('class2.php'); // TODO - Remove all the adminEdit stuff. -include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE); +e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE); define("US_DEBUG",FALSE); //define('US_DEBUG', false); @@ -45,8 +45,8 @@ if ((!ADMIN || !getperms("4")) && e_QUERY && e_QUERY != "update" ) exit(); } -include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_user.php'); // Generic user-related language defines -include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_usersettings.php'); +e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_user.php'); // Generic user-related language defines +e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_usersettings.php'); $ue = e107::getUserExt(); // needed by shortcodes for now.