More fixes for ext-surfbar:

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

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index 936a31f61ce43ee4340706b85eff88d7068d4b38..6e10e276e1c6a017be0022a2eff0cd80fb5419f9 100644 (file)
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -197,9 +197,9 @@ function SURFBAR_MEMBER_ACTIONS ($urlId, $status) {
        foreach ($actionArray as $actionId => $action) {
                // Add form for this action
                $OUT .= loadTemplate('member_surfbar_list_form', true, array(
-                       'width'    => $width,
-                       'id'       => bigintval($urlId),
-                       'action'   => strtolower($action)
+                       'width'  => $width,
+                       'url_id' => bigintval($urlId),
+                       'action' => strtolower($action)
                ));
        } // END - foreach
 
@@ -266,8 +266,8 @@ function SURFBAR_MEMBER_DO_FORM ($formData, $urlArray) {
 // Validate if the requested action can be performed on current URL status
 function SURFBAR_VALIDATE_MEMBER_ACTION_STATUS ($action, $status) {
        // Search for the requested action/status combination in database
-       $result = SQL_QUERY_ESC("SELECT new_status FROM `{?_MYSQL_PREFIX?}_surfbar_actions` WHERE `action`='%s' AND `status`='%s' LIMIT 1",
-       array($action, $status), __FUNCTION__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT `actions_new_status` FROM `{?_MYSQL_PREFIX?}_surfbar_actions` WHERE `actions_action`='%s' AND `actions_status`='%s' LIMIT 1",
+               array($action, $status), __FUNCTION__, __LINE__);
 
        // Is the entry there?
        $isValid = (SQL_NUMROWS($result) == 1);
@@ -876,7 +876,7 @@ ON
        u.`url_id`=l.`locks_url_id`
 WHERE
        l.`locks_userid`=%s AND
-       (UNIX_TIMESTAMP() - {%pipe,SURFBAR_GET_SURF_LOCK%}) < UNIX_TIMESTAMP(l.`locks_last_surfed`) AND
+       (UNIX_TIMESTAMP() - {%%pipe,SURFBAR_GET_SURF_LOCK%%}) < UNIX_TIMESTAMP(l.`locks_last_surfed`) AND
        (
                ((UNIX_TIMESTAMP(l.`locks_last_surfed`) - u.`url_fixed_reload`) < 0 AND u.`url_fixed_reload` > 0) OR
                u.`url_fixed_reload` = 0
@@ -995,13 +995,19 @@ function SURFBAR_GET_TOTAL_USER_URLS ($userid = '0', $status = '', $exclude = ''
 // Generate a validation code for the given id number
 function SURFBAR_GENERATE_VALIDATION_CODE ($urlId, $salt = '') {
        // @TODO Invalid salt should be refused
+       $length = '0';
        $GLOBALS['surfbar_cache']['salt'] = 'INVALID';
 
-       // Get code length from config
-       $length = getCodeLength();
+       // Is extension ext-other there?
+       if (isExtensionActive('other')) {
+               // Get code length from config
+               $length = getCodeLength();
+       } // END - if
 
        // Fix length to 10
-       if ($length == '0') $length = 10;
+       if ($length == '0') {
+               $length = 10;
+       } // END - if
 
        // Generate a code until the length matches
        $valCode = '';
@@ -1206,13 +1212,14 @@ FROM
 INNER JOIN
        `{?_MYSQL_PREFIX?}_user_data` AS d
 ON
-       u.url_userid=d.userid
+       u.`url_userid`=d.`userid`
 WHERE
-       u.url_userid NOT IN (%s,0) AND u.url_status='ACTIVE'
+       u.`url_userid` NOT IN (%s,0) AND
+       u.`url_status`='ACTIVE'
 GROUP BY
-       u.url_userid
+       u.`url_userid`
 ORDER BY
-       u.url_userid ASC",
+       u.`url_userid` ASC",
                        array(getMemberId()), __FUNCTION__, __LINE__);
        } else {
                // Get all userid
@@ -1223,13 +1230,14 @@ FROM
 INNER JOIN
        `{?_MYSQL_PREFIX?}_user_data` AS d
 ON
-       u.url_userid=d.userid
+       u.`url_userid`=d.`userid`
 WHERE
-       u.url_status='ACTIVE'
+       u.`url_userid` > 0 AND
+       u.`url_status`='ACTIVE'
 GROUP BY
-       u.url_userid
+       u.`url_userid`
 ORDER BY
-       u.url_userid ASC", __FUNCTION__, __LINE__);
+       u.`url_userid` ASC", __FUNCTION__, __LINE__);
        }
 
        // Load all userid
@@ -1545,13 +1553,13 @@ function SURFBAR_GET_USER_URLS () {
        u.url_views_max,
        u.url_views_allowed,
        UNIX_TIMESTAMP(u.url_registered) AS `url_registered`,
-       UNIX_TIMESTAMP(u.url_last_locked) AS `url_last_locked`,
-       u.url_lock_reason
+       UNIX_TIMESTAMP(u.`url_last_locked`) AS `url_last_locked`,
+       u.`url_lock_reason`
 FROM
        `{?_MYSQL_PREFIX?}_surfbar_urls` AS u
 WHERE
-       u.url_userid=%s AND
-       u.url_status != 'DELETED'
+       u.`url_userid`=%s AND
+       u.`url_status` != 'DELETED'
 ORDER BY
        u.url_id ASC",
        array(getMemberId()), __FUNCTION__, __LINE__);
@@ -1561,7 +1569,7 @@ ORDER BY
                // Load all rows
                while ($row = SQL_FETCHARRAY($result)) {
                        // Add the row
-                       $urlArray[$row['id']] = $row;
+                       $urlArray[$row['url_id']] = $row;
                } // END - while
        } // END - if
 
@@ -1578,7 +1586,7 @@ function SURFBAR_GET_ARRAY_FROM_STATUS ($status) {
        $returnArray = array();
 
        // Get all assigned actions
-       $result = SQL_QUERY_ESC("SELECT `action` FROM `{?_MYSQL_PREFIX?}_surfbar_actions` WHERE `actions_status`='%s' ORDER BY `actions_id` ASC",
+       $result = SQL_QUERY_ESC("SELECT `actions_action` FROM `{?_MYSQL_PREFIX?}_surfbar_actions` WHERE `actions_status`='%s' ORDER BY `actions_id` ASC",
                array($status), __FUNCTION__, __LINE__);
 
        // Some entries there?
@@ -1586,7 +1594,7 @@ function SURFBAR_GET_ARRAY_FROM_STATUS ($status) {
                // Load all actions
                // @TODO This can be somehow rewritten
                while ($content = SQL_FETCHARRAY($result)) {
-                       $returnArray[] = $content['action'];
+                       $returnArray[] = $content['actions_action'];
                } // END - if
        } // END - if
 
@@ -1625,7 +1633,7 @@ function SURFBAR_DETERMINE_NEXT_ID ($urlId = '0') {
                $add = '';
                if (count($USE) > 0) {
                        // Ignore some!
-                       $add = " AND sbu.url_id NOT IN (";
+                       $add = " AND sbu.`url_id` NOT IN (";
                        foreach ($USE as $url_id => $lid) {
                                // Add URL id
                                $add .= $url_id.',';
@@ -1670,12 +1678,12 @@ LEFT JOIN
 ON
        sbu.url_id=l.locks_url_id
 WHERE
-       sbu.url_userid NOT IN (".implode(',', $userids['url_userid']).") AND
+       sbu.`url_userid` NOT IN (".implode(',', $userids['url_userid']).") AND
        sbu.url_status='ACTIVE' AND
        (sbu.url_views_allowed=0 OR (sbu.url_views_allowed > 0 AND sbu.url_views_max > 0))
        ".$add."
 GROUP BY
-       sbu.url_id
+       sbu.`url_id`
 ORDER BY
        l.locks_last_surfed ASC,
        sbu.url_id ASC