Merge branch 'master' of ssh://3rd-infantry-division.org/~/git/bayonet

11 files changed, 457 insertions, 124 deletions

diff --git a/admin/rudi/views/view.awards.add.php b/admin/rudi/views/view.awards.add.php
new file mode 100644
index 0000000..9c97c54
--- /dev/null
+++ b/admin/rudi/views/view.awards.add.php
@@ -0,0 +1,27 @@
+<?php
+	$class_id = $_GET['cid'];
+	$form = new BayonetForm("", "POST");
+	if($form->verifySubmit('processed'))
+	{
+		global $db;
+		$name = $form->request['name'];
+		$text = $form->request['text'];
+		$db->Query("INSERT INTO `rudi_awards` SET `class_id` = '$class_id', `name` = '$name', `image` = '', `description` = '$text'");
+		
+		PageRedirect(1, "?op=rudi&show=awards&cid={$class_id}");
+		return;		
+	}
+	echo LinkInternal("Cancel","?op=rudi&show=awards&cid={$class_id}");
+	OpenTable();
+?>
+
+<tr><th>Name:</th><td><?php $form->textField('name', "", false, "50"); ?></td><tr>
+<tr><th>Image:</th><td><?php ?></td></tr>
+<tr><th>Text:</th><td><?php $form->textArea('text',10,30); ?></td></tr>
+<tr><td><?php $form->submitButton('processed', 'Add'); ?></td></tr>
+
+<?php
+	CloseTable();
+	$form->__destruct();
+?>
+
diff --git a/admin/rudi/views/view.awards.delete.php b/admin/rudi/views/view.awards.delete.php
new file mode 100644
index 0000000..6fde068
--- /dev/null
+++ b/admin/rudi/views/view.awards.delete.php
@@ -0,0 +1,29 @@
+<?php
+  global $db;
+  
+  $result = $db->Query("SELECT `name`, `class_id` FROM `rudi_awards` WHERE `award_id` = '$award_id' LIMIT 1");
+  $award = $db->FetchRow($result);
+  $form = new BayonetForm("", "POST");
+  
+  if(isset($_POST['proceed']))
+  {
+    echo "Award '{$award['name']}', was deleted.";
+    $db->Query("DELETE FROM `rudi_awards` WHERE `award_id` = '$award_id' LIMIT 1");
+    PageRedirect(2, "?op=rudi&show=awards&cid={$award['class_id']}");
+    return;
+  }
+  if(isset($_POST['cancel']))
+  {
+    echo "User cancelled deletion of award: '{$award['name']}'";
+    PageRedirect(2, "?op=rudi&show=awards&cid={$award['class_id']}");
+    return;
+  }
+  
+  OpenTable();
+?>
+  <th>Are you <u>SURE</u> you want to delete the award titled: '<?php echo $award['name'];?>'?<br />All users who have recieved this award will lose it off their records (not yet at least).</th>
+  <tr><th><button name="proceed">Yes</button>&nbsp;&nbsp;&nbsp;<button name="cancel">No</button></th></tr>
+<?php
+	CloseTable();
+	$form->__destruct();
+?>
\ No newline at end of file
diff --git a/admin/rudi/views/view.awards.edit.php b/admin/rudi/views/view.awards.edit.php
index 21ec156..0b82ef6 100644
--- a/admin/rudi/views/view.awards.edit.php
+++ b/admin/rudi/views/view.awards.edit.php
@@ -1,27 +1,27 @@
-<?php 

-	$award = getAward($award_id);

-	$form = new BayonetForm("", "POST");

-	if($form->verifySubmit('processed'))

-	{

-		global $db;

-		$name = $form->request['name'];

-		$text = $form->request['text'];

-		$db->Query("UPDATE `rudi_awards` SET `name` = '$name', `description` = '$text' WHERE `award_id` = '$award_id' LIMIT 1");

-		

-		PageRedirect(1, "?op=rudi&show=awards&award={$award_id}");

-		return;		

-	}

-	echo LinkInternal("Cancel","?op=rudi&show=awards&cid={$award['class_id']}");

