Adds expires value to output

This commit is contained in:
nikolark committed 2015-07-07 17:15:06 +02:00
1 parent 0d4510c30d
commit d7979a3691
1 file changed
+2 -3
+2 -3
View File
@@ -1,5 +1,4 @@
<?php
// TODO: limit access by API-key
set_include_path("../includes/");
require_once("../inside/credentials.php");
require_once("../includes/DB.php");
@@ -114,7 +113,7 @@ $sql = "SELECT DISTINCT u.id
AND ug.group_id=2 /* Note: Always filter on active group */
$valid_membership_query";
// Overrid query with groups
// Override query with groups
if(count($groups) > 0) {
$sql = "SELECT DISTINCT u.id
FROM din_user u
@@ -150,7 +149,7 @@ $conn->setFetchMode(DB_FETCHMODE_ASSOC);
/* Get data */
$sql_is_member = "u.expires > NOW() OR u.expires IS NULL AS is_member";
$sql_groups = "GROUP_CONCAT(DISTINCT g.id,';',g.name SEPARATOR ',') AS groups";
$data_sql = "SELECT u.id,u.username,u.firstname,u.lastname,u.email,up.number,$sql_groups,$sql_is_member
$data_sql = "SELECT u.id,u.username,u.firstname,u.lastname,u.email,up.number,u.expires,$sql_groups,$sql_is_member
FROM din_user as u
LEFT JOIN din_userphonenumber as up ON up.user_id=u.id
LEFT JOIN din_usergrouprelationship AS ug ON u.id=ug.user_id