X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fwall_attach.php;h=8bf1fdbf19d6293b0bada256d2bc4362fc4debae;hb=47bd3243cdb4a4840ca4d40452402a86b792ce1b;hp=e11d749a3d7b3200f45e12a619db7660966db9d9;hpb=4b6afbf6814acde5151edc74f0b6cf1fd7685432;p=friendica.git

diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index e11d749a3d..8bf1fdbf19 100644
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -1,9 +1,11 @@
 <?php
 
+use Friendica\App;
+
 require_once('include/attach.php');
 require_once('include/datetime.php');
 
-function wall_attach_post(&$a) {
+function wall_attach_post(App $a) {
 
 	$r_json = (x($_GET,'response') && $_GET['response']=='json');
 
@@ -12,15 +14,21 @@ function wall_attach_post(&$a) {
 		$r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid`  WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
 			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 {
-		if ($r_json) { echo json_encode(['error'=>t('Invalid request.')]); killme(); }
+		if ($r_json) {
+			echo json_encode(array('error'=>t('Invalid request.')));
+			killme();
+		}
 		return;
-    }
+	}
 
 	$can_post  = false;
 	$visitor   = 0;
@@ -34,36 +42,41 @@ function wall_attach_post(&$a) {
 		$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;
 				}
 			}
 		}
 	}
 	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')) {
-		if ($r_json) { echo json_encode(['error'=>t('Invalid request.')]); killme(); }
+		if ($r_json) {
+			echo json_encode(array('error'=>t('Invalid request.')));
+		}
 		killme();
 	}
 
@@ -82,7 +95,7 @@ function wall_attach_post(&$a) {
 	if($filesize <=0) {
 		$msg = t('Sorry, maybe your upload is bigger than the PHP configuration allows') . EOL .(t('Or - did you try to upload an empty file?'));
 		if ($r_json) {
-			echo json_encode(['error'=>$msg]);
+			echo json_encode(array('error'=>$msg));
 		} else {
 			notice( $msg. EOL );
 		}
@@ -93,7 +106,7 @@ function wall_attach_post(&$a) {
 	if(($maxfilesize) && ($filesize > $maxfilesize)) {
 		$msg = sprintf(t('File exceeds size limit of %s'), formatBytes($maxfilesize));
 		if ($r_json) {
-			echo json_encode(['error'=>$msg]);
+			echo json_encode(array('error'=>$msg));
 		} else {
 			echo  $msg. EOL ;
 		}
@@ -101,24 +114,26 @@ function wall_attach_post(&$a) {
 		killme();
 	}
 
-	$r = q("select sum(octet_length(data)) as total from attach where uid = %d ",
-		intval($page_owner_uid)
-	);
-
 	$limit = service_class_fetch($page_owner_uid,'attach_upload_limit');
 
-	if(($limit !== false) && (($r[0]['total'] + strlen($imagedata)) > $limit)) {
-		$msg = upgrade_message(true);
-		if ($r_json) {
-			echo json_encode(['error'=>$msg]);
-		} else {
-			echo  $msg. EOL ;
+        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'];
+
+		if (($size + strlen($imagedata)) > $limit) {
+			$msg = upgrade_message(true);
+			if ($r_json) {
+				echo json_encode(array('error'=>$msg));
+			} else {
+				echo  $msg. EOL ;
+			}
+			@unlink($src);
+			killme();
 		}
-		@unlink($src);
-		killme();
 	}
 
-
 	$filedata = @file_get_contents($src);
 	$mimetype = z_mime_content_type($filename);
 	$hash = get_guid(64);
@@ -144,7 +159,7 @@ function wall_attach_post(&$a) {
 	if(! $r) {
 		$msg =  t('File upload failed.');
 		if ($r_json) {
-			echo json_encode(['error'=>$msg]);
+			echo json_encode(array('error'=>$msg));
 		} else {
 			echo  $msg. EOL ;
 		}
@@ -157,17 +172,20 @@ function wall_attach_post(&$a) {
 		dbesc($hash)
 	);
 
-	if(! count($r)) {
+	if (! dbm::is_result($r)) {
 		$msg = t('File upload failed.');
 		if ($r_json) {
-			echo json_encode(['error'=>$msg]);
+			echo json_encode(array('error'=>$msg));
 		} else {
 			echo  $msg. EOL ;
 		}
 		killme();
 	}
 
-	if ($r_json) { echo json_encode(['ok'=>true]); killme(); }
+	if ($r_json) {
+		echo json_encode(array('ok'=>true));
+		killme();
+	}
 
 	$lf = "\n";