[Magellancms-cvs] magellan/var/lib magellan.library,1.12,1.13 pagebuilder.library,1.11,1.12 session.library,1.6,1.7 webusers.library,1.8,1.9

[<bur...@us...>]

Update of /cvsroot/magellancms/magellan/var/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv21007/var/lib

Modified Files:
	magellan.library pagebuilder.library session.library 
	webusers.library 
Log Message:
CHANGES:
- Removed all the uniqid() commands. This speed up things. (wuh)


Index: magellan.library
===================================================================
RCS file: /cvsroot/magellancms/magellan/var/lib/magellan.library,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** magellan.library	31 Mar 2003 10:51:59 -0000	1.12
--- magellan.library	4 Apr 2003 16:46:05 -0000	1.13
***************
*** 169,173 ****
                                                     $this->mrSiteDb->Format_Text( $pageData['title'] ).','.
                                                     $this->mrSiteDb->Format_Text( $pageData['metadesc'] ).','.
!                                                    $this->mrSiteDb->Format_Text( $pageData['metakey'] ).",0,'')" ) )
                      {
                          $this->mPageId = $page_id;
--- 169,173 ----
                                                     $this->mrSiteDb->Format_Text( $pageData['title'] ).','.
                                                     $this->mrSiteDb->Format_Text( $pageData['metadesc'] ).','.
!                                                    $this->mrSiteDb->Format_Text( $pageData['metakey'] ).",0,0)" ) )
                      {
                          $this->mPageId = $page_id;
***************
*** 873,877 ****
  			global $env;
  
! 			$template_file = md5( uniqid( rand() ) );
  
  			// If no template file is provided, then create an empty one
--- 873,877 ----
  			global $env;
  
! 			$template_file = md5( microtime().posix_getpid() );
  
  			// If no template file is provided, then create an empty one

Index: pagebuilder.library
===================================================================
RCS file: /cvsroot/magellancms/magellan/var/lib/pagebuilder.library,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** pagebuilder.library	24 Feb 2003 14:05:27 -0000	1.11
--- pagebuilder.library	4 Apr 2003 16:46:10 -0000	1.12
***************
*** 73,76 ****
--- 73,81 ----
          // to extract the template id
          //
+ 
+         if ( isset( $_GET['tid'] ) ) $tid = $_GET['tid'];
+         elseif ( isset( $_POST['tid'] ) ) $tid = $_POST['tid'];
+         else $tid = '';
+ 
          if ( !empty( $pageid ) )
          {
***************
*** 111,115 ****
              }
  
!             $tmpfn = TMP_PATH.'magellanpages/'.md5( uniqid( rand() ) );
              // Page generator object
              //
--- 116,120 ----
              }
  
!             $tmpfn = TMP_PATH.'magellanpages/'.md5( microtime().posix_getpid() );
              // Page generator object
              //
***************
*** 145,149 ****
  
              $hook->CallHooks( 'rendering', $null, '' );
! 
              include( $tmpfn );
              @unlink( $tmpfn );
--- 150,161 ----
  
              $hook->CallHooks( 'rendering', $null, '' );
! /*
!             $fp = fopen( $tmpfn, 'r' );
!             while ( !feof( $fp ) )
!             {
!                 echo fread( $fp, filesize( $tmpfn ) );
!             }
!             fclose( $fp );
! */
              include( $tmpfn );
              @unlink( $tmpfn );

Index: session.library
===================================================================
RCS file: /cvsroot/magellancms/magellan/var/lib/session.library,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** session.library	24 Feb 2003 14:05:27 -0000	1.6
--- session.library	4 Apr 2003 16:46:11 -0000	1.7
***************
*** 82,86 ****
  		if ( !headers_sent() )
  		{
!         	$this->sessid = md5( uniqid( rand() ) );
          	//setcookie( 'amp_sessid', $this->sessid, '', '/' );
          	setcookie( 'amp_sessid', $this->sessid, SESSION_MAXLIFE, '/' );
--- 82,86 ----
  		if ( !headers_sent() )
  		{
!         	$this->sessid = md5( microtime().posix_getpid() );
          	//setcookie( 'amp_sessid', $this->sessid, '', '/' );
          	setcookie( 'amp_sessid', $this->sessid, SESSION_MAXLIFE, '/' );

Index: webusers.library
===================================================================
RCS file: /cvsroot/magellancms/magellan/var/lib/webusers.library,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** webusers.library	12 Feb 2003 11:33:04 -0000	1.8
--- webusers.library	4 Apr 2003 16:46:12 -0000	1.9
***************
*** 64,68 ****
                                    'Invalid site database handler' );
  
!         if ( is_object( $rampDb ) ) $this->mrAmpDb = &$rampDb;
  
          $this->mUid = $userid;
--- 64,68 ----
                                    'Invalid site database handler' );
  
!         $this->mrAmpDb = &$GLOBALS['gEnv']['root']['db'];
  
          $this->mUid = $userid;