\n";
$OUT .= "\n";
- if (ereg('Y', $display) || (empty($display)))
- {
+
+ if (ereg('Y', $display) || (empty($display))) {
$OUT .= " "._YEARS." | \n";
}
- if (ereg("M", $display) || (empty($display)))
- {
+
+ if (ereg("M", $display) || (empty($display))) {
$OUT .= " "._MONTHS." | \n";
}
- if (ereg("W", $display) || (empty($display)))
- {
+
+ if (ereg("W", $display) || (empty($display))) {
$OUT .= " "._WEEKS." | \n";
}
- if (ereg("D", $display) || (empty($display)))
- {
+
+ if (ereg("D", $display) || (empty($display))) {
$OUT .= " "._DAYS." | \n";
}
- if (ereg("h", $display) || (empty($display)))
- {
+
+ if (ereg("h", $display) || (empty($display))) {
$OUT .= " "._HOURS." | \n";
}
- if (ereg("m", $display) || (empty($display)))
- {
+
+ if (ereg("m", $display) || (empty($display))) {
$OUT .= " "._MINUTES." | \n";
}
- if (ereg("s", $display) || (empty($display)))
- {
+
+ if (ereg("s", $display) || (empty($display))) {
$OUT .= " "._SECONDS." | \n";
}
+
$OUT .= "
\n";
$OUT .= "\n";
- if (ereg('Y', $display) || (empty($display)))
- {
+
+ if (ereg('Y', $display) || (empty($display))) {
// Generate year selection
$OUT .= " | \n";
- }
- else
- {
+ } else {
$OUT .= "\n";
}
- if (ereg("M", $display) || (empty($display)))
- {
+
+ if (ereg("M", $display) || (empty($display))) {
// Generate month selection
$OUT .= " | \n";
- }
- else
- {
+ } else {
$OUT .= "\n";
}
- if (ereg("W", $display) || (empty($display)))
- {
+
+ if (ereg("W", $display) || (empty($display))) {
// Generate week selection
$OUT .= " | \n";
- }
- else
- {
+ } else {
$OUT .= "\n";
}
- if (ereg("D", $display) || (empty($display)))
- {
+
+ if (ereg("D", $display) || (empty($display))) {
// Generate day selection
$OUT .= " | \n";
- }
- else
- {
+ } else {
$OUT .= "\n";
}
- if (ereg("h", $display) || (empty($display)))
- {
+
+ if (ereg("h", $display) || (empty($display))) {
// Generate hour selection
$OUT .= " | \n";
- }
- else
- {
+ } else {
$OUT .= "\n";
}
- if (ereg("m", $display) || (empty($display)))
- {
+
+ if (ereg("m", $display) || (empty($display))) {
// Generate minute selection
$OUT .= " | \n";
- }
- else
- {
+ } else {
$OUT .= "\n";
}
- if (ereg("s", $display) || (empty($display)))
- {
+
+ if (ereg("s", $display) || (empty($display))) {
// Generate second selection
$OUT .= " | \n";
- }
- else
- {
+ } else {
$OUT .= "\n";
}
$OUT .= "
\n";
@@ -1495,7 +1481,8 @@ function CREATE_TIME_SELECTIONS($timestamp, $prefix="", $display="", $align="cen
}
//
function CREATE_TIMESTAMP_FROM_SELECTIONS($prefix, $POST) {
- $ret = "0";
+ $ret = 0;
+
// Do we have a leap year?
$SWITCH = 0;
$TEST = date('Y', time()) / 4;
@@ -1578,7 +1565,7 @@ function CREATE_FANCY_TIME($stamp) {
// Get data array with years/months/weeks/days/...
$data = CREATE_TIME_SELECTIONS($stamp, "", "", "", true);
$ret = "";
- foreach($data as $k=>$v) {
+ foreach($data as $k => $v) {
if ($v > 0) {
// Value is greater than 0 "eval" data to return string
$eval = "\$ret .= \", \".\$v.\" \"._".strtoupper($k).";";
@@ -1966,7 +1953,7 @@ function generateHash ($plainText, $salt = "") {
// Do we miss an arry element here?
if (!isset($_CONFIG['file_hash'])) {
// Stop here
- print(__FUNCTION__.":");
+ print("Missing file_hash in ".__FUNCTION__.". Backtrace:");
debug_print_backtrace();
die("
");
} // END - if
@@ -1977,7 +1964,7 @@ function generateHash ($plainText, $salt = "") {
$server = $_SERVER['PHP_SELF'].":".getenv('HTTP_USER_AGENT').":".getenv('SERVER_SOFTWARE').":".getenv('REMOTE_ADDR').":".":".filemtime(PATH."inc/databases.php");
// Build key string
- $keys = SITE_KEY.":".DATE_KEY.":".$_CONFIG['secret_key'].":".$_CONFIG['file_hash'].":".date("d-m-Y (l-F-T)", $_CONFIG['patch_ctime']).":".$_CONFIG['master_salt'];
+ $keys = SITE_KEY.":".DATE_KEY.":".$_CONFIG['secret_key'].":".$_CONFIG['file_hash'].":".date("d-m-Y (l-F-T)", bigintval($_CONFIG['patch_ctime'])).":".$_CONFIG['master_salt'];
// Additional data
$data = $plainText.":".uniqid(rand(), true).":".time();
@@ -2360,7 +2347,7 @@ function GET_DIR_AS_ARRAY ($baseDir, $prefix) {
}
// Load more reset scripts
function RESET_ADD_INCLUDES () {
- global $_CONFIG, $INC_POOL;
+ global $_CONFIG;
// Is the reset set or old sql_patches?
if ((!isBooleanConstantAndTrue('__DAILY_RESET')) || (GET_EXT_VERSION("sql_patches") < "0.4.5")) {
@@ -2369,7 +2356,7 @@ function RESET_ADD_INCLUDES () {
} // END - if
// Get more daily reset scripts
- $INC_POOL = array_merge($INC_POOL, GET_DIR_AS_ARRAY(PATH."inc/reset/", "reset_"));
+ $INC_POOL = GET_DIR_AS_ARRAY(PATH."inc/reset/", "reset_");
// Create current week mark
$currWeek = date("W", time());
@@ -2394,6 +2381,9 @@ function RESET_ADD_INCLUDES () {
// Update config
UPDATE_CONFIG("last_month", $currMonth);
} // END - if
+
+ // Return array
+ return $INC_POOL;
}
// Handle extra values
function HANDLE_EXTRA_VALUES ($filterFunction, $value, $extraValue) {
@@ -2402,23 +2392,26 @@ function HANDLE_EXTRA_VALUES ($filterFunction, $value, $extraValue) {
// Do we have a special filter function?
if (!empty($filterFunction)) {
- // Do we have extra parameters here?
- if (!empty($extraValue)) {
- // Put both parameters in one new array by default
- $args = array($value, $extraValue);
-
- // If we have an array simply use it and pre-extend it with our value
- if (is_array($extraValue)) {
- // Make the new args array
- $args = array_merge(array($value), $extraValue);
- } // END - if
-
- // Call the multi-parameter call-back
- $ret = call_user_func_array($filterFunction, $args);
- } else {
- // One parameter call
- $ret = call_user_func($filterFunction, $value);
- }
+ // Does the filter function exist?
+ if (function_exists($filterFunction)) {
+ // Do we have extra parameters here?
+ if (!empty($extraValue)) {
+ // Put both parameters in one new array by default
+ $args = array($value, $extraValue);
+
+ // If we have an array simply use it and pre-extend it with our value
+ if (is_array($extraValue)) {
+ // Make the new args array
+ $args = array_merge(array($value), $extraValue);
+ } // END - if
+
+ // Call the multi-parameter call-back
+ $ret = call_user_func_array($filterFunction, $args);
+ } else {
+ // One parameter call
+ $ret = call_user_func($filterFunction, $value);
+ }
+ } // END - if
} // END - if
// Return the value
@@ -2459,6 +2452,11 @@ function CONVERT_SELECTIONS_TO_TIMESTAMP(&$POST, &$DATA, &$id, &$skip) {
$skip = false; $TEST2 = "";
}
}
+// Reverts the german decimal comma into Computer decimal dot
+function REVERT_COMMA ($str) {
+ $float = (float)str_replace(",", ".", $str);
+ return $float;
+}
//
//////////////////////////////////////////////////
// //