merge

include/bbcode.php

@@ -642,8 +642,8 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
 	$Text = preg_replace('/\&quot\;/','"',$Text);
 
 	// fix any escaped ampersands that may have been converted into links
-	$Text = preg_replace("/\<(.*?)(src|href)=(.*?)\&amp\;(.*?)\>/ism",'<$1$2=$3&$4>',$Text);
+	$Text = preg_replace("/\<([^>]*?)(src|href)=(.*?)\&amp\;(.*?)\>/ism",'<$1$2=$3&$4>',$Text);
-	$Text = preg_replace("/\<(.*?)(src|href)=\"[^hfm](.*?)\>/ism",'<$1$2="">',$Text);
+	$Text = preg_replace("/\<([^>]*?)(src|href)=\"[^hfm](.*?)\>/ism",'<$1$2="">',$Text);
 
 	if($saved_image)
 		$Text = bb_replace_images($Text, $saved_image);

include/pgettext.php

@@ -91,11 +91,20 @@ if(! function_exists('load_translation_table')) {
 function load_translation_table($lang) {
 	global $a;
 	 
+	$a->strings = array();
 	if(file_exists("view/$lang/strings.php")) {
 		include("view/$lang/strings.php");
 	}
-	else
+	// load enabled plugins strings
-		$a->strings = array();
+	$plugins = q("SELECT name FROM addon WHERE installed=1;");
+	if ($plugins!==false) {
+		foreach($plugins as $p) {
+			$name = $p['name'];
+			if(file_exists("addon/$name/lang/$lang/strings.php")) {
+				include("addon/$name/lang/$lang/strings.php");
+			}
+		}
+	}
 }}
 
 // translate string if translation exists

index.php

@@ -32,9 +32,7 @@ $install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false
 
 
 
-$lang = get_browser_language();
 
