Global variables rewritten

[mailer.git] / inc / libs / rallye_functions.php

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index d156ee865bee77833e16ed2f135db978e51f1b27..3d70abc82496e915b055ada4313b0f78527ecb25 100644 (file)
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -733,21 +733,19 @@ function RALLYE_TEMPLATE_SELECTION($name="template", $default="")
 }
 //
 function RALLYE_GET_REFCOUNT($uid, $old=0) {
-       global $cacheArray;
-
        // Check current refs
        if (GET_EXT_VERSION("cache") >= "0.1.2") {
                // Get refs from cache
                $cnt = 0;
-               foreach ($cacheArray['refsystem']['userid'] as $id => $u_id) {
+               foreach ($GLOBALS['cache_array']['refsystem']['userid'] as $id => $u_id) {
                        // Do we have a ref for this user?
-                       //* DEBUG: */ echo "id={$id},u_id={$u_id},uid={$uid},old={$old},level={$cacheArray['refsystem']['level'][$id]}<br />\n";
-                       if (($u_id == $uid) && ($cacheArray['refsystem']['level'][$id] == 1)) {
+                       //* DEBUG: */ echo "id={$id},u_id={$u_id},uid={$uid},old={$old},level={$GLOBALS['cache_array']['refsystem']['level'][$id]}<br />\n";
+                       if (($u_id == $uid) && ($GLOBALS['cache_array']['refsystem']['level'][$id] == 1)) {
                                //* DEBUG: */ echo "uid matches!<br />\n";
-                               foreach ($cacheArray['ref_depths']['level'] as $level) {
-                                       if (($level == $cacheArray['refsystem']['level'][$id]) && ($level == 1)) {
+                               foreach ($GLOBALS['cache_array']['ref_depths']['level'] as $level) {
+                                       if (($level == $GLOBALS['cache_array']['refsystem']['level'][$id]) && ($level == 1)) {
                                                // Level does exist so abort here
-                                               $cnt = $cacheArray['refsystem']['counter'][$id];
+                                               $cnt = $GLOBALS['cache_array']['refsystem']['counter'][$id];
                                                //* DEBUG: */ echo "*".$uid."/".$cnt."*<br />";
                                                break;
                                        } elseif ($level > 1) {
@@ -761,7 +759,7 @@ function RALLYE_GET_REFCOUNT($uid, $old=0) {
                        }
                }
                //* DEBUG: */ echo "<pre>";
-               //* DEBUG: */ print_r($cacheArray['refsystem']);
+               //* DEBUG: */ print_r($GLOBALS['cache_array']['refsystem']);
                //* DEBUG: */ echo "</pre>";
                //* DEBUG: */ die();