fix problem with uninitialized xw object

[quix0rs-gnu-social.git] / lib / util.php

diff --git a/lib/util.php b/lib/util.php
index 24f0e5dd8b530e2e3d43097b4186f70add97339c..8a05a346f08a5b4269045a810c54c7041c71f91a 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -72,6 +72,7 @@ function common_show_header($pagetitle) {
        
        $xw = new XMLWriter();
        $xw->openURI('php://output');
+       $xw->setIndent(true);
        $xw->startDocument('1.0', 'UTF-8');
        $xw->writeDTD('html', '-//W3C//DTD XHTML 1.0 Strict//EN',
                                  'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd');
@@ -194,6 +195,7 @@ function common_menu_item($url, $text, $title=NULL) {
 }
 
 function common_input($id, $label, $value=NULL) {
+       common_element_start('p');
        common_element('label', array('for' => $id), $label);
        $attrs = array('name' => $id,
                                   'type' => 'text',
@@ -202,14 +204,31 @@ function common_input($id, $label, $value=NULL) {
                $attrs['value'] = htmlspecialchars($value);
        }
        common_element('input', $attrs);
+       common_element_end('p');
 }
 
 function common_password($id, $label) {
+       common_element_start('p');
        common_element('label', array('for' => $id), $label);
        $attrs = array('name' => $id,
                                   'type' => 'password',
                                   'id' => $id);
        common_element('input', $attrs);
+       common_element_end('p');
+}
+
+function common_submit($id, $label) {
+       global $xw;
+       common_element_start('p');
+       common_element_start('label', array('for' => $id));
+       $xw->writeRaw(' ');
+       common_element_end('label');
+       common_element('input', array('type' => 'submit',
+                                                                 'id' => $id,
+                                                                 'name' => $id,
+                                                                 'value' => $label,
+                                                                 'class' => 'button'));
+       common_element_end('p');
 }
 
 # salted, hashed passwords are stored in the DB