-load_translation_table($lang);
 
 /**
  *
@@ -62,6 +60,9 @@ if(!$install) {
 	$maintenance = get_config('system', 'maintenance');
 }
 
+$lang = get_browser_language();
+
+load_translation_table($lang);
 
 /**
  *

mod/admin.php

@@ -256,6 +256,7 @@ function admin_page_site_post(&$a){
 	$thread_allow		=	((x($_POST,'thread_allow'))		? True						: False);
 	$newuser_private		=	((x($_POST,'newuser_private'))		? True						: False);
 	$enotify_no_content		=	((x($_POST,'enotify_no_content'))	? True						: False);
+	$private_addons		=	((x($_POST,'private_addons'))		? True						: False);
 	
 	$no_multi_reg		=	((x($_POST,'no_multi_reg'))		? True						: False);
 	$no_openid		=	!((x($_POST,'no_openid'))		? True						: False);
@@ -283,7 +284,6 @@ function admin_page_site_post(&$a){
 	$temppath		=	((x($_POST,'temppath'))			? notags(trim($_POST['temppath']))		: '');
 	$basepath		=	((x($_POST,'basepath'))			? notags(trim($_POST['basepath']))		: '');
 	$singleuser		=	((x($_POST,'singleuser'))		? notags(trim($_POST['singleuser']))		: '');
-
 	if($ssl_policy != intval(get_config('system','ssl_policy'))) {
 		if($ssl_policy == SSL_POLICY_FULL) {
 			q("update `contact` set 
@@ -387,6 +387,7 @@ function admin_page_site_post(&$a){
 	set_config('system','dfrn_only', $dfrn_only);
 	set_config('system','ostatus_disabled', $ostatus_disabled);
 	set_config('system','diaspora_enabled', $diaspora_enabled);
+	set_config('config','private_addons', $private_addons);
 	
 	set_config('system','new_share', $new_share);
 	set_config('system','hide_help', $hide_help);
@@ -397,7 +398,6 @@ function admin_page_site_post(&$a){
 	set_config('system','temppath', $temppath);
 	set_config('system','basepath', $basepath);
 	
-
 	info( t('Site settings updated.') . EOL);
 	goaway($a->get_baseurl(true) . '/admin/site' );
 	return; // NOTREACHED
@@ -509,6 +509,7 @@ function admin_page_site(&$a) {
 		'$thread_allow'		=> array('thread_allow', t("Allow threaded items"), get_config('system','thread_allow'), t("Allow infinite level threading for items on this site.")),
 		'$newuser_private'	=> array('newuser_private', t("Private posts by default for new users"), get_config('system','newuser_private'), t("Set default post permissions for all new members to the default privacy group rather than public.")),
 		'$enotify_no_content'	=> array('enotify_no_content', t("Don't include post content in email notifications"), get_config('system','enotify_no_content'), t("Don't include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure.")),
+		'$private_addons'	=> array('private_addons', t("Disallow public access to addons listed in the apps menu."), get_config('config','private_addons'), t("Checking this box will restrict addons listed in the apps menu to members only.")),
 		
 		'$no_multi_reg'		=> array('no_multi_reg', t("Block multiple registrations"),  get_config('system','block_extended_register'), t("Disallow users to register additional accounts for use as pages.")),
 		'$no_openid'		=> array('no_openid', t("OpenID support"), !get_config('system','no_openid'), t("OpenID support for registration and logins.")),
@@ -532,7 +533,6 @@ function admin_page_site(&$a) {
 		'$lockpath'		=> array('lockpath', t("Path for lock file"), get_config('system','lockpath'), "The lock file is used to avoid multiple pollers at one time. Only define a folder here."),
 		'$temppath'		=> array('temppath', t("Temp path"), get_config('system','temppath'), "If you have a restricted system where the webserver can't access the system temp path, enter another path here."),
 		'$basepath'		=> array('basepath', t("Base path to installation"), get_config('system','basepath'), "If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot."),
-
         '$form_security_token' => get_form_security_token("admin_site"),
 
 	));

mod/apps.php

@@ -1,7 +1,14 @@
 <?php
 
 function apps_content(&$a) {
-	$title = t('Applications');
+    $privateaddons = get_config('config','private_addons');
+      if ($privateaddons === "1") {
+	if((! (local_user())))  {
+	info( t("You must be logged in to use addons. "));
+      return;};
+}
+
+      $title = t('Applications');
 
 	if(count($a->apps)==0)
 		notice( t('No installed applications.') . EOL);

mods/sample-Lighttpd.config

@@ -0,0 +1,134 @@
+Below is a sample config for Lighttpd that
+seems to work well on Debian Squeeze, with "lighttpd/1.4.28 (ssl)"
+
+The idea is: if someone enters the bare URL for my site, 'example.com',
+they get redirected to https://example.com/index.html, which is simply a
+page with two links on it: https://wordpress.example.com and
+https://friendica.example.com.
+
+If someone enters https://example.com, they get redirected to
+https://wordpress.example.com/main/, which is the 'main' blog in a Word
+Press 'network install' of the 'subdirectory' variety.
+
+I thought it might be nice to offer people who join my Friendica
+instance their own blogs, if they like.
+
+One can obtain free, signed, single subdomain SSL certificates from
+StartCom CA, which upon checking I noticed was already installed in both
+Firefox and Google Chromium.  Info at http://cert.startcom.org/ .  So I
+got one for each site, and have Lighty use the appropriate cert based on
+the requested URL.
+
+Enjoy!
+
+---------------( config starts )-----------------
+
+debug.log-request-handling = "disable"
+debug.log-condition-handling = "disable"
+
+server.modules = (
+        "mod_access",
+        "mod_alias",
+        "mod_compress",
+        "mod_redirect",
+        "mod_fastcgi",
+        "mod_rewrite"
+)
+
+server.document-root        = "/var/www"
+server.upload-dirs          = ( "/var/cache/lighttpd/uploads" )
+server.errorlog             = "/var/log/lighttpd/error.log"
+server.pid-file             = "/var/run/lighttpd.pid"
+server.username             = "www-data"
+server.groupname            = "www-data"
+
+ssl.engine = "enable"
+ssl.pemfile = "/etc/lighttpd/ssl/wordpress.pem"
+ssl.ca-file = "/etc/lighttpd/ssl/ca.pem"
+
+# Send everybody to landing
+page:                                                            
+$SERVER["socket"] == ":80" {
+
+$HTTP["scheme"] == "http" {
+    $HTTP["host"] =~ ".*" {
+        # This next redirect doesn't appear to ever execute in
+Firefox                       
+        # (sometimes, anyway -- caching issue?), but it does seem
+to                         
+        # reliably in Google's Chromium browser. If I change it
+here                         
+        # and restart Lighty, Firefox still goes to the URL in
+the                           
+        # last 'else' below. Or something. 
+Sometimes.                                       
+        server.document-root = "/var/www"
+        url.redirect = (".*" => "https://example.com")
+    }
+}
+
+}
+else $SERVER["socket"] == ":443" {
+
+$HTTP["scheme"] == "https" {
+
+    $HTTP["host"] == "wordpress.example.com" {
+        server.document-root = "/var/www/wordpress"
+        ssl.pemfile = "/etc/lighttpd/ssl/wordpress.pem"
+        # include
+"wpmu-rewrites.conf"                                                       
+        url.rewrite-if-not-file = (
+            "^/(.*/)?files/$" => "/index.php",
+             "^/(.*/)?files/(.*)" => "/wp-includes/ms-files.php?file=$2",
+             "^(/wp-admin/.*)" => "$1",
+             "^/([_0-9a-zA-Z-]+/)?(wp-.*)" => "/$2",
+             "^/([_0-9a-zA-Z-]+/)?(.*\.php)" => "/$2",
+             "^/(.*)/?$" => "/index.php/$1"
+        )
+    }
+    else $HTTP["host"] == "friendica.example.com" {
+        server.document-root = "/var/www/friendica"
+        ssl.pemfile = "/etc/lighttpd/ssl/friendica.pem"
+        # Got the following 'Drupal Clean URL'after Mike suggested
+trying                    
+        # something along those lines, from
+http://drupal.org/node/1414950                   
+        url.rewrite-if-not-file = (
+            "^\/([^\?]*)\?(.*)$" => "/index.php?q=$1&$2",
+            "^\/(.*)$" => "/index.php?q=$1"
+        )
+    }
+    else $HTTP["host"] !~ "(friendica.example.com|wordpress.example.com)" {
+        server.document-root = "/var/www/wordpress"
+        ssl.pemfile = "/etc/lighttpd/ssl/wordpress.pem"
+        url.redirect = (".*" => "https://wordpress.example.com/main/")
+    }
+}
+
+}
+
+index-file.names            = ( "index.php", "index.html",
+                                "index.htm", "default.htm",
+                               "index.lighttpd.html" )
+
+url.access-deny             = ( "~", ".inc" )
+
+static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )
+
+include_shell "/usr/share/lighttpd/use-ipv6.pl"
+
+dir-listing.encoding        = "utf-8"
+server.dir-listing          = "disable"
+
+#compress.cache-dir          =
+"/var/cache/lighttpd/compress/"                               
+#compress.filetype           = ( "application/x-javascript", "text/css",
+"text/html", "text/p\
+lain"
+)                                                                               
+
+
+include_shell "/usr/share/lighttpd/create-mime.assign.pl"
+include_shell "/usr/share/lighttpd/include-conf-enabled.pl"
+
+---------------( config ends )-----------------

