Extension ext-surfbar continued:

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

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index 8a02ca61163e4120500133f2c48080d9a9e32c9a..4e641f4cc8951c7f0200bda63e53bce5e760b6e2 100644 (file)
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -608,6 +608,7 @@ function getSurfbarUrlData ($searchTerm, $column = 'url_id', $order = 'url_id',
        $result = SQL_QUERY_ESC("SELECT
        `url_id`,
        `url_userid`,
+       `url_package_id`,
        `url`,
        `url_views_total`,
        `url_views_max`,
@@ -954,9 +955,9 @@ function isSurfbarReloadFull () {
        $result = SQL_QUERY_ESC("SELECT
        COUNT(l.`locks_id`) AS `cnt`
 FROM
-       `{?_MYSQL_PREFIX?}_surfbar_locks` AS l
+       `{?_MYSQL_PREFIX?}_surfbar_locks` AS `l`
 INNER JOIN
-       `{?_MYSQL_PREFIX?}_surfbar_urls` AS u
+       `{?_MYSQL_PREFIX?}_surfbar_urls` AS `u`
 ON
        u.`url_id`=l.`locks_url_id`
 WHERE
@@ -1016,7 +1017,7 @@ function getSurfbarTotalUrls ($status = 'ACTIVE', $excludeUserId = NULL) {
 FROM
        `{?_MYSQL_PREFIX?}_surfbar_urls`
 WHERE
-       (`url_userid` NOT IN (".implode(', ', $userids['url_userid']).") OR `url_userid` IS NULL) AND
+       (`url_userid` NOT IN (" . implode(', ', $userids['url_userid']) . ") OR `url_userid` IS NULL) AND
        `url_status`='%s'
 LIMIT 1",
                array($status), __FUNCTION__, __LINE__
@@ -1301,11 +1302,12 @@ function determineSurfbarDepletedUserids ($limit=0) {
 
                // Get all userid except logged in one
                $result = SQL_QUERY_ESC("SELECT
-       u.url_userid, UNIX_TIMESTAMP(d.surfbar_low_notified) AS notified
+       u.`url_userid`,
+       UNIX_TIMESTAMP(d.`surfbar_low_notified`) AS `notified`
 FROM
-       `{?_MYSQL_PREFIX?}_surfbar_urls` AS u
+       `{?_MYSQL_PREFIX?}_surfbar_urls` AS `u`
 INNER JOIN
-       `{?_MYSQL_PREFIX?}_user_data` AS d
+       `{?_MYSQL_PREFIX?}_user_data` AS `d`
 ON
        u.`url_userid`=d.`userid`
 WHERE
@@ -1320,7 +1322,8 @@ ORDER BY
        } else {
                // Get all userid
                $result = SQL_QUERY("SELECT
-       u.url_userid, UNIX_TIMESTAMP(d.surfbar_low_notified) AS notified
+       u.`url_userid`,
+       UNIX_TIMESTAMP(d.`surfbar_low_notified`) AS `notified`
 FROM
        `{?_MYSQL_PREFIX?}_surfbar_urls` AS u
 INNER JOIN
@@ -1603,24 +1606,24 @@ ORDER BY
 function getSurfbarMaximumRandom ($userids, $add) {
        // Count max availabe entries
        $result = SQL_QUERY("SELECT
-       sbu.url_id AS `cnt`
+       sbu.`url_id` AS `cnt`
 FROM
-       `{?_MYSQL_PREFIX?}_surfbar_urls` AS sbu
+       `{?_MYSQL_PREFIX?}_surfbar_urls` AS `sbu`
 LEFT JOIN
-       `{?_MYSQL_PREFIX?}_surfbar_salts` AS sbs
+       `{?_MYSQL_PREFIX?}_surfbar_salts` AS `sbs`
 ON
-       sbu.url_id=sbs.salts_url_id
+       sbu.`url_id`=sbs.`salts_url_id`
 LEFT JOIN
-       `{?_MYSQL_PREFIX?}_surfbar_locks` AS l
+       `{?_MYSQL_PREFIX?}_surfbar_locks` AS `l`
 ON
-       sbu.url_id=l.locks_url_id
+       sbu.`url_id`=l.`locks_url_id`
 WHERE
-       sbu.url_userid NOT IN (" . implode(',', $userids) . ") AND
-       (sbu.url_views_allowed=0 OR (sbu.url_views_allowed > 0 AND sbu.url_views_max > 0)) AND
-       sbu.url_status='ACTIVE'
+       sbu.`url_userid` NOT IN (" . implode(',', $userids) . ") AND
+       (sbu.`url_views_allowed`=0 OR (sbu.`url_views_allowed` > 0 AND sbu.`url_views_max` > 0)) AND
+       sbu.`url_status`='ACTIVE'
        " . $add . "
 GROUP BY
-       sbu.url_id ASC", __FUNCTION__, __LINE__);
+       sbu.`url_id` ASC", __FUNCTION__, __LINE__);
 
        // Log last query
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'lastQuery='.getConfig('db_last_query').'|numRows='.SQL_NUMROWS($result).'|Affected='.SQL_AFFECTEDROWS());
@@ -1644,6 +1647,7 @@ function getSurfbarUserUrls () {
        $result = SQL_QUERY_ESC("SELECT
        u.`url_id`,
        u.`url_userid`,
+       u.`url_package_id`,
        u.`url`,
        u.`url_status`,
        u.`url_views_total`,
@@ -1759,65 +1763,67 @@ function determineSurfbarNextId ($urlId = NULL) {
                // And query the database
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'randNum='.$randNum.',maxRand='.$maxRand.',surfLock='.getSurfbarSurfLock());
                $result = SQL_QUERY_ESC("SELECT
-       sbu.url_id,
-       sbu.url_userid,
-       sbu.url,
-       sbs.salts_last_salt,
-       sbu.url_views_total,
-       sbu.url_views_max,
-       sbu.url_views_allowed,
-       UNIX_TIMESTAMP(l.locks_last_surfed) AS last_surfed,
-       sbu.url_fixed_reload
+       sbu.`url_id`,
+       sbu.`url_userid`,
+       sbu.`url_package_id`,
+       sbu.`url`,
+       sbs.`salts_last_salt`,
+       sbu.`url_views_total`,
+       sbu.`url_views_max`,
+       sbu.`url_views_allowed`,
+       UNIX_TIMESTAMP(l.`locks_last_surfed`) AS `last_surfed`,
+       sbu.`url_fixed_reload`
 FROM
-       `{?_MYSQL_PREFIX?}_surfbar_urls` AS sbu
+       `{?_MYSQL_PREFIX?}_surfbar_urls` AS `sbu`
 LEFT JOIN
-       `{?_MYSQL_PREFIX?}_surfbar_salts` AS sbs
+       `{?_MYSQL_PREFIX?}_surfbar_salts` AS `sbs`
 ON
-       sbu.url_id=sbs.salts_url_id
+       sbu.`url_id`=sbs.`salts_url_id`
 LEFT JOIN
-       `{?_MYSQL_PREFIX?}_surfbar_locks` AS l
+       `{?_MYSQL_PREFIX?}_surfbar_locks` AS `l`
 ON
-       sbu.url_id=l.locks_url_id
+       sbu.`url_id`=l.`locks_url_id`
 WHERE
-       (sbu.`url_userid` NOT IN (".implode(',', $userids['url_userid']).") OR sbu.`url_userid` IS NULL) AND
-       sbu.url_status='ACTIVE' AND
-       (sbu.url_views_allowed=0 OR (sbu.url_views_allowed > 0 AND sbu.url_views_max > 0))
+       (sbu.`url_userid` NOT IN (" . implode(',', $userids['url_userid']) . ") OR sbu.`url_userid` IS NULL) 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`
 ORDER BY
-       l.locks_last_surfed ASC,
-       sbu.url_id ASC
+       l.`locks_last_surfed` ASC,
+       sbu.`url_id` ASC
 LIMIT %s,1",
                        array($randNum), __FUNCTION__, __LINE__
                );
        } else {
                // Get data from specified id number
                $result = SQL_QUERY_ESC("SELECT
-       sbu.url_id,
-       sbu.url_userid,
-       sbu.url,
-       sbs.salts_last_salt,
-       sbu.url_views_total,
-       sbu.url_views_max,
-       sbu.url_views_allowed,
-       UNIX_TIMESTAMP(l.locks_last_surfed) AS last_surfed,
-       sbu.url_fixed_reload
+       sbu.`url_id`,
+       sbu.`url_userid`,
+       sbu.`url_package_id`,
+       sbu.`url`,
+       sbs.`salts_last_salt`,
+       sbu.`url_views_total`,
+       sbu.`url_views_max`,
+       sbu.`url_views_allowed`,
+       UNIX_TIMESTAMP(l.`locks_last_surfed`) AS `last_surfed`,
+       sbu.`url_fixed_reload`
 FROM
-       `{?_MYSQL_PREFIX?}_surfbar_urls` AS sbu
+       `{?_MYSQL_PREFIX?}_surfbar_urls` AS `sbu`
 LEFT JOIN
-       `{?_MYSQL_PREFIX?}_surfbar_salts` AS sbs
+       `{?_MYSQL_PREFIX?}_surfbar_salts` AS `sbs`
 ON
-       sbu.url_id=sbs.salts_url_id
+       sbu.`url_id`=sbs.`salts_url_id`
 LEFT JOIN
-       `{?_MYSQL_PREFIX?}_surfbar_locks` AS l
+       `{?_MYSQL_PREFIX?}_surfbar_locks` AS `l`
 ON
-       sbu.url_id=l.locks_url_id
+       sbu.`url_id`=l.`locks_url_id`
 WHERE
-       (sbu.url_userid != %s OR sbu.url_userid IS NULL) AND
-       sbu.url_status='ACTIVE' AND
-       sbu.url_id=%s AND
-       (sbu.url_views_allowed=0 OR (sbu.url_views_allowed > 0 AND sbu.url_views_max > 0))
+       (sbu.`url_userid` != %s OR sbu.`url_userid` IS NULL) AND
+       sbu.`url_status`='ACTIVE' AND
+       sbu.`url_id`=%s AND
+       (sbu.`url_views_allowed` = 0 OR (sbu.`url_views_allowed` > 0 AND sbu.`url_views_max` > 0))
 LIMIT 1",
                        array(getMemberId(), bigintval($urlId)), __FUNCTION__, __LINE__
                );
@@ -1873,6 +1879,24 @@ LIMIT 1",
        return $nextId;
 }
 
+// Generates an URL to the given booking package
+function generateSurfbarPackageLink ($packageId) {
+       // Base URL
+       $url  = '{%url=modules.php?module=admin&what=list_surfbar_packages';
+
+       // Is package id given?
+       if ((!is_null($packageId)) && ($packageId > 0)) {
+               // Then add it
+               $url .= '&package_id=' . bigintval($packageId);
+       } // END - if
+
+       // Finish URL EL code
+       $url .= '%}';
+
+       // Return it
+       return $url;
+}
+
 //-----------------------------------------------------------------------------
 // Wrapper function
 //-----------------------------------------------------------------------------
@@ -2214,6 +2238,12 @@ function getSurfbarFixedWaitingTime () {
        return getSurfbarData('url_fixed_waiting');
 }
 
+// Getter for package id
+function getSurfbarPackageId () {
+       // Get data element and return its contents
+       return getSurfbarData('url_package_id');
+}
+
 // Getter for surf lock
 function getSurfbarSurfLock () {
        // Get data element and return its contents