From c4823d28fd0bd22250b16d73f2034f36fc54abda Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 19 Jan 2011 19:20:43 +0000 Subject: [PATCH] Several code-cleanups: - Some if() blocks improved by using curly braces (better human-readable) - The sender of bonus mails is not zero (0) anymore, we use NULL now (maybe needs some fixing) - Thanks to SixCooler for reading text of ext-yacy --- beg.php | 2 +- inc/classes/cachesystem.class.php | 4 +-- inc/config-functions.php | 4 +-- inc/db/lib-mysql3.php | 2 +- inc/extensions-functions.php | 4 +-- inc/filter-functions.php | 2 +- inc/functions.php | 4 +-- inc/install-inc.php | 2 +- inc/language-functions.php | 2 +- inc/libs/bonus_functions.php | 4 +-- inc/libs/html_mail_functions.php | 7 +++-- inc/libs/nickname_functions.php | 2 +- inc/libs/rallye_functions.php | 2 +- inc/libs/refback_functions.php | 2 +- inc/libs/sponsor_functions.php | 8 ++--- inc/libs/surfbar_functions.php | 2 +- inc/libs/user_functions.php | 2 +- inc/libs/yoomedia_functions.php | 4 +-- inc/module-functions.php | 2 +- inc/modules/admin/admin-inc.php | 6 ++-- inc/modules/admin/overview-inc.php | 4 +-- inc/modules/admin/what-add_points.php | 2 +- inc/modules/admin/what-config_imprint.php | 2 +- .../admin/what-config_rallye_prices.php | 2 +- inc/modules/admin/what-del_sponsor.php | 2 +- inc/modules/admin/what-edit_sponsor.php | 4 +-- inc/modules/admin/what-list_bank_package.php | 2 +- inc/modules/admin/what-list_links.php | 2 +- inc/modules/admin/what-list_sponsor.php | 2 +- inc/modules/admin/what-list_sponsor_pays.php | 2 +- inc/modules/admin/what-list_unconfirmed.php | 14 ++++++--- inc/modules/admin/what-list_user.php | 2 +- inc/modules/admin/what-lock_sponsor.php | 2 +- inc/modules/admin/what-sub_points.php | 2 +- inc/modules/admin/what-theme_import.php | 2 +- inc/modules/frametester.php | 2 +- inc/modules/member/what-holiday.php | 2 +- inc/modules/member/what-order.php | 2 +- inc/modules/member/what-reflinks.php | 6 ++-- inc/modules/member/what-unconfirmed.php | 4 +-- inc/modules/sponsor/account.php | 2 +- inc/modules/sponsor/settings.php | 2 +- inc/mysql-manager.php | 6 ++-- inc/session-functions.php | 2 +- inc/template-functions.php | 6 ++-- modules.php | 2 +- templates/de/html/ext/ext_yacy.tpl | 30 +++++++++++++++++-- 47 files changed, 107 insertions(+), 72 deletions(-) diff --git a/beg.php b/beg.php index c241a6d373..9967f3b436 100644 --- a/beg.php +++ b/beg.php @@ -145,7 +145,7 @@ if (isGetRequestParameterSet('userid')) { $content['message'] = loadTemplate('beg_failed', true, $content); } } elseif (isMember()) { - // Logged in user found! + // Logged in user found $content['message'] = loadTemplate('beg_login', true, $content); } elseif (getBegPayMode() != 'NONE') { // Other pay-mode active! // Load message template depending on pay-mode diff --git a/inc/classes/cachesystem.class.php b/inc/classes/cachesystem.class.php index 14169a98ab..bee80767ac 100644 --- a/inc/classes/cachesystem.class.php +++ b/inc/classes/cachesystem.class.php @@ -214,7 +214,7 @@ class CacheSystem { // Remove cache $this->removeCacheFile(true); - // Unsupported cache found! + // Unsupported/unhandled cache detected debug_report_bug(__METHOD__, __LINE__, 'Unsupported cache ' . $this->name . ' detected.'); } @@ -478,7 +478,7 @@ class CacheSystem { // Does it match? $GLOBALS[__METHOD__][$ext_name] = ((isset($this->version[$this->name][$ext_name])) && ($this->version[$this->name][$ext_name] == $ext_ver)); } elseif ($this->isCacheReadable()) { - // No cache version found! + // No cache version found logDebugMessage(__METHOD__, __LINE__, 'Cache ' . $this->name . ' has missing version entry for extension ' . $ext_name . '! Purging cache...'); // Remove the cache file diff --git a/inc/config-functions.php b/inc/config-functions.php index df5a884e95..c251e8dda0 100644 --- a/inc/config-functions.php +++ b/inc/config-functions.php @@ -193,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... @@ -239,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 diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php index 9f95d5775b..701506b8a1 100644 --- a/inc/db/lib-mysql3.php +++ b/inc/db/lib-mysql3.php @@ -464,7 +464,7 @@ function SQL_ALTER_TABLE ($sql, $F, $L, $enableCodes = true) { // But should we DROP? if ($tableArray[3] == 'DROP') { - // Then skip if nothing found! + // Then skip if nothing found $skip = true; //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Going to drop key ' . $keyName); } // END - if diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php index ed9ead0d9f..3581bf0227 100644 --- a/inc/extensions-functions.php +++ b/inc/extensions-functions.php @@ -1116,7 +1116,7 @@ function addExtensionNotes ($ext_ver) { 'notes' => '{--INITIAL_RELEASE--}' ); } else { - // No update notes found! + // No update notes found $content = array( 'ver' => $ext_ver, 'notes' => '{--NO_UPDATE_NOTES--}' @@ -1288,7 +1288,7 @@ function isExtensionUpdateRunning ($ext_name) { foreach ($GLOBALS['ext_running_updates'] as $ext1=>$depends) { // Is it found? if (($ext1 == $ext_name) || ($isRunning === true)) { - // Found! + // found logDebugMessage(__FUNCTION__, __LINE__, 'ext1=' . $ext1 . ',ext_name=' . $ext_name . ',isRunning=' . intval($isRunning)); $isRunning = true; break; diff --git a/inc/filter-functions.php b/inc/filter-functions.php index 1dd99c42d4..e2f2b84694 100644 --- a/inc/filter-functions.php +++ b/inc/filter-functions.php @@ -254,7 +254,7 @@ function runFilterChain ($filterName, $data = null) { // Log not found filters in debug-mode if (isDebugModeEnabled()) { // Log it away... - logDebugMessage(__FUNCTION__, __LINE__, 'Filter chain ' . $filterName . ' not found!'); + logDebugMessage(__FUNCTION__, __LINE__, 'Filter chain ' . $filterName . ' not found.'); } // END - if // Abort here and return content diff --git a/inc/functions.php b/inc/functions.php index dbd0bc4261..4b25ba9777 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -169,7 +169,7 @@ Message : ' . htmlentities(utf8_decode($message)) . ' // Send Mail away return sendRawEmail($toEmail, $subject, $message, $mailHeader); } elseif ($isHtml != 'Y') { - // Problem found! + // Problem detected while sending a mail, forward it to admin return sendRawEmail(getConfig('WEBMASTER'), '[PROBLEM:]' . $subject, $message, $mailHeader); } @@ -1858,7 +1858,7 @@ function rebuildCache ($cache, $inc = '', $force = false) { //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "inc={$inc} - LOADED!
"); loadInclude($inc); } else { - // Include not found! + // Include not found logDebugMessage(__FUNCTION__, __LINE__, 'Include ' . $inc . ' not found. cache=' . $cache); } } // END - if diff --git a/inc/install-inc.php b/inc/install-inc.php index d0e49a6f41..4958a31f53 100644 --- a/inc/install-inc.php +++ b/inc/install-inc.php @@ -214,7 +214,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) { if (SQL_SELECT_DB($GLOBALS['install_mysql']['dbase'], __FILE__, __LINE__) === true) { // Check for dumps if ((!isFileReadable(postRequestParameter('spath') . 'install/tables.sql')) || (!isFileReadable(postRequestParameter('spath') . 'install/menu-'.getLanguage().'.sql'))) { - // Installation area not found! + // Installation area not found addFatalMessage(__FILE__, __LINE__, '{--INSTALL_MISSING_DUMPS--}'); return; } // END - if diff --git a/inc/language-functions.php b/inc/language-functions.php index 074b25e447..93999f1f92 100644 --- a/inc/language-functions.php +++ b/inc/language-functions.php @@ -43,7 +43,7 @@ if (!defined('__SECURITY')) { // "Getter" for language strings // @TODO Rewrite all language constants to this function. function getMessage ($messageId) { - // Default is not found! + // Default is not found $return = '!' . $messageId . '!'; // Is the language string found? diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php index a4a9c21895..68269946d8 100644 --- a/inc/libs/bonus_functions.php +++ b/inc/libs/bonus_functions.php @@ -85,7 +85,7 @@ function addTurboBonus ($mid, $userid, $type) { // Level found $points = $test[$rank - 2]; } else { - // Level not found! + // Level not found $points = '0.00000'; } } @@ -197,7 +197,7 @@ LIMIT 1", $GLOBALS['ranking_content']['rankings'] = '{--MEMBER_BONUS_RANK_YOU_ARE_404--}'; } // END - if } else { - // No entries found! + // No entries found // @TODO Move this HTML to a template $OUT = ' diff --git a/inc/libs/html_mail_functions.php b/inc/libs/html_mail_functions.php index 4e0169b3e0..eb205ec734 100644 --- a/inc/libs/html_mail_functions.php +++ b/inc/libs/html_mail_functions.php @@ -58,11 +58,12 @@ function checkHtmlTags ($html) { $check = strtolower(substr($test, strpos($test, '<') + 1, strpos($test, '>') - strpos($test, '<') - 1)); $check = str_replace('/', '', $check); if (!in_array($check, $GLOBALS['html_tags'])) { - // Invalid tag found! + // Invalid tag found return ''; - } + } // END - if $test = substr($test, strpos($test, '>') + 1); - } + } // END - while + // Return tested code return $html; } diff --git a/inc/libs/nickname_functions.php b/inc/libs/nickname_functions.php index a5cfe724d5..f3ec02b214 100644 --- a/inc/libs/nickname_functions.php +++ b/inc/libs/nickname_functions.php @@ -88,7 +88,7 @@ function getNickname ($userid) { $GLOBALS['nicknames'][$userid] = $ret; } // END - if } else { - // Direct nickname found! + // Direct nickname found $ret = $userid; // Put it in cche diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php index a9cb0f5426..e2b69c0b67 100644 --- a/inc/libs/rallye_functions.php +++ b/inc/libs/rallye_functions.php @@ -828,7 +828,7 @@ function addReferalRallyeTemplateSelection ($name = 'template', $default = '') { // Accept only template names between 1 and 255 chars length if ((strlen($read) < 256) && (!empty($read))) { - // Valid entry found! + // Valid entry found $ral[$read] = $read; } else { // Log invalid diff --git a/inc/libs/refback_functions.php b/inc/libs/refback_functions.php index bb42f8f11d..c4b15f74e9 100644 --- a/inc/libs/refback_functions.php +++ b/inc/libs/refback_functions.php @@ -129,7 +129,7 @@ function getRefbackPercents ($userid, $ref) { } else { // Debug log //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__."): NO ENTRY FOUND! :-(
"); - logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',ref=' . $ref . ' - No entry found! :-('); + logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',ref=' . $ref . ' - No entry found. :-('); } // Free result diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php index fac07ce8ca..15ebf6c442 100644 --- a/inc/libs/sponsor_functions.php +++ b/inc/libs/sponsor_functions.php @@ -79,7 +79,7 @@ function handleSponsorRequest ($postData, $update=false, $messageArray=array(), if (SQL_NUMROWS($result) == 1) { // Yes, he is! if ((getWhat() == 'add_sponsor') || ($update)) { - // Already found! + // Already found $ALREADY = true; } else { // Update his data @@ -207,7 +207,7 @@ function handleSponsorRequest ($postData, $update=false, $messageArray=array(), $result = SQL_QUERY_ESC($sql, $DATA['values'], __FUNCTION__, __LINE__); } // END - if } else { - // Error found! + // Error detected $message = getMessageFromIndexedArray('{--SPONSOR_DATA_NOT_SAVED--}', 'failed', $messageArray); loadTemplate('admin_settings_saved', false, $message); } @@ -226,7 +226,7 @@ function sponsorTranslateUserStatus ($status) { // Then use it $ret = getMessage($constantName); } else { - // Not found! + // Not found //* DEBUG: */ debug_report_bug(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status)); logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status)); $ret = getMaskedMessage('ACCOUNT_STATUS_UNKNOWN', $status); @@ -340,7 +340,7 @@ function addSponsorContent ($what) { // Every sponsor action will output nothing directly. It will be written into $GLOBALS['sponsor_output']! loadIncludeOnce($INC); } else { - // File not found! + // File not found $GLOBALS['sponsor_output'] .= loadTemplate('admin_settings_saved', true, getMaskedMessage('SPONSOR_CONTENT_404', $what)); } diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php index ad115ab2e5..18476de12d 100644 --- a/inc/libs/surfbar_functions.php +++ b/inc/libs/surfbar_functions.php @@ -409,7 +409,7 @@ function SURFBAR_MEMBER_EXECUTE_ACTION ($action, $urlData) { $executed = SURFBAR_CHANGE_STATUS($urlData['id'], $urlData['url_status'], $urlData['new_status'], array($urlData['id'] => $urlData)); } // END - if } else { - // Not found! + // Not found addFatalMessage(__FUNCTION__, __LINE__, '{--MEMBER_SURFBAR_EXECUTE_ACTION_404--}', $functionName); } diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php index 4f68201ea3..c405600bdc 100644 --- a/inc/libs/user_functions.php +++ b/inc/libs/user_functions.php @@ -393,7 +393,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p // Set userid in session setSession('current_userid', getUserData('userid')); } elseif (!isUserDataValid()) { - // User id not found! + // User id not found $errorCode = getCode('WRONG_ID'); } else { // Unknown error diff --git a/inc/libs/yoomedia_functions.php b/inc/libs/yoomedia_functions.php index 3e02dff95c..814db3dbb4 100644 --- a/inc/libs/yoomedia_functions.php +++ b/inc/libs/yoomedia_functions.php @@ -302,7 +302,7 @@ function yoomediaTranslateIndex ($type, $index) { // Use this element $return = $GLOBALS['translation_tables']['yoomedia'][$type][$index]; } else { - // Not found! + // Not found logDebugMessage(__FUNCTION__, __LINE__, "type={$type},index={$index} not found."); } @@ -317,7 +317,7 @@ function translateYooMediaError ($errorCode) { // Is the entry there? if (isset($GLOBALS['translation_tables']['yoomedia']['error_codes'][$errorCode])) { - // Entry found! + // Entry found $return = $GLOBALS['translation_tables']['yoomedia']['error_codes'][$errorCode]; } else { // Log missing entries diff --git a/inc/module-functions.php b/inc/module-functions.php index 75316d0dd7..ebb5f2fb83 100644 --- a/inc/module-functions.php +++ b/inc/module-functions.php @@ -154,7 +154,7 @@ function isModuleRegistered ($module) { $found = true; } elseif (isDebugModeEnabled()) { // Debug message only in debug-mode... - logDebugMessage(__FUNCTION__, __LINE__, 'Module ' . $module . ' not found!'); + logDebugMessage(__FUNCTION__, __LINE__, 'Module ' . $module . ' not found.'); } // Free result diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php index c660daca43..4eadcc4894 100644 --- a/inc/modules/admin/admin-inc.php +++ b/inc/modules/admin/admin-inc.php @@ -218,11 +218,11 @@ LIMIT 1", // Access denied loadTemplate('admin_menu_failed', false, getMaskedMessage('ADMIN_ACCESS_DENIED', $what)); } else { - // Include file not found! :-( + // Include file not found :-( loadTemplate('admin_menu_failed', false, getMaskedMessage('ADMIN_ACTION_404', $action)); } } else { - // Invalid action/what pair found! + // Invalid action/what pair found loadTemplate('admin_menu_failed', false, getMaskedMessage('ADMIN_ACTION_INVALID', $action . '/' . $what)); } @@ -1111,7 +1111,7 @@ function sendAdminPasswordResetLink ($email) { // Is there an account? if (SQL_HASZERONUMS($result)) { - // No account found! + // No account found return '{--ADMIN_NO_LOGIN_WITH_EMAIL--}'; } // END - if diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php index b4ae79de66..7304ac172f 100644 --- a/inc/modules/admin/overview-inc.php +++ b/inc/modules/admin/overview-inc.php @@ -115,7 +115,7 @@ ORDER BY array(getCurrentAdminId()), __FILE__, __LINE__); if (!SQL_HASZERONUMS($result_tasks)) { - // New jobs found! + // New jobs found $jobsDone = false; } // END - if @@ -177,7 +177,7 @@ LIMIT 1", $add = '
  • {--ADMIN_MEMBER_UID--}: ' . generateUserProfileLink($taskData['userid'], 'user_data') . ' (' . translateGender($content['gender']) . ' ' . $content['surname'] . ' ' . $content['family'] . ')
    • '; } else { // Invalid userid, so log and zero it - logDebugMessage(__FUNCTION__, __LINE__, 'Invalid userid=' . $taskData['userid'] . ' -> not found!'); + logDebugMessage(__FUNCTION__, __LINE__, 'fetchUserData() failed: userid=' . $taskData['userid'] . ' not found.'); $taskData['userid'] = '0'; } } // END - if diff --git a/inc/modules/admin/what-add_points.php b/inc/modules/admin/what-add_points.php index 5931a83071..54edc1b33b 100644 --- a/inc/modules/admin/what-add_points.php +++ b/inc/modules/admin/what-add_points.php @@ -116,7 +116,7 @@ if (getRequestParameter('userid') == 'all') { loadTemplate('admin_add_points', false, $content); } } else { - // User not found! + // User not found loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid')))); } } else { diff --git a/inc/modules/admin/what-config_imprint.php b/inc/modules/admin/what-config_imprint.php index 6adb3616bc..795fdb1ac1 100644 --- a/inc/modules/admin/what-config_imprint.php +++ b/inc/modules/admin/what-config_imprint.php @@ -62,7 +62,7 @@ if (isFormSent()) { // Transfer all rows to $content $content = $OUT; } else { - // None found! + // None found $content = loadTemplate('admin_list_imprint_row_none', true); } diff --git a/inc/modules/admin/what-config_rallye_prices.php b/inc/modules/admin/what-config_rallye_prices.php index 1a4b86cd53..baf1ab9ed2 100644 --- a/inc/modules/admin/what-config_rallye_prices.php +++ b/inc/modules/admin/what-config_rallye_prices.php @@ -69,7 +69,7 @@ if (isGetRequestParameterSet('rallye')) { // Free memory SQL_FREERESULT($result); - // Price level found! + // Price level found loadTemplate('admin_settings_saved', false, '{--RALLYE_PRICE_ALREADY_FOUND--}'); } } diff --git a/inc/modules/admin/what-del_sponsor.php b/inc/modules/admin/what-del_sponsor.php index a691cc3e01..8001fc0bec 100644 --- a/inc/modules/admin/what-del_sponsor.php +++ b/inc/modules/admin/what-del_sponsor.php @@ -84,7 +84,7 @@ if (isGetRequestParameterSet('id')) { loadTemplate('admin_delete_sponsor', false, $content); } } else { - // Sponsor not found! + // Sponsor not found loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_SPONSOR_404', bigintval(getRequestParameter('id')))); } diff --git a/inc/modules/admin/what-edit_sponsor.php b/inc/modules/admin/what-edit_sponsor.php index 7d6755b0b0..a31c5c2e2d 100644 --- a/inc/modules/admin/what-edit_sponsor.php +++ b/inc/modules/admin/what-edit_sponsor.php @@ -171,11 +171,11 @@ LIMIT 1", // Load mode template loadTemplate($TPL, false, $content); } else { - // Template not found! + // Template not found loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_SPONSOR_MODUS_TPL_404', getRequestParameter('mode'))); } } else { - // Sponsor not found! + // Sponsor not found loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_SPONSOR_404', bigintval(getRequestParameter('id')))); } diff --git a/inc/modules/admin/what-list_bank_package.php b/inc/modules/admin/what-list_bank_package.php index 8f1c7847f4..86de21ccc2 100644 --- a/inc/modules/admin/what-list_bank_package.php +++ b/inc/modules/admin/what-list_bank_package.php @@ -96,7 +96,7 @@ if (!SQL_HASZERONUMS($result)) { // Load main template loadTemplate('admin_list_bank_package', false, $OUT); } else { - // No packages found! + // No packages found loadTemplate('admin_settings_saved', false, '{--ADMIN_BANK_NO_PACKAGES_FOUND--}'); } diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php index f1403a6139..cd43aebdab 100644 --- a/inc/modules/admin/what-list_links.php +++ b/inc/modules/admin/what-list_links.php @@ -115,7 +115,7 @@ if (isGetRequestParameterSet('userid')) { // Do we have an entry? if (SQL_NUMROWS($result_data) == 1) { - // Mail was found! + // Mail was found $content = SQL_FETCHARRAY($result_data); // Fix empty subject diff --git a/inc/modules/admin/what-list_sponsor.php b/inc/modules/admin/what-list_sponsor.php index c7ec236e4e..1c006bdaae 100644 --- a/inc/modules/admin/what-list_sponsor.php +++ b/inc/modules/admin/what-list_sponsor.php @@ -140,7 +140,7 @@ ORDER BY `id` ASC", __FILE__, __LINE__); if (!SQL_HASZERONUMS($result_main)) { - // At least one sponsor found! + // At least one sponsor found $OUT = ''; while ($content = SQL_FETCHARRAY($result_main)) { // Transfer data to array diff --git a/inc/modules/admin/what-list_sponsor_pays.php b/inc/modules/admin/what-list_sponsor_pays.php index 296b11e0c4..dbe212688d 100644 --- a/inc/modules/admin/what-list_sponsor_pays.php +++ b/inc/modules/admin/what-list_sponsor_pays.php @@ -52,7 +52,7 @@ if (isGetRequestParameterSet('id')) { // Free memory SQL_FREERESULT($result); } else { - // Sponsor not found! + // Sponsor not found loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_SPONSOR_404', bigintval(getRequestParameter('id')))); } } else { diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php index a400f4916f..420a0852c4 100644 --- a/inc/modules/admin/what-list_unconfirmed.php +++ b/inc/modules/admin/what-list_unconfirmed.php @@ -107,12 +107,18 @@ if (($listed === true) && (!empty($sql))) { // Do we have an entry? if (SQL_NUMROWS($result_master) == 1) { - // Mail order / bonus mail found! + // Mail order / bonus mail found $poolData = SQL_FETCHARRAY($result_master); - // Transfer data to constants for the template - if (($poolData['id'] > 0) && ($ID == '-1')) $ID = $poolData['id']; - if ($col == 'bonus_id') $poolData['sender'] = '0'; + // If there is a pool id and $ID is not set, we take it + if (($poolData['id'] > 0) && ($ID == '-1')) { + $ID = $poolData['id']; + } // END - if + + // Bonus mails do always have a sender 'NULL' + if ($col == 'bonus_id') { + $poolData['sender'] = null; + } // END - if // Load unconfirmed mail links. Hmmm, this select query is pretty cool // but it does only show unconfirmed mail links from existing user diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php index a900423913..ecc63f1688 100644 --- a/inc/modules/admin/what-list_user.php +++ b/inc/modules/admin/what-list_user.php @@ -107,7 +107,7 @@ LIMIT 1", // User found? if (SQL_NUMROWS($result_user) == 1) { - // Account found! + // Account found $content = SQL_FETCHARRAY($result_user); // Get count/sum of refs, selected categories, unconfirmed mails diff --git a/inc/modules/admin/what-lock_sponsor.php b/inc/modules/admin/what-lock_sponsor.php index a82c17285a..0aedbe82b9 100644 --- a/inc/modules/admin/what-lock_sponsor.php +++ b/inc/modules/admin/what-lock_sponsor.php @@ -106,7 +106,7 @@ if (isGetRequestParameterSet('id')) { $message = '{--ADMIN_SPONSOR_CANNOT_LOCK_PENDING_UNCINFIRMED_ACCOUNTS--}'; } } else { - // Sponsor not found! + // Sponsor not found $message = getMaskedMessage('ADMIN_SPONSOR_404', bigintval(getRequestParameter('id'))); } diff --git a/inc/modules/admin/what-sub_points.php b/inc/modules/admin/what-sub_points.php index 37dea2b698..5c5dc6c4e9 100644 --- a/inc/modules/admin/what-sub_points.php +++ b/inc/modules/admin/what-sub_points.php @@ -109,7 +109,7 @@ if (getRequestParameter('userid') == 'all') { loadTemplate('admin_sub_points', false, $content); } } else { - // User not found! + // User not found loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid')))); } } else { diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php index 84206c4a51..a7f9c10e51 100644 --- a/inc/modules/admin/what-theme_import.php +++ b/inc/modules/admin/what-theme_import.php @@ -78,7 +78,7 @@ VALUES ('%s','N','%s','%s')", // Prepare message $message = getMaskedMessage('ADMIN_THEME_IMPORTED', postRequestParameter('theme')); } else { - // Include file not found! + // Include file not found $message = getMaskedMessage('ADMIN_THEME_INC_404', postRequestParameter('theme')); } } else { diff --git a/inc/modules/frametester.php b/inc/modules/frametester.php index c12694d851..4203c99cfe 100644 --- a/inc/modules/frametester.php +++ b/inc/modules/frametester.php @@ -60,7 +60,7 @@ if (isGetRequestParameterSet('order')) { // Mode is member $mode = 'member'; } else { - // Matching line not found! + // Matching line not found redirectToUrl('modules.php?module=index&what=login'); } diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php index 22867b557f..88bdb0064d 100644 --- a/inc/modules/member/what-holiday.php +++ b/inc/modules/member/what-holiday.php @@ -76,7 +76,7 @@ ORDER BY LIMIT 1", array(getMemberId()), __FILE__, __LINE__); if ((SQL_NUMROWS($result1) == 1) || (SQL_NUMROWS($result2) == 1)) { - // Mail order found! + // Mail order found $content = merge_array($content, SQL_FETCHARRAY($result1)); $content = merge_array($content, SQL_FETCHARRAY($result2)); diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php index 0d95ae301d..59b1cb1ba0 100644 --- a/inc/modules/member/what-order.php +++ b/inc/modules/member/what-order.php @@ -95,7 +95,7 @@ LIMIT 1", if (getConfig('allow_url_in_text') == 'Y') { // Test submitted text against some filters (length, URLs in text etc.) if ((strpos(strtolower(postRequestParameter('text')), 'https://') > -1) || (strpos(strtolower(postRequestParameter('text')), 'http://') > -1) || (strpos(strtolower(postRequestParameter('text')), "www") > -1)) { - // URL found! + // URL found $url = 'modules.php?module=login&what=order&code=' . getCode('URL_FOUND'); } // END - if diff --git a/inc/modules/member/what-reflinks.php b/inc/modules/member/what-reflinks.php index 971af09a6d..609c738f6e 100644 --- a/inc/modules/member/what-reflinks.php +++ b/inc/modules/member/what-reflinks.php @@ -93,7 +93,9 @@ if (!SQL_HASZERONUMS($result)) { $row['alternate'] = '{?MAIN_TITLE?} - {?SLOGAN?}'; } // END - if - if ($size > 0) $row['alternate'] .= ' (' .translateComma(round($size / 102.4) / 10) . ' {--KBYTES--})'; + if ($size > 0) { + $row['alternate'] .= ' (' .translateComma(round($size / 102.4) / 10) . ' {--KBYTES--})'; + } // END - if // Add some more data $row['userid'] = getMemberId(); @@ -105,7 +107,7 @@ if (!SQL_HASZERONUMS($result)) { // Load final template $content['refbanner_content'] = loadTemplate('member_reflinks_table', true, $OUT); } else { - // No refbanner found! + // No refbanner found $content['refbanner_content'] = loadTemplate('admin_settings_saved', true, '{--MEMBER_NO_REFBANNER_FOUND--}'); } diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php index 3689c64ea5..e593034a2a 100644 --- a/inc/modules/member/what-unconfirmed.php +++ b/inc/modules/member/what-unconfirmed.php @@ -165,7 +165,7 @@ LIMIT 1", break; case 'BONUS': - $result_data = SQL_QUERY_ESC("SELECT subject, timestamp, cat_id, points, 0 FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1", + $result_data = SQL_QUERY_ESC("SELECT `subject`, `timestamp`, `cat_id`, `points`, 0 FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1", array(bigintval($row['bonus_id'])), __FILE__, __LINE__); $row['link_type'] = 'bonusid'; $data = $row['bonus_id']; @@ -179,7 +179,7 @@ LIMIT 1", // Data found to this mail? if ((SQL_NUMROWS($result_data) == 1) && (($row['link_type'] == 'mailid') || ($row['link_type'] == 'bonusid'))) { - // Mail was found! + // Mail was found list($subject, $timestamp, $cat, $pay, $sender) = SQL_FETCHROW($result_data); // Subject line found? diff --git a/inc/modules/sponsor/account.php b/inc/modules/sponsor/account.php index df502765f8..118d92e9c7 100644 --- a/inc/modules/sponsor/account.php +++ b/inc/modules/sponsor/account.php @@ -141,7 +141,7 @@ if (SQL_NUMROWS($result) == 1) { $GLOBALS['sponsor_output'] = loadTemplate('admin_settings_saved', true, getMaskedMessage('SPONSOR_ACCOUNT_FAILED', $STATUS)); } } else { - // Sponsor account not found! + // Sponsor account not found $GLOBALS['sponsor_output'] = loadTemplate('admin_settings_saved', true, getMaskedMessage('SPONSOR_ACCOUNT_404', getSession('sponsor_id'))); } diff --git a/inc/modules/sponsor/settings.php b/inc/modules/sponsor/settings.php index b93b803058..d4bc934539 100644 --- a/inc/modules/sponsor/settings.php +++ b/inc/modules/sponsor/settings.php @@ -119,7 +119,7 @@ if (SQL_NUMROWS($result) == 1) { $GLOBALS['sponsor_output'] = loadTemplate('admin_settings_saved', true, getMaskedMessage('SPONSOR_ACCOUNT_FAILED', $STATUS)); } } else { - // Sponsor account not found! + // Sponsor account not found $GLOBALS['sponsor_output'] = loadTemplate('admin_settings_saved', true, getMaskedMessage('SPONSOR_ACCOUNT_404', getSession('sponsor_id'))); } diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index c53e965ec5..9bfcadd5bf 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -259,7 +259,7 @@ ORDER BY // Navigation link $OUT .= ''; } else { - // Not found! - open + // Not found - open $OUT .= ''; } @@ -274,7 +274,7 @@ ORDER BY $OUT .= ''; } // END - if } else { - // Not found! - close + // Not found - close $OUT .= ''; } @@ -963,7 +963,7 @@ function getReferalLevelPercents ($level) { // First look for level $key = array_search($level, $GLOBALS['cache_array']['refdepths']['level']); if ($key !== false) { - // Entry found! + // Entry found $data['percents'] = $GLOBALS['cache_array']['refdepths']['percents'][$key]; // Count cache hit diff --git a/inc/session-functions.php b/inc/session-functions.php index cef1f7a478..7bfb18c901 100644 --- a/inc/session-functions.php +++ b/inc/session-functions.php @@ -91,7 +91,7 @@ function isSessionVariableSet ($var) { // Returns wether the value of the session variable or NULL if not set function getSession ($var) { - // Default is not found! ;-) + // Default is not found ;-) $value = null; // Is the variable there? diff --git a/inc/template-functions.php b/inc/template-functions.php index c82496100d..da8ddcfe8a 100644 --- a/inc/template-functions.php +++ b/inc/template-functions.php @@ -485,7 +485,7 @@ function loadEmailTemplate ($template, $content = array(), $userid = '0', $loadU $GLOBALS['tpl_content'][$template] = '$newContent = decodeEntities("' . compileRawCode(escapeQuotes($GLOBALS['tpl_content'][$template])) . '");'; eval($GLOBALS['tpl_content'][$template]); } elseif (!empty($template)) { - // Template file not found! + // Template file not found $newContent = '
    {--TEMPLATE_404--}: ' . $template . '
    @@ -618,7 +618,7 @@ function compileRawCode ($code, $simple = false, $constants = true, $full = true // Does this entry exist? //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "found={$found},match={$match},set={$set}
    "); if ($test == $match) { - // Match found! + // Match found //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "fuzzyFound!
    "); $fuzzyFound = true; break; @@ -1393,7 +1393,7 @@ function determinePageTitle () { // Installation mode $pageTitle = '{--INSTALLER_OF_MAILER--}'; } else { - // Configuration not found! + // Configuration not found $pageTitle = '{--NO_CONFIG_FOUND_TITLE--}'; // Do not add the fatal message in installation mode diff --git a/modules.php b/modules.php index ac2fd8cd3d..d4e00b3f87 100644 --- a/modules.php +++ b/modules.php @@ -89,7 +89,7 @@ if ((isExtensionActive('maintenance')) && (isMaintenanceEnabled()) && (!isAdmin( // Set HTTP status setHttpStatus('404'); - // Module not found! + // Module not found addFatalMessage(__FILE__, __LINE__, getMaskedMessage('MODULE_REGISTRY_404', getModule())); // Set module to error module (non-existent!) diff --git a/templates/de/html/ext/ext_yacy.tpl b/templates/de/html/ext/ext_yacy.tpl index 47e820839c..eb8c2f14e8 100644 --- a/templates/de/html/ext/ext_yacy.tpl +++ b/templates/de/html/ext/ext_yacy.tpl @@ -2,8 +2,20 @@     YaCy ist eine auf dem Peer-To-Peer-Prinzip aufbauende Suchmaschine. Diese Erweiterung hilft Ihnen - bei der Integration eines YaCy-Peers (z.B. auf Ihrem Server installiertem) - in Ihren {?MT_WORD?} als Webseitensuche. + bei der Integration eines YaCy-Peers (z.B. auf dem selben Server + installiertem) in Ihren {?MT_WORD?} als Webseitensuche. + + +
    + Mögliches Einsatzgebiet von YaCy wäre wie zuvor angedeutet eine + Webseitensuche (das ein bekanntes "Personal Website Search" + Produkt ersetzen kann), {?MT_WORD3?} haben durchaus Foren oder gar einen + Blog installiert, die eine Suche anbieten + einige Seiten auf der + Hauptseite. Diesses alles zusammen liesse sich mit YaCy dann mit einer + einheitlichen Suchmaske durchsuchbar machen. Die Erweiterung macht hier + deswegen Sinn, da es dann dem Webmaster (mit zum Teil sehr wenig + HTML-Kenntnissen) leichter fällt, YaCy einzubinden. Das Mitglied hat + dann ihm eine bekannte Darstellung der Suchergebnisse.
    @@ -16,3 +28,17 @@ Blog installiert haben und diese auch mit der selben Suchmaske durchsuchbar machen möchten.
    + +
    + Aufgrund dass es bei YaCy keinen Jugendschutzfilter (zum Rausfiltern von + für Jugendliche ungeeigneten Content) gibt und jeder Peer-Betreiber + selber entscheiden kann, welche Webseiten er sperrt und welche nicht, + sollten Sie in der YaCy-Konfiguration DHT komplett ausschalten und z.B. + auf einen öffentlichen Robinson-Peer wechseln. So kommen keine ungefilterten + Suchergebisse in Ihren {?MT_WORD?} rein, die Sie eventuell nicht zeigen + wollen. Ist DHT an, ist es durchaus möglich, dass trotz + Einschränkung des URL-Filters (nur Ihre Webseite wie oben beschrieben) + immer noch unerwünschte Suchergebnisse (Bildersuche z.B.) von Ihrem + Peer durchsuchbar sind, da Ihr Peer andere im YaCy-Netzwerk befindlichen + Peers anfragt. +
    -- 2.30.2