Merge branch 'master' of git://github.com/friendica/friendica

[friendica.git] / mod / photos.php

diff --git a/mod/photos.php b/mod/photos.php
old mode 100644 (file)
new mode 100755 (executable)
index 77b44ce..e40ae0d
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -98,7 +98,7 @@ EOT;
 
 function photos_post(&$a) {
 
-       logger('mod-photos: photos_post: begin' , 'LOGGER_DEBUG');
+       logger('mod-photos: photos_post: begin' , LOGGER_DEBUG);
 
 
        logger('mod_photos: REQUEST ' . print_r($_REQUEST,true), LOGGER_DATA);
@@ -571,7 +571,7 @@ function photos_post(&$a) {
        $album    = notags(trim($_REQUEST['album']));
        $newalbum = notags(trim($_REQUEST['newalbum']));
 
-       logger('mod/photos.php: photos_post(): album= ' . $album . ' newalbum= ' . $newalbum , 'LOGGER_DEBUG');
+       logger('mod/photos.php: photos_post(): album= ' . $album . ' newalbum= ' . $newalbum , LOGGER_DEBUG);
 
        if(! strlen($album)) {
                if(strlen($newalbum))
@@ -643,13 +643,13 @@ function photos_post(&$a) {
                return;
        }
 
-       logger('mod/photos.php: photos_post(): loading the contents of ' . $src , 'LOGGER_DEBUG');
+       logger('mod/photos.php: photos_post(): loading the contents of ' . $src , LOGGER_DEBUG);
 
        $imagedata = @file_get_contents($src);
        $ph = new Photo($imagedata);
 
        if(! $ph->is_valid()) {
-               logger('mod/photos.php: photos_post(): unable to process image' , 'LOGGER_DEBUG');
+               logger('mod/photos.php: photos_post(): unable to process image' , LOGGER_DEBUG);
                notice( t('Unable to process image.') . EOL );
                @unlink($src);
                $foo = 0;
@@ -669,7 +669,7 @@ function photos_post(&$a) {
        $r = $ph->store($page_owner_uid, $visitor, $photo_hash, $filename, $album, 0 , 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
 
        if(! $r) {
-               logger('mod/photos.php: photos_post(): image store failed' , 'LOGGER_DEBUG');
+               logger('mod/photos.php: photos_post(): image store failed' , LOGGER_DEBUG);
                notice( t('Image upload failed.') . EOL );
                killme();
        }
@@ -1103,7 +1103,7 @@ function photos_content(&$a) {
                        $link_item = $linked_items[0];
                        $r = q("SELECT COUNT(*) AS `total`
                                FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-                               WHERE `parent-uri` = '%s' AND `uri` != '%s' AND `item`.`deleted` = 0
+                               WHERE `parent-uri` = '%s' AND `uri` != '%s' AND `item`.`deleted` = 0 and `item`.`moderated` = 0
                                AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
                                AND `item`.`uid` = %d 
                                $sql_extra ",
@@ -1122,7 +1122,7 @@ function photos_content(&$a) {
                                `contact`.`rel`, `contact`.`thumb`, `contact`.`self`, 
                                `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
                                FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-                               WHERE `parent-uri` = '%s' AND `uri` != '%s' AND `item`.`deleted` = 0
+                               WHERE `parent-uri` = '%s' AND `uri` != '%s' AND `item`.`deleted` = 0 and `item`.`moderated` = 0
                                AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
                                AND `item`.`uid` = %d
                                $sql_extra