More usage of EL code, no longer required checks removed:

- More usage of EL code for messages generated from functions with one parameter
- No longer needed checks for what/action script's own extension
- TODOs.txt updated

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index 605bc0690f2452163cb7676656e7637d3ec8446f..b7940243484c654e5e49f0eba5b1275abcaf2b54 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -142,8 +142,8 @@
 ./inc/modules/admin/what-list_refs.php:107:                                                            // @TODO Try to rewrite some to EL
 ./inc/modules/admin/what-list_unconfirmed.php:107:     // @TODO "Please do not call me directly." Should be rewritten to a nice selection depending on ext-bonus
 ./inc/modules/admin/what-list_unconfirmed.php:84:      // @TODO This constant might be unused? define('__LIST_UNCON_TITLE', '{--ADMIN_LIST_UNCONFIRMED_BONUS_LINKS--}');
-./inc/modules/admin/what-list_user.php:257:            // @TODO Rewrite this into a filter
-./inc/modules/admin/what-list_user.php:300:                    // @TODO Rewrite this into a filter
+./inc/modules/admin/what-list_user.php:251:            // @TODO Rewrite this into a filter
+./inc/modules/admin/what-list_user.php:294:                    // @TODO Rewrite this into a filter
 ./inc/modules/admin/what-logs.php:64:                  // @TODO Fix content-type here
 ./inc/modules/admin/what-logs.php:70:                  // @TODO Fix content-type here
 ./inc/modules/admin/what-mem_add.php:124:                              // @TODO This can be somehow rewritten to a function

diff --git a/inc/functions.php b/inc/functions.php
index 72bb5460e21bad9324f0e2851f74515ccc59201c..ba6ccc37101dcfc574e6145d1cc3728bbadb3811 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1207,13 +1207,13 @@ function getMessageFromErrorCode ($code) {
                        if (isExtensionActive('mailid', true)) {
                                $message = '{--ERROR_CONFIRMING_MAIL--}';
                        } else {
-                               $message = generateExtensionInactiveNotInstalledMessage('mailid');
+                               $message = '{%pipe,generateExtensionInactiveNotInstalledMessage=mailid%}';
                        }
                        break;
 
                case getCode('EXTENSION_PROBLEM'):
                        if (isGetRequestParameterSet('ext')) {
-                               $message = generateExtensionInactiveNotInstalledMessage(getRequestParameter('ext'));
+                               $message = '{%pipe,generateExtensionInactiveNotInstalledMessage=' . getRequestParameter('ext') . '%}';
                        } else {
                                $message = '{--EXTENSION_PROBLEM_UNSET_EXT--}';
                        }

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index 21db407cb6e17c5e048ecb4999830992002255e7..5bf3cdbb9195c9dc7b69a9c2459df3757ba37dec 100644 (file)
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -293,7 +293,7 @@ function doRegistration () {
        if (isExtensionInstalledAndNewer('theme', '0.0.8')) {
                // Okay, add design here
                $GLOBALS['register_sql_columns'] .= ', `curr_theme`';
-               $GLOBALS['register_sql_data']    .= ", '" . getCurrentTheme() . "'";
+               $GLOBALS['register_sql_data']    .= ", '{%pipe,getCurrentTheme%}'";
        } // END - if
 
        // Check if I shall disable sending mail to newly registered members out about active/begging rallye

diff --git a/inc/modules/admin/action-task.php b/inc/modules/admin/action-task.php
index 1716b20c47d552fdaa1e7c13bb862eeddf527655..710d2ad8609c6a3e57c6bbd04c77968ec437e94e 100644 (file)
--- a/inc/modules/admin/action-task.php
+++ b/inc/modules/admin/action-task.php
@@ -43,11 +43,6 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addYouAreHereLink('admin', __FILE__);
 
-if (!isExtensionActive('task')) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('task'));
-       return;
-} // END - if
-
 // Load the include file
 $inc = sprintf("inc/modules/admin/what-%s.php", getWhat());
 if (isIncludeReadable($inc)) {

diff --git a/inc/modules/admin/what-config_other.php b/inc/modules/admin/what-config_other.php
index 4f79de60ffb8e395baa07c4daf432985f9dc99f1..c1a24294b8542358f421f6605eaa90a5fe16a82f 100644 (file)
--- a/inc/modules/admin/what-config_other.php
+++ b/inc/modules/admin/what-config_other.php
@@ -43,12 +43,6 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addYouAreHereLink('admin', __FILE__);
 
-if (!isExtensionActive('other')) {
-       // Missing extension!
-       displayMessage(generateExtensionInactiveNotInstalledMessage('other'));
-       return;
-} // END - if
-
 // Stop saving data if one input field is !isset
 if (isFormSent()) {
        // Calculate stamps and set calculated stamps

diff --git a/inc/modules/admin/what-config_yoomedia.php b/inc/modules/admin/what-config_yoomedia.php
index f911b3d184b64b4cade7c0ef861bb82e2be0716b..831b21ae5d35dc353465c4b2d2cf1b50e626f9c1 100644 (file)
--- a/inc/modules/admin/what-config_yoomedia.php
+++ b/inc/modules/admin/what-config_yoomedia.php
@@ -43,11 +43,6 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addYouAreHereLink('admin', __FILE__);
 
-if (!isExtensionActive('yoomedia')) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('yoomedia'));
-       return;
-} // END - if
-
 // Was the form submitted?
 if (isFormSent()) {
        // Test Yoo!Media config

diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php
index cad194c34a911739a9afcfd684b80ab720fb268c..459ea16c3bb665db23eccef1eea5cacb46a0e7a8 100644 (file)
--- a/inc/modules/admin/what-list_beg.php
+++ b/inc/modules/admin/what-list_beg.php
@@ -122,7 +122,7 @@ ORDER BY
                if (isExtensionActive('autopurge')) {
                        $content['autopurge_timeout'] = generateDateTime(time() - getApInactiveSince(), 2);
                } else {
-                       $content['autopurge_timeout'] = displayMessage(generateExtensionInactiveNotInstalledMessage('autopurge'), true);
+                       $content['autopurge_timeout'] = displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=autopurge%}', true);
                }
 
                // Load final template

diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index da8b9ba4f87bbaf233cf97a75762c2d60ae3eb1c..eb221735788497a5f6da867b016dc99c17a120ad 100644 (file)
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -134,7 +134,7 @@ ORDER BY
                if (isExtensionActive('autopurge')) {
                        $content['autopurge_timeout'] = '{%message,ADMIN_BONUS_TIMEOUT=' . generateDateTime(time() - getApInactiveSince(), 2) . '%}';
                } else {
-                       $content['autopurge_timeout'] = generateExtensionInactiveNotInstalledMessage('autopurge');
+                       $content['autopurge_timeout'] = '{%pipe,generateExtensionInactiveNotInstalledMessage=autopurge%}';
                }
 
                // Load final template

diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php
index 13f3f973af7e6c4ddd5e7e42086d3adbb656be83..c337642ab1d8b4734e2e784864ecdc5413725767 100644 (file)
--- a/inc/modules/admin/what-list_links.php
+++ b/inc/modules/admin/what-list_links.php
@@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 if (!isExtensionActive('mailid')) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('mailid'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=mailid%}');
        return;
 } // END - if
 

diff --git a/inc/modules/admin/what-list_notifications.php b/inc/modules/admin/what-list_notifications.php
index 73ef864cd12e5a39df68ebfaf40ed832b770a9f9..62f575b9e6c60bb1836f58c8e236035a6da501f6 100644 (file)
--- a/inc/modules/admin/what-list_notifications.php
+++ b/inc/modules/admin/what-list_notifications.php
@@ -67,7 +67,7 @@ ORDER BY
        $result_max = SQL_QUERY($SQL2, __FILE__, __LINE__);
 } else {
        // Bonus extension required!
-       displayMessage(generateExtensionInactiveNotInstalledMessage('bonus'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=bonus%}');
 }
 
 // Create limitation line

diff --git a/inc/modules/admin/what-list_task.php b/inc/modules/admin/what-list_task.php
index c2194ec323b13bd00d0b2fd5bd92985140edda48..b2c97da3607e55794f2fdc54913f089427c38020 100644 (file)
--- a/inc/modules/admin/what-list_task.php
+++ b/inc/modules/admin/what-list_task.php
@@ -43,13 +43,10 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addYouAreHereLink('admin', __FILE__);
 
-if (!isExtensionActive('task')) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('task'));
-       return;
-} // END - if
-
 $whereStatement = '';
-if (!isGetRequestParameterSet('type')) setGetRequestParameter('type', 'your');
+if (!isGetRequestParameterSet('type')) {
+       setGetRequestParameter('type', 'your');
+} // END - if
 
 switch (getRequestParameter('type')) {
        case 'your': // List only your own open (new) tasks

diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index 5add439d216a3b14b34a89f42ee5faad3cac5b00..bd1b932e2b19353b384eab79bd5a7f19bdc41fc8 100644 (file)
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 if (!isExtensionActive('mailid')) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('mailid'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=mailid%}');
        return;
 } // END - if
 

diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index 36fc44e79c3fc8ec2752e6d4a94a273c28c22516..1ba71b686eea342f1604daf78687f0d08ca6427e 100644 (file)
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -43,12 +43,6 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addYouAreHereLink('admin', __FILE__);
 
-if ((!isExtensionInstalled('user')) || (!isExtensionActive('user'))) {
-       // Missing extension!
-       displayMessage(generateExtensionInactiveNotInstalledMessage('user'));
-       return;
-} // END - if
-
 // Init variables
 $MORE = '';
 $colspan = 4;

diff --git a/inc/modules/admin/what-list_yoomedia_tm.php b/inc/modules/admin/what-list_yoomedia_tm.php
index 64e47cab93c626a22c68dae39618856cbbba346e..5f4b295e5d41378ec9cf3d1ec3b673d644858cc9 100644 (file)
--- a/inc/modules/admin/what-list_yoomedia_tm.php
+++ b/inc/modules/admin/what-list_yoomedia_tm.php
@@ -42,13 +42,10 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addYouAreHereLink('admin', __FILE__);
 
-if (!isExtensionActive('yoomedia')) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('yoomedia'));
+if (!isExtensionActive('bonus')) {
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=bonus%}');
        return;
-} elseif (!isExtensionActive('bonus')) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('bonus'));
-       return;
-}
+} // END - if
 
 // Do actions here
 if (isFormSent()) {

diff --git a/inc/modules/admin/what-send_bonus.php b/inc/modules/admin/what-send_bonus.php
index 20514fd4ac11b58f13b240f5b52faf9c6d456a08..2f083fdf1055d1d93fa7e1b8a62092b979062aa6 100644 (file)
--- a/inc/modules/admin/what-send_bonus.php
+++ b/inc/modules/admin/what-send_bonus.php
@@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 if (!isExtensionActive('order')) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('order'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=order%}');
        return;
 } // END - if
 

diff --git a/inc/modules/admin/what-theme_edit.php b/inc/modules/admin/what-theme_edit.php
index c90166a3c53a4dfbb276cb49f5c8805fb6b6a3f1..6f761b24508b325eab946bb2e23fdd358d4d6c76 100644 (file)
--- a/inc/modules/admin/what-theme_edit.php
+++ b/inc/modules/admin/what-theme_edit.php
@@ -43,11 +43,6 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addYouAreHereLink('admin', __FILE__);
 
-if (!isExtensionActive('theme')) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('theme'));
-       return;
-} // END - if
-
 // Check for selected themes
 if (ifPostContainsSelections()) {
        $OUT = '';
@@ -124,7 +119,9 @@ if (!SQL_HASZERONUMS($result)) {
 
                // Is the loaded theme name != current theme name?
                $content['link'] = $content['theme_path'];
-               if ($content['theme_path'] != getCurrentTheme()) $content['link'] = '<a href="{%url=modules.php?module=admin&amp;what=theme_edit&amp;default_theme=' . $content['theme_path'] . '%}" title="{--ADMIN_SET_AS_NEW_THEME--}">' . $content['theme_path'] . '</a>';
+               if ($content['theme_path'] != getCurrentTheme()) {
+                       $content['link'] = '<a href="{%url=modules.php?module=admin&amp;what=theme_edit&amp;default_theme=' . $content['theme_path'] . '%}" title="{--ADMIN_SET_AS_NEW_THEME--}">' . $content['theme_path'] . '</a>';
+               } // END - if
 
                // Prepare data for the row template
                $content['email'] = '<a href="mailto:' . $GLOBALS['theme_data']['email'] . '?Subject=[Theme:] ' . $GLOBALS['theme_data']['name'] . ' (' . $content['theme_path'] . ')\>' . $GLOBALS['theme_data']['author'] . '</a>';

diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php
index 2208230b635056f8d12630c6786ab239afa99211..c3665f9881913dd9487e66fb3db205dca33b5389 100644 (file)
--- a/inc/modules/admin/what-theme_import.php
+++ b/inc/modules/admin/what-theme_import.php
@@ -43,11 +43,6 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addYouAreHereLink('admin', __FILE__);
 
-if (!isExtensionActive('theme')) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('theme'));
-       return;
-} // END - if
-
 // Switch to testing mode
 $GLOBALS['theme_mode'] = 'test';
 
