X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Futil.php;h=6f6f1dd249121be3f5ccc34a3ebd539a48a105df;hb=36429673150b89e868c4ef54f89f408a11971df3;hp=5e3e8c98d0e1b8f1e64538e37f2f84a91a41ffbf;hpb=42bbd38417ffbfe5bfee669e0c52b50187a3032a;p=quix0rs-gnu-social.git

diff --git a/lib/util.php b/lib/util.php
index 5e3e8c98d0..6f6f1dd249 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -194,11 +194,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'));
@@ -253,7 +253,7 @@ function common_show_footer() {
 	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(_('. Contributors should be attributed by full name or nickname.'));
 	common_element_end('p');
@@ -708,7 +708,7 @@ function common_local_url($action, $args=NULL) {
 function common_fancy_url($action, $args=NULL) {
 	switch (strtolower($action)) {
 	 case 'public':
-		if ($args && $args['page']) {
+		if ($args && isset($args['page'])) {
 			return common_path('?page=' . $args['page']);
 		} else {
 			return common_path('');
@@ -757,7 +757,7 @@ function common_fancy_url($action, $args=NULL) {
 	 case 'subscribers':
 	 case 'all':
 	 case 'replies':
-		if ($args && $args['page']) {
+		if ($args && isset($args['page'])) {
 			return common_path($args['nickname'].'/'.$action.'?page=' . $args['page']);
 		} else {
 			return common_path($args['nickname'].'/'.$action);
@@ -769,7 +769,7 @@ function common_fancy_url($action, $args=NULL) {
 	 case 'userrss':
 		return common_path($args['nickname'].'/rss');
 	 case 'showstream':
-		if ($args && $args['page']) {
+		if ($args && isset($args['page'])) {
 			return common_path($args['nickname'].'?page=' . $args['page']);
 		} else {
 			return common_path($args['nickname']);
@@ -889,6 +889,7 @@ function common_redirect($url, $code=307) {
 
 function common_save_replies($notice) {
 	# Alternative reply format
+	$tname = false;
 	if (preg_match('/^T ([A-Z0-9]{1,64}) /', $notice->content, $match)) {
 		$tname = $match[1];
 	}
@@ -921,7 +922,7 @@ function common_save_replies($notice) {
 		$id = $reply->insert();
 		if (!$id) {
 			$last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
-			common_log(LOG_ERROR, 'DB error inserting reply: ' . $last_error->message);
+			common_log(LOG_ERR, 'DB error inserting reply: ' . $last_error->message);
 			common_server_error(sprintf(_('DB error inserting reply: %s'), $last_error->message));
 			return;
 		}
@@ -946,7 +947,7 @@ function common_enqueue_notice($notice) {
         $result = $qi->insert();
 	if (!$result) {
 	    $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
-	    common_log(LOG_ERROR, 'DB error inserting queue item: ' . $last_error->message);
+	    common_log(LOG_ERR, 'DB error inserting queue item: ' . $last_error->message);
 	    return false;
 	}
 	common_log(LOG_DEBUG, 'complete queueing notice ID = ' . $notice->id);
@@ -960,14 +961,14 @@ function common_real_broadcast($notice, $remote=false) {
 		require_once(INSTALLDIR.'/lib/omb.php');
 		$success = omb_broadcast_remote_subscribers($notice);
 		if (!$success) {
-			common_log(LOG_ERROR, 'Error in OMB broadcast for notice ' . $notice->id);
+			common_log(LOG_ERR, 'Error in OMB broadcast for notice ' . $notice->id);
 		}
 	}
 	if ($success) {
 		require_once(INSTALLDIR.'/lib/jabber.php');
 		$success = jabber_broadcast_notice($notice);
 		if (!$success) {
-			common_log(LOG_ERROR, 'Error in jabber broadcast for notice ' . $notice->id);
+			common_log(LOG_ERR, 'Error in jabber broadcast for notice ' . $notice->id);
 		}
 	}
 	// XXX: broadcast notices to SMS
@@ -1318,4 +1319,10 @@ function common_profile_uri($profile) {
 	}
 	# XXX: this is a very bad profile!
 	return NULL;
+}
+
+function common_canonical_sms($sms) {
+	# strip non-digits
+	preg_replace('/\D/', '', $sms);
+	return $sms;
 }
\ No newline at end of file