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

Newsletter plugin major clean-up. GUI and LAN optimization (#90, #6)

Browse Source
This commit is contained in:
Tijn Kuyper
2013-02-08 14:57:15 +01:00
parent a561aa04fe
commit 44dba93c1a
2 changed files with 175 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

249
e107_plugins/newsletter/admin_config.php
View File

@@ -2,17 +2,14 @@
/* /*
* e107 website system * 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 * Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
* *
* Administration - Site Maintenance * Plugin - Newsletter
*
* $Source: /cvs_backup/e107_0.8/e107_plugins/newsletter/admin_config.php,v $
* $Revision$
* $Date$
* $Author$
* *
* $URL$
* $Id$
*/ */
require_once('../../class2.php'); require_once('../../class2.php');
if (!getperms('P')) if (!getperms('P'))
@@ -25,6 +22,9 @@ require_once(e_ADMIN.'auth.php');
// Include ren_help for display_help (while showing BBcodes) // Include ren_help for display_help (while showing BBcodes)
require_once(e_HANDLER.'ren_help.php'); require_once(e_HANDLER.'ren_help.php');
require_once(e_HANDLER.'message_handler.php');
$mes = e107::getMessage();
if (e_QUERY) if (e_QUERY)
{ {
list($action, $id, $key) = explode('.', e_QUERY); list($action, $id, $key) = explode('.', e_QUERY);
@@ -78,6 +78,7 @@ class newsletter
{ {
$tp = e107::getParser(); $tp = e107::getParser();
$ns = e107::getRender(); $ns = e107::getRender();
$mes = e107::getMessage();
$this->e107 = e107::getInstance(); // TODO remove? $this->e107 = e107::getInstance(); // TODO remove?
foreach($_POST as $key => $value) foreach($_POST as $key => $value)
@@ -105,9 +106,13 @@ class newsletter
$this->createIssue(); $this->createIssue();
} }
if($this -> message) /*if($this -> message)
{ {
$ns->tablerender('', "<div style='text-align:center'><b>".$this -> message.'</b></div>'); $ns->tablerender('', "<div style='text-align:center'><b>".$this -> message.'</b></div>');
}*/
if($mes)
{
$ns->tablerender($caption, $mes->render() . $text);
} }
} }
@@ -116,35 +121,41 @@ class newsletter
{ {
$sql = e107::getDb(); $sql = e107::getDb();
$ns = e107::getRender(); $ns = e107::getRender();
$mes = e107::getMessage();
$tp = e107::getParser();
if(!$sql->db_Select('newsletter', '*', "newsletter_parent='0' ORDER BY newsletter_id DESC")) if(!$sql->db_Select('newsletter', '*', "newsletter_parent='0' ORDER BY newsletter_id DESC"))
{ {
$text = NLLAN_05; //$text = NLLAN_05;
$mes->addInfo(NLLAN_05);
} }
else else
{ {
$text = "<form action='".e_SELF."' id='newsletterform' method='post'> $text = "<form action='".e_SELF."' id='newsletterform' method='post'>
<table class='table adminlist'> <table class='table adminlist'>
<colgroup>
<col style='width: 5%; text-align: center;' />
<col style='width: 65%;' />
<col style='width: 20%; text-align: center;' />
<col style='width: 10%; text-align: center;' />
</colgroup>
<tr> <tr>
<td style='width:5%;>".NLLAN_55."</td> <td>".LAN_ID."</td>
<td style='width:65%'>".NLLAN_06."</td> <td>".LAN_NAME."</td>
<td style='width:20%;>".NLLAN_07."</td> <td>".NLLAN_07."</td>
<td style='width:10%;>".NLLAN_08."</td> <td>".LAN_OPTIONS."</td>
</tr> </tr>
"; ";
$nlArray = $this->e107->sql->db_getList(); $nlArray = $sql->db_getList();
foreach($nlArray as $data) foreach($nlArray as $data)
{ {
$text .= "<tr> $text .= "
<td style='width:5%; text-align: center;'>".$data['newsletter_id']."</td> <tr>
<td style='width:65%'>".$data['newsletter_title']."</td> <td>".$data['newsletter_id']."</td>
<td style='width:20%;>".((substr_count($data['newsletter_subscribers'], chr(1))!= 0)?"<a href='".e_SELF."?vs.".$data['newsletter_id']."'>".substr_count($data['newsletter_subscribers'], chr(1))."</a>":substr_count($data['newsletter_subscribers'], chr(1)))."</td> <td>".$data['newsletter_title']."</td>
<td style='width:10%; text-align: center;'> <td>".((substr_count($data['newsletter_subscribers'], chr(1))!= 0)?"<a href='".e_SELF."?vs.".$data['newsletter_id']."'>".substr_count($data['newsletter_subscribers'], chr(1))."</a>":substr_count($data['newsletter_subscribers'], chr(1)))."</td>
<a href='".e_SELF."?edit.".$data['newsletter_id']."'>".ADMIN_EDIT_ICON."</a> <td><a href='".e_SELF."?edit.".$data['newsletter_id']."'>".ADMIN_EDIT_ICON."</a><input type='image' title='".LAN_DELETE."' name='delete[newsletter_".$data['newsletter_id']."]' src='".ADMIN_DELETE_ICON_PATH."' onclick=\"return jsconfirm('".$tp->toJS(LAN_CONFIRMDEL." [ID: ".$data['newsletter_id']." ]")."') \"/></td>
<input type='image' title='".LAN_DELETE."' name='delete[newsletter_".$data['newsletter_id']."]' src='".ADMIN_DELETE_ICON_PATH."' onclick=\"return jsconfirm('".$this->e107->tp->toJS(NLLAN_09." [ID: ".$data['newsletter_id']." ]")."') \"/>
</td>
</tr> </tr>
"; ";
} }
@@ -153,22 +164,30 @@ class newsletter
</form> </form>
"; ";
} }
$this->e107->ns->tablerender(NLLAN_10, $text); $ns->tablerender(NLLAN_10, $mes->render() . $text);
if(!$sql->db_Select('newsletter', '*', "newsletter_parent!='0' ORDER BY newsletter_id DESC")) if(!$sql->db_Select('newsletter', '*', "newsletter_parent!='0' ORDER BY newsletter_id DESC"))
{ {
$text = NLLAN_11; //$text = NLLAN_11;
$mes->addinfo(NLLAN_11);
} }
else else
{ {
$text = "<form action='".e_SELF."' id='newsletterform2' method='post'> $text = "<form action='".e_SELF."' id='newsletterform2' method='post'>
<table class='table adminlist'> <table class='table adminlist'>
<colgroup>
<col style='width: 5%; text-align: center;' />
<col style='width: 10%; text-align: center;' />
<col style='width: 65%;' />
<col style='width: 10%; text-align: center;' />
<col style='width: 10%; text-align: center;' />
</colgroup>
<tr> <tr>
<td style='width:5%;>ID</td> <td>".LAN_ID."</td>
<td style='width:10%;>".NLLAN_12."</td> <td>".NLLAN_12."</td>
<td style='width:65%'>".NLLAN_13."</td> <td>".NLLAN_13."</td>
<td style='width:10%;>".NLLAN_14."</td> <td>".NLLAN_14."</td>
<td style='width:10%;>".NLLAN_15."</td> <td>".LAN_OPTIONS."</td>
</tr> </tr>
"; ";
@@ -176,14 +195,13 @@ class newsletter
foreach($nlArray as $data) foreach($nlArray as $data)
{ {
$text .= "<tr> $text .= "
<td style='width:5%; text-align: center;'>".$data['newsletter_id']."</td> <tr>
<td style='width:10%; text-align: center;'>".$data['newsletter_issue']."</td> <td>".$data['newsletter_id']."</td>
<td style='width:65%'>[ ".$data['newsletter_parent']." ] ".$data['newsletter_title']."</td> <td>".$data['newsletter_issue']."</td>
<td style='width:10%; text-align: center;'>".($data['newsletter_flag'] ? NLLAN_16 : "<input class='button' type='submit' name='nlmailnow_".$data['newsletter_id']."' value='".NLLAN_17."' onclick=\"return jsconfirm('".$this->e107->tp->toJS(NLLAN_18)."') \" />")."</td> <td>[ ".$data['newsletter_parent']." ] ".$data['newsletter_title']."</td>
<td style='width:10%; text-align: center;'> <td>".($data['newsletter_flag'] ? LAN_YES : "<input class='button' type='submit' name='nlmailnow_".$data['newsletter_id']."' value='".NLLAN_17."' onclick=\"return jsconfirm('".$tp->toJS(NLLAN_18)."') \" />")."</td>
<a href='".e_SELF."?edit.".$data['newsletter_id']."'>".ADMIN_EDIT_ICON."</a> <td><a href='".e_SELF."?edit.".$data['newsletter_id']."'>".ADMIN_EDIT_ICON."</a><input type='image' title='".LAN_DELETE."' name='delete[issue_".$data['newsletter_id']."]' src='".ADMIN_DELETE_ICON_PATH."' onclick=\"return jsconfirm('".$tp->toJS(NLLAN_19." [ID: ".$data['newsletter_id']." ]")."') \"/>
<input type='image' title='".LAN_DELETE."' name='delete[issue_".$data['newsletter_id']."]' src='".ADMIN_DELETE_ICON_PATH."' onclick=\"return jsconfirm('".$this->e107->tp->toJS(NLLAN_19." [ID: ".$data['newsletter_id']." ]")."') \"/>
</td> </td>
</tr> </tr>
@@ -194,7 +212,7 @@ class newsletter
</form> </form>
"; ";
} }
$ns->tablerender(NLLAN_20, $text); $ns->tablerender(NLLAN_20, $mes->render() . $text);
} }
@@ -218,11 +236,11 @@ class newsletter
<form action='".e_SELF."' id='newsletterform' method='post'> <form action='".e_SELF."' id='newsletterform' method='post'>
<table class='table adminform'> <table class='table adminform'>
<tr> <tr>
<td>".NLLAN_21."</td> <td>".LAN_TITLE."</td>
<td><input class='tbox' type='text' name='newsletter_title' size='60' value='{$newsletter_title}' maxlength='200' /></td> <td><input class='tbox' type='text' name='newsletter_title' size='60' value='{$newsletter_title}' maxlength='200' /></td>
</tr> </tr>
<tr> <tr>
<td>".NLLAN_22."</td> <td>".LAN_DESCRIPTION."</td>
<td><textarea class='tbox' id='data' name='newsletter_text' cols='80' rows='10'>{$newsletter_text}</textarea></td> <td><textarea class='tbox' id='data' name='newsletter_text' cols='80' rows='10'>{$newsletter_text}</textarea></td>
</tr> </tr>
<tr> <tr>
@@ -234,13 +252,14 @@ class newsletter
<td><textarea class='tbox' id='data' name='newsletter_footer' cols='80' rows='5'>{$newsletter_footer}</textarea></td> <td><textarea class='tbox' id='data' name='newsletter_footer' cols='80' rows='5'>{$newsletter_footer}</textarea></td>
</tr> </tr>
</table> </table>
<div class='buttons-bar center'> <div class='buttons-bar center'>
".($edit ? $frm->admin_button('createNewsletter', NLLAN_25, 'submit')."\n<input type='hidden' name='editid' value='{$edit['newsletter_id']}' />" : $frm->admin_button('createNewsletter', NLLAN_26, 'submit'))." ".($edit ? $frm->admin_button('createNewsletter', LAN_UPDATE, 'update')."\n<input type='hidden' name='editid' value='{$edit['newsletter_id']}' />" : $frm->admin_button('createNewsletter', LAN_CREATE, 'create'))."
</div> </div>
</form> </form>
"; ";
$caption = ($edit ? NLLAN_25 : NLLAN_26); $caption = ($edit ? LAN_PLUGIN_NEWSLETTER_NAME.' - '.LAN_UPDATE : LAN_PLUGIN_NEWSLETTER_NAME.' - '.LAN_CREATE);
$ns->tablerender($caption, $text); $ns->tablerender($caption, $text);
} }
@@ -258,6 +277,7 @@ class newsletter
{ {
$tp = e107::getParser(); $tp = e107::getParser();
$sql = e107::getDb(); $sql = e107::getDb();
$mes = e107::getMessage();
$letter['newsletter_title'] = $tp->toDB($_POST['newsletter_title']); $letter['newsletter_title'] = $tp->toDB($_POST['newsletter_title']);
$letter['newsletter_text'] = $tp->toDB($_POST['newsletter_text']); $letter['newsletter_text'] = $tp->toDB($_POST['newsletter_text']);
@@ -267,13 +287,15 @@ class newsletter
if(isset($_POST['editid'])) if(isset($_POST['editid']))
{ {
$sql -> db_Update('newsletter', "newsletter_title='{$letter['newsletter_title']}', newsletter_text='{$letter['newsletter_text']}', newsletter_header='{$letter['newsletter_header']}', newsletter_footer='{$letter['newsletter_footer']}' WHERE newsletter_id=".intval($_POST['editid'])); $sql -> db_Update('newsletter', "newsletter_title='{$letter['newsletter_title']}', newsletter_text='{$letter['newsletter_text']}', newsletter_header='{$letter['newsletter_header']}', newsletter_footer='{$letter['newsletter_footer']}' WHERE newsletter_id=".intval($_POST['editid']));
$this -> message = NLLAN_27; //$this -> message = NLLAN_27;
$mes->addSuccess(LAN_UPDATED);
} }
else else
{ {
$letter['newsletter_datestamp'] = time(); $letter['newsletter_datestamp'] = time();
$sql->db_Insert('newsletter', $letter); $sql->db_Insert('newsletter', $letter);
$this -> message = NLLAN_28; //$this -> message = NLLAN_28;
$mes->addSuccess(LAN_CREATED);
} }
} }
@@ -283,6 +305,8 @@ class newsletter
$tp = e107::getParser(); $tp = e107::getParser();
$ns = e107::getRender(); $ns = e107::getRender();
$sql = e107::getDb(); $sql = e107::getDb();
$mes = e107::getMessage();
$frm = e107::getForm();
// Passed data is from DB // Passed data is from DB
if($edit) if($edit)
@@ -294,7 +318,8 @@ class newsletter
if(!$sql->db_Select('newsletter', '*', "newsletter_parent='0' ")) if(!$sql->db_Select('newsletter', '*', "newsletter_parent='0' "))
{ {
$this -> message = NLLAN_05; //$this -> message = NLLAN_05;
$mes->addInfo(NLLAN_05);
return; return;
} }
@@ -304,18 +329,18 @@ class newsletter
<form action='".e_SELF."' id='newsletterform' method='post'> <form action='".e_SELF."' id='newsletterform' method='post'>
<table class='table adminform'> <table class='table adminform'>
<tr> <tr>
<td>".NLLAN_30."</td> <td>".NLLAN_30."</td>
<td> <td>
<select name='newsletter_parent' class='tbox'> <select name='newsletter_parent' class='tbox'>
"; ";
foreach($nlArray as $nl) foreach($nlArray as $nl)
{ {
$text .= "<option value='".$nl['newsletter_id']."'>".$nl['newsletter_title']."</option>\n"; $text .= "<option value='".$nl['newsletter_id']."'>".$nl['newsletter_title']."</option>\n";
} }
$text .= "</select> $text .= "</select></td>
<tr> <tr>
<td>".NLLAN_31."</td> <td>".NLLAN_31."</td>
@@ -332,7 +357,7 @@ class newsletter
</tr> </tr>
</table> </table>
<div class='buttons-bar center'> <div class='buttons-bar center'>
".($edit ? $frm->admin_button('createIssue', NLLAN_34, 'update')."\n<input type='hidden' name='editid' value='{$edit['newsletter_id']}' />" : $frm->admin_button('createIssue', NLLAN_35, 'submit'))." ".($edit ? $frm->admin_button('createIssue', LAN_UPDATE, 'update')."\n<input type='hidden' name='editid' value='{$edit['newsletter_id']}' />" : $frm->admin_button('createIssue', LAN_CREATE, 'submit'))."
</div> </div>
</form> </form>
</div> </div>
@@ -340,28 +365,36 @@ class newsletter
$caption = ($edit ? NLLAN_36 : NLLAN_37); $caption = ($edit ? NLLAN_36 : NLLAN_37);
$ns->tablerender($caption, $text); $ns->tablerender($caption, $mes->render() . $text);
} }
function createIssue() function createIssue()
{ {
$letter['newsletter_title'] = $this->e107->tp->toDB($_POST['newsletter_title']); $tp = e107::getParser();
$letter['newsletter_text'] = $this->e107->tp->toDB($_POST['newsletter_text']); $sql = e107::getDb();
$mes = e107::getMessage();
$letter['newsletter_title'] = $tp->toDB($_POST['newsletter_title']);
$letter['newsletter_text'] = $tp->toDB($_POST['newsletter_text']);
$letter['newsletter_parent'] = intval($_POST['newsletter_parent']); $letter['newsletter_parent'] = intval($_POST['newsletter_parent']);
$letter['newsletter_issue'] = $this->e107->tp->toDB($_POST['newsletter_issue']); $letter['newsletter_issue'] = $tp->toDB($_POST['newsletter_issue']);
if (isset($_POST['editid'])) if (isset($_POST['editid']))
{ {
$this->e107->sql->db_Update('newsletter', "newsletter_title='{$letter['newsletter_title']}', newsletter_text='{$letter['newsletter_text']}', newsletter_parent='".$letter['newsletter_parent']."', newsletter_issue='".$letter['newsletter_issue']."' WHERE newsletter_id=".intval($_POST['editid'])); $sql->db_Update('newsletter', "newsletter_title='{$letter['newsletter_title']}', newsletter_text='{$letter['newsletter_text']}', newsletter_parent='".$letter['newsletter_parent']."', newsletter_issue='".$letter['newsletter_issue']."' WHERE newsletter_id=".intval($_POST['editid']));
$this -> message = NLLAN_38; //$this -> message = NLLAN_38;
$mes->addSucces(LAN_UPDATED);
} }
else else
{ {
$letter['newsletter_datestamp'] = time(); $letter['newsletter_datestamp'] = time();
$this->e107->sql->db_Insert('newsletter', $letter); $sql->db_Insert('newsletter', $letter);
$this -> message = NLLAN_39; //$this -> message = NLLAN_39;
$mes->addSuccess(NLLAN_39);
} }
$ns->tablerender($caption, $mes->render() . $text);
} }
@@ -377,6 +410,7 @@ class newsletter
{ {
$pref = e107::getPref(); $pref = e107::getPref();
$sql = e107::getDb(); $sql = e107::getDb();
$mes = e107::getMessage();
$issue = intval(str_replace('nlmailnow_', '', $issue)); $issue = intval(str_replace('nlmailnow_', '', $issue));
@@ -460,14 +494,18 @@ class newsletter
if ($counters['add'] == 0) if ($counters['add'] == 0)
{ {
$mailer->deleteEmail($mailMainID); // No subscribers - delete email $mailer->deleteEmail($mailMainID); // No subscribers - delete email
$this->message = NLLAN_41; //$this->message = NLLAN_41;
$mes->addError(NLLAN_41);
} }
else else
{ {
$mailer->activateEmail($mailMainID, FALSE); // Actually mark the email for sending $mailer->activateEmail($mailMainID, FALSE); // Actually mark the email for sending
$this->message = str_replace('--COUNT--', $counters['add'],NLLAN_40); //$this->message = str_replace('--COUNT--', $counters['add'],NLLAN_40);
$mes->addSuccess(str_replace('--COUNT--', $counters['add'], NLLAN_40));
} }
$sql->db_Update('newsletter', "newsletter_flag='1' WHERE newsletter_id=".$issue); $sql->db_Update('newsletter', "newsletter_flag='1' WHERE newsletter_id=".$issue);
$ns->tablerender($caption, $mes->render() . $text);
} }
@@ -484,7 +522,7 @@ class newsletter
if($sql->db_Select("newsletter", "*", "newsletter_id='{$id}'")) if($sql->db_Select("newsletter", "*", "newsletter_id='{$id}'"))
{ {
$foo = $this->e107->sql->db_Fetch(); $foo = $sql->db_Fetch();
if(!$foo['newsletter_parent']) if(!$foo['newsletter_parent'])
{ {
$this -> defineNewsletter($foo); $this -> defineNewsletter($foo);
@@ -505,19 +543,22 @@ class newsletter
function deleteNewsletter() function deleteNewsletter()
{ {
$sql = e107::getDb(); $sql = e107::getDb();
$mes = e107::getMessage();
$tmp = each($_POST['delete']); $tmp = each($_POST['delete']);
if(strpos($tmp['key'], 'newsletter') === 0) if(strpos($tmp['key'], 'newsletter') === 0)
{ {
$id = intval(str_replace('newsletter_', '', $tmp['key'])); $id = intval(str_replace('newsletter_', '', $tmp['key']));
$sql->db_Delete('newsletter', "newsletter_id='{$id}'"); $sql->db_Delete('newsletter', "newsletter_id='{$id}'");
$this -> message = NLLAN_42; //$this -> message = NLLAN_42;
$mes->addSuccess(LAN_DELETED);
} }
else else
{ {
$id = intval(str_replace('issue_', '', $tmp['key'])); $id = intval(str_replace('issue_', '', $tmp['key']));
$sql->db_Delete('newsletter', "newsletter_id='{$id}' "); $sql->db_Delete('newsletter', "newsletter_id='{$id}' ");
$this -> message = NLLAN_43; //$this -> message = NLLAN_43;
$mes->addSuccess(LAN_DELETED);
} }
} }
@@ -551,27 +592,40 @@ class newsletter
function view_subscribers($p_id) function view_subscribers($p_id)
{ {
$ns = e107::getRender(); $ns = e107::getRender();
$mes = e107::getMessage();
$frm = e107::getForm();
$nl_sql = new db; $nl_sql = new db;
$_nl_sanatized = ''; $_nl_sanatized = '';
if(!$nl_sql -> db_Select('newsletter', '*', 'newsletter_id='.$p_id)) if(!$nl_sql->db_Select('newsletter', '*', 'newsletter_id='.$p_id))// Check if newsletter id is available
{ // Check if newsletter id is available {
$vs_text .= "<br /><br /><span style='text-align:center'>".NLLAN_56."<br /><br/> $mes->addError(NLLAN_56);
<input class='button' type=button value='".NLLAN_57."' onClick=\"window.location='".e_SELF."'\"></span>"; $vs_text .= "<div class='buttonsbar center'>
$ns -> tablerender(NLLAN_58, $vs_text); <input class='button' type=button value='".LAN_BACK."' onClick=\"window.location='".e_SELF."'\">
</div>";
$ns -> tablerender(NLLAN_65.' '.$p_id, $mes->render() . $vs_text);
return; return;
} }
else else
{ {
$vs_text .= " $vs_text .= "
<form action='".e_SELF."' id='newsletterform' method='post'> <form action='".e_SELF."' id='newsletterform' method='post'>
<table style='".ADMIN_WIDTH."' class='fborder'> <table class='table adminlist'>
<colgroup>
<col style='width: 5%; text-align: center;' />
<col style='width: 35%;' />
<col style='width: 45%;' />
<col style='width: 15%; text-align: center;' />
</colgroup>
<tr> <tr>
<td style='width:5%;>".NLLAN_55."</td> <td>".LAN_ID."</td>
<td style='width:35%'>".NLLAN_59."</td> <td>".LAN_NAME."</td>
<td style='width:45%;'>".NLLAN_60."</td> <td>".LAN_EMAIL."</td>
<td style='width:15%;>".NLLAN_61."</td> <td>".LAN_OPTIONS."</td>
</tr>"; </tr>";
if($nl_row = $nl_sql-> db_Fetch()) if($nl_row = $nl_sql-> db_Fetch())
{ {
$subscribers_list = explode(chr(1), trim($nl_row['newsletter_subscribers'])); $subscribers_list = explode(chr(1), trim($nl_row['newsletter_subscribers']));
@@ -595,16 +649,12 @@ class newsletter
$nl_sql -> db_Select("user", "*", "user_id=".$val); $nl_sql -> db_Select("user", "*", "user_id=".$val);
if($nl_row = $nl_sql-> db_Fetch()) if($nl_row = $nl_sql-> db_Fetch())
{ {
$vs_text .= "<tr> $vs_text .= "
<td style='text-align: center;'>{$val} <tr>
</td> <td>".$val."</td>
<td><a href='".e_BASE."user.php?id.{$val}'>".$nl_row['user_name']."</a> <td><a href='".e_BASE."user.php?id.{$val}'>".$nl_row['user_name']."</a></td>
</td> <td>".$nl_row['user_email']."</td>
<td>".$nl_row['user_email']." <td><a href='".e_SELF."?remove.{$p_id}.{$val}'>".ADMIN_DELETE_ICON."</a>".(($nl_row['user_ban'] > 0) ? NLLAN_62 : "")."</td>
</td>
<td style='text-align: center;'><a href='".e_SELF."?remove.{$p_id}.{$val}'>".ADMIN_DELETE_ICON."</a>
".(($nl_row['user_ban'] > 0) ? NLLAN_62 : "")."
</td>
</tr>"; </tr>";
$_last_subscriber = $val; $_last_subscriber = $val;
} }
@@ -622,17 +672,22 @@ class newsletter
} }
$vs_text .= " $vs_text .= "
<tr> <tr>
<td colspan='4'>".NLLAN_63.": ".$subscribers_total_count."</td> <td colspan='4'>".NLLAN_63.": ".$subscribers_total_count."</td>
</tr> </tr>
<tr><td colspan='4' style='text-align:center;'><br /><input class='button' type='submit' value='".NLLAN_64."' /></td></tr> </table>
</table></form> <div class='buttonsbar center'>
".$frm->admin_button('submit', LAN_BACK, 'submit')."
</div>
</form>
"; ";
if ($_nl_sanatized == 1) if ($_nl_sanatized == 1)
{ {
$vs_text .= "<br /><div style='text-align:center;'>".NLLAN_66."</div>"; //$vs_text .= "<br /><div style='text-align:center;'>".NLLAN_66."</div>";
$mes->addInfo(NLLAN_66);
} }
$ns->tablerender(NLLAN_65.' '.$p_id, $vs_text);
$ns->tablerender(NLLAN_65.' '.$p_id, $mes->render() . $vs_text);
} }

45
e107_plugins/newsletter/languages/English_admin_newsletter.php
View File

@@ -2,12 +2,13 @@
/* /*
* e107 website system * 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 * Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
* *
* Plugin - newsfeeds * Plugin - Newsletter
* *
* $URL$
* $Id$ * $Id$
*/ */
@@ -17,18 +18,18 @@
define('NLLAN_04', 'The newsletter plugin has been successfully installed. To configure, return to your main admin page and click on \'Newsletter\' in the plugin section.'); define('NLLAN_04', 'The newsletter plugin has been successfully installed. To configure, return to your main admin page and click on \'Newsletter\' in the plugin section.');
define('NLLAN_05', 'No newsletters defined yet'); define('NLLAN_05', 'No newsletters defined yet');
define('NLLAN_06', 'Name'); //define('NLLAN_06', 'Name');
define('NLLAN_07', 'Subscribers'); define('NLLAN_07', 'Subscribers');
//define('NLLAN_08', 'Options'); //define('NLLAN_08', 'Options');
define('NLLAN_09', 'Are you sure you want to delete this newsletter?'); //define('NLLAN_09', 'Are you sure you want to delete this newsletter?');
define('NLLAN_10', 'Existing Newsletters'); define('NLLAN_10', 'Existing Newsletters');
define('NLLAN_11', 'No newsletter issues yet'); define('NLLAN_11', 'No newsletter issues yet.');
define('NLLAN_12', 'Issue'); define('NLLAN_12', 'Issue');
define('NLLAN_13', '[ Parent ID ] Subject/Title'); define('NLLAN_13', '[ Parent ID ] Subject/Title');
define('NLLAN_14', 'Mailed?'); define('NLLAN_14', 'Mailed?');
//define('NLLAN_15', 'Options'); //define('NLLAN_15', 'Options');
define('NLLAN_16', 'yes'); //define('NLLAN_16', 'yes');
define('NLLAN_17', 'Not sent out - click to send'); define('NLLAN_17', 'Not sent out - click to send');
define('NLLAN_18', 'Are you sure you want to mail this issue to subscribers?'); define('NLLAN_18', 'Are you sure you want to mail this issue to subscribers?');
define('NLLAN_19', 'Are you sure you want to delete this newsletter issue?'); define('NLLAN_19', 'Are you sure you want to delete this newsletter issue?');
@@ -39,40 +40,40 @@ define('NLLAN_23', 'Header');
define('NLLAN_24', 'Footer'); define('NLLAN_24', 'Footer');
//define('NLLAN_25', 'Update Newsletter'); //define('NLLAN_25', 'Update Newsletter');
//define('NLLAN_26', 'Create Newsletter'); //define('NLLAN_26', 'Create Newsletter');
define('NLLAN_27', 'Newsletter updated in database.'); //define('NLLAN_27', 'Newsletter updated in database.');
define('NLLAN_28', 'Newsletter defined and saved in database.'); //define('NLLAN_28', 'Newsletter defined and saved in database.');
//define('NLLAN_29', 'No newsletters defined yet.'); //define('NLLAN_29', 'No newsletters defined yet.');
define('NLLAN_30', 'Newsletter'); define('NLLAN_30', 'Newsletter');
define('NLLAN_31', 'Subject / Title'); define('NLLAN_31', 'Subject / Title');
define('NLLAN_32', 'Issue Number'); define('NLLAN_32', 'Issue Number');
define('NLLAN_33', 'Text'); define('NLLAN_33', 'Text');
define('NLLAN_34', 'Update Mailing'); //define('NLLAN_34', 'Update Mailing');
define('NLLAN_35', 'Create Mailing'); //define('NLLAN_35', 'Create Mailing');
define('NLLAN_36', 'Update Newsletter Issue'); define('NLLAN_36', 'Update Newsletter Issue');
define('NLLAN_37', 'Create Newsletter Issue'); define('NLLAN_37', 'Create Newsletter Issue');
define('NLLAN_38', 'Newsletter updated in database.'); //define('NLLAN_38', 'Newsletter updated in database.');
define('NLLAN_39', 'Newsletter issue saved in database - to send out, click the \'Release Issue\' button in the Options menu.'); define('NLLAN_39', 'Newsletter issue saved in database - to send out, click the \'Release Issue\' button in the Options menu.');
define('NLLAN_40', 'Mailout added to mailout queue - issue sent to --COUNT-- subscriber(s).'); define('NLLAN_40', 'Mailout added to mailout queue - issue sent to --COUNT-- subscriber(s).');
define('NLLAN_41', 'No subscribers found - email cancelled'); define('NLLAN_41', 'No subscribers found - email cancelled');
define('NLLAN_42', 'Newsletter deleted.'); //define('NLLAN_42', 'Newsletter deleted.');
define('NLLAN_43', 'Newsletter issue deleted.'); //define('NLLAN_43', 'Newsletter issue deleted.');
define('NLLAN_44', 'Newsletter Front Page'); define('NLLAN_44', 'Newsletter Front Page'); // FIXME admin_menu
define('NLLAN_45', 'Create Newsletter'); define('NLLAN_45', 'Create Newsletter'); // FIXME admin_menu
define('NLLAN_46', 'Create mailing'); define('NLLAN_46', 'Create Mailing'); // FIXME admin_menu
define('NLLAN_47', 'Newsletter Options'); define('NLLAN_47', 'Newsletter Options');
define('NLLAN_48', 'Newsletter Subscribers'); define('NLLAN_48', 'Newsletter Subscribers');
define('NLLAN_49', 'Newsletter: '); define('NLLAN_49', 'Newsletter: ');
define('NLLAN_54', 'Sending'); define('NLLAN_54', 'Sending');
define('NLLAN_55', 'ID'); //define('NLLAN_55', 'ID');
define('NLLAN_56', 'Newsletter ID not available'); define('NLLAN_56', 'Newsletter ID not available');
define('NLLAN_57', 'Return to previous page'); //define('NLLAN_57', 'Return to previous page');
define('NLLAN_58', 'Error'); //define('NLLAN_58', 'Error');
define('NLLAN_59', 'Name'); //define('NLLAN_59', 'Name');
define('NLLAN_60', 'Email'); //define('NLLAN_60', 'Email');
define('NLLAN_61', 'Actions'); //define('NLLAN_61', 'Actions');
define('NLLAN_62', 'User is banned! (or not fully signed up)'); define('NLLAN_62', 'User is banned! (or not fully signed up)');
define('NLLAN_63', 'Total subscribers'); define('NLLAN_63', 'Total subscribers');
define('NLLAN_64', 'Return to Newsletter frontpage'); define('NLLAN_64', 'Return to Newsletter frontpage');