srchub Commit Details

Date:

2016-10-08 18:24:37 (8 years 2 months ago)

Author:

Natalie Adams

Branch:

master

Commit:

827c537f612727b35f8bc36c0feefd403a197e61

Parents:

84547905d613b724da8dba198b20b27e5cf56b7c

Message:

Issue 164: External file name prompt required

Changes:

File differences

-146
147 147
148 148
149 
150 
151 
152 
153 
149
150
151
152
153
154
155
154 156
155 157
156 158
+            throw new Pluf_Form_Invalid(__("Must upload a file or specify an external file"));␊
        }␊
␊
        foreach(explode(".", $this->cleaned_data["ext_file_name"]) as $section) {␊
            if (!ctype_alnum(($section))) {␊
                throw new Pluf_Form_Invalid(__("External file name must not contain characters other than a-zA-Z and ."));␊
            }␊
        }␊
␉␉if ($this->cleaned_data["ext_file_name"] != "") {␊
␉␉␉foreach(explode(".", $this->cleaned_data["ext_file_name"]) as $section) {␊
␉␉␉␉if (!ctype_alnum(($section))) {␊
␉␉␉␉␉throw new Pluf_Form_Invalid(__("External file name must not contain characters other than a-zA-Z and ."));␊
␉␉␉␉}␊
␉␉␉}␊
␉␉}␊
        return $this->cleaned_data;␊
    }␊
␊
             throw new Pluf_Form_Invalid(__("Must upload a file or specify an external file"));␊
         }␊
 ␊
-        foreach(explode(".", $this->cleaned_data["ext_file_name"]) as $section) {␊
-            if (!ctype_alnum(($section))) {␊
-                throw new Pluf_Form_Invalid(__("External file name must not contain characters other than a-zA-Z and ."));␊
-            }␊
-        }␊
+␉␉if ($this->cleaned_data["ext_file_name"] != "") {␊
+␉␉␉foreach(explode(".", $this->cleaned_data["ext_file_name"]) as $section) {␊
+␉␉␉␉if (!ctype_alnum(($section))) {␊
+␉␉␉␉␉throw new Pluf_Form_Invalid(__("External file name must not contain characters other than a-zA-Z and ."));␊
+␉␉␉␉}␊
+␉␉␉}␊
+␉␉}␊
         return $this->cleaned_data;␊
     }␊
 ␊

Download the corresponding diff file

srchub

File differences

Branches