@@ -91,7 +86,7 @@ VALUES ('%s','N','%s','%s')",
 } // END - if
 
 // Initialize array
-$THEMES = array(
+$themes = array(
        'theme_unix'    => array(), // Unix name from filesystem
        'theme_name'    => array(), // Title
        'theme_author'  => array(), // Theme author's name
@@ -112,20 +107,20 @@ foreach ($includes as $inc) {
        loadInclude($inc);
 
        // Add found theme to array
-       $THEMES['theme_unix'][]   = $dir;
-       $THEMES['theme_name'][]   = $GLOBALS['theme_data']['name'];
-       $THEMES['theme_author'][] = $GLOBALS['theme_data']['author'];
-       $THEMES['theme_email'][]  = $GLOBALS['theme_data']['email'];
-       $THEMES['theme_url'][]    = $GLOBALS['theme_data']['url'];
-       $THEMES['theme_version'][]    = $GLOBALS['theme_data']['version'];
+       $themes['theme_unix'][]   = $dir;
+       $themes['theme_name'][]   = $GLOBALS['theme_data']['name'];
+       $themes['theme_author'][] = $GLOBALS['theme_data']['author'];
+       $themes['theme_email'][]  = $GLOBALS['theme_data']['email'];
+       $themes['theme_url'][]    = $GLOBALS['theme_data']['url'];
+       $themes['theme_version'][]    = $GLOBALS['theme_data']['version'];
 } // END - while
 
 // Sort array by Uni* name
-array_pk_sort($THEMES, array('theme_name'));
+array_pk_sort($themes, array('theme_name'));
 
 // Generate output lines for the template
 $OUT = '';
-foreach ($THEMES['theme_unix'] as $key => $unix) {
+foreach ($themes['theme_unix'] as $key => $unix) {
        // Already installed is default
        $formContent = '<div class="notice">{%message,ADMIN_THEME_ALREADY_INSTALLED=' . $unix . '%}</div>';
 
@@ -138,11 +133,11 @@ foreach ($THEMES['theme_unix'] as $key => $unix) {
        // Prepare content
        $content = array(
                'unix'          => $unix,
-               'theme_name'    => $THEMES['theme_name'][$key],
-               'theme_email'   => $THEMES['theme_email'][$key],
-               'theme_author'  => $THEMES['theme_author'][$key],
-               'theme_url'     => $THEMES['theme_url'][$key],
-               'theme_version' => $THEMES['theme_version'][$key],
+               'theme_name'    => $themes['theme_name'][$key],
+               'theme_email'   => $themes['theme_email'][$key],
+               'theme_author'  => $themes['theme_author'][$key],
+               'theme_url'     => $themes['theme_url'][$key],
+               'theme_version' => $themes['theme_version'][$key],
                'form_content'  => $formContent
        );
 

diff --git a/inc/modules/guest/action- b/inc/modules/guest/action-
index 840262730f7c8e99bf997c477f09ef84c5eb5811..ff7b1c2f41b3dda174875f63368c9a89f9aa3e9c 100644 (file)
--- a/inc/modules/guest/action-
+++ b/inc/modules/guest/action-
@@ -47,7 +47,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('guest', __FILE__);
 
 if ((!isExtensionActive('')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage(''));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=%}');
        return;
 }
 

diff --git a/inc/modules/guest/action-themes.php b/inc/modules/guest/action-themes.php
index 4733e5f45a0b738f229cfae3d43315c56cb605c0..998d08471f2b6d857fbe6cd9b81e8a8fe0946eb1 100644 (file)
--- a/inc/modules/guest/action-themes.php
+++ b/inc/modules/guest/action-themes.php
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 }
 
 if ((!isExtensionActive('theme')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('theme'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=theme%}');
        return;
 } // END - if
 

diff --git a/inc/modules/guest/what-active.php b/inc/modules/guest/what-active.php
index a0075a13c91129ad9b06a0211032545fcb871dd9..d4e951dc20a3f60ba1b0b0c35b35539f338e16c3 100644 (file)
--- a/inc/modules/guest/what-active.php
+++ b/inc/modules/guest/what-active.php
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('guest', __FILE__);
 
 if ((!isExtensionActive('active')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('active'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=active%}');
        return;
 } // END - if
 

diff --git a/inc/modules/guest/what-beg.php b/inc/modules/guest/what-beg.php
index 06d0321683374b2d6b3cf0d453c991d6283350b3..4e4ee7333d16266ff2e76f133da956271b57b66a 100644 (file)
--- a/inc/modules/guest/what-beg.php
+++ b/inc/modules/guest/what-beg.php
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('guest', __FILE__);
 
 if ((!isExtensionActive('beg')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('beg'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=beg%}');
        return;
 } // END - if
 

diff --git a/inc/modules/guest/what-confirm.php b/inc/modules/guest/what-confirm.php
index 9437acbf4ca729f8263a45d318a72f66459f7e0d..7c45f008c239c3badc891e76f61afcf1405ddb99 100644 (file)
--- a/inc/modules/guest/what-confirm.php
+++ b/inc/modules/guest/what-confirm.php
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('guest', __FILE__);
 
 if ((!isExtensionActive('user')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('user'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=user%}');
        return;
 } // END - if
 

diff --git a/inc/modules/guest/what-doubler.php b/inc/modules/guest/what-doubler.php
index c185800cc8bbec2b95cbb3bee22285eeadc99ed6..7523568f4dfdb9a38372e1f069ed58a43ee6c7ce 100644 (file)
--- a/inc/modules/guest/what-doubler.php
+++ b/inc/modules/guest/what-doubler.php
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('guest', __FILE__);
 
 if ((!isExtensionActive('doubler')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('doubler'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=doubler%}');
        return;
 } // END - if
 

diff --git a/inc/modules/guest/what-login.php b/inc/modules/guest/what-login.php
index 8d4abf712de9f8b66d88e50875ae77b6b34d3644..3cad847ee16e55f3d1f926961c2b1536abae077b 100644 (file)
--- a/inc/modules/guest/what-login.php
+++ b/inc/modules/guest/what-login.php
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('guest', __FILE__);
 
 if ((!isExtensionActive('user')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('user'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=user%}');
        return;
 } // END - if
 

diff --git a/inc/modules/guest/what-mediadata.php b/inc/modules/guest/what-mediadata.php
index 577b030c75eb7404981794bd6b7f2561942033f7..be3ef309c4ea3742169e3f4520feb504205513e2 100644 (file)
--- a/inc/modules/guest/what-mediadata.php
+++ b/inc/modules/guest/what-mediadata.php
@@ -45,10 +45,10 @@ addYouAreHereLink('guest', __FILE__);
 
 // Both ext-mediadata and ext-user must be there
 if ((!isExtensionActive('mediadata')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('mediadata'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=mediadata%}');
        return;
 } elseif ((!isExtensionActive('user')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('user'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=user%}');
        return;
 }
 

diff --git a/inc/modules/guest/what-rallyes.php b/inc/modules/guest/what-rallyes.php
index 50760250e47f9844c966a5cf6dd79c289cbe8575..7a47b42e709c48876da8e2e050bda5602c7ff795 100644 (file)
--- a/inc/modules/guest/what-rallyes.php
+++ b/inc/modules/guest/what-rallyes.php
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('guest', __FILE__);
 
 if ((!isExtensionActive('rallye')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('rallye'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=rallye%}');
        return;
 } // END - if
 

diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index 6050874d19826384f1b9f646569a1ed2f6d9b740..5016b33538277b60463ec1050c2c8fcaaffae595 100644 (file)
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -44,10 +44,10 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('guest', __FILE__);
 
 if (!isExtensionActive('register')) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('register'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=register%}');
        return;
 } elseif (!isExtensionActive('country')) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('country'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=country%}');
        return;
 }
 

diff --git a/inc/modules/guest/what-sponsor_agb.php b/inc/modules/guest/what-sponsor_agb.php
index bea40fcc1ff3dd1b4c52d0c0414f2410985ee656..aca880d3dd89f9e3beaba80348ec7caf59978701 100644 (file)
--- a/inc/modules/guest/what-sponsor_agb.php
+++ b/inc/modules/guest/what-sponsor_agb.php
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('guest', __FILE__);
 
 if ((!isExtensionActive('sponsor'))) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('sponsor'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=sponsor%}');
        return;
 } // END - if
 

diff --git a/inc/modules/guest/what-sponsor_infos.php b/inc/modules/guest/what-sponsor_infos.php
index 089f83de149e211f8be476e27676499691b84141..cb394bdd9f6ce0211843a4960571f9a358cad5f1 100644 (file)
--- a/inc/modules/guest/what-sponsor_infos.php
+++ b/inc/modules/guest/what-sponsor_infos.php
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('guest', __FILE__);
 
 if ((!isExtensionActive('sponsor'))) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('sponsor'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=sponsor%}');
        return;
 } // END - if
 

diff --git a/inc/modules/guest/what-sponsor_login.php b/inc/modules/guest/what-sponsor_login.php
index 1f09c0a3e7ec6961efc147ddf94b176f5bd3a8ca..f81b710249851f5cfe58ecfc147d7d83d06fbbc6 100644 (file)
--- a/inc/modules/guest/what-sponsor_login.php
+++ b/inc/modules/guest/what-sponsor_login.php
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('guest', __FILE__);
 
 if ((!isExtensionActive('sponsor'))) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('sponsor'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=sponsor%}');
        return;
 } elseif (isSponsor()) {
        // Is already a logged-in sponsor

diff --git a/inc/modules/guest/what-sponsor_reg.php b/inc/modules/guest/what-sponsor_reg.php
index 9dd8629eb339a35435bfdea5f4c7b51173254b96..5242b160232c7aede23cb48017dfcb665e252c12 100644 (file)
--- a/inc/modules/guest/what-sponsor_reg.php
+++ b/inc/modules/guest/what-sponsor_reg.php
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('guest', __FILE__);
 
 if ((!isExtensionActive('sponsor'))) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('sponsor'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=sponsor%}');
        return;
 } // END - if
 

diff --git a/inc/modules/guest/what-stats.php b/inc/modules/guest/what-stats.php
index ca20611192b8a1b766402a26b5d71c8bef11a9b9..77e54c93bd99e70af0afbd463c7762774ea1ffe4 100644 (file)
--- a/inc/modules/guest/what-stats.php
+++ b/inc/modules/guest/what-stats.php
@@ -45,7 +45,7 @@ addYouAreHereLink('guest', __FILE__);
 
 // This part only works if ext-user is active
 if ((!isExtensionActive('user')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('user'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=user%}');
        return;
 } // END - if
 

diff --git a/inc/modules/guest/what-top10.php b/inc/modules/guest/what-top10.php
index 863ff62ae634deac247f72891de65ee8c46852e2..3435584416cb034ffd0e9f2f56b96633d49e745a 100644 (file)
--- a/inc/modules/guest/what-top10.php
+++ b/inc/modules/guest/what-top10.php
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('guest', __FILE__);
 
 if ((!isExtensionActive('top10')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('top10'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=top10%}');
        return;
 } // END - if
 
@@ -122,6 +122,7 @@ LIMIT {?top10_max?}", __FILE__, __LINE__);
 $OUT = ''; $count = 1;
 while ($content = SQL_FETCHARRAY($result)) {
        // Prepare data for template
+       $content['cnt']         = $count;
        $content['last_online'] = generateDateTime($content['last_online'], '3');
 
        // Load row template

diff --git a/inc/modules/guest/what-wernis_portal.php b/inc/modules/guest/what-wernis_portal.php
index 813425e464cb487b5196ba1d265b436d01e01ca4..dd8fe7e88f64e7c7326309518a7eb726a215b108 100644 (file)
--- a/inc/modules/guest/what-wernis_portal.php
+++ b/inc/modules/guest/what-wernis_portal.php
@@ -47,7 +47,7 @@ loadIncludeOnce('inc/classes/rdf.class.php');
 addYouAreHereLink('guest', __FILE__);
 
 if ((!isExtensionActive('wernis')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('wernis'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=wernis%}');
        return;
 } // END - if
 

diff --git a/inc/modules/member/action- b/inc/modules/member/action-
index e528dfc9851a75f9ca62b5b9345034dff635af3e..eaab958c970673fe93d0d749983b1e44b0a172df 100644 (file)
--- a/inc/modules/member/action-
+++ b/inc/modules/member/action-
@@ -49,7 +49,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage(''));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=%}');
        return;
 } // END - if
 

diff --git a/inc/modules/member/action-bank.php b/inc/modules/member/action-bank.php
index 542012af60b1c40885a158873ffcfc972856572f..27b02f256c42dcf8efbb97408de4162581989271 100644 (file)
--- a/inc/modules/member/action-bank.php
+++ b/inc/modules/member/action-bank.php
@@ -49,7 +49,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('bank')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('bank'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=bank%}');
        return;
 } // END - if
 

diff --git a/inc/modules/member/action-coupon.php b/inc/modules/member/action-coupon.php
index 20ea631c0a6ba2c8b7d1b14e8c8a1f73f9b20644..7edf01ff4da54ff597bb3fdf8178b3e4f547a064 100644 (file)
--- a/inc/modules/member/action-coupon.php
+++ b/inc/modules/member/action-coupon.php
@@ -49,7 +49,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('coupon')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('coupon'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=coupon%}');
        return;
 } // END - if
 

diff --git a/inc/modules/member/action-order.php b/inc/modules/member/action-order.php
index 16654635f630f7190ffd05a1158c6627902ff4db..f50a87f8f4fbae8841be21df50bfa1325d114859 100644 (file)
--- a/inc/modules/member/action-order.php
+++ b/inc/modules/member/action-order.php
@@ -49,7 +49,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('order')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('order'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=order%}');
        return;
 } // END - if
 

diff --git a/inc/modules/member/action-surfbar.php b/inc/modules/member/action-surfbar.php
index dcaeb514928bcc43e2d6fa40e749d7df2379fc89..0b5743fa443c918c9c5bce712032f407d491835d 100644 (file)
--- a/inc/modules/member/action-surfbar.php
+++ b/inc/modules/member/action-surfbar.php
@@ -49,7 +49,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('surfbar')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('surfbar'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=surfbar%}');
        return;
 } // END - if
 

diff --git a/inc/modules/member/action-themes.php b/inc/modules/member/action-themes.php
index 9a725b16723a09ebe52192be98819e7e6306965f..7313a94653ccee39c5dbce2542252670171512b5 100644 (file)
--- a/inc/modules/member/action-themes.php
+++ b/inc/modules/member/action-themes.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 }
 
 if ((!isExtensionActive('theme')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('theme'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=theme%}');
        return;
 } // END - if
 

diff --git a/inc/modules/member/what- b/inc/modules/member/what-
index 71eb76f2296f20428809383e96a8211d9cacfe48..cb2169a6b07fc540c2d74cf8e29da8866f46cf20 100644 (file)
--- a/inc/modules/member/what-
+++ b/inc/modules/member/what-
@@ -47,7 +47,7 @@ addYouAreHereLink('member', __FILE__);
 
 // Continue only if the proper extension is active (admins can always continue)
 if ((!isExtensionActive('')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage(''));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=%}');
        return;
 } // END - if
 

diff --git a/inc/modules/member/what-bank_create.php b/inc/modules/member/what-bank_create.php
index a15af144d58d71927f69a2c0df989be4729a4c57..bf00bd096d8d993189b9120042fe0adbf5be096a 100644 (file)
--- a/inc/modules/member/what-bank_create.php
+++ b/inc/modules/member/what-bank_create.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('bank')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('bank'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=bank%}');
        return;
 } // END - if
 

diff --git a/inc/modules/member/what-bank_deposit.php b/inc/modules/member/what-bank_deposit.php
index d78bd5454a8eff7b32bd80882773e1d6470a3870..cf9497ed3c57eb66c92b29d285cb43e7fc022721 100644 (file)
--- a/inc/modules/member/what-bank_deposit.php
+++ b/inc/modules/member/what-bank_deposit.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('bank')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('bank'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=bank%}');
        return;
 } // END - if
 

diff --git a/inc/modules/member/what-bank_infos.php b/inc/modules/member/what-bank_infos.php
index 5c019a242ba8c5c7c45b5ff6ffdec6467fb88aba..7a1bb0060e266216c2e7b15ad333854b809a7fee 100644 (file)
--- a/inc/modules/member/what-bank_infos.php
+++ b/inc/modules/member/what-bank_infos.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('bank')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('bank'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=bank%}');
        return;
 }
 

