Moritz Schmidt 10 年之前
父节点
当前提交
aaced4656b
共有 4 个文件被更改,包括 10 次插入3 次删除
  1. 2 3
      ajax.php
  2. 2 0
      includes/functions.inc.php
  3. 4 0
      includes/reminder.inc.php
  4. 2 0
      scripts/custom.js

+ 2 - 3
ajax.php

@@ -293,7 +293,7 @@ switch($_REQUEST['action']) {
         $upcomingReminders = getObjectsAsArray(Reminder::getUpcomingRemindersByUserID($_REQUEST['userID']), array("id", "userID", "reminderDate", "remindedYet"));
 
         $return = array(
-            "type"      => "reminder",
+            "type"      => $upcomingReminders == "" ? "ping" : "reminder",
             "reminders" => $upcomingReminders
         );
 
@@ -332,8 +332,7 @@ switch($_REQUEST['action']) {
         echo json_encode($return);
         break;
     case 'debugTest': // for testing single methods etc.
-        pa(Reminder::getUpcomingRemindersByUserID(1));
-        pa(getObjectsAsArray(Reminder::getUpcomingRemindersByUserID(1), array("id", "userID", "reminderDate", "remindedYet")));
+        pa(Reminder::getUpcomingRemindersByUserID($_REQUEST['userID']), array("id", "userID", "reminderDate", "remindedYet"));
         break;
     default:
         header("Status: 400 No Action Defined");

+ 2 - 0
includes/functions.inc.php

@@ -11,6 +11,8 @@ function error($message) {
 }
 
 function getObjectsAsArray($objects, $keys) {
+	if(!$objects)
+		return "";
 	$return = array();
 	if(is_array($objects)) {
 		foreach($objects as $object) {

+ 4 - 0
includes/reminder.inc.php

@@ -116,6 +116,10 @@ class Reminder {
 
         $return = array();
 
+        if(!$reminders) {
+            return false;
+        }
+
         foreach($reminders as $reminder) {
             $return[] = new Reminder($reminder->id, $reminder->user_id, $reminder->reminder_date, $reminder->reminded_yet);
         }

+ 2 - 0
scripts/custom.js

@@ -86,6 +86,8 @@ $(document).ready(function() {
                         }
                     });
                     break;
+                case 'ping':
+                    break;
                 default:
                     console.log("unknown event type:" + r['type']);