util/po2php.php

@@ -46,9 +46,12 @@ function po2php_run(&$argv, &$argc) {
 			$match=Array();
 			preg_match("|nplurals=([0-9]*); *plural=(.*)[;\\\\]|", $l, $match);
 			$cond = str_replace('n','$n',$match[2]);
-			$out .= 'function string_plural_select_' . $lang . '($n){'."\n";
+			// define plural select function if not already defined
+			$fnname = 'string_plural_select_' . $lang;
+			$out .= 'if(! function_exists("'.$fnname.'")) {'."\n";
+			$out .= 'function '. $fnname . '($n){'."\n";
 			$out .= '	return '.$cond.';'."\n";
-			$out .= '}'."\n";
+			$out .= '}}'."\n";
 		}
 		
 

util/run_xgettext.sh

@@ -1,37 +1,77 @@
 #!/bin/bash
-
 FULLPATH=$(dirname $(readlink -f "$0"))
-cd "$FULLPATH/../view/en/"
+
+ADDONMODE=
+ADDONNAME=
+if [ "$1" == "--addon" -o "$1" == "-a" ]
+then
+	ADDONMODE=1
+	if [ -z $2 ]; then echo -e "ERROR: missing addon name\n\nrun_xgettext.sh -a <addonname>"; exit 1; fi
+	ADDONNAME=$2
+	if [ ! -d "$FULLPATH/../addon/$ADDONNAME" ]; then echo "ERROR: addon '$ADDONNAME' not found"; exit 2; fi
+fi
+
+if [ $ADDONMODE ]
+then 
+	cd "$FULLPATH/../addon/$ADDONNAME"
+	mkdir -p "$FULLPATH/../addon/$ADDONNAME/lang/C"
+	OUTFILE="$FULLPATH/../addon/$ADDONNAME/lang/C/messages.po"
+	FINDSTARTDIR="."
+	FINDOPTS=
+else
+	cd "$FULLPATH/../view/en/"
+	OUTFILE="$FULLPATH/messages.po"
+	FINDSTARTDIR="../../"
+	# skip addon folder
+	FINDOPTS="-wholename */addon -prune -o"
+fi
 
 F9KVERSION=$(sed -n "s/.*'FRIENDICA_VERSION'.*'\([0-9.]*\)'.*/\1/p" ../../boot.php);
 
 echo "Friendica version $F9KVERSION"
 
 OPTS=