-	OpenTable();

-?>

-

-<tr><th>Name:</th><td><?php $form->textField('name', $award['name'], false, "50"); ?></td><tr>

-<tr><th>Image:</th><td><?php ?></td></tr>

-<tr><th>Text:</th><td><?php $form->textArea('text',10,30,$award['description']); ?></td></tr>

-<tr><td><?php $form->submitButton('processed', 'Update'); ?></td></tr>

-

-<?php

-	CloseTable();

-	$form->__destruct();

-?>

-

+<?php 
+	$award = getAward($award_id);
+	$form = new BayonetForm("", "POST");
+	if($form->verifySubmit('processed'))
+	{
+		global $db;
+		$name = $form->request['name'];
+		$text = $form->request['text'];
+		$db->Query("UPDATE `rudi_awards` SET `name` = '$name', `description` = '$text' WHERE `award_id` = '$award_id' LIMIT 1");
+		
+		PageRedirect(1, "?op=rudi&show=awards&award={$award_id}");
+		return;		
+	}
+	echo LinkInternal("Cancel","?op=rudi&show=awards&cid={$award['class_id']}");
+	OpenTable();
+?>
+
+<tr><th>Name:</th><td><?php $form->textField('name', $award['name'], false, "50"); ?></td><tr>
+<tr><th>Image:</th><td><?php ?></td></tr>
+<tr><th>Text:</th><td><?php $form->textArea('text',10,30,$award['description']); ?></td></tr>
+<tr><td><?php $form->submitButton('processed', 'Update'); ?></td></tr>
+
+<?php
+	CloseTable();
+	$form->__destruct();
+?>
+
diff --git a/admin/rudi/views/view.awards.php b/admin/rudi/views/view.awards.php
index b4c912f..3a5729f 100644
--- a/admin/rudi/views/view.awards.php
+++ b/admin/rudi/views/view.awards.php
@@ -1,40 +1,40 @@
-<?php

-		include $basedir.'rudi/includes/functions.awards.php';

-		if(isset($_GET['award'])){

-			$award_id = $_GET['award'];

-			include 'view.awards.edit.php';

-		}else if(isset($_GET['add'])){

-			include 'view.awards.add.php';

-		}else if(isset($_GET['delete'])){

-			$award_id = $_GET['delete'];

-			include 'view.awards.delete.php';

-		}else{

-			echo "<h3>Award Classes</h3>";

-			$classes = getAwardClasses();

-			OpenTable();

-			echo "<tr style=\"text-align:center\">";

-			foreach($classes as $class){

-				echo "<td>".LinkInternal($class['name'],'?op=rudi&show=awards&cid='.$class['class_id'])."</td>";	

-			}

-			echo "</tr>";

-			CloseTable();

-			

-			if(isset($_GET['cid'])){

-				$class_id = $_GET['cid'];

-				$awards = getAwardsByClass($class_id);

-				echo "<h3>Awards</h3>";

-				echo LinkInternal('<img src="images/add.png" />&nbsp;Add New Award','?op=rudi&show=awards&cid={$class_id}&add=true');

-				OpenTable();

-				foreach($awards as $award){

-					echo "<tr><td>".$award['name']."</td>

-						 <td><a href=\"?op=rudi&show=awards&award={$award['award_id']}\">Edit</a></td>

-						 <td><a href=\"?op=rudi&show=awards&delete={$award['award_id']}\">Delete</a></td></tr>";				

-				}

-				CloseTable();

-				//include 'view.members.profile.php';	

-			}else if(isset($_GET['aid'])){

-				$award_id = $_GET['aid'];

-				//include 'view.members.service.php';

-			}

-		}

