mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-29 01:00:20 +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

12
e107_plugins/pm/pm.php
View File

@@ -144,7 +144,7 @@ class pm_extended extends private_message
$text = "<form {$enc} method='post' action='".e_SELF."' id='dataform'>
<div><input type='hidden' name='numsent' value='{$pm_outbox['outbox']['total']}' />".
$this->e107->tp->parseTemplate($PM_SEND_PM, TRUE).
e107::getParser()->parseTemplate($PM_SEND_PM, TRUE).
'</div></form>';
return $text;
}
@@ -267,7 +267,7 @@ class pm_extended extends private_message
$pm_info['pm_read'] = $now;
$this->pm_mark_read($pmid, $pm_info);
}
$txt = $this->e107->tp->parseTemplate($PM_SHOW, true);
$txt = e107::getParser()->parseTemplate($PM_SHOW, true);
$this->e107->ns->tablerender(LAN_PM, $txt);
if (!$comeFrom)
{
@@ -302,21 +302,21 @@ class pm_extended extends private_message
$sc->pmBlocks = $pmBlocks;
$txt = "<form method='post' action='".e_SELF."?".e_QUERY."'>";
$txt .= $this->e107->tp->parseTemplate($PM_BLOCKED_HEADER, true);
$txt .= e107::getParser()->parseTemplate($PM_BLOCKED_HEADER, true);
if($pmTotalBlocked = count($pmBlocks))
{
foreach($pmBlocks as $pmBlocked)
{
$sc->pmBlocked = $pmBlocked;
// setScVar('pm_handler_shortcodes','pmBlocked', $pmBlocked);
$txt .= $this->e107->tp->parseTemplate($PM_BLOCKED_TABLE, true);
$txt .= e107::getParser()->parseTemplate($PM_BLOCKED_TABLE, true);
}
}
else
{
$txt .= $this->e107->tp->parseTemplate($PM_BLOCKED_EMPTY, true);
$txt .= e107::getParser()->parseTemplate($PM_BLOCKED_EMPTY, true);
}
$txt .= $this->e107->tp->parseTemplate($PM_BLOCKED_FOOTER, true);
$txt .= e107::getParser()->parseTemplate($PM_BLOCKED_FOOTER, true);
$txt .= '</form>';
return $txt;
}

7
e107_plugins/pm/pm_class.php
View File

@@ -540,6 +540,7 @@ class private_message
*/
function get_users_inclass($class)
{
$sql = e107::getDb();
if($class == e_UC_MEMBER)
{
$qry = "SELECT user_id, user_name, user_email, user_class FROM `#user` WHERE 1";
@@ -550,12 +551,12 @@ class private_message
}
elseif($class)
{
$regex = "(^|,)(".$this->e107->tp->toDB($class).")(,|$)";
$regex = "(^|,)(".e107::getParser()->toDB($class).")(,|$)";
$qry = "SELECT user_id, user_name, user_email, user_class FROM `#user` WHERE user_class REGEXP '{$regex}'";
}
if($this->e107->sql->db_Select_gen($qry))
if($sql->gen($qry))
{
$ret = $this->e107->sql->db_getList();
$ret = $sql->getList();
return $ret;
}
return FALSE;