X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Futil.php;h=a92204aa64a32b9186b70a2a5693056266a7b289;hb=48eaede398859927e9ccdc39b21e26f1832c9910;hp=24f0e5dd8b530e2e3d43097b4186f70add97339c;hpb=8e81943c2c6588be7e4c695172e757243b7a0d74;p=quix0rs-gnu-social.git

diff --git a/lib/util.php b/lib/util.php
index 24f0e5dd8b..a92204aa64 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1,18 +1,18 @@
 <?php
-/* 
+/*
  * Laconica - a distributed open-source microblogging tool
  * Copyright (C) 2008, Controlez-Vous, Inc.
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -69,21 +69,22 @@ function common_show_header($pagetitle) {
 	global $config, $xw;
 
 	header('Content-Type: application/xhtml+xml');
-	
+
 	$xw = new XMLWriter();
 	$xw->openURI('php://output');
+	$xw->setIndent(true);
 	$xw->startDocument('1.0', 'UTF-8');
 	$xw->writeDTD('html', '-//W3C//DTD XHTML 1.0 Strict//EN',
 				  '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',
@@ -101,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');
@@ -111,10 +112,10 @@ function common_show_header($pagetitle) {
 
 function common_show_footer() {
 	global $xw, $config;
-	common_element_start('p', 'footer');
+	common_element_start('div', 'footer');
 	common_foot_menu();
 	common_license_block();
-	common_element_end('p');
+	common_element_end('div');
 	common_element_end('div');
 	common_element_end('div');
 	common_element_end('div');
@@ -154,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' =>
@@ -174,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) {
@@ -194,6 +196,7 @@ function common_menu_item($url, $text, $title=NULL) {
 }
 
 function common_input($id, $label, $value=NULL) {
+	common_element_start('p');
 	common_element('label', array('for' => $id), $label);
 	$attrs = array('name' => $id,
 				   'type' => 'text',
@@ -202,14 +205,42 @@ function common_input($id, $label, $value=NULL) {
 		$attrs['value'] = htmlspecialchars($value);
 	}
 	common_element('input', $attrs);
+	common_element_end('p');
 }
 
 function common_password($id, $label) {
+	common_element_start('p');
 	common_element('label', array('for' => $id), $label);
 	$attrs = array('name' => $id,
 				   'type' => 'password',
 				   'id' => $id);
 	common_element('input', $attrs);
+	common_element_end('p');
+}
+
+function common_submit($id, $label) {
+	global $xw;
+	common_element_start('p');
+	common_element_start('label', array('for' => $id));
+	$xw->writeRaw('&nbsp;');
+	common_element_end('label');
+	common_element('input', array('type' => 'submit',
+								  'id' => $id,
+								  'name' => $id,
+								  'value' => $label,
+								  'class' => 'button'));
+	common_element_end('p');
+}
+
+function common_textarea($id, $label, $content=NULL) {
+	common_element_start('p');
+	common_element('label', array('for' => $id), $label);
+	common_element('textarea', array('rows' => 3, 'cols' => 40,
+									 'name' => $id,
+									 'id' => $id, 
+									 'class' => 'width50'),
+				   ($content) ? $content : ' ');
+	common_element_end('p');
 }
 
 # salted, hashed passwords are stored in the DB
@@ -224,7 +255,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));
 	}
 }
@@ -358,8 +389,16 @@ 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_textarea('content', _t('What\'s up?'));
+	common_submit('submit', _t('Send'));
+	common_element_end('form');
+}
+
 // XXX: set up gettext
 
-function _t($str) { 
+function _t($str) {
 	return $str;
 }