Cleanup for #3010 - added spaces, thanks to @annando .

[friendica.git] / mod / wall_upload.php

diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index fce28c47d428b7d418a3e426dd1fcfd6ccfb2ea5..21d9bf49cb2de85a9218b05b7086bffe4a6d63cb 100644 (file)
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -15,8 +15,11 @@ function wall_upload_post(&$a, $desktopmode = true) {
                                dbesc($nick)
                        );
 
-                       if(! count($r)){
-                               if ($r_json) { echo json_encode(['error'=>t('Invalid request.')]); killme(); }
+                       if(! dbm::is_result($r)){
+                               if ($r_json) {
+                                       echo json_encode(array('error'=>t('Invalid request.')));
+                                       killme();
+                               }
                                return;
                        }
                } else {
@@ -26,7 +29,10 @@ function wall_upload_post(&$a, $desktopmode = true) {
                        );
                }
        } else {
-               if ($r_json) { echo json_encode(['error'=>t('Invalid request.')]); killme(); }
+               if ($r_json) {
+                       echo json_encode(array('error'=>t('Invalid request.')));
+                       killme();
+               }
                return;
        }
 
@@ -42,24 +48,24 @@ function wall_upload_post(&$a, $desktopmode = true) {
                $can_post = true;
        else {
                if($community_page && remote_user()) {
-                       $cid = 0;
+                       $contact_id = 0;
                        if(is_array($_SESSION['remote'])) {
                                foreach($_SESSION['remote'] as $v) {
                                        if($v['uid'] == $page_owner_uid) {
-                                               $cid = $v['cid'];
+                                               $contact_id = $v['cid'];
                                                break;
                                        }
                                }
                        }
-                       if($cid) {
+                       if($contact_id) {
 
                                $r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
-                                       intval($cid),
+                                       intval($contact_id),
                                        intval($page_owner_uid)
                                );
-                               if(count($r)) {
+                               if (dbm::is_result($r)) {
                                        $can_post = true;
-                                       $visitor = $cid;
+                                       $visitor = $contact_id;
                                }
                        }
                }
@@ -67,13 +73,18 @@ function wall_upload_post(&$a, $desktopmode = true) {
 
 
        if(! $can_post) {
-               if ($r_json) { echo json_encode(['error'=>t('Permission denied.')]); killme(); }
+               if ($r_json) {
+                       echo json_encode(array('error'=>t('Permission denied.')));
+                       killme();
+               }
                notice( t('Permission denied.') . EOL );
                killme();
        }
 
        if(! x($_FILES,'userfile') && ! x($_FILES,'media')){
-               if ($r_json) { echo json_encode(['error'=>t('Invalid request.')]); killme(); }
+               if ($r_json) {
+                       echo json_encode(array('error'=>t('Invalid request.')));
+               }
                killme();
        }
 
@@ -107,7 +118,10 @@ function wall_upload_post(&$a, $desktopmode = true) {
        }
 
        if ($src=="") {
-               if ($r_json) { echo json_encode(['error'=>t('Invalid request.')]); killme(); }
+               if ($r_json) {
+                       echo json_encode(array('error'=>t('Invalid request.')));
+                       killme();
+               }
                notice(t('Invalid request.').EOL);
                killme();
        }
@@ -136,7 +150,7 @@ function wall_upload_post(&$a, $desktopmode = true) {
        if(($maximagesize) && ($filesize > $maximagesize)) {
                $msg = sprintf( t('Image exceeds size limit of %s'), formatBytes($maximagesize));
                if ($r_json) {
-                       echo json_encode(['error'=>$msg]);
+                       echo json_encode(array('error'=>$msg));
                } else {
                        echo  $msg. EOL;
                }
@@ -144,16 +158,21 @@ function wall_upload_post(&$a, $desktopmode = true) {
                killme();
        }
 
-       $r = q("select sum(octet_length(data)) as total from photo where uid = %d and scale = 0 and album != 'Contact Photos' ",
-               intval($page_owner_uid)
-       );
 
        $limit = service_class_fetch($page_owner_uid,'photo_upload_limit');
 
-       if(($limit !== false) && (($r[0]['total'] + strlen($imagedata)) > $limit)) {
+       if ($limit) {
+               $r = q("select sum(octet_length(data)) as total from photo where uid = %d and scale = 0 and album != 'Contact Photos' ",
+                       intval($page_owner_uid)
+               );
+               $size = $r[0]['total'];
+       } else
+               $size = 0;
+
+       if(($limit !== false) && (($size + strlen($imagedata)) > $limit)) {
                $msg = upgrade_message(true);
                if ($r_json) {
-                       echo json_encode(['error'=>$msg]);
+                       echo json_encode(array('error'=>$msg));
                } else {
                        echo  $msg. EOL;
                }
@@ -168,7 +187,7 @@ function wall_upload_post(&$a, $desktopmode = true) {
        if(! $ph->is_valid()) {
                $msg = t('Unable to process image.');
                if ($r_json) {
-                       echo json_encode(['error'=>$msg]);
+                       echo json_encode(array('error'=>$msg));
                } else {
                        echo  $msg. EOL;
                }
@@ -201,7 +220,7 @@ function wall_upload_post(&$a, $desktopmode = true) {
        if(! $r) {
                $msg = t('Image upload failed.');
                if ($r_json) {
-                       echo json_encode(['error'=>$msg]);
+                       echo json_encode(array('error'=>$msg));
                } else {
                        echo  $msg. EOL;
                }
@@ -228,7 +247,10 @@ function wall_upload_post(&$a, $desktopmode = true) {
 
                $r = q("SELECT `id`, `datasize`, `width`, `height`, `type` FROM `photo` WHERE `resource-id` = '%s' ORDER BY `width` DESC LIMIT 1", $hash);
                if (!$r){
-                       if ($r_json) { echo json_encode(['error'=>'']); killme(); }
+                       if ($r_json) {
+                               echo json_encode(array('error'=>''));
+                               killme();
+                       }
                        return false;
                }
                $picture = array();
@@ -242,11 +264,18 @@ function wall_upload_post(&$a, $desktopmode = true) {
                $picture["picture"] = $a->get_baseurl()."/photo/{$hash}-0.".$ph->getExt();
                $picture["preview"] = $a->get_baseurl()."/photo/{$hash}-{$smallest}.".$ph->getExt();
 
-               if ($r_json) { echo json_encode(['picture'=>$picture]); killme(); }
+               if ($r_json) {
+                       echo json_encode(array('picture'=>$picture));
+                       killme();
+               }
                return $picture;
        }
 
-       if ($r_json) { echo json_encode(['ok'=>true]); killme(); }
+
+       if ($r_json) {
+               echo json_encode(array('ok'=>true));
+               killme();
+       }
 
 /* mod Waitman Gobble NO WARRANTY */