summaryrefslogtreecommitdiff
path: root/includes/lib
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2012-03-22 12:57:57 +0100
committerMichael Tänzer <neo@nhng.de>2012-03-22 12:57:57 +0100
commit41f8cea59b92bd746540c2a688d8a6c9151eaf4a (patch)
treefc35fe90b772f239151237e878e57e4e6951b9c7 /includes/lib
parent01c885f8fc88cd42c750890b9accf67adfbeee40 (diff)
downloadcacert-devel-41f8cea59b92bd746540c2a688d8a6c9151eaf4a.tar.gz
cacert-devel-41f8cea59b92bd746540c2a688d8a6c9151eaf4a.tar.xz
cacert-devel-41f8cea59b92bd746540c2a688d8a6c9151eaf4a.zip
bug 1024: Put the SQL query into a single string literal
Makes editing and reading easier Signed-off-by: Michael Tänzer <neo@nhng.de>
Diffstat (limited to 'includes/lib')
-rw-r--r--includes/lib/account.php28
1 files changed, 14 insertions, 14 deletions
diff --git a/includes/lib/account.php b/includes/lib/account.php
index f7a24fa..65c75a4 100644
--- a/includes/lib/account.php
+++ b/includes/lib/account.php
@@ -21,13 +21,13 @@ function fix_assurer_flag($userID)
{
// Update Assurer-Flag on users table if 100 points.
// Should the number of points be SUM(points) or SUM(awarded)?
- $query = mysql_query('UPDATE `users` AS `u` SET `assurer` = 1 WHERE '.
- '`u`.`id` = \''.(int)intval($userID).'\' AND '.
- 'EXISTS(SELECT 1 FROM `cats_passed` AS `cp`, `cats_variant` AS `cv` '.
- 'WHERE `cp`.`variant_id` = `cv`.`id` AND `cv`.`type_id` = 1 AND '.
- '`cp`.`user_id` = `u`.`id`) AND '.
- '(SELECT SUM(`points`) FROM `notary` AS `n` WHERE `n`.`to` = `u`.`id` '.
- 'AND (`n`.`expire` > now() OR `n`.`expire` IS NULL)) >= 100');
+ $query = mysql_query('UPDATE `users` AS `u` SET `assurer` = 1 WHERE
+ `u`.`id` = \''.(int)intval($userID).'\' AND
+ EXISTS(SELECT 1 FROM `cats_passed` AS `cp`, `cats_variant` AS `cv`
+ WHERE `cp`.`variant_id` = `cv`.`id` AND `cv`.`type_id` = 1 AND
+ `cp`.`user_id` = `u`.`id`) AND
+ (SELECT SUM(`points`) FROM `notary` AS `n` WHERE `n`.`to` = `u`.`id`
+ AND (`n`.`expire` > now() OR `n`.`expire` IS NULL)) >= 100');
// Challenge has been passed and non-expired points >= 100
if (!$query) {
@@ -35,13 +35,13 @@ function fix_assurer_flag($userID)
}
// Reset flag if requirements are not met
- $query = mysql_query('UPDATE `users` AS `u` SET `assurer` = 0 WHERE '.
- '`u`.`id` = \''.(int)intval($userID).'\' AND '.
- '(NOT EXISTS(SELECT 1 FROM `cats_passed` AS `cp`, `cats_variant` AS '.
- '`cv` WHERE `cp`.`variant_id` = `cv`.`id` AND `cv`.`type_id` = 1 '.
- 'AND `cp`.`user_id` = `u`.`id`) OR '.
- '(SELECT SUM(`points`) FROM `notary` AS `n` WHERE `n`.`to` = `u`.`id` '.
- 'AND (`n`.`expire` > now() OR `n`.`expire` IS NULL)) < 100)');
+ $query = mysql_query('UPDATE `users` AS `u` SET `assurer` = 0 WHERE
+ `u`.`id` = \''.(int)intval($userID).'\' AND
+ (NOT EXISTS(SELECT 1 FROM `cats_passed` AS `cp`, `cats_variant` AS
+ `cv` WHERE `cp`.`variant_id` = `cv`.`id` AND `cv`.`type_id` = 1
+ AND `cp`.`user_id` = `u`.`id`) OR
+ (SELECT SUM(`points`) FROM `notary` AS `n` WHERE `n`.`to` = `u`.`id`
+ AND (`n`.`expire` > now() OR `n`.`expire` IS NULL)) < 100)');
if (!$query) {
return false;