From f250bb41e9e70deff9946e5c04baca469787f4df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a?= <marcosgdf@gmail.com>
Date: Tue, 16 Oct 2012 02:13:38 +0200
Subject: [PATCH] Removed unnecessary comments and commented unused config
 variables

---
 htdocs/admin/syslog.php                       | 66 -------------------
 .../modules/syslog/mod_syslog_chromephp.php   | 30 ++++-----
 .../modules/syslog/mod_syslog_firephp.php     | 32 ++++-----
 3 files changed, 31 insertions(+), 97 deletions(-)

diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index 4038418061c..18dfabefcb0 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -209,72 +209,6 @@ foreach ($syslogModules as $moduleName)
 	print "</tr>\n";
 }
 
-// // Output to file
-// $var=!$var;
-// print '<tr '.$bc[$var].'><td width="140"><input '.$bc[$var].' type="checkbox" name="SYSLOG_FILE_ON" '.$option.' value="1" '.($syslog_file_on?' checked="checked"':'').'> '.$langs->trans("SyslogSimpleFile").'</td>';
-// print '<td nowrap="nowrap">'.$langs->trans("SyslogFilename").': <input type="text" class="flat" name="filename" '.$option.' size="60" value="'.$defaultsyslogfile.'">';
-// print '</td>';
-// print "<td align=\"left\">".$form->textwithpicto('',$langs->trans("YouCanUseDOL_DATA_ROOT"));
-// print '</td></tr>';
-
-// // Output to syslog
-// $var=!$var;
-// print '<tr '.$bc[$var].'><td width="140"><input '.$bc[$var].' type="checkbox" name="SYSLOG_SYSLOG_ON" '.$option.' value="1" '.($syslog_syslog_on?' checked="checked"':'').'> '.$langs->trans("SyslogSyslog").'</td>';
-// print '<td nowrap="nowrap">'.$langs->trans("SyslogFacility").': <input type="text" class="flat" name="facility" '.$option.' value="'.$defaultsyslogfacility.'">';
-// print '</td>';
-// print "<td align=\"left\">".$form->textwithpicto('', $langs->trans('OnlyWindowsLOG_USER'));
-// print '</td></tr>';
-
-// // Output to Firebug
-// try
-// {
-//     set_include_path('/usr/share/php/');
-//     $res=@include_once 'FirePHPCore/FirePHP.class.php';
-//     restore_include_path();
-//     if ($res)
-//     {
-//         $var=!$var;
-//         print '<tr '.$bc[$var].'><td width="140"><input '.$bc[$var].' type="checkbox" name="SYSLOG_FIREPHP_ON" '.$option.' value="1" ';
-//         if (! class_exists('FirePHP')) print ' disabled="disabled"';
-//         else print ($syslog_firephp_on?' checked="checked"':"");
-//         print '> '.$langs->trans("FirePHP").'</td>';
-//         print '<td nowrap="nowrap">';
-//         print '</td>';
-//         print "<td align=\"left\">".$form->textwithpicto('','FirePHP must be installed onto PHP and FirePHP plugin for Firefox must also be installed');
-//         print '</td></tr>';
-//     }
-// }
-// catch(Exception $e)
-// {
-//     // Do nothing
-//     print '<!-- FirePHP no available into PHP -->'."\n";
-// }
-
-// // Output to Chrome
-// try
-// {
-// 	set_include_path('/usr/share/php/');
-// 	$res=@include_once 'ChromePhp.php';
-// 	restore_include_path();
-// 	if ($res)
-// 	{
-// 		$var=!$var;
-// 		print '<tr '.$bc[$var].'><td width="140"><input '.$bc[$var].' type="checkbox" name="SYSLOG_CHROMEPHP_ON" '.$option.' value="1" ';
-// 		if (! class_exists('ChromePHP')) print ' disabled="disabled"';
-// 		else print ($syslog_chromephp_on?' checked="checked"':"");
-// 		print '> '.$langs->trans("ChromePHP").'</td>';
-// 		print '<td nowrap="nowrap">';
-// 		print '</td>';
-// 		print "<td align=\"left\">".$form->textwithpicto('','ChromePHP must be installed onto PHP path and ChromePHP plugin for Chrome must also be installed');
-// 		print '</td></tr>';
-// 	}
-// }
-// catch(Exception $e)
-// {
-// 	// Do nothing
-// 	print '<!-- ChromePHP no available into PHP -->'."\n";
-// }
-
 print "</table>\n";
 print "</form>\n";
 
diff --git a/htdocs/core/modules/syslog/mod_syslog_chromephp.php b/htdocs/core/modules/syslog/mod_syslog_chromephp.php
index 633dbfd581e..dc26fa35722 100644
--- a/htdocs/core/modules/syslog/mod_syslog_chromephp.php
+++ b/htdocs/core/modules/syslog/mod_syslog_chromephp.php
@@ -53,22 +53,22 @@ class mod_syslog_chromephp extends LogHandler implements LogHandlerInterface
 		return false;
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function configure()
-	{
-		global $langs;
+	// /**
+	//  * {@inheritDoc}
+	//  */
+	// public function configure()
+	// {
+	// 	global $langs;
 		
-		return array(
-			array(
-				'name' => $langs->trans('IncludePath'),
-				'constant' => 'SYSLOG_CHROMEPHP_INCLUDEPATH',
-				'default' => '/usr/share/php',
-				'attr' => 'size="40"'
-			)
-		);
-	}
+	// 	return array(
+	// 		array(
+	// 			'name' => $langs->trans('IncludePath'),
+	// 			'constant' => 'SYSLOG_CHROMEPHP_INCLUDEPATH',
+	// 			'default' => '/usr/share/php',
+	// 			'attr' => 'size="40"'
+	// 		)
+	// 	);
+	// }
 
 	/**
 	 * {@inheritDoc}
diff --git a/htdocs/core/modules/syslog/mod_syslog_firephp.php b/htdocs/core/modules/syslog/mod_syslog_firephp.php
index 3bc0c6afbea..ca6396db50d 100644
--- a/htdocs/core/modules/syslog/mod_syslog_firephp.php
+++ b/htdocs/core/modules/syslog/mod_syslog_firephp.php
@@ -53,22 +53,22 @@ class mod_syslog_firephp extends LogHandler implements LogHandlerInterface
 		return false;
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function configure()
-	{
-		global $langs;
+	// /**
+	//  * {@inheritDoc}
+	//  */
+	// public function configure()
+	// {
+	// 	global $langs;
 		
-		return array(
-			array(
-				'name' => $langs->trans('IncludePath'),
-				'constant' => 'SYSLOG_FIREPHP_INCLUDEPATH',
-				'default' => '/usr/share/php',
-				'attr' => 'size="40"'
-			)
-		);
-	}
+	// 	return array(
+	// 		array(
+	// 			'name' => $langs->trans('IncludePath'),
+	// 			'constant' => 'SYSLOG_FIREPHP_INCLUDEPATH',
+	// 			'default' => '/usr/share/php',
+	// 			'attr' => 'size="40"'
+	// 		)
+	// 	);
+	// }
 
 	/**
 	 * {@inheritDoc}
@@ -80,7 +80,7 @@ class mod_syslog_firephp extends LogHandler implements LogHandlerInterface
 		$errors = array();
 
 		$oldinclude = get_include_path();
-		set_include_path(SYSLOG_FIREPHP_INCLUDEPATH);
+		set_include_path('/usr/share/php/');
 
 		if (!file_exists('FirePHPCore/FirePHP.class.php'))
 		{