X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fconfig-functions.php;h=d92d8037cb45e55231cbc9b055e649c00abf733a;hb=34b1f5b69205b08c760d6dcc87ef6a2d1c291261;hp=209743115ad8d477ba58a38c1826d4fd09d0e1d3;hpb=8cef2a4631919672cbbfd484f6e198e1f21b087d;p=mailer.git diff --git a/inc/config-functions.php b/inc/config-functions.php index 209743115a..d92d8037cb 100644 --- a/inc/config-functions.php +++ b/inc/config-functions.php @@ -16,7 +16,7 @@ * $Author:: $ * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * - * Copyright (c) 2009, 2010 by Mailer Developer Team * + * Copyright (c) 2009 - 2011 by Mailer Developer Team * * For more information visit: http://www.mxchange.org * * * * This program is free software; you can redistribute it and/or modify * @@ -71,9 +71,6 @@ function initConfig () { // Getter for $GLOBALS['config'] entries function getConfig ($configEntry) { - // Default value - $value = null; - // Is the entry there? if (!isConfigEntrySet($configEntry)) { // Raise an error of missing entries @@ -93,7 +90,7 @@ function setConfigEntry ($configEntry, $value) { // Checks wether the given config entry is set function isConfigEntrySet ($configEntry) { - //* DEBUG: */ debugOutput(__FUNCTION__.':'.$configEntry.'='.intval(isset($GLOBALS['config'][$configEntry]))); + //* DEBUG: */ debugOutput(__FUNCTION__ . ':' . $configEntry . '=' . intval(isset($GLOBALS['config'][$configEntry]))); return (isset($GLOBALS['config'][$configEntry])); } @@ -104,7 +101,7 @@ function mergeConfig ($newConfig) { // Increment or init with given value or 1 as default the given config entry function incrementConfigEntry ($configEntry, $value=1) { - // Increment it if set or init it with 1 + // Increment it if set or init it with $value if (isConfigEntrySet($configEntry)) { $GLOBALS['config'][$configEntry] += $value; } else { @@ -196,7 +193,7 @@ function updateOldConfigFile () { // Is the line found? if ((substr($line, 0, strlen($old)) == $old) && (!isset($done[$old]))) { - // Entry found! + // Entry found //* DEBUG: */ debugOutput(secureString($line) . ' - FOUND!'); // Eval the line... @@ -242,7 +239,7 @@ function updateOldConfigFile () { // Is the $MySQL found? if (substr($line, 0, 6) == '$MySQL') { - // Okay found! + // Okay, found $found = true; } elseif ($found === true) { // Now check this row