Changeset 1507416
- Timestamp:
- 10/03/2016 11:23:39 AM (10 years ago)
- Location:
- wp-platform/trunk
- Files:
-
- 3 edited
-
classes/Filter.php (modified) (1 diff)
-
classes/Form.php (modified) (26 diffs)
-
plugin.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
wp-platform/trunk/classes/Filter.php
r1505732 r1507416 112 112 return $str; 113 113 114 } 115 116 /** 117 * @param mixed $bool 118 * @return string 119 */ 120 public static function yesno($bool) 121 { 122 if ($bool) { 123 return 'Yes'; 124 } else { 125 return 'No'; 126 } 114 127 } 115 128 -
wp-platform/trunk/classes/Form.php
r1505671 r1507416 76 76 'options' => array(), 77 77 'initial' => '', 78 'required' => NULL,78 'required' => null, 79 79 'attrs' => array() 80 80 ); … … 153 153 $initial = $params['initial']; 154 154 $label = $params['label']; 155 $type = $params['type']; 155 156 156 157 if (!$this->submitted()) { … … 162 163 } 163 164 164 if (!$value) {165 $value = ''; //convert all types of false to string166 }167 168 165 $this->addField($name, $params); 169 166 $this->setValue($name, $value); … … 173 170 if ($this->submitted()) { 174 171 175 if ($required && !$value) {172 if ($required && $value == '') { 176 173 $this->error($label.' not provided', $name); 177 174 } … … 239 236 * @return void 240 237 */ 241 public function text($name, $label, $initial='', $required= NULL, $attrs=array())238 public function text($name, $label, $initial='', $required=null, $attrs=array()) 242 239 { 243 240 $params = get_defined_vars(); … … 254 251 * @return void 255 252 */ 256 public function textarea($name, $label, $initial='', $required= NULL, $attrs=array())253 public function textarea($name, $label, $initial='', $required=null, $attrs=array()) 257 254 { 258 255 … … 290 287 * @return void 291 288 */ 292 public function select($name, $label, $options, $initial=false, $required= NULL, $attrs=array())289 public function select($name, $label, $options, $initial=false, $required=null, $attrs=array()) 293 290 { 294 291 $params = get_defined_vars(); … … 393 390 * @return void 394 391 */ 395 public function multiselect($name, $label, $options, $initial=false, $required= NULL, $attrs=array())392 public function multiselect($name, $label, $options, $initial=false, $required=null, $attrs=array()) 396 393 { 397 394 $attrs['is_multi'] = true; … … 408 405 * @return void 409 406 */ 410 public function radiobuttons($name, $label, $options, $initial=false, $required= NULL, $attrs=array())407 public function radiobuttons($name, $label, $options, $initial=false, $required=null, $attrs=array()) 411 408 { 412 409 $params = get_defined_vars(); … … 422 419 foreach ($options as $key => $text) { 423 420 424 if ($key == $value && $value !== false && $value !== '' && $value !== NULL) {421 if ($key == $value && $value !== false && $value !== '' && $value !== null) { 425 422 $checked = ' checked="checked"'; 426 423 } else { … … 454 451 * @return void 455 452 */ 456 public function checkboxes($name, $label, $options, $initial=array(), $required= NULL, $attrs=array())453 public function checkboxes($name, $label, $options, $initial=array(), $required=null, $attrs=array()) 457 454 { 458 455 … … 540 537 * @return void 541 538 */ 542 public function dateSelect($name, $label, $initial=false, $required= NULL, $attrs=array())539 public function dateSelect($name, $label, $initial=false, $required=null, $attrs=array()) 543 540 { 544 541 … … 681 678 * @return void 682 679 */ 683 public function datePicker($name, $label, $initial=false, $required= NULL, $attrs=array())680 public function datePicker($name, $label, $initial=false, $required=null, $attrs=array()) 684 681 { 685 682 … … 823 820 * @return void 824 821 */ 825 public function timeSelect($name, $label, $initial=false, $required= NULL, $attrs=array())822 public function timeSelect($name, $label, $initial=false, $required=null, $attrs=array()) 826 823 { 827 824 … … 962 959 * @return void 963 960 */ 964 public function yesno($name, $label, $initial=false, $required=NULL, $attrs=array()) 965 { 966 $initial = intval($initial); 961 public function yesno($name, $label, $initial=null, $required=null, $attrs=array()) 962 { 963 if ($initial !== null) { 964 $initial = intval($initial); 965 } 966 967 967 $options = array( 968 968 1 => 'Yes', … … 981 981 * @return void 982 982 */ 983 public function dob($name, $label, $initial=false, $required= NULL, $attrs=array())983 public function dob($name, $label, $initial=false, $required=null, $attrs=array()) 984 984 { 985 985 … … 999 999 * @return void 1000 1000 */ 1001 public function dobPicker($name, $label, $initial=false, $required= NULL, $attrs=array())1001 public function dobPicker($name, $label, $initial=false, $required=null, $attrs=array()) 1002 1002 { 1003 1003 $attrs['min'] = mktime(0, 0, 0, 1, 1, 1920); … … 1016 1016 * @return void 1017 1017 */ 1018 public function gender($name, $label, $initial=false, $required= NULL, $attrs=array())1018 public function gender($name, $label, $initial=false, $required=null, $attrs=array()) 1019 1019 { 1020 1020 $options = array( … … 1038 1038 * @return void 1039 1039 */ 1040 public function salutation($name, $label, $initial=false, $required= NULL, $attrs=array())1040 public function salutation($name, $label, $initial=false, $required=null, $attrs=array()) 1041 1041 { 1042 1042 … … 1060 1060 * @return void 1061 1061 */ 1062 public function email($name, $label, $initial=false, $required= NULL, $attrs=array())1062 public function email($name, $label, $initial=false, $required=null, $attrs=array()) 1063 1063 { 1064 1064 … … 1090 1090 * @return void 1091 1091 */ 1092 public function emailConfirm($name, $label, $label_2, $initial=false, $required= NULL, $attrs=array())1092 public function emailConfirm($name, $label, $label_2, $initial=false, $required=null, $attrs=array()) 1093 1093 { 1094 1094 … … 1119 1119 * @return void 1120 1120 */ 1121 public function url($name, $label, $initial=false, $required= NULL, $attrs=array())1121 public function url($name, $label, $initial=false, $required=null, $attrs=array()) 1122 1122 { 1123 1123 … … 1157 1157 * @return void 1158 1158 */ 1159 public function number($name, $label, $initial='', $required= NULL, $attrs=array())1159 public function number($name, $label, $initial='', $required=null, $attrs=array()) 1160 1160 { 1161 1161 … … 1196 1196 * @return void 1197 1197 */ 1198 public function phone($name, $label, $initial='', $required= NULL, $attrs=array())1198 public function phone($name, $label, $initial='', $required=null, $attrs=array()) 1199 1199 { 1200 1200 … … 1225 1225 * @return void 1226 1226 */ 1227 public function settings($group_name, $group_label, $settings, $initial=array(), $required= NULL, $attrs=array())1227 public function settings($group_name, $group_label, $settings, $initial=array(), $required=null, $attrs=array()) 1228 1228 { 1229 1229 … … 1806 1806 if (!$field) { 1807 1807 return; 1808 } elseif ($field['required'] === NULL) {1808 } elseif ($field['required'] === null) { 1809 1809 return $this->require_all; 1810 1810 } else { -
wp-platform/trunk/plugin.php
r1505732 r1507416 2 2 /** 3 3 * Plugin Name: WP-Platform 4 * Version: 1.2. 24 * Version: 1.2.3 5 5 * Description: Provides platform to allow developers to build bespoke functionality in an MVC and OOP fashion 6 6 */
Note: See TracChangeset
for help on using the changeset viewer.