+<?php
+		include $basedir.'rudi/includes/functions.awards.php';
+		if(isset($_GET['award'])){
+			$award_id = $_GET['award'];
+			include 'view.awards.edit.php';
+		}else if(isset($_GET['add'])){
+			include 'view.awards.add.php';
+		}else if(isset($_GET['delete'])){
+			$award_id = $_GET['delete'];
+			include 'view.awards.delete.php';
+		}else{
+			echo "<h3>Award Classes</h3>";
+			$classes = getAwardClasses();
+			OpenTable();
+			echo "<tr style=\"text-align:center\">";
+			foreach($classes as $class){
+				echo "<td>".LinkInternal($class['name'],'?op=rudi&show=awards&cid='.$class['class_id'])."</td>";	
+			}
+			echo "</tr>";
+			CloseTable();
+			
+			if(isset($_GET['cid'])){
+				$class_id = $_GET['cid'];
+				$awards = getAwardsByClass($class_id);
+				echo "<h3>Awards</h3>";
+				echo LinkInternal('<img src="images/add.png" />&nbsp;Add New Award','?op=rudi&show=awards&cid={$class_id}&add=true');
+				OpenTable();
+				foreach($awards as $award){
+					echo "<tr><td>".$award['name']."</td>
+						 <td><a href=\"?op=rudi&show=awards&award={$award['award_id']}\">Edit</a></td>
+						 <td><a href=\"?op=rudi&show=awards&delete={$award['award_id']}\">Delete</a></td></tr>";				
+				}
+				CloseTable();
+				//include 'view.members.profile.php';	
+			}else if(isset($_GET['aid'])){
+				$award_id = $_GET['aid'];
+				//include 'view.members.service.php';
+			}
+		}
 ?>
\ No newline at end of file
diff --git a/admin/rudi/views/view.battles.list.php b/admin/rudi/views/view.battles.list.php
new file mode 100644
index 0000000..573d422
--- /dev/null
+++ b/admin/rudi/views/view.battles.list.php
@@ -0,0 +1,18 @@
+<?php
+
+	global $db;
+	
+	// get all active members and members that attended the match
+	// each member has a checkbox
+	// -> Use AJAX oncheck to save the status of that member
+	
+	$battle = getBattleInfo($war_id);
+	
+	decho($battle);
+	
+	$members = getCombatSoldiers($war_id);
+	
+	decho($members);
+
+?>
+<h3>Engagement : <?php echo $battle['title']; ?></h3>
\ No newline at end of file
diff --git a/admin/rudi/views/view.battles.php b/admin/rudi/views/view.battles.php
new file mode 100644
index 0000000..d00452e
--- /dev/null
+++ b/admin/rudi/views/view.battles.php
@@ -0,0 +1,36 @@
+<?php
+
+	// list all battles
+	// -> click one to view who was attending (lists everyone in the unit and those attending)
+	// buttons to add/edit/delete battles
+	
+	// definitely gonna use ajax for this...
+	
+	include $basedir.'rudi/includes/functions.battles.php';
+	
+	if(isset($_GET['id'])){
+		$war_id = $_GET['id'];
+		include 'view.battles.list.php';	
+	}else if(isset($_GET['service'])){
+		$member_id = $_GET['service'];
+		include 'view.members.service.php';
+	}else{
+		
+		// list all battles
+		$battles = getAllBattles();
+		decho($battles);
+		
+?>			 
+			 <h3>Unit Engagement:</h3>
+			 <table width="100%" style="text-align:center;">
+			 <tr><th>Title</th><th>Opponent</th><th>Result</th><th>Date</th></tr>
+<?php
+		foreach($battles as $battle){
+			echo "<tr><td><a href=\"?op=rudi&show=battles&id={$battle['war_id']}\">{$battle['title']}</a></td><td>vs {$battle['name']}</td><td>{$battle['status']} {$battle['home_score']}-{$battle['visit_score']}</td><td>";
+			echo date("M j Y", strtotime($battle['date']));
+			echo "</td><tr>";
+			
+		}
+		CloseTable();
+	}
+?>
\ No newline at end of file
diff --git a/admin/rudi/views/view.members.award.php b/admin/rudi/views/view.members.award.php
index cda8595..db6f88e 100644
--- a/admin/rudi/views/view.members.award.php
+++ b/admin/rudi/views/view.members.award.php
@@ -1,19 +1,22 @@
-<?php

-	global $db;

-	$result = $db->Query("SELECT `first_name`, `last_name` FROM `rudi_unit_members` WHERE `member_id` = '$member_id' LIMIT 1");