-OUTFILE="$FULLPATH/messages.po"
+
-if [ "" != "$1" ]
+#if [ "" != "$1" ]
-then
+#then
-	OUTFILE="$(readlink -f ${FULLPATH}/$1)"
+#	OUTFILE="$(readlink -f ${FULLPATH}/$1)"
-	if [ -e "$OUTFILE" ]
+#	if [ -e "$OUTFILE" ]
-	then
+#	then
-		echo "join extracted strings"
+#		echo "join extracted strings"
-		OPTS="-j"
+#		OPTS="-j"
-	fi
+#	fi
-fi
+#fi
 
 KEYWORDS="-k -kt -ktt:1,2"
 
 echo "extract strings to $OUTFILE.."
-find ../../ -name "*.php" | xargs xgettext $KEYWORDS $OPTS -o "$OUTFILE" --from-code=UTF-8
+rm "$OUTFILE"; touch "$OUTFILE"
+for f in $(find "$FINDSTARTDIR" $FINDOPTS -name "*.php" -type f)
+do
+	if [ ! -d "$f" ]
+	then
+		xgettext $KEYWORDS $OPTS -j -o "$OUTFILE" --from-code=UTF-8 "$f"
+	fi
+done
 
 echo "setup base info.."
-sed -i "s/SOME DESCRIPTIVE TITLE./FRIENDICA Distributed Social Network/g" "$OUTFILE"
+if [ $ADDONMODE ]
-sed -i "s/YEAR THE PACKAGE'S COPYRIGHT HOLDER/2010, 2011 the Friendica Project/g" "$OUTFILE"
+then 
-sed -i "s/FIRST AUTHOR <EMAIL@ADDRESS>, YEAR./Mike Macgirvin, 2010/g" "$OUTFILE"
+	sed -i "s/SOME DESCRIPTIVE TITLE./ADDON $ADDONNAME/g" "$OUTFILE"
-sed -i "s/PACKAGE VERSION/$F9KVERSION/g" "$OUTFILE"
+	sed -i "s/YEAR THE PACKAGE'S COPYRIGHT HOLDER//g" "$OUTFILE"
-sed -i "s/PACKAGE/Friendica/g" "$OUTFILE"
+	sed -i "s/FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.//g" "$OUTFILE"
-sed -i "s/CHARSET/UTF-8/g" "$OUTFILE"
+	sed -i "s/PACKAGE VERSION//g" "$OUTFILE"
-sed -i "s/^\"Plural-Forms/#\"Plural-Forms/g" "$OUTFILE"
+	sed -i "s/PACKAGE/Friendica $ADDONNAME addon/g" "$OUTFILE"
-
+	sed -i "s/CHARSET/UTF-8/g" "$OUTFILE"
+	sed -i "s/^\"Plural-Forms/#\"Plural-Forms/g" "$OUTFILE"
+else
+	sed -i "s/SOME DESCRIPTIVE TITLE./FRIENDICA Distributed Social Network/g" "$OUTFILE"
+	sed -i "s/YEAR THE PACKAGE'S COPYRIGHT HOLDER/2010, 2011, 2012, 2013 the Friendica Project/g" "$OUTFILE"
+	sed -i "s/FIRST AUTHOR <EMAIL@ADDRESS>, YEAR./Mike Macgirvin, 2010/g" "$OUTFILE"
+	sed -i "s/PACKAGE VERSION/$F9KVERSION/g" "$OUTFILE"
+	sed -i "s/PACKAGE/Friendica/g" "$OUTFILE"
+	sed -i "s/CHARSET/UTF-8/g" "$OUTFILE"
+	sed -i "s/^\"Plural-Forms/#\"Plural-Forms/g" "$OUTFILE"
+fi
 
 echo "done."

