From: Nik Okuntseff <support@anuko.com>
Date: Thu, 7 Apr 2016 20:15:46 +0000 (+0000)
Subject: Merge branch 'refactoring_test' - this is really a test.
X-Git-Tag: timetracker_1.19-1~1715
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/commitdiff_plain/975b7f31dc237009f2eb186a13e33fc3bbae6e0c?hp=-c

Merge branch 'refactoring_test' - this is really a test.
---

975b7f31dc237009f2eb186a13e33fc3bbae6e0c
diff --combined WEB-INF/lib/common.lib.php
index 4fa43777,13a5d13c..27c43de3
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@@ -26,8 -26,13 +26,8 @@@
  // | https://www.anuko.com/time_tracker/credits.htm
  // +----------------------------------------------------------------------+
  
 -	/**
 -	 * @return unknown
 -	 * @param file unknown
 -	 * @param version = "" unknown
 -	 * @desc Loads a class
 -	 */
 -	function import( $class_name ) {
 +// import() function loads a class.
 +function import($class_name) {
  	    $libs = array(
  			dirname($_SERVER["SCRIPT_FILENAME"]),
  			LIBRARY_DIR
@@@ -56,7 -61,7 +56,7 @@@
  
  		print '<br><b>load_class: error loading file "'.$filename.'"</b>';
  		die();
 -	}
 +}
  
  	// The mu_sort function is used to sort a multi-dimensional array.
  	// It looks like the code example is taken from the PHP manual http://ca2.php.net/manual/en/function.sort.php
@@@ -158,11 -163,9 +158,9 @@@ function sec_to_time_fmt_hm($sec
  
  function magic_quotes_off()
  {
-   // if (get_magic_quotes_gpc()) { // This check is now done before calling this function.
-     $_POST = array_map('stripslashes_deep', $_POST);
-     $_GET = array_map('stripslashes_deep', $_GET);
-     $_COOKIE = array_map('stripslashes_deep', $_COOKIE);
-   // }
+   $_POST = array_map('stripslashes_deep', $_POST);
+   $_GET = array_map('stripslashes_deep', $_GET);
+   $_COOKIE = array_map('stripslashes_deep', $_COOKIE);
  }
  
  // check_extension checks whether a required PHP extension is loaded and dies if not so.