1
0
mirror of https://github.com/e107inc/e107.git synced 2025-06-02 00:45:03 +02:00

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

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

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)
*
@ -10,35 +10,24 @@
*
*/
//@TODO make it 0.8 compatible
if (!defined('e107_INIT')) { exit; }
if (ADMIN == TRUE)
{
// We're not in admin - load generic admin phrases
include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_admin.php');
$tp = e107::getParser();
$pref = e107::getPref();
$ns = e107::getRender();
$nav = e107::getNav();
// $admin = $nav->adminLinks('assoc');
// $plugins = $nav->pluginLinks('assoc');
e107::lan('core','admin', true); // We're not in admin - load generic admin phrases
// $array_functions = array_merge($admin, $plugins);
$tp = e107::getParser();
$pref = e107::getPref();
$ns = e107::getRender();
$nav = e107::getNav();
$array_functions = $nav->adminLinks();
// print_a($array_functions);
// asort($array_functions);
// ksort($array_functions, 'title'); //FIXME Improve ordering.
//$array_functions = asortbyindex($array_functions, 1);
$amtext = "<div style='text-align:center'>
$amtext = "<div class='text-center' style='text-align:center'>
<select name='activate' onchange='urljump(this.options[selectedIndex].value)' class='tbox'>
<option>".LAN_SELECT."</option>\n";
foreach ($array_functions as $link_value)

View File

@ -40,7 +40,8 @@ $frm = e107::getForm();
$mes = e107::getMessage();
$tp = e107::getParser();
include_lan(e_PLUGIN.'banner/languages/'.e_LANGUAGE.'_admin_banner.php');
e107::lan('banner',e_LANGUAGE.'_admin_banner.php',true); // e_PLUGIN.'banner/languages/'.e_LANGUAGE.'_admin_banner.php'
if(e_QUERY)
@ -250,8 +251,8 @@ if (!$action)
<tr>
<td class='center'>".$banner_row['banner_id']."</td>
<td class='e-pointer' onclick=\"e107Helper.toggle('banner-infocell-{$banner_row['banner_id']}')\">
<a href='#banner-infocell-{$banner_row['banner_id']}' class='action e-expandit f-right' title='".BNRLAN_7."'><img class='action info S16' src='".E_16_CAT_ABOUT."' alt='' /></a>
".($banner_row['banner_clientname'] ? $banner_row['banner_clientname'] : BNRLAN_8)."
<a href='#banner-infocell-{$banner_row['banner_id']}' class='action e-expandit' title='".BNRLAN_7."'>
".($banner_row['banner_clientname'] ? $banner_row['banner_clientname'] : BNRLAN_8)."</a>
<div class='e-hideme clear' id='banner-infocell-{$banner_row['banner_id']}'>
<div class='indent'>
<div class='field-spacer'><strong>".BNRLAN_11.": </strong>".$banner_row['banner_campaign']."</div>

View File

@ -30,7 +30,7 @@ To define your own banner to use here ...
3. Save file
*/
//include_lan(e_PLUGIN.'banner/languages/'.e_LANGUAGE.'_menu_banner.php');
//inclXXXude_lan(e_PLUGIN.'banner/languages/'.e_LANGUAGE.'_menu_banner.php');
if(file_exists(THEME.'banner_template.php'))
{

View File

@ -32,258 +32,4 @@ require_once("../../class2.php");
header('Location:'.e_PLUGIN_ABS.'banner/admin_banner.php?menu');
exit;
/*
if (!getperms("1")) // Access to those who can change prefs, theme etc
{
header("location:".e_BASE."index.php");
exit ;
}
require_once(e_ADMIN."auth.php");
require_once(e_HANDLER."form_handler.php");
$rs = new form;
include_lan(e_PLUGIN."banner_menu/languages/".e_LANGUAGE.".php");
include_lan(e_LANGUAGEDIR.e_LANGUAGE."/admin/lan_menus.php");
if (e_QUERY)
{
$tmp = explode(".", e_QUERY);
$action = $tmp[0];
$sub_action = $tmp[1];
$id = $tmp[2];
unset($tmp);
}
if (isset($_POST['update_menu']))
{
unset($temp);
foreach($_POST as $k => $v)
{
if (strpos($k, "banner_") === 0)
{
$temp[$k] = $v;
}
}
if (isset($_POST['catid']))
{
$array_cat = explode("-", $_POST['catid']);
for($i = 0; $i < count($array_cat); $i++)
{
$cat .= $array_cat[$i]."|";
}
$cat = substr($cat, 0, -1);
$temp['banner_campaign'] = $cat;
}
if ($admin_log->logArrayDiffs($temp, $menu_pref, 'BANNER_05'))
{
$sysprefs->setArray('menu_pref'); // Only save if changes
$message = BANNER_MENU_L2;
}
else
{
$message = BANNER_MENU_L19;
}
$ns->tablerender("", "<div style='text-align:center'><b>".$message."</b></div>");
}
if (!$menu_pref['banner_caption'])
{
$menu_pref['banner2_caption'] = BANNER_MENU_L1;
}
$text = "<div style='text-align:center'>
<form method='post' action='".e_SELF."' name='menu_conf_form'>
<table style='width:85%' class='fborder' >
<tr>
<td style='width:40%' class='forumheader3'>".BANNER_MENU_L3.": </td>
<td style='width:60%' class='forumheader3'>
<input class='tbox' type='text' name='banner_caption' size='20' value='".$menu_pref['banner_caption']."' maxlength='100' />
</td>
</tr>";
$array_cat_in = explode("|", $menu_pref['banner_campaign']);
$c = 0;
$d = 0;
$sql2 = new db;
$category_total = $sql2->db_Select("banner", "DISTINCT(SUBSTRING_INDEX(banner_campaign, '^', 1)) as banner_campaign", "ORDER BY banner_campaign", "mode=no_where");
while ($row = $sql2->db_Fetch()) {
extract($row);
if (in_array($banner_campaign, $array_cat_in)) {
$in_catname[$c] = $banner_campaign;
$c++;
} else {
$out_catname[$d] = $banner_campaign;
$d++;
}
}
$text .= "
<tr>
<td style='width:40%' class='forumheader3'>".BANNER_MENU_L6."</td>
<td style='width:60%' class='forumheader3'>
<table style='width:90%'>
<tr>
<td style='width:45%; vertical-align:top'>".BANNER_MENU_L7."<br />
<select class='tbox' id='catout' name='catout' size='10' style='width:180px' multiple='multiple' onchange='moveOver();'>";
for($a = 0; $a <= ($d-1); $a++) {
$text .= "<option value='".$out_catname[$a]."'>".$out_catname[$a]."</option>";
}
$text .= "</select>
</td>
<td style='width:45%; vertical-align:top'>".BANNER_MENU_L8."<br />
<select class='tbox' id='catin' name='catin' size='10' style='width:180px' multiple='multiple'>";
for($a = 0; $a <= ($c-1); $a++) {
$catidvalues .= $in_catname[$a]."-";
$text .= "<option value='".$in_catname[$a]."'>".$in_catname[$a]."</option>";
}
$catidvalues = substr($catidvalues, 0, -1);
$text .= "</select><br /><br />
<input class='btn button' type='button' value='".BANNER_MENU_L9."' onclick='removeMe();' />
<input type='hidden' name='catid' id='catid' value='".$catidvalues."' />
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td style='width:40%' class='forumheader3'>".BANNER_MENU_L10."</td>
<td style='width:60%' class='forumheader3'>
<select class='tbox' id='banner_rendertype' name='banner_rendertype' size='1' >
".$rs->form_option(BANNER_MENU_L11, (!$menu_pref['banner_rendertype'] || $menu_pref['banner_rendertype'] == "0" ? "1" : "0"), 0)."
".$rs->form_option("1 - ".BANNER_MENU_L12."", ($menu_pref['banner_rendertype'] == "1" ? "1" : "0"), 1)."
".$rs->form_option("2 - ".BANNER_MENU_L13."", ($menu_pref['banner_rendertype'] == "2" ? "1" : "0"), 2)."
".$rs->form_option("3 - ".BANNER_MENU_L14."", ($menu_pref['banner_rendertype'] == "3" ? "1" : "0"), 3)."
".$rs->form_select_close()."
</td>
</tr>
<tr>
<td style='width:40%' class='forumheader3'>".BANNER_MENU_L15."<br /><span class='smalltext' style='font-style:italic;'>".BANNER_MENU_L16."</span></td>
<td style='width:60%' class='forumheader3'>
<select class='tbox' id='banner_amount' name='banner_amount' size='1' >
".$rs->form_option(BANNER_MENU_L17, (!$menu_pref['banner_amount'] ? "1" : "0"), 0);
for($b = 1; $b < 6; $b++) {
$text .= $rs->form_option($b, ($menu_pref['banner_amount'] == $b ? "1" : "0"), $b);
}
$text .= $rs->form_select_close()."
</td>
</tr>
<tr>
<td colspan='2' class='forumheader' style='text-align:center'><input class='btn button' type='submit' name='update_menu' value='".BANNER_MENU_L18."' /></td>
</tr>
</table>
</form>
</div>";
$ns->tablerender(BANNER_MENU_L5, $text);
require_once(e_ADMIN."footer.php");
function headerjs() {
$script_js = "<script type=\"text/javascript\">
//<!--
//<!-- Adapted from original: Kathi O'Shea (Kathi.O'Shea@internet.com) -->
function moveOver(){
var boxLength = document.getElementById('catin').length;
var selectedItem = document.getElementById('catout').selectedIndex;
var selectedText = document.getElementById('catout').options[selectedItem].text;
var selectedValue = document.getElementById('catout').options[selectedItem].value;
var i;
var isNew = true;
if (boxLength != 0) {
for (i = 0; i < boxLength; i++) {
thisitem = document.getElementById('catin').options[i].text;
if (thisitem == selectedText) {
isNew = false;
break;
}
}
}
if (isNew) {
newoption = new Option(selectedText, selectedValue, false, false);
document.getElementById('catin').options[boxLength] = newoption;
document.getElementById('catout').options[selectedItem].text = '';
}
document.getElementById('catout').selectedIndex=-1;
saveMe();
}
function removeMe() {
var boxLength = document.getElementById('catin').length;
var boxLength2 = document.getElementById('catout').length;
arrSelected = new Array();
var count = 0;
for (i = 0; i < boxLength; i++) {
if (document.getElementById('catin').options[i].selected) {
arrSelected[count] = document.getElementById('catin').options[i].value;
var valname = document.getElementById('catin').options[i].text;
for (j = 0; j < boxLength2; j++) {
if (document.getElementById('catout').options[j].value == arrSelected[count]){
document.getElementById('catout').options[j].text = valname;
}
}
}
count++;
}
var x;
for (i = 0; i < boxLength; i++) {
for (x = 0; x < arrSelected.length; x++) {
if (document.getElementById('catin').options[i].value == arrSelected[x]) {
document.getElementById('catin').options[i] = null;
}
}
boxLength = document.getElementById('catin').length;
}
saveMe();
}
//function clearMe(clid){
// location.href = document.location + \"?clear.\" + clid;
//}
function saveMe(clid) {
var strValues = \"\";
var boxLength = document.getElementById('catin').length;
var count = 0;
if (boxLength != 0) {
for (i = 0; i < boxLength; i++) {
if (count == 0) {
strValues = document.getElementById('catin').options[i].value;
}
else {
strValues = strValues + \"-\" + document.getElementById('catin').options[i].value;
}
count++;
}
}
if (strValues.length == 0) {
//alert(\"You have not made any selections\");
document.getElementById('catid').value = \"\";
}
else {
document.getElementById('catid').value = strValues;
}
}
// -->
</script>\n";
return $script_js;
}
*/
?>

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

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

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

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

View File

@ -15,27 +15,14 @@
|
| Released under the terms and conditions of the
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_plugins/clock_menu/clock_menu.php,v $
| $Revision$
| $Date$
| $Author$
+---------------------------------------------------------------+
*/
/**
* e107 Clock display menu plugin
*
* Handles the display of a clock/calendar in a menu
*
* @package e107_plugins
* @subpackage clock
* @version $Id$;
*/
//FIXME looks pretty much to be 0.6 compatible
if (!defined('e107_INIT')) { exit(); }
include_lan(e_PLUGIN.'/clock_menu/languages/'.e_LANGUAGE.'.php');
e107::lan('clock_menu',e_LANGUAGE);
$menu_pref = e107::getConfig('menu')->getPref('');
$indexArray = array('clock_dateprefix','clock_format','clock_datesuffix1','clock_datesuffix2','clock_datesuffix3','clock_datesuffix4');

View File

@ -24,8 +24,11 @@ if (!getperms("P") || !plugInstalled('download'))
exit() ;
}
include_lan(e_PLUGIN.'download/languages/'.e_LANGUAGE.'/download.php');
include_lan(e_PLUGIN.'download/languages/'.e_LANGUAGE.'/admin_download.php');
e107::lan('download','download'); // e_PLUGIN.'download/languages/'.e_LANGUAGE.'/download.php'
e107::lan('download','admin_download'); // e_PLUGIN.'download/languages/'.e_LANGUAGE.'/admin_download.php'
// require_once(e_PLUGIN.'download/handlers/adminDownload_class.php');
require_once(e_PLUGIN.'download/handlers/download_class.php');
require_once(e_HANDLER.'upload_handler.php');

View File

@ -18,7 +18,7 @@ if (!e107::isInstalled('download'))
header("location:".e_BASE."index.php");
}
include_lan(e_PLUGIN.'download/languages/'.e_LANGUAGE.'/download.php');
e107::lan('download','download'); // Loads e_PLUGIN.'download/languages/'.e_LANGUAGE.'/download.php'
require_once(e_PLUGIN.'download/handlers/download_class.php');
require_once(e_PLUGIN.'download/handlers/category_class.php');

