X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Futil.php;h=eb019ac7ee849f97d243295c0ce164f7da293773;hb=0ba99486039b10686a520e22ef50385625e5b9ae;hp=d6c1a9f8b9ee863016faad36573a0d5d1dc89344;hpb=c2a170da108a6645846aa2e60238974b49363b21;p=quix0rs-gnu-social.git

diff --git a/lib/util.php b/lib/util.php
index d6c1a9f8b9..eb019ac7ee 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -123,10 +123,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_show_header($pagetitle, $callable=NULL, $data=NULL, $headercall=NULL) {
 	global $config, $xw;
 
-	header('Content-Type: application/xhtml+xml');
+	$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);
+		exit(0);
+	}
+	
+	header('Content-Type: '.$type);
 
 	common_start_xml('html',
 					 '-//W3C//DTD XHTML 1.0 Strict//EN',
@@ -152,6 +166,11 @@ function common_show_header($pagetitle, $callable=NULL, $data=NULL, $headercall=
 							  'href="'.theme_path('ie'.$ver.'.css').' /><![endif]');
 		}
 	}
+	
+	common_element('script', array('type' => 'text/javascript',
+								   'src' => common_path('js/jquery.min.js')),
+				   ' ');
+						 
 	if ($callable) {
 		if ($data) {
 			call_user_func($callable, $data);
@@ -164,12 +183,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();
-	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');
+	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);
+	
 	if ($headercall) {
 		if ($data) {
 			call_user_func($headercall, $data);
@@ -186,6 +217,16 @@ 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('img', array('id' => 'cc',
 								'src' => $config['license']['image'],
 								'alt' => $config['license']['title']));
@@ -232,6 +273,7 @@ function common_nav_menu() {
 	} 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_element_end('ul');
 }
@@ -303,6 +345,7 @@ function common_submit($id, $label) {
 	common_element('input', array('type' => 'submit',
 								  'id' => $id,
 								  'name' => $id,
+								  'class' => 'submit',
 								  'value' => $label));
 	common_element_end('p');
 }
@@ -323,8 +366,8 @@ function common_textarea($id, $label, $content=NULL, $instructions=NULL) {
 
 # salted, hashed passwords are stored in the DB
 
-function common_munge_password($id, $password) {
-	return md5($id . $password);
+function common_munge_password($password, $id) {
+	return md5($password . $id);
 }
 
 # check if a username exists and has matching password
@@ -480,9 +523,15 @@ function common_local_url($action, $args=NULL) {
 function common_fancy_url($action, $args=NULL) {
 	switch (strtolower($action)) {
 	 case 'public':
-		return common_path('');
+		if ($args && $args['page']) {
+			return common_path('?page=' . $args['page']);
+		} else {
+			return common_path('');
+		}
 	 case 'publicrss':
 		return common_path('rss');
+	 case 'publicxrds':
+		return common_path('xrds');
 	 case 'doc':
 		return common_path('doc/'.$args['title']);
 	 case 'login':
@@ -491,27 +540,40 @@ function common_fancy_url($action, $args=NULL) {
 	 case 'subscribe':
 	 case 'unsubscribe':
 		return common_path('main/'.$action);
+	 case 'openidlogin':
+		return common_path('main/openid');
 	 case 'avatar':
 	 case 'password':
 		return common_path('settings/'.$action);
 	 case 'profilesettings':
 		return common_path('settings/profile');
+	 case 'openidsettings':
+		return common_path('settings/openid');
 	 case 'newnotice':
 		return common_path('notice/new');
 	 case 'shownotice':
 		return common_path('notice/'.$args['notice']);
-	 case 'subscriptions':
-	 case 'subscribed':
 	 case 'xrds':		
-	 case 'all':
 	 case 'foaf':
 		return common_path($args['nickname'].'/'.$action);
+	 case 'subscriptions':
+	 case 'subscribers':
+	 case 'all':
+		if ($args && $args['page']) {
+			return common_path($args['nickname'].'/'.$action.'?page=' . $args['page']);
+		} else {
+			return common_path($args['nickname'].'/'.$action);
+		}
 	 case 'allrss':
 		return common_path($args['nickname'].'/all/rss');
 	 case 'userrss':
 		return common_path($args['nickname'].'/rss');
 	 case 'showstream':
-		return common_path($args['nickname']);
+		if ($args && $args['page']) {
+			return common_path($args['nickname'].'?page=' . $args['page']);
+		} else {
+			return common_path($args['nickname']);
+		}
 	 default:
 		return common_simple_url($action, $args);
 	}
@@ -553,7 +615,12 @@ function common_redirect($url, $code=307) {
 						   307 => "Temporary Redirect");
 	header("Status: ${code} $status[$code]");
 	header("Location: $url");
+	
+	common_start_xml('a',
+					 '-//W3C//DTD XHTML 1.0 Strict//EN',
+					 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd');
 	common_element('a', array('href' => $url), $url);
+	common_end_xml();
 }
 
 function common_broadcast_notice($notice, $remote=false) {
@@ -594,7 +661,8 @@ function common_notice_form() {
 								  'id' => 'status_label'),
 				   _t('What\'s up, ').$user->nickname.'?');
 	common_element('textarea', array('id' => 'status_textarea',
-									 'name' => 'status_textarea'));
+									 'name' => 'status_textarea'),
+				   ' ');
 	common_element('input', array('id' => 'status_submit',
 								  'name' => 'status_submit',
 								  'type' => 'submit',
@@ -718,7 +786,7 @@ function common_pagination($have_before, $have_after, $page, $action, $args=NULL
 										 
 		common_element_start('li', 'before');
 		common_element('a', array('href' => common_local_url($action, $newargs)),
-					   _t('« Before'));
+					   _t('« After'));
 		common_element_end('li');
 	}
 
@@ -727,7 +795,7 @@ function common_pagination($have_before, $have_after, $page, $action, $args=NULL
 		$newargs = ($args) ? array_merge($args,$pargs) : $pargs;
 		common_element_start('li', 'after');
 		common_element('a', array('href' => common_local_url($action, $newargs)),
-						   _t('After »'));
+						   _t('Before »'));
 		common_element_end('li');
 	}
 	
@@ -736,3 +804,86 @@ function common_pagination($have_before, $have_after, $page, $action, $args=NULL
 		common_element_end('div');
 	}
 }
+
+/* Following functions are copied from MediaWiki GlobalFunctions.php
+ * and written by Evan Prodromou. */
+
+function common_accept_to_prefs($accept, $def = '*/*') {
+	# No arg means accept anything (per HTTP spec)
+	if(!$accept) {
+		return array($def => 1);
+	}
+
+	$prefs = array();
+
+	$parts = explode(',', $accept);
+
+	foreach($parts as $part) {
+		# FIXME: doesn't deal with params like 'text/html; level=1'
+		@list($value, $qpart) = explode(';', $part);
+		$match = array();
+		if(!isset($qpart)) {
+			$prefs[$value] = 1;
+		} elseif(preg_match('/q\s*=\s*(\d*\.\d+)/', $qpart, $match)) {
+			$prefs[$value] = $match[1];
+		}
+	}
+
+	return $prefs;
+}
+
+function common_mime_type_match($type, $avail) {
+	if(array_key_exists($type, $avail)) {
+		return $type;
+	} else {
+		$parts = explode('/', $type);
+		if(array_key_exists($parts[0] . '/*', $avail)) {
+			return $parts[0] . '/*';
+		} elseif(array_key_exists('*/*', $avail)) {
+			return '*/*';
+		} else {
+			return NULL;
+		}
+	}
+}
+
+function common_negotiate_type($cprefs, $sprefs) {
+	$combine = array();
+
+	foreach(array_keys($sprefs) as $type) {
+		$parts = explode('/', $type);
+		if($parts[1] != '*') {
+			$ckey = common_mime_type_match($type, $cprefs);
+			if($ckey) {
+				$combine[$type] = $sprefs[$type] * $cprefs[$ckey];
+			}
+		}
+	}
+
+	foreach(array_keys($cprefs) as $type) {
+		$parts = explode('/', $type);
+		if($parts[1] != '*' && !array_key_exists($type, $sprefs)) {
+			$skey = common_mime_type_match($type, $sprefs);
+			if($skey) {
+				$combine[$type] = $sprefs[$skey] * $cprefs[$type];
+			}
+		}
+	}
+
+	$bestq = 0;
+	$besttype = NULL;
+
+	foreach(array_keys($combine) as $type) {
+		if($combine[$type] > $bestq) {
+			$besttype = $type;
+			$bestq = $combine[$type];
+		}
+	}
+
+	return $besttype;
+}
+
+function common_config($main, $sub) {
+	global $config;
+	return $config[$main][$sub];
+}