X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fprofile_photo.php;h=5b75e654dff95a08a635533f18cf91a30793bc19;hb=54d598ce7c66308dbcf5d5aa0b14b3aec73885a8;hp=5f524514144f0d86d04f8633be13b17f7cb368ce;hpb=4ca68c7af05b7b41e1b04936b9080802ca2b7716;p=friendica.git

diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 5f52451414..5b75e654df 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -1,12 +1,14 @@
 <?php
-
+/**
+ * @file mod/profile_photo.php
+ */
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
-
-require_once("include/Photo.php");
+use Friendica\Model\Photo;
+use Friendica\Object\Image;
 
 function profile_photo_init(App $a) {
 
@@ -71,27 +73,27 @@ function profile_photo_post(App $a) {
 
 			$base_image = $r[0];
 
-			$im = new Photo($base_image['data'], $base_image['type']);
-			if($im->is_valid()) {
-				$im->cropImage(175,$srcX,$srcY,$srcW,$srcH);
+			$Image = new Image($base_image['data'], $base_image['type']);
+			if ($Image->isValid()) {
+				$Image->crop(175,$srcX,$srcY,$srcW,$srcH);
 
-				$r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 4, $is_default_profile);
+				$r = Photo::store($Image, local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 4, $is_default_profile);
 
 				if ($r === false) {
 					notice ( sprintf(t('Image size reduction [%s] failed.'),"175") . EOL );
 				}
 
-				$im->scaleImage(80);
+				$Image->scaleDown(80);
 
-				$r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 5, $is_default_profile);
+				$r = Photo::store($Image, local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 5, $is_default_profile);
 
 				if ($r === false) {
 					notice( sprintf(t('Image size reduction [%s] failed.'),"80") . EOL );
 				}
 
-				$im->scaleImage(48);
+				$Image->scaleDown(48);
 
-				$r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 6, $is_default_profile);
+				$r = Photo::store($Image, local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 6, $is_default_profile);
 
 				if ($r === false) {
 					notice( sprintf(t('Image size reduction [%s] failed.'),"48") . EOL );
@@ -106,15 +108,15 @@ function profile_photo_post(App $a) {
 					);
 
 					$r = q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s'  WHERE `self` AND `uid` = %d",
-						dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-4.' . $im->getExt()),
-						dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-5.' . $im->getExt()),
-						dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-6.' . $im->getExt()),
+						dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-4.' . $Image->getExt()),
+						dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-5.' . $Image->getExt()),
+						dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-6.' . $Image->getExt()),
 						intval(local_user())
 					);
 				} else {
 					$r = q("update profile set photo = '%s', thumb = '%s' where id = %d and uid = %d",
-						dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-4.' . $im->getExt()),
-						dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-5.' . $im->getExt()),
+						dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-4.' . $Image->getExt()),
+						dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-5.' . $Image->getExt()),
 						intval($_REQUEST['profile']),
 						intval(local_user())
 					);
@@ -132,10 +134,10 @@ function profile_photo_post(App $a) {
 				// Update global directory in background
 				$url = System::baseUrl() . '/profile/' . $a->user['nickname'];
 				if ($url && strlen(Config::get('system','directory'))) {
-					Worker::add(PRIORITY_LOW, "directory", $url);
+					Worker::add(PRIORITY_LOW, "Directory", $url);
 				}
 
-				Worker::add(PRIORITY_LOW, 'profile_update', local_user());
+				Worker::add(PRIORITY_LOW, 'ProfileUpdate', local_user());
 			} else {
 				notice( t('Unable to process image') . EOL);
 			}
@@ -150,22 +152,22 @@ function profile_photo_post(App $a) {
 	$filesize = intval($_FILES['userfile']['size']);
 	$filetype = $_FILES['userfile']['type'];
 	if ($filetype == "") {
-		$filetype = guess_image_type($filename);
+		$filetype = Image::guessType($filename);
 	}
 
-	$maximagesize = Config::get('system','maximagesize');
+	$maximagesize = Config::get('system', 'maximagesize');
 
 	if (($maximagesize) && ($filesize > $maximagesize)) {
-		notice( sprintf(t('Image exceeds size limit of %s'), formatBytes($maximagesize)) . EOL);
+		notice(sprintf(t('Image exceeds size limit of %s'), formatBytes($maximagesize)) . EOL);
 		@unlink($src);
 		return;
 	}
 
 	$imagedata = @file_get_contents($src);
-	$ph = new Photo($imagedata, $filetype);
+	$ph = new Image($imagedata, $filetype);
 
-	if (! $ph->is_valid()) {
-		notice( t('Unable to process image.') . EOL );
+	if (! $ph->isValid()) {
+		notice(t('Unable to process image.') . EOL);
 		@unlink($src);
 		return;
 	}
@@ -176,7 +178,6 @@ function profile_photo_post(App $a) {
 }
 
 
-if(! function_exists('profile_photo_content')) {
 function profile_photo_content(App $a) {
 
 	if (! local_user()) {
@@ -232,13 +233,13 @@ function profile_photo_content(App $a) {
 			// Update global directory in background
 			$url = $_SESSION['my_url'];
 			if ($url && strlen(Config::get('system','directory'))) {
-				Worker::add(PRIORITY_LOW, "directory", $url);
+				Worker::add(PRIORITY_LOW, "Directory", $url);
 			}
 
 			goaway(System::baseUrl() . '/profiles');
 			return; // NOTREACHED
 		}
-		$ph = new Photo($r[0]['data'], $r[0]['type']);
+		$ph = new Image($r[0]['data'], $r[0]['type']);
 		profile_photo_crop_ui_head($a, $ph);
 		// go ahead as we have jus uploaded a new photo to crop
 	}
@@ -283,26 +284,25 @@ function profile_photo_content(App $a) {
 	}
 
 	return; // NOTREACHED
-}}
+}
 
 
-if(! function_exists('profile_photo_crop_ui_head')) {
-function profile_photo_crop_ui_head(App $a, $ph) {
+function profile_photo_crop_ui_head(App $a, Image $Image) {
 	$max_length = Config::get('system','max_image_length');
 	if (! $max_length) {
 		$max_length = MAX_IMAGE_LENGTH;
 	}
 	if ($max_length > 0) {
-		$ph->scaleImage($max_length);
+		$Image->scaleDown($max_length);
 	}
 
-	$width = $ph->getWidth();
-	$height = $ph->getHeight();
+	$width = $Image->getWidth();
+	$height = $Image->getHeight();
 
 	if ($width < 175 || $height < 175) {
-		$ph->scaleImageUp(200);
-		$width = $ph->getWidth();
-		$height = $ph->getHeight();
+		$Image->scaleUp(200);
+		$width = $Image->getWidth();
+		$height = $Image->getHeight();
 	}
 
 	$hash = photo_new_resource();
@@ -310,7 +310,7 @@ function profile_photo_crop_ui_head(App $a, $ph) {
 
 	$smallest = 0;
 
-	$r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 0 );
+	$r = Photo::store($Image, local_user(), 0 , $hash, $filename, t('Profile Photos'), 0 );
 
 	if ($r) {
 		info( t('Image uploaded successfully.') . EOL );
@@ -319,8 +319,8 @@ function profile_photo_crop_ui_head(App $a, $ph) {
 	}
 
 	if ($width > 640 || $height > 640) {
-		$ph->scaleImage(640);
-		$r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 1 );
+		$Image->scaleDown(640);
+		$r = Photo::store($Image, local_user(), 0 , $hash, $filename, t('Profile Photos'), 1 );
 
 		if ($r === false) {
 			notice( sprintf(t('Image size reduction [%s] failed.'),"640") . EOL );
@@ -331,9 +331,8 @@ function profile_photo_crop_ui_head(App $a, $ph) {
 
 	$a->config['imagecrop'] = $hash;
 	$a->config['imagecrop_resolution'] = $smallest;
-	$a->config['imagecrop_ext'] = $ph->getExt();
+	$a->config['imagecrop_ext'] = $Image->getExt();
 	$a->page['htmlhead'] .= replace_macros(get_markup_template("crophead.tpl"), array());
 	$a->page['end'] .= replace_macros(get_markup_template("cropend.tpl"), array());
 	return;
-}}
-
+}