diff --git a/inc/modules/member/what-bank_output.php b/inc/modules/member/what-bank_output.php
index a15af144d58d71927f69a2c0df989be4729a4c57..bf00bd096d8d993189b9120042fe0adbf5be096a 100644 (file)
--- a/inc/modules/member/what-bank_output.php
+++ b/inc/modules/member/what-bank_output.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('bank')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('bank'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=bank%}');
        return;
 } // END - if
 

diff --git a/inc/modules/member/what-bank_withdraw.php b/inc/modules/member/what-bank_withdraw.php
index 5c019a242ba8c5c7c45b5ff6ffdec6467fb88aba..7a1bb0060e266216c2e7b15ad333854b809a7fee 100644 (file)
--- a/inc/modules/member/what-bank_withdraw.php
+++ b/inc/modules/member/what-bank_withdraw.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('bank')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('bank'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=bank%}');
        return;
 }
 

diff --git a/inc/modules/member/what-beg.php b/inc/modules/member/what-beg.php
index 9afb697d6f63f13a148edc687dd51421fdaa1113..0bc948f7ec562c32175ad99eb7e7af01df4e561f 100644 (file)
--- a/inc/modules/member/what-beg.php
+++ b/inc/modules/member/what-beg.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('beg')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('beg'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=beg%}');
        return;
 } // END - if
 

