Index: trunk/tools/debug_sample.php
===================================================================
diff -u -N -r874 -r1566
--- trunk/tools/debug_sample.php	(.../debug_sample.php)	(revision 874)
+++ trunk/tools/debug_sample.php	(.../debug_sample.php)	(revision 1566)
@@ -1,114 +1,39 @@
 <?php
-	// uncomment next line to enable sql logging
-	define('ADODB_OUTP', 'SQLLog'); 
-	
-	
-	define('DOC_ROOT', $_SERVER['DOCUMENT_ROOT']);
-	define('WINDOWS_ROOT', 'w:');
-	define('WINDOWS_EDITOR', 'c:\Program Files\Zend\ZendStudio-4.0Beta\bin\ZDE.exe %F'); // %F - filename, %L - line number
-	define('DBG_STYLESHEET', 'http://'.$_SERVER['HTTP_HOST'].'/in-portal/admin/include/debug_styles.css');
-	
-	//define('SQL_TO_SCREEN', 1);		// output sql queries to screen
-	
-		
-	define('SQL_ERROR_DIE', 1);
-	//define('SQL_PROFILE', 1);
-	
-	// sql logging to file
-	define('SQL_TO_FILE', 1); 		// output sql queries to file
-	define('SQL_OUTPUT', DOC_ROOT.'/inportal_sqls.txt'); // file where to store sql queries
-	define('SQL_OVERWRITE', 1); 	// overwrite or not sql_log file
-	
-	define('DEBUG_MODE', 1); // global debugging
-	//define('DEBUG_HELP', 1); // allow to add missing help 
 
-	if( defined('DEBUG_MODE') && constant('DEBUG_MODE') == 1 )
-	{
-		ini_set('display_errors', 1);
-	}
+	define('DEBUG_MODE',1);
+	if( defined('DEBUG_MODE')&&DEBUG_MODE ) InitDebugger();
 	
-	function isSkipTable($sql)
+	function InitDebugger()
 	{
-		static $skipTables = Array('Modules','Language','PermissionConfig','PermCache',
-								'SessionData','UserSession','Phrase','ConfigurationValues',
-								'PersistantSessionData','Events','EmailQueue',
-								'Permissions');
-		static $prefix = '';
-		$prefix = GetTablePrefix();						
-		foreach($skipTables as $table)
-		{
-			if( strpos($sql, $prefix.$table) !== false ) return true;
-		}						
-		return false;
-	}
-	
-	function SQLLog($msg, $newline = true)
-	{
-		static $file_reset = false;
-		$db =& GetADODBConnection();
+		define('WINDOWS_ROOT', 'w:');
+
+		//define('DBG_RAISE_ON_WARNINGS',1);
+		define('DBG_SQL_PROFILE',1);	// profile SQL queries
+		define('DBG_SQL_FAILURE',1);	// assume sql errors as php fatal errors, warning otherwise
 		
-		if( isSkipTable($msg) ) return false;
-		
-		$select_pos = strpos($msg, 'SELECT ');
-		if($select_pos !== false)
+		// for ADODB
+		define('ADODB_OUTP', 'dbg_SQLLog');
+		function dbg_SQLLog($msg,$new_line=false)
 		{
-			// add affected rows	
-			$before = substr($msg,0,$select_pos);
-			$after = substr($msg,$select_pos,strlen($msg));
-			$msg = $before.'AR: ['.$db->Affected_Rows().'] '.$after;
+			
 		}
 		
-		if($newline) $msg .= "<br>\n";
-		if( defined('SQL_TO_SCREEN') && SQL_TO_SCREEN == 1 ) echo $msg;
-		if( defined('SQL_TO_FILE') && SQL_TO_FILE == 1 )
+		function isSkipTable($sql)
 		{
-			if($file_reset == false && defined('SQL_OVERWRITE') && SQL_OVERWRITE)
-			{
-				if( file_exists(SQL_OUTPUT) ) unlink(SQL_OUTPUT);
-				$file_reset = true;
-			}
-			$msg = str_replace(Array("<hr />\n",' &nbsp; <code></code>','&lt;','&gt;','&quot;'),Array('','','<','>','"'),$msg);
-			$fp = fopen(SQL_OUTPUT, 'a');
-			fwrite($fp,$msg);
-			fclose($fp);
+			static $skipTables = Array(	'Modules','Language','PermissionConfig','PermCache',
+			'SessionData','ConfigurationValues','Events','Phrase',
+			'PersistantSessionData','EmailQueue','UserSession',
+			'Permissions','ThemeFiles');
+
+			foreach($skipTables as $table) if( tableMatch($table,$sql) ) return true;
+			return false;
 		}
-	}
-	
-	/**
-	* @return string
-	* @desc Returnts trace results to place where called from
-	*/
-	function trace()
-	{
-		die('Error: Depricated call. Use <b>$debugger->appendTrace();</b> instead');
-		/*$trace_results = debug_backtrace();
-		array_shift($trace_results);
-		echo 'Called from [<b>'.$trace_results[0]['function'].'</b>]<br>';
-		print_pre($trace_results);*/	
-	}
-	
-	function DebugByFile()
-	{
-		$ScriptName = basename( $_SERVER['PHP_SELF'] );
-		switch ($ScriptName)
+
+		function tableMatch($table_name,$sql)
 		{
-			case 'step3.php':
-				global $objSession;
-				$objSession->SetVariable('import_sql_type',	'mysql');
-				$objSession->SetVariable('import_server',	'localhost');
-				$objSession->SetVariable('import_db',		'alex_in_portal'); //maris_inlink');
-				$objSession->SetVariable('import_user',		'dev');
-				$objSession->SetVariable('import_pass',		'dev-25-sql');
-			
-				$objSession->SetVariable('categoryid', 101); // resource id
-				$objSession->SetVariable('import_category_id', 1); // category id
-				$objSession->SetVariable('catnavbar', 'Home>Directory (debug_auto_complete)');
-				$objSession->SetVariable('user_admin_names','admin');
-				$objSession->SetVariable('user_admin_values', 11);
-				$objSession->SetVariable('user_regular_names','Member');
-				$objSession->SetVariable('user_regular_values', 13);
-				break;
+			static $prefix = '';
+			$prefix = defined('TABLE_PREFIX')?TABLE_PREFIX:GetTablePrefix();
+			return strpos($sql,$prefix.$table_name)!==false;
 		}
 	}
-	
 ?>
\ No newline at end of file