diff options
| -rw-r--r-- | boot.php | 2 | ||||
| -rw-r--r-- | include/EmailNotification.php | 8 | ||||
| -rw-r--r-- | mod/item.php | 11 |
3 files changed, 8 insertions, 13 deletions
@@ -4,7 +4,7 @@ set_time_limit(0); ini_set('pcre.backtrack_limit', 250000); -define ( 'FRIENDIKA_VERSION', '2.2.993' ); +define ( 'FRIENDIKA_VERSION', '2.2.995' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1059 ); diff --git a/include/EmailNotification.php b/include/EmailNotification.php index 209d5476a..78912c0b9 100644 --- a/include/EmailNotification.php +++ b/include/EmailNotification.php @@ -12,14 +12,6 @@ class EmailNotification { * @param textVersion text only version of the message */ static public function sendTextHtmlEmail($fromName,$fromEmail,$replyTo,$toEmail,$messageSubject,$htmlVersion,$textVersion) { - logger("sendTextHtmlEmail: BEGIN"); - logger("fromName: " . $fromName); - logger("fromEmail: " . $fromEmail); - logger("replyTo: " . $replyTo); - logger("toEmail: " . $toEmail); - logger("messageSubject: " . $messageSubject); - //logger("htmlVersion: " . $htmlVersion); - //logger("textVersion: " . $textVersion); // generate a mime boundary $mimeBoundary =rand(0,9)."-" diff --git a/mod/item.php b/mod/item.php index b07f26e32..0fb780adc 100644 --- a/mod/item.php +++ b/mod/item.php @@ -204,6 +204,8 @@ function item_post(&$a) { continue; $image_uri = substr($image,strrpos($image,'/') + 1); $image_uri = substr($image_uri,0, strpos($image_uri,'-')); + if(! strlen($image_uri)) + continue; $srch = '<' . intval($profile_uid) . '>'; $r = q("SELECT `id` FROM `photo` WHERE `allow_cid` = '%s' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = '' AND `resource-id` = '%s' AND `uid` = %d LIMIT 1", @@ -231,7 +233,7 @@ function item_post(&$a) { } - $match = null; + $match = false; if(preg_match_all("/\[attachment\](.+?)\[\/attachment\]/",$body,$match)) { $attaches = $match[1]; @@ -239,13 +241,13 @@ function item_post(&$a) { foreach($attaches as $attach) { $r = q("SELECT * FROM `attach` WHERE `uid` = %d AND `id` = %d LIMIT 1", intval($profile_uid), - intval($attaches) + intval($attach) ); if(count($r)) { $r = q("UPDATE `attach` SET `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1", intval($profile_uid), - intval($attaches) + intval($attach) ); } } @@ -361,6 +363,7 @@ function item_post(&$a) { } $attachments = ''; + $match = false; if(preg_match_all('/(\[attachment\]([0-9]+)\[\/attachment\])/',$body,$match)) { foreach($match[2] as $mtch) { @@ -371,7 +374,7 @@ function item_post(&$a) { if(count($r)) { if(strlen($attachments)) $attachments .= ','; - $attachments .= '[attach]href="' . $a->get_baseurl() . '/attach/' . $r[0]['id'] . '" size="' . $r[0]['filesize'] . '" type="' . $r[0]['filetype'] . '" title="' . $r[0]['filename'] . '"[/attach]'; + $attachments .= '[attach]href="' . $a->get_baseurl() . '/attach/' . $r[0]['id'] . '" size="' . $r[0]['filesize'] . '" type="' . $r[0]['filetype'] . '" title="' . (($r[0]['filename']) ? $r[0]['filename'] : ' ') . '"[/attach]'; } $body = str_replace($match[1],'',$body); } |