| Index: trunk/extensions/SemanticForms/includes/SF_Utils.php |
| — | — | @@ -157,7 +157,7 @@ |
| 158 | 158 | public static function createPageSchemasObject( $objectName, $xmlForField, &$object ) { |
| 159 | 159 | $sfarray = array(); |
| 160 | 160 | $formName=""; |
| 161 | | - if ( $objectName == "Form" ) { |
| | 161 | + if ( $objectName == "semanticforms_Form" ) { |
| 162 | 162 | foreach ( $xmlForField->children() as $tag => $child ) { |
| 163 | 163 | if ( $tag == $objectName ) { |
| 164 | 164 | $formName = (string) $child->attributes()->name; |
| — | — | @@ -170,7 +170,7 @@ |
| 171 | 171 | $object['sf'] = $sfarray; |
| 172 | 172 | return true; |
| 173 | 173 | } |
| 174 | | - if ( $objectName == "FormInput" ) { |
| | 174 | + if ( $objectName == "semanticforms_FormInput" ) { |
| 175 | 175 | foreach ( $xmlForField->children() as $tag => $child ) { |
| 176 | 176 | if ( $tag == $objectName ) { |
| 177 | 177 | foreach ( $child->children() as $prop ) { |
| — | — | @@ -196,10 +196,10 @@ |
| 197 | 197 | $xml_text_array = array(); |
| 198 | 198 | foreach ( $wgRequest->getValues() as $var => $val ) { |
| 199 | 199 | if(substr($var,0,13) == 'sf_form_name_'){ |
| 200 | | - $form_xml_text .= '<semanticforms:Form name="'.$val.'" >'; |
| | 200 | + $form_xml_text .= '<semanticforms_Form name="'.$val.'" >'; |
| 201 | 201 | }else if(substr($var,0,14) == 'sf_input_type_'){ |
| 202 | 202 | $templateNum = substr($var,14,1); |
| 203 | | - $Xmltext .= '<semanticforms:FormInput>'; |
| | 203 | + $Xmltext .= '<semanticforms_FormInput>'; |
| 204 | 204 | $Xmltext .= '<InputType>'.$val.'</InputType>'; |
| 205 | 205 | }else if(substr($var,0,21) == 'sf_page_name_formula_'){ |
| 206 | 206 | $form_xml_text .= '<PageNameFormula>'.$val.'</PageNameFormula>'; |
| — | — | @@ -207,7 +207,7 @@ |
| 208 | 208 | $form_xml_text .= '<CreateTite>'.$val.'</CreateTite>'; |
| 209 | 209 | }else if(substr($var,0,14) == 'sf_edit_title_'){ |
| 210 | 210 | $form_xml_text .= '<EditTitle>'.$val.'</EditTitle>'; |
| 211 | | - $form_xml_text .= '</semanticforms:Form>'; |
| | 211 | + $form_xml_text .= '</semanticforms_Form>'; |
| 212 | 212 | }else if(substr($var,0,14) == 'sf_key_values_'){ |
| 213 | 213 | if ( $val != '' ) { |
| 214 | 214 | // replace the comma substitution character that has no chance of |
| — | — | @@ -227,7 +227,7 @@ |
| 228 | 228 | $Xmltext .= '<Parameter name="'.$param_value[0].'"/>'; |
| 229 | 229 | } |
| 230 | 230 | } |
| 231 | | - $Xmltext .= '</semanticforms:FormInput>'; |
| | 231 | + $Xmltext .= '</semanticforms_FormInput>'; |
| 232 | 232 | $xml_text_array[] = $Xmltext; |
| 233 | 233 | $Xmltext = ''; |
| 234 | 234 | } |
| — | — | @@ -252,7 +252,8 @@ |
| 253 | 253 | $template_all = $pageSchemaObj->getTemplates(); |
| 254 | 254 | $html_text_array = array(); |
| 255 | 255 | $form_html_text = ""; |
| 256 | | - $obj = $pageSchemaObj->getObject('Form'); |
| | 256 | + $obj = $pageSchemaObj->getObject('semanticforms_Form'); |
| | 257 | + |
| 257 | 258 | $form_array = $obj['sf']; |
| 258 | 259 | |
| 259 | 260 | $form_html_text .= '<fieldset style="background: #CF9;"><legend>Form</legend> |
| — | — | @@ -267,7 +268,7 @@ |
| 268 | 269 | |
| 269 | 270 | foreach( $field_all as $field ) { //for each Field, retrieve smw properties and fill $prop_name , $prop_type |
| 270 | 271 | $field_count++; |
| 271 | | - $sf_array = $field->getObject('FormInput');//this returns an array with property values filled |
| | 272 | + $sf_array = $field->getObject('semanticforms_FormInput');//this returns an array with property values filled |
| 272 | 273 | $form_input_array = $sf_array['sf']; |
| 273 | 274 | $html_text = '<fieldset style="background: #CF9;"><legend>Form input</legend> |
| 274 | 275 | <p> Input type: <input size="15" name="sf_input_type_starter" value='.$form_input_array['InputType'].'></p> |
| — | — | @@ -343,9 +344,9 @@ |
| 344 | 345 | $template_fields = array(); |
| 345 | 346 | foreach( $field_all as $fieldObj ) { //for each Field, retrieve smw properties and fill $prop_name , $prop_type |
| 346 | 347 | $field_count++; |
| 347 | | - $sf_array = $fieldObj->getObject('FormInput');//this returns an array with property values filled |
| | 348 | + $sf_array = $fieldObj->getObject('semanticforms_FormInput');//this returns an array with property values filled |
| 348 | 349 | $form_input_array = $sf_array['sf']; |
| 349 | | - $smw_array = $fieldObj->getObject('Property'); //this returns an array with property values filled |
| | 350 | + $smw_array = $fieldObj->getObject('semanticmediawiki_Property'); //this returns an array with property values filled |
| 350 | 351 | $prop_array = $smw_array['smw']; |
| 351 | 352 | $field_t = SFTemplateField::create( $fieldObj->getName(), $fieldObj->getLabel(), $prop_array['name'], $fieldObj->isList() ,$fieldObj->getDelimiter()); |
| 352 | 353 | $template_fields[] = $field_t; |
| — | — | @@ -391,7 +392,7 @@ |
| 392 | 393 | public static function parseFieldElements( $field_xml, &$text_object ) { |
| 393 | 394 | |
| 394 | 395 | foreach ( $field_xml->children() as $tag => $child ) { |
| 395 | | - if ( $tag == "FormInput" ) { |
| | 396 | + if ( $tag == "semanticforms_FormInput" ) { |
| 396 | 397 | $text = ""; |
| 397 | 398 | $text = PageSchemas::tableMessageRowHTML( "paramAttr", "SemanticForms", (string)$tag ); |
| 398 | 399 | foreach ( $child->children() as $prop ) { |