View File

@ -22,8 +22,6 @@ class download_cron // include plugin-folder in the name.
{
function config()
{
include_lan(e_PLUGIN."download/languages/".e_LANGUAGE."/admin_download.php");
$cron = array();
$cron[] = array(
@ -41,7 +39,7 @@ class download_cron // include plugin-folder in the name.
function pruneLog()
{
// Whatever code you wish.
e107::getMessage()->add("Executed dummy function within gsitemap/e_cron.php");
e107::getMessage()->add("Executed dummy function within download/e_cron.php");
return ;
}

View File

@ -4,7 +4,10 @@ if (!defined('e107_INIT'))
require_once("../../class2.php");
}
include_lan(e_PLUGIN."download/languages/".e_LANGUAGE."/download.php");
e107::lan('download','download');
$log = e107::getAdminLog();
$id = FALSE;
@ -256,6 +259,10 @@ if ($type == "file")
exit();
}
}
$log->addError("Line".__LINE__.": Couldn't find ".e_DOWNLOAD.e_QUERY);
$log->toFile('download_requests','Download Requests', true); // Create a log file and add the log messages
require_once(HEADERF);
$ns -> tablerender(LAN_dl_61, "<div style='text-align:center'>".LAN_dl_65."<br /><br /><a href='javascript:history.back(1)'>".LAN_dl_64."</a></div>");
require_once(FOOTERF);