view/admin_site.tpl

@@ -85,7 +85,7 @@
 	{{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }}
 	{{ inc field_checkbox.tpl with $field=$newuser_private }}{{ endinc }}
 	{{ inc field_checkbox.tpl with $field=$enotify_no_content }}{{ endinc }}
-	
+	{{ inc field_checkbox.tpl with $field=$private_addons }}{{ endinc }}	
 	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
 	
 	<h3>$advanced</h3>

view/ca/strings.php

@@ -1,8 +1,9 @@
 <?php
 
+if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	return ($n != 1);;
-}
+}}
 ;
 $a->strings["Post successful."] = "Publicat amb éxit.";
 $a->strings["[Embedded content - reload page to view]"] = "[Contingut embegut - recarrega la pàgina per a veure-ho]";

view/cs/strings.php

@@ -1,8 +1,9 @@
 <?php
 
+if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
-}
+}}
 ;
 $a->strings["Post successful."] = "Příspěvek úspěšně odeslán";
 $a->strings["[Embedded content - reload page to view]"] = "[Vložený obsah - obnovení stránky pro zobrazení]";

view/eo/strings.php

@@ -1,8 +1,9 @@
 <?php
 
+if(! function_exists("string_plural_select_eo")) {
 function string_plural_select_eo($n){
 	return ($n != 1);;
-}
+}}
 ;
 $a->strings["Post successful."] = "Sukcese afiŝita.";
 $a->strings["[Embedded content - reload page to view]"] = "[Enigita enhavo - reŝargu paĝon por spekti ĝin]";

view/es/strings.php

@@ -1,8 +1,9 @@
 <?php
 
+if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
 	return ($n != 1);;
-}
+}}
 ;
 $a->strings["Post successful."] = "¡Publicado!";
 $a->strings["[Embedded content - reload page to view]"] = "[Contenido incrustado - recarga la página para verlo]";

view/fr/strings.php

@@ -1,8 +1,9 @@
 <?php
 
+if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	return ($n > 1);;
-}
+}}
 ;
 $a->strings["Post successful."] = "Publication réussie.";
 $a->strings["[Embedded content - reload page to view]"] = "[contenu incorporé - rechargez la page pour le voir]";

view/is/strings.php

@@ -1,8 +1,9 @@
 <?php
 
