Surfbar continued:

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

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index a4623cdf85980ef146c31f012782f62b958d8b0c..26610a438ed795a8d4430cfbd5886651cc9dd28f 100644 (file)
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -326,6 +326,20 @@ function SURFBAR_MEMBER_DELETE_ACTION ($urlData) {
        // Display form
        return SURFBAR_MEMBER_DISPLAY_ACTION_FORM("delete", $urlData);
 }
        // Display form
        return SURFBAR_MEMBER_DISPLAY_ACTION_FORM("delete", $urlData);
 }

+// Pause active banner
+function SURFBAR_MEMBER_PAUSE_ACTION ($urlData) {
+       return SURFBAR_CHANGE_STATUS($urlData['id'], $urlData['status'], $urlData['new_status'], array($urlData['id'] => $urlData));
+}
+// Unpause stopped banner
+function SURFBAR_MEMBER_UNPAUSE_ACTION ($urlData) {
+       // Fix missing entry for template
+       $urlData['edit'] = $urlData['unpause'];
+       $urlData['edit']['url'] = $urlData['url'];
+       $urlData['edit']['limit'] = $urlData['views_max'];
+
+       // Return status change
+       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
 // Display selected "action form"
 function SURFBAR_MEMBER_DISPLAY_ACTION_FORM ($action, $urlData) {
        // Translate some data


@@ -341,17 +355,20 @@ function SURFBAR_MEMBER_DISPLAY_ACTION_FORM ($action, $urlData) {
                $urlData['lock_reason'] = "---";
        } // END - if
 
                $urlData['lock_reason'] = "---";
        } // END - if
 

-       // Default is not limited
-       $urlData['limited_yes'] = "";
-       $urlData['limited_no']  = " checked=\"checked\"";
-       $urlData['limited']     = "false";
-
-       // Is this URL limited?
-       if ($urlData['views_max'] > 0) {
-               // Then rewrite form data
-               $urlData['limited_yes'] = " checked=\"checked\"";
-               $urlData['limited_no']  = "";
-               $urlData['limited']     = "true";
+       // Include fields only for action 'edit'
+       if ($action == "edit") {
+               // Default is not limited
+               $urlData['limited_yes'] = "";
+               $urlData['limited_no']  = " checked=\"checked\"";
+               $urlData['limited']     = "false";
+
+               // Is this URL limited?
+               if ($urlData['views_max'] > 0) {
+                       // Then rewrite form data
+                       $urlData['limited_yes'] = " checked=\"checked\"";
+                       $urlData['limited_no']  = "";
+                       $urlData['limited']     = "true";
+               } // END - if

        } // END - if
 
        // Load the form and display it
        } // END - if
 
        // Load the form and display it


@@ -397,6 +414,9 @@ function SURFBAR_MEMBER_EXECUTE_ACTION ($action, $urlData) {
 }
 // "Execute edit" function: Update changed data
 function SURFBAR_MEMBER_EXECUTE_EDIT_ACTION ($urlData) {
 }
 // "Execute edit" function: Update changed data
 function SURFBAR_MEMBER_EXECUTE_EDIT_ACTION ($urlData) {

+       // Default is nothing done
+       $status = false;
+

        // Translate URLs for testing
        $url1 = COMPILE_CODE($urlData['url']);
        $url2 = COMPILE_CODE($urlData['edit']['url']);
        // Translate URLs for testing
        $url1 = COMPILE_CODE($urlData['url']);
        $url2 = COMPILE_CODE($urlData['edit']['url']);


@@ -408,19 +428,16 @@ function SURFBAR_MEMBER_EXECUTE_EDIT_ACTION ($urlData) {
                SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_surfbar_urls SET url='%s', views_allowed=%s, views_max=%s WHERE id=%s AND status='%s' LIMIT 1",
                        array($urlData['url'], $urlData['edit']['limit'], $urlData['edit']['limit'], $urlData['id'], $urlData['status']), __FILE__, __LINE__);
 
                SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_surfbar_urls SET url='%s', views_allowed=%s, views_max=%s WHERE id=%s AND status='%s' LIMIT 1",
                        array($urlData['url'], $urlData['edit']['limit'], $urlData['edit']['limit'], $urlData['id'], $urlData['status']), __FILE__, __LINE__);
 

-               // Prepare new data
-               $urlData['new_url']   = $urlData['edit']['url'];
-               $urlData['new_limit'] = $urlData['edit']['limit'];
-               unset($urlData['edit']);
-
-               // Send admin notification
-               SURFBAR_NOTIFY_ADMIN("url_edited", $urlData);
-
-               // Send user notification
-               SURFBAR_NOTIFY_USER("url_edited", $urlData);
-       } // END - if
+               // All fine
+               $status = true;
+       }

 
 

