Merged in botanic/rc-botanic-webdev/rc-botanic-webdev (pull request #34)

fixed some more static non-static warnings
This commit is contained in:
Matthew Lagoe 2013-10-23 18:28:43 -07:00
commit 0787cb4957
4 changed files with 7 additions and 7 deletions

View file

@ -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 ){

View file

@ -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);

View file

@ -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 {

View file

@ -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 {