added images in the ingame part, added config properties & fixed time bug in queues page

code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket.php

@@ -246,6 +246,7 @@ class Ticket{
         }
         $this->title = $values['Title'];
         $this->status = $values['Status'];
+        $this->timestamp = $values['Timestamp'];
         $this->queue = $values['Queue'];
         $this->ticket_category = $values['Ticket_Category'];
         $this->author = $values['Author'];

code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_ticket_info.tpl

@@ -62,25 +62,33 @@
 							    <tr><td>
 							    <p><h3>Ingame related</h3></p>
 							    <table cellpadding="3" width="100%">
+								<tr><td></td><td></td></tr>
 								<tr>
+								    <td width=30><img src="{$WEBPATH}/ams_lib/img/info/shard.png"/></td>
 								    <td><font color="{$info_color}">Shard ID: </font>{$shard_id}</td>
 								</tr>
 								<tr>
+								    <td width=30><img src="{$WEBPATH}/ams_lib/img/info/user.png"/></td>
 								    <td><font color="{$info_color}">User_Id:  </font>{$user_id}</td>
 								</tr>
 								<tr>
+								    <td width=30><img src="{$WEBPATH}/ams_lib/img/info/position.png"/></td>
 								    <td><font color="{$info_color}">User Position: </font>{$user_position}</td> 
 							        </tr>
 								<tr>
+								    <td width=30><img src="{$WEBPATH}/ams_lib/img/info/view.png"/></td>
 								    <td><font color="{$info_color}">View Position: </font>{$view_position}</td>
 								</tr>
 								<tr>
+								    <td width=30><img src="{$WEBPATH}/ams_lib/img/info/client.png"/></td>
 								    <td><font color="{$info_color}">Client_Version: </font>{$client_version}</td>
 								</tr>
 								<tr>
+								    <td width=30><img src="{$WEBPATH}/ams_lib/img/info/patch.png"/></td>
 								    <td><font color="{$info_color}">Patch_Version:  </font>{$patch_version}</td>                  
 								</tr>
 								<tr>
+								    <td><img src="{$WEBPATH}/ams_lib/img/info/server.png"/></td>
 								    <td><font color="{$info_color}"> Server_Tick:  </font>{$server_tick}</td>
 								</tr>
 							    </table>
@@ -92,25 +100,33 @@
 							    <tr><td>
 							    <p><h3>Hardware & Software related</h3></p>
 							    <table cellpadding="3" width="100%">
+								<tr><td></td><td></td></tr>
 								<tr>
+								    <td width=30><img src="{$WEBPATH}/ams_lib/img/info/memory.png"/></td>
 								    <td><font color="{$info_color}">Memory: </font>{$memory}</td>
 								</tr>
 								<tr>
+								    <td width=30><img src="{$WEBPATH}/ams_lib/img/info/processor.png"/></td>
 								    <td><font color="{$info_color}">Processor:  </font>{$processor}</td>
 								</tr>
 								<tr>
+								    <td width=30><img src="{$WEBPATH}/ams_lib/img/info/cpuid.png"/></td>
 								    <td><font color="{$info_color}">Cpu_Id: </font>{$cpu_id}</td> 
 							        </tr>
 								<tr>
+								    <td width=30><img src="{$WEBPATH}/ams_lib/img/info/mask.png"/></td>
 								    <td><font color="{$info_color}">Cpu_Mask: </font>{$cpu_mask}</td>
 								</tr>
 								<tr>
+								    <td width=30><img src="{$WEBPATH}/ams_lib/img/info/ht.png"/></td>
 								    <td><font color="{$info_color}">HT: </font>{$ht}</td>
 								</tr>
 								<tr>
+								    <td width=30><img src="{$WEBPATH}/ams_lib/img/info/os.png"/></td>
 								    <td><font color="{$info_color}">OS: </font>{$os}</td>                  
 								</tr>
 								<tr>
+								    <td width=30><img src="{$WEBPATH}/ams_lib/img/info/nel.png"/></td>
 								    <td><font color="{$info_color}">NeL3D: </font>{$nel3d}</td>
 								</tr>
 							    </table>
