projects / mailer.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Failed SQL queries are now also reported in bug mails, SQL queries improved (more...
[mailer.git] / inc / libs / surfbar_functions.php
diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index 5b2bca1ce726ea51b19db1c9c02d458ed9688d96..ab04a7fa5da55d1f803bb5f38a8f97c683799d32 100644 (file)
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -108,7 +109,7 @@ function SURFBAR_ADMIN_UNLOCK_URL_IDS ($IDs) {
        } elseif (!is_array($IDs)) {
                // No array
                return false;
-       } elseif (count($IDs) == '0') {
+       } elseif (count($IDs) == 0) {
                // Empty array
                return false;
        }
@@ -135,7 +136,7 @@ function SURFBAR_ADMIN_REJECT_URL_IDS ($IDs) {
        } elseif (!is_array($IDs)) {
                // No array
                return false;
-       } elseif (count($IDs) == '0') {
+       } elseif (count($IDs) == 0) {
                // Empty array
                return false;
        }
@@ -363,11 +364,11 @@ function SURFBAR_MEMBER_RESUBMIT_ACTION ($urlData) {
 // Display selected "action form"
 function SURFBAR_MEMBER_DISPLAY_ACTION_FORM ($action, $urlData) {
        // Translate some data
-       $urlData['registered']    = generateDateTime($urlData['registered'], 2);
-       $urlData['views_total']   = translateComma($urlData['views_total']);
-       $urlData['views_max']     = translateComma($urlData['views_max']);
-       $urlData['views_allowed'] = translateComma($urlData['views_allowed']);
-       $urlData['last_locked']   = generateDateTime($urlData['last_locked'], 2);
+       $urlData['url_registered'] = generateDateTime($urlData['url_registered'], 2);
+       $urlData['views_total']    = translateComma($urlData['views_total']);
+       $urlData['views_max']      = translateComma($urlData['views_max']);
+       $urlData['views_allowed']  = translateComma($urlData['views_allowed']);
+       $urlData['last_locked']    = generateDateTime($urlData['last_locked'], 2);
 
        // Is the lock reason empty?
        if (empty($urlData['lock_reason'])) {
@@ -552,12 +553,25 @@ function SURFBAR_GET_URL_DATA ($searchTerm, $column = 'id', $order = 'id', $sort
        } // 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, fixed_reload
-FROM `{?_MYSQL_PREFIX?}_surfbar_urls`
-WHERE %s='%s'".$add."
-ORDER BY %s %s
+       $result = SQL_QUERY_ESC("SELECT
+       `id`, `userid`, `url`,
+       `views_total`, `views_max`, `views_allowed`, `status`,
+       UNIX_TIMESTAMP(`registered`) AS `url_registered`, UNIX_TIMESTAMP(`last_locked`) AS `last_locked`, `lock_reason`,
+       `views_max`, `views_allowed`, `fixed_reload`
+FROM
+       `{?_MYSQL_PREFIX?}_surfbar_urls`
+WHERE
+       `%s`='%s'".$add."
+ORDER BY
+       `%s` %s
 %s",
-       array($column, $searchTerm, $order, $sort, $limit), __FUNCTION__, __LINE__);
+               array(
+                       $column,
+                       $searchTerm,
+                       $order,
+                       $sort,
+                       $limit
+               ), __FUNCTION__, __LINE__);
 
        // Is there at least one record?
        if (SQL_NUMROWS($result) > 0) {
@@ -639,14 +653,14 @@ function SURFBAR_INSERT_URL_BY_ARRAY ($urlData) {
 
        // Just run the insert query for now
        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(
-       $userid,
-       $urlData['url'],
-       $urlData['status'],
-       $urlData['limit'],
-       $urlData['limit'],
-       $urlData['reload']
-       ), __FUNCTION__, __LINE__
+               array(
+                       $userid,
+                       $urlData['url'],
+                       $urlData['status'],
+                       $urlData['limit'],
+                       $urlData['limit'],
+                       $urlData['reload']
+               ), __FUNCTION__, __LINE__
        );
 
        // Return insert id
@@ -670,12 +684,12 @@ function SURFBAR_NOTIFY_ADMIN ($messageType, $content) {
        } // END - if
 
        // Translate some data if present
-       if (isset($content['status']))        $content['status']        = translateSurfbarUrlStatus($content['status']);
-       if (isset($content['registered']))    $content['registered']    = generateDateTime($content['registered'], 2);
-       if (isset($content['last_locked']))   $content['last_locked']   = generateDateTime($content['last_locked'], 2);
-       if (isset($content['views_total']))   $content['views_total']   = translateComma($content['views_total']);
-       if (isset($content['views_allowed'])) $content['views_allowed'] = translateComma($content['views_allowed']);
-       if (isset($content['views_max']))     $content['views_max']     = translateComma($content['views_max']);
+       if (isset($content['status']))         $content['status']         = translateSurfbarUrlStatus($content['status']);
+       if (isset($content['url_registered'])) $content['url_registered'] = generateDateTime($content['url_registered'], 2);
+       if (isset($content['last_locked']))    $content['last_locked']    = generateDateTime($content['last_locked'], 2);
+       if (isset($content['views_total']))    $content['views_total']    = translateComma($content['views_total']);
+       if (isset($content['views_allowed']))  $content['views_allowed']  = translateComma($content['views_allowed']);
+       if (isset($content['views_max']))      $content['views_max']      = translateComma($content['views_max']);
 
        // Send the notification out
        return sendAdminNotification($subject, $templateName, $content, $content['userid']);
@@ -703,12 +717,12 @@ function SURFBAR_NOTIFY_USER ($messageType, $content) {
        } // END - if
 
        // Translate some data if present
-       if (isset($content['status']))        $content['status']        = translateSurfbarUrlStatus($content['status']);
-       if (isset($content['registered']))    $content['registered']    = generateDateTime($content['registered'], 2);
-       if (isset($content['last_locked']))   $content['last_locked']   = generateDateTime($content['last_locked'], 2);
-       if (isset($content['views_total']))   $content['views_total']   = translateComma($content['views_total']);
-       if (isset($content['views_allowed'])) $content['views_allowed'] = translateComma($content['views_allowed']);
-       if (isset($content['views_max']))     $content['views_max']     = translateComma($content['views_max']);
+       if (isset($content['status']))         $content['status']         = translateSurfbarUrlStatus($content['status']);
+       if (isset($content['url_registered'])) $content['url_registered'] = generateDateTime($content['url_registered'], 2);
+       if (isset($content['last_locked']))    $content['last_locked']    = generateDateTime($content['last_locked'], 2);
+       if (isset($content['views_total']))    $content['views_total']    = translateComma($content['views_total']);
+       if (isset($content['views_allowed']))  $content['views_allowed']  = translateComma($content['views_allowed']);
+       if (isset($content['views_max']))      $content['views_max']      = translateComma($content['views_max']);
 
        // Load template
        $mailText = loadEmailTemplate($templateName, $content, $content['userid']);
@@ -798,10 +812,10 @@ function SURFBAR_DETERMINE_TEMPLATE_NAME() {
        $templateName = "surfbar_frameset";
 
        // Any frame set? ;-)
-       if (isGetRequestElementSet('frame')) {
+       if (isGetRequestParameterSet('frame')) {
                // Use the frame as a template name part... ;-)
                $templateName = sprintf("surfbar_frame_%s",
-               getRequestElement('frame')
+               getRequestParameter('frame')
                );
        } // END - if
 
@@ -874,7 +888,7 @@ function SURFBAR_GET_TOTAL_URLS ($status = 'ACTIVE', $excludeUserId = '0') {
        $userids = SURFBAR_DETERMINE_DEPLETED_USERIDS();
 
        // If we dont get any user ids back, there are no URLs
-       if (count($userids['userid']) == '0') {
+       if (count($userids['userid']) == 0) {
                // No user ids found, no URLs!
                return 0;
        } // END - if
@@ -978,7 +992,7 @@ function SURFBAR_GENERATE_VALIDATION_CODE ($urlId, $salt = '') {
        $hashedCode = generateHash(md5($valCode), SURFBAR_GET_SALT());
 
        // Finally encrypt it PGP-like and return it
-       $valHashedCode = generatePassString($hashedCode);
+       $valHashedCode = encodeHashForCookie($hashedCode);
 
        // Return hashed value
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'finalValCode='.$valHashedCode.'', false);
@@ -1244,7 +1258,7 @@ function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array())
        $newStatus = strtolower($newStatus);
 
        // Get URL data for status comparison if missing
-       if ((!is_array($data)) || (count($data) == '0')) {
+       if ((!is_array($data)) || (count($data) == 0)) {
                // Fetch missing URL data
                $data = SURFBAR_GET_URL_DATA($urlId);
        } // END - if
@@ -1431,14 +1445,25 @@ ORDER BY
 // "Getter" for maximum random number
 function SURFBAR_GET_MAX_RANDOM ($userids, $add) {
        // Count max availabe entries
-       $result = SQL_QUERY("SELECT sbu.id AS cnt
-FROM `{?_MYSQL_PREFIX?}_surfbar_urls` AS sbu
-LEFT JOIN `{?_MYSQL_PREFIX?}_surfbar_salts` AS sbs
-ON sbu.id=sbs.url_id
-LEFT JOIN `{?_MYSQL_PREFIX?}_surfbar_locks` AS l
-ON sbu.id=l.url_id
-WHERE sbu.userid NOT IN (".implode(',', $userids).") AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0)) AND sbu.`status`='ACTIVE'".$add."
-GROUP BY sbu.id", __FUNCTION__, __LINE__);
+       $result = SQL_QUERY("SELECT
+       sbu.id AS cnt
+FROM
+       `{?_MYSQL_PREFIX?}_surfbar_urls` AS sbu
+LEFT JOIN
+       `{?_MYSQL_PREFIX?}_surfbar_salts` AS sbs
+ON
+       sbu.id=sbs.url_id
+LEFT JOIN
+       `{?_MYSQL_PREFIX?}_surfbar_locks` AS l
+ON
+       sbu.id=l.url_id
+WHERE
+       sbu.userid NOT IN (".implode(',', $userids).") AND
+       (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0)) AND
+       sbu.`status`='ACTIVE'
+       ".$add."
+GROUP BY
+       sbu.id ASC", __FUNCTION__, __LINE__);
 
        // Log last query
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'lastQuery='.getConfig('db_last_query').'|numRows='.SQL_NUMROWS($result).'|Affected='.SQL_AFFECTEDROWS().'', false);
@@ -1459,10 +1484,19 @@ function SURFBAR_GET_USER_URLS () {
        $URLs = array();
 
        // Begin the query
-       $result = SQL_QUERY_ESC("SELECT u.id, u.userid, u.url, u.views_total, u.views_max, u.views_allowed, u.status, UNIX_TIMESTAMP(u.registered) AS registered, UNIX_TIMESTAMP(u.last_locked) AS last_locked, u.lock_reason AS lock_reason
-FROM `{?_MYSQL_PREFIX?}_surfbar_urls` AS u
-WHERE u.userid=%s AND u.status != 'DELETED'
-ORDER BY u.id ASC",
+       $result = SQL_QUERY_ESC("SELECT
+       u.id, u.userid, u.url, u.status,
+       u.views_total, u.views_max, u.views_allowed,
+       UNIX_TIMESTAMP(u.registered) AS url_registered,
+       UNIX_TIMESTAMP(u.last_locked) AS last_locked,
+       u.lock_reason AS lock_reason
+FROM
+       `{?_MYSQL_PREFIX?}_surfbar_urls` AS u
+WHERE
+       u.userid=%s AND
+       u.status != 'DELETED'
+ORDER BY
+       u.id ASC",
        array(getMemberId()), __FUNCTION__, __LINE__);
 
        // Are there entries?
Mailer-Project repository