X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Futil.php;h=4fef45ec147e6b60dde3e1a373d727a4bdeba3c1;hb=816fe407fa2e781e92ce053ef7ba36e858e95656;hp=8a05a346f08a5b4269045a810c54c7041c71f91a;hpb=070eacb2e79f6d7bd7c1d4251aa49d53d0ce469f;p=quix0rs-gnu-social.git diff --git a/lib/util.php b/lib/util.php index 8a05a346f0..4fef45ec14 100644 --- a/lib/util.php +++ b/lib/util.php @@ -1,18 +1,18 @@ . */ @@ -69,7 +69,7 @@ function common_show_header($pagetitle) { global $config, $xw; header('Content-Type: application/xhtml+xml'); - + $xw = new XMLWriter(); $xw->openURI('php://output'); $xw->setIndent(true); @@ -78,13 +78,13 @@ function common_show_header($pagetitle) { 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'); # FIXME: correct language for interface - + common_element_start('html', array('xmlns' => 'http://www.w3.org/1999/xhtml', 'xml:lang' => 'en', 'lang' => 'en')); - + common_element_start('head'); - common_element('title', NULL, + common_element('title', NULL, $pagetitle . " - " . $config['site']['name']); common_element('link', array('rel' => 'stylesheet', 'type' => 'text/css', @@ -102,7 +102,7 @@ function common_show_header($pagetitle) { common_element_start('body'); common_element_start('div', array('id' => 'wrapper')); common_element_start('div', array('id' => 'content')); - common_element_start('div', array('id' => 'header')); + common_element_start('div', array('id' => 'header')); common_element('h1', 'title', $pagetitle); common_element('h2', 'subtitle', $config['site']['name']); common_element_end('div'); @@ -155,7 +155,7 @@ function common_head_menu() { common_menu_item(common_local_url('doc', array('title' => 'help')), _t('Help')); if ($user) { - common_menu_item(common_local_url('all', array('nickname' => + common_menu_item(common_local_url('all', array('nickname' => $user->nickname)), _t('Home')); common_menu_item(common_local_url('showstream', array('nickname' => @@ -175,13 +175,14 @@ function common_head_menu() { } function common_foot_menu() { - common_element_start('ul', 'footmenu'); + common_element_start('ul', 'footmenu menuish'); common_menu_item(common_local_url('doc', array('title' => 'about')), _t('About')); common_menu_item(common_local_url('doc', array('title' => 'help')), _t('Help')); common_menu_item(common_local_url('doc', array('title' => 'privacy')), _t('Privacy')); + common_element_end('ul'); } function common_menu_item($url, $text, $title=NULL) { @@ -243,7 +244,7 @@ function common_check_user($nickname, $password) { if (is_null($user)) { return false; } else { - return (0 == strcmp(common_munge_password($password, $user->id), + return (0 == strcmp(common_munge_password($password, $user->id), $user->password)); } } @@ -377,8 +378,23 @@ function common_profile_url($nickname) { return common_local_url('showstream', array('nickname' => $nickname)); } +function common_notice_form() { + common_element_start('form', array('id' => 'newnotice', 'method' => 'POST', + 'action' => common_local_url('newnotice'))); + common_element_start('p'); + common_element('label', array('for' => 'content'), _t('What\'s up?')); + common_element('textarea', array('rows' => 3, 'cols' => 40, + 'name' => 'content', + 'id' => 'content', + 'class' => 'width50'), + ' '); + common_element_end('p'); + common_submit('submit', _t('Send')); + common_element_end('form'); +} + // XXX: set up gettext -function _t($str) { +function _t($str) { return $str; }