diff --git a/inc/modules/member/what-beg2.php b/inc/modules/member/what-beg2.php
index 78285c2ca14ab22e2d9d034b7e14bff337216c6c..d41f5964f5522c2995e90bd115df86e3c98a3e4f 100644 (file)
--- a/inc/modules/member/what-beg2.php
+++ b/inc/modules/member/what-beg2.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('beg')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('beg'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=beg%}');
        return;
 } // END - if
 

diff --git a/inc/modules/member/what-bonus.php b/inc/modules/member/what-bonus.php
index 0850e128535bb79f7623b3115785a139ca815e92..21c07396ff0fbf373fc7ad7fe2dd828463f8d3c8 100644 (file)
--- a/inc/modules/member/what-bonus.php
+++ b/inc/modules/member/what-bonus.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('bonus')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('bonus'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=bonus%}');
        return;
 } // END - if
 

diff --git a/inc/modules/member/what-booking.php b/inc/modules/member/what-booking.php
index 210450fbfd45f1980ceb2c47c5f247b00f42bd46..0b28f4d24b8bbbceee7b8acd3feea99ae62991b5 100644 (file)
--- a/inc/modules/member/what-booking.php
+++ b/inc/modules/member/what-booking.php
@@ -47,7 +47,7 @@ addYouAreHereLink('member', __FILE__);
 
 // Continue only if the proper extension is active (admins can always continue)
 if ((!isExtensionActive('booking')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('booking'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=booking%}');
        return;
 } // END - if
 

diff --git a/inc/modules/member/what-cash_coupon.php b/inc/modules/member/what-cash_coupon.php
index ebc427f4f717ba62fd486ec3f43e913357a94df4..3e538b9aa21049411afda73987580e8fcad47e58 100644 (file)
--- a/inc/modules/member/what-cash_coupon.php
+++ b/inc/modules/member/what-cash_coupon.php
@@ -47,7 +47,7 @@ addYouAreHereLink('member', __FILE__);
 
 // Continue only if the proper extension is active (admins can always continue)
 if ((!isExtensionActive('coupon')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('coupon'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=coupon%}');
        return;
 } // END - if
 

diff --git a/inc/modules/member/what-doubler.php b/inc/modules/member/what-doubler.php
index 45f5512c683f3f809f360b1e9666b389037b3952..44e0a9eee9ff4cf6e3b7c4719b850021d75c4470 100644 (file)
--- a/inc/modules/member/what-doubler.php
+++ b/inc/modules/member/what-doubler.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('doubler')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('doubler'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=doubler%}');
        return;
 } // END - if
 

diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php
index 2583ca37a076e2b4d593864581626f1ae536462c..c5d648bd9ae0bf04a27332de185f8c452a9f2671 100644 (file)
--- a/inc/modules/member/what-holiday.php
+++ b/inc/modules/member/what-holiday.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('holiday')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('holiday'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=holiday%}');
        return;
 } // END - if
 

