Templates rewritten/fixed, surfbar extended with per-entry reload lock

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

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index 26610a438ed795a8d4430cfbd5886651cc9dd28f..164813300eff020e93abbc78d0b90e599769ebb2 100644 (file)
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -42,7 +42,7 @@ if (!defined('__SECURITY')) {
 // -----------------------------------------------------------------------------
 //
 // Admin has added an URL with given user id and so on
-function SURFBAR_ADMIN_ADD_URL ($url, $limit) {
+function SURFBAR_ADMIN_ADD_URL ($url, $limit, $reload) {
        // Do some pre-checks
        if (!IS_ADMIN()) {
                // Not an admin
@@ -59,10 +59,13 @@ function SURFBAR_ADMIN_ADD_URL ($url, $limit) {
        } elseif ("".($limit + 0)."" != "".$limit."") {
                // Invalid amount entered
                return false;
+       } elseif ("".($reload + 0)."" != "".$reload."") {
+               // Invalid amount entered
+               return false;
        }
 
        // Register the new URL
-       return SURFBAR_REGISTER_URL($url, "0", "ACTIVE", "unlock", $limit);
+       return SURFBAR_REGISTER_URL($url, "0", "ACTIVE", "unlock", array('limit' => $limit, 'reload' => $reload));
 }
 // Admin unlocked an email so we can migrate the URL
 function SURFBAR_ADMIN_MIGRATE_URL ($url, $uid) {
@@ -164,7 +167,7 @@ function SURFBAR_MEMBER_ADD_URL ($url, $limit) {
        }
 
        // Register the new URL
-       return SURFBAR_REGISTER_URL($url, $GLOBALS['userid'], "PENDING", "reg", $limit);
+       return SURFBAR_REGISTER_URL($url, $GLOBALS['userid'], "PENDING", "reg", array('limit' => $limit));
 }
 // Create list of actions depending on status for the user
 function SURFBAR_MEMBER_ACTIONS ($urlId, $status) {
@@ -340,6 +343,10 @@ function SURFBAR_MEMBER_UNPAUSE_ACTION ($urlData) {
        // Return status change
        return SURFBAR_CHANGE_STATUS($urlData['id'], $urlData['status'], $urlData['new_status'], array($urlData['id'] => $urlData));
 }
+// Resubmit locked URL
+function SURFBAR_MEMBER_RESUBMIT_ACTION ($urlData) {
+       return SURFBAR_CHANGE_STATUS($urlData['id'], $urlData['status'], $urlData['new_status'], array($urlData['id'] => $urlData));
+}
 // Display selected "action form"
 function SURFBAR_MEMBER_DISPLAY_ACTION_FORM ($action, $urlData) {
        // Translate some data
@@ -535,7 +542,7 @@ function SURFBAR_GET_URL_DATA ($searchTerm, $column="id", $order="id", $sort="AS
        } // END - if
 
        // Look up the record
-       $result = SQL_QUERY_ESC("SELECT id, userid, url, views_total, views_max, views_allowed, status, registered, last_locked, lock_reason, views_max, views_allowed
+       $result = SQL_QUERY_ESC("SELECT id, userid, url, views_total, views_max, views_allowed, status, registered, last_locked, lock_reason, views_max, views_allowed, fixed_reload
 FROM "._MYSQL_PREFIX."_surfbar_urls
 WHERE %s='%s'".$add."
 ORDER BY %s %s
@@ -564,20 +571,23 @@ ORDER BY %s %s
        return $lastUrlData;
 }
 // Registers an URL with the surfbar. You should have called SURFBAR_LOOKUP_BY_URL() first!
-function SURFBAR_REGISTER_URL ($url, $uid, $status="PENDING", $addMode="reg", $limit=0) {
+function SURFBAR_REGISTER_URL ($url, $uid, $status="PENDING", $addMode="reg", $extraFields = array()) {
        global $_CONFIG;
 
        // Make sure by the user registered URLs are always pending
        if ($addMode == "reg") $status = "PENDING";
 
        // Prepare content
-       $content = array(
+       $content = array_merge($extraFields, array(
                'url'         => $url,
                'frametester' => FRAMETESTER($url),
                'uid'         => $uid,
                'status'      => $status,
-               'limit'       => $limit
-       );
+       ));
+
+       // Is limit/reload set?
+       if (!isset($config['limit']))  $content['limit']  = 0;
+       if (!isset($config['reload'])) $content['reload'] = 0;
 
        // Insert the URL into database
        $content['insert_id'] = SURFBAR_INSERT_URL_BY_ARRAY($content);
@@ -612,13 +622,14 @@ function SURFBAR_INSERT_URL_BY_ARRAY ($urlData) {
        if (empty($uid)) $uid = 0;
 
        // Just run the insert query for now
-       SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_surfbar_urls (userid,url,status,views_max,views_allowed) VALUES (%s,'%s','%s',%s,%s)",
+       SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_surfbar_urls (userid,url,status,views_max,views_allowed,fixed_reload) VALUES (%s,'%s','%s',%s,%s,%s)",
                array(
                        $uid,
                        $urlData['url'],
                        $urlData['status'],
                        $urlData['limit'],
-                       $urlData['limit']
+                       $urlData['limit'],
+                       $urlData['reload']
                ), __FILE__, __LINE__
        );
 
@@ -681,6 +692,14 @@ function SURFBAR_NOTIFY_USER ($messageType, $content) {
                ADD_FATAL(MEMBER_SURFBAR_NOTIFY_SUBJECT_404, $constantName);
        }
 
+       // Translate some data if present
+       if (isset($content['status']))        $content['status']        = SURFBAR_TRANSLATE_STATUS($content['status']);
+       if (isset($content['registered']))    $content['registered']    = MAKE_DATETIME($content['registered'], "2");
+       if (isset($content['last_locked']))   $content['last_locked']   = MAKE_DATETIME($content['last_locked'], "2");
+       if (isset($content['views_total']))   $content['views_total']   = TRANSLATE_COMMA($content['views_total']);
+       if (isset($content['views_allowed'])) $content['views_allowed'] = TRANSLATE_COMMA($content['views_allowed']);
+       if (isset($content['views_max']))     $content['views_max']     = TRANSLATE_COMMA($content['views_max']);
+
        // Load template
        $mailText = LOAD_EMAIL_TEMPLATE($templateName, $content, $content['uid']);
 
@@ -1165,6 +1184,15 @@ GROUP BY userid",
 function SURFBAR_DETERMINE_WAIT_TIME () {
        global $_CONFIG;
 
+       // Get fixed reload lock
+       $fixed = SURFBAR_GET_FIXED_RELOAD();
+
+       // Is the fixed reload time set?
+       if ($fixed > 0) {
+               // Return it
+               return $fixed;
+       } // END - if
+
        // Static time is default
        $time = $_CONFIG['surfbar_static_time'];
 
@@ -1499,7 +1527,7 @@ function SURFBAR_DETERMINE_NEXT_ID ($urlId = 0) {
 
                // And query the database
                //DEBUG_LOG(__FUNCTION__, __LINE__, "randNum={$randNum},maxRand={$maxRand},surfLock=".SURFBAR_GET_DATA('surf_lock')."", false);
-               $result = SQL_QUERY_ESC("SELECT sbu.id, sbu.userid, sbu.url, sbs.last_salt, sbu.views_total, sbu.views_max, sbu.views_allowed, UNIX_TIMESTAMP(l.last_surfed) AS last_surfed
+               $result = SQL_QUERY_ESC("SELECT sbu.id, sbu.userid, sbu.url, sbs.last_salt, sbu.views_total, sbu.views_max, sbu.views_allowed, UNIX_TIMESTAMP(l.last_surfed) AS last_surfed, sbu.fixed_reload
 FROM "._MYSQL_PREFIX."_surfbar_urls AS sbu
 LEFT JOIN "._MYSQL_PREFIX."_surfbar_salts AS sbs
 ON sbu.id=sbs.url_id
@@ -1513,7 +1541,7 @@ LIMIT %s,1",
                );
        } else {
                // Get data from specified id number
-               $result = SQL_QUERY_ESC("SELECT sbu.id, sbu.userid, sbu.url, sbs.last_salt, sbu.views_total, sbu.views_max, sbu.views_allowed, UNIX_TIMESTAMP(l.last_surfed) AS last_surfed
+               $result = SQL_QUERY_ESC("SELECT sbu.id, sbu.userid, sbu.url, sbs.last_salt, sbu.views_total, sbu.views_max, sbu.views_allowed, UNIX_TIMESTAMP(l.last_surfed) AS last_surfed, sbu.fixed_reload
 FROM "._MYSQL_PREFIX."_surfbar_urls AS sbu
 LEFT JOIN "._MYSQL_PREFIX."_surfbar_salts AS sbs
 ON sbu.id=sbs.url_id
@@ -1646,5 +1674,10 @@ function SURFBAR_GET_ALLOWED_VIEWS () {
        // Get data element and return its contents
        return SURFBAR_GET_DATA('views_allowed');
 }
+// Getter for fixed reload
+function SURFBAR_GET_FIXED_RELOAD () {
+       // Get data element and return its contents
+       return SURFBAR_GET_DATA('fixed_reload');
+}
 //
 ?>