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

Code clean-up on newsletter plugin

Browse Source
This commit is contained in:
Tijn Kuyper
2016-03-15 12:24:20 +01:00
parent abab23d37f
commit 2b12bc4132
3 changed files with 33 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
e107_plugins/newsletter/languages/English.php
View File

@@ -2,23 +2,18 @@
/*
* e107 website system
*
* Copyright (C) 2008-2009 e107 Inc (e107.org)
* Copyright (C) 2008-2016 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
* Plugin - newsfeeds
*
* $Source: /cvs_backup/e107_0.8/e107_plugins/newsletter/languages/English.php,v $
* $Revision$
* $Date$
* $Author$
* Plugin - newsletter
*
*/
define("NLLAN_MENU_CAPTION", "Newsletter");
define("NLLAN_48", "You are subscribed from this newsletter - if you wish to unsubscribe please click the button below.");
define("NLLAN_49", "Are you sure you want to un-subscribe from this newsletter?");
define("NLLAN_48", "You are subscribed to this newsletter - if you wish to unsubscribe please click the button below.");
define("NLLAN_49", "Are you sure you want to unsubscribe from this newsletter?");
define("NLLAN_50", "Click button to subscribe (your subscription address is");
define("NLLAN_51", "Unsubscribe");
define("NLLAN_52", "Subscribe");
@@ -28,7 +23,7 @@ define("NLLAN_67", "Archive overview");
define("NLLAN_68", "Invalid parameter defined");
define("NLLAN_69", "No sent newsletters available.");
define("NLLAN_70", "Selected newsletter does not exist");
define("NLLAN_71", "Back"); //TODO User Generic LAN
//define("NLLAN_71", "Back");
define("NLLAN_72", "View archive");
?>

44
e107_plugins/newsletter/newsletter_menu.php
View File

@@ -2,25 +2,12 @@
/*
* e107 website system
*
* Copyright (C) 2008-2013 e107 Inc (e107.org)
* Copyright (C) 2008-2016 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
* Newsletter plugin - newsletter selection menu
*
* $Source: /cvs_backup/e107_0.8/e107_plugins/newsletter/newsletter_menu.php,v $
* $Revision$
* $Date$
* $Author$
*
*/
/**
* e107 Newsletter plugin
*
* @package e107_plugins
* @subpackage newsletter
* @version $Id$;
*/
if (!defined('e107_INIT')) { exit; }
@@ -29,14 +16,15 @@ if (!e107::isInstalled('newsletter'))
return;
}
if(!USER || !$sql -> db_Select('newsletter', '*', "newsletter_parent='0'"))
{ // no newsletters defined yet
// Do not display menu when there are no newsletters defined yet
if(!USER || !$sql->select('newsletter', '*', "newsletter_parent='0'"))
{
return FALSE;
}
$newsletterArray = $sql->db_getList();
$requery = false;
include_lan(e_PLUGIN.'newsletter/languages/'.e_LANGUAGE.'.php');
//include_lan(e_PLUGIN.'newsletter/languages/'.e_LANGUAGE.'.php');
foreach($_POST as $key => $value)
{
@@ -44,34 +32,39 @@ foreach($_POST as $key => $value)
{
$subid = str_replace('nlUnsubscribe_', '', $key);
$newsletterArray[$subid]['newsletter_subscribers'] = str_replace(chr(1).USERID, "", $newsletterArray[$subid]['newsletter_subscribers']);
$sql -> db_Update('newsletter', "newsletter_subscribers='".$newsletterArray[$subid]['newsletter_subscribers']."' WHERE newsletter_id='".intval($subid)."' ");
$sql->update('newsletter', "newsletter_subscribers='".$newsletterArray[$subid]['newsletter_subscribers']."' WHERE newsletter_id='".intval($subid)."' ");
$requery = true;
}
elseif(strpos($key, 'nlSubscribe_') === 0)
{
$subid = str_replace("nlSubscribe_", "", $key);
$nl_subscriber_array = $newsletterArray[$subid]['newsletter_subscribers'];
// prevent double entry of same user id
if (!array_key_exists(USERID, $nl_subscriber_array))
{ // prevent double entry of same user id
{
$newsletterArray[$subid]['newsletter_subscribers'] .= chr(1).USERID;
$subscribers_list = array_flip(explode(chr(1), $newsletterArray[$subid]['newsletter_subscribers']));
sort($subscribers_list);
$new_subscriber_list = implode(chr(1), array_keys($subscribers_list));
// remove the possible zero caused by function array_flip
if (substr($new_subscriber_list, 0, 1) == '0')
{ // remove the possible zero caused by function array_flip
{
$new_subscriber_list = substr($new_subscriber_list, 1);
}
$sql -> db_Update('newsletter', "newsletter_subscribers='".$new_subscriber_list."' WHERE newsletter_id='".intval($subid)."' ");
$sql->update('newsletter', "newsletter_subscribers='".$new_subscriber_list."' WHERE newsletter_id='".intval($subid)."' ");
$requery = true;
}
}
}
global $tp;
//global $tp;
if($requery)
{
if($sql -> db_Select('newsletter', '*', "newsletter_parent='0' "))
if($sql->select('newsletter', '*', "newsletter_parent='0' "))
{
$newsletterArray = $sql->db_getList();
}
@@ -100,9 +93,10 @@ foreach($newsletterArray as $nl)
<input class='btn btn-default button' type='submit' name='nlSubscribe_".$nl['newsletter_id']."' value='".NLLAN_52."' onclick=\"return jsconfirm('".$tp->toJS(NLLAN_53)."') \" />
";
}
$nl_count = $sql -> db_Count('newsletter', "(*)", "WHERE newsletter_parent='".$nl['newsletter_id']."' AND newsletter_flag='1'");
$nl_count = $sql->count('newsletter', "(*)", "WHERE newsletter_parent='".$nl['newsletter_id']."' AND newsletter_flag='1'");
// display issued newsletters
if($nl_count > 0 && USER)
{ // display issued newsletters
{
$text .= "<br /><a href='".e_PLUGIN_ABS."newsletter/nl_archive.php?show.".$nl['newsletter_id']."' alt='".NLLAN_72."' title='".NLLAN_72."'>".NLLAN_72."</a><br/><br/>";
}
$text .= "</form>

11
e107_plugins/newsletter/nl_archive.php
View File

@@ -2,7 +2,7 @@
/*
* e107 website system
*
* Copyright (C) 2008-2013 e107 Inc (e107.org)
* Copyright (C) 2008-2016 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
@@ -10,15 +10,6 @@
*
*/
/**
* e107 Newsletter plugin
*
* @package e107_plugins
* @subpackage newsletter
*/
require_once('../../class2.php');
if (!e107::isInstalled('newsletter') || !ADMIN)
{