diff --git a/inc/modules/member/what-html_mail.php b/inc/modules/member/what-html_mail.php
index c00badbd45d26989eb9c9fb3f41f08fbb77f409b..aec4b2c5f91c8bd5a1d8cb24941df177ca9de9bf 100644 (file)
--- a/inc/modules/member/what-html_mail.php
+++ b/inc/modules/member/what-html_mail.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('html_mail')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('html_mail'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=html_mail%}');
        return;
 } // END - if
 

diff --git a/inc/modules/member/what-list_coupon.php b/inc/modules/member/what-list_coupon.php
index cbba7c7f34ed4129366b5215fbb4382f37170583..57563750dcda86621044f13d5d2148f6bf197a58 100644 (file)
--- a/inc/modules/member/what-list_coupon.php
+++ b/inc/modules/member/what-list_coupon.php
@@ -47,7 +47,7 @@ addYouAreHereLink('member', __FILE__);
 
 // Continue only if the proper extension is active (admins can always continue)
 if ((!isExtensionActive('coupon')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('coupon'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=coupon%}');
        return;
 } // END - if
 

diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php
index 4e958f7ac0b43ecf3aa8e831bc22b7ac2b318e8e..39b6d3f0a9c2359062efed44934c0fd4b2630bbb 100644 (file)
--- a/inc/modules/member/what-mydata.php
+++ b/inc/modules/member/what-mydata.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('mydata')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('mydata'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=mydata%}');
        return;
 } // END - if
 

diff --git a/inc/modules/member/what-nickname.php b/inc/modules/member/what-nickname.php
index 96df72550de1d131110fe80980629711184ddf1d..f3b14852697918508469f2f206da05216ac90272 100644 (file)
--- a/inc/modules/member/what-nickname.php
+++ b/inc/modules/member/what-nickname.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('nickname')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('nickname'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=nickname%}');
        return;
 } // END - if
 

diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index f6ed2dd996745f4599c16b3f2d8bb1f553473885..bcaece4fecc09f2df6636ab1a4072ff16e067014 100644 (file)
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('order')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('order'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=order%}');
        return;
 } // END - if
 

diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php
index 280912e15a8eb94c0396d4c85650c929f8b3d1be..1a3811e04e69330c429822489c55a930d9b9fac2 100644 (file)
--- a/inc/modules/member/what-payout.php
+++ b/inc/modules/member/what-payout.php
@@ -48,7 +48,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('payout')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('payout'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=payout%}');
        return;
 } // END - if
 

diff --git a/inc/modules/member/what-points.php b/inc/modules/member/what-points.php
index a9e39378d6ee07e4041075e2da3b6cc7c6b33b0a..3362d432df591839f204f74c07f2f16fdc0f1af1 100644 (file)
--- a/inc/modules/member/what-points.php
+++ b/inc/modules/member/what-points.php
@@ -167,7 +167,7 @@ if (isExtensionActive('user')) {
        loadTemplate('member_points', false, $content);
 } elseif (isAdmin()) {
        // Missing extension
-       displayMessage(generateExtensionInactiveNotInstalledMessage('user'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=user%}');
 } else {
        // Message for user
        displayMessage('{--PROBLEM_POINTS_OVERVIEW_UNAVAILABLE--}');

diff --git a/inc/modules/member/what-primera.php b/inc/modules/member/what-primera.php
index ca079da54a697f94c6c3e410bea66607804125c8..684bd1e2c39efdde01642193e73707f3b9205cf8 100644 (file)
--- a/inc/modules/member/what-primera.php
+++ b/inc/modules/member/what-primera.php
@@ -48,7 +48,7 @@ addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('primera')) && (!isAdmin())) {
        // Extension 'primera' is not activated
-       displayMessage(generateExtensionInactiveNotInstalledMessage('primera'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=primera%}');
        return;
 } // END - if
 

diff --git a/inc/modules/member/what-rallyes.php b/inc/modules/member/what-rallyes.php
index 40591fb49c54d48bdc05abee7229170aa6510c4e..88bf9bb768741c0588e1ee606743dd8b015e2773 100644 (file)
--- a/inc/modules/member/what-rallyes.php
+++ b/inc/modules/member/what-rallyes.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('rallye')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('rallye'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=rallye%}');
        return;
 } // END - if
 

