[phpMP-CVS] CVS: phpMP/includes auth.php,1.4,1.5 template.php,1.7,1.8

[Brian R. <hei...@us...>]

Update of /cvsroot/phpmp/phpMP/includes
In directory usw-pr-cvs1:/tmp/cvs-serv10722/includes

Modified Files:
	auth.php template.php 
Log Message:
Attempt at fixing Auth() functions.

Index: auth.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/auth.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** auth.php	5 Apr 2002 07:37:06 -0000	1.4
--- auth.php	5 Apr 2002 23:15:29 -0000	1.5
***************
*** 52,66 ****
    
    function AuthUser() {
!     global $MPCONF, $DBA, $HTTP_POST_VARS;
      
      session_start();
      
!     if($MPCONF['USR']['username'] != "") {
!       session_register("$sess_user");
!       return $this->FetchUserVars("$sess_user");
        
!     } elseif(($MPCONF['GEN']['extcookie'] != "") && ($HTTP_COOKIE_VARS[$MPCONF['SES']['extcookie']])) {
      
!       $this->mpcookie = $HTTP_COOKIE_VARS[$MPCONF['GEN']['extcookie']];
        $authstring = $this->mpcookie;
        
--- 52,66 ----
    
    function AuthUser() {
!     global $MPCONF, $DBA, $HTTP_POST_VARS, $HTTP_COOKIE_VARS, $HTTP_SESSION_VARS;
      
      session_start();
      
!     if($HTTP_SESSION_VARS['sess_user'] != "") {
!       $sess_user = $HTTP_SESSION_VARS['sess_user'];
!       return $this->FetchUserVars($sess_user);
        
!     } elseif($HTTP_COOKIE_VARS[$MPCONF['SES']['extcookie']]) {
      
!       $this->mpcookie = $HTTP_COOKIE_VARS[$MPCONF['SES']['extcookie']];
        $authstring = $this->mpcookie;
        
***************
*** 68,75 ****
        
        if(@mysql_num_rows($result) == 1) {
!         $sess_user = "$username";
!         $session_register("$sess_user");
          
!         return $this->FetchUserVars("$sess_user");
          
        } else {
--- 68,75 ----
        
        if(@mysql_num_rows($result) == 1) {
!         $sess_user = $username;
!         $session_register($sess_user);
          
!         return $this->FetchUserVars($sess_user);
          
        } else {
***************
*** 78,100 ****
        
      } elseif(($HTTP_POST_VARS['username'] != "") && ($HTTP_POST_VARS['password'] != "")) {
!       $enc_password = md5($password);
        
        $result = $DBA->query('SELECT username FROM ' . $MPCONF['DB']['table_prefix'] . "users WHERE username='{$HTTP_POST_VARS['username']}' AND password='$enc_password'");
        if(@mysql_num_rows($result) == 1) {
          $sess_user = $HTTP_POST_VARS['username'];
!         session_register("$sess_user");
          
!         return $this->FetchUserVars('$sess_user');
        } else {
!         header("Location: " . $MPCONF['GEN']['address'] . "/error.php?ecode=auth");
        }
      } else {
        $sess_user = "Anonymous";
!       session_register("$sess_user");
        
        return $this->FetchUserVars('Anonymous');
      }
      
!     if($this->isadmin == 1) {
        $this->AuthAdmin();
      }
--- 78,100 ----
        
      } elseif(($HTTP_POST_VARS['username'] != "") && ($HTTP_POST_VARS['password'] != "")) {
!       $enc_password = md5($HTTP_POST_VARS['password']);
        
        $result = $DBA->query('SELECT username FROM ' . $MPCONF['DB']['table_prefix'] . "users WHERE username='{$HTTP_POST_VARS['username']}' AND password='$enc_password'");
        if(@mysql_num_rows($result) == 1) {
          $sess_user = $HTTP_POST_VARS['username'];
!         session_register($sess_user);
          
!         return $this->FetchUserVars($sess_user);
        } else {
!         header("Location: " . $MPCONF['GEN']['uri'] . "/error.php?ecode=auth");
        }
      } else {
        $sess_user = "Anonymous";
!       session_register($sess_user);
        
        return $this->FetchUserVars('Anonymous');
      }
      
!     if($this->UserVars['isadmin'] == 1) {
        $this->AuthAdmin();
      }
***************
*** 103,122 ****
    
    function AuthAdmin() {
!         if ($this->UserInfo["isadmin"] == 1) {
!               
!               $this->isadmin = 1;
!               
!               if ($this->UserInfo["isgod"] == 1) {
!               
!                   $this->isgod = 1;
!                   
!             }
!             
!             $this->privileges = explode(",", $this->UserInfo["privileges"]);
!               
!               return true;
!         }               
      
!     }
      
    function UpdateUser() {
--- 103,123 ----
    
    function AuthAdmin() {
!     if ($this->UserVars["isadmin"] == 1) {
! 
!       $this->isadmin = 1;
! 
!       if ($this->UserVars["isgod"] == 1) {
! 
!         $this->isgod = 1;
! 
!       }
! 
!       $this->privileges = explode(",", $this->UserVars["privileges"]);
! 
!       return true;
! 
!     }               
      
!   }
      
    function UpdateUser() {
***************
*** 135,142 ****
  /*  Note:  This should be outside the class */
  
- 
  //  This is used to change the default settings
! ini_set ('session.save_handler','user');
  
  function sess_open($save_path, $session_name) {
      global $SESS_LIFE;
--- 136,143 ----
  /*  Note:  This should be outside the class */
  
  //  This is used to change the default settings
! //ini_set ('session.save_handler','user');
  
+ /*
  function sess_open($save_path, $session_name) {
      global $SESS_LIFE;
***************
*** 200,204 ****
  }
      
! session_set_save_handler(
  	'sess_open',
  	'sess_close',
--- 201,205 ----
  }
      
! //session_set_save_handler(
  	'sess_open',
  	'sess_close',
***************
*** 208,211 ****
--- 209,213 ----
  	'sess_gc'
  );
+ */
      
  /****************************************************************************/

Index: template.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/template.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** template.php	3 Apr 2002 10:55:24 -0000	1.7
--- template.php	5 Apr 2002 23:15:29 -0000	1.8
***************
*** 186,189 ****
--- 186,195 ----
    }
  
+   function ClosePage() {
+     global $MPCONF;
+ 
+     session_close();
+   }
+ 
  }