Changeset 14537

Timestamp:

06/24/08 22:38:00 (5 years ago)

Author:

riaf

Message:

いろいろボケてた

Location:

events/phpframework/rhaco/trunk

Files:

• index.php (modified) (1 diff)
• library/PhwittrUser.php (modified) (3 diffs)
• library/Picturize.php (modified) (3 diffs)
• resources/templates/default/account/picture.html (modified) (1 diff)

events/phpframework/rhaco/trunk/index.php

@@ -87 +87 @@
             'method' => 'passwordChange',
         ),
-        // '^account\/picture$' => array(
-        //     'class' => 'PhwittrUser',
-        //     'method' => 'picture',
-        // ),
+        '^account\/picture$' => array(
+            'class' => 'PhwittrUser',
+            'method' => 'picture',
+        ),
+        '^account\/delete_picture$' => array(
+            'class' => 'PhwittrUser',
+            'method' => 'delete_picture',
+        ),
         '^account\/confirm\/(.*?)$' => array(
             'class' => 'PhwittrUser',

events/phpframework/rhaco/trunk/library/PhwittrUser.php

@@ -9 +9 @@
 
 Rhaco::import('Phwittr');
+Rhaco::import('Picturize');
 
 class PhwittrUser extends Phwittr
@@ -87 +88 @@
             try {
                 $picturize = new Picturize();
-                $picturize->loadfile($file->tmp)->fit(48, 48)->save(Rhaco::constant('UPLOAD_PATH') . '/thumbnail/' . $user->getId(), null, true);
+                $picturize->loadfile($file->tmp)->fit(48, 48)->save(Rhaco::constant(VAR_UPLOAD_PATH) . '/thumbnail/' . $user->getId(), null, true);
             } catch(PicturizeException $e){
                 L::warning($e->getMessage());
                 return new HtmlParser(Rhaco::constant('THEME'). '/account/picture.html');
             }
-            $file->generate(Rhaco::constant(VAR_UPLOAD_PATH) . '/original/' . $user->getId() . '.' . $file->getExtension());
-            $user->setImage($user->getId() . '.' . $file->getExtension());
+            $file->generate(Rhaco::constant(VAR_UPLOAD_PATH) . '/original/' . $user->getId() . $file->getExtension());
+            $user->setImage($user->getId() . $file->getExtension());
             if($user->save($this->dbUtil)){
                 Header::redirect(Rhaco::url('account/picture'));
@@ -99 +100 @@
         }
         return new HtmlParser(Rhaco::constant('THEME'). '/account/picture.html');
+    }
+
+    function delete_picture(){
+        $user = $this->loginRequired();
+        $user = $this->dbUtil->get(new User($user->getId()));
+        if(file_exists(Rhaco::constant(VAR_UPLOAD_PATH) . '/original/' . $user->getImage())){
+            @unlink(Rhaco::constant(VAR_UPLOAD_PATH) . '/original/' . $user->getImage());
+        }
+        if(file_exists(Rhaco::constant(VAR_UPLOAD_PATH) . '/thumbnail/' . $user->getImage())){
+            @unlink(Rhaco::constant(VAR_UPLOAD_PATH) . '/thumbnail/' . $user->getImage());
+        }
+        $user->setImage('');
+        $user->save($this->dbUtil);
+        Header::redirect(Rhaco::url('account/picture'));
     }
 

events/phpframework/rhaco/trunk/library/Picturize.php

@@ -39 +39 @@
      */
     public function loadFile($filename){
-        if(file_exists($filename)){
+        if(!file_exists($filename)){
             throw new PicturizeException('File is not found.');
         }
@@ -63 +63 @@
                 break;
             case IMAGETYPE_WBMP:
-                $handle = imagecreatefrompng($filename);
+                $handle = imagecreatefromwbmp($filename);
                 break;
         }
@@ -200 +200 @@
             $filename .= '.' . $ext;
         }
+        switch($type){
+            case IMAGETYPE_GIF:
+                $handle = imagegif($this->handle, $filename);
+                break;
+            case IMAGETYPE_JPEG:
+                $handle = imagejpeg($this->handle, $filename);
+                break;
+            case IMAGETYPE_PNG:
+                $handle = imagepng($this->handle, $filename);
+                break;
+            case IMAGETYPE_WBMP:
+                $handle = imagewbmp($this->handle, $filename);
+                break;
+        }
+
         return $this;
     }

events/phpframework/rhaco/trunk/resources/templates/default/account/picture.html

@@ -9 +9 @@
                         <dd><input type="file" name="picture" /></dd>
 
-                        <dd><a href="{$rhaco.url('account/delete_picture')}"></a> or <input type="submit" value="Save" /></dd>
+                        <dd><a href="{$rhaco.url('account/delete_picture')}">Delete Picture</a> or <input type="submit" value="Save" /></dd>
                 </dl>
         </form>