Merge lp:~edb/quam-plures/debug_logged-in_only into lp:quam-plures

[EdB]

http://forums.quamplures.net/viewtopic.php?f=6&t=920

Adds $debug_visitors so you can turn on debug for logged in only with normal $debug or for everyone with both $debug and $debug_visitors

[Tilman Blumenbach (tblue)]

Works! ;)

review: Approve

[Tilman Blumenbach (tblue)]

Does somebody else want to review this one? I usually merge branches after they have been approved by at least two reviewers.

[lp:~edb/quam-plures/debug_logged-in_only]

7628. By EdB on 2011-09-13

matches core 7632

7629. By EdB on 2011-10-05

core updates

=== modified file 'qp_config/_advanced.php'
--- qp_config/_advanced.php	2010-09-15 01:18:55 +0000
+++ qp_config/_advanced.php	2011-10-05 17:42:08 +0000
@@ -30,6 +30,16 @@
  */
 $debug = 0;
 
+/**
+ * Display debugging informations to visitors?
+ *
+ * $debug always applies to anyone logged in. Set this to 1 if you want to see
+ * debug info when not logged in (for troubleshooting what a visitor sees).
+ *
+ * @global integer
+ */
+$debug_visitors = 0;
+
 // Most of the time you'll want to see all errors, including notices:
 // QP should run notice free! (plugins too!)
 if( ! defined( 'E_DEPRECATED' ) )
 
=== modified file 'qp_inc/_core/_misc.funcs.php'
--- qp_inc/_core/_misc.funcs.php	2011-09-02 19:22:04 +0000
+++ qp_inc/_core/_misc.funcs.php	2011-10-05 17:42:08 +0000
@@ -1866,28 +1866,44 @@
  */
 function debug_info( $force = false, $force_clean = false )
 {
-	global $debug, $debug_done, $Debuglog, $DB, $obhandler_debug, $Timer, $ReqHost, $ReqPath, $is_cli;
-	global $cache_imgsize, $cache_File;
-	global $Session;
-	global $app_db_config, $app_db_tableprefix;
+	global $app_db_config;
+	global $app_db_tableprefix;
+	global $cache_File;
+	global $cache_imgsize;
+	global $DB;
+	global $debug;
+	global $debug_done;
+	global $debug_visitors;
+	global $Debuglog;
 	/**
 	 * @var Hit
 	 */
 	global $Hit;
+	global $is_cli;
+	global $obhandler_debug;
+	global $ReqHost;
+	global $ReqPath;
+	global $Session;
+	global $Timer;
+
+	if( ! is_logged_in() && ! $debug_visitors )
+	{ // No debug for visitors
+		return;
+	}
 
 	if( !$force )
 	{
-		if( !empty($debug_done))
+		if( !empty( $debug_done ) )
 		{ // Already displayed!
 			return;
 		}
 
-		if( empty($debug) )
+		if( empty( $debug ) )
 		{ // No debug output desired:
 			return;
 		}
 
-		if( $debug < 2 && ( empty($Hit) || $Hit->get_agent_type() != 'browser' ) )
+		if( $debug < 2 && ( empty( $Hit ) || $Hit->get_agent_type() != 'browser' ) )
 		{	// Don't display if it's not a browser (very needed for proper RSS display btw)
 			// ($Hit is empty e.g. during install)
 			return;
 
=== modified file 'qp_inc/plugins/_plugin.class.php'
--- qp_inc/plugins/_plugin.class.php	2011-09-04 22:27:27 +0000
+++ qp_inc/plugins/_plugin.class.php	2011-10-05 17:42:08 +0000
@@ -2500,7 +2500,8 @@
 	{
 		global $plugins_path;
 
-		$globalfile_path = $plugins_path.$this->classname.'/po/php/_global.php';
+		$globalfile = $this->classname.'/po/php/_global.php';
+		$globalfile_path = $plugins_path.$globalfile;
 		$trans = & $this->_trans;
 
 		// Load the global messages file, if existing:
@@ -2514,7 +2515,7 @@
 			}
 			else
 			{
-				$this->debug_log( 'Global messages file '.$globalfile_path.' does not exist or is not readable!', 'locale' );
+				$this->debug_log( 'Translation file '.$globalfile.' does not exist or is not readable!', 'locale' );
 			}
 		}
 
 
=== modified file 'qp_inc/widgets/model/_widget.class.php'
--- qp_inc/widgets/model/_widget.class.php	2011-09-01 02:17:16 +0000
+++ qp_inc/widgets/model/_widget.class.php	2011-10-05 17:42:08 +0000
@@ -614,9 +614,11 @@
 			return $this->Plugin->T_( $string, $req_locale );
 		}
 
-		global $plugins_path,$Debuglog;
+		global $plugins_path;
+		global $Debuglog;
 
-		$globalfile_path = $plugins_path.$this->code.'_widget/po/php/_global.php';
+		$globalfile = $this->code.'_widget/po/php/_global.php';
+		$globalfile_path = $plugins_path.$globalfile;
 		$trans = & $this->_trans;
 
 		// Load the global messages file, if existing:
@@ -630,7 +632,7 @@
 			}
 			else
 			{
-				$Debuglog->add( 'Global messages file '.$globalfile_path.' does not exist or is not readable!', 'locale' );
+				$Debuglog->add( 'Translation file '.$globalfile.' does not exist or is not readable!', 'locale' );
 			}
 		}