-       // All fine!
+       // Return status
+       return $status;
+}
+// "Execute delete" function: Does nothing...
+function SURFBAR_MEMBER_EXECUTE_DELETE_ACTION ($urlData) {
+       // Nothing special to do (see above function for such "special actions" to perform)

        return true;
 }
 //
        return true;
 }
 //


@@ -572,7 +589,6 @@ function SURFBAR_REGISTER_URL ($url, $uid, $status="PENDING", $addMode="reg", $l
        } // END - if
 
        // Translate status and limit
        } // END - if
 
        // Translate status and limit

-       $content['status'] = SURFBAR_TRANSLATE_STATUS($content['status']);

        $content['limit'] = SURFBAR_TRANSLATE_LIMIT($content['limit']);
 
        // If in reg-mode we notify admin
        $content['limit'] = SURFBAR_TRANSLATE_LIMIT($content['limit']);
 
        // If in reg-mode we notify admin


@@ -1165,6 +1181,9 @@ function SURFBAR_DETERMINE_WAIT_TIME () {
 function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array()) {
        global $_CONFIG;
 
 function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array()) {
        global $_CONFIG;
 

+       // Make new status always lower-case
+       $newStatus = strtolower($newStatus);
+

        // Get URL data for status comparison if missing
        if ((!is_array($data)) || (count($data) == 0)) {
                // Fetch missing URL data
        // Get URL data for status comparison if missing
        if ((!is_array($data)) || (count($data) == 0)) {
                // Fetch missing URL data


@@ -1191,25 +1210,28 @@ function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array())
        // ---------- Comment out for debugging/developing member actions! ---------
 
        // Was that fine?
        // ---------- Comment out for debugging/developing member actions! ---------
 
        // Was that fine?

-       if (SQL_AFFECTEDROWS() != 1) {
-               // No, something went wrong
-               return false;
-       } // END - if
+       //if (SQL_AFFECTEDROWS() != 1) {
+       //      // No, something went wrong
+       //      return false;
+       //} // END - if

 
        // Prepare content for notification routines
        $data[$urlId]['uid']         = $data[$urlId]['userid'];
        $data[$urlId]['frametester'] = FRAMETESTER($data[$urlId]['url']);
        $data[$urlId]['reward']      = TRANSLATE_COMMA($_CONFIG['surfbar_static_reward']);
        $data[$urlId]['costs']       = TRANSLATE_COMMA($_CONFIG['surfbar_static_costs']);
 
        // Prepare content for notification routines
        $data[$urlId]['uid']         = $data[$urlId]['userid'];
        $data[$urlId]['frametester'] = FRAMETESTER($data[$urlId]['url']);
        $data[$urlId]['reward']      = TRANSLATE_COMMA($_CONFIG['surfbar_static_reward']);
        $data[$urlId]['costs']       = TRANSLATE_COMMA($_CONFIG['surfbar_static_costs']);

-       $data[$urlId]['status']      = SURFBAR_TRANSLATE_STATUS($newStatus);
-       $data[$urlId]['registered']  = MAKE_DATETIME($data[$urlId]['registered'], "2");
-       $newStatus = strtolower($newStatus);
+
+       // Do some dirt fixing here:
+       if (($data[$urlId]['status'] == "STOPPED") && ($newStatus == "pending")) {
+               // Fix for template change
+               $newStatus = "continued";
+       } // END - if

 
        // Send admin notification
 
        // Send admin notification

-       SURFBAR_NOTIFY_ADMIN("url_{$newStatus}", $data[$urlId]);
+       SURFBAR_NOTIFY_ADMIN("url_{$data[$urlId]['status']}_{$newStatus}", $data[$urlId]);

 
        // Send user notification
 
        // Send user notification

-       SURFBAR_NOTIFY_USER("url_{$newStatus}", $data[$urlId]);
+       SURFBAR_NOTIFY_USER("url_{$data[$urlId]['status']}_{$newStatus}", $data[$urlId]);

 
        // All done!
        return true;
 
        // All done!
        return true;