+if(! function_exists("string_plural_select_is")) {
 function string_plural_select_is($n){
 	return ($n != 1);;
-}
+}}
 ;
 $a->strings["Post successful."] = "Melding tókst.";
 $a->strings["[Embedded content - reload page to view]"] = "[Innfelt efni - endurhlaða síðu til að sjá]";

view/nb-no/strings.php

@@ -1,8 +1,9 @@
 <?php
 
+if(! function_exists("string_plural_select_nb_no")) {
 function string_plural_select_nb_no($n){
 	return ($n != 1);;
-}
+}}
 ;
 $a->strings["Post successful."] = "Innlegg vellykket.";
 $a->strings["[Embedded content - reload page to view]"] = "[Innebygget innhold - hent siden på nytt for å se det]";

view/pt-br/strings.php

@@ -1,8 +1,9 @@
 <?php
 
+if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
 	return ($n > 1);;
-}
+}}
 ;
 $a->strings["Post successful."] = "Publicado com sucesso.";
 $a->strings["[Embedded content - reload page to view]"] = "[Conteúdo incorporado - recarregue a página para ver]";

view/ru/strings.php

@@ -1,8 +1,9 @@
 <?php
 
+if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
 	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<10 || $n%100>=20) ? 1 : 2);;
-}
+}}
 ;
 $a->strings["Post successful."] = "Успешно добавлено.";
 $a->strings["[Embedded content - reload page to view]"] = "[Встроенное содержание - перезагрузите страницу для просмотра]";

view/smarty3/admin_site.tpl

@@ -90,7 +90,7 @@
 	{{include file="field_checkbox.tpl" field=$thread_allow}}
 	{{include file="field_checkbox.tpl" field=$newuser_private}}
 	{{include file="field_checkbox.tpl" field=$enotify_no_content}}
-	
+	{{include file="field_checkbox.tpl" field=$private_addons}}	
 	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 	
 	<h3>{{$advanced}}</h3>

view/smarty3/admin_users.tpl

@@ -75,7 +75,7 @@
 						<td class='register_date'>{{$u.register_date}}</td>
 						<td class='login_date'>{{$u.login_date}}</td>
 						<td class='lastitem_date'>{{$u.lastitem_date}}</td>
-						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.accountexpired}}{{$account_expired}}{{/if}}</td>
+						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}</td>
 						<td class="checkbox"> 
                                     {{if $u.is_admin}}
                                         &nbsp;

view/theme/decaf-mobile/admin_users.tpl

@@ -70,7 +70,7 @@
 						<td class='register_date'>$u.register_date</td>
 						<td class='login_date'>$u.login_date</td>
 						<td class='lastitem_date'>$u.lastitem_date</td>
-						<td class='login_date'>$u.page_flags {{ if $u.is_admin }}($siteadmin){{ endif }}</td>
+						<td class='login_date'>$u.page_flags {{ if $u.is_admin }}($siteadmin){{ endif }} {{ if $u.account_expired }}($accountexpired){{ endif }}</td>
 						<td class="checkbox"> 
                                     {{ if $u.is_admin }}
                                         &nbsp;

view/theme/decaf-mobile/smarty3/admin_users.tpl

@@ -75,7 +75,7 @@
 						<td class='register_date'>{{$u.register_date}}</td>
 						<td class='login_date'>{{$u.login_date}}</td>
 						<td class='lastitem_date'>{{$u.lastitem_date}}</td>
-						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}}</td>
+						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}</td>
 						<td class="checkbox"> 
                                     {{if $u.is_admin}}
                                         &nbsp;

view/theme/diabook/admin_users.tpl

@@ -69,7 +69,7 @@
 						<td class='register_date'>$u.register_date</td>
 						<td class='login_date'>$u.login_date</td>
 						<td class='lastitem_date'>$u.lastitem_date</td>
-						<td class='login_date'>$u.page_flags</td>
+						<td class='login_date'>$u.page_flags {{ if $u.is_admin }}($siteadmin){{ endif }} {{ if $u.account_expired }}($accountexpired){{ endif }}</td>
 						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
 						<td class="tools" style="width:60px;">
 							<a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>

