diff --git a/e107_admin/header.php b/e107_admin/header.php index 03d8acc62..61cb38d9a 100644 --- a/e107_admin/header.php +++ b/e107_admin/header.php @@ -12,8 +12,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_admin/header.php,v $ -| $Revision: 1.33 $ -| $Date: 2009-07-14 11:05:49 $ +| $Revision: 1.34 $ +| $Date: 2009-07-15 09:37:59 $ | $Author: e107coders $ +---------------------------------------------------------------+ */ @@ -89,7 +89,7 @@ if (file_exists(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_footer.php')) { @include_once(e_LANGUAGEDIR.'English/admin/lan_footer.php'); } if (!defined('ADMIN_WIDTH')) { - define('ADMIN_WIDTH', "width: 95%' class='adminlist"); + define('ADMIN_WIDTH', "width: 95%"); } if (!defined('ADMIN_TRUE_ICON')) @@ -690,7 +690,7 @@ if (strpos(e_SELF.'?'.e_QUERY, 'menus.php?configure') === FALSE) { $sql->db_Mark_Time('(End: Parse Admin Header)'); } -if(!is_object($emessage)) +if(!varset($emessage) && !is_object($emessage)) { require_once(e_HANDLER."message_handler.php"); $emessage = &eMessage::getInstance(); diff --git a/e107_admin/mailout.php b/e107_admin/mailout.php index 0e063a5ec..b75f31164 100644 --- a/e107_admin/mailout.php +++ b/e107_admin/mailout.php @@ -11,8 +11,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_admin/mailout.php,v $ -| $Revision: 1.14 $ -| $Date: 2009-07-14 11:05:49 $ +| $Revision: 1.15 $ +| $Date: 2009-07-15 09:37:59 $ | $Author: e107coders $ | | Work in progress - supplementary mailer plugin @@ -386,14 +386,14 @@ Table data: // -------------- $text .= "
- - - - - +
+ + + + - - + + "; @@ -402,7 +402,7 @@ Table data: { if ($m->mailer_enabled) { - $text .= ""; + $text .= ""; } } @@ -410,20 +410,20 @@ Table data: // Support 'cc' and 'bcc' as standard mailout addresses $text .= ($_POST['email_cc']) ? " - - + + ": ""; $text .= ($_POST['email_bcc']) ? " - - + + ": ""; $text .= " - - + + "; // Attachment @@ -431,21 +431,21 @@ Table data: { $text .= " - - + + "; } // Figures - number of emails to send, number of duplicates stripped $text .= " - - + + "; // Email text $text .=" - +
".LAN_MAILOUT_01." / ".LAN_MAILOUT_02."".$_POST['email_from_name']." <".$_POST['email_from_email'].">".LAN_MAILOUT_01." / ".LAN_MAILOUT_02."".$_POST['email_from_name']." <".$_POST['email_from_email'].">
".$m->mailer_name."".$m->show_select(FALSE)."
".$m->mailer_name."".$m->show_select(FALSE)."
".LAN_MAILOUT_04."".$_POST['email_cc']." ".LAN_MAILOUT_04."".$_POST['email_cc']." 
".LAN_MAILOUT_05."".$_POST['email_bcc']." ".LAN_MAILOUT_05."".$_POST['email_bcc']." 
".LAN_MAILOUT_51."".$_POST['email_subject']." ".LAN_MAILOUT_51."".$_POST['email_subject']." 
".LAN_MAILOUT_07."".$email_data['attach']." ".LAN_MAILOUT_07."".$email_data['attach']." 
".LAN_MAILOUT_71." ".$c." ".LAN_MAILOUT_69.$dups.LAN_MAILOUT_70."".LAN_MAILOUT_71." ".$c." ".LAN_MAILOUT_69.$dups.LAN_MAILOUT_70."
".stripslashes($tp->toHTML($_POST['email_body'],TRUE))."".stripslashes($tp->toHTML($_POST['email_body'],TRUE))."
@@ -601,16 +601,16 @@ function showMailouts($sub_par,$mail_id) \n - ".LAN_MAILOUT_51." - ".$mail['email_subject']." + ".LAN_MAILOUT_51." + ".$mail['email_subject']." \n - ".LAN_MAILOUT_103." - ".(isset($mail['send_results']) ? implode('
',$mail['send_results']) : LAN_MAILOUT_104)." + ".LAN_MAILOUT_103." + ".(isset($mail['send_results']) ? implode('
',$mail['send_results']) : LAN_MAILOUT_104)." \n"; if ($sql->db_Select('generic','gen_id,gen_datestamp,gen_chardata',"`gen_datestamp`={$mail_id} AND `gen_type`='sendmail'")) { - $text .= "".LAN_MAILOUT_105.""; + $text .= "".LAN_MAILOUT_105.""; $spacer = ''; $i = 0; while (($row = $sql->db_Fetch()) && ($i < 10)) @@ -668,12 +668,12 @@ function showMailouts($sub_par,$mail_id) \n - ".LAN_MAILOUT_51." - ".$mail['email_subject']." + ".LAN_MAILOUT_51." + ".$mail['email_subject']." \n - ".LAN_MAILOUT_100." - ".$mail['email_body']." + ".LAN_MAILOUT_100." + ".$mail['email_body']." \n "; @@ -761,13 +761,13 @@ function showMailouts($sub_par,$mail_id) if ($row['pending']) $emails_found[$row['gen_datestamp']] = $row['pending']; // Log the mailshot in a list if any emails to go $text .= " - ".$row['gen_datestamp'] ." - ".$datestamp." - ".$row['user_name']." - ".$row['gen_ip']." - ".$row['gen_intdata']." - ".$row['pending']." - + ".$row['gen_datestamp'] ." + ".$datestamp." + ".$row['user_name']." + ".$row['gen_ip']." + ".$row['gen_intdata']." + ".$row['pending']." +
"; $text .= "".LAN_MAILOUT_109.""; if ($row['pending']) @@ -816,9 +816,9 @@ function showMailouts($sub_par,$mail_id) if (!isset($emails_found[$row['gen_datestamp']])) { $text .= " - ".$row['gen_datestamp'] ." - ".$row['pending']." - + ".$row['gen_datestamp'] ." + ".$row['pending']." +
toJS(LAN_CONFIRMDEL." [".$row['gen_datestamp']."]")."') \">".LAN_DELETE."
@@ -857,16 +857,16 @@ function show_mailform($foo="") } $debug = (e_MENU == "debug") ? "?[debug]" : ""; - $text .= "
+ $text .= "
- - - - +
+ + + - - + "; @@ -874,8 +874,8 @@ function show_mailform($foo="") $text .=" - - + "; @@ -886,7 +886,7 @@ function show_mailform($foo="") { if ($m->mailer_enabled) { - $text .= ""; + $text .= ""; } } @@ -895,15 +895,15 @@ function show_mailform($foo="") // CC, BCC $text .= " - - + - - + "; @@ -912,17 +912,17 @@ function show_mailform($foo="") // Close one table, open another - to give a boundary between addressees and content $text .= "
".LAN_MAILOUT_01.": + ".LAN_MAILOUT_01.":
".LAN_MAILOUT_02.": + ".LAN_MAILOUT_02.":
".$m->mailer_name."".$m->show_select(TRUE)."
".$m->mailer_name."".$m->show_select(TRUE)."
".LAN_MAILOUT_04.": + ".LAN_MAILOUT_04.":
".LAN_MAILOUT_05.": + ".LAN_MAILOUT_05.":
- - - - +
+ + + "; // Subject $text .= " - - + "; @@ -930,8 +930,8 @@ function show_mailform($foo="") // Attachment. $text .= " - - + - - + - "; $text .=" - - "; + +
".LAN_MAILOUT_51.": + ".LAN_MAILOUT_51.":
".LAN_MAILOUT_07.": "; + ".LAN_MAILOUT_07.": "; $text .= "
".LAN_MAILOUT_09.": + ".LAN_MAILOUT_09.":
- + +
-
"; +
+
"; global $eplug_bb; @@ -990,11 +990,11 @@ function show_mailform($foo="") $text .="
"; - $text .= " - "; + $text .= "
"; if(isset($_POST['edit'])){ $text .= ""; $text .= ""; @@ -1004,9 +1004,8 @@ function show_mailform($foo="") $text .="  - - - +
+
"; @@ -1023,22 +1022,22 @@ function show_prefs() global $pref,$ns; $text = "
-
- - - - +
+
+ + + - - + - - + - - + \n - - + - - + - - + \n"; - $text .= " - -
".LAN_MAILOUT_110."
  + ".LAN_MAILOUT_110."
 
".LAN_MAILOUT_115."
".LAN_MAILOUT_116."		 + ".LAN_MAILOUT_115."
".LAN_MAILOUT_116."
".LAN_MAILOUT_25." ".LAN_MAILOUT_26." + ".LAN_MAILOUT_25." ".LAN_MAILOUT_26." ".LAN_MAILOUT_27. " ".LAN_MAILOUT_29.".
".LAN_MAILOUT_30." @@ -1134,8 +1133,8 @@ $text = "
".LAN_MAILOUT_31." + ".LAN_MAILOUT_31." ".LAN_MAILOUT_32.":
".LAN_MAILOUT_33.":
".LAN_MAILOUT_34.":
@@ -1158,8 +1157,8 @@ $text = " if (isset($pref['mailout_sources'])) { // Allow selection of email address sources $text .= "
".LAN_MAILOUT_77." + ".LAN_MAILOUT_77." "; $mail_enable = explode(',',$pref['mailout_enabled']); foreach (explode(',',$pref['mailout_sources']) as $mailer) @@ -1173,8 +1172,8 @@ $text = " list($mail_log_option,$mail_log_email) = explode(',',varset($pref['mail_log_options'],'0,0')); $check = ($mail_log_email == 1) ? " checked='checked'" : ""; $text .= "
".LAN_MAILOUT_72." + ".LAN_MAILOUT_72."
+ $text .= "
+
- - \n +
-
"; +
"; $caption = LAN_PREFS; $ns->tablerender($caption, $text); @@ -1248,11 +1245,11 @@ function showList($type='massmail') $datestamp = $gen->convert_date($row2['gen_datestamp'], "short"); $text .= " - ".$row2['gen_id'] ." - ".$row2['user_name']." - ".$row2['gen_ip']." - ".$datestamp." - + ".$row2['gen_id'] ." + ".$row2['user_name']." + ".$row2['gen_ip']." + ".$datestamp." +
"; $text .= "".LAN_EDIT.""; // @@ -1333,7 +1330,7 @@ function sc_Select($container='sc_selector')