From 7186331a8939cdaf07d9d7d7b750c23988b179a8 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 25 Feb 2013 13:02:17 +0100
Subject: [PATCH 1/2] Admin panel: show if an account has expired

---
 mod/admin.php                | 5 +++--
 view/admin_users.tpl         | 8 +++++++-
 view/smarty3/admin_users.tpl | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/mod/admin.php b/mod/admin.php
index fb333c3e5c..ecca0b8be3 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -694,7 +694,7 @@ function admin_page_users(&$a){
 	}
 	
 	
-	$users = q("SELECT `user` . * , `contact`.`name` , `contact`.`url` , `contact`.`micro`, `lastitem`.`lastitem_date`
+	$users = q("SELECT `user` . * , `contact`.`name` , `contact`.`url` , `contact`.`micro`, `lastitem`.`lastitem_date`, `user`.`account_expired`
 				FROM
 					(SELECT MAX(`item`.`changed`) as `lastitem_date`, `item`.`uid`
 					FROM `item`
@@ -718,7 +718,7 @@ function admin_page_users(&$a){
 			t('Normal Account'), 
 			t('Soapbox Account'),
 			t('Community/Celebrity Account'),
-			t('Automatic Friend Account')
+                        t('Automatic Friend Account')
 		);
 		$e['page-flags'] = $accounts[$e['page-flags']];
 		$e['register_date'] = relative_date($e['register_date']);
@@ -756,6 +756,7 @@ function admin_page_users(&$a){
 		'$block' => t('Block'),
 		'$unblock' => t('Unblock'),
         '$siteadmin' => t('Site admin'),
+        '$accountexpired' => t('Account expired'),
 		
 		'$h_users' => t('Users'),
 		'$th_users' => array( t('Name'), t('Email'), t('Register date'), t('Last login'), t('Last item'),  t('Account') ),
diff --git a/view/admin_users.tpl b/view/admin_users.tpl
index 781d538bb7..71d55c04db 100644
--- a/view/admin_users.tpl
+++ b/view/admin_users.tpl
@@ -70,7 +70,13 @@
 						<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;
diff --git a/view/smarty3/admin_users.tpl b/view/smarty3/admin_users.tpl
index 7ecef1a56c..e3fc14ac3b 100644
--- a/view/smarty3/admin_users.tpl
+++ b/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}}</td>
+						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.accountexpired}}{{$account_expired}}{{/if}}</td>
 						<td class="checkbox"> 
                                     {{if $u.is_admin}}
                                         &nbsp;

From f97c81c1788b84b8e55ea938d787e946b4c59eaa Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 25 Feb 2013 13:05:30 +0100
Subject: [PATCH 2/2] kill some newlines

---
 view/admin_users.tpl | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/view/admin_users.tpl b/view/admin_users.tpl
index 71d55c04db..d9a96d7df7 100644
--- a/view/admin_users.tpl
+++ b/view/admin_users.tpl
@@ -70,13 +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 }} {{ if
-                                                $u.account_expired
-                                                }}($accountexpired){{ 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;