| Index: trunk/extensions/PageSchemas/PageSchemas.classes.php |
| — | — | @@ -196,7 +196,7 @@ |
| 197 | 197 | public $pageId=0; |
| 198 | 198 | public $pageXml=null; |
| 199 | 199 | public $pageXmlstr= ""; |
| 200 | | - public $pageName=""; |
| | 200 | + //public $pageName=""; |
| 201 | 201 | public $formName=""; |
| 202 | 202 | public $formArray = array(); |
| 203 | 203 | /* Stores the templte objects */ |
| — | — | @@ -228,7 +228,7 @@ |
| 229 | 229 | //retrievimg the third attribute which is pp_value |
| 230 | 230 | $pageXmlstr = $row[2]; |
| 231 | 231 | $this->pageXml = simplexml_load_string ( $pageXmlstr ); |
| 232 | | - $this->pageName = (string)$this->pageXml->attributes()->name; |
| | 232 | + //$this->pageName = (string)$this->pageXml->attributes()->name; |
| 233 | 233 | /* index for template objects */ |
| 234 | 234 | $i = 0; |
| 235 | 235 | $inherited_templates = null ; |
| — | — | @@ -274,11 +274,7 @@ |
| 275 | 275 | /*return an array of PSTemplate Objects */ |
| 276 | 276 | function getTemplates () { |
| 277 | 277 | return $this->PSTemplates; |
| 278 | | - } |
| 279 | | - /*returns the name of the PageSchema object */ |
| 280 | | - function getName(){ |
| 281 | | - return $this->pageName; |
| 282 | | - } |
| | 278 | + } |
| 283 | 279 | function getFormName(){ |
| 284 | 280 | $form_array = $this->getFormArray(); |
| 285 | 281 | return $form_array['name']; |
| Index: trunk/extensions/PageSchemas/specials/PS_EditSchema.php |
| — | — | @@ -97,7 +97,7 @@ |
| 98 | 98 | wfRunHooks( 'getHtmlTextForFieldInputs', array( &$js_extensions, &$text_extensions )); |
| 99 | 99 | $text = ""; |
| 100 | 100 | $text .= ' <form id="createPageSchemaForm" action="" method="post">' . "\n"; |
| 101 | | - $text .= '<p>'.$schema_name_label.' <input type="text" name="s_name"/> </p> '; |
| | 101 | + //$text .= '<p>'.$schema_name_label.' <input type="text" name="s_name"/> </p> '; |
| 102 | 102 | $text .= '<p>'.$add_xml_label.' |
| 103 | 103 | <textarea rows=4 style="width: 100%" name="ps_add_xml"></textarea> |
| 104 | 104 | </p> '; |
| — | — | @@ -218,8 +218,8 @@ |
| 219 | 219 | if ($save_page) { |
| 220 | 220 | //Generate the Xml from the Form elements |
| 221 | 221 | $Xmltext = ""; |
| 222 | | - $s_name = $wgRequest->getText('s_name'); |
| 223 | | - $Xmltext .= '<PageSchema name="'.$s_name.'">'; |
| | 222 | + //$s_name = $wgRequest->getText('s_name'); |
| | 223 | + $Xmltext .= '<PageSchema>'; |
| 224 | 224 | $ps_add_xml = $wgRequest->getText('ps_add_xml'); |
| 225 | 225 | $Xmltext .= $ps_add_xml; |
| 226 | 226 | $fieldName = ""; |
| — | — | @@ -335,10 +335,10 @@ |
| 336 | 336 | $pageXmlstr = $row[2]; |
| 337 | 337 | $pageXml = simplexml_load_string ( $pageXmlstr ); |
| 338 | 338 | $ps_add_xml = ""; |
| 339 | | - $pageName = (string)$pageXml->attributes()->name; |
| | 339 | + //$pageName = (string)$pageXml->attributes()->name; |
| 340 | 340 | $text_4 .= ''; |
| 341 | 341 | $text_4 .= '<form id="editPageSchemaForm" action="" method="post">' . "\n"; |
| 342 | | - $text_4 .= '<p>'.$schema_name_label.' <input type="text" name="s_name" value="'.$pageName.'" /> </p> '; |
| | 342 | + //$text_4 .= '<p>'.$schema_name_label.' <input type="text" name="s_name" value="'.$pageName.'" /> </p> '; |
| 343 | 343 | foreach ( $pageXml->children() as $template_xml ) { |
| 344 | 344 | if ( ($template_xml->getName() != 'Template') && ($template_xml->getName() != 'semanticforms_Form') ){ |
| 345 | 345 | $ps_add_xml .= (string)$template_xml->asXML(); |