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

Notice removal

Browse Source
This commit is contained in:
e107steved
2010-01-10 11:01:29 +00:00
parent 3c772dee49
commit 239e7154b5
4 changed files with 52 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
e107_admin/mailout.php
View File

@@ -2,19 +2,28 @@
/* /*
* e107 website system * e107 website system
* *
* Copyright (C) 2008-2009 e107 Inc (e107.org) * Copyright (C) 2008-2010 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 * Administration - Mailout
* *
* $Source: /cvs_backup/e107_0.8/e107_admin/mailout.php,v $ * $Source: /cvs_backup/e107_0.8/e107_admin/mailout.php,v $
* $Revision: 1.34 $ * $Revision: 1.35 $
* $Date: 2010-01-10 06:20:31 $ * $Date: 2010-01-10 11:01:27 $
* $Author: e107coders $ * $Author: e107steved $
* *
*/ */
/**
* e107 Mail handling - Admin
*
* @package e107
* @subpackage admin
* @version $Id: mailout.php,v 1.35 2010-01-10 11:01:27 e107steved Exp $;
*/
/* /*
Features: Features:
1. Additional sources of email addresses for mailouts can be provided via plugins, and can be enabled via the mailout preferences page 1. Additional sources of email addresses for mailouts can be provided via plugins, and can be enabled via the mailout preferences page
@@ -523,7 +532,7 @@ switch ($action)
case 'makemail' : case 'makemail' :
default : default :
if (!is_array($mailData)) if (!isset($mailData) || !is_array($mailData))
{ {
$mailData = array(); // Empty array just in case $mailData = array(); // Empty array just in case
} }
@@ -577,6 +586,7 @@ function saveMailPrefs(&$emessage)
$temp['mail_workpertick'] = intval($_POST['mail_workpertick']); $temp['mail_workpertick'] = intval($_POST['mail_workpertick']);
$temp['mail_workpertick'] = min($temp['mail_workpertick'],1000); $temp['mail_workpertick'] = min($temp['mail_workpertick'],1000);
$temp['mail_bounce'] = isset($bounceOpts[$_POST['mail_bounce']]) ? $_POST['mail_bounce'] : 'none'; $temp['mail_bounce'] = isset($bounceOpts[$_POST['mail_bounce']]) ? $_POST['mail_bounce'] : 'none';
$temp['mail_bounce_auto'] = 0; // Make sure this is always defined
switch ($temp['mail_bounce']) switch ($temp['mail_bounce'])
{ {
case 'none' : case 'none' :
@@ -594,9 +604,9 @@ function saveMailPrefs(&$emessage)
$temp['mail_bounce_user'] = $e107->tp->toDB($_POST['mail_bounce_user']); $temp['mail_bounce_user'] = $e107->tp->toDB($_POST['mail_bounce_user']);
$temp['mail_bounce_pass'] = $e107->tp->toDB($_POST['mail_bounce_pass']); $temp['mail_bounce_pass'] = $e107->tp->toDB($_POST['mail_bounce_pass']);
$temp['mail_bounce_type'] = $e107->tp->toDB($_POST['mail_bounce_type']); $temp['mail_bounce_type'] = $e107->tp->toDB($_POST['mail_bounce_type']);
$temp['mail_bounce_delete'] = intval($_POST['mail_bounce_delete']); $temp['mail_bounce_delete'] = intval(varset($_POST['mail_bounce_delete'], 0));
$temp['mailout_enabled'] = implode(',',$_POST['mail_mailer_enabled']); $temp['mailout_enabled'] = implode(',',varset($_POST['mail_mailer_enabled'], ''));
$temp['mail_log_options'] = intval($_POST['mail_log_option']).','.intval($_POST['mail_log_email']); $temp['mail_log_options'] = intval($_POST['mail_log_option']).','.intval($_POST['mail_log_email']);
if ($e107->admin_log->logArrayDiffs($temp, $pref, 'MAIL_03')) if ($e107->admin_log->logArrayDiffs($temp, $pref, 'MAIL_03'))
@@ -640,7 +650,7 @@ function show_prefs($mailAdmin)
</colgroup> </colgroup>
<tr> <tr>
<td>".LAN_MAILOUT_110."<br /></td> <td>".LAN_MAILOUT_110."<br /></td>
<td>".$frm->admin_button(testemail, LAN_MAILOUT_112)."&nbsp; <td>".$frm->admin_button('testemail', LAN_MAILOUT_112)."&nbsp;
<input name='testaddress' class='tbox' type='text' size='40' maxlength='80' value=\"".(varset($_POST['testaddress']) ? $_POST['testaddress'] : USEREMAIL)."\" /> <input name='testaddress' class='tbox' type='text' size='40' maxlength='80' value=\"".(varset($_POST['testaddress']) ? $_POST['testaddress'] : USEREMAIL)."\" />
</td> </td>
</tr> </tr>

15
e107_handlers/admin_log_class.php
View File

@@ -3,7 +3,7 @@
+ ----------------------------------------------------------------------------+ + ----------------------------------------------------------------------------+
| e107 website system | e107 website system
| |
| ?Copyright (C) 2008-2009 e107 Inc (e107.org) | ?Copyright (C) 2008-2010 e107 Inc (e107.org)
| http://e107.org | http://e107.org
| |
| |
@@ -11,13 +11,9 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_handlers/admin_log_class.php,v $ | $Source: /cvs_backup/e107_0.8/e107_handlers/admin_log_class.php,v $
| $Revision: 1.20 $ | $Revision: 1.21 $
| $Date: 2009-11-30 20:40:03 $ | $Date: 2010-01-10 11:01:28 $
| $Author: e107steved $ | $Author: e107steved $
To do:
1. Do we need to check for presence of elements of debug_backtrace() to avoid notices?
2. Reflect possible DB structure changes once finalised
3. Ad user audit trail
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -29,6 +25,9 @@ if (!defined('e107_INIT'))
/** /**
* Admin logging class. * Admin logging class.
* *
* @package e107
* @subpackage e107_handlers
* @version $Id: admin_log_class.php,v 1.21 2010-01-10 11:01:28 e107steved Exp $;
*/ */
class e_admin_log class e_admin_log
{ {
@@ -351,7 +350,7 @@ class e_admin_log
$changes = array(); $changes = array();
foreach ($new as $k=>$v) foreach ($new as $k=>$v)
{ {
if ($v != $old[$k]) if ($v != varset($old[$k],''))
{ {
$old[$k] = $v; $old[$k] = $v;
$changes[] = $k.'=>'.$v; $changes[] = $k.'=>'.$v;

14
e107_handlers/mailout_admin_class.php
View File

@@ -9,20 +9,18 @@
* Administration - Site Maintenance * Administration - Site Maintenance
* *
* $Source: /cvs_backup/e107_0.8/e107_handlers/mailout_admin_class.php,v $ * $Source: /cvs_backup/e107_0.8/e107_handlers/mailout_admin_class.php,v $
* $Revision: 1.12 $ * $Revision: 1.13 $
* $Date: 2010-01-10 06:20:41 $ * $Date: 2010-01-10 11:01:28 $
* $Author: e107coders $ * $Author: e107steved $
* *
*/ */
/** /**
* Various admin-related mailout functions, mostly to do with creating and handling forms.
* *
* @package e107 * @package e107
* @subpackage e107_handlers * @subpackage e107_handlers
* @version $Revision: 1.12 $ * @version $Id: mailout_admin_class.php,v 1.13 2010-01-10 11:01:28 e107steved Exp $;
* @author $Author: e107coders $
* Various admin-related mailout functions, mostly to do with creating and handling forms.
*/ */
@@ -879,7 +877,7 @@ class mailoutAdminClass extends e107MailManager
); );
$text .= $this->sendStyleSelect($mailSource['mail_send_style']); $text .= $this->sendStyleSelect(varset($mailSource['mail_send_style'], ''));
$checked = (isset($mailSource['mail_include_images']) && $mailSource['mail_include_images']) ? " checked='checked'" : ''; $checked = (isset($mailSource['mail_include_images']) && $mailSource['mail_include_images']) ? " checked='checked'" : '';
$text .= "&nbsp;&nbsp;<input type='checkbox' name='mail_include_images' value='1' {$checked} />".LAN_MAILOUT_225; $text .= "&nbsp;&nbsp;<input type='checkbox' name='mail_include_images' value='1' {$checked} />".LAN_MAILOUT_225;
$text .=" $text .="

28
e107_handlers/mailout_class.php
View File

@@ -2,19 +2,26 @@
/* /*
* e107 website system * e107 website system
* *
* Copyright (C) 2008-2009 e107 Inc (e107.org) * Copyright (C) 2008-2010 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 * Mailout handling - selector for 'core' users
* *
* $Source: /cvs_backup/e107_0.8/e107_handlers/mailout_class.php,v $ * $Source: /cvs_backup/e107_0.8/e107_handlers/mailout_class.php,v $
* $Revision: 1.8 $ * $Revision: 1.9 $
* $Date: 2010-01-10 06:20:43 $ * $Date: 2010-01-10 11:01:29 $
* $Author: e107coders $ * $Author: e107steved $
* *
*/ */
/**
* e107 Mail handling - core selector for users
*
* @package e107
* @subpackage e107_handlers
* @version $Id: mailout_class.php,v 1.9 2010-01-10 11:01:29 e107steved Exp $;
*/
if (!defined('e107_INIT')) { exit; } if (!defined('e107_INIT')) { exit; }
@@ -36,9 +43,8 @@ It is the responsibility of each class to manager permission restrictions where
TODO: TODO:
1. accept varying date formats for last visit 1. accept varying date formats for last visit
2. Use XHTML calendar for last visit 2. Use XHTML calendar for last visit
3. Sort classes for table cells
*/ */
// These variables determine the circumstances under which this class is loaded (only used during loading, and may be overwritten later) // These variables determine the circumstances under which this class is loaded (only used during loading, and may be overwritten later)
$mailerIncludeWithDefault = TRUE; // Mandatory - if false, show only when mailout for this specific plugin is enabled $mailerIncludeWithDefault = TRUE; // Mandatory - if false, show only when mailout for this specific plugin is enabled
$mailerExcludeDefault = TRUE; // Mandatory - if TRUE, when this plugin's mailout is active, the default (core) isn't loaded $mailerExcludeDefault = TRUE; // Mandatory - if TRUE, when this plugin's mailout is active, the default (core) isn't loaded
@@ -276,10 +282,10 @@ class core_mailout
$u_array = array('user_name'=>LAN_MAILOUT_43,'user_login'=>LAN_MAILOUT_44,'user_email'=>LAN_MAILOUT_45); $u_array = array('user_name'=>LAN_MAILOUT_43,'user_login'=>LAN_MAILOUT_44,'user_email'=>LAN_MAILOUT_45);
$var[0]['html'] = $admin->userClassesTotals('email_to', varset($selectVals['email_to'], '')); $var[0]['html'] = $admin->userClassesTotals('email_to', varset($selectVals['email_to'], ''));
$var[1]['html'] = $frm->selectbox('user_search_name', $u_array, $selectVals['user_search_name'],'',TRUE)." ".LAN_MAILOUT_47." ".$frm->text('user_search_value', $selectVals['user_search_value']); $var[1]['html'] = $frm->selectbox('user_search_name', $u_array, varset($selectVals['user_search_name'], ''),'',TRUE)." ".LAN_MAILOUT_47." ".$frm->text('user_search_value', varset($selectVals['user_search_value'], ''));
$var[2]['html'] = $admin->comparisonSelect('last_visit_match', $selectVals['last_visit_match'])." ".$frm->text('last_visit_date', $selectVals['last_visit_date']); $var[2]['html'] = $admin->comparisonSelect('last_visit_match', varset($selectVals['last_visit_match'], ''))." ".$frm->text('last_visit_date', varset($selectVals['last_visit_date'], 0));
$var[3]['html'] = $admin->ret_extended_field_list('extended_1_name', varset($selectVals['extended_1_name'], ''), TRUE).LAN_MAILOUT_48." ".$frm->text('extended_1_value',$selectVals['extended_1_value']); $var[3]['html'] = $admin->ret_extended_field_list('extended_1_name', varset($selectVals['extended_1_name'], ''), TRUE).LAN_MAILOUT_48." ".$frm->text('extended_1_value',varset($selectVals['extended_1_value'], ''));
$var[4]['html'] = $admin->ret_extended_field_list('extended_2_name', varset($selectVals['extended_2_name'], ''), TRUE).LAN_MAILOUT_48." ".$frm->text('extended_2_value',$selectVals['extended_2_value']); $var[4]['html'] = $admin->ret_extended_field_list('extended_2_name', varset($selectVals['extended_2_name'], ''), TRUE).LAN_MAILOUT_48." ".$frm->text('extended_2_value',varset($selectVals['extended_2_value'],''));
} }
else // Display existing values else // Display existing values