Stefanius67 / PNServer

PNTestServer.php

Spacing +2 added lines, -2 removed lines

@@ -113,8 +113,8 @@
 	} else {

 		$aLog = $oServer->getLog();

 		echo '<h2>Push - Log:</h2>' . PHP_EOL;

-		foreach ($aLog as $strEndpoint => $aMsg ) {

+		foreach ($aLog as $strEndpoint => $aMsg) {

 			echo '<h3>' . PNSubscription::getOrigin($strEndpoint) . '</h3>' . PHP_EOL;

-			echo $aMsg['msg'] . '<br/>resonse code: ' . $aMsg['curl_response_code']  . ' (' . $aMsg['curl_response'] . ')';	

+			echo $aMsg['msg'] . '<br/>resonse code: ' . $aMsg['curl_response_code'] . ' (' . $aMsg['curl_response'] . ')';	

 		}

 	}

SKien/PNServer/PNServer.php

Spacing +6 added lines, -6 removed lines

@@ -47,7 +47,7 @@ 
      *    
      * @param PNDataProvider $oDP
      */
-    public function __construct(PNDataProvider $oDP=null) {
+    public function __construct(PNDataProvider $oDP = null) {
         if ($oDP->isConnected()) {
             $this->oDP = $oDP;
         }
@@ -69,7 +69,7 @@ 
      * set VAPID subject and keys.
      * @param PNVapid $oVapid
      */
-    public function setVapid (PNVapid $oVapid) {
+    public function setVapid(PNVapid $oVapid) {
         $this->oVapid = $oVapid;
     }
     
@@ -77,7 +77,7 @@ 
      * set payload used for all push notifications.
      * @param mixed $payload    string or PNPayload object
      */
-    public function setPayload ($payload) {
+    public function setPayload($payload) {
         if (self::className($payload) == 'PNPayload') {
             $this->strPayload = $payload->toJSON();
         } else {
@@ -123,7 +123,7 @@ 
      * has only affect, if data loaded through DataProvider 
      * @param bool $bAutoRemove
      */
-    public function setAutoRemove ($bAutoRemove=true) {
+    public function setAutoRemove($bAutoRemove = true) {
         $this->bAutoRemove = $bAutoRemove;
     }
     
@@ -142,9 +142,9 @@ 
     public function push() {
         if (!$this->oVapid) {
             $this->strError = 'no VAPID-keys set!';
-        } elseif(!$this->oVapid->isValid()) {
+        } elseif (!$this->oVapid->isValid()) {
             $this->strError = 'VAPID error: ' . $this->oVapid->getError();
-        } elseif(count($this->aSubscription) == 0) {
+        } elseif (count($this->aSubscription) == 0) {
             $this->strError = 'no valid Subscriptions set!';
         } else {
             // create multi requests...

SKien/PNServer/PNDataProviderSQLite.php

Spacing +4 added lines, -4 removed lines

@@ -42,7 +42,7 @@ 
      * @param string $strDBName     name of DB file - if null, file 'pnsub.sqlite' is used and created if not exist
      * @param string $strTableName  tablename for the subscriptions - if null, 'tPNSubscription' is used and created if not exist
      */
-    public function __construct($strDir=null, $strDBName=null, $strTableName=null) {
+    public function __construct($strDir = null, $strDBName = null, $strTableName = null) {
         $this->strTableName = isset($strTableName) ? $strTableName : 'tPNSubscription';
         $this->strDBName = isset($strDBName) ? $strDBName : 'pnsub.sqlite';
         $this->strLastError = ''; 
@@ -64,7 +64,7 @@ 
             $this->db = null;
             $this->strLastError = $e->getMessage();
             if (!file_exists($this->strDBName)) {
-                $strDir = pathinfo($this->strDBName, PATHINFO_DIRNAME) == '' ?  __DIR__ : pathinfo($this->strDBName, PATHINFO_DIRNAME);
+                $strDir = pathinfo($this->strDBName, PATHINFO_DIRNAME) == '' ? __DIR__ : pathinfo($this->strDBName, PATHINFO_DIRNAME);
                 if (!is_writable($strDir)) {
                    $this->strLastError .= ' (no rights to write on directory ' . $strDir . ')';
                 }
@@ -103,7 +103,7 @@ 
                     $strUserAgent = isset($oSubscription['userAgent']) ? $oSubscription['userAgent'] : 'unknown UserAgent';
                     
                     $strSQL  = "REPLACE INTO " . $this->strTableName . " (";
-                    $strSQL .=       self::COL_ENDPOINT;
+                    $strSQL .= self::COL_ENDPOINT;
                     $strSQL .= "," . self::COL_EXPIRES;
                     $strSQL .= "," . self::COL_SUBSCRIPTION;
                     $strSQL .= "," . self::COL_USERAGENT;
@@ -157,7 +157,7 @@ 
      * (non-PHPdoc)
      * @see \lib\PNServer\PNDataProvider::init()
      */
-    public function init($bAutoRemove=true) {
+    public function init($bAutoRemove = true) {
         $bSucceeded = false;
         $this->dbres = false;
         $this->row = null;

SKien/PNServer/PNDataProviderMySQL.php

Spacing +5 added lines, -5 removed lines

@@ -50,7 +50,7 @@ 
      * @param string $strDBName     DB Name
      * @param string $strTableName  tablename for the subscriptions - if null, 'tPNSubscription' is used and created if not exist
      */
-    public function __construct($strDBHost, $strDBUser, $strDBPwd, $strDBName, $strTableName=null) {
+    public function __construct($strDBHost, $strDBUser, $strDBPwd, $strDBName, $strTableName = null) {
         $this->strDBHost = $strDBHost; 
         $this->strDBUser = $strDBUser; 
         $this->strDBPwd = $strDBPwd; 
@@ -98,7 +98,7 @@ 
                 $strUserAgent = isset($oSubscription['userAgent']) ? $oSubscription['userAgent'] : 'unknown UserAgent';
                                 
                 $strSQL  = "INSERT INTO " . $this->strTableName . " (";
-                $strSQL .=       self::COL_ENDPOINT;
+                $strSQL .= self::COL_ENDPOINT;
                 $strSQL .= "," . self::COL_EXPIRES;
                 $strSQL .= "," . self::COL_SUBSCRIPTION;
                 $strSQL .= "," . self::COL_USERAGENT;
@@ -108,7 +108,7 @@ 
                 $strSQL .= ",'" . $strJSON . "'";
                 $strSQL .= ",'" . $strUserAgent . "'";
                 $strSQL .= ") ";
-                $strSQL .= "ON DUPLICATE KEY UPDATE ";  // in case of UPDATE UA couldn't have been changed - endpoint is the UNIQUE key!
+                $strSQL .= "ON DUPLICATE KEY UPDATE "; // in case of UPDATE UA couldn't have been changed - endpoint is the UNIQUE key!
                 $strSQL .= " expires = " . $tsExpires;
                 $strSQL .= ",subscription = '" . $strJSON . "'";
                 $strSQL .= ";";
@@ -146,7 +146,7 @@ 
      * (non-PHPdoc)
      * @see \lib\PNServer\PNDataProvider::init()
      */
-    public function init($bAutoRemove=true) {
+    public function init($bAutoRemove = true) {
         $bSucceeded = false;
         $this->dbres = false;
         $this->row = null;
@@ -171,7 +171,7 @@ 
             }
             if ($bSucceeded) {
                 $strSQL  = "SELECT ";
-                $strSQL .=       self::COL_ID;
+                $strSQL .= self::COL_ID;
                 $strSQL .= "," . self::COL_ENDPOINT;
                 $strSQL .= ",UNIX_TIMESTAMP(" . self::COL_EXPIRES . ") AS " . self::COL_EXPIRES;
                 $strSQL .= "," . self::COL_SUBSCRIPTION;

SKien/PNServer/PNServerHelper.php

Spacing +3 added lines, -3 removed lines

@@ -64,9 +64,9 @@ 
         $der  = self::p256PrivateKey($strPrivateKey);
         $der .= $strPublicKey;
     
-        $pem = '-----BEGIN EC PRIVATE KEY-----'.PHP_EOL;
+        $pem = '-----BEGIN EC PRIVATE KEY-----' . PHP_EOL;
         $pem .= chunk_split(base64_encode($der), 64, PHP_EOL);
-        $pem .= '-----END EC PRIVATE KEY-----'.PHP_EOL;
+        $pem .= '-----END EC PRIVATE KEY-----' . PHP_EOL;
     
         return $pem;
     }
@@ -121,7 +121,7 @@ 
         }
         
         if ($R !== false && $S !== false) {
-            $sig = \pack('H*', $R.$S);
+            $sig = \pack('H*', $R . $S);
         }
     
         return $sig;

SKien/PNServer/PNSubscription.php

Spacing +11 added lines, -11 removed lines

@@ -37,7 +37,7 @@ 
      * @param number $timeExpiration
      * @param string $strEncoding
      */
-    public function __construct($strEndpoint, $strPublicKey, $strAuth, $timeExpiration=0, $strEncoding='aesgcm') {
+    public function __construct($strEndpoint, $strPublicKey, $strAuth, $timeExpiration = 0, $strEncoding = 'aesgcm') {
         $this->strEndpoint = $strEndpoint;
         $this->strPublicKey = $strPublicKey;
         $this->strAuth = $strAuth;
@@ -85,7 +85,7 @@ 
                     isset($this->strEndpoint) && strlen($this->strEndpoint) > 0 &&
                     isset($this->strPublicKey) && strlen($this->strPublicKey) > 0 &&
                     isset($this->strAuth) && strlen($this->strAuth) > 0 &&
-                    ($this->strEncoding == 'aesgcm'|| $this->strEncoding == 'aes128gcm') 
+                    ($this->strEncoding == 'aesgcm' || $this->strEncoding == 'aes128gcm') 
                 );
         }
         return $bValid;
@@ -94,63 +94,63 @@ 
     /**
      * @return string
      */
-    public function getEndpoint () {
+    public function getEndpoint() {
         return $this->strEndpoint;
     }
 
     /**
      * @return string
      */
-    public function getPublicKey () {
+    public function getPublicKey() {
         return $this->strPublicKey;
     }
 
     /**
      * @return string
      */
-    public function getAuth () {
+    public function getAuth() {
         return $this->strAuth;
     }
 
     /**
      * @return string
      */
-    public function getEncoding () {
+    public function getEncoding() {
         return $this->strEncoding;
     }
 
     /**
      * @param string $strEndpoint
      */
-    public function setEndpoint ($strEndpoint) {
+    public function setEndpoint($strEndpoint) {
         $this->strEndpoint = $strEndpoint;
     }
 
     /**
      * @param string $strPublicKey
      */
-    public function setPublicKey ($strPublicKey) {
+    public function setPublicKey($strPublicKey) {
         $this->strPublicKey = $strPublicKey;
     }
 
     /**
      * @param string $strAuth
      */
-    public function setAuth ($strAuth) {
+    public function setAuth($strAuth) {
         $this->strAuth = $strAuth;
     }
 
     /**
      * @param number $timeExpiration
      */
-    public function setExpiration ($timeExpiration) {
+    public function setExpiration($timeExpiration) {
         $this->timeExpiration = $timeExpiration;
     }
 
     /**
      * @param string $strEncoding
      */
-    public function setEncoding ($strEncoding) {
+    public function setEncoding($strEncoding) {
         $this->strEncoding = $strEncoding;
     }
 

SKien/PNServer/PNPayload.php

Spacing +7 added lines, -7 removed lines

@@ -40,7 +40,7 @@ 
      * @param string $strText       A string representing an extra content to display within the notification.
      * @param string $strIcon       containing the URL of an image to be used as an icon by the notification.
      */
-    public function __construct($strTitle, $strText=null, $strIcon=null) {
+    public function __construct($strTitle, $strText = null, $strIcon = null) {
         $this->aPayload = array(
                 'title' => $strTitle,
                 'opt' => array(
@@ -56,7 +56,7 @@ 
      */
     public function setURL($strURL) {
         if (is_array($this->aPayload) && isset($this->aPayload['opt']) && is_array($this->aPayload['opt'])) {
-            if (!isset($this->aPayload['opt']['data']) || !is_array($this->aPayload['opt']['data'] )) {
+            if (!isset($this->aPayload['opt']['data']) || !is_array($this->aPayload['opt']['data'])) {
                 $this->aPayload['opt']['data'] = array();
             }
             $this->aPayload['opt']['data']['url'] = $strURL;
@@ -72,7 +72,7 @@ 
      * @param string $strTag
      * @param bool $bReNotify
      */
-    public function setTag($strTag, $bReNotify=false) {
+    public function setTag($strTag, $bReNotify = false) {
         if (is_array($this->aPayload) && isset($this->aPayload['opt']) && is_array($this->aPayload['opt'])) {
             $this->aPayload['opt']['tag'] = $strTag;
             $this->aPayload['opt']['renotify'] = $bReNotify;
@@ -119,9 +119,9 @@ 
      * @param string $strIcon       containing the URL of an icon to display with the action.
      * @param string $strCustom     custom info - not part of the showNotification()- Options!
      */
-    public function addAction($strAction, $strTitle, $strIcon=null, $strCustom='') {
+    public function addAction($strAction, $strTitle, $strIcon = null, $strCustom = '') {
         if (is_array($this->aPayload) && isset($this->aPayload['opt']) && is_array($this->aPayload['opt'])) {
-            if (!isset($this->aPayload['opt']['actions']) || !is_array($this->aPayload['opt']['actions'] )) {
+            if (!isset($this->aPayload['opt']['actions']) || !is_array($this->aPayload['opt']['actions'])) {
                 $this->aPayload['opt']['actions'] = array();
             }
             $this->aPayload['opt']['actions'][] = array('action' => $strAction, 'title' => $strTitle, 'icon' => $strIcon, 'custom' => $strCustom);
@@ -159,7 +159,7 @@ 
      * 
      * @param bool $bSet
      */
-    public function requireInteraction($bSet=true) {
+    public function requireInteraction($bSet = true) {
         if (is_array($this->aPayload) && isset($this->aPayload['opt']) && is_array($this->aPayload['opt'])) {
             $this->aPayload['opt']['requireInteraction'] = $bSet;
         }
@@ -170,7 +170,7 @@ 
      * If this 'mute' function is activated, a previously set vibration is reset to prevent a TypeError exception.
      * @param bool $bSet
      */
-    public function setSilent($bSet=true) {
+    public function setSilent($bSet = true) {
         if (is_array($this->aPayload) && isset($this->aPayload['opt']) && is_array($this->aPayload['opt'])) {
             $this->aPayload['opt']['silent'] = $bSet;
             if ($bSet && isset($this->aPayload['opt']['vibrate'])) {

SKien/PNServer/PNDataProvider.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
      * @param bool $bAutoRemove     automatic remove of expired subscriptions
      * @return bool true on success
      */
-    public function init($bAutoRemove=true);
+    public function init($bAutoRemove = true);
     
     /**
      * get count of subscriptions.

SKien/PNServer/PNEncryption.php

Spacing +4 added lines, -4 removed lines

@@ -56,7 +56,7 @@ 
      * @param string $strSubscrAuth     subscription authenthication code
      * @param string $strEncoding       encoding (default: 'aesgcm')
      */
-    public function __construct($strSubscrKey, $strSubscrAuth, $strEncoding='aesgcm') {
+    public function __construct($strSubscrKey, $strSubscrAuth, $strEncoding = 'aesgcm') {
         $this->strSubscrKey = self::decodeBase64URL($strSubscrKey);
         $this->strSubscrAuth = self::decodeBase64URL($strSubscrAuth);
         $this->strEncoding = $strEncoding;
@@ -141,7 +141,7 @@ 
      * @param array $aHeaders   existing headers to merge with
      * @return array
      */
-    public function getHeaders($aHeaders=null) {
+    public function getHeaders($aHeaders = null) {
         if (!$aHeaders) {
             $aHeaders = array();
         }
@@ -321,7 +321,7 @@ 
      * @param number $iMaxLengthToPad
      * @return string
      */
-    private function padPayload($strPayload, $iMaxLengthToPad=0)
+    private function padPayload($strPayload, $iMaxLengthToPad = 0)
     {
         $iLen = mb_strlen($strPayload, '8bit');
         $iPad = $iMaxLengthToPad ? $iMaxLengthToPad - $iLen : 0;
@@ -359,6 +359,6 @@ 
         $prk = hash_hmac('sha256', $ikm, $salt, true);
     
         // expand
-        return mb_substr(hash_hmac('sha256', $info.chr(1), $prk, true), 0, $length, '8bit');
+        return mb_substr(hash_hmac('sha256', $info . chr(1), $prk, true), 0, $length, '8bit');
     }
 }