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

diff --git a/beg.php b/beg.php
index c241a6d373d633aa2e2986e8f1a87e1cdc5afcfd..9967f3b4365ecdb9415194db37ace2e9fd829bb9 100644 (file)
--- 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 14169a98ab5ea545cacd83178c57f24dc35ee98e..bee80767ac0581e642d07d739a122fb64e47f2db 100644 (file)
--- 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 df5a884e95c19a3849e62bec6d7693484ae4e8a1..c251e8dda083bd4fafff50c417fb1e2f570b096c 100644 (file)
--- 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 9f95d5775b4e026b0b57ee3848843a474f882c69..701506b8a1a83e1879da201ebb549d076d6e9fca 100644 (file)
--- 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 ed9ead0d9f8e0117ffcc188d579a595a97183c19..3581bf02270367d59ea3334339f4dd818243b75f 100644 (file)
--- 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 1dd99c42d4d13487217e3ce149cec349fc152627..e2f2b84694c7b4241b204fd34ad7157ff3f5026e 100644 (file)
--- 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 dbd0bc42611156a20dbb8874f412bcbede1afc5c..4b25ba977704ed82f709b48713f0e574d5c634f6 100644 (file)
--- 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!<br />");
                                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 d0e49a6f41ba06f2f45695109a9fa9b77ae86d94..4958a31f53c47e364c9ba2f198b2bd3af9dd7f33 100644 (file)
--- 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 074b25e447f03c6bc9f92d7a8eff5c40cfe0611c..93999f1f92bbbb5b8d9874975203b4fedaa1b31f 100644 (file)
--- 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 a4a9c2189560f8815a21cdbfbe550801bcee7851..68269946d8e2dc80356978972bcddfbae7e07716 100644 (file)
--- 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 = '<tr>
   <td colspan="3" align="center" height="30" class="bottom">

diff --git a/inc/libs/html_mail_functions.php b/inc/libs/html_mail_functions.php
index 4e0169b3e083be71cb0d7f008e8e082e1c9a90fa..eb205ec7345e7edd84dadf394b85ac0e42a1614f 100644 (file)
--- 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 a5cfe724d5bf86ee5857252a1b624a44f40a8731..f3ec02b214696c2abdf77c88c4ea8a795a091ac5 100644 (file)
--- 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 a9cb0f5426d6a9c9e613ef3748c3407b18563289..e2b69c0b67472fb841f215a594b98c6ba673b368 100644 (file)
--- 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 bb42f8f11d2d0bc649e96c1be4dbb284e4ce79ba..c4b15f74e9f5536eae060235d40ac5e3e916e1e1 100644 (file)
--- 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__ . '(<font color="#0000aa">' . __LINE__."</font>): NO ENTRY FOUND! :-(<br />");
-                       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 fac07ce8cad9b34676fd8cfd024998f98b6b109c..15ebf6c442cbedbf9761c93fd293dd5387da2b4d 100644 (file)
--- 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 ad115ab2e51ac4892fb83a2a5f41f08d90068042..18476de12dae5db13b17e15dab156d0a9d907ff8 100644 (file)
--- 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 4f68201ea3d445d7a8c571341cdf1b8a15e1133f..c405600bdccd6e302640225d407d07677592e8a1 100644 (file)
--- 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 3e02dff95c2d6f3b06a1bf00a53e4b0493b0d40a..814db3dbb49044f56dea68c8246dce95f6980e37 100644 (file)
--- 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 75316d0dd772dc8b19c1c0009fed33e17182bee3..ebb5f2fb8329208f2bce744d663b450a29c18690 100644 (file)
--- 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 c660daca43b9ce2b172774e43b71fb8b58d909e1..4eadcc4894a63950df4e26ff2c6f864fd6ccd864 100644 (file)
--- 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 b4ae79de664cd86b439ddd437777afaab53b494b..7304ac172f49c73350ef8ed5db62bf254280d59f 100644 (file)
--- 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 = '<li>{--ADMIN_MEMBER_UID--}: <strong>' . generateUserProfileLink($taskData['userid'], 'user_data') . ' (<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . translateGender($content['gender']) . ' ' . $content['surname'] . ' ' . $content['family'] . '</a>)</strong></li>';
                                        } 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 5931a830715c87f0944b0c4ed3d9cf50f39947f8..54edc1b33bd3dee29e75aebc9d4cbde2ed8224ad 100644 (file)
