From: rabuzarus <>
Date: Sat, 25 Mar 2017 18:12:16 +0000 (+0100)
Subject: some work on code standards compliance
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a2ad01383082a01eb540ffa6c89c82519fec7b11;p=friendica.git

some work on code standards compliance
---

diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index 2f3bd14154..3e88bd76b5 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -1,18 +1,30 @@
 <?php
 
-require_once('include/Photo.php');
+/**
+ * @file mod/wall_upload.php
+ * @brief Module for uploading a picture to the profile wall
+ * 
+ * By default the picture will be stored in the photo album with the name Wall Photos.
+ * You can specify a different album by adding an optional query string "album="
+ * to the url
+ */
+
+require_once 'include/Photo.php';
 
 function wall_upload_post(App $a, $desktopmode = true) {
 
 	logger("wall upload: starting new upload", LOGGER_DEBUG);
 
-	$r_json = (x($_GET,'response') && $_GET['response']=='json');
+	$r_json = (x($_GET, 'response') && $_GET['response'] == 'json');
 	$album = (x($_GET, 'album') ? notags(trim($_GET['album'])) : '');
 
-	if($a->argc > 1) {
-		if(! x($_FILES,'media')) {
+	if ($a->argc > 1) {
+		if (! x($_FILES, 'media')) {
 			$nick = $a->argv[1];
-			$r = q("SELECT `user`.*, `contact`.`id` FROM `user` INNER JOIN `contact` on `user`.`uid` = `contact`.`uid`  WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
+			$r = q("SELECT `user`.*, `contact`.`id` FROM `user`
+				INNER JOIN `contact` on `user`.`uid` = `contact`.`uid`
+				WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0
+				AND `contact`.`self` = 1 LIMIT 1",
 				dbesc($nick)
 			);
 
@@ -25,7 +37,10 @@ function wall_upload_post(App $a, $desktopmode = true) {
 			}
 		} else {
 			$user_info = api_get_user($a);
-			$r = q("SELECT `user`.*, `contact`.`id` FROM `user` INNER JOIN `contact` on `user`.`uid` = `contact`.`uid`  WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
+			$r = q("SELECT `user`.*, `contact`.`id` FROM `user`
+				INNER JOIN `contact` on `user`.`uid` = `contact`.`uid`
+				WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0
+				AND `contact`.`self` = 1 LIMIT 1",
 				dbesc($user_info['screen_name'])
 			);
 		}
@@ -37,6 +52,9 @@ function wall_upload_post(App $a, $desktopmode = true) {
 		return;
 	}
 
+	/*
+	 * Setup permissions structures
+	 */
 	$can_post  = false;
 	$visitor   = 0;
 
@@ -45,22 +63,24 @@ function wall_upload_post(App $a, $desktopmode = true) {
 	$page_owner_nick  = $r[0]['nickname'];
 	$community_page   = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
 
-	if((local_user()) && (local_user() == $page_owner_uid))
+	if ((local_user()) && (local_user() == $page_owner_uid)) {
 		$can_post = true;
-	else {
-		if($community_page && remote_user()) {
+	} else {
+		if ($community_page && remote_user()) {
 			$contact_id = 0;
-			if(is_array($_SESSION['remote'])) {
-				foreach($_SESSION['remote'] as $v) {
-					if($v['uid'] == $page_owner_uid) {
+			if (is_array($_SESSION['remote'])) {
+				foreach ($_SESSION['remote'] as $v) {
+					if ($v['uid'] == $page_owner_uid) {
 						$contact_id = $v['cid'];
 						break;
 					}
 				}
 			}
-			if($contact_id) {
 
-				$r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
+			if ($contact_id) {
+				$r = q("SELECT `uid` FROM `contact`
+					WHERE `blocked` = 0 AND `pending` = 0
+					AND `id` = %d AND `uid` = %d LIMIT 1",
 					intval($contact_id),
 					intval($page_owner_uid)
 				);
@@ -73,16 +93,16 @@ function wall_upload_post(App $a, $desktopmode = true) {
 	}
 
 
-	if(! $can_post) {
+	if (! $can_post) {
 		if ($r_json) {
 			echo json_encode(array('error'=>t('Permission denied.')));
 			killme();
 		}
-		notice( t('Permission denied.') . EOL );
+		notice(t('Permission denied.') . EOL);
 		killme();
 	}
 
-	if(! x($_FILES,'userfile') && ! x($_FILES,'media')){
+	if (! x($_FILES, 'userfile') && ! x($_FILES, 'media')) {
 		if ($r_json) {
 			echo json_encode(array('error'=>t('Invalid request.')));
 		}
@@ -90,32 +110,36 @@ function wall_upload_post(App $a, $desktopmode = true) {
 	}
 
 	$src = "";
-	if(x($_FILES,'userfile')) {
+	if (x($_FILES, 'userfile')) {
 		$src      = $_FILES['userfile']['tmp_name'];
 		$filename = basename($_FILES['userfile']['name']);
 		$filesize = intval($_FILES['userfile']['size']);
 		$filetype = $_FILES['userfile']['type'];
-	}
-	elseif(x($_FILES,'media')) {
-		if (is_array($_FILES['media']['tmp_name']))
+
+	} elseif (x($_FILES, 'media')) {
+		if (is_array($_FILES['media']['tmp_name'])) {
 			$src = $_FILES['media']['tmp_name'][0];
-		else
+		} else {
 			$src = $_FILES['media']['tmp_name'];
+		}
 
-		if (is_array($_FILES['media']['name']))
+		if (is_array($_FILES['media']['name'])) {
 			$filename = basename($_FILES['media']['name'][0]);
-		else
+		} else {
 			$filename = basename($_FILES['media']['name']);
+		}
 
-		if (is_array($_FILES['media']['size']))
+		if (is_array($_FILES['media']['size'])) {
 			$filesize = intval($_FILES['media']['size'][0]);
-		else
+		} else {
 			$filesize = intval($_FILES['media']['size']);
+		}
 
-		if (is_array($_FILES['media']['type']))
+		if (is_array($_FILES['media']['type'])) {
 			$filetype = $_FILES['media']['type'][0];
-		else
+		} else {
 			$filetype = $_FILES['media']['type'];
+		}
 	}
 
 	if ($src=="") {
@@ -128,28 +152,30 @@ function wall_upload_post(App $a, $desktopmode = true) {
 	}
 
 	// This is a special treatment for picture upload from Twidere
-	if (($filename == "octet-stream") AND ($filetype != "")) {
+	if (($filename == "octet-stream") && ($filetype != "")) {
 		$filename = $filetype;
 		$filetype = "";
 	}
 
-	if ($filetype=="")
+	if ($filetype=="") {
 		$filetype=guess_image_type($filename);
+	}
 
 	// If there is a temp name, then do a manual check
 	// This is more reliable than the provided value
 
 	$imagedata = getimagesize($src);
-	if ($imagedata)
+	if ($imagedata) {
 		$filetype = $imagedata['mime'];
+	}
 
-	logger("File upload src: ".$src." - filename: ".$filename.
-		" - size: ".$filesize." - type: ".$filetype, LOGGER_DEBUG);
+	logger("File upload src: " . $src . " - filename: " . $filename .
+		" - size: " . $filesize . " - type: " . $filetype, LOGGER_DEBUG);
 
-	$maximagesize = get_config('system','maximagesize');
+	$maximagesize = get_config('system', 'maximagesize');
 
-	if(($maximagesize) && ($filesize > $maximagesize)) {
-		$msg = sprintf( t('Image exceeds size limit of %s'), formatBytes($maximagesize));
+	if (($maximagesize) && ($filesize > $maximagesize)) {
+		$msg = sprintf(t('Image exceeds size limit of %s'), formatBytes($maximagesize));
 		if ($r_json) {
 			echo json_encode(array('error'=>$msg));
 		} else {
@@ -160,10 +186,12 @@ function wall_upload_post(App $a, $desktopmode = true) {
 	}
 
 
-	$limit = service_class_fetch($page_owner_uid,'photo_upload_limit');
+	$limit = service_class_fetch($page_owner_uid, 'photo_upload_limit');
 
 	if ($limit) {
-		$r = q("select sum(octet_length(data)) as total from photo where uid = %d and scale = 0 and album != 'Contact Photos' ",
+		$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'];
@@ -183,7 +211,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
 	$imagedata = @file_get_contents($src);
 	$ph = new Photo($imagedata, $filetype);
 
-	if(! $ph->is_valid()) {
+	if (! $ph->is_valid()) {
 		$msg = t('Unable to process image.');
 		if ($r_json) {
 			echo json_encode(array('error'=>$msg));
@@ -197,12 +225,13 @@ function wall_upload_post(App $a, $desktopmode = true) {
 	$ph->orient($src);
 	@unlink($src);
 
-	$max_length = get_config('system','max_image_length');
-	if(! $max_length)
+	$max_length = get_config('system', 'max_image_length');
+	if (! $max_length) {
 		$max_length = MAX_IMAGE_LENGTH;
-	if($max_length > 0) {
+	}
+	if ($max_length > 0) {
 		$ph->scaleImage($max_length);
-		logger("File upload: Scaling picture to new size ".$max_length, LOGGER_DEBUG);
+		logger("File upload: Scaling picture to new size " . $max_length, LOGGER_DEBUG);
 	}
 
 	$width = $ph->getWidth();
@@ -221,7 +250,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
 
 	$r = $ph->store($page_owner_uid, $visitor, $hash, $filename, $album, 0, 0, $defperm);
 
-	if(! $r) {
+	if (! $r) {
 		$msg = t('Image upload failed.');
 		if ($r_json) {
 			echo json_encode(array('error'=>$msg));
@@ -231,26 +260,31 @@ function wall_upload_post(App $a, $desktopmode = true) {
 		killme();
 	}
 
-	if($width > 640 || $height > 640) {
+	if ($width > 640 || $height > 640) {
 		$ph->scaleImage(640);
 		$r = $ph->store($page_owner_uid, $visitor, $hash, $filename, $album, 1, 0, $defperm);
-		if($r)
+		if ($r) {
 			$smallest = 1;
+		}
 	}
 
-	if($width > 320 || $height > 320) {
+	if ($width > 320 || $height > 320) {
 		$ph->scaleImage(320);
 		$r = $ph->store($page_owner_uid, $visitor, $hash, $filename, $album, 2, 0, $defperm);
-		if($r AND ($smallest == 0))
+		if ($r && ($smallest == 0)) {
 			$smallest = 2;
+		}
 	}
 
 	$basename = basename($filename);
 
 	if (!$desktopmode) {
-
-		$r = q("SELECT `id`, `datasize`, `width`, `height`, `type` FROM `photo` WHERE `resource-id` = '%s' ORDER BY `width` DESC LIMIT 1", $hash);
-		if (!$r){
+		$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();
@@ -259,14 +293,14 @@ function wall_upload_post(App $a, $desktopmode = true) {
 		}
 		$picture = array();
 
-		$picture["id"] = $r[0]["id"];
-		$picture["size"] = $r[0]["datasize"];
-		$picture["width"] = $r[0]["width"];
-		$picture["height"] = $r[0]["height"];
-		$picture["type"] = $r[0]["type"];
-		$picture["albumpage"] = App::get_baseurl().'/photos/'.$page_owner_nick.'/image/'.$hash;
-		$picture["picture"] = App::get_baseurl()."/photo/{$hash}-0.".$ph->getExt();
-		$picture["preview"] = App::get_baseurl()."/photo/{$hash}-{$smallest}.".$ph->getExt();
+		$picture["id"]        = $r[0]["id"];
+		$picture["size"]      = $r[0]["datasize"];
+		$picture["width"]     = $r[0]["width"];
+		$picture["height"]    = $r[0]["height"];
+		$picture["type"]      = $r[0]["type"];
+		$picture["albumpage"] = App::get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash;
+		$picture["picture"]   = App::get_baseurl() . "/photo/{$hash}-0." . $ph->getExt();
+		$picture["preview"]   = App::get_baseurl() . "/photo/{$hash}-{$smallest}." . $ph->getExt();
 
 		if ($r_json) {
 			echo json_encode(array('picture'=>$picture));
@@ -282,7 +316,6 @@ function wall_upload_post(App $a, $desktopmode = true) {
 	}
 
 /* mod Waitman Gobble NO WARRANTY */
-
 	// if we get the signal then return the image url info in BBCODE
 	if ($_REQUEST['hush']!='yeah') {
 		echo  "\n\n" . '[url=' . App::get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . App::get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]\n\n";
diff --git a/view/theme/frio/js/filebrowser.js b/view/theme/frio/js/filebrowser.js
index 8617e80207..5985ac742e 100644
--- a/view/theme/frio/js/filebrowser.js
+++ b/view/theme/frio/js/filebrowser.js
@@ -87,7 +87,7 @@ var FileBrowser = {
 			}
 		};
 
-		console.log("FileBrowser:", nickname, type,FileBrowser.event, FileBrowser.id );
+		console.log("FileBrowser:", nickname, type,FileBrowser.event, FileBrowser.id);
 
 		FileBrowser.postLoad();
 
@@ -111,11 +111,11 @@ var FileBrowser = {
 
 			var embed = "";
 			if (FileBrowser.type == "image") {
-				embed = "[url="+this.dataset.link+"][img]"+this.dataset.img+"[/img][/url]";
+				embed = "[url=" + this.dataset.link + "][img]" + this.dataset.img + "[/img][/url]";
 			}
 			if (FileBrowser.type == "file") {
 				// attachment links are "baseurl/attach/id"; we need id
-				embed = "[attachment]"+this.dataset.link.split("/").pop()+"[/attachment]";
+				embed = "[attachment]" + this.dataset.link.split("/").pop() + "[/attachment]";
 			}
 
 			// Delete prefilled Text of the comment input
@@ -131,7 +131,9 @@ var FileBrowser = {
 				}
 
 			}
+
 			console.log(FileBrowser.event, this.dataset.filename, embed, FileBrowser.id);
+
 			parent.$("body").trigger(FileBrowser.event, [
 				this.dataset.filename,
 				embed,
@@ -164,16 +166,16 @@ var FileBrowser = {
 			//AjaxUpload for images
 			var image_uploader = new window.AjaxUpload(
 				'upload-image',
-				{	action: 'wall_upload/'+FileBrowser.nickname+'?response=json&album=' + albumname,
+				{	action: 'wall_upload/' + FileBrowser.nickname + '?response=json&album=' + albumname,
 					name: 'userfile',
 					responseType: 'json',
-					onSubmit: function(file,ext) {
+					onSubmit: function(file, ext) {
 						$(".fbrowser-content").hide();
 						$(".fbrowser .profile-rotator-wrapper").show();
 						$(".error").addClass('hidden');
 					},
 					onComplete: function(file,response) {
-						if (response['error']!= undefined) {
+						if (response['error'] != undefined) {
 							$(".error span").html(response['error']);
 							$(".error").removeClass('hidden');
 							$(".fbrowser .profile-rotator-wrapper").hide();
@@ -197,7 +199,7 @@ var FileBrowser = {
 				'upload-file',
 				{	action: 'wall_attach/' + FileBrowser.nickname + '?response=json',
 					name: 'userfile',
-					onSubmit: function(file,ext) {
+					onSubmit: function(file, ext) {
 						$(".fbrowser-content").hide();
 						$(".fbrowser .profile-rotator-wrapper").show();
 						$(".error").addClass('hidden');
@@ -238,7 +240,7 @@ var FileBrowser = {
 		$(".fbrowser .profile-rotator-wrapper").show();
 
 		// load new content to fbrowser window
-		$(".fbrowser").load(url, function(responseText, textStatus){
+		$(".fbrowser").load(url, function(responseText, textStatus) {
 			$(".profile-rotator-wrapper").hide();
 			if (textStatus === 'success') {
 				$(".fbrowser_content").show();