View File

@ -22,7 +22,7 @@ $url = e107::getUrl()->create('faqs/list/all', false, 'full=1&noencode=1');
header('Location: '.$url);
exit;
include_lan(e_PLUGIN."faqs/languages/".e_LANGUAGE."/".e_LANGUAGE."_front.php");
incluXXXde_lan(e_PLUGIN."faqs/languages/".e_LANGUAGE."/".e_LANGUAGE."_front.php");
require_once (e_HANDLER."form_handler.php");

View File

@ -40,9 +40,8 @@ require_once("../../class2.php");
$frm = e107::getForm();
$mes = e107::getMessage();
include_lan(e_PLUGIN.'import/languages/'.e_LANGUAGE.'_admin_import.php');
//e107::lan('import',e_LANGUAGE.'_admin_import.php');
//XXX A Fresh Start
class import_admin extends e_admin_dispatcher

View File

@ -17,7 +17,9 @@ if (!getperms('P') || !e107::isInstalled('linkwords'))
exit ;
}
require_once(e_ADMIN.'auth.php');
include_lan(e_PLUGIN.'linkwords/languages/'.e_LANGUAGE.'_admin_linkwords.php');
e107::lan('linkwords', e_LANGUAGE."_admin_linkwords.php"); // e_PLUGIN.'linkwords/languages/'.e_LANGUAGE.'_admin_linkwords.php'
define('LW_CACHE_TAG', 'nomd5_linkwords');

