Index: branches/unlabeled/unlabeled-1.12.2/tools/debug_sample.php
===================================================================
diff -u -r4941 -r6206
--- branches/unlabeled/unlabeled-1.12.2/tools/debug_sample.php	(.../debug_sample.php)	(revision 4941)
+++ branches/unlabeled/unlabeled-1.12.2/tools/debug_sample.php	(.../debug_sample.php)	(revision 6206)
@@ -1,60 +1,72 @@
 <?php
 
-//	define('SILENT_LOG', 1); // write all sql errors to log
-//	define('DBG_REQUREST_LOG', $_SERVER['DOCUMENT_ROOT'].'/../request.log'); // write all POST/GET request log to file
+//	define('DBG_IP', '193.68.72.83');			// Define IP addreses, that are allowed to user debugger, semicolon separated. All allowed if none specified. 
+//	define('SILENT_LOG', 1);					// Log all php errors on site to separate file (/silent_log.txt)
+//	define('DBG_REQUREST_LOG', '/path/to/file');// Log all user requests to site into filename specified
+//	define('DBG_SITE_PATH', '/relative_path/');	// set alternative BASE_PATH for old in-portal parts (where no K4 included)
 	
-	define('DEBUG_MODE', 1); // enable/disable debug mode
-	if( defined('DEBUG_MODE') && DEBUG_MODE ) InitDebugger();
+	InitDebugger();
 	
-	//define('DBG_SITE_PATH', '/');	// set alternative BASE_PATH for old in-portal parts (where no K4 included)
-
-	//define('CMS', 1);	// search for missing templates on HDD in database
+	/**
+	 * Allows to determine if debug is allowed by user, who is viewing site
+	 *
+	 * @return bool
+	 */
+	function DebugAllowed()
+	{
+		$ip_addresses = defined('DBG_IP') && DBG_IP ? explode(';', DBG_IP) : Array($_SERVER['REMOTE_ADDR']);
+		
+		return 	in_array($_SERVER['REMOTE_ADDR'], $ip_addresses) &&
+				!(defined('IS_INSTALL') && IS_INSTALL);
+	}
 	
+	/**
+	 * Performs initial debugger configuration by defining control constants
+	 *
+	 */
 	function InitDebugger()
 	{
-		define('DBG_LOCAL_BASE_PATH', 'w:'); // replace server's DocumentRoot by this path in filenames in errors
+		if (!DebugAllowed()) {
+			// debug is not allowed
+			return false;
+		}
+		define('DEBUG_MODE', 1);				// Debug mode is allowed
 		
-//		define('DBG_RAISE_ON_WARNINGS', 1); // show debugger automatically if some errors occured
-		define('DBG_SQL_PROFILE',1);	// profile SQL queries
-		define('DBG_SQL_FAILURE', defined('IS_INSTALL') && IS_INSTALL ? 0 : 1);	// assume sql errors as php fatal errors, warning otherwise
+		define('DBG_LOCAL_BASE_PATH', 'w:');	// Folder name on mapped drive, where site resides
+		define('DBG_TOOLBAR_BUTTONS', 1);		// Show "Show Debugger" & "Refresh Frame" buttons (on front)
 		
-//		define('DBG_PROFILE_INCLUDES', 1);
-
-		define('DBG_SHOW_HTTPQUERY', 1);	// show http query content
-		define('DBG_SHOW_SESSIONDATA', 1);	// show session data
-
-//		define('DBG_EDIT_HELP', 1);	// Show help filename on help screen
-//		define('DBG_HELP', 1);		// Show FCK editor when viewing help screen
+//		define('DBG_USE_HIGHLIGHT', 0);			// Use "highlight_string" php function for debugger output formatting
+//		define('DBG_RAISE_ON_WARNINGS',1);		// Show debugger output in case of any non-fatal error
+		define('DBG_SQL_PROFILE',1);			// Profile SQL queries
+		define('DBG_SQL_FAILURE', defined('IS_INSTALL') && IS_INSTALL ? 0 : 1);	// treat sql errors as fatal errors except for installation process
 		
-//		define('DBG_FORCE_THEME', 1);	// Use this ThemeId, not one passed in env
-		define('DBG_PHRASES', 1);		// Add ability to translate phrases on the fly (K4 only)
-//		define('DBG_PHRASES_HIGHLIGHT', 1); // used for phrase existance detection debugging
+		define('DBG_SHOW_HTTPQUERY', 1);		// Show http query content (parsed user submit, GPC)
+		define('DBG_SHOW_SESSIONDATA', 1);		// Show session data (at script finish)
 		
+		define('DBG_EDIT_HELP', 1);				// Show help filename on help screen
+//		define('DBG_HELP', 1);		// Show FCK editor when viewing help screen
+		
+//		define('DBG_FORCE_THEME', 1);			// Use this theme_id instead of one in url
+		define('DBG_PHRASES', 1);				// Add ability to translate phrases on the fly (K4 templates only)
 		define('DBG_WINDOW_WIDTH', 700);// Set custom debugger layer width (in pixels)
 		
-//		define('DBG_CACHE', 1);	// debug cache usage
-//		define('DBG_REDIRECT', 1); // set this to debug get redirect attempts
-		define('DBG_ZEND_PRESENT', 0); // set this to zero to debug debugger
-		//define('DBG_VALIDATE_CONFIGS',1);	// check that config fields match ones from database
-//		define('DBG_SHOW_TAGS', 1);		// show tags beeing processed
+//		define('DBG_REDIRECT', 1);				// Show links with redirect url instead of performing it (useful in events debugging)
+//		define('DBG_ZEND_PRESENT',0);			// Set to 0 to debug debugger (because debugger automatically got disabled during zend debug sessions)
+//		define('DBG_VALIDATE_CONFIGS',1);		// Check that config fields match ones from database
+//		define('DBG_SHOW_TAGS', 1);				// Show tags beeing processed
 		
 		// for ADODB to work: begin
 		define('ADODB_OUTP', 'dbg_SQLLog');
-		
-		function dbg_SQLLog($msg,$new_line=false)
-		{
-			
-		}
+		function dbg_SQLLog($msg, $new_line = false) { }
 		// for ADODB to work: end
 		
 		function isSkipTable($sql)
 		{
 			// don't show sqls that use one or more tables from list below
 			static $skipTables = Array(	'PermissionConfig','SessionData','Permissions',
-										'Phrase','Cache',
+										'Phrase','Cache','Modules','PermCache','Events',
 										'PersistantSessionData','EmailQueue','UserSession',
-										'ThemeFiles', 'Language');
-			// ,'Modules',,'PermCache','Events''ConfigurationValues',
+										'ThemeFiles', 'Language','ConfigurationValues');
 			
 			// make exception for scripts listed below
 			$filename = basename($_SERVER['PHP_SELF']);