From 0077cb99704fe863cf731fc5cab792af2ede96c2 Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Sun, 17 Apr 2011 20:13:07 -0400
Subject: Backporting retarded amount of changes outside of version control

---
 admin/rudi/views/view.members.profile.php | 50 ++++++++++++++++++++++++-------
 1 file changed, 39 insertions(+), 11 deletions(-)

(limited to 'admin/rudi/views/view.members.profile.php')

diff --git a/admin/rudi/views/view.members.profile.php b/admin/rudi/views/view.members.profile.php
index bd776d7..6355d2e 100644
--- a/admin/rudi/views/view.members.profile.php
+++ b/admin/rudi/views/view.members.profile.php
@@ -10,7 +10,10 @@
 		 	$status_id = $_POST['status'];
 		 	$role_id = $_POST['role'];
 		 	$unit_id = $_POST['unit'];
+		 	$a2_id = $_POST['a2_id'];
+		 	$oa_id = $_POST['oa_id'];
 			$weapon_id = $_POST['weapon'];
+			$weapon2_id = $_POST['weapon2'];
 		 	$first_name = addslashes($_POST['first']);
 		 	$last_name = addslashes($_POST['last']);
 		 	$username = addslashes($_POST['username']);
@@ -29,9 +32,13 @@
  			$query = "UPDATE `rudi_unit_members` SET"
 			 		." `rank_id` = '$rank_id',"
 			 		." `country_id` = '$country_id',"
+			 		." `role_id` = '$role_id', "
 					." `status_id` = '$status_id',"
 					." `cunit_id` = '$unit_id',"
 					." `weapon_id` = '$weapon_id',"
+					." `weapon2_id` = '$weapon2_id',"
+					." `a2_id` = '$a2_id',"
+					." `oa_id` = '$oa_id',"
 					." `username` = '$username',"
 					." `email` = '$email',"
 					." `xfire` = '$xfire',"
@@ -51,10 +58,10 @@
 			decho($query);
 		 	$db->Query($query);
 		 	
-		 	$db->Query("UPDATE `rudi_roles_container` SET `role_id` = '$role_id' WHERE `member_id` = '$member_id' LIMIT 1");
+		 	//$db->Query("UPDATE `rudi_roles_container` SET `role_id` = '$role_id' WHERE `member_id` = '$member_id' LIMIT 1");
 		 	
 		 	/* do the role query as well */
-		 	PageRedirect(1, "?op=rudi&show=members&profile={$member_id}");
+		 	PageRedirect(1, "?op=rudi&show=members");
 		 	return;		 
 		 } 	
 		 $member = GetMember($member_id);
@@ -87,6 +94,8 @@
 ?>
 			</select>
 		</td></tr>
+		<tr><td class="right" width="50%">ArmA2 ID</td><td class="left"><input type="text" name="a2_id" value="<?php echo $member['a2_id']; ?>"/></td></tr>
+		<tr><td class="right" width="50%">ArmA2:OA ID</td><td class="left"><input type="text" name="oa_id" value="<?php echo $member['oa_id']; ?>"/></td></tr>
 		</table>
 		<table width="100%" style="text-align:center;">
 		<tr><th colspan="2" style="background-color:#c4c4c4;">Vital Statistics</th></tr>
@@ -118,15 +127,21 @@
 			<td class="right">Role:</td>
 			<td class="left">
 			<select name="role">
+				<option value="0">---SELECT-POSITION---</option>
 <?php
-			$member_roles = GetMembersRoles($member['member_id']);
-			$roles = GetRoles();	
-			foreach($member_roles as $member_role){}
-			foreach($roles as $role){
-				if($role['role_id']==$member_role['role_id'])
-					echo "<option value=\"{$role['role_id']}\" selected>{$role['name']}</option>";
-				else
-					echo "<option value=\"{$role['role_id']}\">{$role['name']}</option>";			
+			//$member_roles = GetMembersRoles($member['member_id']);
+			$groups = GetRoles();
+			decho($groups);	
+			//foreach($member_roles as $member_role){}
+			foreach($groups as $group){	
+				echo "<optgroup label=\"{$group['name']}\">";
+				foreach($group['roles'] as $role){
+					if($role['role_id']==$member['role_id'])
+						echo "<option value=\"{$role['role_id']}\" selected>{$role['name']}</option>";
+					else
+						echo "<option value=\"{$role['role_id']}\">{$role['name']}</option>";			
+				}
+				echo "</optgroup>";
 			}
 ?>
 				</select>
@@ -153,7 +168,7 @@
 		    	</select>
 			</td>
 		</tr>
-		<tr><td class="right">Weapons:</td><td class="left">
+		<tr><td class="right">Primary Weapon:</td><td class="left">
 			<select name="weapon">
 <?php		$weapons = GetWeapons();
 			foreach($weapons as $weapon){
@@ -162,6 +177,19 @@
 				else
 					echo "<option value=\"{$weapon['weapon_id']}\">{$weapon['model']}</option>";			
 			}
+?>
+		</select>
+		</td></tr>
+		<tr><td class="right">Secondary Weapon:</td><td class="left">
+			<select name="weapon2">
+				<option value="0">None</option>
+<?php
+			foreach($weapons as $weapon){
+				if($weapon['weapon_id'] == $member['weapon2_id'])
+					echo "<option value=\"{$weapon['weapon_id']}\" selected>{$weapon['model']}</option>";
+				else
+					echo "<option value=\"{$weapon['weapon_id']}\">{$weapon['model']}</option>";			
+			}
 ?>
 		</select>
 		</td></tr>
-- 
cgit