X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fwall_upload.php;h=b815348c7010baddd103553dc653f83da416ce86;hb=fd8df4c4d6688e5ffd6bc78e14062aa064102715;hp=8e7eaa027f342717bb60f3992c3c6742340a3b8f;hpb=fa0acba49e01e2bb26e88e54c543975a5048617b;p=friendica.git

diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index 8e7eaa027f..b815348c70 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -16,10 +16,10 @@ function wall_upload_post(&$a, $desktopmode = true) {
 			);
 
 			if(! count($r)){
-				if ($r_json) { 
-                                    echo json_encode(array('error'=>t('Invalid request.'))); 
-                                    killme(); 
-                                }
+				if ($r_json) {
+				    echo json_encode(array('error'=>t('Invalid request.')));
+				    killme();
+				}
 				return;
 			}
 		} else {
@@ -29,10 +29,10 @@ function wall_upload_post(&$a, $desktopmode = true) {
 			);
 		}
 	} else {
-		if ($r_json) { 
-                    echo json_encode(array('error'=>t('Invalid request.'))); 
-                    killme(); 
-                }
+		if ($r_json) {
+		    echo json_encode(array('error'=>t('Invalid request.')));
+		    killme();
+		}
 		return;
 	}
 
@@ -73,18 +73,18 @@ function wall_upload_post(&$a, $desktopmode = true) {
 
 
 	if(! $can_post) {
-		if ($r_json) { 
-                    echo json_encode(array('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(array('error'=>t('Invalid request.')));
-                }
+		if ($r_json) {
+		    echo json_encode(array('error'=>t('Invalid request.')));
+		}
 		killme();
 	}
 
@@ -118,10 +118,10 @@ function wall_upload_post(&$a, $desktopmode = true) {
 	}
 
 	if ($src=="") {
-		if ($r_json) { 
-                    echo json_encode(array('error'=>t('Invalid request.')));
-                    killme();
-                }
+		if ($r_json) {
+		    echo json_encode(array('error'=>t('Invalid request.')));
+		    killme();
+		}
 		notice(t('Invalid request.').EOL);
 		killme();
 	}
@@ -158,13 +158,18 @@ 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(array('error'=>$msg));
@@ -243,9 +248,9 @@ 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(array('error'=>''));
-                            killme();
-                        }
+			    echo json_encode(array('error'=>''));
+			    killme();
+			}
 			return false;
 		}
 		$picture = array();
@@ -260,16 +265,17 @@ function wall_upload_post(&$a, $desktopmode = true) {
 		$picture["preview"] = $a->get_baseurl()."/photo/{$hash}-{$smallest}.".$ph->getExt();
 
 		if ($r_json) {
-                    echo json_encode(array('picture'=>$picture));
-                    killme();
-                }
+		    echo json_encode(array('picture'=>$picture));
+		    killme();
+		}
 		return $picture;
 	}
 
+
 	if ($r_json) {
-            echo json_encode(array('ok'=>true));
-            killme();
-        }
+	    echo json_encode(array('ok'=>true));
+	    killme();
+	}
 
 /* mod Waitman Gobble NO WARRANTY */