Moved surfbar-related functions, unnessary array element removed

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index 9feb142f5a05c29b82cdcc842483ba499175d36a..e588ce6508afb2034241d4972bf84a92848c84b5 100644 (file)
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -1717,6 +1717,58 @@ LIMIT 1",
        return $nextId;
 }
 
+// ----------------------------------------------------------------------------
+// Wrapper function
+// ----------------------------------------------------------------------------
+
+// "Getter" for surfbar_dynamic_percent
+function getSurfbarDynamicPercent () {
+       // Do we have cache?
+       if (!isset($GLOBALS['surfbar_dynamic_percent'])) {
+               // Determine it
+               $GLOBALS['surfbar_dynamic_percent'] = getConfig('surfbar_dynamic_percent');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS['surfbar_dynamic_percent'];
+}
+
+// "Getter" for surfbar_static_reward
+function getSurfbarStaticReward () {
+       // Do we have cache?
+       if (!isset($GLOBALS['surfbar_static_reward'])) {
+               // Determine it
+               $GLOBALS['surfbar_static_reward'] = getConfig('surfbar_static_reward');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS['surfbar_static_reward'];
+}
+
+// "Getter" for surfbar_static_time
+function getSurfbarStaticTime () {
+       // Do we have cache?
+       if (!isset($GLOBALS['surfbar_static_time'])) {
+               // Determine it
+               $GLOBALS['surfbar_static_time'] = getConfig('surfbar_static_time');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS['surfbar_static_time'];
+}
+
+// "Getter" for surfbar_max_order
+function getSurfbarMaxOrder () {
+       // Do we have cache?
+       if (!isset($GLOBALS['surfbar_max_order'])) {
+               // Determine it
+               $GLOBALS['surfbar_max_order'] = getConfig('surfbar_max_order');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS['surfbar_max_order'];
+}
+
 // -----------------------------------------------------------------------------
 // PLEASE DO NOT ADD ANY OTHER FUNCTIONS BELOW THIS LINE IF THEY DON'T "WRAP"
 // THE $GLOBALS['surfbar_cache'] ARRAY!

diff --git a/inc/modules/admin/what-usr_online.php b/inc/modules/admin/what-usr_online.php
index 22c4a00e44c12acab6b8132ecca79c61b960d59d..a572112347906334fb5e5bd0738a2127335aed7e 100644 (file)
--- a/inc/modules/admin/what-usr_online.php
+++ b/inc/modules/admin/what-usr_online.php
@@ -86,7 +86,6 @@ if (isExtensionActive('online')) {
 
                // Remember rows and fancy time in array
                $content['rows']           = $OUT;
-               $content['online_timeout'] = '{--ONLINE_TIMEOUT_IS--}';
 
                // Load footer template
                loadTemplate('admin_list_online', false, $content);

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index a8277d6255d0d1eee25d24acd807062ec4461fd2..e47587883efb0fbb6d6aee38744878399a9d7df3 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -1742,42 +1742,6 @@ function getRefPayout () {
        return $GLOBALS['ref_payout'];
 }
 
-// "Getter" for surfbar_dynamic_percent
-function getSurfbarDynamicPercent () {
-       // Do we have cache?
-       if (!isset($GLOBALS['surfbar_dynamic_percent'])) {
-               // Determine it
-               $GLOBALS['surfbar_dynamic_percent'] = getConfig('surfbar_dynamic_percent');
-       } // END - if
-
-       // Return cache
-       return $GLOBALS['surfbar_dynamic_percent'];
-}
-
-// "Getter" for surfbar_static_reward
-function getSurfbarStaticReward () {
-       // Do we have cache?
-       if (!isset($GLOBALS['surfbar_static_reward'])) {
-               // Determine it
-               $GLOBALS['surfbar_static_reward'] = getConfig('surfbar_static_reward');
-       } // END - if
-
-       // Return cache
-       return $GLOBALS['surfbar_static_reward'];
-}
-
-// "Getter" for surfbar_static_time
-function getSurfbarStaticTime () {
-       // Do we have cache?
-       if (!isset($GLOBALS['surfbar_static_time'])) {
-               // Determine it
-               $GLOBALS['surfbar_static_time'] = getConfig('surfbar_static_time');
-       } // END - if
-
-       // Return cache
-       return $GLOBALS['surfbar_static_time'];
-}
-
 // "Getter" for online_timeout
 function getOnlineTimeout () {
        // Do we have cache?

diff --git a/templates/de/html/admin/admin_list_online.tpl b/templates/de/html/admin/admin_list_online.tpl
index 93171d0b3dec1b5debd071684c3fe4fd7cfb49cc..e1007e4bee315bcc89ab82bc5200f72996d42464 100644 (file)
--- a/templates/de/html/admin/admin_list_online.tpl
+++ b/templates/de/html/admin/admin_list_online.tpl
@@ -17,7 +17,9 @@
 </tr>
 $content[rows]
 <tr>
-       <td colspan="8" class="admin_footer">$content[online_timeout]</td>
+       <td colspan="8" class="admin_footer">
+               {--ONLINE_TIMEOUT_IS--}
+       </td>
 </tr>
 </table>
 </div>