From e01c0c09135cf85404abb2bb46993e55647b4aa2 Mon Sep 17 00:00:00 2001 From: Quitta Date: Sun, 8 Sep 2013 22:49:39 +0200 Subject: [PATCH] Soem fixes + also using the createPermissions() function of the module atm! --- .../server/ryzom_ams/drupal_module/ryzommanage/config.php | 2 +- .../drupal_module/ryzommanage/ryzommanage.module | 8 ++++---- .../tools/server/ryzom_ams/www/html/func/change_mail.php | 1 + .../server/ryzom_ams/www/html/func/change_password.php | 1 + 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/config.php b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/config.php index 5cb719bc8..ef2459117 100644 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/config.php +++ b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/config.php @@ -91,7 +91,7 @@ $TIME_FORMAT = "m-d-Y H:i:s"; //defines which ingame layout template should be used $INGAME_LAYOUT = "basic"; -$FORCE_INGAME = true; +$FORCE_INGAME = false; diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ryzommanage.module b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ryzommanage.module index deb8a5f40..e094aeceb 100644 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ryzommanage.module +++ b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ryzommanage.module @@ -486,10 +486,10 @@ function createUser($values, $user_id) //Create the user on the shard + in case shard is offline put copy of query in query db //returns: ok, shardoffline or liboffline $result = WebUsers::createUser($params, $user_id); - //createPermissions(array($login)); + createPermissions(array($login)); } -/*function createPermissions($values) { +function createPermissions($values) { try { $hostname = variable_get('ryzommanage_serverurl', 'localhost'); @@ -536,7 +536,7 @@ function createUser($values, $user_id) } return true; -}*/ +} function ryzommanage_user_login(&$edit, $account){ $_SESSION['user'] = $account->name; @@ -610,7 +610,7 @@ function top_bar() // Logged in user //check permission, if user if(ticket_user::isMod(unserialize($_SESSION['ticket_user']))){ - return "
Profile | + return "
Dashboard | Profile | Create Ticket | Settings | Users | Queues | 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 ac24fa5b0..f807e46b5 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 @@ -91,3 +91,4 @@ 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 b3971202d..ab4a71892 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 @@ -87,3 +87,4 @@ function change_password(){ } +