diff --git a/e107_admin/banlist.php b/e107_admin/banlist.php index 24ab51199..8271461c0 100644 --- a/e107_admin/banlist.php +++ b/e107_admin/banlist.php @@ -269,7 +269,7 @@ class banlist_ui extends e_admin_ui - public function timesPage() + protected function timesPage() { if (!getperms('0')) { @@ -349,12 +349,12 @@ class banlist_ui extends e_admin_ui } - public function optionsPage() + protected function optionsPage() { //FIXME Put Options code in here. } - public function banlogPage() + protected function banlogPage() { //FIXME Put LogPage code in here. } diff --git a/e107_admin/eurl.php b/e107_admin/eurl.php index 420d01d77..dac7eae5f 100644 --- a/e107_admin/eurl.php +++ b/e107_admin/eurl.php @@ -204,7 +204,7 @@ class eurl_admin_ui extends e_admin_controller_ui } //TODO Checkbox for each plugin to enable/disable - public function simplePage() + protected function simplePage() { // $this->addTitle("Simple Redirects"); $eUrl =e107::getAddonConfig('e_url'); @@ -320,7 +320,7 @@ class eurl_admin_ui extends e_admin_controller_ui } } - public function SettingsPage() + protected function SettingsPage() { //$this->addTitle(LAN_EURL_NAME_SETTINGS); return $this->getUI()->urlSettings(); @@ -356,7 +356,7 @@ class eurl_admin_ui extends e_admin_controller_ui } } - public function AliasPage() + protected function AliasPage() { // $this->addTitle(LAN_EURL_NAME_ALIASES); @@ -411,7 +411,7 @@ class eurl_admin_ui extends e_admin_controller_ui } } - public function ConfigPage() + protected function ConfigPage() { // $this->addTitle(LAN_EURL_NAME_CONFIG); $active = e107::getPref('url_config'); diff --git a/e107_core/templates/email_template.php b/e107_core/templates/email_template.php index 20bb708d8..2b969d23f 100644 --- a/e107_core/templates/email_template.php +++ b/e107_core/templates/email_template.php @@ -112,6 +112,8 @@ $EMAIL_TEMPLATE['default']['header'] = " @@ -146,7 +180,7 @@ $EMAIL_TEMPLATE['default']['body'] = "{BODY}
{MEDIA1}{MEDIA2}{MEDIA3}{MED $EMAIL_TEMPLATE['default']['footer'] = "

+ {SITEURL}
{SITEBUTTON: type=email&h=60}

{SITENAME=link}

- {SITEURL}
diff --git a/e107_handlers/mail.php b/e107_handlers/mail.php index b8bcdf2ac..4e0e9e796 100644 --- a/e107_handlers/mail.php +++ b/e107_handlers/mail.php @@ -566,7 +566,7 @@ class e107Email extends PHPMailer } $message = str_replace("\t", "", $message); // filter out tabs from templates; - + if ($want_HTML !== FALSE) { // $message = e107::getParser()->toHtml("[html]".$message."[/html]",true); // using toHtml will break media attachment links. (need to retain {e_XXXX ) @@ -598,7 +598,7 @@ class e107Email extends PHPMailer $message = str_replace("\n", "
\n", $message); } - + $this->MsgHTML($message); // Theoretically this should do everything, including handling of inline images. } @@ -863,11 +863,11 @@ class e107Email extends PHPMailer $identifier = deftrue('MAIL_IDENTIFIER', 'X-e107-id'); - - if (isset($eml['SMTPDebug'])) { $this->SMTPDebug = $eml['SMTPDebug']; } // 'FALSE' is a valid value! + + if (isset($eml['SMTPDebug'])) { $this->SMTPDebug = $eml['SMTPDebug']; } // 'FALSE' is a valid value! if (!empty($eml['sender_email'])) { $this->From = $eml['sender_email']; } if (!empty($eml['sender_name'])) { $this->FromName = $eml['sender_name']; } - if (!empty($eml['replyto'])) { $this->AddAddressList('replyto',$eml['replyto'],vartrue($eml['replytonames'],'')); } + if (!empty($eml['replyto'])) { $this->AddAddressList('replyto',$eml['replyto'],vartrue($eml['replytonames'],'')); } if (isset($eml['html'])) { $this->allow_html = $eml['html']; } // 'FALSE' is a valid value! if (isset($eml['html_header'])) { $this->add_HTML_header = $eml['html_header']; } // 'FALSE' is a valid value! if (!empty($eml['body'])) { $this->makeBody($eml['body'], $this->allow_html, $this->add_HTML_header); } @@ -882,7 +882,7 @@ class e107Email extends PHPMailer if (!empty($eml['split'])) { $this->SingleTo = ($eml['split'] != FALSE); } if (!empty($eml['smtp_username'])) { $this->Username = $eml['smtp_username']; } if (!empty($eml['smtp_password'])) { $this->Password = $eml['smtp_password']; } - + if (!empty($eml['bouncepath'])) { $this->Sender = $eml['bouncepath']; // Bounce path @@ -968,12 +968,12 @@ class e107Email extends PHPMailer public function sendEmail($send_to, $to_name, $eml = array(), $bulkmail = false) { if (count($eml)) - { + { if($error = $this->arraySet($eml)) // Set parameters from list { return $error; } - + } if (($bulkmail == true) && $this->localUseVerp && $this->save_bouncepath && (strpos($this->save_bouncepath,'@') !== false)) @@ -1002,7 +1002,7 @@ class e107Email extends PHPMailer $_SERVER['REMOTE_ADDR'] = $_SERVER['SERVER_ADDR']; $_SERVER["HTTP_X_FORWARDED_FOR"] = $_SERVER['SERVER_ADDR']; $_SERVER["HTTP_CF_CONNECTING_IP"] = $_SERVER['SERVER_ADDR']; - + $result = $this->Send(); // Actually send email @@ -1122,10 +1122,18 @@ class e107Email extends PHPMailer $url = $tp->replaceConstants($url); // resize on the fly. + if($this->debug) + { + echo "
Attempting Resize...".$url; + } if($resized = e107::getMedia()->resizeImage($url, e_TEMP.basename($url),'w=800')) { $url = $resized; } + elseif($this->debug) + { + echo "
Couldn't resize ".$url; + } $delim = $images[2][$i]; // Will be single or double quote $filename = basename($url); @@ -1139,7 +1147,7 @@ class e107Email extends PHPMailer if ($this->debug) { - echo "
CID file {$filename} in {$directory}. Base = ".SERVERBASE."< BaseDir = {$basedir}
"; + echo "
CID file {$filename} in {$directory}. Base = ".SERVERBASE."
BaseDir = {$basedir}
"; } $cid = 'cid:' . md5($filename); diff --git a/e107_handlers/media_class.php b/e107_handlers/media_class.php index a59596db4..6a36cdd1e 100644 --- a/e107_handlers/media_class.php +++ b/e107_handlers/media_class.php @@ -1472,6 +1472,11 @@ class e_media $src = $tp->replaceConstants($src); $dest = $tp->replaceConstants($dest); + if(!file_exists($src)) + { + return false; + } + $maxWidth = varset($opts['w'], 800); $maxHeight = varset($opts['h'], 800); diff --git a/e107_plugins/pm/languages/English.php b/e107_plugins/pm/languages/English.php index 8229517aa..d1ae0a849 100755 --- a/e107_plugins/pm/languages/English.php +++ b/e107_plugins/pm/languages/English.php @@ -86,4 +86,6 @@ define("LAN_PM_108", "Message sent on: "); define("LAN_PM_109", "New Message(s)"); define("LAN_PM_111", "Read"); define("LAN_PM_112", "User(s)"); + +define("LAN_PM_113", "Read Message"); ?> \ No newline at end of file diff --git a/e107_plugins/pm/pm_class.php b/e107_plugins/pm/pm_class.php index 44259476a..27f086d57 100755 --- a/e107_plugins/pm/pm_class.php +++ b/e107_plugins/pm/pm_class.php @@ -407,7 +407,8 @@ class private_message $data['PM_DATE'] = e107::getParser()->toDate($pmInfo['pm_sent'], 'long'); $data['SITENAME'] = SITENAME; $data['USERNAME'] = USERNAME; - $data['PM_URL'] = "".$url."";// e107::url('pm','index', null, array('mode'=>'full')).'?show.'.$pmid; + $data['PM_URL'] = $url;// e107::url('pm','index', null, array('mode'=>'full')).'?show.'.$pmid; + $data['PM_BUTTON'] = "".LAN_PM_113."";// e107::url('pm','index', null, array('mode'=>'full')).'?show.'.$pmid; $text = e107::getParser()->simpleParse($template, $data); diff --git a/e107_plugins/pm/pm_template.php b/e107_plugins/pm/pm_template.php index 1c16c7b41..0846c6113 100755 --- a/e107_plugins/pm/pm_template.php +++ b/e107_plugins/pm/pm_template.php @@ -276,10 +276,9 @@ $PM_NOTIFY = ".LAN_PM_103."{PM_SUBJECT} ".LAN_PM_108."{PM_DATE} ".LAN_PM_104."{PM_ATTACHMENTS} - -
-
".LAN_PM_105.": {PM_URL}
- + + +

+".LAN_PM_113."
"; -?> \ No newline at end of file