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

1 files changed, 43 insertions, 21 deletions

diff --git a/modules/rudi/views/view.profile.php b/modules/rudi/views/view.profile.php
index 6135ea4..97adead 100644
--- a/modules/rudi/views/view.profile.php
+++ b/modules/rudi/views/view.profile.php
@@ -1,10 +1,14 @@
 <?php
 //define('BLOCK_RIGHT_DISABLE','block_right_disable');
 $member =& $this->data[$_GET['profile']];
-$uniform_image = $member->first_name[0].str_replace(array("'", "\""), "", $member->last_name).".png";
+$uniform_image = "modules/rudi/images/uniform/".$member->first_name[0].str_replace(array("'", "\""), "", $member->last_name).".png";
 decho($member);
 define('BLOCK_RIGHT_DISABLE', true);
+
+$arrUnits = $this->getUnitArr($_GET['profile']);
+decho($arrUnits);
 ?>
+
 <style type="text/css">
 
 
@@ -15,7 +19,13 @@ define('BLOCK_RIGHT_DISABLE', true);
     <th class="header">Viewing Profile of: <?php echo $member->rank_long . " " . $member->first_name . " " . $member->last_name; ?></th>
   </tr>
   <tr>
-    <td><center><img src="modules/rudi/images/uniform/<?php echo $uniform_image; ?>" />&nbsp;</center></td>
+    <td><center>
+<?php
+		if(file_exists($uniform_image)){
+			echo '<img src="'.$uniform_image.'" />';		
+		}
+?>
+		&nbsp;</center></td>
   </tr>
   <tr>
     <td><table width="100%" border="0" cellpadding="1">
@@ -23,11 +33,18 @@ define('BLOCK_RIGHT_DISABLE', true);
           <td width="20%">
             <table width="100%" border="0" cellpadding="5" align="center" style="border: 0px;">
            	  <tr>
-           	  	<td><center><?php echo $member->primary_mos; ?></center></td>
+           	  	<td><center><span style="font-weight: bold; font-size: 16px; font-family: arial;"><?php echo $member->primary_mos; ?></span></center></td>
    	  		  </tr>
               <tr>
-                <td><center><img src="modules/rudi/images/ranks/large/<?php echo $member->rank_image; ?>" />&nbsp;</center></td>
-              </tr>
+                <td><center>
+			<?php 
+			  	if(file_exists("modules/rudi/images/ranks/large/{$member->rank_image}")){
+          		   	echo "<img src=\"modules/rudi/images/ranks/large/{$member->rank_image}\" alt=\"{$member->rank_short}\" />";       	
+          		}else{
+          			echo $member->rank_short;       		
+          		}
+		  	?>
+              </center></td></tr>
               <tr>
                 <td><center><img src="modules/rudi/images/flags/<?php echo $member->country_image; ?>" />&nbsp;</center></td>
               </tr>
@@ -38,12 +55,12 @@ define('BLOCK_RIGHT_DISABLE', true);
               <tr>
                 <th class="header" scope="row">Location</th>
                 <td class="info"><?php echo $this->evalData($member->location); ?>&nbsp;</td>
-                <th class="header">Superior</th>
+                <th class="header">Reports To</th>
                 <td class="info"><?php
-                if(!is_null($member->superior_next->leader_id))
-                  echo "<a href=\"?load=rudi&profile={$member->superior_next->leader_id}\">";
+                if(!is_null($member->superior->leader_id))
+                  echo "<a href=\"?load=rudi&profile={$member->superior->leader_id}\">";
                 
-                echo $this->evalData($member->superior_next->name);      
+                echo $this->evalData($member->superior->name);      
                 echo "</a>&nbsp;";
                   ?>
                   </td>
@@ -52,23 +69,27 @@ define('BLOCK_RIGHT_DISABLE', true);
                 <th class="header" scope="row">Status</th>
                 <td class="info"><?php echo $this->evalData($member->status); ?>&nbsp;</td>
                 <th class="header">Position</th>
-                <td class="info"><?php echo $this->evalData($member->position); ?>&nbsp;</td>
+                <td class="info"><?php echo $this->evalData($member->role_name); ?>&nbsp;</td>
               </tr>
               <tr> 
                 <th class="header" scope="row">Unit</th>
-                <td class="info"><?php echo $this->evalData($member->unit_name); ?>&nbsp;</td>
+                <td class="info"><?php echo $this->evalData($arrUnits[0]['name']); ?>&nbsp;</td>
                 <th class="header">Weapon</th>