View File

@ -25,7 +25,8 @@
if (!defined('e107_INIT')) { exit; }
include_lan(e_PLUGIN."linkwords/languages/".e_LANGUAGE."_admin_linkwords.php");
e107::lan('linkwords',e_LANGUAGE."_admin_linkwords.php");
if (e_QUERY) list($action,$junk) = explode('.',e_QUERY.'.'); else $action = 'words';

View File

@ -32,7 +32,9 @@ class e_linkwords
global $pref, $admin_log;
/* constructor */
// Do an auto-update on the variable used to hook parsers - so we should only be called once
include_lan(e_PLUGIN."linkwords/languages/".e_LANGUAGE.".php");
e107::lan('linkwords',e_LANGUAGE); // e_PLUGIN."linkwords/languages/".e_LANGUAGE.".php"
$hooks = explode(",",$pref['tohtml_hook']);
if (($key=array_search('linkwords',$hooks)) !== FALSE)
{

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<e107Plugin name="PDF" lan="LAN_PLUGIN_PDF_NAME" version="2.0" date="2012-08-01" compatibility="2.0" installRequired="true">
<e107Plugin name="PDF" lan="LAN_PLUGIN_PDF_NAME" version="2.0" date="2012-08-01" compatibility="1.0" installRequired="true">
<author name="e107Inc" />
<description lan="LAN_PLUGIN_PDF_DESCRIPTION">PDF creation support using TCPDF.</description>
<copyright>Copyright e107 Inc e107.org, Licensed under GPL (http://www.gnu.org/licenses/gpl.txt)</copyright>

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<e107Plugin name="Trackback" lan="LAN_PLUGIN_TRACKBACK_NAME" version="1.1" date="2012-08-01" compatibility="2.0" installRequired="true">
<e107Plugin name="Trackback" lan="LAN_PLUGIN_TRACKBACK_NAME" version="1.1" date="2012-08-01" compatibility="1.0" installRequired="true">
<author name="e107 Inc." url="http://e107.org" email="devs@e107.org" />
<description lan="LAN_PLUGIN_TRACKBACK_DESCRIPTION">This plugin enables you to use trackback in your news posts.</description>
<copyright>Copyright e107 Inc e107.org, Licensed under GPL (http://www.gnu.org/licenses/gpl.txt)</copyright>