Remove references to third-party Push services

classes/NMA_API.php

@@ -1,256 +0,0 @@
-<?php
-
-class NMA_API
-{
-
-    /**
-     * @const LIB_ERROR_TYPE can be exception or error
-     */
-    const LIB_ERROR_TYPE = 'error';
-
-    /**
-     * @const holds the api key verify url
-     */
-    const LIB_NMA_VERIFY = 'https://www.notifymyandroid.com/publicapi/verify';
-
-    /**
-     * @const holds the notify url
-     */
-    const LIB_NMA_NOTIFY = 'https://www.notifymyandroid.com/publicapi/notify';
-
-    /**
-     * toggles on debugging
-     *
-     * @var bool
-     */
-    public $debug = false;
-
-    public $apiCallsRemaining = false;
-
-    public $apiLimitReset = false;
-
-    public $lastStatus = false;
-    /**
-     * @var bool|string
-     */
-    protected $apiKey = false;
-
-    /**
-     * @var bool|string
-     */
-    protected $devKey = false;
-
-
-    protected $error_codes
-        = array(
-            200     => 'Notification submitted.',
-            400     => 'The data supplied is in the wrong format, invalid length or null.',
-            401     => 'None of the API keys provided were valid.',
-            402     => 'Maximum number of API calls per hour exceeded.',
-            500     => 'Internal server error. Please contact our support if the problem persists.'
-        );
-
-    /**
-     * @param array $options
-     */
-    function __construct($options = [])
-    {
-        if (!isset($options['apikey'])) {
-            return $this->error('You must supply a API Key');
-        } else {
-            $this->apiKey = $options['apikey'];
-        }
-
-        if (isset($options['developerkey'])) {
-            $this->devKey = $options['developerkey'];
-        }
-
-        if (isset($options['debug'])) {
-            $this->debug = true;
-        }
-
-        return true; // this shuts my ide up
-
-    }
-
-
-    /**
-     * @param bool $key [optional] if not set the one used on construct is used
-     *
-     * @return bool|mixed|SimpleXMLElement|string
-     */
-    public function verify($key = false)
-    {
-
-        $options = [];
-
-        if ($key !== false) {
-            $options['apikey'] = $key;
-        } else {
-            $options['apikey'] = $this->apiKey;
-        }
-
-
-        if ($this->devKey) {
-            $options['developerkey'] = $this->devKey;
-        }
-
-        return $this->makeApiCall(self::LIB_NMA_VERIFY, $options);
-    }
-
-    /**
-     * @param string $application
-     * @param string $event
-     * @param string $description
-     * @param string $url
-     * @param int    $priority
-     * @param bool   $apiKeys
-     *
-     * @return bool|mixed|SimpleXMLElement|string
-     */
-    public function notify($application = '', $event = '', $description = '', $url = '', $priority = 0, $apiKeys = false)
-    {
-        if (empty($application) || empty($event) || empty($description)) {
-            return $this->error('you must supply a application name, event and long desc');
-        }
-
-        $post = array('application' => substr($application, 0, 256),
-                      'event'       => substr($event, 0, 1000),
-                      'description' => substr($description, 0, 10000),
-                      'priority'    => $priority
-        );
-    if (!empty($url)) {
-      $post['url'] = substr($url, 0, 2000);
-    }
-        if ($this->devKey) {
-            $post['developerkey'] = $this->devKey;
-        }
-
-        if ($apiKeys !== false) {
-            $post['apikey'] = $apiKeys;
-        } else {
-            $post['apikey'] = $this->apiKey;
-        }
-
-        return $this->makeApiCall(self::LIB_NMA_NOTIFY, $post, 'POST');
-    }
-
-
-    /**
-     * @param        $url
-     * @param null   $params
-     * @param string $verb
-     * @param string $format
-     *
-     * @return bool|mixed|SimpleXMLElement|string
-     * @throws Exception
-     */
-    protected function makeApiCall($url, $params = null, $verb = 'GET', $format = 'xml')
-    {
-        $cparams = array(
-            'http' => array(
-                'method'        => $verb,
-                'ignore_errors' => true
-            )
-        );
-        if ($params !== null && !empty($params)) {
-            $params = http_build_query($params);
-            if ($verb == 'POST') {
-                $cparams["http"]['header'] = 'Content-Type: application/x-www-form-urlencoded';
-                $cparams['http']['content'] = $params;
-            } else {
-                $url .= '?' . $params;
-            }
-        } else {
-            return $this->error(
-                'this api requires all calls to have params' . $this->debug ? ', you provided: ' . var_dump($params)
-                    : ''
-            );
-        }
-
-        $context = stream_context_create($cparams);
-        $fp = fopen($url, 'rb', false, $context);
-        if (!$fp) {
-            $res = false;
-        } else {
-
-            if ($this->debug) {
-                $meta = stream_get_meta_data($fp);
-                $this->error('var dump of http headers' . var_dump($meta['wrapper_data']));
-            }
-
-            $res = stream_get_contents($fp);
-        }
-
-        if ($res === false) {
-            return $this->error("$verb $url failed: $php_errormsg");
-        }
-
-        switch ($format) {
-            case 'json':
-                return $this->error('this api does not support json');
-            /*
-            * uncomment the below if json is added later
-            * $r = json_decode($res);
-           if ($r === null) {
-               return $this->error("failed to decode $res as json");
-           }
-           return $r;*/
-
-            case 'xml':
-                $r = simplexml_load_string($res);
-                if ($r === null) {
-                    return $this->error("failed to decode $res as xml");
-                }
-                return $this->process_xml_return($r);
-        }
-        return $res;
-    }
-
-    /**
-     * @param     $message
-     * @param int $type
-     *
-     * @return bool
-     * @throws Exception
-     */
-    private function error($message, $type = E_USER_NOTICE)
-    {
-        if (self::LIB_ERROR_TYPE == 'error') {
-            trigger_error($message, $type);
-            return false;
-        } else {
-            throw new Exception($message, $type);
-        }
-    }
-
-    /**
-     * @param SimpleXMLElement $obj
-     *
-     * @return bool
-     */
-    private function process_xml_return(SimpleXMLElement $obj)
-    {
-
-        if (isset($obj->success)) {
-            $this->lastStatus = $obj->success["@attributes"]['code'];
-
-            $this->apiCallsRemaining = $obj->success["@attributes"]['remaining'];
-            $this->apiLimitReset = $obj->success["@attributes"]['resettimer'];
-            return true;
-        } elseif (isset($obj->error)) {
-            if (isset($obj->error["@attributes"])) {
-                $this->lastStatus = $obj->error["@attributes"]['code'];
-
-                if (isset($obj->error["@attributes"]['resettimer'])) {
-                    $this->apiLimitReset = $obj->error["@attributes"]['resettimer'];
-                }
-
-            }
-            return $this->error($obj->error);
-        } else {
-            return $this->error("unkown error");
-        }
-    }
-
-}

