cvs: docweb /templates/all/www users.tpl.php /www users.php

vincent		Mon Aug  1 14:12:39 2005 EDT

  Modified files:              
    /docweb/templates/all/www	users.tpl.php 
    /docweb/www	users.php 
  Log:
  nice idea, but it didn't really work correct..
  
http://cvs.php.net/diff.php/docweb/templates/all/www/users.tpl.php?r1=1.7&r2=1.8&ty=u
Index: docweb/templates/all/www/users.tpl.php
diff -u docweb/templates/all/www/users.tpl.php:1.7 docweb/templates/all/www/users.tpl.php:1.8
--- docweb/templates/all/www/users.tpl.php:1.7	Mon Aug  1 10:34:35 2005
+++ docweb/templates/all/www/users.tpl.php	Mon Aug  1 14:12:35 2005
@@ -10,11 +10,8 @@
     case 'succes':
         $errors = "&docweb.users.succes;";
     break;
-    case 'size':
-        $errors = "&docweb.users.error.size;";
-    break;
     case 'format':
-        $errors = "&docweb.users.error.format;";
+        $errors = "&docweb.users.error.format;<br />&docweb.users.error.size;";
     break;
     default:
         $errors = '';
http://cvs.php.net/diff.php/docweb/www/users.php?r1=1.5&r2=1.6&ty=u
Index: docweb/www/users.php
diff -u docweb/www/users.php:1.5 docweb/www/users.php:1.6
--- docweb/www/users.php:1.5	Mon Aug  1 10:34:35 2005
+++ docweb/www/users.php	Mon Aug  1 14:12:38 2005
@@ -1,5 +1,5 @@
 <?php
-/* $Id: users.php,v 1.5 2005/08/01 14:34:35 vincent Exp $ */
+/* $Id: users.php,v 1.6 2005/08/01 18:12:38 vincent Exp $ */
 
 include '../include/init.inc.php';
 require_once '../include/lib_auth.inc.php';
@@ -38,20 +38,18 @@
 
     if (!empty($_FILES['photo']['name'])) {
         // this will need some more security checks
-        if ($_FILES['photo']['size'] >= round((1024 * 1024)/10)) {
-            $pictureError = 'size';
+        $img = getimagesize($_FILES['photo']['tmp_name']);
+        if ($_FILES['photo']['size'] >= round((300 * 1024)) or !$img or $img[0] >= 500 or $img[1] >= 500 or $img['mime'] != 'image/jpeg') {
+            $pictureError = 'format';
             unlink($_FILES['photo']['tmp_name']);
         } else {
-            $img = getimagesize($_FILES['photo']['tmp_name']);
-            if (!$img or $img[0] >= 500 or $img[1] >= 500 or $img['mime'] != 'image/jpeg') {
-                $pictureError = 'format';
-            } else {
                 move_uploaded_file($_FILES['photo']['tmp_name'],
                      $_SERVER['DOCUMENT_ROOT'].'/images/users/' . $info['username'] . '.jpg');
-            }
         }
     }
-$pictureError = 'succes';
+if (empty($pictureError)) {    
+    $pictureError = 'succes';
+}
 unset($info);
 $info = user_info($userid);
 }