--- 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 6adb3616bcb832004b7cd32ca31363721a26bdde..795fdb1ac1b8ccaabd37d7152ba845057dc11b0a 100644 (file)
--- 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 1a4b86cd530d0bfc0f04ac3b132d0e04685a6153..baf1ab9ed241617d3bd0d6f9474ef0e42b622a30 100644 (file)
--- 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 a691cc3e0187b4bda47eed73f1f4124d647e5957..8001fc0bec625ab09f065929eb6f055241f469f1 100644 (file)
--- 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 7d6755b0b0e9fe75f8863585ac0c91afc087e237..a31c5c2e2d652e48061128ae55d03bc638779b95 100644 (file)
--- 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 8f1c7847f4a7c4d1962e149325610be97e8f8ad6..86de21ccc2f2a564ad034ca0384cba0cbd751551 100644 (file)
--- 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 f1403a6139f528ef38120fc4e66c917a710b6c69..cd43aebdabe981e5a5973ed7b30bf676cac29c05 100644 (file)
--- 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 c7ec236e4e9709bdfe6e24daee6a17ebbd077bed..1c006bdaaec882014597d7547da2940eb37a8662 100644 (file)
--- 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 296b11e0c43791436522716368afdfaa58fb42fd..dbe212688d5965e8b438b2fbfba9f1a3beeba777 100644 (file)
--- 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 a400f4916f1eda92f12b9bee6cca19d76e143bfa..420a0852c41cbb42d6ceec3076a51158223770f1 100644 (file)
--- 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 a900423913f9c23c2f4916917eeead3d0d082930..ecc63f1688dacc71d073d2b897b39cfffd24b4d0 100644 (file)
--- 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 a82c17285ae3e0ca6e4d875fb05873c5c5afa89e..0aedbe82b95bdad7e03d1bd522414ff8a6d3eedb 100644 (file)
--- 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 37dea2b69838da3e27c8ce88bfd94d3f7ed71ecb..5c5dc6c4e97c8fa5d34c2603499cd8356360bf75 100644 (file)
--- 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 84206c4a517a131bc89aa579f0ea9e286feef85f..a7f9c10e510ab5f9f68cba3ec39d67032660989c 100644 (file)
--- 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 c12694d85199e3dc5c83276b7e902f30324515ee..4203c99cfedd63c69c0644de8cfceb628c72bf0f 100644 (file)
--- 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 22867b557f0072f19ba732422f3a0be0455ac081..88bdb0064d0d98593b034e0bf8ecd259b1986000 100644 (file)
--- 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 0d95ae301df065580173ff9f281b5728f508aef5..59b1cb1ba080a6ba2fa96345f2cdf267ab34ccfc 100644 (file)
--- 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 971af09a6d42b7efd8c35cec43f71cfe53fe9588..609c738f6e9367461f28fe6bdf3bede4e32eae08 100644 (file)
--- 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 3689c64ea5bd0435eae4c2c49ee11e2bbaaadd3a..e593034a2ac6295ae0e97528ca1e2343f6e70cfd 100644 (file)
--- 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 df502765f8a09126409c34823ce94f3da758b227..118d92e9c7acd1832e38e37ede579ad55d141b78 100644 (file)
--- 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 b93b8030585e2656ba04944c45d58be85a482c7b..d4bc9345394a7b4df8d88d889039e3df3c4b8dad 100644 (file)
--- 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 c53e965ec57d68dcf483fe1ee2a10449b3f9485a..9bfcadd5bf1e94799eb0ecab569989d633793bf8 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -259,7 +259,7 @@ ORDER BY
                                                // Navigation link
                                                $OUT .= '<a name="menu" class="menu_blur" href="{%url=modules.php?module=' . getModule() . '&amp;what=' . $content['sub_what'] . '%}" target="_self">';
                                        } else {
-                                               // Not found! - open
+                                               // Not found - open
                                                $OUT .= '<em style="cursor:help" class="notice" title="{%message,MENU_WHAT_404=' . $content['sub_what'] . '%}">';
                                        }
 
@@ -274,7 +274,7 @@ ORDER BY
                                                        $OUT .= '</strong>';
                                                } // END - if
                                        } else {
-                                               // Not found! - close
+                                               // Not found - close
                                                $OUT .= '</em>';
                                        }
 
@@ -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 cef1f7a478150bdfa43ceedc7e1ad0e8529e04cc..7bfb18c901742d31e4ddaf75580f42f3581bfdb3 100644 (file)
--- 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 c82496100db1edd4836ab10be8e89d254c225a94..da8ddcfe8a674f6cf6d4b3829038174aa69aefd8 100644 (file)
--- 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 = '<div class="para">
        {--TEMPLATE_404--}: ' . $template . '
 </div>
@@ -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}<br />");
                                if ($test == $match) {
-                                       // Match found!
+                                       // Match found
                                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "fuzzyFound!<br />");
                                        $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 ac2fd8cd3d4e12f7615a66986a1832db00016ab1..d4e00b3f872b82034fe311f314f30cef8f846023 100644 (file)
--- 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 47e820839c0f4aa698de1be4b11de931b778636b..eb8c2f14e853d15521fdf4f6da3c333af54dd014 100644 (file)
--- a/templates/de/html/ext/ext_yacy.tpl
+++ b/templates/de/html/ext/ext_yacy.tpl
@@ -2,8 +2,20 @@
        <a href="http://yacy.net" rel="external" target="_blank"
         title="YaCy Peer-To-Peer Suchmaschine">YaCy</a> 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.
+</div>
+
+<div class="para">
+       M&ouml;gliches Einsatzgebiet von YaCy w&auml;re wie zuvor angedeutet eine
+       Webseitensuche (das ein bekanntes &quot;Personal Website Search&quot;
+       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&auml;llt, YaCy einzubinden. Das Mitglied hat
+       dann ihm eine bekannte Darstellung der Suchergebnisse.
 </div>
 
 <div class="para">
@@ -16,3 +28,17 @@
        Blog installiert haben und diese auch mit der selben Suchmaske durchsuchbar
        machen m&ouml;chten.
 </div>
+
+<div class="para">
+       Aufgrund dass es bei YaCy keinen Jugendschutzfilter (zum Rausfiltern von
+       f&uuml;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 &ouml;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&ouml;glich, dass trotz
+       Einschr&auml;nkung des URL-Filters (nur Ihre Webseite wie oben beschrieben)
+       immer noch unerw&uuml;nschte Suchergebnisse (Bildersuche z.B.) von Ihrem
+       Peer durchsuchbar sind, da Ihr Peer andere im YaCy-Netzwerk befindlichen
+       Peers anfragt.
+</div>