X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Futil.php;h=1a0dd07d2628552ab6c2551f33ce95dac3c5342a;hb=3f1f1427d9d65215af7546de2ad5c16120f44857;hp=18ac303d5831ae1ab476873d06f24a57d18bc2aa;hpb=fddcfd75c53b8e08be5b71ca24c31b6982fea7ad;p=quix0rs-gnu-social.git diff --git a/lib/util.php b/lib/util.php index 18ac303d58..1a0dd07d26 100644 --- 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) { @@ -124,22 +123,22 @@ function common_end_xml() { } define('PAGE_TYPE_PREFS', 'application/xhtml+xml,text/html;q=0.7,application/xml;q=0.3,text/xml;q=0.2'); - + function common_show_header($pagetitle, $callable=NULL, $data=NULL, $headercall=NULL) { global $config, $xw; $httpaccept = isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : NULL; # XXX: allow content negotiation for RDF, RSS, or XRDS - + $type = common_negotiate_type(common_accept_to_prefs($httpaccept), common_accept_to_prefs(PAGE_TYPE_PREFS)); if (!$type) { - common_client_error(_t('This page is not available in a media type you accept'), 406); + common_user_error(_t('This page is not available in a media type you accept'), 406); exit(0); } - + header('Content-Type: '.$type); common_start_xml('html', @@ -163,14 +162,17 @@ function common_show_header($pagetitle, $callable=NULL, $data=NULL, $headercall= if (file_exists(theme_file('ie'.$ver.'.css'))) { # Yes, IE people should be put in jail. $xw->writeComment('[if lte IE '.$ver.']> '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) { call_user_func($callable, $data); @@ -183,17 +185,24 @@ function common_show_header($pagetitle, $callable=NULL, $data=NULL, $headercall= common_element_start('div', array('id' => 'wrap')); common_element_start('div', array('id' => 'header')); common_nav_menu(); - if ($config['site']['logo'] || file_exists(theme_file('logo.png'))) { + if ((is_string($config['site']['logo']) && (strlen($config['site']['logo']) > 0)) + || file_exists(theme_file('logo.png'))) + { common_element_start('a', array('href' => common_local_url('public'))); common_element('img', array('src' => ($config['site']['logo']) ? ($config['site']['logo']) : theme_path('logo.png'), 'alt' => $config['site']['name'], 'id' => 'logo')); common_element_end('a'); + } else { + common_element_start('p', array('id' => 'branding')); + common_element('a', array('href' => common_local_url('public')), + $config['site']['name']); + common_element_end('p'); } + common_element('h1', 'pagetitle', $pagetitle); - common_element('h2', 'sitename', $config['site']['name']); - + if ($headercall) { if ($data) { call_user_func($headercall, $data); @@ -210,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'])); @@ -275,10 +288,14 @@ function common_foot_menu() { common_element_start('ul', array('id' => 'nav_sub')); common_menu_item(common_local_url('doc', array('title' => 'about')), _t('About')); + common_menu_item(common_local_url('doc', array('title' => 'faq')), + _t('FAQ')); common_menu_item(common_local_url('doc', array('title' => 'privacy')), _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'); } @@ -301,6 +318,7 @@ function common_input($id, $label, $value=NULL,$instructions=NULL) { common_element('label', array('for' => $id), $label); $attrs = array('name' => $id, 'type' => 'text', + 'class' => 'input_text', 'id' => $id); if ($value) { $attrs['value'] = htmlspecialchars($value); @@ -312,6 +330,30 @@ function common_input($id, $label, $value=NULL,$instructions=NULL) { common_element_end('p'); } +function common_checkbox($id, $label, $checked=false, $instructions=NULL, $value='true') +{ + common_element_start('p'); + $attrs = array('name' => $id, + 'type' => 'checkbox', + 'class' => 'checkbox', + 'id' => $id); + if ($value) { + $attrs['value'] = htmlspecialchars($value); + } + if ($checked) { + $attrs['checked'] = 'checked'; + } + common_element('input', $attrs); + # XXX: use a