diff --git a/inc/modules/member/what-refback.php b/inc/modules/member/what-refback.php
index ee2afa4f87228253a551b46bbe01b3e4d2892e5c..1e431f4fb9701400fa27da93d53d827837f53705 100644 (file)
--- a/inc/modules/member/what-refback.php
+++ b/inc/modules/member/what-refback.php
@@ -53,7 +53,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('refback')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('refback'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=refback%}');
        return;
 } // END - if
 

diff --git a/inc/modules/member/what-sponsor_list.php b/inc/modules/member/what-sponsor_list.php
index 067735061678477010712de91589c0a5fe8c2fa6..1a2cd463a781a20503a422b924f25310b586cae4 100644 (file)
--- a/inc/modules/member/what-sponsor_list.php
+++ b/inc/modules/member/what-sponsor_list.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('sponsor')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('sponsor'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=sponsor%}');
        return;
 } // END - if
 

diff --git a/inc/modules/member/what-support.php b/inc/modules/member/what-support.php
index 31642af3c4595c0eb8ff43cac8bf2754042ffaec..a7066b1426b0e5b6882c43172aa089014d3432ab 100644 (file)
--- a/inc/modules/member/what-support.php
+++ b/inc/modules/member/what-support.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('support')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('support'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=support%}');
        return;
 } // END - if
 

diff --git a/inc/modules/member/what-surfbar_book.php b/inc/modules/member/what-surfbar_book.php
index f7dd0aa4656eaffd0771edb9215a7d752e0265d1..e428c713c5c4a5907e1e4faaf009344284dea181 100644 (file)
--- a/inc/modules/member/what-surfbar_book.php
+++ b/inc/modules/member/what-surfbar_book.php
@@ -47,7 +47,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('surfbar')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('surfbar'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=surfbar%}');
        return;
 } // END - if
 

diff --git a/inc/modules/member/what-surfbar_list.php b/inc/modules/member/what-surfbar_list.php
index 46474d66561e06a1e99a64312a29340b7da5870b..6d17f2560fa7c79d28a62c61e23d2ff53eaa6170 100644 (file)
--- a/inc/modules/member/what-surfbar_list.php
+++ b/inc/modules/member/what-surfbar_list.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('surfbar')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('surfbar'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=surfbar%}');
        return;
 } // END - if
 

diff --git a/inc/modules/member/what-surfbar_start.php b/inc/modules/member/what-surfbar_start.php
index c721627d3c83c17799add27acf784c1925c1bb75..bf720d7badefb9b699d852abde07724b9cb57056 100644 (file)
--- a/inc/modules/member/what-surfbar_start.php
+++ b/inc/modules/member/what-surfbar_start.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('surfbar')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('surfbar'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=surfbar%}');
        return;
 } // END - if
 

diff --git a/inc/modules/member/what-surfbar_stats.php b/inc/modules/member/what-surfbar_stats.php
index b4eebd6769650641eb5fd2980b8b88af276f53d3..76170db60ccd3557ab8b4017684d19957f8424b7 100644 (file)
--- a/inc/modules/member/what-surfbar_stats.php
+++ b/inc/modules/member/what-surfbar_stats.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('surfbar')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('surfbar'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=surfbar%}');
        return;
 } // END - if
 

diff --git a/inc/modules/member/what-themes.php b/inc/modules/member/what-themes.php
index 20d74a441e1e3ef05242ecbcfe584c701fd3a123..0dad311230328796dea510234312c48e9ba4df68 100644 (file)
--- a/inc/modules/member/what-themes.php
+++ b/inc/modules/member/what-themes.php
@@ -46,14 +46,17 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('theme')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('theme'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=theme%}');
        return;
 } // END - if
 
 if (isPostRequestParameterSet('member_theme')) {
        // Save theme to member's profile
        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `curr_theme`='%s' WHERE `userid`=%s LIMIT 1",
-               array(postRequestParameter('member_theme'), getMemberId()), __FILE__, __LINE__);
+               array(
+                       postRequestParameter('member_theme'),
+                       getMemberId()
+               ), __FILE__, __LINE__);
 
        // Set new theme for guests
        $newTheme = SQL_ESCAPE(postRequestParameter('member_theme'));
@@ -66,7 +69,7 @@ if (isPostRequestParameterSet('member_theme')) {
 } // END - if
 
 // Initialize array