-	$member = $db->FetchRow($result);

-	echo "<h3>Award Record of {$member['first_name']} {$member['last_name']}</h3>";

-		

-	if(isset($_GET['edit'])){

-		$record_id = $_GET['edit'];

-		EditAwardRecord($record_id);

-	}else if(isset($_GET['add'])){

-		if($_GET['add']){

-			AddAwardRecord($_GET['award']);

-		}

-	}else{

-	

-		echo "<div style=\"text-align:left;\">".LinkInternal('Back to Roster', '?op=rudi&show=members')."</div>";

-		ListAwardRecord($_GET['award']);

-	}

+<?php
+	global $db;
+	$result = $db->Query("SELECT `first_name`, `last_name` FROM `rudi_unit_members` WHERE `member_id` = '$member_id' LIMIT 1");
+	$member = $db->FetchRow($result);
+	echo "<h3>Award Record of {$member['first_name']} {$member['last_name']}</h3>";
+		
+	if(isset($_GET['edit'])){
+		$record_id = $_GET['edit'];
+		EditAwardRecord($record_id);
+	}else if(isset($_GET['add'])){
+		if($_GET['add']){
+			AddAwardRecord($_GET['award']);
+		}
+	}else if(isset($_GET['delete'])){
+		$record_id = $_GET['delete'];
+		DeleteAwardRecord($record_id);
+	}else{
+	
+		echo "<div style=\"text-align:left;\">".LinkInternal('Back to Roster', '?op=rudi&show=members')."</div>";
+		ListAwardRecord($_GET['award']);
+	}
 ?>
\ No newline at end of file
diff --git a/admin/rudi/views/view.members.new.php b/admin/rudi/views/view.members.new.php
new file mode 100644
index 0000000..cbc086f
--- /dev/null
+++ b/admin/rudi/views/view.members.new.php
@@ -0,0 +1,179 @@
+<?php

+		 global $db;

+		 

+		 if(isset($_POST['processed'])){

+		 	

+	 		echo "Please wait while the information is processed...";

+		 	

+		 	$rank_id = $_POST['rank'];

+		 	$country_id = $_POST['country'];

+		 	$status_id = $_POST['status'];

+		 	$role_id = $_POST['role'];

+		 	$unit_id = $_POST['unit'];

+			$weapon_id = $_POST['weapon'];

+		 	$first_name = addslashes($_POST['first']);

+		 	$last_name = addslashes($_POST['last']);

+		 	$username = addslashes($_POST['username']);

+		 	$city = addslashes($_POST['city']);

+		 	$province = addslashes($_POST['province']);

+		 	$primary_mos = addslashes($_POST['primmos']);		 	

+		 	$enlisted = addslashes($_POST['enlist']);

+		 	$promoted = addslashes($_POST['promote']);

+		 	$discharged = addslashes($_POST['discharge']);

+		 	$xfire = addslashes($_POST['xfire']);

+		 	$email = addslashes($_POST['email']);

+		 	$bio = addslashes($_POST['bio']);

+		 	

+		 	//$discharged = empty($discharged) ? NULL : "'{$discharged}'";

+

+ 			$query = "INSERT INTO `rudi_unit_members` SET"

+			 		." `rank_id` = '$rank_id',"

+			 		." `country_id` = '$country_id',"

+					." `status_id` = '$status_id',"

+					." `cunit_id` = '$unit_id',"

+					." `weapon_id` = '$weapon_id',"

+					." `username` = '$username',"

+					." `email` = '$email',"

+					." `xfire` = '$xfire',"

+					." `first_name` = '$first_name',"

+					." `last_name` = '$last_name',"

+					." `location_city` = '$city',"

+					." `location_province` = '$province',"

+					." `bio` = '$bio',"

+					." `date_enlisted` = '$enlisted',"

+					." `date_promotion` = '$promoted',"

+					." `primary_mos` = '$primary_mos',";

+			if(empty($discharged))

+				$query = $query." `date_discharged` = null";

+			else

+				$query = $query." `date_discharged` = '$discharged'";	

+			decho($query);

+		 	$db->Query($query);

+		 	

+		 	$member_id = $db->InsertID();

+		 	decho($member_id);

+		 	$db->Query("INSERT INTO `rudi_roles_container` SET `role_id` = '$role_id', `member_id` = '$member_id'");

+		 	

+		 	PageRedirect(1, "?op=rudi&show=members");

+		 	return;		 

+		 } 	

