X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Favatar.php;h=ffd003f749c4ba0cf4c592a0ec82ca2f1c0eb584;hb=d1fc067471a72589c9ae655f67eeea1709e12af5;hp=0b1025a3c4b2d0b658f3a47aababf937fa068cb5;hpb=466f0489c364441c125dffe6c9040bf6fcafd043;p=quix0rs-gnu-social.git

diff --git a/actions/avatar.php b/actions/avatar.php
index 0b1025a3c4..ffd003f749 100644
--- a/actions/avatar.php
+++ b/actions/avatar.php
@@ -36,7 +36,8 @@ class AvatarAction extends SettingsAction {
 			common_element('img', array('src' => $original->url,
 										'class' => 'avatar original',
 										'width' => $original->width,
-										'height' => $original->height));
+										'height' => $original->height,
+										'alt' => $user->nickname));
 		}
 
 		$avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
@@ -45,7 +46,8 @@ class AvatarAction extends SettingsAction {
 			common_element('img', array('src' => $avatar->url,
 										'class' => 'avatar profile',
 										'width' => AVATAR_PROFILE_SIZE,
-										'height' => AVATAR_PROFILE_SIZE));
+										'height' => AVATAR_PROFILE_SIZE,
+										'alt' => $user->nickname));
 		}
 
 		common_element_start('form', array('enctype' => 'multipart/form-data',
@@ -60,11 +62,9 @@ class AvatarAction extends SettingsAction {
 		common_element('input', array('name' => 'avatarfile',
 									  'type' => 'file',
 									  'id' => 'avatarfile'));
-		common_element('input', array('name' => 'submit',
-									  'type' => 'submit',
-									  'id' => 'submit'),
-					   _t('Upload'));
+		common_submit('submit', _t('Upload'));
 		common_element_end('form');
+		common_show_footer();
 	}
 
 	function handle_post() {
@@ -102,111 +102,17 @@ class AvatarAction extends SettingsAction {
 			$this->show_form(_t('Unsupported image file format.'));
 			return;
 		}
-		
-		$user = common_current_user();
-
-		$filename = common_avatar_filename($user, image_type_to_extension($info[2]));
-		$filepath = common_avatar_path($filename);
-
-		if (!move_uploaded_file($_FILES['avatarfile']['tmp_name'], $filepath)) {
-			@unlink($_FILES['avatarfile']['tmp_name']);
-			$this->show_form(_t('System error uploading file.'));
-			return;
-		}
-
-		$avatar = DB_DataObject::factory('avatar');
-
-		$avatar->profile_id = $user->id;
-		$avatar->width = $info[0];
-		$avatar->height = $info[1];
-		$avatar->mediatype = image_type_to_mime_type($info[2]);
-		$avatar->filename = $filename;
-		$avatar->original = true;
-		$avatar->url = common_avatar_url($filename);
-		$avatar->created = date(DATE_RFC822); # current time
-		foreach (array(AVATAR_PROFILE_SIZE, AVATAR_STREAM_SIZE, AVATAR_MINI_SIZE) as $size) {
-			$scaled[] = $this->scale_avatar($user, $avatar, $size);
-		}
-
-		# XXX: start a transaction here
-
-		if (!$this->delete_old_avatars($user)) {
-			@unlink($filepath);
-			common_server_error(_t('Error deleting old avatars.'));
-			return;
-		}
 
-		if (!$avatar->insert()) {
-			@unlink($filepath);
-			common_server_error(_t('Error inserting avatar.'));
-			return;
-		}
-
-		foreach ($scaled as $s) {
-			if (!$s->insert()) {
-				common_server_error(_t('Error inserting scaled avatar.'));
-				return;
-			}
-		}
-
-		# XXX: end transaction here
-
-		$this->show_form(_t('Avatar updated.'), true);
-	}
-	
-	function scale_avatar($user, $avatar, $size) {
-		$image_s = imagecreatetruecolor($size, $size);
-		$image_a = $this->avatar_to_image($avatar);
-		
-		$square = min($avatar->width, $avatar->height);
-		
-		imagecopyresampled($image_s, $image_a, 0, 0, 0, 0,
-						   $size, $size, $square, $square);
-
-		$ext = ($avatar->mediattype == 'image/jpeg') ? ".jpg" : ".png";
-		
-		$filename = common_avatar_filename($user, $ext, $size);
-		
-		if ($avatar->mediatype == 'image/jpeg') {
-			imagejpeg($image_s, common_avatar_path($filename));
-		} else {
-			imagepng($image_s, common_avatar_path($filename));
-		}
-		
-		$scaled = DB_DataObject::factory('avatar');
-		$scaled->profile_id = $avatar->profile_id;
-		$scaled->width = $size;
-		$scaled->height = $size;
-		$scaled->original = false;
-		$scaled->mediatype = ($avatar->mediattype == 'image/jpeg') ? 'image/jpeg' : 'image/png';
-		$scaled->filename = $filename;
-		$scaled->url = common_avatar_url($filename);
-		$scaled->created = date(DATE_RFC822); # current time
+		$user = common_current_user();
+		$profile = $user->getProfile();
 		
-		return $scaled;
-	}
-	
-	function avatar_to_image($avatar) {
-		$filepath = common_avatar_path($avatar->filename);
-		if ($avatar->mediatype == 'image/gif') {
-			return imagecreatefromgif($filepath);
-		} else if ($avatar->mediatype == 'image/jpeg') {
-			return imagecreatefromjpeg($filepath);			
-		} else if ($avatar->mediatype == 'image/png') {
-			return imagecreatefrompng($filepath);
+		if ($profile->setOriginal($_FILES['avatarfile']['tmp_name'])) {
+			$this->show_form(_t('Avatar updated.'), true);
 		} else {
-			common_server_error(_t('Unsupported image type:') . $avatar->mediatype);
-			return NULL;
-		}
-	}
-	
-	function delete_old_avatars($user) {
-		$avatar = DB_DataObject::factory('avatar');
-		$avatar->profile_id = $user->id;
-		$avatar->find();
-		while ($avatar->fetch()) {
-			$avatar->delete();
+			$this->show_form(_t('Failed updating avatar.'));
 		}
+
+		@unlink($_FILES['avatarfile']['tmp_name']);
 	}
 }