classes/misc.class.php

@@ -137,8 +137,6 @@ class Misc {
           AND InInbox = '1'");
       list($UnRead) = G::$DB->next_record();
       G::$Cache->cache_value("inbox_new_$ID", $UnRead);
-
-      NotificationsManager::send_push($ID, "Message from $SenderName, Subject: $UnescapedSubject", $UnescapedBody, site_url() . 'inbox.php', NotificationsManager::INBOX);
     }
 
     G::$DB->set_query_id($QueryID);

classes/notificationsmanager.class.php

@@ -5,9 +5,6 @@ class NotificationsManager {
   const OPT_DISABLED = 0;
   const OPT_POPUP = 1;
   const OPT_TRADITIONAL = 2;
-  const OPT_PUSH = 3;
-  const OPT_POPUP_PUSH = 4;
-  const OPT_TRADITIONAL_PUSH = 5;
 
   // Importances
   const IMPORTANT = 'information';
@@ -628,10 +625,8 @@ class NotificationsManager {
       $QueryID = G::$DB->get_query_id();
       G::$DB->query("
         SELECT *
-        FROM users_notifications_settings AS n
-        LEFT JOIN users_push_notifications AS p
-        ON p.UserID = n.UserID
-        WHERE n.UserID = '$UserID'");
+        FROM users_notifications_settings
+        WHERE UserID = ?", $UserID);
       $Results = G::$DB->next_record(MYSQLI_ASSOC, false);
       G::$DB->set_query_id($QueryID);
       G::$Cache->cache_value("users_notifications_settings_$UserID", $Results, 0);
@@ -648,14 +643,11 @@ class NotificationsManager {
     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);
       $Result = self::OPT_DISABLED;
       if ($Popup) {
-        $Result = $Push ? self::OPT_POPUP_PUSH : self::OPT_POPUP;
+        $Result = self::OPT_POPUP;
       } elseif ($Traditional) {
-        $Result = $Push ? self::OPT_TRADITIONAL_PUSH : self::OPT_TRADITIONAL;
-      } elseif ($Push) {
-        $Result = self::OPT_PUSH;
+        $Result = self::OPT_TRADITIONAL;
       }
       $Update[] = "$Type = $Result";
     }
@@ -665,34 +657,14 @@ class NotificationsManager {
     G::$DB->query("
       UPDATE users_notifications_settings
       SET $Update
-      WHERE UserID = '$UserID'");
-
-    $PushService = (int) $_POST['pushservice'];
-    $PushOptionsArray = array("PushKey" => $_POST['pushkey']);
-    if ($PushService === 6) { //pushbullet
-      $PushOptionsArray['PushDevice'] = $_POST['pushdevice'];
-    }
-    $PushOptions = db_string(serialize($PushOptionsArray));
-
-    if ($PushService != 0) {
-      G::$DB->query("
-          INSERT INTO users_push_notifications
-            (UserID, PushService, PushOptions)
-          VALUES
-            ('$UserID', '$PushService', '$PushOptions')
-          ON DUPLICATE KEY UPDATE
-            PushService = '$PushService',
-            PushOptions = '$PushOptions'");
-    } else {
-      G::$DB->query("UPDATE users_push_notifications SET PushService = 0 WHERE UserID = '$UserID'");
-    }
+      WHERE UserID = ?", $UserID);
 
     G::$DB->set_query_id($QueryID);
     G::$Cache->delete_value("users_notifications_settings_$UserID");
   }
 
   public function is_traditional($Type) {
-    return $this->Settings[$Type] == self::OPT_TRADITIONAL || $this->Settings[$Type] == self::OPT_TRADITIONAL_PUSH;
+    return $this->Settings[$Type] == self::OPT_TRADITIONAL;
   }
 
   public function is_skipped($Type) {
@@ -700,101 +672,7 @@ class NotificationsManager {
   }
 
   public function use_noty() {
-    return in_array(self::OPT_POPUP, $this->Settings) || in_array(self::OPT_POPUP_PUSH, $this->Settings);
-  }
-
-  /**
-   * Send a push notification to a user
-   *
-   * @param array $UserIDs integer or array of integers of UserIDs to push
-   * @param string $Title the title to be displayed in the push
-   * @param string $Body the body of the push
-   * @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 = self::GLOBALNOTICE) {
-    if (!is_array($UserIDs)) {
-      $UserIDs = array($UserIDs);
-    }
-    foreach($UserIDs as $UserID) {
-      $UserID = (int) $UserID;
-      $QueryID = G::$DB->get_query_id();
-      $SQL = "
-        SELECT
-          p.PushService, p.PushOptions
-        FROM users_notifications_settings AS n
-          JOIN users_push_notifications AS p ON n.UserID = p.UserID
-        WHERE n.UserID = '$UserID'
-        AND p.PushService != 0";
-      if ($Type != self::GLOBALNOTICE) {
-        $SQL .= " AND n.$Type IN (" . self::OPT_PUSH . "," . self::OPT_POPUP_PUSH . "," . self::OPT_TRADITIONAL_PUSH . ")";
-      }
-      G::$DB->query($SQL);
-
-      if (G::$DB->has_results()) {
-        list($PushService, $PushOptions) = G::$DB->next_record(MYSQLI_NUM, false);
-        $PushOptions = unserialize($PushOptions);
-        switch ($PushService) {
-          case '1':
-            $Service = "NMA";
-            break;
-          case '2':
-            $Service = "Prowl";
-            break;
-          // Case 3 is missing because notifo is dead.
-          case '4':
-            $Service = "Toasty";
-            break;
-          case '5':
-            $Service = "Pushover";
-            break;
-          case '6':
-            $Service = "PushBullet";
-            break;
-          default:
-            break;
-          }
-          if (!empty($Service) && !empty($PushOptions['PushKey'])) {
-            $Options = array("service" => strtolower($Service),
-                    "user" => array("key" => $PushOptions['PushKey']),
-                    "message" => array("title" => $Title, "body" => $Body, "url" => $URL));
-
-            if ($Service === 'PushBullet') {
-              $Options["user"]["device"] = $PushOptions['PushDevice'];
-
-            }
-
-            $JSON = json_encode($Options);
-            G::$DB->query("
-              INSERT INTO push_notifications_usage
-                (PushService, TimesUsed)
-              VALUES
-                ('$Service', 1)
-              ON DUPLICATE KEY UPDATE
-                TimesUsed = TimesUsed + 1");
-
-            $PushServerSocket = fsockopen("127.0.0.1", 6789);
-            fwrite($PushServerSocket, $JSON);
-            fclose($PushServerSocket);
-          }
-      }
-      G::$DB->set_query_id($QueryID);
-    }
+    return in_array(self::OPT_POPUP, $this->Settings);
   }
 
-  /**
-   * Gets users who have push notifications enabled
-   *
-   */
-  public static function get_push_enabled_users() {
-    $QueryID = G::$DB->get_query_id();
-    G::$DB->query("
-      SELECT UserID
-      FROM users_push_notifications
-      WHERE PushService != 0
-        AND UserID != '" . G::$LoggedUser['ID']. "'");
-    $PushUsers = G::$DB->collect("UserID");
-    G::$DB->set_query_id($QueryID);
-    return $PushUsers;
-  }
 }

classes/notificationsmanagerview.class.php

@@ -17,43 +17,8 @@ class NotificationsManagerView {
     }
   }
 
-  private static function render_push_settings() {
-    $PushService = self::$Settings['PushService'];
-    $PushOptions = unserialize(self::$Settings['PushOptions']);
-    if (empty($PushOptions['PushDevice'])) {
-      $PushOptions['PushDevice'] = '';
-    }
-    ?>
-    <tr>
-      <td class="label"><strong>Push notifications</strong></td>
-      <td>
-        <select name="pushservice" id="pushservice">
-          <option value="0"<? if (empty($PushService)) { ?> selected="selected"<? } ?>>Disable push notifications</option>
-          <option value="1"<? if ($PushService == 1) { ?> selected="selected"<? } ?>>Notify My Android</option>
-          <option value="2"<? if ($PushService == 2) { ?> selected="selected"<? } ?>>Prowl</option>
-<!--            No option 3, notifo died. -->
-          <option value="4"<? if ($PushService == 4) { ?> selected="selected"<? } ?>>Super Toasty</option>
-          <option value="5"<? if ($PushService == 5) { ?> selected="selected"<? } ?>>Pushover</option>
-          <option value="6"<? if ($PushService == 6) { ?> selected="selected"<? } ?>>PushBullet</option>
-        </select>
-        <div id="pushsettings" style="display: none;">
-          <label id="pushservice_title" for="pushkey">API key</label>
-          <input type="text" size="50" name="pushkey" id="pushkey" value="<?=display_str($PushOptions['PushKey'])?>" />
-          <label class="pushdeviceid" id="pushservice_device" for="pushdevice">Device ID</label>
-          <select class="pushdeviceid" name="pushdevice" id="pushdevice">
-            <option value="<?= display_str($PushOptions['PushDevice'])?>" selected="selected"><?= display_str($PushOptions['PushDevice'])?></option>
-          </select>
-          <br />
-          <a href="user.php?action=take_push&amp;push=1&amp;userid=<?=G::$LoggedUser['ID']?>&amp;auth=<?=G::$LoggedUser['AuthKey']?>" class="brackets">Test push</a>
-          <a href="wiki.php?action=article&amp;id=1017" class="brackets">View wiki guide</a>
-        </div>
-      </td>
-    </tr>
-<?  }
-
   public static function render_settings($Settings) {
     self::$Settings = $Settings;
-    self::render_push_settings();
 ?>
     <tr>
       <td class="label">
@@ -124,11 +89,10 @@ class NotificationsManagerView {
     </tr>
 <?  }
 
-  private static function render_checkbox($Name, $Traditional = false, $Push = true) {
+  private static function render_checkbox($Name, $Traditional = false) {
     $Checked = self::$Settings[$Name];
-    $PopupChecked = $Checked == NotificationsManager::OPT_POPUP || $Checked == NotificationsManager::OPT_POPUP_PUSH || !isset($Checked) ? ' checked="checked"' : '';
-    $TraditionalChecked = $Checked == NotificationsManager::OPT_TRADITIONAL || $Checked == NotificationsManager::OPT_TRADITIONAL_PUSH ? ' checked="checked"' : '';
-    $PushChecked = $Checked == NotificationsManager::OPT_TRADITIONAL_PUSH || $Checked == NotificationsManager::OPT_POPUP_PUSH || $Checked == NotificationsManager::OPT_PUSH ? ' checked="checked"' : '';
+    $PopupChecked = $Checked == NotificationsManager::OPT_POPUP || !isset($Checked) ? ' checked="checked"' : '';
+    $TraditionalChecked = $Checked == NotificationsManager::OPT_TRADITIONAL ? ' checked="checked"' : '';
 
 ?>
     <label>
@@ -140,12 +104,6 @@ class NotificationsManagerView {
       <input type="checkbox" name="notifications_<?=$Name?>_traditional" id="notifications_<?=$Name?>_traditional"<?=$TraditionalChecked?> />
       Traditional
     </label>
-<?    }
-    if ($Push) { ?>
-    <label>
-      <input type="checkbox" name="notifications_<?=$Name?>_push" id="notifications_<?=$Name?>_push"<?=$PushChecked?> />
-      Push
-    </label>
 <?    }
   }
 

classes/pushserver.class.php

@@ -1,184 +0,0 @@
-<?php
-define("PUSH_SOCKET_LISTEN_ADDRESS", "127.0.0.1");
-define("PUSH_SOCKET_LISTEN_PORT", 6789);
-
-require 'NMA_API.php';
-require 'config.php';
-class PushServer {
-  private $ListenSocket = false;
-  private $State = 1;
-  private $Listened = false;
-
-  public function __construct() {
-    // restore_error_handler(); //Avoid PHP error logging
-    set_time_limit(0);
-    $this->init();
-    $this->listen();
-  }
-
-  private function init() {
-    $this->ListenSocket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
-    socket_set_option($this->ListenSocket, SOL_SOCKET, SO_REUSEADDR, 1);
-    socket_bind($this->ListenSocket, PUSH_SOCKET_LISTEN_ADDRESS, PUSH_SOCKET_LISTEN_PORT);
-    socket_listen($this->ListenSocket);
-    socket_set_nonblock($this->ListenSocket);
-    echo "\nInitialized\n";
-  }
-
-  private function listen() {
-    echo "\nListening...\n";
-    while ( ($this->State) == 1 ) {
-      if ($this->Listened = @socket_accept($this->ListenSocket)) {
-        $Data = socket_read($this->Listened, 512);
-        $this->parse_data($Data);
-      }
-      usleep(5000);
-    }
-  }
-
-  private function parse_data($Data) {
-    $JSON = json_decode($Data, true);
-    $Service = strtolower($JSON['service']);
-    switch ($Service) {
-      case 'nma':
-        $this->push_nma($JSON['user']['key'], $JSON['message']['title'], $JSON['message']['body'], $JSON['message']['url']);
-        break;
-      case 'prowl':
-        $this->push_prowl($JSON['user']['key'], $JSON['message']['title'], $JSON['message']['body'], $JSON['message']['url']);
-        break;
-      case 'toasty':
-        $this->push_toasty($JSON['user']['key'], $JSON['message']['title'], $JSON['message']['body'], $JSON['message']['url']);
-        break;
-      case 'pushover':
-        $this->push_pushover($JSON['user']['key'], $JSON['message']['title'], $JSON['message']['body'], $JSON['message']['url']);
-        break;
-      case 'pushbullet':
-        $this->push_pushbullet(
-          $JSON['user']['key'],
-          $JSON['user']['device'],
-          $JSON['message']['title'],
-          $JSON['message']['body'],
-          $JSON['message']['url']
-        );
-      default:
-        break;
-    }
-  }
-
-  private function push_prowl($Key, $Title, $Message, $URL) {
-    $API = "https://api.prowlapp.com/publicapi/add";
-    $Fields = array(
-        'apikey' => urlencode($Key),
-        'application' => urlencode(SITE_NAME),
-        'event' => urlencode($Title),
-        'description' => urlencode($Message)
-    );
-    if (!empty($URL)) {
-      $Fields['url'] = $URL;
-    }
-    $FieldsString = "";
-    foreach ($Fields as $key => $value) {
-      $FieldsString .= $key . '=' . $value . '&';
-    }
-    rtrim($FieldsString, '&');
-
-    $Curl = curl_init();
-    curl_setopt($Curl, CURLOPT_URL, $API);
-    curl_setopt($Curl, CURLOPT_POST, count($Fields));
-    curl_setopt($Curl, CURLOPT_POSTFIELDS, $FieldsString);
-    curl_exec($Curl);
-    curl_close($Curl);
-    echo "Push sent to Prowl";
-  }
-
-  private function push_toasty($Key, $Title, $Message, $URL) {
-    $API = "http://api.supertoasty.com/notify/" . urlencode($Key) . "?";
-    if (!empty($URL)) {
-      $Message = $Message . " " . $URL;
-    }
-    $Fields = array(
-        'title' => urlencode($Title),
-        'text' => urlencode($Message),
-        'sender' => urlencode(SITE_NAME)
-    );
-    $FieldsString = "";
-    foreach ($Fields as $key => $value) {
-      $FieldsString .= $key . '=' . $value . '&';
-    }
-    rtrim($FieldsString, '&');
-
-    $Curl = curl_init();
-    curl_setopt($Curl, CURLOPT_URL, $API);
-    curl_setopt($Curl, CURLOPT_POST, count($Fields));
-    curl_setopt($Curl, CURLOPT_POSTFIELDS, $FieldsString);
-    curl_exec($Curl);
-    curl_close($Curl);
-    echo "Push sent to Toasty";
-  }
-
-  private function push_nma($Key, $Title, $Message, $URL) {
-    $NMA = new NMA_API(array(
-        'apikey' => $Key
-    ));
-    if ($NMA->verify()) {
-      if ($NMA->notify(SITE_NAME, $Title, $Message, $URL)) {
-        echo "Push sent to NMA";
-      }
-    }
-  }
-
-  private function push_pushover($UserKey, $Title, $Message, $URL) {
-    curl_setopt_array($ch = curl_init(), array(
-        CURLOPT_URL => "https://api.pushover.net/1/messages.json",
-        CURLOPT_POSTFIELDS => array(
-            "token" => PUSHOVER_KEY,
-            "user" => $UserKey,
-            "title" => $Title,
-            "message" => $Message,
-            "url" => $URL
-        )
-    ));
-    curl_exec($ch);
-    curl_close($ch);
-    echo "Push sent to Pushover";
-  }
-
-  /**
-   * Notify via pushbullet
-   *
-   * @param $UserKey User API key
-   * @param $DeviceID device to push to
-   * @param $Title Notification title
-   * @param $Message Notification message
-   * @param $URL For compatibility with other command. Just gets appended.
-   */
-  private function push_pushbullet($UserKey, $DeviceID,
-    $Title, $Message, $URL) {
-    if (!empty($URL)) {
-      $Message .= ' ' . $URL;
-    }
-
-    curl_setopt_array($Curl = curl_init(), array(
-      CURLOPT_URL => 'https://api.pushbullet.com/api/pushes',
-      CURLOPT_POSTFIELDS => array(
-        'type' => 'note',
-        'title' => $Title,
-        'body' => $Message,
-        'device_iden' => $DeviceID
-      ),
-      CURLOPT_USERPWD => $UserKey . ':',
-      CURLOPT_HTTPAUTH => CURLAUTH_BASIC,
-      CURLOPT_RETURNTRANSFER => True
-    ));
-
-    $Result = curl_exec($Curl);
-    echo "Push sent to Pushbullet";
-    curl_close($Curl);
-
-
-
-  }
-}
-
-$PushServer = new PushServer();
-?>

classes/subscriptions.class.php

@@ -57,14 +57,14 @@ class Subscriptions {
         INSERT IGNORE INTO users_notify_quoted
           (UserID, QuoterID, Page, PageID, PostID, Date)
         VALUES
-          ('$UserID', '$QuoterID', '$Page', '$PageID', '$PostID', NOW())");
+          (    ?,               ?,               ?,      ?,       ?,   NOW())",
+          $Result['ID'], G::$LoggedUser['ID'], $Page, $PageID, $PostID);
       G::$Cache->delete_value("notify_quoted_$UserID");
       if ($Page == 'forums') {
         $URL = site_url() . "forums.php?action=viewthread&postid=$PostID";
       } else {
         $URL = site_url() . "comments.php?action=jump&postid=$PostID";
       }
-      NotificationsManager::send_push($UserID, 'New Quote!', 'Quoted by ' . G::$LoggedUser['Username'] . " $URL", $URL, NotificationsManager::QUOTES);
     }
     G::$DB->set_query_id($QueryID);
   }

gazelle.sql

@@ -640,12 +640,6 @@ CREATE TABLE `pm_messages` (
   KEY `ConvID` (`ConvID`)
 ) ENGINE=InnoDB CHARSET=utf8;
 
-CREATE TABLE `push_notifications_usage` (
-  `PushService` varchar(10) NOT NULL,
-  `TimesUsed` int(10) NOT NULL DEFAULT '0',
-  PRIMARY KEY (`PushService`)
-) ENGINE=InnoDB CHARSET=utf8;
-
 CREATE TABLE `reports` (
   `ID` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `UserID` int(10) unsigned NOT NULL DEFAULT '0',
@@ -1593,13 +1587,6 @@ CREATE TABLE `users_points_requests` (
   KEY `RequestID` (`RequestID`)
 ) ENGINE=InnoDB CHARSET=utf8;
 
-CREATE TABLE `users_push_notifications` (
-  `UserID` int(10) NOT NULL,
-  `PushService` tinyint(1) NOT NULL DEFAULT '0',
-  `PushOptions` text,
-  PRIMARY KEY (`UserID`)
-) ENGINE=InnoDB CHARSET=utf8;
-
 CREATE TABLE `users_seedtime` (
   `UserID` int(10) unsigned NOT NULL,
   `TorrentID` int(10) unsigned NOT NULL,

sections/ajax/index.php

@@ -153,9 +153,6 @@ switch ($_GET['action']) {
   case 'clear_user_notification':
     require(SERVER_ROOT . '/sections/ajax/clear_user_notification.php');
     break;
-  case 'pushbullet_devices':
-    require(SERVER_ROOT . '/sections/ajax/pushbullet_devices.php');
-    break;
   case 'anidb':
     require(SERVER_ROOT . '/sections/ajax/anidb.php');
     break;

sections/ajax/pushbullet_devices.php

@@ -1,21 +0,0 @@
-<?php
-
-
-if (!isset($_GET['apikey']) || empty($_GET['apikey'])) {
-  echo '{"error": { "message": "No API Key specified" }}';
-  die();
-}
-
-$ApiKey = $_GET['apikey'];
-
-
-curl_setopt_array($Ch = curl_init(), array(
-  CURLOPT_URL => 'https://api.pushbullet.com/api/devices',
-  CURLOPT_HTTPAUTH => CURLAUTH_BASIC,
-  CURLOPT_RETURNTRANSFER => true,
-  CURLOPT_USERPWD => $ApiKey . ':'
-));
-
-$Result = curl_exec($Ch);
-curl_close($Ch);
-echo json_encode($Result);

sections/blog/index.php

@@ -101,7 +101,6 @@ if (check_perms('admin_manage_blog')) {
             VALUES ('$LoggedUser[ID]', $ThreadID)");
           $Cache->delete_value('subscriptions_user_'.$LoggedUser['ID']);
         }
-        NotificationsManager::send_push(NotificationsManager::get_push_enabled_users(), $_POST['title'], $_POST['body'], site_url() . 'index.php', NotificationsManager::BLOG);
 
         header('Location: blog.php');
         break;

sections/tools/index.php

@@ -178,8 +178,6 @@ switch ($_REQUEST['action']) {
     $Cache->delete_value('news_latest_title');
     $Cache->delete_value('news');
 
-    NotificationsManager::send_push(NotificationsManager::get_push_enabled_users(), $_POST['title'], $_POST['body'], site_url() . 'index.php', NotificationsManager::NEWS);
-
     header('Location: index.php');
     break;
 

sections/user/take_push.php

@@ -1,11 +0,0 @@
-<?
-authorize();
-if (!check_perms('users_mod') && $_GET['userid'] != $LoggedUser['ID']) {
-  error(403);
-}
-
-$UserID = db_string($_GET['userid']);
-NotificationsManager::send_push($UserID, 'Push!', 'You\'ve been pushed by ' . $LoggedUser['Username']);
-
-header('Location: user.php?action=edit&userid=' . $UserID . "");
-?>

static/functions/user_settings.js

@@ -1,7 +1,3 @@
-var PUSHOVER = 5;
-var TOASTY = 4;
-var PUSHBULLET = 6;
-
 $(document).ready(function() {
   var top = $('#settings_sections').offset().top - parseFloat($('#settings_sections').css('marginTop').replace(/auto/, 0));
   $(window).scroll(function (event) {
@@ -58,91 +54,9 @@ $(document).ready(function() {
   $("#notifications_Torrents_popup").click(function() {
     $("#notifications_Torrents_traditional").prop('checked', false);
   });
-
-  if ($("#pushservice").val() > 0) {
-    $('.pushdeviceid').hide();
-    $('#pushsettings').show();
-    if ($('#pushservice').val() == PUSHBULLET) {
-      fetchPushbulletDevices($('#pushkey').val());
-      $('.pushdeviceid').show();
-    }
-  }
-
-  $("#pushservice").change(function() {
-    if ($(this).val() > 0) {
-      $('#pushsettings').show(500);
-
-      if ($(this).val() == TOASTY) {
-        $('#pushservice_title').text("Device ID");
-      } else if ($(this).val() == PUSHOVER) {
-        $('#pushservice_title').text("User Key");
-      } else {
-        $('#pushservice_title').text("API Key");
-      }
-    } else {
-      $('#pushsettings').hide(500);
-    }
-
-    if ($(this).val() == PUSHBULLET) {
-      fetchPushbulletDevices($('#pushkey').val());
-      $('.pushdeviceid').show(500);
-    } else {
-      $('.pushdeviceid').hide(500);
-    }
-  });
-
-  $("#pushkey").blur(function() {
-    if($("#pushservice").val() == PUSHBULLET) {
-      fetchPushbulletDevices($(this).val());
-    }
-  });
 });
 
 function fuzzyMatch(str, pattern){
   pattern = pattern.split("").reduce(function(a,b){ return a+".*"+b; });
   return new RegExp(pattern).test(str);
 };
-
-/**
- * Gets device IDs from the pushbullet API
- *
- * @return array of dictionaries with devices
- */
-function fetchPushbulletDevices(apikey) {
-  $.ajax({
-    url: 'ajax.php',
-    data: {
-      "action": 'pushbullet_devices',
-      "apikey": apikey
-    },
-    type: 'GET',
-    success: function(data, textStatus, xhr) {
-      var data = jQuery.parseJSON(data);
-      var field = $('#pushdevice');
-      var value = field.val();
-      if (data.error || textStatus !== 'success' ) {
-        if (data.error) {
-          field.html('<option>' + data.error.message + '</option>');
-        } else {
-          $('#pushdevice').html('<option>No devices fetched</option>');
-        }
-      } else {
-        if(data['devices'].length > 0) {
-          field.html('');
-        }
-        for (var i = 0; i < data['devices'].length; i++) {
-          var model = data['devices'][i]['extras']['model'];
-          var nickname = data['devices'][i]['extras']['nickname'];
-          var name = nickname !== undefined ? nickname : model;
-          var option = new Option(name, data['devices'][i]['iden']);
-
-          option.selected = (option.value == value);
-          field[0].add(option);
-        }
-      }
-    },
-    error: function(data,textStatus,xhr) {
-      $('#pushdevice').html('<option>' + textStatus + '</option>');
-    }
-  });
-}