+?>

+		<a href="?op=rudi&show=members">Cancel</a><br />

+		<form method="POST" action="">

+		<table width="100%" style="text-align:center;">

+		<tr><th colspan="2" style="background-color:#c4c4c4;">Personnel File of <?php echo $member['first_name']." ".$member['last_name']; ?></th></tr>

+		<tr><td class="right" width="50%">Rank:</td><td class="left">

+			<select name="rank">

+<?php		$ranks = GetRanks();

+			foreach($ranks as $rank){

+				echo "<option value=\"{$rank['rank_id']}\">{$rank['longname']}</option>";			

+			}

+?>

+			</select>

+		</td></tr>

+		<tr><td class="right">Country:</td><td class="left">

+			<select name="country">

+<?php		$countries = GetCountry();

+			foreach($countries as $country){

+				echo "<option value=\"{$country['country_id']}\">{$country['name']}</option>";			

+			}

+?>

+			</select>

+		</td></tr>

+		</table>

+		<table width="100%" style="text-align:center;">

+		<tr><th colspan="2" style="background-color:#c4c4c4;">Vital Statistics</th></tr>

+		<tr>

+			<td class="right" width="50%">First:</td>

+			<td class="left"><input type="text" name="first" value="" /></td>

+		</tr>

+		<tr>

+			<td class="right">Last:</td>

+			<td class="left"><input type="text" name="last" value="" /></td>

+		</tr>

+		<tr><td class="right">Username:</td><td class="left"><input type="text" name="username" value="" /></td></tr>

+		<tr><td class="right">City:</td><td class="left"><input type="text" name="city" value=""/></td></tr>

+		<tr><td class="right">Province:</td><td class="left"><input type="text" name="province" value="" /></td></tr>

+		<tr><td class="right">Status:</td><td class="left">

+			<select name="status">

+<?php		$statuses = GetStatuses();

+			foreach($statuses as $status){

+				echo "<option value=\"{$status['status_id']}\">{$status['name']}</option>";			

+			}

+?>

+		</select>

+		</td></tr>

+		<tr><td class="right">Primary MOS:</td><td class="left"><input type="text" name="primmos" value="" /></td></tr>

+		<tr>

+			<td class="right">Role:</td>

+			<td class="left">

+			<select name="role">

+<?php

+			$roles = GetRoles();	

+			foreach($roles as $role){

+				echo "<option value=\"{$role['role_id']}\">{$role['name']}</option>";			

+			}

+?>

+				</select>

+			</td>

+		</tr>

+		<tr>

+			<td class="right" style="font-weight:bold;">Unit:</td>

+			<td class="left">

+			<select name="unit">

+		    	<option value="0">N/A</option>

+<?php

+					$result = $db->Query("SELECT `unit_id`, `name` FROM `rudi_combat_units` WHERE `detachment` = 0 ");

+	    			$row = $db->Fetch($result);

+	    			foreach($row as $unit){

+	    				$unit_name = $unit['name'];

+	    				$unit_id = $unit['unit_id'];

+						if($member['cunit_id']==$unit_id)

+	    					echo '<option value="'.$unit_id.'" selected>'.$unit_name.'</option>';

+	       				else

+ 							echo '<option value="'.$unit_id.'">'.$unit_name.'</option>';

+						selectUnits($unit_id, 0, $member['cunit_id']);

+					}

+?>

+		    	</select>

+			</td>

+		</tr>

+		<tr><td class="right">Weapons:</td><td class="left">

+			<select name="weapon">

+<?php		$weapons = GetWeapons();

+			foreach($weapons as $weapon){

+				echo "<option value=\"{$weapon['weapon_id']}\">{$weapon['model']}</option>";			

+			}

