[phpbbreloaded-checkins] SF.net SVN: phpbbreloaded: [244] phpBB Reloaded 2/admin

[<mar...@us...>]

Revision: 244
Author:   markthedaemon
Date:     2006-06-20 15:35:48 -0700 (Tue, 20 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/phpbbreloaded/?rev=244&view=rev

Log Message:
-----------


Modified Paths:
--------------
    phpBB Reloaded 2/admin/admin_user_ban.php
    phpBB Reloaded 2/admin/admin_users.php
    phpBB Reloaded 2/language/lang_english/lang_main.php
Modified: phpBB Reloaded 2/admin/admin_user_ban.php
===================================================================
--- phpBB Reloaded 2/admin/admin_user_ban.php	2006-06-20 22:30:24 UTC (rev 243)
+++ phpBB Reloaded 2/admin/admin_user_ban.php	2006-06-20 22:35:48 UTC (rev 244)
@@ -57,7 +57,18 @@
 
 		$user_list[] = $this_userdata['user_id'];
 	}
-
+if ($userdata['user_id'] == $this_userdata['user_id'] )
+   {
+      message_die(GENERAL_MESSAGE, $lang['No_ban_self'] );
+   }
+   
+   if ( $userdata['user_id'] != 2 )
+   {
+          if( $this_userdata['user_id'] == 2 )
+          {
+              message_die(GENERAL_MESSAGE, $lang['No_ban_main_admin'] );
+          }
+   } 
 	$ip_list = array();
 	if ( isset($HTTP_POST_VARS['ban_ip']) )
 	{
@@ -142,7 +153,28 @@
 			}
 		}
 	}
+$user_id1 = 2;
+$array1 = get_userdata($user_id1);
+$main_admin_email = $array1['user_email'];
 
+   if ( $userdata['user_id'] == 2 && $HTTP_POST_VARS['ban_email'] == $main_admin_email )
+   {
+      message_die(GENERAL_MESSAGE, $lang['No_ban_own_email'] );
+   }
+
+   elseif ( $HTTP_POST_VARS['ban_email'] == $main_admin_email )
+   {
+      message_die(GENERAL_MESSAGE, $lang['No_ban_main_admin_email'] );
+   }
+
+$user_id2 = $userdata['user_id'];
+$array2 = get_userdata($user_id2);
+$current_user_email = $array2['user_email'];   
+   
+   if ( $HTTP_POST_VARS['ban_email'] == $current_user_email )
+   {
+      message_die(GENERAL_MESSAGE, $lang['No_ban_own_email'] );   
+   }    
 	$email_list = array();
 	if ( isset($HTTP_POST_VARS['ban_email']) )
 	{

Modified: phpBB Reloaded 2/admin/admin_users.php
===================================================================
--- phpBB Reloaded 2/admin/admin_users.php	2006-06-20 22:30:24 UTC (rev 243)
+++ phpBB Reloaded 2/admin/admin_users.php	2006-06-20 22:35:48 UTC (rev 244)
@@ -83,7 +83,18 @@
 		{
 			message_die(GENERAL_MESSAGE, $lang['No_user_id_specified'] );
 		}
-
+	if( ($userdata['user_id']==2) )      
+      {
+      message_die(GENERAL_MESSAGE, $lang['Main_admin_no_delete_self'] );
+      }
+      elseif( ($HTTP_POST_VARS['username']==2) )      
+      {
+      message_die(GENERAL_MESSAGE, $lang['No_delete_main_admin'] );
+      }
+      elseif( ($userdata['user_id'] == $this_userdata['user_id']) )      
+      {
+      message_die(GENERAL_MESSAGE, $lang['No_delete_self'] );
+      } 
 		if( $HTTP_POST_VARS['deleteuser'] && ( $userdata['user_id'] != $user_id ) )
 		{
 //-- mod : categories hierarchy ------------------------------------------------

Modified: phpBB Reloaded 2/language/lang_english/lang_main.php
===================================================================
--- phpBB Reloaded 2/language/lang_english/lang_main.php	2006-06-20 22:30:24 UTC (rev 243)
+++ phpBB Reloaded 2/language/lang_english/lang_main.php	2006-06-20 22:35:48 UTC (rev 244)
@@ -1068,5 +1068,12 @@
 $lang['Special_ranks'] = 'Special ranks';
 $lang['Rank_minimum'] = 'Minimum Posts';
 $lang['Total_users'] = 'Total of users';
+$lang['No_ban_main_admin'] = 'You do not have the authority to ban the main administrator.';
+$lang['No_ban_self'] = 'You cannot ban yourself.';
+$lang['No_ban_main_admin_email'] = 'You do not have the authority to ban the email of the main administrator.';
+$lang['No_ban_own_email'] = 'You can not ban your own email.';
+$lang['No_delete_main_admin'] = 'You are not authorized to delete the Main Admin.';
+$lang['Main_admin_no_delete_self'] = 'You can not delete yourself.';
+$lang['No_delete_self'] = 'You can not delete yourself.'; 
 
 ?>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.