[geeklog-cvs] Geeklog-2/views BaseViewFlexyUser.php,1.1.1.1,1.2

tony at iowaoutdoors.org tony at iowaoutdoors.org
Mon Dec 20 17:13:36 EST 2004


Update of /var/cvs/Geeklog-2/views
In directory www:/tmp/cvs-serv28308

Modified Files:
	BaseViewFlexyUser.php 
Log Message:
Fixed some bugs to get views working properly


Index: BaseViewFlexyUser.php
===================================================================
RCS file: /var/cvs/Geeklog-2/views/BaseViewFlexyUser.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BaseViewFlexyUser.php	17 Dec 2004 23:35:47 -0000	1.1.1.1
--- BaseViewFlexyUser.php	20 Dec 2004 22:13:34 -0000	1.2
***************
*** 11,15 ****
  * The propel user model cclass
  */
! require_once 'Geeklog-2/HlUser.php';
  
  /**
--- 11,15 ----
  * The propel user model cclass
  */
! require_once 'Geeklog-2/Gl2User.php';
  
  /**
***************
*** 28,38 ****
  abstract class Geeklog_BaseViewFlexyUser extends Geeklog_BaseViewFlexy {
      /**
!     * Hunting Log User Object
!     * @access private
!     * @var object
!     */
      public $user = null;
      
      /**
      * Initializes the user object so it is available to children
      *
--- 28,45 ----
  abstract class Geeklog_BaseViewFlexyUser extends Geeklog_BaseViewFlexy {
      /**
!      * User Object
!      * @access public
!      * @var object
!      */
      public $user = null;
      
      /**
+      * Indicates if the user object is require (i.e. user must have logged in)
+      * @access private
+      * @var boolean
+      */
+     private $userRequired = true;
+     
+     /**
      * Initializes the user object so it is available to children
      *
***************
*** 43,49 ****
      public function __construct()
      {
      	$this->user = unserialize($_SESSION['user']);
  
!         if (!is_object($this->user)) {
              // NOTE this makes use of the global forward feature in MVCnPHP
              throw new Exception('doForward:login');
--- 50,59 ----
      public function __construct()
      {
+     	// Try to get the user object out of the session.
      	$this->user = unserialize($_SESSION['user']);
  
!     	// Determine if the view requires the user object or if it is simply optional.  NOTE the 
!     	// user object is required by default
!         if ($this->getUserRequired() AND !is_object($this->user)) {
              // NOTE this makes use of the global forward feature in MVCnPHP
              throw new Exception('doForward:login');
***************
*** 128,130 ****
--- 138,150 ----
  		return $this->user->getUserId();
  	}
+ 	
+ 	protected function setUserRequired($switch)
+ 	{
+ 		$this->userRequired = $switch;
+ 	}
+ 	
+ 	protected function getUserRequired()
+ 	{
+ 		return $this->userRequired;
+ 	}
  }
\ No newline at end of file




More information about the geeklog-cvs mailing list