view/theme/diabook/smarty3/admin_users.tpl

@@ -74,7 +74,7 @@
 						<td class='register_date'>{{$u.register_date}}</td>
 						<td class='login_date'>{{$u.login_date}}</td>
 						<td class='lastitem_date'>{{$u.lastitem_date}}</td>
-						<td class='login_date'>{{$u.page_flags}}</td>
+						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}</td>
 						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>
 						<td class="tools" style="width:60px;">
 							<a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><span class='icon block {{if $u.blocked==0}}dim{{/if}}'></span></a>

view/theme/frost-mobile/admin_users.tpl

@@ -70,7 +70,7 @@
 						<td class='register_date'>$u.register_date</td>
 						<td class='login_date'>$u.login_date</td>
 						<td class='lastitem_date'>$u.lastitem_date</td>
-						<td class='login_date'>$u.page_flags {{ if $u.is_admin }}($siteadmin){{ endif }}</td>
+						<td class='login_date'>$u.page_flags {{ if $u.is_admin }}($siteadmin){{ endif }} {{ if $u.account_expired }}($accountexpired){{ endif }}</td>
 						<td class="checkbox"> 
                                     {{ if $u.is_admin }}
                                         &nbsp;

view/theme/frost-mobile/smarty3/admin_users.tpl

@@ -75,7 +75,7 @@
 						<td class='register_date'>{{$u.register_date}}</td>
 						<td class='login_date'>{{$u.login_date}}</td>
 						<td class='lastitem_date'>{{$u.lastitem_date}}</td>
-						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}}</td>
+						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}</td>
 						<td class="checkbox"> 
                                     {{if $u.is_admin}}
                                         &nbsp;

view/theme/frost/admin_users.tpl

@@ -70,7 +70,7 @@
 						<td class='register_date'>$u.register_date</td>
 						<td class='login_date'>$u.login_date</td>
 						<td class='lastitem_date'>$u.lastitem_date</td>
-						<td class='login_date'>$u.page_flags {{ if $u.is_admin }}($siteadmin){{ endif }}</td>
+						<td class='login_date'>$u.page_flags {{ if $u.is_admin }}($siteadmin){{ endif }} {{ if $u.account_expired }}($accountexpired){{ endif }}</td>
 						<td class="checkbox"> 
                                     {{ if $u.is_admin }}
                                         &nbsp;

view/theme/frost/smarty3/admin_users.tpl

@@ -75,7 +75,7 @@
 						<td class='register_date'>{{$u.register_date}}</td>
 						<td class='login_date'>{{$u.login_date}}</td>
 						<td class='lastitem_date'>{{$u.lastitem_date}}</td>
-						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}}</td>
+						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}</td>
 						<td class="checkbox"> 
                                     {{if $u.is_admin}}
                                         &nbsp;

view/theme/smoothly/login.tpl

@@ -1,5 +1,4 @@
 <img style="float:left; margin:5px 20px 0 0" src="/images/friendica-128.png" title="friendica">
-
 <div class="login-form">
 <form action="$dest_url" method="post" >
 	<input type="hidden" name="auth-params" value="login" />
@@ -34,5 +33,4 @@
 	
 </form>
 </div>
-
 <script type="text/javascript">window.loginName = "$lname.0";</script>

view/theme/smoothly/smarty3/login.tpl

@@ -4,7 +4,6 @@
  *
  *}}
 <img style="float:left; margin:5px 20px 0 0" src="/images/friendica-128.png" title="friendica">
-
 <div class="login-form">
 <form action="{{$dest_url}}" method="post" >
 	<input type="hidden" name="auth-params" value="login" />
@@ -39,5 +38,4 @@
 	
 </form>
 </div>
-
 <script type="text/javascript">window.loginName = "{{$lname.0}}";</script>

view/theme/smoothly/smarty3/wall_thread.tpl

@@ -21,7 +21,7 @@
 				<a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
 				<img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" /></a>
 			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
