From 91c9c04dc328ff4ac514e8fd649e70ab89f6f662 Mon Sep 17 00:00:00 2001 From: Quitta Date: Mon, 9 Sep 2013 03:47:32 +0200 Subject: [PATCH] Biggest push ever! :D Kinda made it possible to only need a few files in the inc/func of the drupal module, all others can be copied of the www version --- .../ryzom_ams/ams_lib/autoload/helpers.php | 9 +- .../ams_lib/ingame_templates/createticket.tpl | 2 +- .../ams_lib/ingame_templates/dashboard.tpl | 8 +- .../ams_lib/ingame_templates/layout_admin.tpl | 12 +- .../ams_lib/ingame_templates/layout_mod.tpl | 12 +- .../ams_lib/ingame_templates/layout_user.tpl | 6 +- .../ams_lib/ingame_templates/login.tpl | 5 +- .../ams_lib/ingame_templates/register.tpl | 2 +- .../ams_lib/ingame_templates/settings.tpl | 26 +- .../ams_lib/ingame_templates/sgroup_list.tpl | 6 +- .../ams_lib/ingame_templates/show_queue.tpl | 22 +- .../ams_lib/ingame_templates/show_reply.tpl | 6 +- .../ams_lib/ingame_templates/show_sgroup.tpl | 8 +- .../ams_lib/ingame_templates/show_ticket.tpl | 18 +- .../ingame_templates/show_ticket_info.tpl | 40 +- .../ingame_templates/show_ticket_log.tpl | 4 +- .../ams_lib/ingame_templates/show_user.tpl | 18 +- .../ams_lib/ingame_templates/userlist.tpl | 24 +- .../server/ryzom_ams/ams_lib/libinclude.php | 10 +- .../ams_lib/ingame_templates/createticket.tpl | 101 - .../ams_lib/ingame_templates/dashboard.tpl | 81 - .../ams_lib/ingame_templates/index.tpl | 81 - .../ams_lib/ingame_templates/layout.tpl | 34 - .../ams_lib/ingame_templates/layout_admin.tpl | 19 - .../ams_lib/ingame_templates/layout_mod.tpl | 18 - .../ams_lib/ingame_templates/layout_user.tpl | 13 - .../ams_lib/ingame_templates/login.tpl | 39 - .../ams_lib/ingame_templates/register.tpl | 115 - .../ams_lib/ingame_templates/sgroup_list.tpl | 146 -- .../ams_lib/ingame_templates/show_queue.tpl | 222 -- .../ams_lib/ingame_templates/show_reply.tpl | 88 - .../ams_lib/ingame_templates/show_sgroup.tpl | 171 -- .../ams_lib/ingame_templates/show_ticket.tpl | 285 --- .../ingame_templates/show_ticket_info.tpl | 168 -- .../ingame_templates/show_ticket_log.tpl | 88 - .../ams_lib/ingame_templates/show_user.tpl | 163 -- .../ams_lib/ingame_templates/userlist.tpl | 96 - .../ryzommanage/func/add_sgroup.php | 45 - .../ryzommanage/func/add_user_to_sgroup.php | 48 - .../ryzommanage/func/change_mail.php | 93 - .../ryzommanage/func/change_password.php | 88 - .../ryzommanage/func/create_ticket.php | 58 - .../drupal_module/ryzommanage/func/login.php | 41 - .../func/modify_email_of_sgroup.php | 59 - .../ryzommanage/func/reply_on_ticket.php | 59 - .../ryzommanage/inc/change_permission.php | 49 - .../ryzommanage/inc/createticket.php | 48 - .../ryzommanage/inc/dashboard.php | 37 - .../drupal_module/ryzommanage/inc/login.php | 21 - .../ryzommanage/inc/sgroup_list.php | 39 - .../ryzommanage/inc/show_queue.php | 153 -- .../ryzommanage/inc/show_reply.php | 48 - .../ryzommanage/inc/show_sgroup.php | 66 - .../ryzommanage/inc/show_ticket.php | 86 - .../ryzommanage/inc/show_ticket_info.php | 55 - .../ryzommanage/inc/show_ticket_log.php | 67 - .../ryzommanage/inc/userlist.php | 30 - .../ryzommanage/templates/userlist.tpl | 2 +- .../{drupal_module/ryzommanage => }/todo.txt | 4 +- .../tools/server/ryzom_ams/www/config.php | 9 +- .../ryzom_ams/www/html/autoload/webusers.php | 2 +- .../tools/server/ryzom_ams/www/html/blank.php | 33 - .../server/ryzom_ams/www/html/calendar.php | 45 - .../tools/server/ryzom_ams/www/html/chart.php | 120 -- .../ryzom_ams/www/html/file-manager.php | 36 - .../server/ryzom_ams/www/html/footer.php | 121 -- .../tools/server/ryzom_ams/www/html/form.php | 333 --- .../ryzom_ams/www/html/func/add_sgroup.php | 22 +- .../ryzom_ams/www/html/func/add_user.php | 4 +- .../www/html/func/add_user_to_sgroup.php | 20 +- .../ryzom_ams/www/html/func/change_info.php | 10 +- .../ryzom_ams/www/html/func/change_mail.php | 13 +- .../www/html/func/change_password.php | 14 +- .../www/html/func/change_receivemail.php | 10 +- .../ryzom_ams/www/html/func/create_ticket.php | 14 +- .../server/ryzom_ams/www/html/func/login.php | 16 +- .../www/html/func/modify_email_of_sgroup.php | 20 +- .../www/html/func/reply_on_ticket.php | 26 +- .../server/ryzom_ams/www/html/gallery.php | 41 - .../tools/server/ryzom_ams/www/html/grid.php | 240 --- .../server/ryzom_ams/www/html/header.php | 158 -- .../tools/server/ryzom_ams/www/html/icon.php | 355 ---- .../www/html/inc/change_permission.php | 19 +- .../ryzom_ams/www/html/inc/createticket.php | 4 +- .../ryzom_ams/www/html/inc/dashboard.php | 13 +- .../server/ryzom_ams/www/html/inc/login.php | 13 +- .../ryzom_ams/www/html/inc/settings.php | 12 +- .../ryzom_ams/www/html/inc/sgroup_list.php | 16 +- .../ryzom_ams/www/html/inc/show_queue.php | 42 +- .../ryzom_ams/www/html/inc/show_reply.php | 6 +- .../ryzom_ams/www/html/inc/show_sgroup.php | 18 +- .../ryzom_ams/www/html/inc/show_ticket.php | 14 +- .../www/html/inc/show_ticket_info.php | 10 +- .../www/html/inc/show_ticket_log.php | 21 +- .../ryzom_ams/www/html/inc/show_user.php | 9 +- .../ryzom_ams/www/html/inc/userlist.php | 10 +- .../tools/server/ryzom_ams/www/html/index.php | 4 +- .../ryzom_ams/www/html/index_charisma.php | 329 --- .../tools/server/ryzom_ams/www/html/table.php | 1844 ----------------- .../www/html/templates/show_ticket_info.tpl | 32 +- .../tools/server/ryzom_ams/www/html/tour.php | 32 - .../server/ryzom_ams/www/html/typography.php | 176 -- .../tools/server/ryzom_ams/www/html/ui.php | 287 --- 103 files changed, 407 insertions(+), 7528 deletions(-) delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/createticket.tpl delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/dashboard.tpl delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/index.tpl delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/layout.tpl delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/layout_admin.tpl delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/layout_mod.tpl delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/layout_user.tpl delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/login.tpl delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/register.tpl delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/sgroup_list.tpl delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/show_queue.tpl delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/show_reply.tpl delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/show_sgroup.tpl delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/show_ticket.tpl delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/show_ticket_info.tpl delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/show_ticket_log.tpl delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/show_user.tpl delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/userlist.tpl delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/func/add_sgroup.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/func/add_user_to_sgroup.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/func/change_mail.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/func/change_password.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/func/create_ticket.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/func/login.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/func/modify_email_of_sgroup.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/func/reply_on_ticket.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/change_permission.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/createticket.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/dashboard.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/login.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/sgroup_list.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/show_queue.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/show_reply.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/show_sgroup.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/show_ticket.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/show_ticket_info.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/show_ticket_log.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/userlist.php rename code/ryzom/tools/server/ryzom_ams/{drupal_module/ryzommanage => }/todo.txt (69%) delete mode 100644 code/ryzom/tools/server/ryzom_ams/www/html/blank.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/www/html/calendar.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/www/html/chart.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/www/html/file-manager.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/www/html/footer.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/www/html/form.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/www/html/gallery.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/www/html/grid.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/www/html/header.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/www/html/icon.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/www/html/index_charisma.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/www/html/table.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/www/html/tour.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/www/html/typography.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/www/html/ui.php diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php index 18f34b1d1..9bf7f03e1 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php @@ -5,7 +5,6 @@ class Helpers{ public static function loadTemplate( $template, $vars = array (), $returnHTML = false ) { - global $AMS_LIB; global $SITEBASE; global $AMS_TRANS; @@ -25,7 +24,8 @@ class Helpers{ $smarty -> cache_lifetime = 120; helpers :: create_folders (); - if ( helpers::check_if_game_client() or $forcelibrender = false ){ + global $FORCE_INGAME; + if ( helpers::check_if_game_client() or $FORCE_INGAME ){ $smarty -> template_dir = $AMS_LIB . '/ingame_templates/'; $smarty -> setConfigDir( $AMS_LIB . '/configs' ); $variables = parse_ini_file( $AMS_LIB . '/configs/ingame_layout.ini', true ); @@ -58,7 +58,7 @@ class Helpers{ } - + if($returnHTML == true){ return $smarty ->fetch($inherited . $template . '.tpl' ); }else{ @@ -90,7 +90,8 @@ class Helpers{ static public function check_if_game_client() { // if HTTP_USER_AGENT is not set then its ryzom core - if ( strpos($_SERVER['HTTP_USER_AGENT'],"Ryzom") === 0){ + global $FORCE_INGAME; + if (( strpos($_SERVER['HTTP_USER_AGENT'],"Ryzom") === 0) || $FORCE_INGAME){ return true; }else{ return false; diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/createticket.tpl b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/createticket.tpl index 4445fca39..ec79cc661 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/createticket.tpl +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/createticket.tpl @@ -32,7 +32,7 @@ diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_admin.tpl b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_admin.tpl index b3ce83d86..afe29e778 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_admin.tpl +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_admin.tpl @@ -1,18 +1,18 @@ {extends file="layout.tpl"} {block name=menu} - + - + - + - + - + - + {/block} diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_mod.tpl b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_mod.tpl index 34911226f..65d10c611 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_mod.tpl +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_mod.tpl @@ -1,18 +1,18 @@ {extends file="layout.tpl"} {block name=menu} - + - + - + - + - + - + {/block} diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_user.tpl b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_user.tpl index af2f23f07..233ba2ad4 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_user.tpl +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_user.tpl @@ -1,12 +1,12 @@ {extends file="layout.tpl"} {block name=menu} - + - + - + {/block} diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/login.tpl b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/login.tpl index ad6f48e0d..03d0bd7aa 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/login.tpl +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/login.tpl @@ -3,14 +3,13 @@

{$login_info}

- +

Username:

-

Password: @@ -34,7 +33,7 @@

{/if}

- {$login_register_message} {$login_register_message_here}! + {$login_register_message} {$login_register_message_here}!

-
+ diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/dashboard.tpl b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/dashboard.tpl index af87d13aa..24b8c7878 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/dashboard.tpl +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/dashboard.tpl @@ -40,10 +40,10 @@ - - - - + + + +
Title: Total amount of Tickets
{$nrAssignedWaiting}{$nrToDo}{$newestTicketTitle}{$nrTotalTickets}{$nrAssignedWaiting}{$nrToDo}{$newestTicketTitle}{$nrTotalTickets}
Dashboard
Dashboard
Profile
Profile
Settings
Settings
 |
Users
Users
Queues
Queues
Support Groups
Support Groups
Dashboard
Dashboard
Profile
Profile
Settings
Settings
 |
Users
Users
Queues
Queues
Support Groups
Support Groups
Profile
Profile
Settings
Settings
 |
Create New Ticket
Create New Ticket
diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/register.tpl b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/register.tpl index 03cb7c9d3..9c38b34a2 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/register.tpl +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/register.tpl @@ -6,7 +6,7 @@
{$welcome_message}
-click hereeeee + diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/settings.tpl b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/settings.tpl index 048675a9e..e256e4429 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/settings.tpl +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/settings.tpl @@ -8,18 +8,18 @@ - - + + {if isset($isAdmin) and $isAdmin eq 'TRUE' and $target_id neq 1} {if $userPermission eq 1} - - + + {else if $userPermission eq 2 } - - + + {else if $userPermission eq 3 } - - + + {/if} {/if} @@ -40,7 +40,7 @@ - + @@ -70,7 +70,7 @@

Change Password

- +
Browse UserSend TicketBrowse UserSend TicketMake ModeratorMake AdminMake ModeratorMake AdminDemote to UserMake AdminDemote to UserMake AdminDemote to UserDemote to ModeratorDemote to UserDemote to Moderator

Change Settings

Change Settings of {$target_username}
{if !isset($changesOther) or $changesOther eq "FALSE"} @@ -124,7 +124,7 @@

Change Email

- +
New Email: @@ -156,7 +156,7 @@

Change Info

- + @@ -212,7 +212,7 @@
Firstname:

Ticket-Update Mail Settings

- + @@ -60,7 +60,7 @@
Receive ticket updates diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/sgroup_list.tpl b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/sgroup_list.tpl index 322323d03..3a6dcc52f 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/sgroup_list.tpl +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/sgroup_list.tpl @@ -35,7 +35,7 @@

Add a Support group

- + - + - {if isset($isAdmin) && $isAdmin eq 'TRUE'}{/if} + {if isset($isAdmin) && $isAdmin eq 'TRUE'}{/if} {/foreach}
@@ -123,10 +123,10 @@ {foreach from=$grouplist item=group}
{$group.sGroupId}{$group.name}{$group.name} {$group.tag} {$group.groupemail}DeleteDelete
diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_queue.tpl b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_queue.tpl index eeda5813e..956b5e20d 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_queue.tpl +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_queue.tpl @@ -8,11 +8,11 @@ 		- - - - - + + + + +
Todo ticketsAll ticketsAll open ticketsTicket ArchiveNot Assigned TicketsTodo ticketsAll ticketsAll open ticketsTicket ArchiveNot Assigned Tickets

Tickets

- + @@ -129,8 +129,8 @@ {foreach from=$tickets item=ticket} - - + + @@ -139,19 +139,19 @@ {if $ticket.forwardedGroupName eq "0"} {$public_sgroup} {else} - {$ticket.forwardedGroupName} + {$ticket.forwardedGroupName} {/if} @@ -27,7 +27,7 @@ - + diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_sgroup.tpl b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_sgroup.tpl index 7888996ed..2f0c29695 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_sgroup.tpl +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_sgroup.tpl @@ -34,7 +34,7 @@
{$ticket.tId}{$ticket.title}{if $ticket.assignedText neq ""} {$ticket.assignedText}{else} {$not_assigned} {/if}{$ticket.title}{if $ticket.assignedText neq ""} {$ticket.assignedText}{else} {$not_assigned} {/if} {$ticket.timestamp} {$ticket.category} {if $ticket.status eq 0}{else if $ticket.status eq 1}{else if $ticket.status eq 2}{/if}{$ticket.statusText} {if $ticket.assigned eq 0} - + {else if $ticket.assigned eq $user_id} -
+ diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_reply.tpl b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_reply.tpl index b6aa90cb2..9b0a6296a 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_reply.tpl +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_reply.tpl @@ -8,8 +8,8 @@
- - + +
Show TicketShow Ticket LogShow TicketShow Ticket Log

Reply ID#{$reply_id} of Ticket #{$ticket_id}

Reply ID#{$reply_id} of Ticket #{$ticket_id}

Add user to the list

{if isset($isAdmin) && $isAdmin eq 'TRUE'} - + @@ -92,8 +92,8 @@ {foreach from=$userlist item=user} - - {if isset($isAdmin) && $isAdmin eq 'TRUE'}{/if} + + {if isset($isAdmin) && $isAdmin eq 'TRUE'}{/if} {/foreach}
Username:
{$user.tUserId}{$user.name}Delete{$user.name}Delete
@@ -108,7 +108,7 @@

Mail settings

- + diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_ticket.tpl b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_ticket.tpl index fe27b2ce7..97f1d3c53 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_ticket.tpl +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_ticket.tpl @@ -8,9 +8,9 @@ @@ -74,13 +74,13 @@ {if $ticket_forwardedGroupName eq "0"} {$public_sgroup} {else} - {$ticket_forwardedGroupName} + {$ticket_forwardedGroupName} {/if} - + @@ -125,7 +125,7 @@ @@ -53,7 +53,7 @@
- {if isset($isMod) and $isMod eq "TRUE"}{/if} - - {if $hasInfo}{/if} + {if isset($isMod) and $isMod eq "TRUE"}{/if} + + {if $hasInfo}{/if}
Show Ticket LogSend Other TicketShow Additional InfoShow Ticket LogSend Other TicketShow Additional Info
Assigned To: {if $ticket_assignedTo neq ""} {$ticket_assignedToText}{else} {$not_assigned} {/if}Assigned To: {if $ticket_assignedTo neq ""} {$ticket_assignedToText}{else} {$not_assigned} {/if}
- + @@ -193,13 +193,13 @@

Ticket Assigning: {if $ticket_assignedTo eq 0} - + {else if $ticket_assignedTo eq $user_id} -
+ @@ -233,7 +233,7 @@

@@ -29,7 +29,7 @@ - + @@ -64,31 +64,31 @@

Forward to Group: - +

- {if isset($isMod) and $isMod eq "TRUE"}{/if} - - + {if isset($isMod) and $isMod eq "TRUE"}{/if} + +
Show Ticket LogSend Other TicketShow TicketShow Ticket LogSend Other TicketShow Ticket

Additional Info For Ticket [#{$ticket_id}]

Additional Info For Ticket [#{$ticket_id}]
- + - + - + - + - + - + - +
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}
@@ -102,31 +102,31 @@ - + - + - + - + - + - + - +
Memory: {$memory}
Processor: {$processor}
Cpu_Id: {$cpu_id}
Cpu_Mask: {$cpu_mask}
HT: {$ht}
OS: {$os}
NeL3D: {$nel3d}
@@ -140,11 +140,11 @@ - + - +
Connect_State: {$connect_state}
Local_Address: {$local_address}
diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_ticket_log.tpl b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_ticket_log.tpl index 57dff23b6..f79735064 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_ticket_log.tpl +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_ticket_log.tpl @@ -8,7 +8,7 @@ 		- +
Show TicketShow Ticket
- - -{/block} - diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/show_queue.tpl b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/show_queue.tpl deleted file mode 100644 index 956b5e20d..000000000 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/show_queue.tpl +++ /dev/null @@ -1,222 +0,0 @@ -{block name=content} - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +
-

Title: {$ticket_title}

+

Title: {$ticket_title}

diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_user.tpl b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_user.tpl index 93110b895..51c5bb77a 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_user.tpl +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_user.tpl @@ -8,18 +8,18 @@ - - - - - - - - - - - - - - -{/block} - diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/layout_mod.tpl b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/layout_mod.tpl deleted file mode 100644 index 65d10c611..000000000 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/layout_mod.tpl +++ /dev/null @@ -1,18 +0,0 @@ -{extends file="layout.tpl"} -{block name=menu} - - - - - - - - - - - - - - -{/block} - diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/layout_user.tpl b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/layout_user.tpl deleted file mode 100644 index 233ba2ad4..000000000 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/layout_user.tpl +++ /dev/null @@ -1,13 +0,0 @@ -{extends file="layout.tpl"} -{block name=menu} - - - - - - - - - -{/block} - diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/login.tpl b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/login.tpl deleted file mode 100644 index 03d0bd7aa..000000000 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/login.tpl +++ /dev/null @@ -1,39 +0,0 @@ -

 

-
- - + + {if isset($isAdmin) and $isAdmin eq 'TRUE' and $target_id neq 1} {if $userPermission eq 1} - - + + {else if $userPermission eq 2 } - - + + {else if $userPermission eq 3 } - - + + {/if} {/if} @@ -138,7 +138,7 @@ {foreach from=$ticketlist item=ticket} - + diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/userlist.tpl b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/userlist.tpl index 4e5f2a4ae..c2e226ca3 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/userlist.tpl +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/userlist.tpl @@ -44,24 +44,24 @@ {foreach from=$userlist item=element} - + {if $element.permission eq 1}{/if} {if $element.permission eq 2}{/if} {if $element.permission eq 3}{/if} @@ -73,11 +73,11 @@ diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/libinclude.php b/code/ryzom/tools/server/ryzom_ams/ams_lib/libinclude.php index e5deb6030..b0031de73 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/libinclude.php +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/libinclude.php @@ -3,10 +3,14 @@ // Base include file for library functions for AMS // *********************************************** function __autoload( $className ){ - if(file_exists( '/home/daan/ryzom/ryzomcore/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/' . strtolower ( $className ) . '.php')){ + global $AMS_LIB; + global $SITEBASE; + if(file_exists( $AMS_LIB.'/autoload/' . strtolower ( $className ) . '.php')){ require_once 'autoload/' . strtolower ( $className ) . '.php'; } - if($className == "WebUsers") - require_once '/home/daan/ryzom/ryzomcore/code/ryzom/tools/server/ryzom_ams/www/html/autoload/' . strtolower ( $className ) . '.php'; + if($className == "WebUsers"){ + require_once $SITEBASE.'/autoload/' . strtolower ( $className ) . '.php'; } +} + diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/createticket.tpl b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/createticket.tpl deleted file mode 100644 index ec79cc661..000000000 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/createticket.tpl +++ /dev/null @@ -1,101 +0,0 @@ -{block name=content} - - - - -{/block} - - diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/dashboard.tpl b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/dashboard.tpl deleted file mode 100644 index 24b8c7878..000000000 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/dashboard.tpl +++ /dev/null @@ -1,81 +0,0 @@ -{block name=content} - - - - - - - - - - -{/block} - diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/index.tpl b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/index.tpl deleted file mode 100644 index 82495ff89..000000000 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/index.tpl +++ /dev/null @@ -1,81 +0,0 @@ -{config_load file="ams_lib.conf" section="setup"} - -
-
-{* bold and title are read from the config file *}
-{if #bold#}{/if}
-{* capitalize the first letters of each word of the title *}
-Title: {#title#|capitalize}
-{if #bold#}{/if}
-
-The current date and time is {$smarty.now|date_format:"%Y-%m-%d %H:%M:%S"}
-
-The value of global assigned variable $SCRIPT_NAME is {$SCRIPT_NAME}
-
-Example of accessing server environment variable SERVER_NAME: {$smarty.server.SERVER_NAME}
-
-The value of {ldelim}$Name{rdelim} is {$Name}
-
-variable modifier example of {ldelim}$Name|upper{rdelim}
-
-{$Name|upper}
-
-
-An example of a section loop:
-
-{section name=outer 
-loop=$FirstName}
-{if $smarty.section.outer.index is odd by 2}
-	{$smarty.section.outer.rownum} . {$FirstName[outer]} {$LastName[outer]}
-{else}
-	{$smarty.section.outer.rownum} * {$FirstName[outer]} {$LastName[outer]}
-{/if}
-{sectionelse}
-	none
-{/section}
-
-An example of section looped key values:
-
-{section name=sec1 loop=$contacts}
-	phone: {$contacts[sec1].phone}

-	fax: {$contacts[sec1].fax}

-	cell: {$contacts[sec1].cell}

-{/section}
-

-
-testing strip tags
-{strip}
-
Edit UserSend TicketEdit UserSend TicketMake ModeratorMake AdminMake ModeratorMake AdminDemote to UserMake AdminDemote to UserMake AdminDemote to UserDemote to ModeratorDemote to UserDemote to Moderator
{$ticket.tId}{$ticket.title}{$ticket.title} {$ticket.timestamp} {$ticket.category}
{$element.id}{$element.username}{$element.username} {$element.email}UserModeratorAdmin - Show User - Edit User + Show User + Edit User {if isset($isAdmin) and $isAdmin eq 'TRUE' and $element.id neq 1} {if $element.permission eq 1} - Make Moderator - Make Admin + Make Moderator + Make Admin {else if $element.permission eq 2 } - Demote to User - Make Admin + Demote to User + Make Admin {else if $element.permission eq 3 } - Demote to User - Demote to Moderator + Demote to User + Demote to Moderator {/if} {/if}
- + {foreach from=$links item=link} - + {/foreach} - +
««{$link}{$link}»»
- - - - - - - - - -

Create a new ticket

-
- - - - - - - - - - -
- - -
-
- - -
- - -
- - -
- - - - - - - - - - - - - - - - - -
Title: - -
Category: - -
Description:
- - - - - {if $ingame} - - - - - - - - - - - - - - - - - - {/if} - -
- -
-
-
-
- -
- - - - - - - - - -

{$home_title}

-
- - - - - - - - - - -
- - -
-
- - - - -
- - -
- - -
- - - - - - - - - - - - - -
Tickets Waiting for Direct ActionTickets TodoNewest TicketTotal amount of Tickets
{$nrAssignedWaiting}{$nrToDo}{$newestTicketTitle}{$nrTotalTickets}
-
-
-
- - -
- - -
-

{$home_info}

-

This is the GSOC project of Daan Janssens mentored by Matthew Lagoe.

-
-
-
-
- -
- - - -
- - This is a test - -
-{/strip} - - - -This is an example of the html_select_date function: - -
-{html_select_date start_year=1998 end_year=2010} -
- -This is an example of the html_select_time function: - -
-{html_select_time use_24_hours=false} -
- -This is an example of the html_options function: - -
- -
- -{include file="footer.tpl"} diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/layout.tpl b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/layout.tpl deleted file mode 100644 index c98768e52..000000000 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/layout.tpl +++ /dev/null @@ -1,34 +0,0 @@ - - - - - Ryzom Account Management System - - - - - - - - - {block name=content}{/block} - - - -
- - - - - {block name=menu}{/block} - - - -
-
- - - - - - diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/layout_admin.tpl b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/layout_admin.tpl deleted file mode 100644 index afe29e778..000000000 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/layout_admin.tpl +++ /dev/null @@ -1,19 +0,0 @@ -{extends file="layout.tpl"} -{block name=menu} -
Dashboard
Profile
Settings
|
Users
Queues
Support Groups
Dashboard
Profile
Settings
|
Users
Queues
Support Groups
Profile
Settings
|
Create New Ticket
-
-
-

{$login_info}

-
-
-
-

- Username: - -

- -

- Password: - -

- -

- Remember me: -

Remember me -

- -

- - -

- -
- - {if isset($login_error) and $login_error eq "TRUE"} -

- {$login_error_message} -

- {/if} -

- {$login_register_message} {$login_register_message_here}! -

-
diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/register.tpl b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/register.tpl deleted file mode 100644 index 9c38b34a2..000000000 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/register.tpl +++ /dev/null @@ -1,115 +0,0 @@ -{config_load file="ams_lib.conf" section="setup"} -

- {$title} -
- -
- {$welcome_message} -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{$username_tag} - - {if isset($Username)}{$Username}{/if}
{$password_tag} - - {if isset($PASSWORD_ERROR) && $PASSWORD_ERROR eq "TRUE"}{$Password}{/if}
{$cpassword_tag} - {if isset($CPASSWORD_ERROR) && $CPASSWORD_ERROR eq "TRUE"}{$ConfirmPass}{/if}
{$email_tag} - - {if isset($EMAIL_ERROR) && $EMAIL_ERROR eq "TRUE"}{$Email}{/if}
{$tac_tag}{$tac_message}
- -
- -
- -
- -
- -
- {$username_tooltip} -
- - -
- {$password_message} -
- -
- {$cpassword_message} -
- -
- {$email_message} -
- -
diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/sgroup_list.tpl b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/sgroup_list.tpl deleted file mode 100644 index 3a6dcc52f..000000000 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/sgroup_list.tpl +++ /dev/null @@ -1,146 +0,0 @@ -{block name=content} - -
- - - - - - - - - -

Support Groups

-
- - - - - - - - - - -
- - -
-
- - {if isset($isAdmin) && $isAdmin eq 'TRUE'} - - {/if} - -
- - -
- - -
-

Add a Support group

- -
- - - - - - -
- - - - - - - - - - - - - - - -
Group name:
Group Tag:
Group EmailAddress:
- 		- - - - - - - - - - - - - - - -
IMAP MailServer IP:
IMAP Username:
IMAP Password:
-
- -

- - - {if isset($RESULT_OF_ADDING) and $RESULT_OF_ADDING eq "SUCCESS"} -

- {$group_success} -

- {else if isset($RESULT_OF_ADDING) and $RESULT_OF_ADDING eq "NAME_TAKEN"} -

- {$group_name_taken} -

- {else if isset($RESULT_OF_ADDING) and $RESULT_OF_ADDING eq "TAG_TAKEN"} -

- {$group_tag_taken} -

- {else if isset($RESULT_OF_ADDING) and $RESULT_OF_ADDING eq "SIZE_ERROR"} -

- {$group_size_error} -

- {/if} -
-
-
-
- - -
- - -
-

All groups

- - - - - - - {if isset($isAdmin) && $isAdmin eq 'TRUE'}{/if} - - - {foreach from=$grouplist item=group} - - - - - - {if isset($isAdmin) && $isAdmin eq 'TRUE'}{/if} - - {/foreach} -
IDNameTagEmailAction
{$group.sGroupId}{$group.name}{$group.tag}{$group.groupemail}Delete
-
-
-
-
- -
- - - - - - - -
- - - - -
- - - - - - - - -
Todo ticketsAll ticketsAll open ticketsTicket ArchiveNot Assigned Tickets
-
-
-
- - - - - - - - - -

Ticket Queue: {$queue_view}

-
- - - - - - - - - - -{/block} - diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/show_reply.tpl b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/show_reply.tpl deleted file mode 100644 index 9b0a6296a..000000000 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/show_reply.tpl +++ /dev/null @@ -1,88 +0,0 @@ -{block name=content} - - - - -{/block} - - diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/show_sgroup.tpl b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/show_sgroup.tpl deleted file mode 100644 index 2f0c29695..000000000 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/show_sgroup.tpl +++ /dev/null @@ -1,171 +0,0 @@ -{block name=content} - - - - -{/block} - diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/show_ticket.tpl b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/show_ticket.tpl deleted file mode 100644 index 97f1d3c53..000000000 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/show_ticket.tpl +++ /dev/null @@ -1,285 +0,0 @@ -{block name=content} - - - - - -{/block} - diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/show_ticket_info.tpl b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/show_ticket_info.tpl deleted file mode 100644 index 4431331c4..000000000 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/show_ticket_info.tpl +++ /dev/null @@ -1,168 +0,0 @@ -{block name=content} - - - - - -{/block} - diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/show_ticket_log.tpl b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/show_ticket_log.tpl deleted file mode 100644 index f79735064..000000000 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/show_ticket_log.tpl +++ /dev/null @@ -1,88 +0,0 @@ -{block name=content} - - - - -{/block} - \ No newline at end of file diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/show_user.tpl b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/show_user.tpl deleted file mode 100644 index 51c5bb77a..000000000 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/show_user.tpl +++ /dev/null @@ -1,163 +0,0 @@ -{block name=content} - - - - - -{/block} - diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/userlist.tpl b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/userlist.tpl deleted file mode 100644 index c2e226ca3..000000000 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ams_lib/ingame_templates/userlist.tpl +++ /dev/null @@ -1,96 +0,0 @@ -{block name=content} - - - -{/block} - diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/func/add_sgroup.php b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/func/add_sgroup.php deleted file mode 100644 index 94157192b..000000000 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/func/add_sgroup.php +++ /dev/null @@ -1,45 +0,0 @@ -getPermission(); - $result['no_visible_elements'] = 'FALSE'; - $result['username'] = $_SESSION['user']; - //global $SITEBASE; - //require($SITEBASE . '/inc/sgroup_list.php'); - //$result= array_merge($result, sgroup_list()); - //return helpers :: loadtemplate( 'sgroup_list', $result, true); - if (Helpers::check_if_game_client()) { - header("Location: ".$INGAME_WEBPATH."?page=sgroup_list"); - }else{ - header("Location: ".$WEBPATH."?page=sgroup_list"); - } - exit; - - }else{ - //ERROR: No access! - $_SESSION['error_code'] = "403"; - header("Location: index.php?page=error"); - exit; - } - }else{ - //ERROR: not logged in! - header("Location: index.php"); - exit; - } - -} \ No newline at end of file diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/func/add_user_to_sgroup.php b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/func/add_user_to_sgroup.php deleted file mode 100644 index e4d46e610..000000000 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/func/add_user_to_sgroup.php +++ /dev/null @@ -1,48 +0,0 @@ -getPermission()>1){ - $result['RESULT_OF_ADDING'] = Support_Group::addUserToSupportGroup($user_id, $id); - }else{ - $result['RESULT_OF_ADDING'] = "NOT_MOD_OR_ADMIN"; - } - - }else{ - $result['RESULT_OF_ADDING'] = "USER_NOT_EXISTING"; - } - $result['permission'] = unserialize($_SESSION['ticket_user'])->getPermission(); - $result['no_visible_elements'] = 'FALSE'; - $result['username'] = $_SESSION['user']; - //global $SITEBASE; - //require_once($SITEBASE . 'inc/show_sgroup.php'); - //$result= array_merge($result, show_sgroup()); - //helpers :: loadtemplate( 'show_sgroup', $result); - if (Helpers::check_if_game_client()) { - header("Location: ".$INGAME_WEBPATH."?page=show_sgroup&id=".$id); - }else{ - header("Location: ".$WEBPATH."?page=show_sgroup&id=".$id); - } - exit; - - }else{ - //ERROR: No access! - $_SESSION['error_code'] = "403"; - header("Location: index.php?page=error"); - exit; - } - }else{ - //ERROR: not logged in! - header("Location: index.php"); - exit; - } - -} \ No newline at end of file diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/func/change_mail.php b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/func/change_mail.php deleted file mode 100644 index f04648343..000000000 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/func/change_mail.php +++ /dev/null @@ -1,93 +0,0 @@ -getUsername(); - } - - $webUser = new WebUsers($_POST['target_id']); - $reply = $webUser->checkEmail($_POST['NewEmail']); - - global $SITEBASE; - require_once($SITEBASE . '/inc/settings.php'); - $result = settings(); - - if ( $reply != "success" ){ - $result['EMAIL_ERROR'] = 'TRUE'; - }else{ - $result['EMAIL_ERROR'] = 'FALSE'; - } - $result['prevNewEmail'] = filter_var($_POST["NewEmail"], FILTER_SANITIZE_EMAIL); - - if ($reply== "success"){ - $status = WebUsers::setEmail($target_username, filter_var($_POST["NewEmail"], FILTER_SANITIZE_EMAIL) ); - if($status == 'ok'){ - $result['SUCCESS_MAIL'] = "OK"; - }else if($status == 'shardoffline'){ - $result['SUCCESS_MAIL'] = "SHARDOFF"; - } - $result['permission'] = unserialize($_SESSION['ticket_user'])->getPermission(); - $result['no_visible_elements'] = 'FALSE'; - $result['username'] = $_SESSION['user']; - $result['target_id'] = $_POST['target_id']; - if(isset($_GET['id'])){ - if(Ticket_User::isMod(unserialize($_SESSION['ticket_user'])) && ($_POST['target_id'] != $_SESSION['id'])){ - $result['isMod'] = "TRUE"; - } - } - helpers :: loadtemplate( 'settings', $result); - exit; - - }else{ - $result['EMAIL'] = $reply; - $result['permission'] = unserialize($_SESSION['ticket_user'])->getPermission(); - $result['no_visible_elements'] = 'FALSE'; - $result['username'] = $_SESSION['user']; - $result['target_id'] = $_POST['target_id']; - if(isset($_GET['id'])){ - if(Ticket_User::isMod(unserialize($_SESSION['ticket_user'])) && ($_POST['target_id'] != $_SESSION['id'])){ - $result['isMod'] = "TRUE"; - } - } - helpers :: loadtemplate( 'settings', $result); - exit; - } - - }else{ - //ERROR: permission denied! - $_SESSION['error_code'] = "403"; - header("Location: index.php?page=error"); - exit; - } - - }else{ - //ERROR: The form was not filled in correclty - header("Location: index.php?page=settings"); - exit; - } - }else{ - //ERROR: user is not logged in - header("Location: index.php"); - exit; - } - - }catch (PDOException $e) { - //go to error page or something, because can't access website db - print_r($e); - exit; - } - -} - diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/func/change_password.php b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/func/change_password.php deleted file mode 100644 index 420d78103..000000000 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/func/change_password.php +++ /dev/null @@ -1,88 +0,0 @@ -getUsername(); - //isAdmin is true when it's the admin, but the target_id != own id - $adminChangesOther = true; - $_POST["CurrentPass"] = "dummypass"; - } - - $webUser = new WebUsers($_POST['target_id']); - $params = Array( 'user' => $target_username, 'CurrentPass' => $_POST["CurrentPass"], 'NewPass' => $_POST["NewPass"], 'ConfirmNewPass' => $_POST["ConfirmNewPass"], 'adminChangesOther' => $adminChangesOther); - $result = $webUser->check_change_password($params); - if ($result == "success"){ - //edit stuff into db - global $SITEBASE; - require_once($SITEBASE . '/inc/settings.php'); - $succresult = settings(); - $status = WebUsers::setPassword($target_username, $_POST["NewPass"]); - if($status == 'ok'){ - $succresult['SUCCESS_PASS'] = "OK"; - }else if($status == 'shardoffline'){ - $succresult['SUCCESS_PASS'] = "SHARDOFF"; - } - $succresult['permission'] = unserialize($_SESSION['ticket_user'])->getPermission(); - $succresult['no_visible_elements'] = 'FALSE'; - $succresult['username'] = $_SESSION['user']; - $succresult['target_id'] = $_POST['target_id']; - helpers :: loadtemplate( 'settings', $succresult); - exit; - - }else{ - - $result['prevCurrentPass'] = filter_var($_POST["CurrentPass"], FILTER_SANITIZE_STRING); - $result['prevNewPass'] = filter_var($_POST["NewPass"], FILTER_SANITIZE_STRING); - $result['prevConfirmNewPass'] = filter_var($_POST["ConfirmNewPass"], FILTER_SANITIZE_STRING); - $result['permission'] = unserialize($_SESSION['ticket_user'])->getPermission(); - $result['no_visible_elements'] = 'FALSE'; - $result['username'] = $_SESSION['user']; - $result['target_id'] = $_POST['target_id']; - - global $SITEBASE; - require_once($SITEBASE . '/inc/settings.php'); - $settings = settings(); - - $result = array_merge($result,$settings); - helpers :: loadtemplate( 'settings', $result); - exit; - } - - }else{ - //ERROR: permission denied! - $_SESSION['error_code'] = "403"; - header("Location: index.php?page=error"); - exit; - } - - }else{ - //ERROR: The form was not filled in correclty - header("Location: index.php?page=settings"); - exit; - } - }else{ - //ERROR: user is not logged in - header("Location: index.php"); - exit; - } - - }catch (PDOException $e) { - //go to error page or something, because can't access website db - print_r($e); - exit; - } - -} - diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/func/create_ticket.php b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/func/create_ticket.php deleted file mode 100644 index cf497dabf..000000000 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/func/create_ticket.php +++ /dev/null @@ -1,58 +0,0 @@ -getTUserId(); - }else{ - $author= Ticket_User::constr_ExternId($_POST['target_id'])->getTUserId(); - } - $ticket_id = Ticket::create_Ticket($title, $content, $category, $author, unserialize($_SESSION['ticket_user'])->getTUserId(),0, $_POST); - if (Helpers::check_if_game_client()) { - header("Location: ".$INGAME_WEBPATH."?page=show_ticket&id=".$ticket_id); - }else{ - header("Location: ".$WEBPATH."?page=show_ticket&id=".$ticket_id); - } - exit; - - }catch (PDOException $e) { - //ERROR: LIB DB is not online! - print_r($e); - exit; - header("Location: index.php"); - exit; - } - - }else{ - //ERROR: permission denied! - $_SESSION['error_code'] = "403"; - header("Location: index.php?page=error"); - exit; - } - - }else{ - //ERROR: The form was not filled in correclty - header("Location: index.php?page=create_ticket"); - exit; - } - }else{ - //ERROR: user is not logged in - header("Location: index.php"); - exit; - } - -} - diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/func/login.php b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/func/login.php deleted file mode 100644 index 54d6b0672..000000000 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/func/login.php +++ /dev/null @@ -1,41 +0,0 @@ -getLanguage(); - - //go back to the index page. - if (Helpers::check_if_game_client()) { - header( 'Location: '. $INGAME_WEBPATH ); - }else{ - header( 'Location: '. $WEBPATH ); - } - exit; - }else{ - //handle login failure - $result = Array(); - $result['login_error'] = 'TRUE'; - $result['no_visible_elements'] = 'TRUE'; - helpers :: loadtemplate( 'login', $result); - exit; - } - - - }catch (PDOException $e) { - //go to error page or something, because can't access website db - print_r($e); - exit; - } - -} \ No newline at end of file diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/func/modify_email_of_sgroup.php b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/func/modify_email_of_sgroup.php deleted file mode 100644 index 9befa9ae4..000000000 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/func/modify_email_of_sgroup.php +++ /dev/null @@ -1,59 +0,0 @@ -setGroupEmail($groupemail); - $group->setIMAP_MailServer(filter_var($_POST['IMAP_MailServer'],FILTER_SANITIZE_STRING)); - $group->setIMAP_Username(filter_var($_POST['IMAP_Username'],FILTER_SANITIZE_STRING)); - - //encrypt password! - global $cfg; - $crypter = new MyCrypt($cfg['crypt']); - $enc_password = $crypter->encrypt($password); - $group->setIMAP_Password($enc_password); - $group->update(); - $result['RESULT_OF_MODIFYING'] = "SUCCESS"; - if($password == ""){ - $result['RESULT_OF_MODIFYING'] = "NO_PASSWORD"; - } - }else{ - $result['RESULT_OF_MODIFYING'] = "EMAIL_NOT_VALID"; - } - - $result['permission'] = unserialize($_SESSION['ticket_user'])->getPermission(); - $result['no_visible_elements'] = 'FALSE'; - $result['username'] = $_SESSION['user']; - //global $SITEBASE; - //require_once($SITEBASE . 'inc/show_sgroup.php'); - //$result= array_merge($result, show_sgroup()); - //helpers :: loadtemplate( 'show_sgroup', $result); - if (Helpers::check_if_game_client()) { - header("Location: ".$INGAME_WEBPATH."?page=show_sgroup&id=".$sgroupid); - }else{ - header("Location: ".$WEBPATH."?page=show_sgroup&id=".$sgroupid); - } - exit; - - }else{ - //ERROR: No access! - $_SESSION['error_code'] = "403"; - header("Location: index.php?page=error"); - exit; - } - }else{ - //ERROR: not logged in! - header("Location: index.php"); - exit; - } - -} \ No newline at end of file diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/func/reply_on_ticket.php b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/func/reply_on_ticket.php deleted file mode 100644 index e7841906f..000000000 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/func/reply_on_ticket.php +++ /dev/null @@ -1,59 +0,0 @@ -load_With_TId($ticket_id); - - if(($target_ticket->getAuthor() == unserialize($_SESSION['ticket_user'])->getTUserId()) || Ticket_User::isMod(unserialize($_SESSION['ticket_user'])) ){ - - try{ - $author = unserialize($_SESSION['ticket_user'])->getTUserId(); - if(isset($_POST['Content'])){ - $content = $_POST['Content']; - }else{ - $content=""; - } - $hidden = 0; - if(isset($_POST['hidden']) && Ticket_User::isMod(unserialize($_SESSION['ticket_user']))){ - $hidden = 1; - } - Ticket::createReply($content, $author, $ticket_id, $hidden); - - if(isset($_POST['ChangeStatus']) && isset($_POST['ChangePriority']) && Ticket_User::isMod(unserialize($_SESSION['ticket_user']))){ - $newStatus = filter_var($_POST['ChangeStatus'], FILTER_SANITIZE_NUMBER_INT); - $newPriority = filter_var($_POST['ChangePriority'], FILTER_SANITIZE_NUMBER_INT); - Ticket::updateTicketStatusAndPriority($ticket_id,$newStatus, $newPriority, $author); - } - if (Helpers::check_if_game_client()) { - header("Location: ".$INGAME_WEBPATH."?page=show_ticket&id=".$ticket_id); - }else{ - header("Location: ".$WEBPATH."?page=show_ticket&id=".$ticket_id); - } - exit; - - }catch (PDOException $e) { - //ERROR: LIB DB is not online! - print_r($e); - //header("Location: index.php"); - exit; - } - - }else{ - //ERROR: No access! - $_SESSION['error_code'] = "403"; - header("Location: index.php?page=error"); - exit; - } - }else{ - //ERROR: not logged in! - header("Location: index.php"); - exit; - } - -} \ No newline at end of file diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/change_permission.php b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/change_permission.php deleted file mode 100644 index 35f561290..000000000 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/change_permission.php +++ /dev/null @@ -1,49 +0,0 @@ -getTUserId(), $value); - if (Helpers::check_if_game_client()) { - header("Location: ".$INGAME_WEBPATH."?page=show_user&id=".$user_id); - }else{ - header("Location: ".$WEBPATH."?page=show_user&id=".$user_id); - } - exit; - - - }else{ - //ERROR: GET PARAMS not given or trying to change admin - if (Helpers::check_if_game_client()) { - header("Location: ".$INGAME_WEBPATH."?page=show_user&id=".$user_id); - }else{ - header("Location: ".$WEBPATH."?page=show_user&id=".$user_id); - } - exit; - } - - }else{ - //ERROR: No access! - $_SESSION['error_code'] = "403"; - header("Location: index.php?page=error"); - exit; - - } - - }else{ - //ERROR: not logged in! - header("Location: index.php"); - exit; - } - - -} \ No newline at end of file diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/createticket.php b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/createticket.php deleted file mode 100644 index 3fdb54b84..000000000 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/createticket.php +++ /dev/null @@ -1,48 +0,0 @@ -getTUserId(); - $result['nrToDo'] = Ticket_Queue_Handler::getNrOfTicketsToDo(unserialize($_SESSION['ticket_user'])->getTUserId()); - $result['nrAssignedWaiting'] = Ticket_Queue_Handler::getNrOfTicketsAssignedWaiting(unserialize($_SESSION['ticket_user'])->getTUserId()); - $result['nrTotalTickets'] = Ticket_Queue_Handler::getNrOfTickets(); - $ticket = Ticket_Queue_Handler::getNewestTicket(); - $result['newestTicketId'] = $ticket->getTId(); - $result['newestTicketTitle'] = $ticket->getTitle(); - $result['newestTicketAuthor'] = Ticket_User::get_username_from_id($ticket->getAuthor()); - global $INGAME_WEBPATH; - $result['ingame_webpath'] = $INGAME_WEBPATH; - return $result; - - }else{ - //ERROR: No access! - $_SESSION['error_code'] = "403"; - header("Location: index.php?page=error"); - exit; - - } - - }else{ - //ERROR: not logged in! - header("Location: index.php"); - exit; - } - - -} \ No newline at end of file diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/login.php b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/login.php deleted file mode 100644 index fca774ddc..000000000 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/login.php +++ /dev/null @@ -1,21 +0,0 @@ -getTUserId(); - $queueArray = array(); - $queue_handler = new Ticket_Queue_handler(); - - //Pagination Base Links - if (Helpers::check_if_game_client()) { - $result['pagination_base_link'] = $INGAME_WEBPATH."?page=show_queue&get=".$result['queue_view'] ; - }else{ - $result['pagination_base_link'] = $WEBPATH."?page=show_queue&get=".$result['queue_view'] ; - } - - //form url to keep the getters constant - - if (Helpers::check_if_game_client()) { - $result['getURL'] = $INGAME_WEBPATH."?page=show_queue&get=" . $result['queue_view']; - }else{ - $result['getURL'] = $WEBPATH."?page=show_queue&get=" . $result['queue_view']; - } - - if(isset($_GET['pagenum'])){ - $result['getURL'] = $result['getURL'] . "&pagenum=".$_GET['pagenum']; - } - - if(isset($_GET['get']) && ($_GET['get'] == "create") && isset($_GET['userid']) && isset($_GET['groupid']) && isset($_GET['what']) && isset($_GET['how']) && isset($_GET['who'])){ - $userid = filter_var($_GET['userid'], FILTER_SANITIZE_NUMBER_INT); - $groupid = filter_var($_GET['groupid'], FILTER_SANITIZE_NUMBER_INT); - $what = filter_var($_GET['what'], FILTER_SANITIZE_STRING); - $how = filter_var($_GET['how'], FILTER_SANITIZE_STRING); - $who = filter_var($_GET['who'], FILTER_SANITIZE_STRING); - $queue_handler->CreateQueue($userid, $groupid, $what, $how, $who); - - if (Helpers::check_if_game_client()) { - $result['pagination_base_link'] = $INGAME_WEBPATH."?page=show_queue&get=create&userid=".$userid."&groupid=".$groupid."&what=".$what."&how=".$how."&who=".$who; - }else{ - $result['pagination_base_link'] = $WEBPATH."?page=show_queue&get=create&userid=".$userid."&groupid=".$groupid."&what=".$what."&how=".$how."&who=".$who; - } - - - $result['prev_created_userid'] = $userid; - $result['prev_created_groupid'] = $groupid; - $result['prev_created_what'] = $what; - $result['prev_created_how'] = $how; - $result['prev_created_who'] = $who; - - $result['getURL'] = $result['getURL'] . "&userid=".$userid."&groupid=".$groupid."&what=".$what."&how=".$how."&who=".$who; - - } - - //if an action is set - if(isset($_POST['action'])){ - switch($_POST['action']){ - case "assignTicket": - $ticket_id = filter_var($_POST['ticket_id'], FILTER_SANITIZE_NUMBER_INT); - $result['ACTION_RESULT'] = Ticket::assignTicket($user_id, $ticket_id); - break; - - case "unAssignTicket": - $ticket_id = filter_var($_POST['ticket_id'], FILTER_SANITIZE_NUMBER_INT); - $result['ACTION_RESULT'] = Ticket::unAssignTicket($user_id, $ticket_id); - break; - - case "create_queue": - $userid = filter_var($_POST['userid'], FILTER_SANITIZE_NUMBER_INT); - $groupid = filter_var($_POST['groupid'], FILTER_SANITIZE_NUMBER_INT); - $what = filter_var($_POST['what'], FILTER_SANITIZE_STRING); - $how = filter_var($_POST['how'], FILTER_SANITIZE_STRING); - $who = filter_var($_POST['who'], FILTER_SANITIZE_STRING); - $queue_handler->CreateQueue($userid, $groupid, $what, $how, $who); - if (Helpers::check_if_game_client()) { - $result['pagination_base_link'] = $INGAME_WEBPATH."?page=show_queue&get=create&userid=".$userid."&groupid=".$groupid."&what=".$what."&how=".$how."&who=".$who; - }else{ - $result['pagination_base_link'] = $WEBPATH."?page=show_queue&get=create&userid=".$userid."&groupid=".$groupid."&what=".$what."&how=".$how."&who=".$who; - } - $result['prev_created_userid'] = $userid; - $result['prev_created_groupid'] = $groupid; - $result['prev_created_what'] = $what; - $result['prev_created_how'] = $how; - $result['prev_created_who'] = $who; - $result['getURL'] = $result['getURL'] . "&userid=".$userid."&groupid=".$groupid."&what=".$what."&how=".$how."&who=".$who; - - break; - - } - } - - $queueArray = $queue_handler->getTickets($result['queue_view'], $user_id); - - //pagination - $result['links'] = $queue_handler->getPagination()->getLinks(5); - $result['lastPage'] = $queue_handler->getPagination()->getLast(); - $result['currentPage'] = $queue_handler->getPagination()->getCurrent(); - - - //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){ - $web_author = new WebUsers($ticket['authorExtern']); - $result['tickets'][$i]['author'] = $web_author->getUsername(); - $web_assigned = new WebUsers($ticket['assigned']); - $result['tickets'][$i]['assignedText'] = $web_assigned->getUsername(); - $result['tickets'][$i]['timestamp_elapsed'] = Gui_Elements::time_elapsed_string($ticket['timestamp']); - $i++; - } - $result['user_id'] = unserialize($_SESSION['ticket_user'])->getTUserId(); - - //Queue creator field info - $result['grouplist'] = Gui_Elements::make_table(Support_Group::getGroups(), Array("getSGroupId","getName"), Array("sGroupId","name")); - $result['teamlist'] = Gui_Elements::make_table(Ticket_User::getModsAndAdmins(), Array("getTUserId","getExternId"), Array("tUserId","externId")); - $i = 0; - foreach( $result['teamlist'] as $member){ - $web_teammember = new Webusers($member['externId']); - $result['teamlist'][$i]['name'] = $web_teammember->getUsername(); - $i++; - } - global $INGAME_WEBPATH; - $result['ingame_webpath'] = $INGAME_WEBPATH; - return $result; - - }else{ - - //ERROR: Doesn't exist! - $_SESSION['error_code'] = "404"; - header("Location: ams?page=error"); - exit; - } - - }else{ - //ERROR: No access! - $_SESSION['error_code'] = "403"; - header("Location: index.php?page=error"); - exit; - } - }else{ - //ERROR: not logged in! - header("Location: index.php"); - exit; - } - -} \ No newline at end of file diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/show_reply.php b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/show_reply.php deleted file mode 100644 index 96cec0a6a..000000000 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/show_reply.php +++ /dev/null @@ -1,48 +0,0 @@ -load_With_TReplyId($result['reply_id']); - - - $ticket = new Ticket(); - $ticket->load_With_TId($reply->getTicket()); - - if(( $ticket->getAuthor() == unserialize($_SESSION['ticket_user'])->getTUserId() && ! $reply->getHidden()) || Ticket_User::isMod(unserialize($_SESSION['ticket_user']) )){ - $content = new Ticket_Content(); - $content->load_With_TContentId($reply->getContent()); - - $author = new Ticket_User(); - $author->load_With_TUserId($reply->getAuthor()); - - $result['hidden'] = $reply->getHidden(); - $result['ticket_id'] = $reply->getTicket(); - $result['reply_timestamp'] = $reply->getTimestamp(); - $result['author_permission'] = $author->getPermission(); - $result['reply_content'] = $content->getContent(); - $result['author'] = $author->getExternId(); - $webUser = new WebUsers($author->getExternId()); - $result['authorName'] = $webUser->getUsername(); - if(Ticket_User::isMod(unserialize($_SESSION['ticket_user']))){ - $result['isMod'] = "TRUE"; - } - global $INGAME_WEBPATH; - $result['ingame_webpath'] = $INGAME_WEBPATH; - return $result; - - }else{ - //ERROR: No access! - $_SESSION['error_code'] = "403"; - header("Location: index.php?page=error"); - exit; - } - }else{ - //ERROR: not logged in! - header("Location: index.php"); - exit; - } -} \ No newline at end of file diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/show_sgroup.php b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/show_sgroup.php deleted file mode 100644 index edf1ba0a9..000000000 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/show_sgroup.php +++ /dev/null @@ -1,66 +0,0 @@ -getName(); - $result['groupemail'] = $group->getGroupEmail(); - $result['imap_mailserver'] = $group->getIMAP_MailServer(); - $result['imap_username'] = $group->getIMAP_Username(); - $result['userlist'] = Gui_Elements::make_table(Support_Group::getAllUsersOfSupportGroup($result['target_id']), Array("getTUserId","getPermission","getExternId"), Array("tUserId","permission","externId")); - $i = 0; - foreach( $result['userlist'] as $user){ - $webuser = new Webusers($user['externId']); - $result['userlist'][$i]['name'] = $webuser->getUsername(); - $i++; - } - global $INGAME_WEBPATH; - $result['ingame_webpath'] = $INGAME_WEBPATH; - return $result; - - - }else{ - - //ERROR: No page specified! - $_SESSION['error_code'] = "404"; - header("Location: ams?page=error"); - exit; - } - - }else{ - //ERROR: No access! - $_SESSION['error_code'] = "403"; - header("Location: index.php?page=error"); - exit; - } - }else{ - //ERROR: not logged in! - header("Location: index.php"); - exit; - } - -} \ No newline at end of file diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/show_ticket.php b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/show_ticket.php deleted file mode 100644 index 4ecddb0b7..000000000 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/show_ticket.php +++ /dev/null @@ -1,86 +0,0 @@ -getTUserId(); - $result['ticket_id'] = filter_var($_GET['id'], FILTER_SANITIZE_NUMBER_INT); - $target_ticket = new Ticket(); - $target_ticket->load_With_TId($result['ticket_id']); - - if(Ticket_User::isMod(unserialize($_SESSION['ticket_user'] ))){ - if(isset($_POST['action'])){ - switch($_POST['action']){ - case "forward": - $ticket_id = filter_var($_POST['ticket_id'], FILTER_SANITIZE_NUMBER_INT); - $group_id = filter_var($_POST['group'], FILTER_SANITIZE_NUMBER_INT); - $result['ACTION_RESULT'] = Ticket::forwardTicket($result['user_id'], $ticket_id, $group_id); - break; - case "assignTicket": - $ticket_id = filter_var($_POST['ticket_id'], FILTER_SANITIZE_NUMBER_INT); - $result['ACTION_RESULT'] = Ticket::assignTicket($result['user_id'] , $ticket_id); - break; - case "unAssignTicket": - $ticket_id = filter_var($_POST['ticket_id'], FILTER_SANITIZE_NUMBER_INT); - $result['ACTION_RESULT'] = Ticket::unAssignTicket($result['user_id'], $ticket_id); - break; - - } - } - } - - if(($target_ticket->getAuthor() == unserialize($_SESSION['ticket_user'])->getTUserId()) || Ticket_User::isMod(unserialize($_SESSION['ticket_user']) )){ - - $show_as_admin = false; - if(Ticket_User::isMod(unserialize($_SESSION['ticket_user']))){ - $show_as_admin = true; - } - - $entire_ticket = Ticket::getEntireTicket( $result['ticket_id'],$show_as_admin); - Ticket_Log::createLogEntry($result['ticket_id'],unserialize($_SESSION['ticket_user'])->getTUserId(), 3); - $result['ticket_tId'] = $entire_ticket['ticket_obj']->getTId(); - $result['ticket_forwardedGroupName'] = $entire_ticket['ticket_obj']->getForwardedGroupName(); - $result['ticket_forwardedGroupId'] = $entire_ticket['ticket_obj']->getForwardedGroupId(); - $result['ticket_title'] = $entire_ticket['ticket_obj']->getTitle(); - $result['ticket_timestamp'] = $entire_ticket['ticket_obj']->getTimestamp(); - $result['ticket_status'] = $entire_ticket['ticket_obj']->getStatus(); - $result['ticket_author'] = $entire_ticket['ticket_obj']->getAuthor(); - $result['ticket_prioritytext'] = $entire_ticket['ticket_obj']->getPriorityText(); - $result['ticket_priorities'] = Ticket::getPriorityArray(); - $result['ticket_priority'] = $entire_ticket['ticket_obj']->getPriority(); - $result['ticket_statustext'] = $entire_ticket['ticket_obj']->getStatusText(); - $result['ticket_lastupdate'] = Gui_Elements::time_elapsed_string(Ticket::getLatestReply($result['ticket_id'])->getTimestamp()); - $result['ticket_category'] = $entire_ticket['ticket_obj']->getCategoryName(); - $webUser = new WebUsers(Assigned::getUserAssignedToTicket($result['ticket_tId'])); - $result['ticket_assignedToText'] = $webUser->getUsername(); - $result['ticket_assignedTo'] = Assigned::getUserAssignedToTicket($result['ticket_tId']); - $result['ticket_replies'] = Gui_Elements::make_table($entire_ticket['reply_array'], Array("getTReplyId","getContent()->getContent","getTimestamp","getAuthor()->getExternId","getAuthor()->getPermission","getHidden"), Array("tReplyId","replyContent","timestamp","authorExtern","permission","hidden")); - $i = 0; - foreach( $result['ticket_replies'] as $reply){ - $webReplyUser = new WebUsers($reply['authorExtern']); - $result['ticket_replies'][$i]['author'] = $webReplyUser->getUsername(); - $i++; - } - if(Ticket_User::isMod(unserialize($_SESSION['ticket_user']))){ - $result['isMod'] = "TRUE"; - $result['statusList'] = Ticket::getStatusArray(); - $result['sGroups'] = Gui_Elements::make_table_with_key_is_id(Support_Group::getAllSupportGroups(), Array("getName"), "getSGroupId" ); - } - $result['hasInfo'] = $target_ticket->hasInfo(); - global $INGAME_WEBPATH; - $result['ingame_webpath'] = $INGAME_WEBPATH; - return $result; - - }else{ - //ERROR: No access! - $_SESSION['error_code'] = "403"; - header("Location: index.php?page=error"); - exit; - } - }else{ - //ERROR: not logged in! - header("Location: index.php"); - exit; - } -} \ No newline at end of file diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/show_ticket_info.php b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/show_ticket_info.php deleted file mode 100644 index 4e43c7aad..000000000 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/show_ticket_info.php +++ /dev/null @@ -1,55 +0,0 @@ -load_With_TId($result['ticket_id']); - - if( $target_ticket->hasInfo() && (($target_ticket->getAuthor() == unserialize($_SESSION['ticket_user'])->getTUserId()) || Ticket_User::isMod(unserialize($_SESSION['ticket_user']) ))){ - $result['ticket_title'] = $target_ticket->getTitle(); - $result['ticket_author'] = $target_ticket->getAuthor(); - - $ticket_info = new Ticket_Info(); - $ticket_info->load_With_Ticket($result['ticket_id']); - $result['shard_id'] = $ticket_info->getShardId(); - $result['user_position'] = $ticket_info->getUser_Position(); - $result['view_position'] = $ticket_info->getView_Position(); - $result['client_version'] = $ticket_info->getClient_Version(); - $result['patch_version'] = $ticket_info->getPatch_Version(); - $result['server_tick'] = $ticket_info->getServer_Tick(); - $result['connect_state'] = $ticket_info->getConnect_State(); - $result['local_address'] = $ticket_info->getLocal_Address(); - $result['memory'] = $ticket_info->getMemory(); - $result['os'] = $ticket_info->getOS(); - $result['processor'] = $ticket_info->getProcessor(); - $result['cpu_id'] = $ticket_info->getCPUId(); - $result['cpu_mask'] = $ticket_info->getCPU_Mask(); - $result['ht'] = $ticket_info->getHT(); - $result['nel3d'] = $ticket_info->getNel3D(); - $result['user_id'] = $ticket_info->getUser_Id(); - global $IMAGELOC_WEBPATH; - $result['IMAGELOC_WEBPATH'] = $IMAGELOC_WEBPATH; - - if(Ticket_User::isMod(unserialize($_SESSION['ticket_user']))){ - $result['isMod'] = "TRUE"; - } - global $INGAME_WEBPATH; - $result['ingame_webpath'] = $INGAME_WEBPATH; - return $result; - - }else{ - //ERROR: No access! - $_SESSION['error_code'] = "403"; - header("Location: index.php?page=error"); - exit; - } - }else{ - //ERROR: not logged in! - header("Location: index.php"); - exit; - } -} \ No newline at end of file diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/show_ticket_log.php b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/show_ticket_log.php deleted file mode 100644 index 6d1ea9701..000000000 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/show_ticket_log.php +++ /dev/null @@ -1,67 +0,0 @@ -load_With_TId($result['ticket_id']); - $result['ticket_title'] = $target_ticket->getTitle(); - $ticket_logs = Ticket_Log::getLogsOfTicket( $result['ticket_id']); - $log_action_array = Ticket_Log::getActionTextArray(); - $result['ticket_logs'] = Gui_Elements::make_table($ticket_logs, Array("getTLogId","getTimestamp","getAuthor()->getExternId","getAction","getArgument()"), Array("tLogId","timestamp","authorExtern","action","argument")); - $i = 0; - foreach( $result['ticket_logs'] as $log){ - $webUser = new WebUsers($log['authorExtern']); - $author = $webUser->getUsername(); - $result['ticket_logs'][$i]['author'] = $author; - $query_backpart = ""; - if($log['action'] == 2){ - $webUser2 = new WebUsers($log['argument']); - $query_backpart = $webUser2->getUsername(); - }else if($log['action'] == 4){ - if (Helpers::check_if_game_client()) { - $query_backpart = "ID#" . $log['argument'] . ""; - }else{ - $query_backpart = "ID#" . $log['argument'] . ""; - } - }else if($log['action'] == 5){ - $statusArray = Ticket::getStatusArray(); - $query_backpart = $statusArray[$log['argument'] ]; - }else if($log['action'] == 6){ - $priorityArray = Ticket::getPriorityArray(); - $query_backpart = $priorityArray[$log['argument'] ]; - }else if($log['action'] == 8){ - if (Helpers::check_if_game_client()) { - $query_backpart = "" . Support_Group::getGroup($log['argument'])->getName() . ""; - }else{ - $query_backpart = "" . Support_Group::getGroup($log['argument'])->getName() . ""; - } - } - $result['ticket_logs'][$i]['query'] = $author . " " . $log_action_array[$log['action']] . " " . $query_backpart; - $result['ticket_logs'][$i]['timestamp_elapsed'] = Gui_Elements::time_elapsed_string($log['timestamp']); - $i++; - } - if(Ticket_User::isMod(unserialize($_SESSION['ticket_user']))){ - $result['isMod'] = "TRUE"; - } - global $INGAME_WEBPATH; - $result['ingame_webpath'] = $INGAME_WEBPATH; - return $result; - - }else{ - //ERROR: No access! - $_SESSION['error_code'] = "403"; - header("Location: index.php?page=error"); - exit; - } - }else{ - //ERROR: not logged in! - header("Location: index.php"); - exit; - } -} \ No newline at end of file diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/userlist.php b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/userlist.php deleted file mode 100644 index 2c408f683..000000000 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/inc/userlist.php +++ /dev/null @@ -1,30 +0,0 @@ -getElements() , Array("getUId","getUsername","getEmail"), Array("id","username","email")); - $pageResult['links'] = $pagination->getLinks(5); - $pageResult['lastPage'] = $pagination->getLast(); - $pageResult['currentPage'] = $pagination->getCurrent(); - - $i = 0; - foreach( $pageResult['userlist'] as $user ){ - $pageResult['userlist'][$i]['permission'] = Ticket_User::constr_ExternId($pageResult['userlist'][$i]['id'])->getPermission(); - $i++; - } - - if (Ticket_User::isAdmin(unserialize($_SESSION['ticket_user']))){ - $pageResult['isAdmin'] = "TRUE"; - } - global $INGAME_WEBPATH; - $pageResult['ingame_webpath'] = $INGAME_WEBPATH; - return $pageResult; - }else{ - //ERROR: No access! - $_SESSION['error_code'] = "403"; - header("Location: index.php?page=error"); - exit; - } -} \ No newline at end of file diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/userlist.tpl b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/userlist.tpl index bf39cc6ae..b6eab4abb 100644 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/userlist.tpl +++ b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/templates/userlist.tpl @@ -25,7 +25,7 @@ Show User {if isset($isAdmin) and $isAdmin eq 'TRUE' and $element.id neq 1} diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/todo.txt b/code/ryzom/tools/server/ryzom_ams/todo.txt similarity index 69% rename from code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/todo.txt rename to code/ryzom/tools/server/ryzom_ams/todo.txt index 20bb8235b..9c8b36197 100644 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/todo.txt +++ b/code/ryzom/tools/server/ryzom_ams/todo.txt @@ -2,4 +2,6 @@ -Make Permission www dependend, so it can be implemented in drupal with hook_permission(); -in helpers make_folders mkdir($value); should be drupal_mkdir(); -write backwards compatible script for existing nel db! --fix the callback in add_user_to_sgroup.php and show_sgroup.php in the func dir \ No newline at end of file +-fix the callback in add_user_to_sgroup.php and show_sgroup.php in the func dir +-add createPermissions function to www side. +-add db install stuff to drupal install file + create a matching admin link! diff --git a/code/ryzom/tools/server/ryzom_ams/www/config.php b/code/ryzom/tools/server/ryzom_ams/www/config.php index 25679ac64..1867875ba 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/config.php +++ b/code/ryzom/tools/server/ryzom_ams/www/config.php @@ -72,8 +72,14 @@ $CREATE_RING = true ; $AMS_LIB = dirname( dirname( __FILE__ ) ) . '/ams_lib'; $AMS_TRANS = $AMS_LIB . '/translations'; $AMS_CACHEDIR = $AMS_LIB . '/cache'; +//Here your inc and func resides $SITEBASE = dirname( __FILE__ ) . '/html/' ; -$WEBPATH ='http://localhost:40917' ; + +$BASE_WEBPATH = 'http://localhost:40917/www/html'; +$IMAGELOC_WEBPATH = 'http://localhost:40917'; +$WEBPATH = $BASE_WEBPATH . '/index.php'; +$INGAME_WEBPATH = $BASE_WEBPATH . '/index.php'; +$CONFIG_PATH = dirname( __FILE__ ); //defines the default language $DEFAULT_LANGUAGE = 'en'; @@ -87,4 +93,5 @@ $TIME_FORMAT = "m-d-Y H:i:s"; //defines which ingame layout template should be used $INGAME_LAYOUT = "basic"; +$FORCE_INGAME = false; diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/autoload/webusers.php b/code/ryzom/tools/server/ryzom_ams/www/html/autoload/webusers.php index 2311916fb..4e9ae845a 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/autoload/webusers.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/autoload/webusers.php @@ -59,10 +59,10 @@ class WebUsers extends Users{ * @return string Info: Returns true or false if a login match is found in the web db */ public function checkLoginMatch($username,$password){ + $dbw = new DBLayer("web"); $statement = $dbw->execute("SELECT * FROM ams_user WHERE Login=:user", array('user' => $username)); $row = $statement->fetch(); - $salt = substr($row['Password'],0,2); $hashed_input_pass = crypt($password, $salt); if($hashed_input_pass == $row['Password']){ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/blank.php b/code/ryzom/tools/server/ryzom_ams/www/html/blank.php deleted file mode 100644 index e6d4b3268..000000000 --- a/code/ryzom/tools/server/ryzom_ams/www/html/blank.php +++ /dev/null @@ -1,33 +0,0 @@ - - - -
- -
- -
-
-
-

Blank

-
- - - -
-
-
- -
-
- -
- - - diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/calendar.php b/code/ryzom/tools/server/ryzom_ams/www/html/calendar.php deleted file mode 100644 index 83f714dfe..000000000 --- a/code/ryzom/tools/server/ryzom_ams/www/html/calendar.php +++ /dev/null @@ -1,45 +0,0 @@ - - -
- -
- -
-
-
-

Calendar

-
- - - -
-
-
-
-

Draggable Events

-
Default
-
Completed
-
Warning
-
Important
-
Info
-
Other
-

- -

-
- -
- -
-
-
-
- - diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/chart.php b/code/ryzom/tools/server/ryzom_ams/www/html/chart.php deleted file mode 100644 index 10cd049ed..000000000 --- a/code/ryzom/tools/server/ryzom_ams/www/html/chart.php +++ /dev/null @@ -1,120 +0,0 @@ - - - -
- -
- -
- -
-
-

Chart with points

-
- - - -
-
-
-
-

Mouse position at (0, 0).

-
-
- -
-
-

Flot

-
- - - -
-
-
-
-
-
- -
-
-

Stack Example

-
- - - -
-
-
-
- -

- - -

- -

- - - -

-
-
- -
- -
-
-
-

Pie

-
- - - -
-
-
-
-
-
- -
-
-

Realtime

-
- - - -
-
-
-
-

You can update a chart periodically to get a real-time effect by using a timer to insert the new data in the plot and redraw it.

-

Time between updates: milliseconds

-
-
- -
-
-

Donut

-
- - - -
-
-
-
-
-
-
-
- - diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/file-manager.php b/code/ryzom/tools/server/ryzom_ams/www/html/file-manager.php deleted file mode 100644 index 251b42847..000000000 --- a/code/ryzom/tools/server/ryzom_ams/www/html/file-manager.php +++ /dev/null @@ -1,36 +0,0 @@ - - -
- -
- -
-
-
-

File Manager

-
- - - -
-
-
-
- - As its a demo, you currently have read-only permission, in your server you may do everything like, upload or delete. It will work on a server only. -
-
-
-
- -
- - - diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/footer.php b/code/ryzom/tools/server/ryzom_ams/www/html/footer.php deleted file mode 100644 index e7053a9c6..000000000 --- a/code/ryzom/tools/server/ryzom_ams/www/html/footer.php +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/form.php b/code/ryzom/tools/server/ryzom_ams/www/html/form.php deleted file mode 100644 index fce48a142..000000000 --- a/code/ryzom/tools/server/ryzom_ams/www/html/form.php +++ /dev/null @@ -1,333 +0,0 @@ - - - -
- -
- -
-
-
-

Form Elements

-
- - - -
-
-
-
-
- Datepicker, Autocomplete, WYSIWYG -
- -
- -

Start typing to activate auto complete!

-
-
-
- -
- -
-
- -
- -
- -
-
-
- -
- -
-
-
- - -
-
- - -
-
- -
- - -
-
-
-

Form Elements

-
- - - -
-
-
-
-
-
- -
- -
-
-
- -
- Some value here -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - Something may have gone wrong -
-
-
- -
- - Please correct the error -
-
-
- -
- - Woohoo! -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- - -
-
- - -
-
- -
- -
-
-
-

Form Elements

-
- - - -
-
-
-
-
-
- -
-
- @ -
-

Here's some help text

-
-
-
- -
-
- .00 -
- Here's more help text -
-
-
- -
-
- $.00 -
-
-
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
- -
- - - -
-
-
- -
- -
-
-
- -
- -
- -
-
-
- - -
-
- -
-
- -
- - diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/func/add_sgroup.php b/code/ryzom/tools/server/ryzom_ams/www/html/func/add_sgroup.php index 4a5ff8452..960ec2c6b 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/func/add_sgroup.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/func/add_sgroup.php @@ -1,10 +1,11 @@ getPermission(); + $result['permission'] = unserialize($_SESSION['ticket_user'])->getPermission(); $result['no_visible_elements'] = 'FALSE'; $result['username'] = $_SESSION['user']; - global $SITEBASE; - require_once($SITEBASE . 'inc/sgroup_list.php'); - $result= array_merge($result, sgroup_list()); - helpers :: loadtemplate( 'sgroup_list', $result); + //global $SITEBASE; + //require($SITEBASE . '/inc/sgroup_list.php'); + //$result= array_merge($result, sgroup_list()); + //return helpers :: loadtemplate( 'sgroup_list', $result, true); + if (Helpers::check_if_game_client()) { + header("Location: ".$INGAME_WEBPATH."?page=sgroup_list"); + }else{ + header("Location: ".$WEBPATH."?page=sgroup_list"); + } exit; }else{ @@ -36,4 +42,4 @@ function add_sgroup(){ exit; } -} \ No newline at end of file +} diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/func/add_user.php b/code/ryzom/tools/server/ryzom_ams/www/html/func/add_user.php index a7f17b0aa..2cb583061 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/func/add_user.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/func/add_user.php @@ -1,7 +1,7 @@ $_POST["Username"], 'Password' => $_POST["Password"], 'ConfirmPass' => $_POST["ConfirmPass"], 'Email' => $_POST["Email"]); $webUser = new WebUsers(); $result = $webUser->check_Register($params); @@ -20,6 +20,7 @@ function add_user(){ $status = write_user( $edit ); $pageElements['status'] = $status; $pageElements['no_visible_elements'] = 'TRUE'; + $pageElements['ingame_webpath'] = $INGAME_WEBPATH; helpers :: loadtemplate( 'register_feedback', $pageElements); exit; }else{ @@ -29,6 +30,7 @@ function add_user(){ $result['prevConfirmPass'] = $_POST["ConfirmPass"]; $result['prevEmail'] = $_POST["Email"]; $result['no_visible_elements'] = 'TRUE'; + $pageElements['ingame_webpath'] = $INGAME_WEBPATH; helpers :: loadtemplate( 'register', $result); exit; } diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/func/add_user_to_sgroup.php b/code/ryzom/tools/server/ryzom_ams/www/html/func/add_user_to_sgroup.php index 3eb79b928..e4d46e610 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/func/add_user_to_sgroup.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/func/add_user_to_sgroup.php @@ -1,10 +1,11 @@ getPermission(); + $result['permission'] = unserialize($_SESSION['ticket_user'])->getPermission(); $result['no_visible_elements'] = 'FALSE'; $result['username'] = $_SESSION['user']; - global $SITEBASE; - require_once($SITEBASE . 'inc/show_sgroup.php'); - $result= array_merge($result, show_sgroup()); - helpers :: loadtemplate( 'show_sgroup', $result); + //global $SITEBASE; + //require_once($SITEBASE . 'inc/show_sgroup.php'); + //$result= array_merge($result, show_sgroup()); + //helpers :: loadtemplate( 'show_sgroup', $result); + if (Helpers::check_if_game_client()) { + header("Location: ".$INGAME_WEBPATH."?page=show_sgroup&id=".$id); + }else{ + header("Location: ".$WEBPATH."?page=show_sgroup&id=".$id); + } exit; }else{ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/func/change_info.php b/code/ryzom/tools/server/ryzom_ams/www/html/func/change_info.php index 311935e9c..1fb0f10c0 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/func/change_info.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/func/change_info.php @@ -9,7 +9,7 @@ function change_info(){ if(isset($_POST['target_id'])){ - if( ($_POST['target_id'] == $_SESSION['id']) || Ticket_User::isMod($_SESSION['ticket_user'] ) ){ + if( ($_POST['target_id'] == $_SESSION['id']) || Ticket_User::isMod(unserialize($_SESSION['ticket_user']) ) ){ if($_POST['target_id'] == $_SESSION['id']){ $target_username = $_SESSION['user']; }else{ @@ -77,15 +77,17 @@ function change_info(){ } global $SITEBASE; - require_once($SITEBASE . 'inc/settings.php'); + require_once($SITEBASE . '/inc/settings.php'); $result = settings(); if($updated){ $result['info_updated'] = "OK"; } - $result['permission'] = $_SESSION['ticket_user']->getPermission(); + $result['permission'] = unserialize($_SESSION['ticket_user'])->getPermission(); $result['username'] = $_SESSION['user']; $result['no_visible_elements'] = 'FALSE'; $result['target_id'] = $_POST['target_id']; + global $INGAME_WEBPATH; + $result['ingame_webpath'] = $INGAME_WEBPATH; helpers :: loadtemplate( 'settings', $result); exit; @@ -112,4 +114,4 @@ function change_info(){ print_r($e); exit; } -} \ No newline at end of file +} diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/func/change_mail.php b/code/ryzom/tools/server/ryzom_ams/www/html/func/change_mail.php index f807e46b5..f04648343 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/func/change_mail.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/func/change_mail.php @@ -9,7 +9,7 @@ function change_mail(){ if(isset($_POST['target_id'])){ - if( ($_POST['target_id'] == $_SESSION['id']) || Ticket_User::isMod($_SESSION['ticket_user']) ){ + if( ($_POST['target_id'] == $_SESSION['id']) || Ticket_User::isMod(unserialize($_SESSION['ticket_user'])) ){ if($_POST['target_id'] == $_SESSION['id']){ $target_username = $_SESSION['user']; }else{ @@ -21,7 +21,7 @@ function change_mail(){ $reply = $webUser->checkEmail($_POST['NewEmail']); global $SITEBASE; - require_once($SITEBASE . 'inc/settings.php'); + require_once($SITEBASE . '/inc/settings.php'); $result = settings(); if ( $reply != "success" ){ @@ -38,12 +38,12 @@ function change_mail(){ }else if($status == 'shardoffline'){ $result['SUCCESS_MAIL'] = "SHARDOFF"; } - $result['permission'] = $_SESSION['ticket_user']->getPermission(); + $result['permission'] = unserialize($_SESSION['ticket_user'])->getPermission(); $result['no_visible_elements'] = 'FALSE'; $result['username'] = $_SESSION['user']; $result['target_id'] = $_POST['target_id']; if(isset($_GET['id'])){ - if(Ticket_User::isMod($_SESSION['ticket_user']) && ($_POST['target_id'] != $_SESSION['id'])){ + if(Ticket_User::isMod(unserialize($_SESSION['ticket_user'])) && ($_POST['target_id'] != $_SESSION['id'])){ $result['isMod'] = "TRUE"; } } @@ -52,12 +52,12 @@ function change_mail(){ }else{ $result['EMAIL'] = $reply; - $result['permission'] = $_SESSION['ticket_user']->getPermission(); + $result['permission'] = unserialize($_SESSION['ticket_user'])->getPermission(); $result['no_visible_elements'] = 'FALSE'; $result['username'] = $_SESSION['user']; $result['target_id'] = $_POST['target_id']; if(isset($_GET['id'])){ - if(Ticket_User::isMod($_SESSION['ticket_user']) && ($_POST['target_id'] != $_SESSION['id'])){ + if(Ticket_User::isMod(unserialize($_SESSION['ticket_user'])) && ($_POST['target_id'] != $_SESSION['id'])){ $result['isMod'] = "TRUE"; } } @@ -91,4 +91,3 @@ function change_mail(){ } - diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/func/change_password.php b/code/ryzom/tools/server/ryzom_ams/www/html/func/change_password.php index ab4a71892..420d78103 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/func/change_password.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/func/change_password.php @@ -9,7 +9,7 @@ function change_password(){ if(isset($_POST['target_id'])){ $adminChangesOther = false; //if target_id is the same as session id or is admin - if( ($_POST['target_id'] == $_SESSION['id']) || Ticket_User::isMod($_SESSION['ticket_user']) ){ + if( ($_POST['target_id'] == $_SESSION['id']) || Ticket_User::isMod(unserialize($_SESSION['ticket_user'])) ){ if($_POST['target_id'] == $_SESSION['id']){ $target_username = $_SESSION['user']; }else{ @@ -26,16 +26,15 @@ function change_password(){ if ($result == "success"){ //edit stuff into db global $SITEBASE; - require_once($SITEBASE . 'inc/settings.php'); + require_once($SITEBASE . '/inc/settings.php'); $succresult = settings(); - $hashpass = crypt($_POST["NewPass"], WebUsers::generateSALT()); - $status = WebUsers::setPassword($target_username, $hashpass); + $status = WebUsers::setPassword($target_username, $_POST["NewPass"]); if($status == 'ok'){ $succresult['SUCCESS_PASS'] = "OK"; }else if($status == 'shardoffline'){ $succresult['SUCCESS_PASS'] = "SHARDOFF"; } - $succresult['permission'] = $_SESSION['ticket_user']->getPermission(); + $succresult['permission'] = unserialize($_SESSION['ticket_user'])->getPermission(); $succresult['no_visible_elements'] = 'FALSE'; $succresult['username'] = $_SESSION['user']; $succresult['target_id'] = $_POST['target_id']; @@ -47,13 +46,13 @@ function change_password(){ $result['prevCurrentPass'] = filter_var($_POST["CurrentPass"], FILTER_SANITIZE_STRING); $result['prevNewPass'] = filter_var($_POST["NewPass"], FILTER_SANITIZE_STRING); $result['prevConfirmNewPass'] = filter_var($_POST["ConfirmNewPass"], FILTER_SANITIZE_STRING); - $result['permission'] = $_SESSION['ticket_user']->getPermission(); + $result['permission'] = unserialize($_SESSION['ticket_user'])->getPermission(); $result['no_visible_elements'] = 'FALSE'; $result['username'] = $_SESSION['user']; $result['target_id'] = $_POST['target_id']; global $SITEBASE; - require_once($SITEBASE . 'inc/settings.php'); + require_once($SITEBASE . '/inc/settings.php'); $settings = settings(); $result = array_merge($result,$settings); @@ -87,4 +86,3 @@ function change_password(){ } - diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/func/change_receivemail.php b/code/ryzom/tools/server/ryzom_ams/www/html/func/change_receivemail.php index 85cbec965..5bfba0b8d 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/func/change_receivemail.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/func/change_receivemail.php @@ -4,18 +4,24 @@ function change_receivemail(){ try{ //if logged in + global $INGAME_WEBPATH; + global $WEBPATH; if(WebUsers::isLoggedIn()){ if(isset($_POST['target_id'])){ - if( ( ($_POST['target_id'] == $_SESSION['id']) || Ticket_User::isMod($_SESSION['ticket_user'])) && isset($_POST['ReceiveMail']) ){ + if( ( ($_POST['target_id'] == $_SESSION['id']) || Ticket_User::isMod(unserialize($_SESSION['ticket_user']))) && isset($_POST['ReceiveMail']) ){ $user_id = filter_var($_POST['target_id'], FILTER_SANITIZE_NUMBER_INT); $receiveMail = filter_var($_POST['ReceiveMail'], FILTER_SANITIZE_NUMBER_INT); if($receiveMail == 0 || $receiveMail == 1){ WebUsers::setReceiveMail($user_id, $receiveMail); } - header("Location: index.php?page=settings&id=".$user_id); + if (Helpers::check_if_game_client()) { + header("Location: ".$INGAME_WEBPATH."?page=settings&id=".$user_id); + }else{ + header("Location: ".$WEBPATH."?page=settings&id=".$user_id); + } exit; }else{ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/func/create_ticket.php b/code/ryzom/tools/server/ryzom_ams/www/html/func/create_ticket.php index 5fce2d9de..cf497dabf 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/func/create_ticket.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/func/create_ticket.php @@ -2,24 +2,30 @@ function create_ticket(){ //if logged in + global $INGAME_WEBPATH; + global $WEBPATH; if(WebUsers::isLoggedIn() && isset($_SESSION['ticket_user'])){ if(isset($_POST['target_id'])){ //if target_id is the same as session id or is admin - if( ($_POST['target_id'] == $_SESSION['id']) || Ticket_User::isMod($_SESSION['ticket_user']) ){ + if( ($_POST['target_id'] == $_SESSION['id']) || Ticket_User::isMod(unserialize($_SESSION['ticket_user'])) ){ $category = filter_var($_POST['Category'], FILTER_SANITIZE_NUMBER_INT); $title = filter_var($_POST['Title'], FILTER_SANITIZE_STRING); $content = filter_var($_POST['Content'], FILTER_SANITIZE_STRING); try{ if($_POST['target_id'] == $_SESSION['id']){ - $author = $_SESSION['ticket_user']->getTUserId(); + $author = unserialize($_SESSION['ticket_user'])->getTUserId(); }else{ $author= Ticket_User::constr_ExternId($_POST['target_id'])->getTUserId(); } - $ticket_id = Ticket::create_Ticket($title, $content, $category, $author, $_SESSION['ticket_user']->getTUserId(),0, $_POST); - header("Location: index.php?page=show_ticket&id=".$ticket_id); + $ticket_id = Ticket::create_Ticket($title, $content, $category, $author, unserialize($_SESSION['ticket_user'])->getTUserId(),0, $_POST); + if (Helpers::check_if_game_client()) { + header("Location: ".$INGAME_WEBPATH."?page=show_ticket&id=".$ticket_id); + }else{ + header("Location: ".$WEBPATH."?page=show_ticket&id=".$ticket_id); + } exit; }catch (PDOException $e) { diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/func/login.php b/code/ryzom/tools/server/ryzom_ams/www/html/func/login.php index da3b29478..6841b7ffd 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/func/login.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/func/login.php @@ -1,21 +1,27 @@ getLanguage(); - + //go back to the index page. - header( 'Location: index.php' ); + if (Helpers::check_if_game_client()) { + header( 'Location: '. $INGAME_WEBPATH ); + }else{ + header( 'Location: '. $WEBPATH ); + } exit; }else{ //handle login failure diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/func/modify_email_of_sgroup.php b/code/ryzom/tools/server/ryzom_ams/www/html/func/modify_email_of_sgroup.php index bf842feff..9befa9ae4 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/func/modify_email_of_sgroup.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/func/modify_email_of_sgroup.php @@ -1,10 +1,11 @@ getPermission(); + $result['permission'] = unserialize($_SESSION['ticket_user'])->getPermission(); $result['no_visible_elements'] = 'FALSE'; $result['username'] = $_SESSION['user']; - global $SITEBASE; - require_once($SITEBASE . 'inc/show_sgroup.php'); - $result= array_merge($result, show_sgroup()); - helpers :: loadtemplate( 'show_sgroup', $result); + //global $SITEBASE; + //require_once($SITEBASE . 'inc/show_sgroup.php'); + //$result= array_merge($result, show_sgroup()); + //helpers :: loadtemplate( 'show_sgroup', $result); + if (Helpers::check_if_game_client()) { + header("Location: ".$INGAME_WEBPATH."?page=show_sgroup&id=".$sgroupid); + }else{ + header("Location: ".$WEBPATH."?page=show_sgroup&id=".$sgroupid); + } exit; }else{ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/func/reply_on_ticket.php b/code/ryzom/tools/server/ryzom_ams/www/html/func/reply_on_ticket.php index 76f8ee71e..e7841906f 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/func/reply_on_ticket.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/func/reply_on_ticket.php @@ -1,32 +1,40 @@ load_With_TId($ticket_id); - if(($target_ticket->getAuthor() == $_SESSION['ticket_user']->getTUserId()) || Ticket_User::isMod($_SESSION['ticket_user']) ){ + if(($target_ticket->getAuthor() == unserialize($_SESSION['ticket_user'])->getTUserId()) || Ticket_User::isMod(unserialize($_SESSION['ticket_user'])) ){ try{ - $author = $_SESSION['ticket_user']->getTUserId(); - - $content = $_POST['Content']; + $author = unserialize($_SESSION['ticket_user'])->getTUserId(); + if(isset($_POST['Content'])){ + $content = $_POST['Content']; + }else{ + $content=""; + } $hidden = 0; - if(isset($_POST['hidden']) && Ticket_User::isMod($_SESSION['ticket_user'])){ + if(isset($_POST['hidden']) && Ticket_User::isMod(unserialize($_SESSION['ticket_user']))){ $hidden = 1; } Ticket::createReply($content, $author, $ticket_id, $hidden); - if(isset($_POST['ChangeStatus']) && isset($_POST['ChangePriority']) && Ticket_User::isMod($_SESSION['ticket_user'])){ + if(isset($_POST['ChangeStatus']) && isset($_POST['ChangePriority']) && Ticket_User::isMod(unserialize($_SESSION['ticket_user']))){ $newStatus = filter_var($_POST['ChangeStatus'], FILTER_SANITIZE_NUMBER_INT); $newPriority = filter_var($_POST['ChangePriority'], FILTER_SANITIZE_NUMBER_INT); Ticket::updateTicketStatusAndPriority($ticket_id,$newStatus, $newPriority, $author); } - header("Location: index.php?page=show_ticket&id=".$ticket_id); + if (Helpers::check_if_game_client()) { + header("Location: ".$INGAME_WEBPATH."?page=show_ticket&id=".$ticket_id); + }else{ + header("Location: ".$WEBPATH."?page=show_ticket&id=".$ticket_id); + } exit; }catch (PDOException $e) { diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/gallery.php b/code/ryzom/tools/server/ryzom_ams/www/html/gallery.php deleted file mode 100644 index a822e00ab..000000000 --- a/code/ryzom/tools/server/ryzom_ams/www/html/gallery.php +++ /dev/null @@ -1,41 +0,0 @@ - - -
- -
- -
-
-
-

Gallery

-
- - - -
-
-
-

- -

-
-
    - -
  • - Sample Image <?php echo $i ?> -
    • - -
-
-
- -
- - diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/grid.php b/code/ryzom/tools/server/ryzom_ams/www/html/grid.php deleted file mode 100644 index cd278aa3d..000000000 --- a/code/ryzom/tools/server/ryzom_ams/www/html/grid.php +++ /dev/null @@ -1,240 +0,0 @@ - - - -
- -
- -
-
-
-

Grid 12

-
- - - -
-
-
-
-
span 4
-
span 4
-
span 4
-
-
-
-
- -
-
-
-

Grid 3

-
- -
-
-
-
-
span 4
-
span 4
-
span 4
-
-
-
-
-
-

Grid 3

-
- -
-
-
-
-
span 4
-
span 4
-
span 4
-
-
-
-
-
-

Grid 3

-
- -
-
-
-
-
span 4
-
span 4
-
span 4
-
-
-
-
-
-

Plain

-
-
-
-
span 4
-
span 4
-
span 4
-
-
-
-
- -
-
-
-

Grid 6

-
- - - -
-
-
-
-
span 4
-
span 4
-
span 4
-
-
-
- -
-
-

Grid 6

-
- - - -
-
-
-
-
span 4
-
span 4
-
span 4
-
-
-
-
-
-
-
-

Grid 4

-
- - - -
-
-
-
-
span 4
-
span 4
-
span 4
-
-
-
- -
-
-

Grid 4

-
- - - -
-
-
-
-
span 4
-
span 4
-
span 4
-
-
-
- -
-
-

Grid 4

-
- - - -
-
-
-
-
span 4
-
span 4
-
span 4
-
-
-
-
- -
-
-
-

Box less area

-

The flat boxes can be created using grids. But you can also use grids inside grids, which makes the layout 100% flexible!

-
-
-
- -
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
- -
-
4
-
4
-
4
-
- -
-
3
-
3
-
3
-
3
-
- -
-
4
-
8
-
- -
-
6
-
6
-
- -
-
12
-
- - - diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/header.php b/code/ryzom/tools/server/ryzom_ams/www/html/header.php deleted file mode 100644 index c3af26217..000000000 --- a/code/ryzom/tools/server/ryzom_ams/www/html/header.php +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - Free HTML5 Bootstrap Admin Template - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- - - - - - Charisma Logo Charisma - - -
- - Change Theme / Skin - - - -
- - - -
- - admin - - - -
- - -
- -
-
-
-
- - -
-
- - - -
-
- - -
-
- - - - -
- - diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/icon.php b/code/ryzom/tools/server/ryzom_ams/www/html/icon.php deleted file mode 100644 index 071b4252d..000000000 --- a/code/ryzom/tools/server/ryzom_ams/www/html/icon.php +++ /dev/null @@ -1,355 +0,0 @@ - - - -
- -
- -
-
-
-

Icons

-
- - - -
-
-
-
-
-

Icons Graciously provided by Glyphicons

-
-
-
-
    -
  • icon-glass
    • -
  • icon-music
    • -
  • icon-search
    • -
  • icon-envelope
    • -
  • icon-heart
    • -
  • icon-star
    • -
  • icon-star-empty
    • -
  • icon-user
    • -
  • icon-film
    • -
  • icon-th-large
    • -
  • icon-th
    • -
  • icon-th-list
    • -
  • icon-ok
    • -
  • icon-remove
    • -
  • icon-zoom-in
    • -
  • icon-zoom-out
    • -
  • icon-off
    • -
  • icon-signal
    • -
  • icon-cog
    • -
  • icon-trash
    • -
  • icon-home
    • -
  • icon-file
    • -
  • icon-time
    • -
  • icon-road
    • -
  • icon-download-alt
    • -
  • icon-download
    • -
  • icon-upload
    • -
  • icon-inbox
    • -
  • icon-play-circle
    • -
  • icon-repeat
    • -
  • icon-refresh
    • -
  • icon-list-alt
    • -
  • icon-lock
    • -
  • icon-flag
    • -
  • icon-headphones
    • -
-
-
-
    -
  • icon-volume-off
    • -
  • icon-volume-down
    • -
  • icon-volume-up
    • -
  • icon-qrcode
    • -
  • icon-barcode
    • -
  • icon-tag
    • -
  • icon-tags
    • -
  • icon-book
    • -
  • icon-bookmark
    • -
  • icon-print
    • -
  • icon-camera
    • -
  • icon-font
    • -
  • icon-bold
    • -
  • icon-italic
    • -
  • icon-text-height
    • -
  • icon-text-width
    • -
  • icon-align-left
    • -
  • icon-align-center
    • -
  • icon-align-right
    • -
  • icon-align-justify
    • -
  • icon-list
    • -
  • icon-indent-left
    • -
  • icon-indent-right
    • -
  • icon-facetime-video
    • -
  • icon-picture
    • -
  • icon-pencil
    • -
  • icon-map-marker
    • -
  • icon-adjust
    • -
  • icon-tint
    • -
  • icon-edit
    • -
  • icon-share
    • -
  • icon-check
    • -
  • icon-move
    • -
  • icon-step-backward
    • -
  • icon-fast-backward
    • -
-
-
-
    -
  • icon-backward
    • -
  • icon-play
    • -
  • icon-pause
    • -
  • icon-stop
    • -
  • icon-forward
    • -
  • icon-fast-forward
    • -
  • icon-step-forward
    • -
  • icon-eject
    • -
  • icon-chevron-left
    • -
  • icon-chevron-right
    • -
  • icon-plus-sign
    • -
  • icon-minus-sign
    • -
  • icon-remove-sign
    • -
  • icon-ok-sign
    • -
  • icon-question-sign
    • -
  • icon-info-sign
    • -
  • icon-screenshot
    • -
  • icon-remove-circle
    • -
  • icon-ok-circle
    • -
  • icon-ban-circle
    • -
  • icon-arrow-left
    • -
  • icon-arrow-right
    • -
  • icon-arrow-up
    • -
  • icon-arrow-down
    • -
  • icon-share-alt
    • -
  • icon-resize-full
    • -
  • icon-resize-small
    • -
  • icon-plus
    • -
  • icon-minus
    • -
  • icon-asterisk
    • -
  • icon-exclamation-sign
    • -
  • icon-gift
    • -
  • icon-leaf
    • -
  • icon-fire
    • -
  • icon-eye-open
    • -
-
-
-
    -
  • icon-eye-close
    • -
  • icon-warning-sign
    • -
  • icon-plane
    • -
  • icon-calendar
    • -
  • icon-random
    • -
  • icon-comment
    • -
  • icon-magnet
    • -
  • icon-chevron-up
    • -
  • icon-chevron-down
    • -
  • icon-retweet
    • -
  • icon-shopping-cart
    • -
  • icon-folder-close
    • -
  • icon-folder-open
    • -
  • icon-resize-vertical
    • -
  • icon-resize-horizontal
    • -
  • icon-hdd
    • -
  • icon-bullhorn
    • -
  • icon-bell
    • -
  • icon-certificate
    • -
  • icon-thumbs-up
    • -
  • icon-thumbs-down
    • -
  • icon-hand-right
    • -
  • icon-hand-left
    • -
  • icon-hand-up
    • -
  • icon-hand-down
    • -
  • icon-circle-arrow-right
    • -
  • icon-circle-arrow-left
    • -
  • icon-circle-arrow-up
    • -
  • icon-circle-arrow-down
    • -
  • icon-globe
    • -
  • icon-wrench
    • -
  • icon-tasks
    • -
  • icon-filter
    • -
  • icon-briefcase
    • -
  • icon-fullscreen
    • -
-
-
- -
- -
-
-

Built as a sprite

-

Instead of making every icon an extra request, we've compiled them into a sprite—a bunch of images in one file that uses CSS to position the images with background-position. This is the same method we use on Twitter.com and it has worked well for us.

-

All icons classes are prefixed with .icon- for proper namespacing and scoping, much like our other components. This will help avoid conflicts with other tools.

-
-
-

How to use

-

Bootstrap uses an <i> tag for all icons, but they have no case class—only a shared prefix. To use, place the following code just about anywhere:

- 
<i class="icon-search"></i>
-

There are also styles available for inverted (white) icons, made ready with one extra class:

- 
<i class="icon-search icon-white"></i>
-
In dark themes (Cyborg and Slate) normal icons become white and icon-white become black.
-

There are 140 classes to choose from for your icons. Just add an <i> tag with the right classes and you're set. You can find the full list in sprites.less or right here in this document.

-

- Heads up! - When using beside strings of text, as in buttons or nav links, be sure to leave a space after the <i> tag for proper spacing. -

-
-
-

Use cases

-

Icons are great, but where would one use them? Here are a few ideas:

-
    -
  • As visuals for your sidebar navigation
    • -
  • For a purely icon-driven navigation
    • -
  • For buttons to help convey the meaning of an action
    • -
  • With links to share context on a user's destination
    • -
-

Essentially, anywhere you can put an <i> tag, you can put an icon.

-
-
- -

Examples

-

Use them in buttons, button groups for a toolbar, navigation, or prepended form inputs.

-
-
-
-
- - - - -
-
- User - - -
-
-

- Refresh - Checkout - Delete -

-

- Comment - Settings - More Info -

-
-
-
- -
-
-
-
-
- -
-
- -
-
-
- -
-
-
- -
-
-

More Icons Icon sets from the Opa library

-
-
-
-

Icon sets

-

Default icon set has gray style suitable for white and light backgrounds, but a number of functional classes can be applied for different icon color styles. - These classes include a 5-color (blue, green, red, yellow and gray) .icon-color class, a black .icon-black class, a white .icon-white class, and a dark-gray .icon-darkgray class. -

- Note: place your cursor on the chosen icon image to see its class. -
-
-
-

Default Icon Sets

-

Default icon classes .icon or .icon32 are best suitable for white and light backgrounds.

-

16x16 pixels icon set

-

Set .icon class for 16x16 pixels icon followed by a class corresponding to the chosen image.

- 
<span class="icon icon-home"/>
-
-

32x32 pixels icon set

Set .icon32 class for 32x32 pixels icon followed by a class corresponding to the chosen image.

<span class="icon32 icon-user"/>

Special class for the whole section

To use gray icon set for the whole section set .icons-gray class on the parent element.

- 
<div class="icons-gray">
-	<span class="icon icon-add"/>
-	<span class="icon icon-remove"/>
-</div>
-
-

Dark-gray Icon Sets

Dark-gray icon sets are used for default :hover effect. - The .icon-darkgray class should be used for the icons on light and middle gray backgrounds.

16x16 pixels icon set

Set .icon class for 16x16 pixels icon, then .icon-darkgray class for color and a class corresponding to the chosen image.

<span class="icon icon-darkgray icon-add"/>

32x32 pixels icon set

Set .icon32 class for 32x32 pixels icon, then .icon-darkgray class for color and a class corresponding to the chosen image.

<span class="icon32 icon-darkgray icon-remove"/>

Special class for the whole section

To use dark-gray icon set for the whole section set .icons-darkgray class on the parent element.

<div class="icons-darkgray">
-	<span class="icon icon-add"/>
-	<span class="icon icon-remove"/>
-</div>

Color Icon Sets

Color icon sets are used for default .active icon effect. - The .icon-color class should be used for the icons on white and light backgrounds.

16x16 pixels icon set

Set .icon class for 16x16 pixels icon, then .icon-color class for color and a class corresponding to the chosen image.

<span class="icon icon-color icon-triangle-n"/>

32x32 pixels icon set

Set .icon32 class for 32x32 pixels icon, then .icon-color class for color and a class corresponding to the chosen image.

<span class="icon32 icon-color icon-triangle-s"/>

Special class for the whole section

To use color icon set for the whole section set .icons-color - class on the parent element.

<div class="icons-color">
-	<span class="icon icon-triangle-n"/>
-	<span class="icon icon-triangle-s"/>
-</div>

Black Icon Sets

The .icon-black class could be used for the icons on light and middle gray backgrounds.

16x16 pixels icon set

Set .icon class for 16x16 pixels icon, then .icon-black class for color and a class corresponding to the chosen image.

<span class="icon icon-black icon-folder-open"/>

32x32 pixels icon set

Set .icon32 class for 32x32 pixels icon, then .icon-black class for color and a class corresponding to the chosen image.

<span class="icon32 icon-black icon-folder-collapsed"/>

Special class for the whole section

To use black icon set for the whole section set .icons-black - class on the parent element.

<div class="icons-black">
-	<span class="icon icon-folder-open"/>
-	<span class="icon icon-folder-collapsed"/>
-</div>
-

White Icon Sets

The .icon-white class should be used for the icons on vivid and dark backgrounds.

16x16 pixels icon set

Set .icon class for 16x16 pixels icon, then .icon-white class for color and a class corresponding to the chosen image.

<span class="icon icon-white icon-bullet-on"/>

32x32 pixels icon set

Set .icon32 class for 32x32 pixels icon, then .icon-white class for color and a class corresponding to the chosen image.

<span class="icon32 icon-white icon-bullet-off"/>

Special class for the whole section

To use white icon set for the whole section set .icons-white class on the parent element.

<div class="icons-white">
-	<span class="icon icon-bullet-on"/>
-	<span class="icon icon-bullet-off"/>
-</div>
-

Blue Icon Sets

The .icon-blue class could be used for the icons on light or dark backgrounds.

16x16 pixels icon set

Set .icon class for 16x16 pixels icon, then .icon-blue class for color and a class corresponding to the chosen image.

<span class="icon icon-blue icon-carat-1-n"/>

32x32 pixels icon set

Set .icon32 class for 32x32 pixels icon, then .icon-blue class for color and a class corresponding to the chosen image.

<span class="icon32 icon-blue icon-carat-1-s"/>

Special class for the whole section

To use blue icon set for the whole section set .icons-blue - class on the parent element.

<div class="icons-blue">
-	<span class="icon icon-carat-1-n"/>
-	<span class="icon icon-carat-1-s"/>
-</div>
-

Green Icon Sets

The .icon-green class could be used for the icons on light or dark backgrounds.

16x16 pixels icon set

Set .icon class for 16x16 pixels icon, then .icon-green class for color and a class corresponding to the chosen image.

<span class="icon icon-green icon-arrow-e"/>

32x32 pixels icon set

Set .icon32 class for 32x32 pixels icon, then .icon-green class for color and a class corresponding to the chosen image.

<span class="icon32 icon-green icon-arrow-w"/>

Special class for the whole section

To use green icon set for the whole section set .icons-green - class on the parent element.

<div class="icons-green">
-	<span class="icon icon-arrow-e"/>
-	<span class="icon icon-arrow-w"/>
-</div>
-

Red Icon Sets

The .icon-red class could be used for the icons on light or dark backgrounds.

16x16 pixels icon set

Set .icon class for 16x16 pixels icon, then .icon-red class for color and a class corresponding to the chosen image.

<span class="icon icon-red icon-arrowthick-ne"/>

32x32 pixels icon set

Set .icon32 class for 32x32 pixels icon, then .icon-red class for color and a class corresponding to the chosen image.

<span class="icon32 icon-red icon-arrowthick-sw"/>

Special class for the whole section

To use red icon set for the whole section set .icons-red - class on the parent element.

<div class="icons-red">
-	<span class="icon icon-arrowthick-ne"/>
-	<span class="icon icon-arrowthick-sw"/>
-</div>
-

Orange Icon Sets

The .icon-orange class could be used for the icons on light or dark backgrounds.

16x16 pixels icon set

Set .icon class for 16x16 pixels icon, then .icon-orange class for color and a class corresponding to the chosen image.

<span class="icon icon-orange icon-undo"/>

32x32 pixels icon set

Set .icon32 class for 32x32 pixels icon, then .icon-orange class for color and a class corresponding to the chosen image.

<span class="icon32 icon-orange icon-redo"/>

Special class for the whole section

To use orange icon set for the whole section set .icons-orange - class on the parent element.

<div class="icons-orange">
-	<span class="icon icon-undo"/>
-	<span class="icon icon-redo"/>
-</div>
-
- - -
-
-
- -
- - diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/change_permission.php b/code/ryzom/tools/server/ryzom_ams/www/html/inc/change_permission.php index 084aa3923..35f561290 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/inc/change_permission.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/inc/change_permission.php @@ -1,24 +1,33 @@ getTUserId(), $value); - header("Location: index.php?page=show_user&id=".$user_id); + if (Helpers::check_if_game_client()) { + header("Location: ".$INGAME_WEBPATH."?page=show_user&id=".$user_id); + }else{ + header("Location: ".$WEBPATH."?page=show_user&id=".$user_id); + } exit; }else{ //ERROR: GET PARAMS not given or trying to change admin - header("Location: index.php?page=show_user&id=".$user_id); + if (Helpers::check_if_game_client()) { + header("Location: ".$INGAME_WEBPATH."?page=show_user&id=".$user_id); + }else{ + header("Location: ".$WEBPATH."?page=show_user&id=".$user_id); + } exit; } diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/createticket.php b/code/ryzom/tools/server/ryzom_ams/www/html/inc/createticket.php index 40b6610ec..3fdb54b84 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/inc/createticket.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/inc/createticket.php @@ -7,7 +7,7 @@ function createticket(){ //in case user_id-GET param set it's value as target_id, if no user_id-param is given, use the session id. if(isset($_GET['user_id'])){ - if(($_GET['user_id'] != $_SESSION['id']) && ( ! ticket_user::isMod($_SESSION['ticket_user'])) ){ + if(($_GET['user_id'] != $_SESSION['id']) && ( ! ticket_user::isMod(unserialize($_SESSION['ticket_user']))) ){ //ERROR: No access! $_SESSION['error_code'] = "403"; @@ -35,6 +35,8 @@ function createticket(){ //create array of category id & names $catArray = Ticket_Category::getAllCategories(); $result['category'] = Gui_Elements::make_table_with_key_is_id($catArray, Array("getName"), "getTCategoryId" ); + global $INGAME_WEBPATH; + $result['ingame_webpath'] = $INGAME_WEBPATH; return $result; }else{ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/dashboard.php b/code/ryzom/tools/server/ryzom_ams/www/html/inc/dashboard.php index 980da3cb1..74475dcd1 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/inc/dashboard.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/inc/dashboard.php @@ -1,19 +1,22 @@ getTUserId(); - $result['nrToDo'] = Ticket_Queue_Handler::getNrOfTicketsToDo($_SESSION['ticket_user']->getTUserId()); - $result['nrAssignedWaiting'] = Ticket_Queue_Handler::getNrOfTicketsAssignedWaiting($_SESSION['ticket_user']->getTUserId()); + if(ticket_user::isMod(unserialize($_SESSION['ticket_user']))){ + $result['user_id'] = unserialize($_SESSION['ticket_user'])->getTUserId(); + $result['nrToDo'] = Ticket_Queue_Handler::getNrOfTicketsToDo(unserialize($_SESSION['ticket_user'])->getTUserId()); + $result['nrAssignedWaiting'] = Ticket_Queue_Handler::getNrOfTicketsAssignedWaiting(unserialize($_SESSION['ticket_user'])->getTUserId()); $result['nrTotalTickets'] = Ticket_Queue_Handler::getNrOfTickets(); $ticket = Ticket_Queue_Handler::getNewestTicket(); $result['newestTicketId'] = $ticket->getTId(); $result['newestTicketTitle'] = $ticket->getTitle(); $result['newestTicketAuthor'] = Ticket_User::get_username_from_id($ticket->getAuthor()); + global $INGAME_WEBPATH; + $result['ingame_webpath'] = $INGAME_WEBPATH; return $result; }else{ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/login.php b/code/ryzom/tools/server/ryzom_ams/www/html/inc/login.php index 745d48288..4d04f3cc7 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/inc/login.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/inc/login.php @@ -1,6 +1,8 @@ getInfo(); - if(Ticket_User::isMod($_SESSION['ticket_user']) && ($_GET['id']!= $_SESSION['id'])){ + if(Ticket_User::isMod(unserialize($_SESSION['ticket_user'])) && ($_GET['id']!= $_SESSION['id'])){ $result['changesOther'] = "TRUE"; } $result['target_id'] = $_GET['id']; $result['current_mail'] = $webUser->getEmail(); + $result['target_username'] = $webUser->getUsername(); } }else{ $webUser = new Webusers($_SESSION['id']); $result = $webUser->getInfo(); $result['target_id'] = $_SESSION['id']; - $result['current_mail'] = $webUser->getEmail(); + $result['current_mail'] = $webUser->getEmail(); + $result['target_username'] = $webUser->getUsername(); } //Sanitize Data $result['current_mail'] = filter_var($result['current_mail'], FILTER_SANITIZE_EMAIL); - //$result['Login'] = filter_var($result['Login'], FILTER_SANITIZE_STRING); + $result['target_username'] = filter_var($result['target_username'], FILTER_SANITIZE_STRING); $result['FirstName'] = filter_var($result['FirstName'], FILTER_SANITIZE_STRING); $result['LastName'] = filter_var($result['LastName'], FILTER_SANITIZE_STRING); $result['Country'] = filter_var($result['Country'], FILTER_SANITIZE_STRING); $result['Gender'] = filter_var($result['Gender'], FILTER_SANITIZE_NUMBER_INT); $result['ReceiveMail'] = filter_var($result['ReceiveMail'], FILTER_SANITIZE_NUMBER_INT); $result['country_array'] = getCountryArray(); + global $INGAME_WEBPATH; + $result['ingame_webpath'] = $INGAME_WEBPATH; return $result; }else{ //ERROR: not logged in! diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/sgroup_list.php b/code/ryzom/tools/server/ryzom_ams/www/html/inc/sgroup_list.php index f9c2ac150..0b446fc2c 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/inc/sgroup_list.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/inc/sgroup_list.php @@ -1,20 +1,28 @@ getTUserId(); + $user_id = unserialize($_SESSION['ticket_user'])->getTUserId(); $queueArray = array(); $queue_handler = new Ticket_Queue_handler(); //Pagination Base Links - $result['pagination_base_link'] = "index.php?page=show_queue&get=".$result['queue_view'] ; + if (Helpers::check_if_game_client()) { + $result['pagination_base_link'] = $INGAME_WEBPATH."?page=show_queue&get=".$result['queue_view'] ; + }else{ + $result['pagination_base_link'] = $WEBPATH."?page=show_queue&get=".$result['queue_view'] ; + } //form url to keep the getters constant - $result['getURL'] = "index.php?page=show_queue&get=" . $result['queue_view']; + + if (Helpers::check_if_game_client()) { + $result['getURL'] = $INGAME_WEBPATH."?page=show_queue&get=" . $result['queue_view']; + }else{ + $result['getURL'] = $WEBPATH."?page=show_queue&get=" . $result['queue_view']; + } + if(isset($_GET['pagenum'])){ $result['getURL'] = $result['getURL'] . "&pagenum=".$_GET['pagenum']; } @@ -29,7 +40,14 @@ function show_queue(){ $how = filter_var($_GET['how'], FILTER_SANITIZE_STRING); $who = filter_var($_GET['who'], FILTER_SANITIZE_STRING); $queue_handler->CreateQueue($userid, $groupid, $what, $how, $who); - $result['pagination_base_link'] = "index.php?page=show_queue&get=create&userid=".$userid."&groupid=".$groupid."&what=".$what."&how=".$how."&who=".$who; + + if (Helpers::check_if_game_client()) { + $result['pagination_base_link'] = $INGAME_WEBPATH."?page=show_queue&get=create&userid=".$userid."&groupid=".$groupid."&what=".$what."&how=".$how."&who=".$who; + }else{ + $result['pagination_base_link'] = $WEBPATH."?page=show_queue&get=create&userid=".$userid."&groupid=".$groupid."&what=".$what."&how=".$how."&who=".$who; + } + + $result['prev_created_userid'] = $userid; $result['prev_created_groupid'] = $groupid; $result['prev_created_what'] = $what; @@ -60,7 +78,11 @@ function show_queue(){ $how = filter_var($_POST['how'], FILTER_SANITIZE_STRING); $who = filter_var($_POST['who'], FILTER_SANITIZE_STRING); $queue_handler->CreateQueue($userid, $groupid, $what, $how, $who); - $result['pagination_base_link'] = "index.php?page=show_queue&get=create&userid=".$userid."&groupid=".$groupid."&what=".$what."&how=".$how."&who=".$who; + if (Helpers::check_if_game_client()) { + $result['pagination_base_link'] = $INGAME_WEBPATH."?page=show_queue&get=create&userid=".$userid."&groupid=".$groupid."&what=".$what."&how=".$how."&who=".$who; + }else{ + $result['pagination_base_link'] = $WEBPATH."?page=show_queue&get=create&userid=".$userid."&groupid=".$groupid."&what=".$what."&how=".$how."&who=".$who; + } $result['prev_created_userid'] = $userid; $result['prev_created_groupid'] = $groupid; $result['prev_created_what'] = $what; @@ -93,7 +115,7 @@ function show_queue(){ $result['tickets'][$i]['timestamp_elapsed'] = Gui_Elements::time_elapsed_string($ticket['timestamp']); $i++; } - $result['user_id'] = $_SESSION['ticket_user']->getTUserId(); + $result['user_id'] = unserialize($_SESSION['ticket_user'])->getTUserId(); //Queue creator field info $result['grouplist'] = Gui_Elements::make_table(Support_Group::getGroups(), Array("getSGroupId","getName"), Array("sGroupId","name")); @@ -104,13 +126,15 @@ function show_queue(){ $result['teamlist'][$i]['name'] = $web_teammember->getUsername(); $i++; } + global $INGAME_WEBPATH; + $result['ingame_webpath'] = $INGAME_WEBPATH; return $result; }else{ //ERROR: Doesn't exist! $_SESSION['error_code'] = "404"; - header("Location: index.php?page=error"); + header("Location: ams?page=error"); exit; } diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_reply.php b/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_reply.php index 1640c5938..96cec0a6a 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_reply.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_reply.php @@ -12,7 +12,7 @@ function show_reply(){ $ticket = new Ticket(); $ticket->load_With_TId($reply->getTicket()); - if(( $ticket->getAuthor() == $_SESSION['ticket_user']->getTUserId() && ! $reply->getHidden()) || Ticket_User::isMod($_SESSION['ticket_user'] )){ + if(( $ticket->getAuthor() == unserialize($_SESSION['ticket_user'])->getTUserId() && ! $reply->getHidden()) || Ticket_User::isMod(unserialize($_SESSION['ticket_user']) )){ $content = new Ticket_Content(); $content->load_With_TContentId($reply->getContent()); @@ -27,9 +27,11 @@ function show_reply(){ $result['author'] = $author->getExternId(); $webUser = new WebUsers($author->getExternId()); $result['authorName'] = $webUser->getUsername(); - if(Ticket_User::isMod($_SESSION['ticket_user'])){ + if(Ticket_User::isMod(unserialize($_SESSION['ticket_user']))){ $result['isMod'] = "TRUE"; } + global $INGAME_WEBPATH; + $result['ingame_webpath'] = $INGAME_WEBPATH; return $result; }else{ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_sgroup.php b/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_sgroup.php index 1c9ab406f..edf1ba0a9 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_sgroup.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_sgroup.php @@ -1,22 +1,28 @@ getUsername(); $i++; } + global $INGAME_WEBPATH; + $result['ingame_webpath'] = $INGAME_WEBPATH; return $result; @@ -39,7 +47,7 @@ function show_sgroup(){ //ERROR: No page specified! $_SESSION['error_code'] = "404"; - header("Location: index.php?page=error"); + header("Location: ams?page=error"); exit; } diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_ticket.php b/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_ticket.php index d69fbc319..4ecddb0b7 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_ticket.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_ticket.php @@ -4,12 +4,12 @@ function show_ticket(){ //if logged in if(WebUsers::isLoggedIn() && isset($_GET['id'])){ - $result['user_id'] = $_SESSION['ticket_user']->getTUserId(); + $result['user_id'] = unserialize($_SESSION['ticket_user'])->getTUserId(); $result['ticket_id'] = filter_var($_GET['id'], FILTER_SANITIZE_NUMBER_INT); $target_ticket = new Ticket(); $target_ticket->load_With_TId($result['ticket_id']); - if(Ticket_User::isMod($_SESSION['ticket_user'] )){ + if(Ticket_User::isMod(unserialize($_SESSION['ticket_user'] ))){ if(isset($_POST['action'])){ switch($_POST['action']){ case "forward": @@ -30,15 +30,15 @@ function show_ticket(){ } } - if(($target_ticket->getAuthor() == $_SESSION['ticket_user']->getTUserId()) || Ticket_User::isMod($_SESSION['ticket_user'] )){ + if(($target_ticket->getAuthor() == unserialize($_SESSION['ticket_user'])->getTUserId()) || Ticket_User::isMod(unserialize($_SESSION['ticket_user']) )){ $show_as_admin = false; - if(Ticket_User::isMod($_SESSION['ticket_user'])){ + if(Ticket_User::isMod(unserialize($_SESSION['ticket_user']))){ $show_as_admin = true; } $entire_ticket = Ticket::getEntireTicket( $result['ticket_id'],$show_as_admin); - Ticket_Log::createLogEntry($result['ticket_id'],$_SESSION['ticket_user']->getTUserId(), 3); + Ticket_Log::createLogEntry($result['ticket_id'],unserialize($_SESSION['ticket_user'])->getTUserId(), 3); $result['ticket_tId'] = $entire_ticket['ticket_obj']->getTId(); $result['ticket_forwardedGroupName'] = $entire_ticket['ticket_obj']->getForwardedGroupName(); $result['ticket_forwardedGroupId'] = $entire_ticket['ticket_obj']->getForwardedGroupId(); @@ -62,12 +62,14 @@ function show_ticket(){ $result['ticket_replies'][$i]['author'] = $webReplyUser->getUsername(); $i++; } - if(Ticket_User::isMod($_SESSION['ticket_user'])){ + if(Ticket_User::isMod(unserialize($_SESSION['ticket_user']))){ $result['isMod'] = "TRUE"; $result['statusList'] = Ticket::getStatusArray(); $result['sGroups'] = Gui_Elements::make_table_with_key_is_id(Support_Group::getAllSupportGroups(), Array("getName"), "getSGroupId" ); } $result['hasInfo'] = $target_ticket->hasInfo(); + global $INGAME_WEBPATH; + $result['ingame_webpath'] = $INGAME_WEBPATH; return $result; }else{ 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 4f1e98d61..4e43c7aad 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 @@ -9,7 +9,7 @@ function show_ticket_info(){ $target_ticket = new Ticket(); $target_ticket->load_With_TId($result['ticket_id']); - if( $target_ticket->hasInfo() && (($target_ticket->getAuthor() == $_SESSION['ticket_user']->getTUserId()) || Ticket_User::isMod($_SESSION['ticket_user'] ))){ + if( $target_ticket->hasInfo() && (($target_ticket->getAuthor() == unserialize($_SESSION['ticket_user'])->getTUserId()) || Ticket_User::isMod(unserialize($_SESSION['ticket_user']) ))){ $result['ticket_title'] = $target_ticket->getTitle(); $result['ticket_author'] = $target_ticket->getAuthor(); @@ -31,12 +31,14 @@ function show_ticket_info(){ $result['ht'] = $ticket_info->getHT(); $result['nel3d'] = $ticket_info->getNel3D(); $result['user_id'] = $ticket_info->getUser_Id(); - global $WEBPATH; - $result['WEBPATH'] = $WEBPATH; + global $IMAGELOC_WEBPATH; + $result['IMAGELOC_WEBPATH'] = $IMAGELOC_WEBPATH; - if(Ticket_User::isMod($_SESSION['ticket_user'])){ + if(Ticket_User::isMod(unserialize($_SESSION['ticket_user']))){ $result['isMod'] = "TRUE"; } + global $INGAME_WEBPATH; + $result['ingame_webpath'] = $INGAME_WEBPATH; return $result; }else{ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_ticket_log.php b/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_ticket_log.php index 5d4cbb76b..6d1ea9701 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_ticket_log.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_ticket_log.php @@ -1,11 +1,12 @@ load_With_TId($result['ticket_id']); @@ -23,7 +24,11 @@ function show_ticket_log(){ $webUser2 = new WebUsers($log['argument']); $query_backpart = $webUser2->getUsername(); }else if($log['action'] == 4){ - $query_backpart = "ID#" . $log['argument'] . ""; + if (Helpers::check_if_game_client()) { + $query_backpart = "ID#" . $log['argument'] . ""; + }else{ + $query_backpart = "ID#" . $log['argument'] . ""; + } }else if($log['action'] == 5){ $statusArray = Ticket::getStatusArray(); $query_backpart = $statusArray[$log['argument'] ]; @@ -31,15 +36,21 @@ function show_ticket_log(){ $priorityArray = Ticket::getPriorityArray(); $query_backpart = $priorityArray[$log['argument'] ]; }else if($log['action'] == 8){ - $query_backpart = "" . Support_Group::getGroup($log['argument'])->getName() . ""; + if (Helpers::check_if_game_client()) { + $query_backpart = "" . Support_Group::getGroup($log['argument'])->getName() . ""; + }else{ + $query_backpart = "" . Support_Group::getGroup($log['argument'])->getName() . ""; + } } $result['ticket_logs'][$i]['query'] = $author . " " . $log_action_array[$log['action']] . " " . $query_backpart; $result['ticket_logs'][$i]['timestamp_elapsed'] = Gui_Elements::time_elapsed_string($log['timestamp']); $i++; } - if(Ticket_User::isMod($_SESSION['ticket_user'])){ + if(Ticket_User::isMod(unserialize($_SESSION['ticket_user']))){ $result['isMod'] = "TRUE"; } + global $INGAME_WEBPATH; + $result['ingame_webpath'] = $INGAME_WEBPATH; return $result; }else{ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_user.php b/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_user.php index a8774ba83..aae4d2caa 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_user.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_user.php @@ -3,8 +3,7 @@ function show_user(){ //if logged in if(WebUsers::isLoggedIn()){ - - if( !isset($_GET['id']) || Ticket_User::isMod($_SESSION['ticket_user']) || $_GET['id'] == $_SESSION['id'] ){ + if( !isset($_GET['id']) || Ticket_User::isMod(unserialize($_SESSION['ticket_user'])) || $_GET['id'] == $_SESSION['id'] ){ if(isset($_GET['id'])){ $result['target_id'] = filter_var($_GET['id'], FILTER_SANITIZE_NUMBER_INT); @@ -22,12 +21,14 @@ function show_user(){ $ticket_user = Ticket_User::constr_ExternId($result['target_id']); $result['userPermission'] = $ticket_user->getPermission(); - if(Ticket_User::isAdmin($_SESSION['ticket_user'])){ + if(Ticket_User::isAdmin(unserialize($_SESSION['ticket_user']))){ $result['isAdmin'] = "TRUE"; } $ticketlist = Ticket::getTicketsOf($ticket_user->getTUserId()); $result['ticketlist'] = Gui_Elements::make_table($ticketlist, Array("getTId","getTimestamp","getTitle","getStatus","getStatusText","getStatusText","getCategoryName"), Array("tId","timestamp","title","status","statustext","statusText","category")); + global $INGAME_WEBPATH; + $result['ingame_webpath'] = $INGAME_WEBPATH; return $result; }else{ @@ -41,4 +42,4 @@ function show_user(){ header("Location: index.php"); exit; } -} \ No newline at end of file +} diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/userlist.php b/code/ryzom/tools/server/ryzom_ams/www/html/inc/userlist.php index 9e4c8a079..76074abcd 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/inc/userlist.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/inc/userlist.php @@ -1,7 +1,7 @@ getElements() , Array("getUId","getUsername","getEmail"), Array("id","username","email")); @@ -15,9 +15,13 @@ function userlist(){ $i++; } - if (Ticket_User::isAdmin($_SESSION['ticket_user'])){ + if (Ticket_User::isAdmin(unserialize($_SESSION['ticket_user']))){ $pageResult['isAdmin'] = "TRUE"; } + global $INGAME_WEBPATH; + $pageResult['ingame_webpath'] = $INGAME_WEBPATH; + global $BASE_WEBPATH; + $pageResult['base_webpath'] = $BASE_WEBPATH; return $pageResult; }else{ //ERROR: No access! @@ -25,4 +29,4 @@ function userlist(){ header("Location: index.php?page=error"); exit; } -} \ No newline at end of file +} diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/index.php b/code/ryzom/tools/server/ryzom_ams/www/html/index.php index b52ccce3b..a57d4aa45 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/index.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/index.php @@ -8,7 +8,7 @@ session_start(); //Decide what page to load if ( ! isset( $_GET["page"]) ){ if(isset($_SESSION['user'])){ - if(Ticket_User::isMod($_SESSION['ticket_user'])){ + if(Ticket_User::isMod(unserialize($_SESSION['ticket_user']))){ $page = 'dashboard'; }else{ $page = 'show_user'; @@ -44,7 +44,7 @@ if(isset($_SESSION['user'])){ //Set permission if(isset($_SESSION['ticket_user'])){ - $return['permission'] = $_SESSION['ticket_user']->getPermission(); + $return['permission'] = unserialize($_SESSION['ticket_user'])->getPermission(); }else{ //default permission $return['permission'] = 0; diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/index_charisma.php b/code/ryzom/tools/server/ryzom_ams/www/html/index_charisma.php deleted file mode 100644 index b4b943104..000000000 --- a/code/ryzom/tools/server/ryzom_ams/www/html/index_charisma.php +++ /dev/null @@ -1,329 +0,0 @@ - - - -
- -
-
- - -
Total Members
-
507
- 6 - - - - -
Pro Members
-
228
- 4 - - - - -
Sales
-
$13320
- $34 - - - - -
Messages
-
25
- 12 - -
- -
-
-
-

Introduction

-
- - - -
-
-
-

Charisma free, premium quality, responsive, multiple skin admin template.

-

Its a live demo of the template. I have created Charisma to ease the repeat work I have to do on my projects. Now I re-use Charisma as a base for my admin panel work and I am sharing it with you :)

-

All pages in the menu are functional, take a look at all, please share this with your followers.

- -

- Back to article - Download Page -

-
-
-
-
- -
-
-
-

Tabs

-
- - - -
-
-
- - -
-
-

Charisma a fully featued template

-

Its a fully featured, responsive template for your admin panel. Its optimized for tablet and mobile phones. Scan the QR code below to view it in your mobile device.

QR Code -
-
-

Custom small text

-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur bibendum ornare dolor.

-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur bibendum ornare dolor, quis ullamcorper ligula sodales at. Nulla tellus elit, varius non commodo eget, mattis vel eros. In sed ornare nulla. Donec consectetur, velit a pharetra ultricies, diam lorem lacinia risus, ac commodo orci erat eu massa. Sed sit amet nulla ipsum. Donec felis mauris, vulputate sed tempor at, aliquam a ligula. Pellentesque non pulvinar nisi.

-
-
-

Messages small text

-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur bibendum ornare dolor, quis ullamcorper ligula sodales at. Nulla tellus elit, varius non commodo eget, mattis vel eros. In sed ornare nulla. Donec consectetur, velit a pharetra ultricies, diam lorem lacinia risus, ac commodo orci erat eu massa. Sed sit amet nulla ipsum. Donec felis mauris, vulputate sed tempor at, aliquam a ligula. Pellentesque non pulvinar nisi.

-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur bibendum ornare dolor.

-
-
-
-
- -
-
-

Member Activity

-
- - -
-
-
-
- -
-
-
- -
-
-

Realtime Traffic

-
- - -
-
-
-
-

You can update a chart periodically to get a real-time effect by using a timer to insert the new data in the plot and redraw it.

-

Time between updates: milliseconds

-
-
-
- -
-
-
-

Buttons

-
- - - -
-
-
-

- - - -

-

- - - -

-

- - - -

-

- - - - -

-

- - - - -

-

- - - -

-
-
- -
-
-

Buttons

-
- - - -
-
-
-

- - -

-

- - -

-

- - -

-

- -

-
- - - -
- -
-
- -
-
-

Weekly Stat

-
- - - -
-
-
- -
-
-
- - - - - diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/table.php b/code/ryzom/tools/server/ryzom_ams/www/html/table.php deleted file mode 100644 index 0a023296c..000000000 --- a/code/ryzom/tools/server/ryzom_ams/www/html/table.php +++ /dev/null @@ -1,1844 +0,0 @@ - - - -
- -
- -
-
-
-

Members

-
- - - -
-
-
-
- - -
-
- - - -
- - - {if isset($ACTION_RESULT)} - -
- - - -
-

Tickets

-

-

- - - - - - - - - - - - - - - - -
Show - - tickets - - to - - : - - or - - - - -
-
-

-

- - - - - - - - - - - - {foreach from=$tickets item=ticket} - - - - - - - - - - - {/foreach} -
IDTitleAssignedTimestampCategoryStatusSupportGroupActions
{$ticket.tId}{$ticket.title}{if $ticket.assignedText neq ""} {$ticket.assignedText}{else} {$not_assigned} {/if}{$ticket.timestamp}{$ticket.category}{if $ticket.status eq 0}{else if $ticket.status eq 1}{else if $ticket.status eq 2}{/if}{$ticket.statusText} - - {if $ticket.forwardedGroupName eq "0"} - {$public_sgroup} - {else} - {$ticket.forwardedGroupName} - {/if} - - - {if $ticket.assigned eq 0} -
- - - -
- {else if $ticket.assigned eq $user_id} -
- - - -
- {/if} -
-

-
- - - - {foreach from=$links item=link} - - {/foreach} - - -
«{$link}»
-
-
- - - - - - -
- {if isset($ACTION_RESULT) and $ACTION_RESULT eq "SUCCESS_ASSIGNED"} -

- {$success_assigned} -

- {else if isset($ACTION_RESULT) and $ACTION_RESULT eq "SUCCESS_UNASSIGNED"} -

- {$success_unassigned} -

- {else if isset($ACTION_RESULT) and $ACTION_RESULT eq "TICKET_NOT_EXISTING"} -

- {$ticket_not_existing} -

- {else if isset($ACTION_RESULT) and $ACTION_RESULT eq "ALREADY_ASSIGNED"} -

- {$ticket_already_assigned} -

- {else if isset($ACTION_RESULT) and $ACTION_RESULT eq "NOT_ASSIGNED"} -

- {$ticket_not_assigned} -

- {/if} -
- - {/if} -
-
-
- -
- - - - - - - -
- - - - -
- - - - - -
Show TicketShow Ticket Log
-
-
-
- - - - - - - - - -

Reply ID#{$reply_id} of Ticket #{$ticket_id}

-
- - - - - - - - - - -
- - -
-
- - -
- - -
- - -
-

Reply:

-

- - - - -
-

- {$reply_timestamp} - {if $author_permission eq '1'} - {if isset($isMod) and $isMod eq "TRUE"} {$authorName}{else} {$authorName} {/if} - {else if $reply.permission gt '1'} - {if isset($isMod) and $isMod eq "TRUE"} {$authorName}{else} {$authorName} {/if} - {/if}

- 

{$reply_content}

-
-

-
-
-
-
- -
- - - - - - - - - -

Support Group: {$groupsname}

-
- - - - - - - - - - -
- - -
-
- - - - -
- - -
- - -
-

Add user to the list

- {if isset($isAdmin) && $isAdmin eq 'TRUE'} -
- - - - - -
Username:
- - - -

- -

- - {if isset($RESULT_OF_ADDING) and $RESULT_OF_ADDING eq "SUCCESS"} -

- {$add_to_group_success} -

- {else if isset($RESULT_OF_ADDING) and $RESULT_OF_ADDING eq "ALREADY_ADDED"} -

- {$user_already_added} -

- {else if isset($RESULT_OF_ADDING) and $RESULT_OF_ADDING eq "GROUP_NOT_EXISTING"} -

- {$group_not_existing} -

- {else if isset($RESULT_OF_ADDING) and $RESULT_OF_ADDING eq "USER_NOT_EXISTING"} -

- {$user_not_existing} -

- {else if isset($RESULT_OF_ADDING) and $RESULT_OF_ADDING eq "NOT_MOD_OR_ADMIN"} -

- {$not_mod_or_admin} -

- {/if} -
- {/if} -
-
-
- - -
- - -
-

All members

- - - - - {if isset($isAdmin) && $isAdmin eq 'TRUE'}{/if} - - - {foreach from=$userlist item=user} - - - - {if isset($isAdmin) && $isAdmin eq 'TRUE'}{/if} - - {/foreach} -
IDNameAction
{$user.tUserId}{$user.name}Delete
-
-
-
- - -
- - -
-

Mail settings

-
- - - - - - - - - - - - - - - - - - - - - - -
Group Email:
IMAP Mail Server:
IMAP Username:
IMAP Password:
- - - - -

- -

- - {if isset($RESULT_OF_MODIFYING) and $RESULT_OF_MODIFYING eq "SUCCESS"} -

- {$modify_mail_of_group_success} -

- {else if isset($RESULT_OF_MODIFYING) and $RESULT_OF_MODIFYING eq "EMAIL_NOT_VALID"} -

- {$email_not_valid} -

- {else if isset($RESULT_OF_MODIFYING) and $RESULT_OF_MODIFYING eq "NO_PASSWORD"} -

- {$no_password_given} -

- {/if} - -
-
-
-
-
- -
- - - - - - - -
- - - - -
- - - {if isset($isMod) and $isMod eq "TRUE"}{/if} - - {if $hasInfo}{/if} - -
Show Ticket LogSend Other TicketShow Additional Info
-
-
-
- - - - - - - - - -

[{$t_title}-#{$ticket_tId}] {$ticket_title}

-
- - - - - - - - - - -
- - -
-
- - -
- - -
- - -
- - - - - {if isset($isMod) and $isMod eq "TRUE"} - -
- - -
- - - - - - - - - - - - - - - - -
Submitted: {$ticket_timestamp}Last Updated: {$ticket_lastupdate}Status: {if $ticket_status neq 3}Open{/if} {if $ticket_status eq 3} {$ticket_statustext}{else}{$ticket_statustext} {/if}
Category: {$ticket_category}Priority {$ticket_prioritytext}Support Group: - - {if $ticket_forwardedGroupName eq "0"} - {$public_sgroup} - {else} - {$ticket_forwardedGroupName} - {/if} - -
Assigned To: {if $ticket_assignedTo neq ""} {$ticket_assignedToText}{else} {$not_assigned} {/if}
-
-
- - {foreach from=$ticket_replies item=reply} - - - - {/foreach} - - {if $ticket_status eq 3} - - - - {/if} - - - - -
- - -
-

- {$reply.timestamp} - {if $reply.permission eq '1'} - {if isset($isMod) and $isMod eq "TRUE"} {$reply.author}{else} {$reply.author} {/if} - {else if $reply.permission gt '1'} - {if isset($isMod) and $isMod eq "TRUE"} {$reply.author}{else} {$reply.author} {/if} - {/if} -

- 

{$reply.replyContent}

-
-
- - -
- 

[Ticket is closed]

-
-
- -
- - - - - - {if $ticket_status neq 3} - - - - {if isset($isMod) and $isMod eq "TRUE"} - - - - {/if} - {/if} - - - - - - -
-

{$t_reply}:

-
Hide reply for user.
- {if isset($isMod) and $isMod eq "TRUE"} - - - - - -
- Change status to - - - Change priority to - -
- {/if} -
- - - -
-
-
-
- - -
- - - - - -
-

- Ticket Assigning: - {if $ticket_assignedTo eq 0} -

- - - -
- {else if $ticket_assignedTo eq $user_id} -
- - - -
- {/if} -

- {if isset($ACTION_RESULT) and $ACTION_RESULT eq "SUCCESS_ASSIGNED"} -

- {$success_assigned} -

- {else if isset($ACTION_RESULT) and $ACTION_RESULT eq "SUCCESS_UNASSIGNED"} -

- {$success_unassigned} -

- {else if isset($ACTION_RESULT) and $ACTION_RESULT eq "TICKET_NOT_EXISTING"} -

- {$ticket_not_existing} -

- {else if isset($ACTION_RESULT) and $ACTION_RESULT eq "ALREADY_ASSIGNED"} -

- {$ticket_already_assigned} -

- {else if isset($ACTION_RESULT) and $ACTION_RESULT eq "NOT_ASSIGNED"} -

- {$ticket_not_assigned} -

- {/if} - - - 		-

- Forward to Group: -

- - - - - -
-

- {if isset($ACTION_RESULT) and $ACTION_RESULT eq "INVALID_SGROUP"} -

- {$invalid_sgroup} -

- {else if isset($ACTION_RESULT) and $ACTION_RESULT eq "TICKET_NOT_EXISTING"} -

- {$ticket_not_existing} -

- {else if isset($ACTION_RESULT) and $ACTION_RESULT eq "SUCCESS_FORWARDED"} -

- {$success_forwarded} -

- {/if} -
-
-
- {/if} - -
-
-
-
-
- -
- - - - - - - -
- - - - -
- - - {if isset($isMod) and $isMod eq "TRUE"}{/if} - - - -
Show Ticket LogSend Other TicketShow Ticket
-
-
-
- - - - - - - - - -

Additional Info For Ticket [#{$ticket_id}]

-
- - - - - - - - - - -
- - -
-
- - -
- - -
- - -
- - - - -
- - -
-

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}
-
-
- - -
-

Hardware & Software related

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Memory: {$memory}
Processor: {$processor}
Cpu_Id: {$cpu_id}
Cpu_Mask: {$cpu_mask}
HT: {$ht}
OS: {$os}
NeL3D: {$nel3d}
-
-
- - -
-

Network related

- - - - - - - - - - -
Connect_State: {$connect_state}
Local_Address: {$local_address}
-
-
-
-
-
-
- -
- - - - - - - -
- - - - -
- - - - -
Show Ticket
-
-
-
- - - - - - - - - -

Log of Ticket #{$ticket_id}

-
- - - - - - - - - - -
- - -
-
- - -
- - -
- - -
-

Title: {$ticket_title}

-

- - - - - - - - {foreach from=$ticket_logs item=log} - - - - - - {/foreach} - -
IDTimestampQuery
{$log.tLogId}{$log.timestamp}{$log.query}
-

-
-
-
-
- -
- - - - - - - -
- - - - -
- - - - - {if isset($isAdmin) and $isAdmin eq 'TRUE' and $target_id neq 1} - {if $userPermission eq 1} - - - {else if $userPermission eq 2 } - - - {else if $userPermission eq 3 } - - - {/if} - {/if} - -
Edit UserSend TicketMake ModeratorMake AdminDemote to UserMake AdminDemote to UserDemote to Moderator
-
-
-
- - - - - - - - - -

Profile of {$target_name}

-
- - - - - - - - - - -
- - -
-
- - - -
- - -
- - -
- -

Info

- - - - - - - - - - - - {if $firstName neq ""} - - - - - {/if} - {if $lastName neq ""} - - - - - {/if} - {if $country neq ""} - - - - - {/if} - {if $gender neq 0} - - - {if $gender eq 1} - - {else if $gender eq 2} - - {/if} - - {/if} - -
Email:{$mail}
Role: - {if $userPermission eq 1}User{/if} - {if $userPermission eq 2}Moderator{/if} - {if $userPermission eq 3}Admin{/if} -
Firstname:{$firstName}
LastName:{$lastName}
Country:{$country}
Gender:♂♀
-
-
-
- - -
- - -
-

Tickets

- - - - - - - - - - - {foreach from=$ticketlist item=ticket} - - - - - - - - - {/foreach} - -
IDTitleTimestampCategoryStatus
{$ticket.tId}{$ticket.title}{$ticket.timestamp}{$ticket.category}{if $ticket.status eq 0} {/if} {$ticket.statusText}
-
-
-
-
- -
- - - - - - - - - -

Members

-
- - - - - - - - - - -
- - -
-
- - -
- - -
- - - -
-

All Acounts

- - - - - - - - - - {foreach from=$userlist item=element} - - - - - {if $element.permission eq 1}{/if} - {if $element.permission eq 2}{/if} - {if $element.permission eq 3}{/if} - - - - {/foreach} -
IdUsernameEmailPermissionAction
{$element.id}{$element.username}{$element.email}UserModeratorAdmin - Show User - Edit User - {if isset($isAdmin) and $isAdmin eq 'TRUE' and $element.id neq 1} - {if $element.permission eq 1} - Make Moderator - Make Admin - {else if $element.permission eq 2 } - Demote to User - Make Admin - {else if $element.permission eq 3 } - Demote to User - Demote to Moderator - {/if} - {/if} -
-
- - - - {foreach from=$links item=link} - - {/foreach} - - -
«{$link}»
-
-
-
-
- -
- Edit User + Edit User
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
UsernameDate registeredRoleStatusActions
David R2012/01/01Member - Active - - - - View - - - - Edit - - - - Delete - -
Chris Jack2012/01/01Member - Active - - - - View - - - - Edit - - - - Delete - -
Jack Chris2012/01/01Member - Active - - - - View - - - - Edit - - - - Delete - -
Muhammad Usman2012/01/01Member - Active - - - - View - - - - Edit - - - - Delete - -
Sheikh Heera2012/02/01Staff - Banned - - - - View - - - - Edit - - - - Delete - -
Helen Garner2012/02/01Staff - Banned - - - - View - - - - Edit - - - - Delete - -
Saruar Ahmed2012/03/01Member - Pending - - - - View - - - - Edit - - - - Delete - -
Ahemd Saruar2012/03/01Member - Pending - - - - View - - - - Edit - - - - Delete - -
David R2012/01/01Member - Active - - - - View - - - - Edit - - - - Delete - -
Chris Jack2012/01/01Member - Active - - - - View - - - - Edit - - - - Delete - -
Jack Chris2012/01/01Member - Active - - - - View - - - - Edit - - - - Delete - -
Muhammad Usman2012/01/01Member - Active - - - - View - - - - Edit - - - - Delete - -
Sheikh Heera2012/02/01Staff - Banned - - - - View - - - - Edit - - - - Delete - -
Helen Garner2012/02/01Staff - Banned - - - - View - - - - Edit - - - - Delete - -
Saruar Ahmed2012/03/01Member - Pending - - - - View - - - - Edit - - - - Delete - -
Ahemd Saruar2012/03/01Member - Pending - - - - View - - - - Edit - - - - Delete - -
David R2012/01/01Member - Active - - - - View - - - - Edit - - - - Delete - -
Chris Jack2012/01/01Member - Active - - - - View - - - - Edit - - - - Delete - -
Jack Chris2012/01/01Member - Active - - - - View - - - - Edit - - - - Delete - -
Muhammad Usman2012/01/01Member - Active - - - - View - - - - Edit - - - - Delete - -
Sheikh Heera2012/02/01Staff - Banned - - - - View - - - - Edit - - - - Delete - -
Helen Garner2012/02/01Staff - Banned - - - - View - - - - Edit - - - - Delete - -
Saruar Ahmed2012/03/01Member - Pending - - - - View - - - - Edit - - - - Delete - -
Ahemd Saruar2012/03/01Member - Pending - - - - View - - - - Edit - - - - Delete - -
David R2012/01/01Member - Active - - - - View - - - - Edit - - - - Delete - -
Chris Jack2012/01/01Member - Active - - - - View - - - - Edit - - - - Delete - -
Jack Chris2012/01/01Member - Active - - - - View - - - - Edit - - - - Delete - -
Muhammad Usman2012/01/01Member - Active - - - - View - - - - Edit - - - - Delete - -
Sheikh Heera2012/02/01Staff - Banned - - - - View - - - - Edit - - - - Delete - -
Helen Garner2012/02/01Staff - Banned - - - - View - - - - Edit - - - - Delete - -
Saruar Ahmed2012/03/01Member - Pending - - - - View - - - - Edit - - - - Delete - -
Ahemd Saruar2012/03/01Member - Pending - - - - View - - - - Edit - - - - Delete - -
David R2012/01/01Member - Active - - - - View - - - - Edit - - - - Delete - -
Chris Jack2012/01/01Member - Active - - - - View - - - - Edit - - - - Delete - -
Jack Chris2012/01/01Member - Active - - - - View - - - - Edit - - - - Delete - -
Muhammad Usman2012/01/01Member - Active - - - - View - - - - Edit - - - - Delete - -
Sheikh Heera2012/02/01Staff - Banned - - - - View - - - - Edit - - - - Delete - -
Helen Garner2012/02/01Staff - Banned - - - - View - - - - Edit - - - - Delete - -
Saruar Ahmed2012/03/01Member - Pending - - - - View - - - - Edit - - - - Delete - -
Ahemd Saruar2012/03/01Member - Pending - - - - View - - - - Edit - - - - Delete - -
Habib Rizwan2012/01/21Staff - Active - - - - View - - - - Edit - - - - Delete - -
Rizwan Habib2012/01/21Staff - Active - - - - View - - - - Edit - - - - Delete - -
Amrin Sana2012/08/23Staff - Banned - - - - View - - - - Edit - - - - Delete - -
Sana Amrin2012/08/23Staff - Banned - - - - View - - - - Edit - - - - Delete - -
Ifrah Jannat2012/06/01Admin - Inactive - - - - View - - - - Edit - - - - Delete - -
Jannat Ifrah2012/06/01Admin - Inactive - - - - View - - - - Edit - - - - Delete - -
Robert2012/03/01Member - Pending - - - - View - - - - Edit - - - - Delete - -
Dave Robert2012/03/01Member - Pending - - - - View - - - - Edit - - - - Delete - -
Brown Robert2012/03/01Member - Pending - - - - View - - - - Edit - - - - Delete - -
Usman Muhammad2012/01/01Member - Active - - - - View - - - - Edit - - - - Delete - -
Abdullah2012/02/01Staff - Banned - - - - View - - - - Edit - - - - Delete - -
Dow John2012/02/01Admin - Inactive - - - - View - - - - Edit - - - - Delete - -
John R2012/02/01Admin - Inactive - - - - View - - - - Edit - - - - Delete - -
Paul Wilson2012/03/01Member - Pending - - - - View - - - - Edit - - - - Delete - -
Wilson Paul2012/03/01Member - Pending - - - - View - - - - Edit - - - - Delete - -
Heera Sheikh2012/01/21Staff - Active - - - - View - - - - Edit - - - - Delete - -
Sheikh Heera2012/01/21Staff - Active - - - - View - - - - Edit - - - - Delete - -
Christopher2012/08/23Staff - Banned - - - - View - - - - Edit - - - - Delete - -
Andro Christopher2012/08/23Staff - Banned - - - - View - - - - Edit - - - - Delete - -
Jhon Doe2012/06/01Admin - Inactive - - - - View - - - - Edit - - - - Delete - -
Lorem Ipsum2012/03/01Member - Pending - - - - View - - - - Edit - - - - Delete - -
Abraham2012/03/01Member - Pending - - - - View - - - - Edit - - - - Delete - -
Brown Blue2012/03/01Member - Pending - - - - View - - - - Edit - - - - Delete - -
Worth Name2012/03/01Member - Pending - - - - View - - - - Edit - - - - Delete - -
- - - - - -
-
-
-

Simple Table

-
- - - -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
UsernameDate registeredRoleStatus
Muhammad Usman2012/01/01Member - Active -
White Horse2012/02/01Staff - Banned -
Sheikh Heera2012/02/01Admin - Inactive -
Saruar2012/03/01Member - Pending -
Sana Amrin2012/01/21Staff - Active -
- -
-
- -
-
-

Striped Table

-
- - - -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
UsernameDate registeredRoleStatus
Muhammad Usman2012/01/01Member - Active -
White Horse2012/02/01Staff - Banned -
Sheikh Heera2012/02/01Admin - Inactive -
Saruar2012/03/01Member - Pending -
Sana Amrin2012/01/21Staff - Active -
- -
-
-
- -
-
-
-

Bordered Table

-
- - - -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
UsernameDate registeredRoleStatus
Muhammad Usman2012/01/01Member - Active -
White Horse2012/02/01Staff - Banned -
Sheikh Heera2012/02/01Admin - Inactive -
Saruar2012/03/01Member - Pending -
Sana Amrin2012/01/21Staff - Active -
- -
-
- -
-
-

Condensed Table

-
- - - -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
UsernameDate registeredRoleStatus
Muhammad Usman2012/01/01Member - Active -
White Horse2012/02/01Staff - Banned -
Sheikh Heera2012/02/01Admin - Inactive -
Saruar2012/03/01Member - Pending -
Sana Amrin2012/01/21Staff - Active -
- -
-
- -
- -
-
-
-

Combined All

-
- - - -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
UsernameDate registeredRoleStatus
Muhammad Usman2012/01/01Member - Active -
White Horse2012/02/01Staff - Banned -
Sheikh Heera2012/02/01Admin - Inactive -
Saruar2012/03/01Member - Pending -
Sana Amrin2012/01/21Staff - Active -
- -
-
-
- - 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 23eaebdab..d8a7420d5 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}
diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/tour.php b/code/ryzom/tools/server/ryzom_ams/www/html/tour.php deleted file mode 100644 index d4e24047f..000000000 --- a/code/ryzom/tools/server/ryzom_ams/www/html/tour.php +++ /dev/null @@ -1,32 +0,0 @@ - - - -
- -
- -
-
-
-

Tour

-
- - - -
-
-
- Click Here to restart the tour
- You can create Custom Tour, like this.
For more help on implementing tour go here -
-
-
- - diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/typography.php b/code/ryzom/tools/server/ryzom_ams/www/html/typography.php deleted file mode 100644 index b49b9430d..000000000 --- a/code/ryzom/tools/server/ryzom_ams/www/html/typography.php +++ /dev/null @@ -1,176 +0,0 @@ - - -
- -
- -
-
-
-

Typography

-
- - - -
-
-
-
-

Typography Headings, paragraphs, lists, and other inline type elements

-
-
-
-

Sample text and paragraphs

-

- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur bibendum ornare dolor, quis ullamcorper ligula sodales at. Nulla tellus elit, varius non commodo eget, mattis vel eros. In sed ornare nulla. Donec consectetur, velit a pharetra ultricies, diam lorem lacinia risus, ac commodo orci erat eu massa. Sed sit amet nulla ipsum. Donec felis mauris, vulputate sed tempor at, aliquam a ligula. Pellentesque non pulvinar nisi. -

-

- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur bibendum ornare dolor, quis ullamcorper ligula sodales at. Nulla tellus elit, varius non commodo eget, mattis vel eros. In sed ornare nulla. Donec consectetur, velit a pharetra ultricies, diam lorem lacinia risus, ac commodo orci erat eu massa. Sed sit amet nulla ipsum. Donec felis mauris, vulputate sed tempor at, aliquam a ligula. Pellentesque non pulvinar nisi. -

-
-
-

Example body text

-

Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula ut id elit.

-

Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec sed odio dui.

-
-
-
-

h1. Heading 1

-

h2. Heading 2

-

h3. Heading 3

-

h4. Heading 4

-
h5. Heading 5
-
h6. Heading 6
-
-
-
- -
-
-

Example blockquotes

-
-
-

Default blockquotes are styled as such:

-
-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.

- Someone famous in Body of work -
-
-
-

You can always float your blockquote to the right:

-
-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.

- Someone famous in Body of work -
-
-
-
-
-
-
-

More Sample Text

-

- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur bibendum ornare dolor, quis ullamcorper ligula sodales at. Nulla tellus elit, varius non commodo eget, mattis vel eros. In sed ornare nulla. Donec consectetur, velit a pharetra ultricies, diam lorem lacinia risus, ac commodo orci erat eu massa. Sed sit amet nulla ipsum. Donec felis mauris, vulputate sed tempor at, aliquam a ligula. Pellentesque non pulvinar nisi. -

-
-
-

And Paragraphs

-

- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur bibendum ornare dolor, quis ullamcorper ligula sodales at. Nulla tellus elit, varius non commodo eget, mattis vel eros. In sed ornare nulla. Donec consectetur, velit a pharetra ultricies, diam lorem lacinia risus, ac commodo orci erat eu massa. Sed sit amet nulla ipsum. Donec felis mauris, vulputate sed tempor at, aliquam a ligula. Pellentesque non pulvinar nisi. -

-
-
-
-
-

Example use of Tooltips

-

Hover over the links below to see tooltips:

-
-

Tight pants next level keffiyeh you probably haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american appadata-rel have a terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan whatever keytar, scenester farm-to-table banksy Austin twitter handle freegan cred raw denim single-origin coffee viral. -

-
-
-
-
-
- -
-
-

Unordered List

-
- -
-
-
-
    -
  • Lorem ipsum dolor sit amet
    • -
  • Consectetur adipiscing elit
    • -
  • Integer molestie lorem at massa
    • -
  • Facilisis in pretium nisl aliquet
    • -
  • Nulla volutpat aliquam velit -
      -
    • Phasellus iaculis neque
      • -
    • Purus sodales ultricies
      • -
    • Vestibulum laoreet porttitor sem
      • -
    • Ac tristique libero volutpat at
      • -
    -
    • -
  • Faucibus porta lacus fringilla vel
    • -
  • Aenean sit amet erat nunc
    • -
  • Eget porttitor lorem
    • -
-
-
- -
-
-

Ordered List

-
- -
-
-
-
    -
  1. Lorem ipsum dolor sit amet
    2. -
  2. Consectetur adipiscing elit
    3. -
  3. Integer molestie lorem at massa
    4. -
  4. Facilisis in pretium nisl aliquet
    5. -
  5. Nulla volutpat aliquam velit
    6. -
  6. Faucibus porta lacus fringilla vel
    7. -
  7. Aenean sit amet erat nunc
    8. -
  8. Eget porttitor lorem
    9. -
-
-
- -
-
-

Description List

-
- -
-
-
-
-
Description lists
-
A description list is perfect for defining terms.
-
Euismod
-
Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.
-
Donec id elit non mi porta gravida at eget metus.
-
Malesuada porta
-
Etiam porta sem malesuada magna mollis euismod.
-
-
-
- - - -
- - diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/ui.php b/code/ryzom/tools/server/ryzom_ams/www/html/ui.php deleted file mode 100644 index c0bda6be2..000000000 --- a/code/ryzom/tools/server/ryzom_ams/www/html/ui.php +++ /dev/null @@ -1,287 +0,0 @@ - - - -
- -
- -
-
-
-

Extended Elements

-
- - - -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Multiple File Upload

 - -

Star Rating

 -
- 		<div class="raty"></div>

Toggle Switch

 - - <input data-no-uniform="true" type="checkbox" class="iphone-toggle">

Auto Growing Textarea

 - - <textarea class="autogrow"></textarea>

Popover

 - Hover for popover - <a href="#" class="btn btn-danger" data-rel="popover" data-content="And here's some amazing content. It's very engaging. right?" title="A Title">hover for popover</a>

Slider

 -
- 		<div class="slider"></div>

Dialog

 - Click for dialog -

Tooltip

 - Hover for tooltip - <a href="#" title="Tooltip, you can change the position." data-rel="tooltip" class="btn btn-warning">Hover for tooltip</a>
-
-
- -
- -
-
-
-

Progress Bars

-
- - - -
-
-
-

Basic

-
-
-
-

Striped

-
-
-
-

Animated

-
-
-
-

Additional Colors

-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-

Labels and Annotations

-
- - - -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
LabelsMarkup
- Default - - <span class="label">Default</span> -
- Success - - <span class="label label-success">Success</span> -
- Warning - - <span class="label label-warning">Warning</span> -
- Important - - <span class="label label-important">Important</span> -
- Info - - <span class="label label-info">Info</span> -
- Inverse - - <span class="label label-inverse">Inverse</span> -
-
-
- -
-
-
-
-

Alerts

-
- - - -
-
-
-
- - Oh snap! Change a few things up and try submitting again. -
-
- - Well done! You successfully read this important alert message. -
-
- - Heads up! This alert needs your attention, but it's not super important. -
-
- -

Warning!

-

Best check yo self, you're not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.

-
-
-
- -
-
-

Notifications

-
- - - -
-
-
-
- Click buttons below to see Pop Notifications. -
-

- - - - -

-

- - -

- -

- - -

- -

- -

-
-
- -
-
-

Ajax Loaders

-
- - - -
-
-
-
    - -
    • - -
- From / More http://ajaxload.info/ -
-
-
- - -