Removed globals and created private vars

pedro_morgan

2007-08-21 a75d10d7548e69fb6fd3b9dcf14d357febcc72f4

Removed globals and created private vars

 interface/lib/classes/remoting.inc.php

@@ -5,26 +5,36 @@
    //* remote session timeout in seconds
    private $session_timeout = 600;
    
    private $app;
    private $conf;
    private $server;

    public function __construct()
    {
        global $app, $conf, $server;
        $this->server = $server;
        $this->app = $app;
        $this->conf = $conf;
    }

    //* remote login function
    public function login($username, $password)
    {
        global $app, $conf, $server;
		
        if(empty($username)) {
            $server->fault('login_username_empty', 'The login username is empty');
            $this->server->fault('login_username_empty', 'The login username is empty');
            return false;
        }
        
        if(empty($password)) {
            $server->fault('login_password_empty', 'The login password is empty');
            $this->server->fault('login_password_empty', 'The login password is empty');
            return false;
        }
        
        $username = $app->db->quote($username);
        $password = $app->db->quote($password);
        $username = $this->app->db->quote($username);
        $password = $this->app->db->quote($password);
        
        $sql = "SELECT * FROM remote_user WHERE remote_username = '$username' and remote_password = md5('$password')";
        $remote_user = $app->db->queryOneRecord($sql);
        $remote_user = $this->app->db->queryOneRecord($sql);
        if($remote_user['remote_userid'] > 0) {
            //* Create a remote user session
            srand ((double)microtime()*1000000);
@@ -32,11 +42,13 @@
            $remote_userid = $remote_user['remote_userid'];
            $remote_functions = $remote_user['remote_functions'];
            $tstamp = time() + $this->session_timeout;
            $sql = "INSERT INTO remote_session (remote_session,remote_userid,remote_functions,tstamp) VALUES ('$remote_session',$remote_userid,'$remote_functions',$tstamp)";
            $app->db->query($sql);
            $sql = 'INSERT INTO remote_session (remote_session,remote_userid,remote_functions,tstamp'
                   .') VALUES ('
                   ." '$remote_session',$remote_userid,'$remote_functions',$tstamp)";
            $this->app->db->query($sql);
            return $remote_session;
        } else {
            $server->fault('login_failed', 'The login failed. Username or password wrong.');
            $this->server->fault('login_failed', 'The login failed. Username or password wrong.');
            return false;
        }
        
@@ -45,31 +57,23 @@
    
    //* remote logout function
    public function logout($session_id)
    {
        global $app, $conf, $server;
		
    {		
        if(empty($session_id)) {
            $server->fault('session_id_empty', 'The SessionID is empty.');
            $this->server->fault('session_id_empty', 'The SessionID is empty.');
            return false;
        }
        
        $session_id = $app->db->quote($session_id);
        
        $sql = "DELETE FROM remote_session WHERE remote_session = '$session_id'";
        $app->db->query($sql);
        if($app->db->affectedRows() == 1) {
            return true;
        } else {
            return false;
        }
        $this->app->db->query($sql);
        return ($this->app->db->affectedRows() == 1);
    }
    
    public function mail_domain_add($session_id, $params)
    {
        global $app, $conf, $server;
		
        if(!$this->checkPerm($session_id, 'mail_domain_add')) {
            $server->fault('permission_denied','You do not have the permissions to access this function.');
            $this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
            return false;
        }
        
@@ -78,9 +82,6 @@
        
        //* check the variables against the form definition and build the sql query automatically.
        // I will use a modified version of the tform class for this.
		
		
		
        
    }
    
@@ -105,23 +106,21 @@
    
    
    private function getSession($session_id)
    {
        global $app, $conf, $server;
		
    {	
        if(empty($session_id)) {
            $server->fault('session_id_empty','The SessionID is empty.');
            $this->server->fault('session_id_empty','The SessionID is empty.');
            return false;
        }
        
        $session_id = $app->db->quote($session_id);
        $session_id = $this->app->db->quote($session_id);
        
        $now = time();
        $sql = "SELECT * FROM remote_session WHERE remote_session = '$session_id' AND tstamp >= $now";
        $session = $app->db->queryOneRecord($sql);
        $session = $this->app->db->queryOneRecord($sql);
        if($session['remote_userid'] > 0) {
            return $session;
        } else {
            $server->fault('session_does_not_exist','The Session is expired or does not exist.');
            $this->server->fault('session_does_not_exist','The Session is expired or does not exist.');
            return false;
        }
    }