+?>

+		</select>

+		</td></tr>

+		<tr>

+			<td class="right">Enlisted Date:</td>

+			<td class="left"><input type="text" name="enlist" value="" /></td>

+		</tr>

+		<tr>

+			<td class="right">Promotion Date:</td>

+			<td class="left">

+				<input type="text" name="promote" value="" />

+			</td>

+		</tr>

+		<tr>

+			<td class="right">Discharge Date:</td>

+			<td class="left"><input type="text" name="discharge" value="" /></td>

+		</tr>

+		<tr>	

+			<td class="right">Xfire:</td>

+			<td class="left"><input type="text" name="xfire" value=""/></td>

+		</tr>

+		<tr>

+			<td class="right">E-Mail:</td>

+			<td class="left"><input type="text" name="email" value=""/></td>

+		</tr>

+		</table>

+		<br />

+		<table width="100%" style="text-align:center;">

+		<tr><th colspan="2" style="background-color:#c4c4c4;">Personal Bio</th></tr>

+		<tr><td><textarea rows="7" name="bio" cols="60"></textarea></td></tr>

+		<tr><td colspan="2"><input type="submit" value="Submit" name="processed" /></td>

+		</table>

+		</form>
\ No newline at end of file
diff --git a/admin/rudi/views/view.members.php b/admin/rudi/views/view.members.php
index 38929df..9013b8e 100644
--- a/admin/rudi/views/view.members.php
+++ b/admin/rudi/views/view.members.php
@@ -9,13 +9,18 @@
 		}else if(isset($_GET['award'])){
 			$member_id = $_GET['award'];
 			include 'view.members.award.php';
+		}else if(isset($_GET['create']) && $_GET['create'] == "soldier"){
+			include 'view.members.new.php';
 		}else{
 					
 			 global $db;
 			 
-			 echo "<h3>Current Members</h3>";
-			 echo "<table width=\"100%\" style=\"text-align:center;\">";
-			 echo "<tr><th>Rank</th><th>Soldier</th><th>Main Info</th><th>Service Record</th><th>Medal Record</th></tr>";
+			 echo LinkInternal('New Soldier','?op=rudi&show=members&create=soldier');
+?>			 
+			 <h3>Current Members</h3>
+			 <table width="100%" style="text-align:center;">
+			 <tr><th>Rank</th><th>Soldier</th><th>Main Info</th><th>Service Record</th><th>Medal Record</th></tr>
+<?php
 			 $result = $db->Query("SELECT * FROM `rudi_unit_members` JOIN `rudi_ranks` ON rudi_unit_members.rank_id=rudi_ranks.rank_id WHERE rudi_unit_members.status_id <= 3 ORDER BY rudi_ranks.weight DESC , rudi_unit_members.date_promotion ASC , rudi_unit_members.date_enlisted ASC");
 			 $row = $db->Fetch($result);
 			 
@@ -28,10 +33,11 @@
 				echo "<tr>";	 
 			 }
 			 CloseTable();
