mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-16 20:28:28 +01:00
Code Issues Releases Wiki Activity

Code cleanup: deprecated include_lan()

Browse Source
This commit is contained in:
Cameron 2017-01-23 09:41:23 -08:00
parent 55cb8d409e
commit 43d0211590
86 changed files with 105 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
comment.php
View File

@ -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')))
{

2
contact.php
View File

@ -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);

4
e107_admin/admin_log.php
View File

@ -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);
}
}

2
e107_admin/cpage.php
View File

@ -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';

2
e107_admin/language.php
View File

@ -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");

2
e107_admin/prefs.php
View File

@ -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");

2
e107_admin/update_routines.php
View File

@ -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

2
e107_core/bbcodes/quote.bb
View File

@ -1,6 +1,6 @@
//<?
$class = e107::getBB()->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'))
{

2
e107_core/shortcodes/single/custom.php
View File

@ -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 : "<span class='loginc sep'>.:.</span>";

2
e107_core/shortcodes/single/email.sc
View File

@ -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')

2
e107_core/shortcodes/single/search.sc
View File

@ -1,7 +1,7 @@
//<?
global $sql,$sysprefs,$SEARCH_SHORTCODE;
include_lan(e_PLUGIN."search_menu/languages/".e_LANGUAGE.".php");
e107::includeLan(e_PLUGIN."search_menu/languages/".e_LANGUAGE.".php");
$text = "";
if (!isset($SEARCH_SHORTCODE))
{

2
e107_core/shortcodes/single/user_extended.php
View File

@ -65,7 +65,7 @@
/**
* @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))

4
e107_core/shortcodes/single/user_extended_old.sc
View File

@ -10,7 +10,7 @@
* USAGE: {USER_EXTENDED=<field_name>.[text|value|icon|text_value].<user_id>}
* 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;

2
e107_handlers/comment_class.php
View File

@ -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");
/**

2
e107_handlers/date_handler.php
View File

@ -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
{

2
e107_handlers/db_verify_class.php
View File

@ -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
{

2
e107_handlers/e107_class.php
View File

@ -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

4
e107_handlers/emailprint_class.php
View File

@ -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
{

2
e107_handlers/login.php
View File

@ -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

2
e107_handlers/mail_manager_class.php
View File

@ -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);

2
e107_handlers/media_class.php
View File

@ -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');
}

2
e107_handlers/notify_class.php
View File

@ -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))
{

2
e107_handlers/rate_class.php
View File

@ -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 {

2
e107_handlers/sitelinks_class.php
View File

@ -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
{

6
e107_handlers/theme_handler.php
View File

@ -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 = "<br /><div class='indent'>".TPVLAN_1.".</div><br />";
global $ns;
$ns->tablerender(TPVLAN_2, $text);

2
e107_handlers/upload_handler.php
View File

@ -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);

2
e107_handlers/user_handler.php
View File

@ -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
{

2
e107_handlers/user_select_class.php
View File

@ -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
{

2
e107_handlers/userclass_class.php
View File

@ -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');
/*

4
e107_plugins/alt_auth/alt_auth_conf.php
View File

@ -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 = "<div>
<form method='post' action='".e_SELF."'>

4
e107_plugins/alt_auth/e107db_conf.php
View File

@ -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');

6
e107_plugins/alt_auth/e_help.php
View File

@ -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.'<br /><br />'.(defined('SHOW_COPY_HELP') ? LAN_ALT_COPY_HELP : '').(defined('SHOW_CONVERSION_HELP') ? LAN_ALT_CONVERSION_HELP : '').LAN_ALT_VALIDATE_HELP);
}

4
e107_plugins/alt_auth/importdb_conf.php
View File

@ -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');

4
e107_plugins/alt_auth/ldap_conf.php
View File

@ -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');

4
e107_plugins/alt_auth/otherdb_conf.php
View File

@ -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');

4
e107_plugins/alt_auth/radius_conf.php
View File

@ -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();

2
e107_plugins/banner/e_help.php
View File

@ -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);
?>

2
e107_plugins/blogcalendar_menu/archive.php
View File

@ -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);

2
e107_plugins/blogcalendar_menu/config.php
View File

@ -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');

2
e107_plugins/clock_menu/config.php
View File

@ -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();

2
e107_plugins/comment_menu/config.php
View File

@ -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');

2
e107_plugins/forum/forum_mod.php
View File

@ -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)
{

2
e107_plugins/list_new/list_class.php
View File

@ -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"))

4
e107_plugins/log/admin_config.php
View File

@ -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))
{

2
e107_plugins/log/e_help.php
View File

@ -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';

2
e107_plugins/log/stats_csv.php
View File

@ -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)

2
e107_plugins/login_menu/config.php
View File

@ -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');

2
e107_plugins/metaweblog/admin_config.php
View File

@ -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 = "<div class='alert alert-block'>".XMLRPC_HELP_011."</div>";

2
e107_plugins/metaweblog/e_help.php
View File

@ -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;
//

2
e107_plugins/newforumposts_main/admin_config.php
View File

@ -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();

2
e107_plugins/newforumposts_main/newforumposts_main.php
View File

@ -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;

4
e107_plugins/news/news.php
View File

@ -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();

2
e107_plugins/newsfeed/e_help.php
View File

@ -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) );
?>

2
e107_plugins/newsfeed/newsfeed.php
View File

@ -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');

2
e107_plugins/newsfeed/newsfeed_menu.php
View File

@ -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'))
{

2
e107_plugins/newsletter/e_mailout.php
View File

@ -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

2
e107_plugins/newsletter/nl_archive.php
View File

@ -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();

2
e107_plugins/online/config.php
View File

@ -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'))
{

2
e107_plugins/online/lastseen_menu.php
View File

@ -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'))
{

2
e107_plugins/online/online_menu.php
View File

@ -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';

2
e107_plugins/pm/e_cron.php
View File

@ -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.
{

2
e107_plugins/pm/e_shortcode.php
View File

@ -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();

2
e107_plugins/pm/pm.php
View File

@ -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');

2
e107_plugins/pm/pm_shortcodes.php
View File

@ -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);

2
e107_plugins/poll/admin_config.php
View File

@ -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");

2
e107_plugins/poll/oldpolls.php
View File

@ -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)
{

2
e107_plugins/poll/poll_class.php
View File

@ -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);

2
e107_plugins/poll/poll_menu.php
View File

@ -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))

2
e107_plugins/rss_menu/admin_prefs.php
View File

@ -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");

2
e107_plugins/rss_menu/rss.php
View File

@ -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'))

2
e107_plugins/trackback/admin_config.php
View File

@ -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();

2
e107_plugins/user/usertheme_menu_config.php
View File

@ -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;

2
e107_themes/bootstrap3/theme_shortcodes.php
View File

@ -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'.

2
e107_themes/voux/theme_shortcodes.php
View File

@ -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'.

2
email.php
View File

@ -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);

2
login.php
View File

@ -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);

2
membersonly.php
View File

@ -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
{

4
news.php
View File

@ -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 = '';

2
online.php
View File

@ -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);

2
rate.php
View File

@ -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.

4
signup.php
View File

@ -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.

2
sitedown.php
View File

@ -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');

2
submitnews.php
View File

@ -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);

2
upload.php
View File

@ -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)
{

2
user.php
View File

@ -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;

6
usersettings.php
View File

@ -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.