Added merge-script (rudimentary) and fixes from EL brancH

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

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index 5526567afe1615b3510e381820f45065b1963dfb..ba5e615897a5565f36b1de50d56b0c150f664935 100644 (file)
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -73,7 +73,10 @@ function autostartReferalRallyes ($result) {
        $result_user = SQL_QUERY("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `status`='CONFIRMED' ORDER BY `userid` ASC", __FUNCTION__, __LINE__);
 
        // Let's begin with the userids...
-       while ($content = merge_array($content, SQL_FETCHARRAY($result_user))) {
+       while ($row = SQL_FETCHARRAY($result_user)) {
+               // Merge both arrays
+               $content = merge_array($content, $row);
+
                $un = false;
 
                // Get refs by userid
@@ -83,7 +86,7 @@ function autostartReferalRallyes ($result) {
                // Check if line is already included...
                $result_ref = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE `rallye_id`=%s AND `userid`=%s LIMIT 1",
                        array(bigintval($id), bigintval($content['userid'])), __FUNCTION__, __LINE__);
-               if (SQL_NUMROWS($result_ref) == '0') {
+               if (SQL_NUMROWS($result_ref) == 0) {
                        // Free memory
                        SQL_FREERESULT($result_ref);
 
@@ -317,7 +320,7 @@ function addUserToReferalRallye ($userid, $content = array()) {
        $add = '';
 
        // Updated extension?
-       if (getExtensionVersion('rallye') >= '0.2.0') {
+       if (isExtensionInstalledAndNewer('rallye', '0.2.0')) {
                $add .= ", `min_users`, `min_prices`";
        } // END - if
 
@@ -337,7 +340,7 @@ LIMIT 1", __FUNCTION__, __LINE__);
                $min_users = '0'; $min_prices = '0';
 
                // Load data
-               if (getExtensionVersion('rallye') >= '0.2.0') {
+               if (isExtensionInstalledAndNewer('rallye', '0.2.0')) {
                        list($id, $title, $start, $end, $notify, $min_users, $min_prices) = SQL_FETCHROW($result);
                } else {
                        list($id, $title, $start, $end, $notify) = SQL_FETCHROW($result);
@@ -801,7 +804,7 @@ function addReferalRallyeTemplateSelection ($name = 'template', $default = '') {
 //
 function getReferalRallyeRefsCount ($userid, $old = '0') {
        // Check current refs
-       if (getExtensionVersion('cache') >= '0.1.2') {
+       if (isExtensionInstalledAndNewer('cache', '0.1.2')) {
                // Get refs from cache
                $cnt = '0';
                foreach ($GLOBALS['cache_array']['refsystem']['userid'] as $id => $userid) {