binarycloud-cvs-commit

[binarycloud-cvs-commit] cvs: r2 /binarycloud/base/core Debug.php Page.php

[alex <bin...@li...>]

alex		Wed Aug  1 15:49:50 2001 EDT

  Modified files:              
    /r2/binarycloud/base/core	Debug.php Page.php 
  Log:
  Couple post mods to Page and Debug for caching
  
Index: r2/binarycloud/base/core/Debug.php
diff -u r2/binarycloud/base/core/Debug.php:1.5 r2/binarycloud/base/core/Debug.php:1.6
--- r2/binarycloud/base/core/Debug.php:1.5	Wed Aug  1 14:47:53 2001
+++ r2/binarycloud/base/core/Debug.php	Wed Aug  1 15:49:50 2001
@@ -1,7 +1,7 @@
 <?php
 // Header {{{
 /*******************************************************************************
- ** -File		$Id: Debug.php,v 1.5 2001/08/01 21:47:53 alex Exp $
+ ** -File		$Id: Debug.php,v 1.6 2001/08/01 22:49:50 alex Exp $
  ** -License	LGPL (http://www.gnu.org/copyleft/lesser.html)
  ** -Copyright	2001, The Turing Studio, Inc.
  ** -Author		alex black, en...@tu...
@@ -689,7 +689,11 @@
 
 	function _output_globals() {
 		$this->_output_header('GLOBALS Array');
-		print_r($GLOBALS);
+		ob_start();
+			print_r($GLOBALS);
+		$output = ob_get_contents();
+		ob_end_clean();
+		echo htmlspecialchars($output, ENT_QUOTES);
 	}
 
 	// }}}
Index: r2/binarycloud/base/core/Page.php
diff -u r2/binarycloud/base/core/Page.php:1.12 r2/binarycloud/base/core/Page.php:1.13
--- r2/binarycloud/base/core/Page.php:1.12	Wed Aug  1 14:47:53 2001
+++ r2/binarycloud/base/core/Page.php	Wed Aug  1 15:49:50 2001
@@ -1,7 +1,7 @@
 <?php
 // Header {{{
 /*
- * -File		$Id: Page.php,v 1.12 2001/08/01 21:47:53 alex Exp $
+ * -File		$Id: Page.php,v 1.13 2001/08/01 22:49:50 alex Exp $
  * -License		LGPL (http://www.gnu.org/copyleft/lesser.html)
  * -Copyright	2001, The Turing Studio, Inc.
  * -Authors		alex black, en...@tu...
@@ -201,7 +201,7 @@
 			echo join('', $this->output);
 		}
 
-		if ($this->cache['is_valid'] == false) {
+		if ($this->caching == true) {
 			$this->_cache_output('pages');
 		}
 	}

[binarycloud-cvs-commit] cvs: r2 /binarycloud/base/core Debug.php Page.php

[alex <bin...@li...>]

alex		Fri Sep  7 12:37:07 2001 EDT

  Modified files:              
    /r2/binarycloud/base/core	Debug.php Page.php 
  Log:
  Sync from sf
  
Index: r2/binarycloud/base/core/Debug.php
diff -u r2/binarycloud/base/core/Debug.php:1.7 r2/binarycloud/base/core/Debug.php:1.8
--- r2/binarycloud/base/core/Debug.php:1.7	Wed Aug 22 10:50:52 2001
+++ r2/binarycloud/base/core/Debug.php	Fri Sep  7 12:37:07 2001
@@ -1,6 +1,6 @@
 <?php
 // {{{ Header
-/* -File        $Id: Debug.php,v 1.7 2001/08/22 17:50:52 alex Exp $
+/* -File        $Id: Debug.php,v 1.8 2001/09/07 19:37:07 alex Exp $
  * -License     LGPL (http://www.gnu.org/copyleft/lesser.html)
  * -Copyright   2001, The Turing Studio, Inc.
  * -Author      alex black, en...@tu...
@@ -226,6 +226,7 @@
 					$this->_output_all_classes();
 					$this->_output_vars();
 					$this->_output_server_env();
+					$this->_output_session_vars();
 					$this->_output_globals();
 					$this->_output_included_files();
 					break;
@@ -262,6 +263,9 @@
 				case "server_env":
 					$this->_output_server_env();
 					break;
+				case "session":
+					$this->_output_session_vars();
+					break;
 				case "globals":
 					$this->_output_globals();
 					break;
@@ -280,6 +284,7 @@
 					$this->_output_all_classes();
 					$this->_output_vars();
 					$this->_output_server_env();
+					$this->_output_session_vars();
 					$this->_output_globals();
 					$this->_output_included_files();
 					break;
@@ -592,6 +597,36 @@
 			echo "No variables have been captured";
 		}
 	}		
+
+	// }}}
+	// {{{ _output_session_vars
+
+	/**
+	 * This method prints all of the session vars.
+	 * 
+	 * @author	jason hines, ja...@gr...
+	 * @access	private
+	 */
+
+	function _output_session_vars() {
+		global $HTTP_SESSION_VARS;
+
+		$this->_output_header('Session Variables');
+		$session_vars = $HTTP_SESSION_VARS;
+
+		if (is_array($session_vars)) {
+
+			foreach($session_vars as $var=>$key) {
+				print $var;
+				print ": ";
+				print_r($key);
+				print "\n";
+			}
+
+		} else {
+			echo "No session variables have been registered";
+		}
+	}
 
 	// }}}
 	// {{{ _output_server_env
Index: r2/binarycloud/base/core/Page.php
diff -u r2/binarycloud/base/core/Page.php:1.18 r2/binarycloud/base/core/Page.php:1.19
--- r2/binarycloud/base/core/Page.php:1.18	Thu Aug 16 13:43:26 2001
+++ r2/binarycloud/base/core/Page.php	Fri Sep  7 12:37:07 2001
@@ -1,7 +1,7 @@
 <?php
 // Header {{{
 /*
- * -File		$Id: Page.php,v 1.18 2001/08/16 20:43:26 alex Exp $
+ * -File		$Id: Page.php,v 1.19 2001/09/07 19:37:07 alex Exp $
  * -License		LGPL (http://www.gnu.org/copyleft/lesser.html)
  * -Copyright	2001, The Turing Studio, Inc.
  * -Authors		alex black, en...@tu...
@@ -157,7 +157,7 @@
 			echo $CacheManager->GetModuleCache();
 			$Debug->CaptureMessage('Page', "Used module cache with id ".$CacheManager->module['id']);
 		} else {
-			$Debug->CaptureMessage('Page', "Built module");
+			$Debug->CaptureMessage('Page', "Built module ".get_class($mod['obj']));
 			$mod['obj']->Output();
 		}
 		if ($mod['cache'] == true) {