mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-13 18:14:26 +02:00
Code Issues Releases Wiki Activity

Code clean-up (global pointers, $e107->, headers). Got rid of all $e107->this->sql and tp

Browse Source
This commit is contained in:
Moc
2013-03-26 12:16:55 +01:00
parent e9d3ae3841
commit f65708cd5a
22 changed files with 352 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
e107_plugins/newsletter/nl_archive.php
View File

@@ -6,12 +6,7 @@
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
* Administration - Site Maintenance
*
* $Source: /cvs_backup/e107_0.8/e107_plugins/newsletter/nl_archive.php,v $
* $Revision$
* $Date$
* $Author$
* Administration - Newsletter archive
*
*/
@@ -21,7 +16,6 @@
*
* @package e107_plugins
* @subpackage newsletter
* @version $Id$;
*/
@@ -34,6 +28,8 @@ if (!$e107->isInstalled('newsletter') || !ADMIN)
include_lan(e_PLUGIN.'newsletter/languages/'.e_LANGUAGE.'.php');
require_once(HEADERF);
$sql = e107::getDb();
$action_parent_id = 0;
$action_nl_id = 0;
if(e_QUERY)
@@ -62,12 +58,12 @@ else
{
$limit_start = $_POST['limit_start'];
}
$nl_count = $e107->sql->db_Count('newsletter', '(*)', "WHERE newsletter_parent='".$action_parent_id."' AND newsletter_flag='1'");
$nl_count = $sql->count('newsletter', '(*)', "WHERE newsletter_parent='".$action_parent_id."' AND newsletter_flag='1'");
if ($nl_count > 0)
{
// Retrieve parent info
$e107->sql->db_Select('newsletter', "*", "newsletter_id='".$action_parent_id."'");
if ($row = $e107->sql->db_Fetch())
$sql->select('newsletter', "*", "newsletter_id='".$action_parent_id."'");
if ($row = $sql->fetch())
{
$parent_newsletter_title = $tp->toHTML($row['newsletter_title'],true);
$parent_newsletter_text = $tp->toHTML($row['newsletter_text'],true);
@@ -86,8 +82,8 @@ else
{ // This should only be done when action is 'showp'
$limit_start = $limit_start + $page_size;
}
$e107->sql->db_Select('newsletter', '*', "newsletter_parent='".$action_parent_id."' AND newsletter_flag='1' ORDER BY newsletter_datestamp DESC LIMIT ".$limit_start.",".$page_size);
while ($row = $e107->sql->db_Fetch())
$sql->select('newsletter', '*', "newsletter_parent='".$action_parent_id."' AND newsletter_flag='1' ORDER BY newsletter_datestamp DESC LIMIT ".$limit_start.",".$page_size);
while ($row = $sql->fetch())
{
$ga = new convert();
$newsletter_datestamp = $ga->convert_date($row['newsletter_datestamp'], 'long');
@@ -107,14 +103,14 @@ else
if($limit_start + $page_size < $nl_count)
{
$text .= "<form id='nl' method='post' action='".e_PLUGIN."newsletter/nl_archive.php?showp.".$action_parent_id."'>
<br /><input class='button' name='submit' type='submit' value='View older newsletters in archive'/>
<br /><input class='btn button' name='submit' type='submit' value='View older newsletters in archive'/>
<input type='hidden' name='limit_start' value='".$limit_start."'/></form>";
}
}
else // Show requested newsletter
{
$e107->sql->db_Select('newsletter', '*', "newsletter_parent='".$action_parent_id."' AND newsletter_id='".$action_nl_id."' AND newsletter_flag='1'");
if ($row = $e107->sql->db_Fetch())
$sql->select('newsletter', '*', "newsletter_parent='".$action_parent_id."' AND newsletter_id='".$action_nl_id."' AND newsletter_flag='1'");
if ($row = $sql->fetch())
{
// Display parent header
$text .= "$parent_newsletter_title<br />
@@ -129,7 +125,7 @@ else
// Display parent footer
$text .= "$parent_newsletter_footer<br />";
// Display back to newsletter overview button
$text .= "<br /><a href='javascript:history.go(-1);'><input class='button' type='submit' value='".NLLAN_71."'</a>";
$text .= "<br /><a href='javascript:history.go(-1);'><input class='btn button' type='submit' value='".NLLAN_71."'</a>";
}
else
{