@@ -122,10 +138,13 @@
 							    <tr><td>
 							    <p><h3>Network related</h3></p>
 							    <table cellpadding="3" width="100%">
+								<tr><td></td><td></td></tr>
 								<tr>
+								    <td width=30><img src="{$WEBPATH}/ams_lib/img/info/connect.png"/></td>
 								    <td><font color="{$info_color}">Connect_State: </font>{$connect_state}</td>
 								</tr>
 								<tr>
+								    <td width=30><img src="{$WEBPATH}/ams_lib/img/info/local.png"/></td>
 								    <td><font color="{$info_color}">Local_Address:  </font>{$local_address}</td>
 								</tr>
 							    </table>

code/ryzom/tools/server/ryzom_ams/www/config.php

@@ -73,6 +73,7 @@ $AMS_LIB = dirname( dirname( __FILE__ ) ) . '/ams_lib';
 $AMS_TRANS = $AMS_LIB . '/translations';
 $AMS_CACHEDIR = $AMS_LIB . '/cache';
 $SITEBASE = dirname( __FILE__ ) . '/html/' ;
+$WEBPATH ='http://localhost:40917' ;
 
 //defines the default language
 $DEFAULT_LANGUAGE = 'en';

code/ryzom/tools/server/ryzom_ams/www/html/inc/show_queue.php