+			<div class="wall-item-arrowphoto-wrapper" ><img src="view/theme/smoothly/images/larrow.gif" alt="{{$item.wall}}" /></div>
 			{{/if}}
 			<div class="wall-item-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}" 
 				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"

view/theme/smoothly/style.css

@@ -2,7 +2,7 @@
   	style.css
   	Smoothly
    
-	Created by alex@friendica.pixelbits.de on 2013-02-21
+	Created by alex@friendica.pixelbits.de on 2013-02-27
 
 ** Colors ** 
 Blue links - #1873a2
@@ -634,8 +634,9 @@ aside h4 {
 
 .vcard #profile-photo-wrapper {
 	margin: 10px 0px;
-	padding: 6px;
+	padding: 1px;
-	width: auto;
+	width: 200px;
+	height: 200px;
 	background: none repeat scroll 0 0 #FFFFFF;
 	border: 1px solid #C5C5C5;
 	box-shadow: 0 0 8px #BDBDBD;
@@ -1403,10 +1404,18 @@ ul .sidebar-group-li .icon {
 	width: 100px;
 }
 
+.wall-item-photo {
+	width: 81px !important; 
+	height: 81px !important;
+	border-radius: 5px;
+		-webkit-border-radius: 5px;
+		-moz-border-radius: 5px;
+}
+
 .wall-item-photo-wrapper { 
 	width: 80px; 
 	height: 80px;
-	padding: 4px;
+	padding: 1px;
 	position: relative;
 	border: 1px solid #dddddd;
 	border-radius: 5px;
@@ -1589,14 +1598,13 @@ ul .sidebar-group-li .icon {
 }
 
 .wallwall .wwto {
-	left: -10px;
+	left: 0px;
-	margin: 0;
 	position: absolute;
-	top: 65px;
+	margin: -1px;
-	width: 30px;
+	top: 63px;
 	z-index: 900;
-	width: 30px;
+	width: 0px;
-	height: 30px;    
+	height: 0px;    
 }
 
 .wallwall .wwto img { 
@@ -1610,8 +1618,8 @@ ul .sidebar-group-li .icon {
 
 .wall-item-arrowphoto-wrapper {
 	position: absolute;
-	left: 20px;
+	left: 30px;
-	top: 70px;
+	top: 67px;
 	z-index: 950;
 }
 
@@ -1725,8 +1733,8 @@ code {
 }
 
 .wall-item-outside-wrapper.comment .wall-item-photo {
-	width: 40px!important;
+	width: 41px!important;
-	height: 40px!important;
+	height: 41px!important;
 }
 
 .wall-item-outside-wrapper.comment .wall-item-photo-wrapper {
@@ -2013,8 +2021,11 @@ div[id$="wrapper"] br {
 }
 
 .photo {
-	height: 191px!important;
+	height: 200px!important;
-	width: 191px!important;
+	width: 200px!important;
+	border-radius: 5px;
+		-moz-border-radius: 5px;
+		-webkit-border-radius: 5px;
 }
 
 #side-bar-photos-albums {

view/theme/smoothly/theme.php

@@ -3,7 +3,7 @@
 /*
  * Name: Smoothly
  * Description: Like coffee with milk. Theme optimized for iPad[2].
- * Version: Version 0.21
+ * Version: Version 2013-02-27.1
  * Author: Alex <https://friendica.pixelbits.de/profile/alex>
  * Maintainer: Alex <https://friendica.pixelbits.de/profile/alex>
  * Screenshot: <a href="screenshot.png">Screenshot</a>

view/theme/smoothly/wall_thread.tpl

@@ -16,7 +16,7 @@
 				<a href="$item.owner_url" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
 				<img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
 			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
+			<div class="wall-item-arrowphoto-wrapper" ><img src="view/theme/smoothly/images/larrow.gif" alt="$item.wall" /></div>
 			{{ endif }}
 			<div class="wall-item-photo-wrapper mframe{{ if $item.owner_url }} wwfrom{{ endif }}" id="wall-item-photo-wrapper-$item.id" 
 				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"