diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket.php b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket.php index 321409b24..e263ff700 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket.php +++ b/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']; diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/client.png b/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/client.png new file mode 100755 index 000000000..d9c327ad5 Binary files /dev/null and b/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/client.png differ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/connect.png b/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/connect.png similarity index 100% rename from code/ryzom/tools/server/ryzom_ams/www/html/img/info/connect.png rename to code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/connect.png diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/cpuid.png b/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/cpuid.png new file mode 100755 index 000000000..019d08bef Binary files /dev/null and b/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/cpuid.png differ diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/ht.png b/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/ht.png new file mode 100755 index 000000000..5bc1cfd1d Binary files /dev/null and b/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/ht.png differ diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/local.png b/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/local.png new file mode 100755 index 000000000..00eb97422 Binary files /dev/null and b/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/local.png differ diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/mask.png b/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/mask.png new file mode 100755 index 000000000..2dd19175d Binary files /dev/null and b/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/mask.png differ diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/memory.png b/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/memory.png new file mode 100755 index 000000000..c1b4a26c3 Binary files /dev/null and b/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/memory.png differ diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/nel.png b/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/nel.png new file mode 100755 index 000000000..344c05ff9 Binary files /dev/null and b/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/nel.png differ diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/os.png b/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/os.png new file mode 100755 index 000000000..d8a50a5e2 Binary files /dev/null and b/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/os.png differ diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/patch.png b/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/patch.png new file mode 100755 index 000000000..cf468d125 Binary files /dev/null and b/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/patch.png differ diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/position.png b/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/position.png new file mode 100755 index 000000000..476e3693d Binary files /dev/null and b/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/position.png differ diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/processor.png b/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/processor.png new file mode 100755 index 000000000..98297fcaa Binary files /dev/null and b/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/processor.png differ diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/server.png b/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/server.png new file mode 100755 index 000000000..83eac6283 Binary files /dev/null and b/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/server.png differ diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/shard.png b/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/shard.png new file mode 100755 index 000000000..752ff61ff Binary files /dev/null and b/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/shard.png differ diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/user.png b/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/user.png new file mode 100755 index 000000000..f0f204148 Binary files /dev/null and b/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/user.png differ diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/view.png b/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/view.png new file mode 100755 index 000000000..00363775c Binary files /dev/null and b/code/ryzom/tools/server/ryzom_ams/ams_lib/img/info/view.png differ diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_ticket_info.tpl b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_ticket_info.tpl index 9edb32cda..9233f0c0f 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_ticket_info.tpl +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_ticket_info.tpl @@ -62,25 +62,33 @@

Ingame related

+ + + + + + + +
Shard ID: {$shard_id}
User_Id: {$user_id}
User Position: {$user_position}
View Position: {$view_position}
Client_Version: {$client_version}
Patch_Version: {$patch_version}
Server_Tick: {$server_tick}
@@ -92,25 +100,33 @@

Hardware & Software related

+ + + + + + + +
Memory: {$memory}
Processor: {$processor}
Cpu_Id: {$cpu_id}
Cpu_Mask: {$cpu_mask}
HT: {$ht}
OS: {$os}
NeL3D: {$nel3d}
@@ -122,10 +138,13 @@

Network related

+ + +
Connect_State: {$connect_state}
Local_Address: {$local_address}
diff --git a/code/ryzom/tools/server/ryzom_ams/www/config.php b/code/ryzom/tools/server/ryzom_ams/www/config.php index 7d8f202d7..6e2769079 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/config.php +++ b/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'; diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/client.png b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/client.png deleted file mode 100644 index 83443dd76..000000000 Binary files a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/client.png and /dev/null differ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/cpuid.png b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/cpuid.png deleted file mode 100644 index c3e531ff3..000000000 Binary files a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/cpuid.png and /dev/null differ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/ht.png b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/ht.png deleted file mode 100644 index fcf468e71..000000000 Binary files a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/ht.png and /dev/null differ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/local.png b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/local.png deleted file mode 100644 index 4cb748c8d..000000000 Binary files a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/local.png and /dev/null differ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/mask.png b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/mask.png deleted file mode 100644 index 2f0685bde..000000000 Binary files a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/mask.png and /dev/null differ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/memory.png b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/memory.png deleted file mode 100644 index 35111c0ee..000000000 Binary files a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/memory.png and /dev/null differ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/nel.png b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/nel.png deleted file mode 100644 index b23e2534a..000000000 Binary files a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/nel.png and /dev/null differ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/os.png b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/os.png deleted file mode 100644 index 30f04153a..000000000 Binary files a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/os.png and /dev/null differ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/patch.png b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/patch.png deleted file mode 100644 index 7c00408ff..000000000 Binary files a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/patch.png and /dev/null differ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/position.png b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/position.png deleted file mode 100644 index ffa627e52..000000000 Binary files a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/position.png and /dev/null differ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/processor.png b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/processor.png deleted file mode 100644 index 411be15c2..000000000 Binary files a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/processor.png and /dev/null differ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/server.png b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/server.png deleted file mode 100644 index 7edc55e2f..000000000 Binary files a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/server.png and /dev/null differ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/shard.png b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/shard.png deleted file mode 100644 index 414c63a70..000000000 Binary files a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/shard.png and /dev/null differ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/user.png b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/user.png deleted file mode 100644 index 1267388c4..000000000 Binary files a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/user.png and /dev/null differ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/view.png b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/view.png deleted file mode 100644 index b21e63576..000000000 Binary files a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/view.png and /dev/null differ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_queue.php b/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_queue.php index 513c5f52f..3d2a7aac8 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_queue.php +++ b/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){ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_ticket_info.php b/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_ticket_info.php index 84bea6d97..4f1e98d61 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_ticket_info.php +++ b/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; - $result['SITEBASE'] = $SITEBASE; + global $WEBPATH; + $result['WEBPATH'] = $WEBPATH; if(Ticket_User::isMod($_SESSION['ticket_user'])){ $result['isMod'] = "TRUE"; diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/show_ticket_info.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/show_ticket_info.tpl index d66d43162..23eaebdab 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/show_ticket_info.tpl +++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/show_ticket_info.tpl @@ -17,61 +17,61 @@
Ingame related
- Shard ID: {$shard_id} + Shard ID: {$shard_id} - User_Id: {$user_id} + User_Id: {$user_id} - User Position: {$user_position} + User Position: {$user_position} - View Position: {$view_position} + View Position: {$view_position} - Client_Version: {$client_version} + Client_Version: {$client_version} - Patch_Version: {$patch_version} + Patch_Version: {$patch_version} - Server_Tick: {$server_tick} + Server_Tick: {$server_tick}
Hardware & Software related
- Memory: {$memory} + Memory: {$memory} - Processor: {$processor} + Processor: {$processor} - Cpu_Id: {$cpu_id} + Cpu_Id: {$cpu_id} - Cpu_Mask: {$cpu_mask} + Cpu_Mask: {$cpu_mask} - HT: {$ht} + HT: {$ht} - OS: {$os} + OS: {$os} - NeL3D: {$nel3d} + NeL3D: {$nel3d}
Network related
- Connect_State: {$connect_state} + Connect_State: {$connect_state} - Local_Address: {$local_address} + Local_Address: {$local_address}