@@ -83,7 +83,6 @@ function show_queue(){
             
             //if queue_view is a valid parameter value
             if ($queueArray != "ERROR"){
-
                 $result['tickets'] = Gui_Elements::make_table($queueArray, Array("getTId","getTitle","getTimestamp","getAuthor()->getExternId","getTicket_Category()->getName","getStatus","getStatusText","getAssigned","getForwardedGroupName","getForwardedGroupId"), Array("tId","title","timestamp","authorExtern","category","status","statusText","assigned","forwardedGroupName","forwardedGroupId"));
                 $i = 0;
                 foreach( $result['tickets'] as $ticket){

code/ryzom/tools/server/ryzom_ams/www/html/inc/show_ticket_info.php

@@ -31,8 +31,8 @@ function show_ticket_info(){
             $result['ht'] = $ticket_info->getHT();
             $result['nel3d'] = $ticket_info->getNel3D();
             $result['user_id'] = $ticket_info->getUser_Id();
-            global $SITEBASE;
+            global $WEBPATH;
-            $result['SITEBASE'] = $SITEBASE;
+            $result['WEBPATH'] = $WEBPATH;
             
             if(Ticket_User::isMod($_SESSION['ticket_user'])){
                 $result['isMod'] = "TRUE";

code/ryzom/tools/server/ryzom_ams/www/html/templates/show_ticket_info.tpl

@@ -17,61 +17,61 @@
 				<td><center><strong> Ingame related </strong></center></td>
 			    </tr>
 			    <tr>
-				<td><img src="img/info/shard.png" height="30" /><strong> Shard ID: </strong>{$shard_id}</td>
+				<td><img src="{$WEBPATH}/ams_lib/img/info/shard.png"/><strong> Shard ID: </strong>{$shard_id}</td>
 			    </tr>
 			    <tr>
-				<td><img src="img/info/user.png" height="30" /><strong> User_Id: </strong>{$user_id}</td>
+				<td><img src="{$WEBPATH}/ams_lib/img/info/user.png"/><strong> User_Id: </strong>{$user_id}</td>
 			    </tr>   
 			    <tr>
-				<td><img src="img/info/position.png" height="30" /><strong> User Position: </strong>{$user_position}</td>
+				<td><img src="{$WEBPATH}/ams_lib/img/info/position.png"/><strong> User Position: </strong>{$user_position}</td>
 			    </tr>
 			    <tr>
-				<td><img src="img/info/view.png" height="30" /><strong> View Position: </strong>{$view_position}</td>
+				<td><img src="{$WEBPATH}/ams_lib/img/info/view.png"/><strong> View Position: </strong>{$view_position}</td>
 			    </tr>
     
 			    <tr>
-				<td><img src="img/info/client.png" height="30" /><strong> Client_Version: </strong> {$client_version}</td>              
+				<td><img src="{$WEBPATH}/ams_lib/img/info/client.png"/><strong> Client_Version: </strong> {$client_version}</td>              
 			    </tr>
 			    <tr>
-				<td><img src="img/info/patch.png" height="30" /><strong> Patch_Version: </strong>{$patch_version}</td>
+				<td><img src="{$WEBPATH}/ams_lib/img/info/patch.png"/><strong> Patch_Version: </strong>{$patch_version}</td>
 			    </tr>
 			    <tr>
-				<td><img src="img/info/server.png" height="30" /><strong> Server_Tick: </strong>{$server_tick}</td>
+				<td><img src="{$WEBPATH}/ams_lib/img/info/server.png"/><strong> Server_Tick: </strong>{$server_tick}</td>
 			    </tr>
 			    <tr class="alert alert-info">
 				<td><center><strong> Hardware & Software related </strong></center></td>
 			    </tr>
 			    <tr>
-				<td><strong><img src="img/info/memory.png" height="30" /> Memory: </strong>{$memory}</td>
+				<td><strong><img src="{$WEBPATH}/ams_lib/img/info/memory.png"/> Memory: </strong>{$memory}</td>
 			    </tr>
 			    <tr>
-				<td><img src="img/info/processor.png" height="30" /><strong> Processor: </strong>{$processor}</td>
+				<td><img src="{$WEBPATH}/ams_lib/img/info/processor.png"/><strong> Processor: </strong>{$processor}</td>
 			    </tr>
 			    <tr>
-				<td><img src="img/info/cpuid.png" height="30" /><strong> Cpu_Id: </strong>{$cpu_id}</td>
+				<td><img src="{$WEBPATH}/ams_lib/img/info/cpuid.png"/><strong> Cpu_Id: </strong>{$cpu_id}</td>
 			    </tr>			
 			    <tr>
-				<td><img src="img/info/mask.png" height="30" /><strong> Cpu_Mask: </strong>{$cpu_mask}</td>
+				<td><img src="{$WEBPATH}/ams_lib/img/info/mask.png"/><strong> Cpu_Mask: </strong>{$cpu_mask}</td>
 			    </tr>
 			    
 			     <tr>
-				<td><img src="img/info/ht.png" height="30" /><strong> HT: </strong>{$ht}</td>
+				<td><img src="{$WEBPATH}/ams_lib/img/info/ht.png"/><strong> HT: </strong>{$ht}</td>
 			    </tr>
 			    <tr>
-				<td><img src="img/info/os.png" height="30" /><strong> OS: </strong>{$os}</td>
+				<td><img src="{$WEBPATH}/ams_lib/img/info/os.png"/><strong> OS: </strong>{$os}</td>
 			    </tr>
 			    <tr>
-				<td><img src="img/info/nel.png" height="30" /><strong> NeL3D: </strong>{$nel3d}</td>
+				<td><img src="{$WEBPATH}/ams_lib/img/info/nel.png"/><strong> NeL3D: </strong>{$nel3d}</td>
 			    </tr>
 			    
 			    <tr class="alert alert-info">
 				<td><center><strong> Network related </strong></center></td>
 			    </tr>
 			    <tr>
-				<td><img src="img/info/connect.png" height="30" /><strong> Connect_State: </strong>{$connect_state}</td>
+				<td><img src="{$WEBPATH}/ams_lib/img/info/connect.png"/><strong> Connect_State: </strong>{$connect_state}</td>
 			    </tr>
 			    <tr>
-				<td><img src="img/info/local.png" height="30" /><strong> Local_Address: </strong>{$local_address}</td>
+				<td><img src="{$WEBPATH}/ams_lib/img/info/local.png"/><strong> Local_Address: </strong>{$local_address}</td>
 			    </tr>
 			   
 		    </table>