openrat-cms

commit 64f7caac097926402dd34f285af1e18af74acc70
parent 490c4c5e50cabcf094de5c7296404c7047630b43
Author: dankert <devnull@localhost>
Date:   Tue, 17 Mar 2009 02:39:43 +0100

Funktionsfähigkeit bei enable_cache=false

Diffstat:
objectClasses/Object.class.php
 | 
23
+++++++++++++----------
objectClasses/Page.class.php
 | 
13
++++---------
objectClasses/Value.class.php
 | 
3
+--

3 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/objectClasses/Object.class.php b/objectClasses/Object.class.php
@@ -20,6 +20,9 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // ---------------------------------------------------------------------------
 // $Log$
+// Revision 1.31  2009-03-17 01:39:43  dankert
+// Funktionsfähigkeit bei enable_cache=false
+//
 // Revision 1.30  2009-03-17 01:27:28  dankert
 // Überarbeitung der temporären Dateinamen.
 //
@@ -1151,22 +1154,22 @@ class Object
 	{
 		global $conf;
 		
-		if	( $conf['cache']['enable_cache'] )
-		{
+//		if	( $conf['cache']['enable_cache'] )
+//		{
 			$filename = Object::getTempDir().'/openrat';
 			foreach( $attr as $a=>$w )
 				$filename .= '_'.$a.$w;
 				
 			$filename .= '.tmp';
 			return $filename;
-		}
-		else
-		{
-			$tmpdir = @$conf['cache']['tmp_dir'];
-			$tmpfile = tempnam( $tmpdir,'openrat_tmp' );
-			
-			return $tmpfile;
-		}
+//		}
+//		else
+//		{
+//			$tmpdir = @$conf['cache']['tmp_dir'];
+//			$tmpfile = tempnam( $tmpdir,'openrat_tmp' );
+//			
+//			return $tmpfile;
+//		}
 	}
 
 
diff --git a/objectClasses/Page.class.php b/objectClasses/Page.class.php
@@ -20,6 +20,9 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // ---------------------------------------------------------------------------
 // $Log$
+// Revision 1.30  2009-03-17 01:39:43  dankert
+// Funktionsfähigkeit bei enable_cache=false
+//
 // Revision 1.29  2009-03-17 01:27:29  dankert
 // Überarbeitung der temporären Dateinamen.
 //
@@ -737,19 +740,12 @@ class Page extends Object
 	function generate()
 	{
 		global $conf;
-//		Html::debug($conf);
+		
 		if	( $conf['cache']['enable_cache'] && is_file($this->tmpfile() ))
 		{
 			$this->value = implode('',file($this->tmpfile()));
 			return $this->value;
 		}
-
-		global $conf,
-		       $conf_php,
-		       $db,
-			   $conf_tmpdir,
-			   $sess_vars,
-			   $SESS;
 	
 		$this->generate_elements();
 
@@ -761,7 +757,6 @@ class Page extends Object
 		$src = $this->template->src;
 
 		// Ersetzen der Platzhalter durch die Element-Inhalte
-		//
 		
 		foreach( $this->values as $id=>$value )
 		{
diff --git a/objectClasses/Value.class.php b/objectClasses/Value.class.php
@@ -430,7 +430,7 @@ SQL
 		$inhalt = '';
 
 		global $conf;
-//		Html::debug($conf);
+
 		if	( $conf['cache']['enable_cache'] && is_file( $this->tmpfile() ))
 		{
 			$this->value = implode('',file($this->tmpfile() )); // from cache.
@@ -456,7 +456,6 @@ SQL
 			return;
 		}
 		
-//		Html::debug( $this->element->type );	
 		switch( $this->element->type )
 		{
 			case 'list'  : // nur wg. R�ckw�rtskompabilit�t.