From: Roland Häder Date: Mon, 9 Nov 2009 17:47:12 +0000 (+0000) Subject: All CSS classes top2,bottom2,right2,left2 are now deprecated, user details now have... X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=76b1b077bda73310c536f658d3a9bb5e12232f39 All CSS classes top2,bottom2,right2,left2 are now deprecated, user details now have 4 columns --- diff --git a/inc/extensions/ext-doubler.php b/inc/extensions/ext-doubler.php index ce96fdfd54..1619efeca9 100644 --- a/inc/extensions/ext-doubler.php +++ b/inc/extensions/ext-doubler.php @@ -73,7 +73,7 @@ PRIMARY KEY (id) // Maximum points to double addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD doubler_max FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 10000.00000"); // Points left on users account after doubling - addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD doubler_left2 BIGINT(20) UNSIGNED NOT NULL DEFAULT 1000"); + addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD doubler_left BIGINT(20) UNSIGNED NOT NULL DEFAULT 1000"); // Charge for doubling points which goes to the webmaster (shreddered in fact!) addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD doubler_charge FLOAT(7,5) UNSIGNED NOT NULL DEFAULT 0.03000"); // Referal percents diff --git a/inc/functions.php b/inc/functions.php index dfa1e13218..f3aecaf590 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -1341,7 +1341,7 @@ function bigintval ($num, $castValue = true) { function generateImageOrCode ($img_code, $headerSent = true) { // Is the code size oversized or shouldn't we display it? if ((strlen($img_code) > 6) || (empty($img_code)) || (getConfig('code_length') == '0')) { - // Stop2 execution of function here because of over-sized code length + // Stop execution of function here because of over-sized code length debug_report_bug('img_code ' . $img_code .' has invalid length. img_code()=' . strlen($img_code) . ' code_length=' . getConfig('code_length')); } elseif ($headerSent === false) { // Return an HTML code here @@ -1458,31 +1458,31 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align = $OUT .= "\n"; if (ereg('Y', $display) || (empty($display))) { - $OUT .= "
{--_YEARS--}\n"; + $OUT .= "
{--_YEARS--}\n"; } if (ereg('M', $display) || (empty($display))) { - $OUT .= "
{--_MONTHS--}\n"; + $OUT .= "
{--_MONTHS--}\n"; } if (ereg('W', $display) || (empty($display))) { - $OUT .= "
{--_WEEKS--}\n"; + $OUT .= "
{--_WEEKS--}\n"; } if (ereg('D', $display) || (empty($display))) { - $OUT .= "
{--_DAYS--}\n"; + $OUT .= "
{--_DAYS--}\n"; } if (ereg('h', $display) || (empty($display))) { - $OUT .= "
{--_HOURS--}\n"; + $OUT .= "
{--_HOURS--}\n"; } if (ereg('m', $display) || (empty($display))) { - $OUT .= "
{--_MINUTES--}\n"; + $OUT .= "
{--_MINUTES--}\n"; } if (ereg('s', $display) || (empty($display))) { - $OUT .= "
{--_SECONDS--}\n"; + $OUT .= "
{--_SECONDS--}\n"; } $OUT .= "\n"; @@ -1646,7 +1646,7 @@ function createFancyTime ($stamp) { function addEmailNavigation ($PAGES, $offset, $show_form, $colspan, $return=false) { $SEP = ''; $TOP = ''; if ($show_form === false) { - $TOP = " top2"; + $TOP = " top"; $SEP = " "; } @@ -2028,7 +2028,7 @@ function generateHash ($plainText, $salt = '') { // Do we miss an arry element here? if (!isConfigEntrySet('file_hash')) { - // Stop2 here + // Stop here debug_report_bug('Missing file_hash in ' . __FUNCTION__ . '.'); } // END - if @@ -3225,7 +3225,7 @@ function shutdown () { addFatalMessage(__FILE__, __LINE__, getMessage('NO_DB_LINK_SHUTDOWN')); } - // Stop2 executing here + // Stop executing here exit; } diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php index 2487665b87..556473257c 100644 --- a/inc/libs/bonus_functions.php +++ b/inc/libs/bonus_functions.php @@ -201,9 +201,9 @@ LIMIT 1", // Output row $OUT .= " -  ".$rows['rank'].". - ".$rows['userid']." - ".$rows['points']." +  ".$rows['rank'].". + ".$rows['userid']." + ".$rows['points']." \n"; // Switch color @@ -218,7 +218,7 @@ LIMIT 1", } else { // No entries found! $OUT = " - +
".sprintf(getMessage('BONUS_NO_RANKS'), $data)."
\n"; diff --git a/inc/libs/doubler_functions.php b/inc/libs/doubler_functions.php index 2a2100f592..f13c6cb529 100644 --- a/inc/libs/doubler_functions.php +++ b/inc/libs/doubler_functions.php @@ -109,7 +109,7 @@ LIMIT ".$limit, __FUNCTION__, __LINE__); } else { // List no entries $OUT = " - + ".loadTemplate('admin_settings_saved', true, $message)." \n"; diff --git a/inc/libs/holiday_functions.php b/inc/libs/holiday_functions.php index 0d4d06d50d..dd8a45bb65 100644 --- a/inc/libs/holiday_functions.php +++ b/inc/libs/holiday_functions.php @@ -60,7 +60,7 @@ ORDER BY // Process all found entries while ($content = SQL_FETCHARRAY($result_stop)) { - // Stop2 holiday + // Stop holiday addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_holidays` WHERE `userid`=%s LIMIT 1", array(bigintval($content['userid'])), __FUNCTION__, __LINE__, false)); diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php index 201b11db96..cd86573a4c 100644 --- a/inc/libs/rallye_functions.php +++ b/inc/libs/rallye_functions.php @@ -285,13 +285,13 @@ LIMIT 1", if (empty($DATA['ref'][$idx])) $DATA['ref'][$idx] = '---'; // Add row $OUT .= " -   ".($idx+1).". - "; +   ".($idx+1).". + "; if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; $OUT .= $DATA['userid'][$idx]; if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; $OUT .= " - "; + "; if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; $OUT .= $DATA['ref'][$idx]; if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; @@ -685,18 +685,18 @@ function addReferalRallyeWinners ($rallye, $default=0) { // Add row $add = ''; $OUT .= " -   ".($idx+1).". - "; +   ".($idx+1).". + "; if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; $OUT .= $DATA['userid'][$idx]; if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; $OUT .= " - "; + "; if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; $OUT .= $DATA['ref'][$idx]; if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; $OUT .= " - "; + "; if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; $OUT .= $DATA['infos'][$idx]; if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php index f59554b1e3..4683195339 100644 --- a/inc/libs/task_functions.php +++ b/inc/libs/task_functions.php @@ -574,7 +574,7 @@ function createExtraTaskRows ($WHATs, $DESCRs, $TITLEs) { ); // Rewrite CSS class if not last entry is reached - if ($key < (count($sqls) - 1)) $content['bottom'] = 'bottom2'; + if ($key < (count($sqls) - 1)) $content['bottom'] = 'bottom'; if (($value > 0) && (!empty($WHATs[$key]))) { if (empty($TITLEs[$key])) $TITLEs[$key] = getMessage('ADMIN_TASK_UNKNOWN_LIST_TITLE'); diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php index 18fd084d45..32d21c16a7 100644 --- a/inc/libs/user_functions.php +++ b/inc/libs/user_functions.php @@ -138,11 +138,11 @@ function addPageNavigation ($PAGES, $offset, $show_form, $colspan,$return=false) //if ($show_form === true) { // // Load form for changing number of lines // define('__FORM_HEADER', loadTemplate('admin_list_user_sort_form', true)); - // define('__FORM_FOOTER', ' '); + // define('__FORM_FOOTER', ' '); //} else { // // Empty row // define('__FORM_HEADER', ' '); - // define('__FORM_FOOTER', ' '); + // define('__FORM_FOOTER', ' '); //} $OUT = ''; diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php index a58ac8611f..cb91f5fae9 100644 --- a/inc/modules/admin/overview-inc.php +++ b/inc/modules/admin/overview-inc.php @@ -241,7 +241,7 @@ LIMIT 1", // Add SQLs to a table if ((!empty($ext_name)) && (getExtensionVersion('sql_patches')) && (getConfig('verbose_sql') == 'Y')) { // Add verbose SQL table - $text .= addExtensionVerboseSqlTable($title, " class=\"admin_table top2 left2 right2\"", true, '100%') . "
\n"; + $text .= addExtensionVerboseSqlTable($title, " class=\"admin_table top left right\"", true, '100%') . "
\n"; } // END - if } elseif ((!empty($ext_name)) && (!empty($ext_ver))) { // Run SQL commands in dry mode but only return the notes @@ -384,7 +384,7 @@ LIMIT 1", break; } $OUT .= " -   +   \n"; } // END - if diff --git a/inc/modules/admin/what-config_other.php b/inc/modules/admin/what-config_other.php index de3687f561..55496f34db 100644 --- a/inc/modules/admin/what-config_other.php +++ b/inc/modules/admin/what-config_other.php @@ -50,7 +50,7 @@ if (!isExtensionActive('other')) { return; } // END - if -// Stop2 saving data if one input field is !isset +// Stop saving data if one input field is !isset if (isFormSent()) { // Calculate stamps and set calculated stamps setRequestPostElement('online_timeout' , createTimestampFromSelections('ip_timeout' , postRequestArray())); diff --git a/inc/modules/admin/what-config_register.php b/inc/modules/admin/what-config_register.php index ce936b3514..c4bf6bc837 100644 --- a/inc/modules/admin/what-config_register.php +++ b/inc/modules/admin/what-config_register.php @@ -66,9 +66,9 @@ while ($content = SQL_FETCHARRAY($result)) { // @TODO Move this HTML code into a template $OUT .= " - ".$content['id']." -   ".$content['field_name']." - + ".$content['id']." +   ".$content['field_name']." + ".$content['selection']." \n"; diff --git a/inc/modules/admin/what-del_transfer.php b/inc/modules/admin/what-del_transfer.php index ee03dab65f..b8a77c252a 100644 --- a/inc/modules/admin/what-del_transfer.php +++ b/inc/modules/admin/what-del_transfer.php @@ -93,7 +93,7 @@ if (SQL_NUMROWS($result) > 0) { } else { // Nothing for in and out $OUT = " - + ".loadTemplate('admin_settings_saved', true, getMessage('TRANSFER_NO_INOUT_TRANSFERS'))." "; diff --git a/inc/modules/admin/what-list_transfer.php b/inc/modules/admin/what-list_transfer.php index 03cac72235..937a90386f 100644 --- a/inc/modules/admin/what-list_transfer.php +++ b/inc/modules/admin/what-list_transfer.php @@ -72,7 +72,7 @@ if (SQL_NUMROWS($result) > 0) { } else { // Nothing for in and out $OUT = " - + ".loadTemplate('admin_settings_saved', true, getMessage('TRANSFER_NO_INOUT_TRANSFERS'))." "; diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php index f369b3a38b..6349a41bdb 100644 --- a/inc/modules/admin/what-list_user.php +++ b/inc/modules/admin/what-list_user.php @@ -286,7 +286,7 @@ LIMIT 1", // @TODO Rewrite this into a filter if (isExtensionActive('nickname')) { // Nickname extension found - define('__NICKNAME_TH', " {--NICKNAME--}"); + define('__NICKNAME_TH', " {--NICKNAME--}"); } else { // Not found define('__NICKNAME_TH', ''); diff --git a/inc/modules/admin/what-theme_edit.php b/inc/modules/admin/what-theme_edit.php index 04bffb46da..e950cb89f3 100644 --- a/inc/modules/admin/what-theme_edit.php +++ b/inc/modules/admin/what-theme_edit.php @@ -150,7 +150,7 @@ if (SQL_NUMROWS($result) > 0) { } else { // No themes found??? $OUT .= " - + ".loadTemplate('admin_settings_saved', true, getMessage('ADMIN_NO_THEMES_FOUND'))." \n"; diff --git a/inc/modules/guest/what-sponsor_reg.php b/inc/modules/guest/what-sponsor_reg.php index 29e2831c02..fc1d82f326 100644 --- a/inc/modules/guest/what-sponsor_reg.php +++ b/inc/modules/guest/what-sponsor_reg.php @@ -284,7 +284,7 @@ ORDER BY `pay_name`", __FILE__, __LINE__); if (SQL_NUMROWS($result) > 0) { // Load all types... // @TODO Swap this HTML code to templates - $OUT = "\n"; + $OUT = "
\n"; $SW = 2; while ($content = SQL_FETCHARRAY($result)) { // Prepare content for output diff --git a/inc/modules/guest/what-stats.php b/inc/modules/guest/what-stats.php index 56e6999b33..9e12b77d13 100644 --- a/inc/modules/guest/what-stats.php +++ b/inc/modules/guest/what-stats.php @@ -137,7 +137,7 @@ switch (getConfig('guest_stats')) { $content['ltitle'] = $ltitle; // Generate monthly stats - $SW = 2; $r2 = ' right2'; $l = 'll'; $r = 'lr'; $OUT = ''; + $SW = 2; $r2 = ' right'; $l = 'll'; $r = 'lr'; $OUT = ''; foreach ($months as $month => $cnt) { if ($SW == 2) $OUT .= "\n"; @@ -158,7 +158,7 @@ switch (getConfig('guest_stats')) { $l = 'rl'; $r = 'rr'; } else { $OUT .= "\n"; - $r2 = ' right2'; + $r2 = ' right'; $l = 'll'; $r = 'lr'; } $SW = 3 - $SW; diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php index a73cc89544..5b86f5e55a 100644 --- a/inc/modules/member/what-order.php +++ b/inc/modules/member/what-order.php @@ -643,7 +643,7 @@ LIMIT 1", $add = ''; if (isExtensionActive('html_mail')) { // Add some content when html extension is active - if ((getConfig('order_multi_page') == 'Y') || (isAdmin())) $add = "\n"; + if ((getConfig('order_multi_page') == 'Y') || (isAdmin())) $add = "\n"; $content['html_extension'] = loadTemplate('member_order-html_intro', true); } else { // No HTML extension installed diff --git a/inc/modules/member/what-themes.php b/inc/modules/member/what-themes.php index 7acdd77a43..0ffe52a4e9 100644 --- a/inc/modules/member/what-themes.php +++ b/inc/modules/member/what-themes.php @@ -113,17 +113,17 @@ foreach ($THEMES['theme_unix'] as $key => $unix) { // Add row $OUT .= " - - - + - - + \n"; $SW = 3 - $SW; } // END - foreach @@ -131,7 +131,7 @@ foreach ($THEMES['theme_unix'] as $key => $unix) { if (empty($OUT)) { // No themes found??? $OUT = " - \n"; diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php index 55e1f0a3c9..38a7cb973b 100644 --- a/inc/modules/member/what-transfer.php +++ b/inc/modules/member/what-transfer.php @@ -342,7 +342,7 @@ switch ($mode) { } else { // Nothing for in or out $OUT = " - "; @@ -428,7 +428,7 @@ KEY (`party_userid`) } else { // Nothing for in and out $OUT = " - "; diff --git a/inc/reset/reset_holiday.php b/inc/reset/reset_holiday.php index 418e939a61..37662440bf 100644 --- a/inc/reset/reset_holiday.php +++ b/inc/reset/reset_holiday.php @@ -101,7 +101,7 @@ LIMIT 1", // Free memory SQL_FREERESULT($result_main); -// Stop2 currently activated holidays +// Stop currently activated holidays stopHolidays(); // [EOF] diff --git a/surfbar.php b/surfbar.php index a97cdd5a99..c8a8c9d00d 100644 --- a/surfbar.php +++ b/surfbar.php @@ -105,7 +105,7 @@ SURFBAR_INIT(); SURFBAR_HANDLE_SELF_MAINTENANCE(); // Is there a check value? -if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestElementSet('frame')) && (in_array(getRequestElement('frame'), array('stop', 'stop2', 'stats', 'textlinks'))))) { +if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestElementSet('frame')) && (in_array(getRequestElement('frame'), array('stop', 'stop', 'stats', 'textlinks'))))) { // Reload-lock is full, surfbar stopped so... // Load header loadIncludeOnce('inc/header.php'); @@ -216,7 +216,7 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestElementSet('frame')) && (in_a SURFBAR_UPDATE_SALT_STATS(); } else { // Load new URL - SURFBAR_RELOAD_TO_STOP_PAGE('stop2'); + SURFBAR_RELOAD_TO_STOP_PAGE('stop'); } } elseif ((isGetRequestElementSet('frame')) && (getRequestElement('frame') == 'start')) { // Starter frame found so let the footer display diff --git a/templates/de/html/admin/admin_add_bank_package.tpl b/templates/de/html/admin/admin_add_bank_package.tpl index b300a3c396..04bbdb1add 100644 --- a/templates/de/html/admin/admin_add_bank_package.tpl +++ b/templates/de/html/admin/admin_add_bank_package.tpl @@ -1,7 +1,7 @@
 
 
+ ".$THEMES['theme_name'][$key]." + ".$THEMES['theme_name'][$key]." ".$THEMES['theme_author'][$key]." + ".$THEMES['theme_url'][$key]." v".$THEMES['theme_ver'][$key]."v".$THEMES['theme_ver'][$key]."
+ ".loadTemplate('admin_settings_saved', true, getMessage('MEMBER_NO_THEMES_FOUND'))."
+ ".loadTemplate('admin_settings_saved', true, $nothingMessage)."
+ ".loadTemplate('admin_settings_saved', true, getMessage('TRANSFER_NO_INOUT_TRANSFERS'))."
- @@ -150,7 +150,7 @@ - +
+ {--ADMIN_ADD_BANK_PACKAGE_TITLE--}