From f18be2743e779b2b6f5a8c2961ba2657520bad6b Mon Sep 17 00:00:00 2001 From: quix0r Date: Mon, 24 Nov 2008 15:41:47 +0000 Subject: [PATCH] Some theme fixes, debug system now forced (true) - Some DEBUG_LOG() lines has given __FILE__ (like in functions.php) which will not give good debug messages, rewritten to __FUNCTION__ - DEBUG_LOG() is now always forced (true) except commented-out lines in surfbar-functions.php which I use for developing/debugging the surfbar - CSS classes guest_skyscraper/member_skyscraper "beautified" ;-) --- inc/databases.php | 2 +- inc/functions.php | 13 ++++--- inc/libs/sponsor_functions.php | 4 +- inc/libs/surfbar_functions.php | 70 +++++++++++++++++----------------- inc/libs/wernis_functions.php | 2 +- inc/modules/index.php | 2 +- inc/mysql-manager.php | 4 +- theme/business/css/general.css | 3 +- theme/default/css/general.css | 1 + theme/desert/css/general.css | 1 + 10 files changed, 53 insertions(+), 49 deletions(-) diff --git a/inc/databases.php b/inc/databases.php index df9a621aaa..7fbbd9433b 100644 --- a/inc/databases.php +++ b/inc/databases.php @@ -114,7 +114,7 @@ define('USAGE_BASE', "usage"); define('SERVER_URL', "http://www.mxchange.org"); // This current patch level -define('CURR_SVN_REVISION', "552"); +define('CURR_SVN_REVISION', "553"); // Take a prime number which is long (if you know a longer one please try it out!) define('_PRIME', 591623); diff --git a/inc/functions.php b/inc/functions.php index cfbd665384..177886ad3a 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -132,7 +132,7 @@ function OUTPUT_HTML($HTML, $NEW_LINE = true) { default: // Huh, something goes wrong or maybe you have edited config.php ??? - DEBUG_LOG(__FILE__, __LINE__, sprintf("Invalid renderer %s detected.", OUTPUT_MODE)); + DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid renderer %s detected.", OUTPUT_MODE)); MXCHANGE_DIE("".FATAL_ERROR.": ".LANG_NO_RENDER_DIRECT); break; } @@ -259,6 +259,7 @@ function LOAD_TEMPLATE($template, $return=false, $content=array()) { // Translate gender $gender = TRANSLATE_GENDER($gender); + DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("DEPRECATION-WARNING: content is not array (%s).", gettype($content))); } // Free result @@ -569,7 +570,7 @@ function MAKE_DATETIME ($time, $mode="0") case "2": $ret = date("d.m.Y|H:i", $time); break; case "3": $ret = date("d.m.Y", $time); break; default: - DEBUG_LOG(__FILE__, __LINE__, sprintf("Invalid date mode %s detected.", $mode)); + DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid date mode %s detected.", $mode)); break; } break; @@ -581,7 +582,7 @@ function MAKE_DATETIME ($time, $mode="0") case "2": $ret = date("y-m-d|H:i", $time); break; case "3": $ret = date("y-m-d", $time); break; default: - DEBUG_LOG(__FILE__, __LINE__, sprintf("Invalid date mode %s detected.", $mode)); + DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid date mode %s detected.", $mode)); break; } } @@ -703,7 +704,7 @@ function TRANSLATE_STATUS($status) { break; default: - DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown status %s detected.", $status)); + DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status)); $ret = UNKNOWN_STATUS_1.$status.UNKNOWN_STATUS_2; break; } @@ -1755,7 +1756,7 @@ function POST_URL ($script, $postData) { // Is postData an array? if (!is_array($postData)) { // Abort here - DEBUG_LOG(__FILE__, __LINE__, sprintf("postData is not an array. Type: %s", gettype($postData))); + DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("postData is not an array. Type: %s", gettype($postData))); return array("", "", ""); } // END - if @@ -2384,7 +2385,7 @@ function merge_array ($array1, $array2) { die(""); } // Debug message logger -function DEBUG_LOG ($file, $line, $message, $force=false) { +function DEBUG_LOG ($file, $line, $message, $force=true) { // Is debug mode enabled? if ((isBooleanConstantAndTrue('DEBUG_MODE')) || ($force)) { // Log this message away diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php index c16023477f..5c511f85a6 100644 --- a/inc/libs/sponsor_functions.php +++ b/inc/libs/sponsor_functions.php @@ -283,7 +283,7 @@ function SPONSOR_TRANSLATE_STATUS($status) break; default: - DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown status %s detected.", $status)); + DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status)); $ret = UNKNOWN_STATUS_1.$status.UNKNOWN_STATUS_2; break; } @@ -568,7 +568,7 @@ function SPONSOR_SAVE_DATA($POST, $content) break; default: // Unknown sponsor what value! - DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown sponsor module (what) %s detected.", $GLOBALS['what'])); + DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown sponsor module (what) %s detected.", $GLOBALS['what'])); $MSG = SPONSOR_UNKNOWN_WHAT_1.$GLOBALS['what'].SPONSOR_UNKNOWN_WHAT_2; $templ = ""; $subj = ""; break; diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php index 9256ec8627..3700fab397 100644 --- a/inc/libs/surfbar_functions.php +++ b/inc/libs/surfbar_functions.php @@ -625,7 +625,7 @@ function SURFBAR_CHECK_RELOAD_FULL() { // Cache static reload lock $SURFBAR_CACHE['surf_lock'] = $_CONFIG['surfbar_static_lock']; - //DEBUG_LOG(__FUNCTION__, __LINE__, "Fixed surf lock is ".$_CONFIG['surfbar_static_lock'].""); + //DEBUG_LOG(__FUNCTION__, __LINE__, "Fixed surf lock is ".$_CONFIG['surfbar_static_lock']."", false); // Do we have dynamic model? if ($_CONFIG['surfbar_pay_model'] == "DYNAMIC") { @@ -656,7 +656,7 @@ LIMIT 1", $total = SURFBAR_GET_TOTAL_URLS(); // Do we have some URLs in lock? Admins can always surf on own URLs! - //DEBUG_LOG(__FUNCTION__, __LINE__, "userLocks=".SURFBAR_GET_DATA('user_locks').",total={$total}"); + //DEBUG_LOG(__FUNCTION__, __LINE__, "userLocks=".SURFBAR_GET_DATA('user_locks').",total={$total}", false); $isFull = ((SURFBAR_GET_DATA('user_locks') == $total) && ($total > 0)); // Return result @@ -764,16 +764,16 @@ function SURFBAR_GENERATE_VALIDATION_CODE ($urlId, $salt="") { if (empty($salt)) { // Generate random hashed string $SURFBAR_CACHE['salt'] = sha1(GEN_PASS(255)); - //DEBUG_LOG(__FUNCTION__, __LINE__, "newSalt=".SURFBAR_GET_SALT().""); + //DEBUG_LOG(__FUNCTION__, __LINE__, "newSalt=".SURFBAR_GET_SALT()."", false); } else { // Use this as salt! $SURFBAR_CACHE['salt'] = $salt; - //DEBUG_LOG(__FUNCTION__, __LINE__, "oldSalt=".SURFBAR_GET_SALT().""); + //DEBUG_LOG(__FUNCTION__, __LINE__, "oldSalt=".SURFBAR_GET_SALT()."", false); } // ... and now the validation code $valCode = GEN_RANDOM_CODE($length, sha1(SURFBAR_GET_SALT().":".$urlId), $GLOBALS['userid']); - //DEBUG_LOG(__FUNCTION__, __LINE__, "valCode={$valCode}"); + //DEBUG_LOG(__FUNCTION__, __LINE__, "valCode={$valCode}", false); } // END - while // Hash it with md5() and salt it with the random string @@ -783,7 +783,7 @@ function SURFBAR_GENERATE_VALIDATION_CODE ($urlId, $salt="") { $valHashedCode = generatePassString($hashedCode); // Return hashed value - //DEBUG_LOG(__FUNCTION__, __LINE__, "finalValCode={$valHashedCode}"); + //DEBUG_LOG(__FUNCTION__, __LINE__, "finalValCode={$valHashedCode}", false); return $valHashedCode; } // Check validation code @@ -797,14 +797,14 @@ function SURFBAR_CHECK_VALIDATION_CODE ($urlId, $check, $salt) { $code = SURFBAR_GENERATE_VALIDATION_CODE($urlId, $salt); // Return result of checking hashes and salts - //DEBUG_LOG(__FUNCTION__, __LINE__, "---".$code."|".$check."---"); - //DEBUG_LOG(__FUNCTION__, __LINE__, "+++".$salt."|".SURFBAR_GET_DATA('last_salt')."+++"); + //DEBUG_LOG(__FUNCTION__, __LINE__, "---".$code."|".$check."---", false); + //DEBUG_LOG(__FUNCTION__, __LINE__, "+++".$salt."|".SURFBAR_GET_DATA('last_salt')."+++", false); return (($code == $check) && ($salt == SURFBAR_GET_DATA('last_salt'))); } // Lockdown the userid/id combination (reload lock) function SURFBAR_LOCKDOWN_ID ($urlId) { - //* //DEBUG: */ print "LOCK!"); - ///* //DEBUG: */ return; + //* DEBUG: */ print "LOCK!"); + ///* DEBUG: */ return; // Just add it to the database SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_surfbar_locks (userid, url_id) VALUES (%s, %s)", array($GLOBALS['userid'], bigintval($urlId)), __FILE__, __LINE__); @@ -816,13 +816,13 @@ function SURFBAR_LOCKDOWN_ID ($urlId) { // Pay points to the user and remove it from the sender function SURFBAR_PAY_POINTS ($urlId) { // Remove it from the URL owner - //DEBUG_LOG(__FUNCTION__, __LINE__, "uid=".SURFBAR_GET_USERID().",costs=".SURFBAR_GET_COSTS().""); + //DEBUG_LOG(__FUNCTION__, __LINE__, "uid=".SURFBAR_GET_USERID().",costs=".SURFBAR_GET_COSTS()."", false); if (SURFBAR_GET_USERID() > 0) { SUB_POINTS(SURFBAR_GET_USERID(), SURFBAR_GET_COSTS()); } // END - if // Book it to the user - //DEBUG_LOG(__FUNCTION__, __LINE__, "uid=".$GLOBALS['userid'].",reward=".SURFBAR_GET_REWARD().""); + //DEBUG_LOG(__FUNCTION__, __LINE__, "uid=".$GLOBALS['userid'].",reward=".SURFBAR_GET_REWARD()."", false); ADD_POINTS_REFSYSTEM($GLOBALS['userid'], SURFBAR_GET_DATA('reward')); } // Updates the statistics of current URL/userid @@ -875,7 +875,7 @@ function SURFBAR_UPDATE_SALT_STATS () { array(SURFBAR_GET_SALT(), SURFBAR_GET_ID(), $GLOBALS['userid']), __FILE__, __LINE__); // Debug message - //DEBUG_LOG(__FUNCTION__, __LINE__, "salt=".SURFBAR_GET_SALT().",id=".SURFBAR_GET_ID().",uid=".$GLOBALS['userid'].""); + //DEBUG_LOG(__FUNCTION__, __LINE__, "salt=".SURFBAR_GET_SALT().",id=".SURFBAR_GET_ID().",uid=".$GLOBALS['userid']."", false); // Was that okay? if (SQL_AFFECTEDROWS() < 1) { @@ -885,14 +885,14 @@ function SURFBAR_UPDATE_SALT_STATS () { } // END - if // Debug message - //DEBUG_LOG(__FUNCTION__, __LINE__, "affectedRows=".SQL_AFFECTEDROWS().""); + //DEBUG_LOG(__FUNCTION__, __LINE__, "affectedRows=".SQL_AFFECTEDROWS()."", false); // Return if the update was okay return (SQL_AFFECTEDROWS() == 1); } // Check if the reload lock is active for given id function SURFBAR_CHECK_RELOAD_LOCK ($urlId) { - //DEBUG_LOG(__FUNCTION__, __LINE__, "id={$urlId}"); + //DEBUG_LOG(__FUNCTION__, __LINE__, "id={$urlId}", false); // Ask the database $result = SQL_QUERY_ESC("SELECT COUNT(id) AS cnt FROM "._MYSQL_PREFIX."_surfbar_locks @@ -909,7 +909,7 @@ LIMIT 1", SQL_FREERESULT($result); // Return check - //DEBUG_LOG(__FUNCTION__, __LINE__, "cnt={$cnt},".SURFBAR_GET_DATA('surf_lock').""); + //DEBUG_LOG(__FUNCTION__, __LINE__, "cnt={$cnt},".SURFBAR_GET_DATA('surf_lock')."", false); return ($cnt == 1); } // Determine which user hash no more points left @@ -952,12 +952,12 @@ ORDER BY u.userid ASC", __FILE__, __LINE__); while (list($uid, $notified) = SQL_FETCHROW($result)) { // Get total points $points = GET_TOTAL_DATA($uid, "user_points", "points") - GET_TOTAL_DATA($uid, "user_data", "used_points"); - //DEBUG_LOG(__FUNCTION__, __LINE__, "uid={$uid},points={$points}"); + //DEBUG_LOG(__FUNCTION__, __LINE__, "uid={$uid},points={$points}", false); // Shall we add this to ignore? if ($points <= $limit) { // Ignore this one! - //DEBUG_LOG(__FUNCTION__, __LINE__, "uid={$uid} has depleted points amount!"); + //DEBUG_LOG(__FUNCTION__, __LINE__, "uid={$uid} has depleted points amount!", false); $UIDs['uid'][$uid] = $uid; $UIDs['points'][$uid] = $points; $UIDs['notified'][$uid] = $notified; @@ -968,7 +968,7 @@ ORDER BY u.userid ASC", __FILE__, __LINE__); SQL_FREERESULT($result); // Debug message - //DEBUG_LOG(__FUNCTION__, __LINE__, "UIDs::count=".count($UIDs)." (with own userid=".$GLOBALS['userid'].")"); + //DEBUG_LOG(__FUNCTION__, __LINE__, "UIDs::count=".count($UIDs)." (with own userid=".$GLOBALS['userid'].")", false); // Return result return $UIDs; @@ -1154,17 +1154,17 @@ ORDER BY // Load all entries while (list($lid, $url, $last) = SQL_FETCHROW($result)) { // Debug message - //DEBUG_LOG(__FUNCTION__, __LINE__, "next - lid={$lid},url={$url},rest=".(time() - $last)."/".SURFBAR_GET_DATA('surf_lock').""); + //DEBUG_LOG(__FUNCTION__, __LINE__, "next - lid={$lid},url={$url},rest=".(time() - $last)."/".SURFBAR_GET_DATA('surf_lock')."", false); // Skip entries that are too old if (($last > (time() - SURFBAR_GET_DATA('surf_lock'))) && (!in_array($url, $ignored))) { // Debug message - //DEBUG_LOG(__FUNCTION__, __LINE__, "okay - lid={$lid},url={$url},last={$last}"); + //DEBUG_LOG(__FUNCTION__, __LINE__, "okay - lid={$lid},url={$url},last={$last}", false); // Add only if missing or bigger if ((!isset($IDs[$url])) || ($IDs[$url] > $last)) { // Debug message - //DEBUG_LOG(__FUNCTION__, __LINE__, "ADD - lid={$lid},url={$url},last={$last}"); + //DEBUG_LOG(__FUNCTION__, __LINE__, "ADD - lid={$lid},url={$url},last={$last}", false); // Add this ID $IDs[$url] = $last; @@ -1172,7 +1172,7 @@ ORDER BY } // END - if } else { // Debug message - //DEBUG_LOG(__FUNCTION__, __LINE__, "ignore - lid={$lid},url={$url},last={$last}"); + //DEBUG_LOG(__FUNCTION__, __LINE__, "ignore - lid={$lid},url={$url},last={$last}", false); // Ignore these old entries! $ignored[] = $url; @@ -1201,7 +1201,7 @@ WHERE sbu.userid NOT IN (".implode(",", $UIDs).") AND (sbu.views_allowed=0 OR (s GROUP BY sbu.id", __FILE__, __LINE__); // Log last query - //DEBUG_LOG(__FUNCTION__, __LINE__, "lastQuery=".$_CONFIG['db_last_query']."|numRows=".SQL_NUMROWS($result)."|Affected=".SQL_AFFECTEDROWS().""); + //DEBUG_LOG(__FUNCTION__, __LINE__, "lastQuery=".$_CONFIG['db_last_query']."|numRows=".SQL_NUMROWS($result)."|Affected=".SQL_AFFECTEDROWS()."", false); // Fetch max rand $maxRand = SQL_NUMROWS($result); @@ -1317,7 +1317,7 @@ function SURFBAR_DETERMINE_NEXT_ID ($urlId = 0) { } // END - if // And query the database - //DEBUG_LOG(__FUNCTION__, __LINE__, "randNum={$randNum},maxRand={$maxRand},surfLock=".SURFBAR_GET_DATA('surf_lock').""); + //DEBUG_LOG(__FUNCTION__, __LINE__, "randNum={$randNum},maxRand={$maxRand},surfLock=".SURFBAR_GET_DATA('surf_lock')."", false); $result = SQL_QUERY_ESC("SELECT sbu.id, sbu.userid, sbu.url, sbs.last_salt, sbu.views_total, sbu.views_max, sbu.views_allowed, UNIX_TIMESTAMP(l.last_surfed) AS last_surfed FROM "._MYSQL_PREFIX."_surfbar_urls AS sbu LEFT JOIN "._MYSQL_PREFIX."_surfbar_salts AS sbs @@ -1345,12 +1345,12 @@ LIMIT 1", } // Is there an id number? - //DEBUG_LOG(__FUNCTION__, __LINE__, "lastQuery=".$_CONFIG['db_last_query']."|numRows=".SQL_NUMROWS($result)."|Affected=".SQL_AFFECTEDROWS().""); + //DEBUG_LOG(__FUNCTION__, __LINE__, "lastQuery=".$_CONFIG['db_last_query']."|numRows=".SQL_NUMROWS($result)."|Affected=".SQL_AFFECTEDROWS()."", false); if (SQL_NUMROWS($result) == 1) { // Load/cache data - //DEBUG_LOG(__FUNCTION__, __LINE__, "count(".count($SURFBAR_CACHE).") - BEFORE"); + //DEBUG_LOG(__FUNCTION__, __LINE__, "count(".count($SURFBAR_CACHE).") - BEFORE", false); $SURFBAR_CACHE = merge_array($SURFBAR_CACHE, SQL_FETCHARRAY($result)); - //DEBUG_LOG(__FUNCTION__, __LINE__, "count(".count($SURFBAR_CACHE).") - AFTER"); + //DEBUG_LOG(__FUNCTION__, __LINE__, "count(".count($SURFBAR_CACHE).") - AFTER", false); // Determine waiting time $SURFBAR_CACHE['time'] = SURFBAR_DETERMINE_WAIT_TIME(); @@ -1358,28 +1358,28 @@ LIMIT 1", // Is the last salt there? if (is_null($SURFBAR_CACHE['last_salt'])) { // Then repair it wit the static! - //DEBUG_LOG(__FUNCTION__, __LINE__, "last_salt - FIXED!"); + //DEBUG_LOG(__FUNCTION__, __LINE__, "last_salt - FIXED!", false); $SURFBAR_CACHE['last_salt'] = ""; } // END - if // Fix missing last_surfed if ((!isset($SURFBAR_CACHE['last_surfed'])) || (is_null($SURFBAR_CACHE['last_surfed']))) { // Fix it here - //DEBUG_LOG(__FUNCTION__, __LINE__, "last_surfed - FIXED!"); + //DEBUG_LOG(__FUNCTION__, __LINE__, "last_surfed - FIXED!", false); $SURFBAR_CACHE['last_surfed'] = 0; } // END - if // Get base/fixed reward and costs $SURFBAR_CACHE['reward'] = SURFBAR_DETERMINE_REWARD(); $SURFBAR_CACHE['costs'] = SURFBAR_DETERMINE_COSTS(); - //DEBUG_LOG(__FUNCTION__, __LINE__, "BASE/STATIC - reward=".SURFBAR_GET_REWARD()."|costs=".SURFBAR_GET_COSTS().""); + //DEBUG_LOG(__FUNCTION__, __LINE__, "BASE/STATIC - reward=".SURFBAR_GET_REWARD()."|costs=".SURFBAR_GET_COSTS()."", false); // Only in dynamic model add the dynamic bonus! if ($_CONFIG['surfbar_pay_model'] == "DYNAMIC") { // Calculate dynamic reward/costs and add it $SURFBAR_CACHE['reward'] += SURFBAR_CALCULATE_DYNAMIC_ADD(); $SURFBAR_CACHE['costs'] += SURFBAR_CALCULATE_DYNAMIC_ADD(); - //DEBUG_LOG(__FUNCTION__, __LINE__, "DYNAMIC+ - reward=".SURFBAR_GET_REWARD()."|costs=".SURFBAR_GET_COSTS().""); + //DEBUG_LOG(__FUNCTION__, __LINE__, "DYNAMIC+ - reward=".SURFBAR_GET_REWARD()."|costs=".SURFBAR_GET_COSTS()."", false); } // END - if // Now get the id @@ -1390,7 +1390,7 @@ LIMIT 1", SQL_FREERESULT($result); // Return result - //DEBUG_LOG(__FUNCTION__, __LINE__, "nextId={$nextId}"); + //DEBUG_LOG(__FUNCTION__, __LINE__, "nextId={$nextId}", false); return $nextId; } // ----------------------------------------------------------------------------- @@ -1400,7 +1400,7 @@ LIMIT 1", // Private getter for data elements function SURFBAR_GET_DATA ($element) { global $SURFBAR_CACHE; - //DEBUG_LOG(__FUNCTION__, __LINE__, "element={$element}"); + //DEBUG_LOG(__FUNCTION__, __LINE__, "element={$element}", false); // Default is null $data = null; @@ -1417,7 +1417,7 @@ function SURFBAR_GET_DATA ($element) { } // Return result - //DEBUG_LOG(__FUNCTION__, __LINE__, "element[$element]={$data}"); + //DEBUG_LOG(__FUNCTION__, __LINE__, "element[$element]={$data}", false); return $data; } // Getter for reward from cache diff --git a/inc/libs/wernis_functions.php b/inc/libs/wernis_functions.php index 635b338852..ee8a5d9958 100644 --- a/inc/libs/wernis_functions.php +++ b/inc/libs/wernis_functions.php @@ -170,7 +170,7 @@ function WERNIS_SEND_REQUEST ($scriptName, $requestData = array()) { break; default: // Unknown error (maybe new?) - DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown error %s from WDS66 API received.", $data[1])); + DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown error %s from WDS66 API received.", $data[1])); $return = array( 'status' => "request_failed", 'message' => sprintf(WERNIS_API_REQUEST_FAILED, $data[1]) diff --git a/inc/modules/index.php b/inc/modules/index.php index 191ca68d94..dcd2f45f01 100644 --- a/inc/modules/index.php +++ b/inc/modules/index.php @@ -115,7 +115,7 @@ if ((FILE_READABLE($INC_ACTION)) && (VALIDATE_MENU_ACTION("guest", $act, $GLOBAL } if (($_CONFIG['guest_menu'] == "Y") || (!EXT_IS_ACTIVE("sql_patches", true))) { - // TDs between content and + // Right side of content (hint: a good place for 120x600 skyscraper banner!) LOAD_TEMPLATE("guest_content_footer"); // Some advertising stuff? diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index 684d43d3d8..9524124961 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -839,7 +839,7 @@ function SEND_MODE_MAILS($mod, $modes) break; default: - DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown mode %s detected.", $mode)); + DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown mode %s detected.", $mode)); $content = MEMBER_UNKNOWN_MODE.": ".$mode."\n\n"; break; } @@ -871,7 +871,7 @@ function SEND_MODE_MAILS($mod, $modes) break; default: - DEBUG_LOG(__FILE__, __LINE__, sprintf("Unsupported module %s detected.", $mod)); + DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unsupported module %s detected.", $mod)); $content = "".UNKNOWN_MODULE.""; break; } diff --git a/theme/business/css/general.css b/theme/business/css/general.css index 0bf2c180ff..66d1f9b509 100644 --- a/theme/business/css/general.css +++ b/theme/business/css/general.css @@ -680,8 +680,9 @@ DIV.admin_note { .member_skyscraper, .guest_skyscraper { width : 122px; - height : 602px; + height : 601px; border : 1px solid #000000; margin : 0px; padding : 0px; + padding-top : 1px; } diff --git a/theme/default/css/general.css b/theme/default/css/general.css index 1c14ac08a5..e0b3691437 100644 --- a/theme/default/css/general.css +++ b/theme/default/css/general.css @@ -710,4 +710,5 @@ DIV.admin_note { border : 1px solid #AA0044; margin : 0px; padding : 0px; + padding-top : 1px; } diff --git a/theme/desert/css/general.css b/theme/desert/css/general.css index 665924b3b4..2d788a922b 100644 --- a/theme/desert/css/general.css +++ b/theme/desert/css/general.css @@ -680,4 +680,5 @@ DIV.admin_note { border : 1px solid #880000; margin : 0px; padding : 0px; + padding-top : 1px; } -- 2.39.5