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

diff --git a/lib/util.php b/lib/util.php
index a630646d7c..eb019ac7ee 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -166,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);
@@ -178,16 +183,23 @@ 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) {
@@ -205,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']));
@@ -251,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');
 }
@@ -322,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');
 }
@@ -342,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
@@ -499,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':
@@ -510,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);
 	}
@@ -572,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) {
@@ -613,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',
@@ -737,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');
 	}
 
@@ -746,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');
 	}