method

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

diff --git a/lib/util.php b/lib/util.php
index f3ab42ea95eca6746313eff2dc051e8a5c536358..bbaed32da5e5a66e6abecb9303d099d502c71a91 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -94,16 +94,15 @@ function common_element_start($tag, $attrs=NULL) {
 
 function common_element_end($tag) {
        global $xw;
-       $xw->endElement();
+       # TODO: switch based on $tag
+       $xw->fullEndElement();
 }
 
 function common_element($tag, $attrs=NULL, $content=NULL) {
     common_element_start($tag, $attrs);
-       if ($content) {
-               global $xw;
-               $xw->text($content);
-       }
-       common_element_end($tag);
+    global $xw;
+    $xw->text($content);
+    common_element_end($tag);
 }
 
 function common_start_xml($doc=NULL, $public=NULL, $system=NULL) {
@@ -170,6 +169,9 @@ function common_show_header($pagetitle, $callable=NULL, $data=NULL, $headercall=
        common_element('script', array('type' => 'text/javascript',
                                                                   'src' => common_path('js/jquery.min.js')),
                                   ' ');
+       common_element('script', array('type' => 'text/javascript',
+                                                                  'src' => common_path('js/util.js')),
+                                  ' ');
 
        if ($callable) {
                if ($data) {
@@ -217,16 +219,20 @@ function common_show_footer() {
        common_element_end('div'); # content div
        common_foot_menu();
        common_element_start('div', array('id' => 'footer'));
-       common_element_start('p', 'laconica');
-       common_text(_t('This site is running the '));
-       common_element('a', array('class' => 'software',
-                                                         href => 'http://laconi.ca/'),
-                                  'Laconica');
-       common_text(_t('microblogging tool, version ' . LACONICA_VERSION . ', available under the '));
-       common_element('a', array(href => 'http://www.fsf.org/licensing/licenses/agpl-3.0.html'),
-                                  'GNU Affero General Public License');
-       common_text(_t('.'));
-       common_element_end('p');
+       common_element_start('div', 'laconica');
+       if (common_config('site', 'broughtby')) {
+               $instr = _t('**%%site.name%%** is a microblogging service brought to you by [%%site.broughtby%%](%%site.broughtbyurl%%). ');
+       } else {
+               $instr = _t('**%%site.name%%** is a microblogging service. ');
+       }
+       $instr .= _t('It runs the [Laconica](http://laconi.ca/) ' .
+                        'microblogging software, version ' . LACONICA_VERSION . ', ' .
+                        'available under the ' .
+                        '[GNU Affero General Public License]' .
+                        '(http://www.fsf.org/licensing/licenses/agpl-3.0.html).');
+    $output = common_markup_to_html($instr);
+    common_raw($output);
+       common_element_end('div');
        common_element('img', array('id' => 'cc',
                                                                'src' => $config['license']['image'],
                                                                'alt' => $config['license']['title']));
@@ -288,6 +294,8 @@ function common_foot_menu() {
                                         _t('Privacy'));
        common_menu_item(common_local_url('doc', array('title' => 'source')),
                                         _t('Source'));
+       common_menu_item(common_local_url('doc', array('title' => 'contact')),
+                                        _t('Contact'));
        common_element_end('ul');
 }
 
@@ -385,7 +393,7 @@ function common_textarea($id, $label, $content=NULL, $instructions=NULL) {
                                                                         'cols' => 40,
                                                                         'name' => $id,
                                                                         'id' => $id),
-                                  ($content) ? $content : ' ');
+                                  ($content) ? $content : '');
        if ($instructions) {
                common_element('span', 'input_instructions', $instructions);
        }
@@ -656,6 +664,12 @@ function common_fancy_url($action, $args=NULL) {
         case 'subscribe':
         case 'unsubscribe':
                return common_path('main/'.$action);
+        case 'remotesubscribe':
+               if ($args && $args['nickname']) {
+                       return common_path('main/remote?nickname=' . $args['nickname']);
+               } else {
+                       return common_path('main/remote');
+               }
         case 'openidlogin':
                return common_path('main/openid');
         case 'avatar':
@@ -816,15 +830,18 @@ function common_notice_form($action=NULL, $content=NULL) {
        $user = common_current_user();
        assert(!is_null($user));
        common_element_start('form', array('id' => 'status_form',
-                                                                          'method' => 'POST',
+                                                                          'method' => 'post',
                                                                           'action' => common_local_url('newnotice')));
        common_element_start('p');
-       common_element('label', array('for' => 'status_update',
+       common_element('label', array('for' => 'status_textarea',
                                                                  'id' => 'status_label'),
                                   _t('What\'s up, ').$user->nickname.'?');
+        common_element('span', array('id' => 'counter', 'class' => 'counter'), '140');
        common_element('textarea', array('id' => 'status_textarea',
+                                                                        'cols' => 60,
+                                                                        'rows' => 3,
                                                                         'name' => 'status_textarea'),
-                                  ($content) ? $content : ' ');
+                                  ($content) ? $content : '');
        if ($action) {
                common_hidden('returnto', $action);
        }
@@ -1106,3 +1123,12 @@ function common_confirmation_code($bits) {
        }
        return $code;
 }
+
+# convert markup to HTML
+
+function common_markup_to_html($c) {
+       $c = preg_replace('/%%action.(\w+)%%/e', "common_local_url('\\1')", $c);
+       $c = preg_replace('/%%doc.(\w+)%%/e', "common_local_url('doc', array('title'=>'\\1'))", $c);
+       $c = preg_replace('/%%(\w+).(\w+)%%/e', 'common_config(\'\\1\', \'\\2\')', $c);
+       return Markdown($c);
+}