X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=lib%2Futil.php;h=c6cdfbcb949ab0d447802ce55461f9b53cbd5fb3;hb=f5fe013657ced6920e3fe794a2a8d4122a85e377;hp=833695ba87e667c6b5c1179834a7b5b5157c64e5;hpb=1fcdecbd2b527ad63a322ee87fa5f83b508307b9;p=quix0rs-gnu-social.git
diff --git a/lib/util.php b/lib/util.php
index 833695ba87..c6cdfbcb94 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -93,14 +93,22 @@ function common_element_start($tag, $attrs=NULL) {
}
function common_element_end($tag) {
+ static $empty_tag = array('base', 'meta', 'link', 'hr',
+ 'br', 'param', 'img', 'area',
+ 'input', 'col');
global $xw;
- $xw->endElement();
+ # XXX: check namespace
+ if (in_array($tag, $empty_tag)) {
+ $xw->endElement();
+ } else {
+ $xw->fullEndElement();
+ }
}
function common_element($tag, $attrs=NULL, $content=NULL) {
- common_element_start($tag, $attrs);
- if ($content) {
- global $xw;
+ common_element_start($tag, $attrs);
+ global $xw;
+ if (!is_null($content)) {
$xw->text($content);
}
common_element_end($tag);
@@ -123,7 +131,24 @@ function common_end_xml() {
$xw->flush();
}
-define('PAGE_TYPE_PREFS', 'application/xhtml+xml,text/html;q=0.7,application/xml;q=0.3,text/xml;q=0.2');
+function common_init_language() {
+ mb_internal_encoding('UTF-8');
+ $language = common_language();
+ # So we don't have to make people install the gettext locales
+ putenv('LANGUAGE='.$language);
+ putenv('LANG='.$language);
+ $locale_set = setlocale(LC_ALL, $language . ".utf8",
+ $language . ".UTF8",
+ $language . ".utf-8",
+ $language . ".UTF-8",
+ $language);
+ bindtextdomain("laconica", common_config('site','locale_path'));
+ bind_textdomain_codeset("laconica", "UTF-8");
+ textdomain("laconica");
+ setlocale(LC_CTYPE, 'C');
+}
+
+define('PAGE_TYPE_PREFS', 'text/html,application/xhtml+xml,application/xml;q=0.3,text/xml;q=0.2');
function common_show_header($pagetitle, $callable=NULL, $data=NULL, $headercall=NULL) {
global $config, $xw;
@@ -136,7 +161,7 @@ function common_show_header($pagetitle, $callable=NULL, $data=NULL, $headercall=
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(_('This page is not available in a media type you accept'), 406);
exit(0);
}
@@ -148,9 +173,11 @@ function common_show_header($pagetitle, $callable=NULL, $data=NULL, $headercall=
# FIXME: correct language for interface
+ $language = common_language();
+
common_element_start('html', array('xmlns' => 'http://www.w3.org/1999/xhtml',
- 'xml:lang' => 'en',
- 'lang' => 'en'));
+ 'xml:lang' => $language,
+ 'lang' => $language));
common_element_start('head');
common_element('title', NULL,
@@ -163,13 +190,23 @@ 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')),
+ ' ');
+ common_element('link', array('rel' => 'search', 'type' => 'application/opensearchdescription+xml',
+ 'href' => common_local_url('opensearch', array('type' => 'people')),
+ 'title' => common_config('site', 'name').' People Search'));
+
+ common_element('link', array('rel' => 'search', 'type' => 'application/opensearchdescription+xml',
+ 'href' => common_local_url('opensearch', array('type' => 'notice')),
+ 'title' => common_config('site', 'name').' Notice Search'));
if ($callable) {
if ($data) {
@@ -183,11 +220,11 @@ 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 ((is_string($config['site']['logo']) && (strlen($config['site']['logo']) > 0))
+ if ((isset($config['site']['logo']) && 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']) ?
+ common_element('img', array('src' => isset($config['site']['logo']) ?
($config['site']['logo']) : theme_path('logo.png'),
'alt' => $config['site']['name'],
'id' => 'logo'));
@@ -217,26 +254,26 @@ 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 = _('**%%site.name%%** is a microblogging service brought to you by [%%site.broughtby%%](%%site.broughtbyurl%%). ');
+ } else {
+ $instr = _('**%%site.name%%** is a microblogging service. ');
+ }
+ $instr .= sprintf(_('It runs the [Laconica](http://laconi.ca/) microblogging software, version %s, available under the [GNU Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html).'), LACONICA_VERSION);
+ $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']));
common_element_start('p');
- common_text(_t('Unless otherwise specified, contents of this site are copyright by the contributors and available under the '));
+ common_text(_('Unless otherwise specified, contents of this site are copyright by the contributors and available under the '));
common_element('a', array('class' => 'license',
'rel' => 'license',
- href => $config['license']['url']),
+ 'href' => $config['license']['url']),
$config['license']['title']);
- common_text(_t('. Contributors should be attributed by full name or nickname.'));
+ common_text(_('. Contributors should be attributed by full name or nickname.'));
common_element_end('p');
common_element_end('div');
common_element_end('div');
@@ -260,32 +297,39 @@ function common_nav_menu() {
common_element_start('ul', array('id' => 'nav'));
if ($user) {
common_menu_item(common_local_url('all', array('nickname' => $user->nickname)),
- _t('Home'));
+ _('Home'));
}
- common_menu_item(common_local_url('public'), _t('Public'));
- common_menu_item(common_local_url('doc', array('title' => 'help')),
- _t('Help'));
+ common_menu_item(common_local_url('peoplesearch'), _('Search'));
+ common_menu_item(common_local_url('tags'), _('Tags'));
if ($user) {
common_menu_item(common_local_url('profilesettings'),
- _t('Settings'));
+ _('Settings'));
common_menu_item(common_local_url('logout'),
- _t('Logout'));
+ _('Logout'));
} else {
- common_menu_item(common_local_url('login'), _t('Login'));
- common_menu_item(common_local_url('register'), _t('Register'));
- common_menu_item(common_local_url('openidlogin'), _t('OpenID'));
+ common_menu_item(common_local_url('login'), _('Login'));
+ if (!common_config('site', 'closed')) {
+ common_menu_item(common_local_url('register'), _('Register'));
+ }
+ common_menu_item(common_local_url('openidlogin'), _('OpenID'));
}
common_element_end('ul');
}
function common_foot_menu() {
common_element_start('ul', array('id' => 'nav_sub'));
+ common_menu_item(common_local_url('doc', array('title' => 'help')),
+ _('Help'));
common_menu_item(common_local_url('doc', array('title' => 'about')),
- _t('About'));
+ _('About'));
+ common_menu_item(common_local_url('doc', array('title' => 'faq')),
+ _('FAQ'));
common_menu_item(common_local_url('doc', array('title' => 'privacy')),
- _t('Privacy'));
+ _('Privacy'));
common_menu_item(common_local_url('doc', array('title' => 'source')),
- _t('Source'));
+ _('Source'));
+ common_menu_item(common_local_url('doc', array('title' => 'contact')),
+ _('Contact'));
common_element_end('ul');
}
@@ -308,6 +352,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);
@@ -319,6 +364,50 @@ 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