Mirror/Gazelle
1
0
Fork 0
mirror of https://github.com/WhatCD/Gazelle.git synced 2025-02-21 20:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Empty commit

Browse Source
This commit is contained in:
Git 2014-04-04 08:00:50 +00:00
parent ebf316c74f
commit cdac28e9de
1 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
classes/notificationsmanager.class.php
View File

@ -66,7 +66,7 @@ function __construct($UserID, $Skip = array(), $Load = true, $AutoSkip = true) {
if ($AutoSkip) {
foreach ($this->Settings as $Key => $Value) {
// Skip disabled and traditional settings
if ($Value == self::OPT_DISABLED || $Value == self::OPT_TRADITIONAL) {
if ($Value == self::OPT_DISABLED || $this->is_traditional($Key)) {
$this->Skipped[$Key] = true;
}
}
@ -645,24 +645,16 @@ public static function save_settings($UserID, $Settings) {
}
$Update = array();
foreach (self::$Types as $Type) {
$Popup = array_key_exists("notifications_$Type" . '_popup', $Settings);
$Traditional = array_key_exists("notifications_$Type" . '_traditional', $Settings);
$Push = array_key_exists("notifications_$Type" . '_push', $Settings);
$Popup = array_key_exists("notifications_{$Type}_popup", $Settings);
$Traditional = array_key_exists("notifications_{$Type}_traditional", $Settings);
$Push = array_key_exists("notifications_{$Type}_push", $Settings);
$Result = self::OPT_DISABLED;
if ($Popup) {
$Result = self::OPT_POPUP;
}
if ($Traditional) {
$Result = self::OPT_TRADITIONAL;
}
if ($Push) {
$Result = self::OPT_POPUP;
}
if ($Popup && $Push) {
$Result = self::OPT_POPUP_PUSH;
}
if ($Traditional && $Push) {
$Result = self::OPT_TRADITIONAL_PUSH;
$Result = $Push ? self::OPT_POPUP_PUSH : self::OPT_POPUP;
} elseif ($Traditional) {
$Result = $Push ? self::OPT_TRADITIONAL_PUSH : self::OPT_TRADITIONAL;
} elseif ($Push) {
$Result = self::OPT_PUSH;
}
$Update[] = "$Type = $Result";
}
@ -678,7 +670,6 @@ public static function save_settings($UserID, $Settings) {
$PushOptionsArray = array("PushKey" => $_POST['pushkey']);
if ($PushService === 6) { //pushbullet
$PushOptionsArray['PushDevice'] = $_POST['pushdevice'];
}
$PushOptions = db_string(serialize($PushOptionsArray));
@ -700,7 +691,7 @@ public static function save_settings($UserID, $Settings) {
}
public function is_traditional($Type) {
return $this->Settings[$Type] == self::OPT_TRADITIONAL;
return $this->Settings[$Type] == self::OPT_TRADITIONAL || $this->Settings[$Type] == self::OPT_TRADITIONAL_PUSH;
}
public function is_skipped($Type) {
@ -708,7 +699,7 @@ public function is_skipped($Type) {
}
public function use_noty() {
return in_array(self::OPT_POPUP, $this->Settings);
return in_array(self::OPT_POPUP, $this->Settings) || in_array(self::OPT_POPUP_PUSH, $this->Settings);
}
/**
@ -720,7 +711,7 @@ public function use_noty() {
* @param string $URL url for the push notification to contain
* @param string $Type what sort of push is it? PM, Rippy, News, etc
*/
public static function send_push($UserIDs, $Title, $Body, $URL = '', $Type = 'Global') {
public static function send_push($UserIDs, $Title, $Body, $URL = '', $Type = self::GLOBALNOTICE) {
if (!is_array($UserIDs)) {
$UserIDs = array($UserIDs);
}
@ -731,8 +722,7 @@ public static function send_push($UserIDs, $Title, $Body, $URL = '', $Type = 'Gl
SELECT
p.PushService, p.PushOptions
FROM users_notifications_settings AS n
JOIN users_push_notifications AS p
ON n.UserID = p.UserID
JOIN users_push_notifications AS p ON n.UserID = p.UserID
WHERE n.UserID = '$UserID'
AND p.PushService != 0";
if ($Type != self::GLOBALNOTICE) {