Fix logic that determines if a URL is relative or absolute in script() and cssLink()

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

diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 095f4d478673e306bb1664ec381de3c0311fa7d1..6045971161d5e933437d5c1be6d02e61e870f802 100644 (file)
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -101,27 +101,54 @@ class HTMLOutputter extends XMLOutputter
             $type = common_negotiate_type($cp, $sp);
 
             if (!$type) {
-                common_user_error(_('This page is not available in a '.
-                                    'media type you accept'), 406);
-                exit(0);
+                throw new ClientException(_('This page is not available in a '.
+                                            'media type you accept'), 406);
             }
         }
 
         header('Content-Type: '.$type);
 
-        $this->startXML('html',
-                        '-//W3C//DTD XHTML 1.0 Strict//EN',
-                        'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd');
-
-        // FIXME: correct language for interface
+        $this->extraHeaders();
+        if( ! substr($type,0,strlen('text/html'))=='text/html' ){
+            // Browsers don't like it when <?xml it output for non-xhtml documents
+            $this->xw->startDocument('1.0', 'UTF-8');
+        }
+        $this->xw->writeDTD('html', $public, $system);
 
-        $language = common_language();
+        $language = $this->getLanguage();
 
         $this->elementStart('html', array('xmlns' => 'http://www.w3.org/1999/xhtml',
                                           'xml:lang' => $language,
                                           'lang' => $language));
     }
 
+    function getLanguage()
+    {
+        // FIXME: correct language for interface
+        return common_language();
+    }
+
+    /**
+    *  Ends an HTML document
+    *
+    *  @return void
+    */
+    function endHTML()
+    {
+        $this->elementEnd('html');
+        $this->endXML();
+    }
+
+    /**
+    *  To specify additional HTTP headers for the action
+    *
+    *  @return void
+    */
+    function extraHeaders()
+    {
+        // Needs to be overloaded
+    }
+
     /**
      * Output an HTML text input element
      *
@@ -144,20 +171,17 @@ class HTMLOutputter extends XMLOutputter
 
     function input($id, $label, $value=null, $instructions=null)
     {
-        $this->elementStart('p');
         $this->element('label', array('for' => $id), $label);
         $attrs = array('name' => $id,
                        'type' => 'text',
-                       'class' => 'input_text',
                        'id' => $id);
         if ($value) {
-            $attrs['value'] = htmlspecialchars($value);
+            $attrs['value'] = $value;
         }
         $this->element('input', $attrs);
         if ($instructions) {
-            $this->element('span', 'input_instructions', $instructions);
+            $this->element('p', 'form_guide', $instructions);
         }
-        $this->elementEnd('p');
     }
 
     /**
@@ -181,13 +205,12 @@ class HTMLOutputter extends XMLOutputter
     function checkbox($id, $label, $checked=false, $instructions=null,
                       $value='true', $disabled=false)
     {
-        $this->elementStart('p');
         $attrs = array('name' => $id,
                        'type' => 'checkbox',
                        'class' => 'checkbox',
                        'id' => $id);
         if ($value) {
-            $attrs['value'] = htmlspecialchars($value);
+            $attrs['value'] = $value;
         }
         if ($checked) {
             $attrs['checked'] = 'checked';
@@ -197,14 +220,13 @@ class HTMLOutputter extends XMLOutputter
         }
         $this->element('input', $attrs);
         $this->text(' ');
-        $this->element('label', array('class' => 'checkbox_label',
+        $this->element('label', array('class' => 'checkbox',
                                       'for' => $id),
                        $label);
         $this->text(' ');
         if ($instructions) {
-            $this->element('span', 'input_instructions', $instructions);
+            $this->element('p', 'form_guide', $instructions);
         }
-        $this->elementEnd('p');
     }
 
     /**
@@ -229,7 +251,6 @@ class HTMLOutputter extends XMLOutputter
     function dropdown($id, $label, $content, $instructions=null,
                       $blank_select=false, $selected=null)
     {
-        $this->elementStart('p');
         $this->element('label', array('for' => $id), $label);
         $this->elementStart('select', array('id' => $id, 'name' => $id));
         if ($blank_select) {
@@ -238,7 +259,7 @@ class HTMLOutputter extends XMLOutputter
         foreach ($content as $value => $option) {
             if ($value == $selected) {
                 $this->element('option', array('value' => $value,
-                                               'selected' => $value),
+                                               'selected' => 'selected'),
                                $option);
             } else {
                 $this->element('option', array('value' => $value), $option);
@@ -246,9 +267,8 @@ class HTMLOutputter extends XMLOutputter
         }
         $this->elementEnd('select');
         if ($instructions) {
-            $this->element('span', 'input_instructions', $instructions);
+            $this->element('p', 'form_guide', $instructions);
         }
-        $this->elementEnd('p');
     }
 
     /**
@@ -285,7 +305,6 @@ class HTMLOutputter extends XMLOutputter
 
     function password($id, $label, $instructions=null)
     {
-        $this->elementStart('p');
         $this->element('label', array('for' => $id), $label);
         $attrs = array('name' => $id,
                        'type' => 'password',
@@ -293,9 +312,8 @@ class HTMLOutputter extends XMLOutputter
                        'id' => $id);
         $this->element('input', $attrs);
         if ($instructions) {
-            $this->element('span', 'input_instructions', $instructions);
+            $this->element('p', 'form_guide', $instructions);
         }
-        $this->elementEnd('p');
     }
 
     /**
@@ -311,15 +329,60 @@ class HTMLOutputter extends XMLOutputter
      * @todo add a $name parameter
      */
 