-			 
-			 echo "<h3>Previous Members</h3>";
-			 echo "<table width=\"100%\" style=\"text-align:center;\">";
-			 echo "<tr><th>Rank</th><th>Soldier</th><th>Main Info</th><th>Service Record</th><th>Medal Record</th></tr>";
+?>
+			 <h3>Previous Members</h3>
+			 <table width="100%" style="text-align:center;">
+			 <tr><th>Rank</th><th>Soldier</th><th>Main Info</th><th>Service Record</th><th>Medal Record</th></tr>
+<?php
 			 $result = $db->Query("SELECT * FROM `rudi_unit_members` JOIN `rudi_ranks` ON rudi_unit_members.rank_id=rudi_ranks.rank_id WHERE rudi_unit_members.status_id > 3 ORDER BY rudi_ranks.weight DESC, rudi_unit_members.date_promotion ASC, rudi_unit_members.date_enlisted ASC");
 			 $row = $db->Fetch($result);
 			 
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){
@@ -165,6 +180,19 @@
 ?>
 		</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>
 		<tr>
 			<td class="right">Enlisted Date:</td>
 			<td class="left"><input type="text" name="enlist" value="<?php echo !empty($member['date_enlisted']) ? date('Y-m-d', strtotime($member['date_enlisted'])) : ""; ?>" /></td>
diff --git a/admin/rudi/views/view.units.php b/admin/rudi/views/view.units.php
index 2ccf35a..ab3dedd 100644
--- a/admin/rudi/views/view.units.php
+++ b/admin/rudi/views/view.units.php
@@ -1,22 +1,29 @@
-<?php

-	include $basedir.'rudi/includes/functions.units.php';

-	if(isset($_GET['unit'])){

-			

-	}else{

-		//list units	

-		DisplayUnits();

-		

-	}

-

-

-?>

-<div style="text-align:left;">

-<img src="images/tree_branch.gif" />&nbsp;Kilo Company<br />

-<img src="images/tree_blank.gif" /><img src="images/tree_branch.gif" />&nbsp;1st Platoon<br />

-<img src="images/tree_blank.gif" /><img src="images/tree_blank.gif" /><img src="images/tree_branch.gif" />&nbsp;1st Squad<br />

-<img src="images/tree_blank.gif" /><img src="images/tree_blank.gif" /><img src="images/tree_leaf.gif" /><img src="images/tree_branch.gif" />&nbsp;Fireteam Alpha<br />

-<img src="images/tree_blank.gif" /><img src="images/tree_blank.gif" /><img src="images/tree_leaf.gif" /><img src="images/tree_branch.gif" />&nbsp;Fireteam Bravo<br />

-<img src="images/tree_blank.gif" /><img src="images/tree_blank.gif" /><img src="images/tree_branch.gif" />&nbsp;2nd Squad<br />

-<img src="images/tree_blank.gif" /><img src="images/tree_blank.gif" /><img src="images/tree_blank.gif" /><img src="images/tree_branch.gif" />&nbsp;Fireteam Alpha<br />

-<img src="images/tree_blank.gif" /><img src="images/tree_blank.gif" /><img src="images/tree_blank.gif" /><img src="images/tree_branch.gif" />&nbsp;Fireteam Bravo<br />

-</div>
\ No newline at end of file
+<h3>Unit Structure</h3>
+<center>
+<?php
+	include $basedir.'rudi/includes/functions.units.php';
+	if(isset($_GET['unit'])){
+			
+	}else{
+		//list units
+		echo '<div style="text-align:left; width:300px;">';	
+		DisplayUnits();
+		echo '</div>';
+		
+	}
+
+
+?>
+</center>
+<!--
+<div style="text-align:left;">
+<img src="images/tree_branch.gif" />&nbsp;Kilo Company<br />
+<img src="images/tree_blank.gif" /><img src="images/tree_branch.gif" />&nbsp;1st Platoon<br />
+<img src="images/tree_blank.gif" /><img src="images/tree_blank.gif" /><img src="images/tree_branch.gif" />&nbsp;1st Squad<br />
+<img src="images/tree_blank.gif" /><img src="images/tree_blank.gif" /><img src="images/tree_leaf.gif" /><img src="images/tree_branch.gif" />&nbsp;Fireteam Alpha<br />
+<img src="images/tree_blank.gif" /><img src="images/tree_blank.gif" /><img src="images/tree_leaf.gif" /><img src="images/tree_branch.gif" />&nbsp;Fireteam Bravo<br />
+<img src="images/tree_blank.gif" /><img src="images/tree_blank.gif" /><img src="images/tree_branch.gif" />&nbsp;2nd Squad<br />
+<img src="images/tree_blank.gif" /><img src="images/tree_blank.gif" /><img src="images/tree_blank.gif" /><img src="images/tree_branch.gif" />&nbsp;Fireteam Alpha<br />
+<img src="images/tree_blank.gif" /><img src="images/tree_blank.gif" /><img src="images/tree_blank.gif" /><img src="images/tree_branch.gif" />&nbsp;Fireteam Bravo<br />
+</div>
+-->
\ No newline at end of file