X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Futil.php;h=1b308d14ead940ca0e69539afa692146e1420128;hb=0cabc70341727a2e017674278a33ddc970e3e2ce;hp=86c71abb75fb5d555d83bb2a44ae94e7c0b9fb57;hpb=aed137fae3c943b5e2710e608b1f4402755d8032;p=quix0rs-gnu-social.git

diff --git a/lib/util.php b/lib/util.php
index 86c71abb75..1b308d14ea 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -150,9 +150,15 @@ function common_text($txt) {
 	$xw->text($txt);
 }
 
+function common_raw($xml) {
+	global $xw;
+	$xw->writeRaw($xml);
+}
+
 function common_license_block() {
 	global $config, $xw;
-	common_element_start('div', 'license');
+	common_element_start('p', 'license greenBg');
+	common_element_start('span', 'floatLeft width25');
 	common_element_start('a', array('class' => 'license',
 									'rel' => 'license',
 									href => $config['license']['url']));
@@ -160,13 +166,16 @@ function common_license_block() {
 								'src' => $config['license']['image'],
 								'alt' => $config['license']['title']));
 	common_element_end('a');
+	common_element_end('span');
+	common_element_start('span', 'floatRight width75');
 	common_text(_t('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']),
 				   $config['license']['title']);
 	common_text(_t('. Contributors should be attributed by full name or nickname.'));
-	common_element_end('div');
+	common_element_end('span');
+	common_element_end('p');
 }
 
 function common_head_menu() {
@@ -353,9 +362,9 @@ function common_avatar_filename($user, $extension, $size=NULL, $extra=NULL) {
 	global $config;
 
 	if ($size) {
-		return $user->id . '-' . $size . (($extra) ? $extra : '') . $extension;
+		return $user->id . '-' . $size . (($extra) ? ('-' . $extra) : '') . $extension;
 	} else {
-		return $user->id . '-original' . (($extra) ? $extra : '') . $extension;
+		return $user->id . '-original' . (($extra) ? ('-' . $extra) : '') . $extension;
 	}
 }
 
@@ -480,7 +489,7 @@ function common_mtrand($bytes) {
 }
 
 function common_timestamp() {
-	return date('YmdHisu');
+	return date('YmdHis');
 }
 	
 // XXX: set up gettext