-                <td class="info"><?php echo $this->evalData($member->weapon_name); ?>&nbsp;</td>
+                <td class="info"><?php echo $this->evalData($member->weapon_model); ?>&nbsp;
+						<?php if($member->weapon2_model != NULL)
+								 echo "/&nbsp;&nbsp;".$member->weapon2_model;
+					 	?>
+				</td>
               </tr>
               <tr>
                 <th class="header" scope="row">Platoon</th>
-                <td class="info"><?php echo $this->evalData($member->platoon_name); ?>&nbsp;</td>
+                <td class="info"><?php echo $this->evalData($arrUnits[1]['name']); ?>&nbsp;</td>
                 <th class="header" scope="row">Enlisted</th>
                 <td class="info"><?php echo $this->evalData($member->enlist_date); ?>&nbsp;</td>                
               </tr>
               <tr>
                 <th class="header" scope="row">Squad</th>
-                <td class="info"><?php echo $this->evalData($member->squad_name); ?>&nbsp;</td>
+                <td class="info"><?php echo $this->evalData($arrUnits[2]['name']); ?>&nbsp;</td>
                 <th class="header">Time In Service</th>
                   <?php if($member->discharge_date): ?>
                     <td class="info"><?php echo $this->getDiffTime($member->enlist_date_st, $member->discharge_date); ?>&nbsp;</td>
@@ -79,7 +100,7 @@ define('BLOCK_RIGHT_DISABLE', true);
               </tr>
               <tr>
                 <th class="header">Team</th>
-                <td class="info"><?php echo $this->evalData($member->team_name); ?>&nbsp;</td>
+                <td class="info"><?php echo $this->evalData($arrUnits[3]['name']); ?>&nbsp;</td>
                 <th class="header">Time In Grade</th>
                 <?php if($member->discharge_date): ?>
                 	<td class="info"><?php echo $this->getDiffTime($member->promo_date_st, $member->discharge_date); ?>&nbsp;</td>
@@ -122,7 +143,7 @@ define('BLOCK_RIGHT_DISABLE', true);
         <?php foreach($member->service_record as $record): ?>
         <tr>
           <th class="header" width="25%"><?php echo date('M j, Y', strtotime($record->date_added)); ?>&nbsp;</th>
-          <td><?php echo $record->record_note; ?>&nbsp;</td>
+          <td style="text-align:left; padding-left: 10px;"><?php echo $record->record_note; ?>&nbsp;</td>
         </tr>
         <?php endforeach; ?>
         <?php endif; ?>
@@ -142,9 +163,9 @@ define('BLOCK_RIGHT_DISABLE', true);
         <?php foreach($member->award_record as $record): ?>
         <tr>
           <th class="header" width="25%"><?php echo date('M j, Y', strtotime($record->date_added)); ?>&nbsp;</th>
-          <td ><?php echo $this->evalData($record->award_name); ?>&nbsp;</td>
+          <td style="text-align:left; padding-left: 10px;" ><?php echo $this->evalData($record->award_name); ?>&nbsp;</td>
           <td style="vertical-align:middle;"><center><img src="modules/rudi/images/medals/<?php echo $record->image; ?>"/></center></td>
-          <td width="40%"><?php echo $record->record_note; ?>&nbsp;</td>
+          <td width="40%" style="text-align:left; padding-left: 10px;"><?php echo $record->record_note; ?>&nbsp;</td>
         </tr>
         <?php endforeach; ?>
         <?php endif; ?>
@@ -155,7 +176,7 @@ define('BLOCK_RIGHT_DISABLE', true);
       
             <table width="100%" border="0" cellpadding="1" id="thin">
         <tr>
-          <th class="header" scope="col" colspan="3">Combat Record</th>
+          <th class="header" scope="col" colspan="4">Combat Record</th>
         </tr>
         <tr>
        	<?php if($this->evalData($member->combat_record)):?>
@@ -163,9 +184,10 @@ define('BLOCK_RIGHT_DISABLE', true);
         <?php else:?>
         <?php foreach($member->combat_record as $record): ?>
         <tr>
-          <th class="header" width="25%"><?php echo date('M j, Y', strtotime($record->date_added)); ?>&nbsp;</th>
+          <th class="header" width="25%"><?php echo date('M j, Y', strtotime($record->date)); ?>&nbsp;</th>
           <td><a href="<?php echo $record->website; ?>"><?php echo $record->name; ?></a>&nbsp;</td>
-          <td><?php echo $record->status; ?>&nbsp;</td>
+          <td><?php echo $record->title; ?>&nbsp;</td>
+          <td><?php echo $record->status . ' '. $record->home_score . '-' . $record->visit_score; ?>&nbsp;</td>
         </tr>
         <?php endforeach; ?>
         <?php endif; ?>