Changeset 169

Timestamp:

Jun 14, 2006 1:10:07 AM (18 years ago)

Author:

scdev

Message:

${1}

Location:

trunk

Files:

• lib/Validator.inc.php (modified) (1 diff)
• lib/Version.inc.php (modified) (6 diffs)
• tests/FormValidatorTest.php (modified) (1 diff)

trunk/lib/Validator.inc.php

@@ -295 +295 @@
     function fileUploaded($form_name)
     {
-        return isset($_FILES[$form_name]['tmp_name']) && !empty($_FILES[$form_name]['tmp_name']);
+        if (!isset($_FILES[$form_name]['tmp_name'])) {
+            return false;
+        }
+        
+        if (is_array($_FILES[$form_name]['tmp_name'])) {
+            foreach($_FILES[$form_name]['tmp_name'] as $f) {
+                if ('' == $f) {
+                    return false;
+                }
+            }
+        } else {
+            if ('' == $_FILES[$form_name]['tmp_name']) {
+                return false;
+            }
+        }
+        
+        return true;
     }
 

trunk/lib/Version.inc.php

@@ -93 +93 @@
             }
             $db->query("CREATE TABLE IF NOT EXISTS " . $db->escapeString($this->getParam('db_table')) . " (
-                version_id int NOT NULL auto_increment,
-                record_table varchar(255) NOT NULL default '',
-                record_key varchar(255) NOT NULL default '',
-                record_val varchar(255) NOT NULL default '',
-                version_data mediumblob NOT NULL,
-                version_title varchar(255) NOT NULL default '',
-                version_notes varchar(255) NOT NULL default '',
-                saved_by_user_id smallint(11) NOT NULL default '0',
-                version_datetime datetime NOT NULL default '0000-00-00 00:00:00',
+                version_id INT NOT NULL AUTO_INCREMENT,
+                record_table VARCHAR(255) NOT NULL DEFAULT '',
+                record_key VARCHAR(255) NOT NULL DEFAULT '',
+                record_val VARCHAR(255) NOT NULL DEFAULT '',
+                version_data MEDIUMBLOB NOT NULL,
+                version_title VARCHAR(255) NOT NULL DEFAULT '',
+                version_number SMALLINT(11) UNSIGNED NOT NULL DEFAULT '0',
+                version_notes VARCHAR(255) NOT NULL DEFAULT '',
+                saved_by_user_id SMALLINT(11) NOT NULL DEFAULT '0',
+                version_datetime DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
                 PRIMARY KEY (version_id),
                 KEY record_table (record_table),
@@ -115 +116 @@
                 'version_data',
                 'version_title',
+                'version_number',
                 'version_notes',
                 'saved_by_user_id',
@@ -180 +182 @@
             return false;
         }
+        
+        // Get previous version_number.
+        $qid = $db->query("
+            SELECT MAX(version_number) FROM " . $db->escapeString($this->getParam('db_table')) . "
+            WHERE record_table = '" . $db->escapeString($record_table) . "'
+            AND record_key = '" . $db->escapeString($record_key) . "'
+            AND record_val = '" . $db->escapeString($record_val) . "'
+        ");
+        list($last_version_number) = mysql_fetch_row($qid);
 
         // Clean-up old versions.
@@ -193 +204 @@
                 version_data,
                 version_title,
+                version_number,
                 version_notes,
                 saved_by_user_id,
@@ -202 +214 @@
                 '" . $db->escapeString(gzcompress(serialize($record), 9)) . "',
                 '" . $db->escapeString($title) . "',
+                '" . $db->escapeString($last_version_number + 1) . "',
                 '" . $db->escapeString($notes) . "',
                 '" . $db->escapeString($this->_auth->get('user_id')) . "',
@@ -354 +367 @@
         // Get versions of this record.
         $qid = $db->query("
-            SELECT version_id, saved_by_user_id, version_datetime, version_title, version_notes
+            SELECT 
+                version_id,
+                saved_by_user_id,
+                version_datetime,
+                version_title,
+                version_number,
+                version_notes
             FROM " . $db->escapeString($this->getParam('db_table')) . "
             WHERE record_table = '" . $db->escapeString($record_table) . "'

trunk/tests/FormValidatorTest.php

@@ -268 +268 @@
     {
         // This one is an error!
-        $this->FormValidator->fileUploaded('some_field', _("Error message"));
+        $this->FormValidator->fileUploaded('this-file-does-not-exist', _("Error message"));
         $this->assertTrue($this->FormValidator->anyerrors());
     }