mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-16 19:44:09 +02:00
Code Issues Releases Wiki Activity

Code clean-up (globals, $e107->, headers, $sql)

Browse Source
This commit is contained in:
Moc
2013-03-25 18:48:48 +01:00
parent 231dd00f27
commit 2074ef8f37
17 changed files with 106 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
e107_plugins/list_new/list_admin_class.php
View File

@@ -2,17 +2,12 @@
/*
* e107 website system
*
* Copyright (C) 2008-2009 e107 Inc (e107.org)
* Copyright (C) 2008-2013 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
* List Admin Class
*
* $Source: /cvs_backup/e107_0.8/e107_plugins/list_new/list_admin_class.php,v $
* $Revision$
* $Date$
* $Author$
*
*/
if (!defined('e107_INIT')) { exit; }
@@ -47,17 +42,19 @@ class list_admin
*/
function db_update_menu()
{
$sql = e107::getDb();
$tp = e107::getParser();
// Get the preferences so we've got a reference for changes
$list_pref = $this->parent->getListPrefs();
$temp = array();
while(list($key, $value) = each($_POST))
{
if($value != LIST_ADMIN_2){ $temp[$this->e107->tp->toDB($key)] = $this->e107->tp->toDB($value); }
if($value != LIST_ADMIN_2){ $temp[$tp->toDB($key)] = $tp->toDB($value); }
}
if ($this->e107->admin_log->logArrayDiffs($temp, $list_pref, 'LISTNEW_01'))
{
$tmp = $this->e107->arrayStorage->WriteArray($list_pref);
$this->e107->sql->db_Update("core", "e107_value='{$tmp}' WHERE e107_name='list' ");
$sql->update("core", "e107_value='{$tmp}' WHERE e107_name='list' ");
$message = LIST_ADMIN_3;
}
else
@@ -98,7 +95,8 @@ class list_admin
*/
function parse_global_options($type)
{
global $rs, $fl;
global $rs;
$fl = e107::getFile();
$text = '';
@@ -247,7 +245,7 @@ class list_admin
for($i=0;$i<count($this->parent->sections);$i++)
{
$this->row['FIELD_TITLE'] = $this->parent->titles[$i];
$this->row['FIELD_ITEM'] = $rs->form_text($this->parent->sections[$i]."_".$type."_caption", 30, $this->e107->tp->toHTML($this->parent->list_pref[$this->parent->sections[$i]."_".$type."_caption"],"","defs"), "50", "tbox");
$this->row['FIELD_ITEM'] = $rs->form_text($this->parent->sections[$i]."_".$type."_caption", 30, e1007::getParser()->toHTML($this->parent->list_pref[$this->parent->sections[$i]."_".$type."_caption"],"","defs"), "50", "tbox");
$this->row['FIELD'] .= $this->parseTemplate('FIELD_TABLE');
}
$this->row['FIELD'] .= $this->parseTemplate('FIELD_TABLE_END');
@@ -268,6 +266,7 @@ class list_admin
function parse_menu_options($type)
{
global $rs;
$tp = e107::getParser();
$this->row['ID'] = "list-new-".str_replace('_', '-', $type);
$this->row['TITLE'] = ($type == "new_menu" ? LIST_ADMIN_OPT_5 : LIST_ADMIN_OPT_3);
@@ -280,7 +279,7 @@ class list_admin
$this->row['HEADING'] = LIST_ADMIN_LAN_3;
$this->row['HELP'] = LIST_ADMIN_LAN_4;
$this->row['CONTID'] = "list-new-menu-{$type}-expandable-caption";
$this->row['FIELD'] = $rs->form_text($type."_caption", "30", $this->e107->tp->toHTML($this->parent->list_pref[$type."_caption"],"","defs"), "50", "tbox");
$this->row['FIELD'] = $rs->form_text($type."_caption", "30", $tp->toHTML($this->parent->list_pref[$type."_caption"],"","defs"), "50", "tbox");
$text .= $this->parseTemplate('TOPIC_ROW');
//menu preference : icon : use
@@ -375,6 +374,7 @@ class list_admin
function parse_page_options($type)
{
global $rs;
$tp = e107::getParser();
$display = ($type == "recent_page" ? "display:none;" : '');
@@ -389,7 +389,7 @@ class list_admin
$this->row['HEADING'] = LIST_ADMIN_LAN_3;
$this->row['HELP'] = LIST_ADMIN_LAN_4;
$this->row['CONTID'] = "list-new-page-{$type}-expandable-caption";
$this->row['FIELD'] = $rs->form_text($type."_caption", "30", $this->e107->tp->toHTML($this->parent->list_pref[$type."_caption"],"","defs"), "50", "tbox");
$this->row['FIELD'] = $rs->form_text($type."_caption", "30", $tp->toHTML($this->parent->list_pref[$type."_caption"],"","defs"), "50", "tbox");
$text .= $this->parseTemplate('TOPIC_ROW');
//page preference : icon : use
@@ -475,7 +475,7 @@ class list_admin
$this->row['HEADING'] = LIST_ADMIN_LAN_24;
$this->row['HELP'] = LIST_ADMIN_LAN_25;
$this->row['CONTID'] = "list-new-page-{$type}-expandable-wtext";
$this->row['FIELD'] = $rs->form_textarea($type."_welcometext", "50", "5", $this->e107->tp->toHTML($this->parent->list_pref[$type."_welcometext"],"","defs"), "", "tbox");
$this->row['FIELD'] = $rs->form_textarea($type."_welcometext", "50", "5", $tp->toHTML($this->parent->list_pref[$type."_welcometext"],"","defs"), "", "tbox");
$text .= $this->parseTemplate('TOPIC_ROW');
if($type == "new_page")
@@ -542,7 +542,7 @@ class list_admin
$frm = e107::getForm();
$this->row['TOPIC'] = LIST_ADMIN_11;
$this->row['FIELD'] = $frm->admin_button('update_menu',LIST_ADMIN_2,'update'); // $rs->form_button("submit", 'update_menu', LIST_ADMIN_2);
$this->row['FIELD'] = $frm->admin_button('update_menu',LIST_ADMIN_2,'update');
return "<tr><td class='buttons-bar center' colspan='2'>".$frm->admin_button('update_menu',LIST_ADMIN_2,'update')."</td></tr>";
return $this->parseTemplate('TOPIC_ROW_NOEXPAND');
}

23
e107_plugins/list_new/list_shortcodes.php
View File

@@ -2,17 +2,12 @@
/*
* e107 website system
*
* Copyright (C) 2008-2009 e107 Inc (e107.org)
* Copyright (C) 2008-2013 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
* List Shortcodes
*
* $Source: /cvs_backup/e107_0.8/e107_plugins/list_new/list_shortcodes.php,v $
* $Revision$
* $Date$
* $Author$
*
*/
/**
@@ -53,37 +48,37 @@ class list_shortcodes
function sc_list_date()
{
return $this->e107->tp->toHTML($this->row['date'], true, "");
return e107::getParser()->toHTML($this->row['date'], true, "");
}
function sc_list_icon()
{
return $this->e107->tp->toHTML($this->row['icon'], true, "");
return e107::getParser()->toHTML($this->row['icon'], true, "");
}
function sc_list_heading()
{
return $this->e107->tp->toHTML($this->row['heading'], true, "TITLE");
return e107::getParser()->toHTML($this->row['heading'], true, "TITLE");
}
function sc_list_author()
{
return $this->e107->tp->toHTML($this->row['author'], true, "");
return e107::getParser()->toHTML($this->row['author'], true, "");
}
function sc_list_category()
{
return $this->e107->tp->toHTML($this->row['category'], true, "");
return e107::getParser()->toHTML($this->row['category'], true, "");
}
function sc_list_info()
{
return $this->e107->tp->toHTML($this->row['info'], true, "");
return e107::getParser()->toHTML($this->row['info'], true, "");
}
function sc_list_caption()
{
return $this->e107->tp->toHTML($this->rc->data['caption'], true, "");
return e107::getParser()->toHTML($this->rc->data['caption'], true, "");
}
function sc_list_displaystyle()
@@ -99,7 +94,7 @@ class list_shortcodes
function sc_list_col_welcometext()
{
return $this->e107->tp->toHTML($this->list_pref[$this->rc->mode."_welcometext"], true, "");
return e107::getParser()->toHTML($this->list_pref[$this->rc->mode."_welcometext"], true, "");
}
function sc_list_col_cellwidth()

12
e107_plugins/list_new/section/list_members.php
View File

@@ -2,17 +2,12 @@
/*
* e107 website system
*
* Copyright (C) 2008-2009 e107 Inc (e107.org)
* Copyright (C) 2008-2013 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
* Members e_list Handler
*
* $Source: /cvs_backup/e107_0.8/e107_plugins/list_new/section/list_members.php,v $
* $Revision$
* $Date$
* $Author$
*
*/
/**
@@ -32,6 +27,7 @@ class list_members
function getListData()
{
$sql = e107::getDb();
$list_caption = $this->parent->settings['caption'];
$list_display = ($this->parent->settings['open'] ? "" : "none");
@@ -44,13 +40,13 @@ class list_members
$bullet = $this->parent->getBullet($this->parent->settings['icon']);
if(!$this->parent->e107->sql->db_Select_gen("SELECT user_id,user_name,user_join FROM #user WHERE ".$qry))
if(!$this->parent->$sql->gen("SELECT user_id,user_name,user_join FROM #user WHERE ".$qry))
{
$list_data = LIST_MEMBER_2;
}
else
{
while($row = $this->parent->e107->sql->db_Fetch())
while($row = $this->parent->$sql->fetch())
{
$record = array();
$rowheading = $this->parent->parse_heading($row['user_name']);