-$THEMES = array(
+$themes = array(
        'theme_unix'    => array(), // Unix name from filesystem
        'theme_name'    => array(), // Title
        'theme_author'  => array(), // Theme author's name
@@ -89,12 +92,12 @@ foreach ($includes as $inc) {
                loadInclude($inc);
 
                // Add found theme to array
-               $THEMES['theme_unix'][]    = $dir;
-               $THEMES['theme_name'][]    = $GLOBALS['theme_data']['name'];
-               $THEMES['theme_author'][]  = $GLOBALS['theme_data']['author'];
-               $THEMES['theme_email'][]   = $GLOBALS['theme_data']['email'];
-               $THEMES['theme_url'][]     = $GLOBALS['theme_data']['url'];
-               $THEMES['theme_version'][] = $GLOBALS['theme_data']['version'];
+               $themes['theme_unix'][]    = $dir;
+               $themes['theme_name'][]    = $GLOBALS['theme_data']['name'];
+               $themes['theme_author'][]  = $GLOBALS['theme_data']['author'];
+               $themes['theme_email'][]   = $GLOBALS['theme_data']['email'];
+               $themes['theme_url'][]     = $GLOBALS['theme_data']['url'];
+               $themes['theme_version'][] = $GLOBALS['theme_data']['version'];
        } // END - if
 } // END - while
 
@@ -102,11 +105,11 @@ foreach ($includes as $inc) {
 unset($GLOBALS['theme_data']);
 
 // Sort array by Uni* name
-array_pk_sort($THEMES, array('theme_name'));
+array_pk_sort($themes, array('theme_name'));
 
 // Generate output lines for the template
 $OUT = '';
-foreach ($THEMES['theme_unix'] as $key => $unix) {
+foreach ($themes['theme_unix'] as $key => $unix) {
        $default = '';
        if (getCurrentTheme() == $unix) {
                $default = ' checked="checked"';
@@ -116,11 +119,11 @@ foreach ($THEMES['theme_unix'] as $key => $unix) {
        $content = array(
                'unix'          => $unix,
                'default'       => $default,
-               'theme_name'    => $THEMES['theme_name'][$key],
-               'theme_email'   => $THEMES['theme_email'][$key],
-               'theme_author'  => $THEMES['theme_author'][$key],
-               'theme_url'     => $THEMES['theme_url'][$key],
-               'theme_version' => $THEMES['theme_version'][$key]
+               'theme_name'    => $themes['theme_name'][$key],
+               'theme_email'   => $themes['theme_email'][$key],
+               'theme_author'  => $themes['theme_author'][$key],
+               'theme_url'     => $themes['theme_url'][$key],
+               'theme_version' => $themes['theme_version'][$key]
        );
 
        // Load row template

diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index 03231df4cc2ede074fd42e355fc906c25cdd04fc..45c272e081cb6cf20f893333bf68890c0d160e2d 100644 (file)
--- a/inc/modules/member/what-transfer.php
+++ b/inc/modules/member/what-transfer.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('transfer')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('transfer'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=transfer%}');
        return;
 } // END - if
 

diff --git a/inc/modules/member/what-wernis.php b/inc/modules/member/what-wernis.php
index af105f761c8a6ac67032135830e3d1accef5585c..9ea20c21125464fe732be47a2708c9b3c04e0d61 100644 (file)
--- a/inc/modules/member/what-wernis.php
+++ b/inc/modules/member/what-wernis.php
@@ -47,7 +47,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('wernis')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('wernis'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=wernis%}');
        return;
 } // END - if
 

diff --git a/inc/modules/order.php b/inc/modules/order.php
index e47f21b2c784a0e40c0a4ed9d6f15cc7d1f8862f..c491d0798318e46419fc67bebf4fd6e9ad05b8a0 100644 (file)
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -40,7 +40,7 @@ $url = '';
 if (!defined('__SECURITY')) {
        die();
 } elseif ((!isExtensionActive('order')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('order'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=order%}');
        return;
 } elseif (!isMember()) {
        // Sorry, no guest access!

diff --git a/inc/modules/sponsor.php b/inc/modules/sponsor.php
index ce813aa415395eb7b354d94d9e7d6f08c33eb9d4..2ccd61cfdb17bb52a06952b479c2e670c8382d40 100644 (file)
--- a/inc/modules/sponsor.php
+++ b/inc/modules/sponsor.php
@@ -38,7 +38,7 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif ((!isExtensionActive('sponsor'))) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('sponsor'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=sponsor%}');
        return;
 } elseif (!isSponsor()) {
        // No sponsor!

diff --git a/inc/modules/sponsor/.php b/inc/modules/sponsor/.php
index 03310a253ad4ade8659a43610bc5d28f1eb4b0d7..d1b27bc96e73cf7b1e9530188729becf5f10feb7 100644 (file)
--- a/inc/modules/sponsor/.php
+++ b/inc/modules/sponsor/.php
@@ -38,7 +38,7 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif ((!isExtensionActive('sponsor'))) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('sponsor'));
+       addFatalMessage(__FILE__, __LINE__, '{%pipe,generateExtensionInactiveNotInstalledMessage=sponsor%}');
        return;
 } elseif (!isSponsor()) {
        // No sponsor!

diff --git a/inc/modules/sponsor/account.php b/inc/modules/sponsor/account.php
index 8e98ea28f5f3c77bbaa2cf1c4c22c5f059dbac3b..b5680854fc51774c6d66ec28a146533bcb24bb50 100644 (file)
--- a/inc/modules/sponsor/account.php
+++ b/inc/modules/sponsor/account.php
@@ -39,7 +39,7 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif (!isExtensionActive('sponsor')) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('sponsor'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=sponsor%}');
        return;
 } elseif (!isSponsor()) {
        // No sponsor!

diff --git a/inc/modules/sponsor/guest.php b/inc/modules/sponsor/guest.php
index ec30ef8a3572e1bc856bda390b2096c1082fc529..1c987a8a3a2f183f594b2c671eae81a92fb61992 100644 (file)
--- a/inc/modules/sponsor/guest.php
+++ b/inc/modules/sponsor/guest.php
@@ -38,7 +38,7 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif ((!isExtensionActive('sponsor'))) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('sponsor'));
+       addFatalMessage(__FILE__, __LINE__, '{%pipe,generateExtensionInactiveNotInstalledMessage=sponsor%}');
        return;
 } elseif (!isSponsor()) {
        // No sponsor!

diff --git a/inc/modules/sponsor/logout.php b/inc/modules/sponsor/logout.php
index 55f14157751af067c57165d4ff5e04b4cd0006da..5a5857ab88c8213671a83c6fbc9ff46dbf556757 100644 (file)
--- a/inc/modules/sponsor/logout.php
+++ b/inc/modules/sponsor/logout.php
@@ -38,7 +38,7 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif ((!isExtensionActive('sponsor'))) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('sponsor'));
+       addFatalMessage(__FILE__, __LINE__, '{%pipe,generateExtensionInactiveNotInstalledMessage=sponsor%}');
        return;
 } elseif (!isSponsor()) {
        // No sponsor!

diff --git a/inc/modules/sponsor/settings.php b/inc/modules/sponsor/settings.php
index f71ee51a3bce7d2f82b382fed6f428d53a731ef8..673718a23ed35399d5757654a301ee096a98e852 100644 (file)
--- a/inc/modules/sponsor/settings.php
+++ b/inc/modules/sponsor/settings.php
@@ -39,7 +39,7 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif (!isExtensionActive('sponsor')) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('sponsor'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=sponsor%}');
        return;
 } elseif (!isSponsor()) {
        // No sponsor!

diff --git a/inc/modules/sponsor/welcome.php b/inc/modules/sponsor/welcome.php
index a740df393395ed9e9b1a7192442c7ec80e1820bc..e4b71d0530732833b419d6c4741306d499e472d9 100644 (file)
--- a/inc/modules/sponsor/welcome.php
+++ b/inc/modules/sponsor/welcome.php
@@ -39,7 +39,7 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif (!isExtensionActive('sponsor')) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('sponsor'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=sponsor%}');
        return;
 } elseif (!isSponsor()) {
        // No sponsor!