[phpwebapp-commits] CVS: web_app/session class.Request.php,1.5,1.5.2.1 class.Session.php,1.6,1.6.2.1

[Dashamir H. <das...@us...>]

Update of /cvsroot/phpwebapp/web_app/session
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5614/session

Modified Files:
      Tag: phpwebapp-1_0
	class.Request.php class.Session.php 
Log Message:
All the changes that are done after release 1.0 (but without the XML parser
and XHML template requirement) are placed in the branch phpwebapp-1_0,
so that old applications can get them, without having to modify their
templates.


Index: class.Request.php
===================================================================
RCS file: /cvsroot/phpwebapp/web_app/session/class.Request.php,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -d -r1.5 -r1.5.2.1
*** class.Request.php	25 Aug 2003 13:18:31 -0000	1.5
--- class.Request.php	4 Oct 2004 09:09:32 -0000	1.5.2.1
***************
*** 33,37 ****
    var $phpVars;
  
!   /** If true, then this page is the first in the session. */
    var $firstTime;
  
--- 33,37 ----
    var $phpVars;
  
!   /** Is true only for the first page in the session. */
    var $firstTime;
  

Index: class.Session.php
===================================================================
RCS file: /cvsroot/phpwebapp/web_app/session/class.Session.php,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
*** class.Session.php	25 Aug 2003 13:18:31 -0000	1.6
--- class.Session.php	4 Oct 2004 09:09:32 -0000	1.6.2.1
***************
*** 41,46 ****
        $this->dbVars = array();
  
!       $sessVars = $request->sessionVars;
!       if ($sessVars==UNDEFINED )
          {
            //new session
--- 41,45 ----
        $this->dbVars = array();
  
!       if ($request->firstTime)
          {
            //new session
***************
*** 49,53 ****
        else
          {
!           $this->getVars($sessVars);
            $this->getDBVars();
          }
--- 48,52 ----
        else
          {
!           $this->getVars($request->sessionVars);
            $this->getDBVars();
          }
***************
*** 211,216 ****
            if (isset($this->dbVars[$var_name]))
              {
!               $msg ="Session::addVar(): DB var '$var_name' already exists."; 
!               print WebApp::warning_msg($msg);
              }
            if (isset($this->Vars[$var_name]))
--- 210,215 ----
            if (isset($this->dbVars[$var_name]))
              {
!               //this variable is already initialized
!               return;
              }
            if (isset($this->Vars[$var_name]))
***************
*** 230,235 ****
            if (isset($this->Vars[$var_name]))
              {
!               $msg = "Session::addVar(): JS var '$var_name' already exists.";
!               print WebApp::warning_msg($msg);            
              }
            $this->Vars[$var_name] = $var_value;
--- 229,234 ----
            if (isset($this->Vars[$var_name]))
              {
!               //this variable is already initialized
!               return;
              }
            $this->Vars[$var_name] = $var_value;