-    function submit($id, $label, $cls='submit', $name=null)
+    function submit($id, $label, $cls='submit', $name=null, $title=null)
     {
-        $this->elementStart('p');
         $this->element('input', array('type' => 'submit',
                                       'id' => $id,
                                       'name' => ($name) ? $name : $id,
                                       'class' => $cls,
-                                      'value' => $label));
-        $this->elementEnd('p');
+                                      'value' => $label,
+                                      'title' => $title));
+    }
+
+    /**
+     * output a script (almost always javascript) tag
+     *
+     * @param string $src          relative or absolute script path
+     * @param string $type         'type' attribute value of the tag
+     *
+     * @return void
+     */
+    function script($src, $type='text/javascript')
+    {
+        $url = parse_url($src);
+        if( empty($url->scheme) && empty($url->host) && empty($url->query) && empty($url->fragment))
+        {
+            $src = common_path($src) . '?version=' . LACONICA_VERSION;
+        }
+        $this->element('script', array('type' => $type,
+                                               'src' => $src),
+                               ' ');
+    }
+
+    /**
+     * output a css link
+     *
+     * @param string $src     relative path within the theme directory, or an absolute path
+     * @param string $theme        'theme' that contains the stylesheet
+     * @param string media         'media' attribute of the tag
+     *
+     * @return void
+     */
+    function cssLink($src,$theme=null,$media=null)
+    {
+        $url = parse_url($src);
+        if( empty($url->scheme) && empty($url->host) && empty($url->query) && empty($url->fragment))
+        {
+            if(file_exists(theme_file($src,$theme))){
+               $src = theme_path($src, $theme) . '?version=' . LACONICA_VERSION;
+            }else{
+               $src = common_path($src);
+            }
+        }
+        $this->element('link', array('rel' => 'stylesheet',
+                                'type' => 'text/css',
+                                'href' => $src,
+                                'media' => $media));
     }
 
     /**
@@ -339,7 +402,6 @@ class HTMLOutputter extends XMLOutputter
 
     function textarea($id, $label, $content=null, $instructions=null)
     {
-        $this->elementStart('p');
         $this->element('label', array('for' => $id), $label);
         $this->element('textarea', array('rows' => 3,
                                          'cols' => 40,
@@ -347,8 +409,7 @@ class HTMLOutputter extends XMLOutputter
                                          'id' => $id),
                        ($content) ? $content : '');
         if ($instructions) {
-            $this->element('span', 'input_instructions', $instructions);
+            $this->element('p', 'form_guide', $instructions);
         }
-        $this->elementEnd('p');
     }
 }