From c4e79a82460da100abc4b051d64508e3b326c0f4 Mon Sep 17 00:00:00 2001 From: Botanic Date: Wed, 23 Oct 2013 18:26:59 -0700 Subject: [PATCH] fixed some more static non-static warnings --HG-- branch : rc-botanic-webdev --- .../tools/server/ryzom_ams/ams_lib/autoload/ticket_log.php | 2 +- code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/users.php | 4 ++-- .../ryzom_ams/drupal_module/ryzommanage/autoload/webusers.php | 4 ++-- .../tools/server/ryzom_ams/www/html/autoload/webusers.php | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket_log.php b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket_log.php index bfb679348..8c7439bc0 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket_log.php +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket_log.php @@ -221,7 +221,7 @@ class Ticket_Log{ * get the action text(string) array. * this is being read from the language .ini files. */ - public function getActionTextArray(){ + public static function getActionTextArray(){ $variables = Helpers::handle_language(); $result = array(); foreach ( $variables['ticket_log'] as $key => $value ){ diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/users.php b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/users.php index 7dbb1bfda..43dc91a99 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/users.php +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/users.php @@ -414,7 +414,7 @@ class Users{ * @param $pass the new password. * @return ok if it worked, if the lib or shard is offline it will return liboffline or shardoffline. */ - protected function setAmsPassword($user, $pass){ + protected static function setAmsPassword($user, $pass){ $values = Array('user' => $user, 'pass' => $pass); @@ -444,7 +444,7 @@ class Users{ * @param $mail the new email address * @return ok if it worked, if the lib or shard is offline it will return liboffline or shardoffline. */ - protected function setAmsEmail($user, $mail){ + protected static function setAmsEmail($user, $mail){ $values = Array('user' => $user, 'mail' => $mail); diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/autoload/webusers.php b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/autoload/webusers.php index d30d9714f..bc0d325a3 100644 --- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/autoload/webusers.php +++ b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/autoload/webusers.php @@ -200,7 +200,7 @@ class WebUsers extends Users{ * @param $pass the new password. * @return ok if it worked, if the lib or shard is offline it will return liboffline or shardoffline. */ - public function setPassword($user, $pass){ + public static function setPassword($user, $pass){ $hashpass = crypt($pass, WebUsers::generateSALT()); $reply = WebUsers::setAmsPassword($user, $hashpass); $drupal_pass = user_hash_password($pass); @@ -223,7 +223,7 @@ class WebUsers extends Users{ * @param $mail the new emailaddress. * @return ok if it worked, if the lib or shard is offline it will return liboffline or shardoffline. */ - public function setEmail($user, $mail){ + public static function setEmail($user, $mail){ $reply = WebUsers::setAmsEmail($user, $mail); $values = Array('user' => $user, 'mail' => $mail); try { 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 621bb0e06..5c5860532 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 @@ -230,7 +230,7 @@ class WebUsers extends Users{ * @param $pass the new password. * @return ok if it worked, if the lib or shard is offline it will return liboffline or shardoffline. */ - public function setPassword($user, $pass){ + public static function setPassword($user, $pass){ $hashpass = crypt($pass, WebUsers::generateSALT()); $reply = WebUsers::setAmsPassword($user, $hashpass); @@ -254,7 +254,7 @@ class WebUsers extends Users{ * @param $mail the new emailaddress. * @return ok if it worked, if the lib or shard is offline it will return liboffline or shardoffline. */ - public function setEmail($user, $mail){ + public static function setEmail($user, $mail){ $reply = WebUsers::setAmsEmail($user, $mail); $values = Array('user' => $user, 'mail' => $mail); try {