mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 04:10:38 +02:00
Code Issues Releases Wiki Activity

Deprecated function include_lan() cleanup. Replaced with e107::lan();

Browse Source
This commit is contained in:
Cameron
2014-02-07 07:03:05 -08:00
parent c6d29662a7
commit f96f755318
20 changed files with 57 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
e107_plugins/chatbox_menu/admin_chatbox.php
View File

@@ -18,7 +18,10 @@ if (!plugInstalled('chatbox_menu') || !getperms("P"))
exit;
}
include_lan( e_PLUGIN."chatbox_menu/languages/".e_LANGUAGE."/admin_chatbox_menu.php");
// include_lXXXan( e_PLUGIN."chatbox_menu/languages/".e_LANGUAGE."/admin_chatbox_menu.php");
e107::lan('chatbox_menu','admin_chatbox_menu');
require_once(e_ADMIN."auth.php");
require_once(e_HANDLER."userclass_class.php");

2
e107_plugins/chatbox_menu/chat.php
View File

@@ -15,7 +15,7 @@ if (!plugInstalled('chatbox_menu'))
exit;
}
include_lan(e_PLUGIN."chatbox_menu/languages/".e_LANGUAGE."/".e_LANGUAGE.".php");
e107::lan('chatbox_menu',e_LANGUAGE);
require_once(HEADERF);
$mes = e107::getMessage();

26
e107_plugins/chatbox_menu/chatbox_menu.php
View File

@@ -35,7 +35,8 @@ if (!plugInstalled('chatbox_menu'))
return '';
}
include_lan(e_PLUGIN.'chatbox_menu/languages/'.e_LANGUAGE.'/'.e_LANGUAGE.'.php');
e107::lan('chatbox_menu',e_LANGUAGE);
// FIXME - start - LAN is not loaded
/*
@@ -47,7 +48,7 @@ if(($pref['cb_layer']==2) || isset($_POST['chatbox_ajax']))
//Normally the menu.sc file will auto-load the language file, this is needed in case
//ajax is turned on and the menu is not loaded from the menu.sc
include_lan(e_PLUGIN.'chatbox_menu/languages/'.e_LANGUAGE.'/'.e_LANGUAGE.'.php');
inclXXXude_lan(e_PLUGIN.'chatbox_menu/languages/'.e_LANGUAGE.'/'.e_LANGUAGE.'.php');
}
}
// FIXME - end
@@ -58,12 +59,9 @@ if(($pref['cb_layer']==2) || isset($_POST['chatbox_ajax']))
$emessage='';
// FIX - using generic sc names is affecting old installs/templates and global wrappers (e.g. sc_style[USERNAME])
/**
* Chatbox Menu Shortcodes.
*/
if(!class_exists('chatbox_shortcodes'))
{
class chatbox_shortcodes extends e_shortcode
@@ -138,18 +136,6 @@ if(!class_exists('chatbox_shortcodes'))
if((isset($_POST['chat_submit']) || e_AJAX_REQUEST) && $_POST['cmessage'] != '')
{
if(!USER && !$pref['anon_post'])

7
e107_plugins/chatbox_menu/e_notify.php
View File

@@ -2,7 +2,7 @@
/*
* e107 website system
*
* Copyright (C) 2008-2013 e107 Inc (e107.org)
* Copyright (C) 2008-2014 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
@@ -12,7 +12,6 @@ if (!defined('e107_INIT')) { exit; }
/*
if(defined('ADMIN_PAGE') && ADMIN_PAGE === true)
{
include_lan(e_PLUGIN."chatbox_menu/languages/".e_LANGUAGE."/".e_LANGUAGE.".php");
// $config_category = NT_LAN_CB_1;
// $config_events = array('cboxpost' => NT_LAN_CB_2);
}
@@ -21,7 +20,6 @@ if(defined('ADMIN_PAGE') && ADMIN_PAGE === true)
if (!function_exists('notify_cboxpost')) {
function notify_cboxpost($data) {
global $nt;
include_lan(e_PLUGIN."chatbox_menu/languages/".e_LANGUAGE."/".e_LANGUAGE.".php");
$message = NT_LAN_CB_3.': '.USERNAME.' ('.NT_LAN_CB_4.': '.e107::getIPHandler()->ipDecode($data['ip']).' )<br />';
$message .= NT_LAN_CB_5.':<br />'.$data['cmessage'].'<br /><br />';
$nt -> send('cboxpost', NT_LAN_CB_6, $message);
@@ -30,13 +28,11 @@ if (!function_exists('notify_cboxpost')) {
*/
// v2.x Standard
class chatbox_menu_notify extends notify // plugin-folder + '_notify'
{
function config()
{
//include_lan(e_PLUGIN."chatbox_menu/languages/".e_LANGUAGE."/".e_LANGUAGE.".php"); Use English_global.php instead.
$config = array();
@@ -51,7 +47,6 @@ class chatbox_menu_notify extends notify // plugin-folder + '_notify'
function cboxpost($data)
{
//include_lan(e_PLUGIN."chatbox_menu/languages/".e_LANGUAGE."/".e_LANGUAGE.".php"); // Use English_global.php instead.
$message = NT_LAN_CB_3.': '.USERNAME.' ('.NT_LAN_CB_4.': '.e107::getIPHandler()->ipDecode($data['ip']).' )<br />';
$message .= NT_LAN_CB_5.':<br />'.$data['cmessage'].'<br /><br />';