die();
} // END - if
-// -----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
// Admin functions
-// -----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
//
// Admin has added an URL with given user id and so on
function SURFBAR_ADMIN_ADD_URL ($url, $limit, $reload) {
}
//
-// -----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
// Member functions
-// -----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
//
// Member has added an URL
function SURFBAR_MEMBER_ADD_URL ($url, $limit) {
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
// 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);
}
//
-// -----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
// Member actions
-// -----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
//
// Retreat a booked URL
function SURFBAR_MEMBER_RETREAT_ACTION ($urlData) {
return true;
}
//
-// -----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
// Self-maintenance functions
-// -----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
//
// Main function
function SURFBAR_HANDLE_SELF_MAINTENANCE () {
}
//
-// -----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
// Generic functions
-// -----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
//
// Looks up by an URL
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
// 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 = '';
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
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
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__);
// Load all rows
while ($row = SQL_FETCHARRAY($result)) {
// Add the row
- $urlArray[$row['id']] = $row;
+ $urlArray[$row['url_id']] = $row;
} // END - while
} // END - if
$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?
// 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
$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.',';
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
return $nextId;
}
-// ----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
// Wrapper function
-// ----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
// "Getter" for surfbar_dynamic_percent
function getSurfbarDynamicPercent () {
return $GLOBALS[__FUNCTION__];
}
-// -----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
// PLEASE DO NOT ADD ANY OTHER FUNCTIONS BELOW THIS LINE IF THEY DON'T "WRAP"
// THE $GLOBALS['surfbar_cache'] ARRAY!
-// -----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
// Initializes the surfbar
function SURFBAR_INIT () {