| Index: trunk/extensions/SemanticForms/specials/SF_CreateForm.php |
| — | — | @@ -180,7 +180,7 @@ |
| 181 | 181 | $input_type = $wgRequest->getVal( "input_type_" . $old_i . "_" . $j ); |
| 182 | 182 | if ( $input_type == 'hidden' ) { |
| 183 | 183 | $field->template_field->setInputType( $input_type ); |
| 184 | | - $field->is_hidden = true; |
| | 184 | + $field->setIsHidden( true ); |
| 185 | 185 | } elseif ( substr( $input_type, 0, 1 ) == '.' ) { |
| 186 | 186 | // It's the default input type - |
| 187 | 187 | // don't do anything. |
| Index: trunk/extensions/SemanticForms/includes/SF_FormPrinter.php |
| — | — | @@ -1446,16 +1446,16 @@ |
| 1447 | 1447 | // (type is SFTemplateField, instead of SFFormField) |
| 1448 | 1448 | $template_field = $form_field->getTemplateField(); |
| 1449 | 1449 | |
| 1450 | | - if ( $form_field->is_hidden ) { |
| | 1450 | + if ( $form_field->isHidden() ) { |
| 1451 | 1451 | $text = SFFormUtils::hiddenFieldHTML( $form_field->input_name, $cur_value ); |
| 1452 | 1452 | } elseif ( $form_field->getInputType() != '' && |
| 1453 | 1453 | array_key_exists( $form_field->getInputType(), $this->mInputTypeHooks ) && |
| 1454 | 1454 | $this->mInputTypeHooks[$form_field->getInputType()] != null ) { |
| 1455 | 1455 | $funcArgs = array(); |
| 1456 | 1456 | $funcArgs[] = $cur_value; |
| 1457 | | - $funcArgs[] = $form_field->input_name; |
| 1458 | | - $funcArgs[] = $form_field->is_mandatory; |
| 1459 | | - $funcArgs[] = $form_field->is_disabled; |
| | 1457 | + $funcArgs[] = $form_field->getInputName(); |
| | 1458 | + $funcArgs[] = $form_field->isMandatory(); |
| | 1459 | + $funcArgs[] = $form_field->isDisabled(); |
| 1460 | 1460 | // last argument to function should be a hash, merging the default |
| 1461 | 1461 | // values for this input type with all other properties set in |
| 1462 | 1462 | // the form definition, plus some semantic-related arguments |
| — | — | @@ -1465,15 +1465,15 @@ |
| 1466 | 1466 | $text = call_user_func_array( $hook_values[0], $funcArgs ); |
| 1467 | 1467 | } else { // input type not defined in form |
| 1468 | 1468 | $property_type = $template_field->getPropertyType(); |
| 1469 | | - $is_list = ( $form_field->is_list || $template_field->getIsList() ); |
| | 1469 | + $is_list = ( $form_field->isList() || $template_field->isList() ); |
| 1470 | 1470 | if ( $property_type != '' && |
| 1471 | 1471 | array_key_exists( $property_type, $this->mSemanticTypeHooks ) && |
| 1472 | 1472 | isset( $this->mSemanticTypeHooks[$property_type][$is_list] ) ) { |
| 1473 | 1473 | $funcArgs = array(); |
| 1474 | 1474 | $funcArgs[] = $cur_value; |
| 1475 | | - $funcArgs[] = $form_field->input_name; |
| 1476 | | - $funcArgs[] = $form_field->is_mandatory; |
| 1477 | | - $funcArgs[] = $form_field->is_disabled; |
| | 1475 | + $funcArgs[] = $form_field->getInputName(); |
| | 1476 | + $funcArgs[] = $form_field->isMandatory(); |
| | 1477 | + $funcArgs[] = $form_field->isDisabled(); |
| 1478 | 1478 | $hook_values = $this->mSemanticTypeHooks[$property_type][$is_list]; |
| 1479 | 1479 | $other_args = $form_field->getArgumentsForInputCall( $hook_values[1] ); |
| 1480 | 1480 | $funcArgs[] = $other_args; |
| — | — | @@ -1481,12 +1481,12 @@ |
| 1482 | 1482 | } else { // anything else |
| 1483 | 1483 | $other_args = $form_field->getArgumentsForInputCall(); |
| 1484 | 1484 | // special call to ensure that a list input is the right default size |
| 1485 | | - if ( $form_field->is_list ) { |
| | 1485 | + if ( $form_field->isList() ) { |
| 1486 | 1486 | if ( ! array_key_exists( 'size', $other_args ) ) { |
| 1487 | 1487 | $other_args['size'] = 100; |
| 1488 | 1488 | } |
| 1489 | 1489 | } |
| 1490 | | - $text = SFTextInput::getHTML( $cur_value, $form_field->input_name, $form_field->is_mandatory, $form_field->is_disabled, $other_args ); |
| | 1490 | + $text = SFTextInput::getHTML( $cur_value, $form_field->getInputName(), $form_field->isMandatory(), $form_field->isDisabled(), $other_args ); |
| 1491 | 1491 | } |
| 1492 | 1492 | } |
| 1493 | 1493 | return $text; |
| Index: trunk/extensions/SemanticForms/includes/SF_Utils.php |
| — | — | @@ -237,7 +237,7 @@ |
| 238 | 238 | $form->setPageNameFormula( $form_array['PageNameFormula'] ); |
| 239 | 239 | $form->setCreateTitle( $form_array['CreateTite'] ); |
| 240 | 240 | $form->setEditTitle( $form_array['EditTitle'] ); |
| 241 | | - $title = Title::makeTitleSafe( SF_NS_FORM, $form->mFormName ); |
| | 241 | + $title = Title::makeTitleSafe( SF_NS_FORM, $form->getFormName() ); |
| 242 | 242 | $key_title = PageSchemas::titleString( $title ); |
| 243 | 243 | if( in_array($key_title, $toGenPageList )){ |
| 244 | 244 | $full_text = $form->createMarkup(); |