Changeset 1159 for trunk/common

Timestamp:

12/07/11 17:51:00 (6 months ago)

Author:

adrian.budau

Message:

Fix more errors that occured durring the deployment of the avatar optimisation

Fixes to the attachments control. Users can't upload an attachment called avatar.
Now the avatar can be deleted.
Fixes to the image resize script regarding gif files (it used to enter an infinite loop)

REVIEW URL ​http://reviewboard.infoarena.ro/r/181/

Location:

trunk/common

Files:

• attachment.php (modified) (1 diff)
• avatar.php (modified) (2 diffs)
• common.php (modified) (1 diff)
• security.php (modified) (2 diffs)

trunk/common/attachment.php

@@ -178 +178 @@
             $trans_col = imagecolortransparent($image);
             imagepalettecopy($image_resized, $image);
-            imagefill($image_resized, 0, 0, $trans_col);
+            if ($trans_col != -1) {
+                imagefill($image_resized, 0, 0, $trans_col);
+            }
             imagecolortransparent($image_resized, $trans_col);
             imagecopyresampled($image_resized, $image, 0, 0, 0, 0,

trunk/common/avatar.php

@@ -7 +7 @@
 require_once(IA_ROOT_DIR.'www/controllers/account_validator.php');
 require_once(IA_ROOT_DIR.'common/common.php');
+require_once(IA_ROOT_DIR.'www/config.php');
 require_once(IA_ROOT_DIR.'common/attachment.php');
+
+/**
+ * Returns whether the attachment of the given page is an avatar attachment
+ * @param  string  $attachment_name
+ * @param  string  $page_name
+ * @return bool
+ */
+function is_avatar_attachment($attachment_name, $page_name) {
+    $matches = get_page_user_name($page_name);
+
+    if ($attachment_name === 'avatar' && $matches) {
+        return true;
+    }
+
+    return false;
+}
+
+/**
+ * Resizes a newly uploaded avatar and returns errors if any
+ * @param  string  $temporary_name
+ * @param  string  $filepath          The filepath where to copy the attachment
+ * @param  string  $username
+ * @return mixed   Error message or null on success
+ */
+function avatar_update($temporary_name, $filepath, $username) {
+    // resize the avatar if it has a correct mime-type
+    $avatar_mime_types = array('image/gif', 'image/jpeg', 'image/png');
+    $image_info = getimagesize($temporary_name);
+    if (!in_array($image_info['mime'], $avatar_mime_types)) {
+        return 'Fisierul nu este o imagine acceptata pe site. ' .
+                'Utilizati doar imagini GIF, JPEG sau PNG.';
+    }
+
+    // write the file on disk.
+    if (!move_uploaded_file($temporary_name, $filepath)) {
+        return 'Fisierul nu a putut fi incarcat pe server.';
+    }
+    // resize the avatar
+    avatar_cache_resized($filepath, $image_info, "a".$username);
+    return null;
+}
 
 /**
@@ -45 +87 @@
 }
 
+/**
+ * Delete's an user avatar, the rest is done from the attachment page
+ *
+ * @param  string  $username
+ */
+function avatar_delete($username) {
+    $resize_folders = array('tiny/', 'small/', 'normal/', 'forum/', 'big/');
+
+    // Unlink the hardlinked full-sized image
+    $filepath = IA_AVATAR_FOLDER . 'full/a' . $username;
+    if (is_file($filepath) || is_link($filepath)) {
+        unlink($filepath);
+    }
+
+    // Delete the resized ones
+    foreach ($resize_folders as $resize_folder) {
+        $filepath = IA_AVATAR_FOLDER . $resize_folder . 'a'
+                . $username;
+        if (is_file($filepath) || is_link($filepath)) {
+            unlink($filepath);
+        }
+    }
+}
 ?>

trunk/common/common.php

@@ -154 +154 @@
 function is_page_name($page_name) {
     return preg_match('/^'.IA_RE_PAGE_NAME.'$/xi', $page_name);
+}
+
+/**
+ * Validates user page name
+ *
+ * @param  string  $page_name
+ * @return array                returns an array containing the matched user
+ */
+function get_page_user_name($page_name) {
+    preg_match("/^ ".
+                preg_quote(IA_USER_TEXTBLOCK_PREFIX, '/').
+                '('.IA_RE_USER_NAME.") (\/?.*) $/xi",
+                $page_name, $matches);
+    return $matches;
 }
 

trunk/common/security.php

@@ -193 +193 @@
     // HACK: Forward security to user.
     // HACK: based on name
-    if (preg_match("/^ ".
-                preg_quote(IA_USER_TEXTBLOCK_PREFIX, '/').
-                '('.IA_RE_USER_NAME.") (\/?.*) $/xi",
-                $textblock['name'], $matches)) {
+    if (count($matches = get_page_user_name($textblock['name'])) > 0) {
         require_once(IA_ROOT_DIR . "common/db/user.php");
         $ouser = user_get_by_username($matches[1]);
@@ -205 +202 @@
         // This is a horrible hack to prevent deleting or moving an user page.
         // This is pure evil.
-        if ($matches[2] != '') {
-            return false;
-        }
         if ($action == 'textblock-delete' || $action == 'textblock-move') {
             $action = 'simple-critical';