Stefanius67 / PNServer

PNTestServer.php

Indentation +91 added lines, -91 removed lines

@@ -9,112 +9,112 @@
 use SKien\PNServer\PNPayload;

 use SKien\PNServer\PNServer;

 

-	// check, if PHP version is sufficient and all required extensions are installed

-	$bExit = false;

-	if (version_compare(phpversion(), '7.1', '<')) {

-		trigger_error('At least PHP Version 7.1 is required (current Version is ' . phpversion() . ')!', E_USER_WARNING);

-		$bExit = true;

-	}

-	$aExt = array('curl', 'gmp', 'mbstring', 'openssl', 'bcmath');

-	foreach ($aExt as $strExt) {

-		if (!extension_loaded($strExt)) {

-			trigger_error('Extension ' . $strExt . ' must be installed!', E_USER_WARNING);

-			$bExit = true;

-		}

-	}

-	if ($bExit) {

-		exit();

-	}

+    // check, if PHP version is sufficient and all required extensions are installed

+    $bExit = false;

+    if (version_compare(phpversion(), '7.1', '<')) {

+        trigger_error('At least PHP Version 7.1 is required (current Version is ' . phpversion() . ')!', E_USER_WARNING);

+        $bExit = true;

+    }

+    $aExt = array('curl', 'gmp', 'mbstring', 'openssl', 'bcmath');

+    foreach ($aExt as $strExt) {

+        if (!extension_loaded($strExt)) {

+            trigger_error('Extension ' . $strExt . ' must be installed!', E_USER_WARNING);

+            $bExit = true;

+        }

+    }

+    if ($bExit) {

+        exit();

+    }

 

-	// for test use SQLite database - will be cretaed at first instantiation

-	$oDP = new PNDataProviderSQLite();

+    // for test use SQLite database - will be cretaed at first instantiation

+    $oDP = new PNDataProviderSQLite();

 	

-	// or may use any MySQL database

-	// $oDP = new PNDataProviderMySQL('localhost', 'username', 'password', 'db-name');

+    // or may use any MySQL database

+    // $oDP = new PNDataProviderMySQL('localhost', 'username', 'password', 'db-name');

 	

-	if (!$oDP->isConnected()) {

-	    echo $oDP->getError();

-		exit();

-	}

+    if (!$oDP->isConnected()) {

+        echo $oDP->getError();

+        exit();

+    }

 

-	// just add expired (unsubscribed) subscription to demonstrate response of

-	// push service and the auto-remove option

-	if (!$oDP->saveSubscription(

-			'{'

-			.'	"endpoint": "https://fcm.googleapis.com/fcm/send/f8PIq7EL6xI:APA91bFgD2qA0Goo_6sWgWVDKclh5Sm1Gf1BtYZw3rePs_GHqmC9l2N92I4QhLQtPmyB18HYYseFHLhvMbpq-oGz2Jtt8AVExmNU9R3K9Z-Gaiq6rQxig1WT4ND_5PSXTjuth-GoGggt",'

-			.'	"expirationTime": "1589291569000",'

-			.'	"keys": {'

-			.'	"p256dh": "BEQrfuNX-ZrXPf0Mm-IdVMO1LMpu5N3ifgcyeUD2nYwuUhRUDmn_wVOM3eQyYux5vW2B8-TyTYco4-bFKKR02IA",'

-			.'	"auth": "jOfywakW_srfHhMF-NiZ3Q"'

-			.'	}'

-			.'}'

-	    )) {

-	    echo $oDP->getError();

-	    exit();

-	}

+    // just add expired (unsubscribed) subscription to demonstrate response of

+    // push service and the auto-remove option

+    if (!$oDP->saveSubscription(

+            '{'

+            .'	"endpoint": "https://fcm.googleapis.com/fcm/send/f8PIq7EL6xI:APA91bFgD2qA0Goo_6sWgWVDKclh5Sm1Gf1BtYZw3rePs_GHqmC9l2N92I4QhLQtPmyB18HYYseFHLhvMbpq-oGz2Jtt8AVExmNU9R3K9Z-Gaiq6rQxig1WT4ND_5PSXTjuth-GoGggt",'

+            .'	"expirationTime": "1589291569000",'

+            .'	"keys": {'

+            .'	"p256dh": "BEQrfuNX-ZrXPf0Mm-IdVMO1LMpu5N3ifgcyeUD2nYwuUhRUDmn_wVOM3eQyYux5vW2B8-TyTYco4-bFKKR02IA",'

+            .'	"auth": "jOfywakW_srfHhMF-NiZ3Q"'

+            .'	}'

+            .'}'

+        )) {

+        echo $oDP->getError();

+        exit();

+    }

 	

-	echo 'Count of subscriptions: ' . $oDP->count() . '<br/><br/>' . PHP_EOL;

-	if ($oDP->init()) {

-		while (($strJsonSub = $oDP->fetch()) !== false) {

-			echo 'UA: ' . $oDP->getColumn(PNDataProvider::COL_USERAGENT);

-			echo ' (Lastupdated: ' . date('Y-m-d H:i:s', $oDP->getColumn(PNDataProvider::COL_LASTUPDATED)) . ')<br/>' . PHP_EOL;			

-			$strPrintable = json_encode(json_decode($strJsonSub), JSON_PRETTY_PRINT);

-			$strPrintable = str_replace("\n", '<br/>', $strPrintable);

-			$strPrintable = str_replace(" ", '&nbsp;', $strPrintable);

-			echo '<span style="font-size: 10pt; font-family: courier; overflow:scroll; white-space: nowrap">' . $strPrintable . '</span><br/><br/>' . PHP_EOL;			

-		}

-	} else {

-    	echo $oDP->getError();

-    	exit();

-	}

+    echo 'Count of subscriptions: ' . $oDP->count() . '<br/><br/>' . PHP_EOL;

+    if ($oDP->init()) {

+        while (($strJsonSub = $oDP->fetch()) !== false) {

+            echo 'UA: ' . $oDP->getColumn(PNDataProvider::COL_USERAGENT);

+            echo ' (Lastupdated: ' . date('Y-m-d H:i:s', $oDP->getColumn(PNDataProvider::COL_LASTUPDATED)) . ')<br/>' . PHP_EOL;			

+            $strPrintable = json_encode(json_decode($strJsonSub), JSON_PRETTY_PRINT);

+            $strPrintable = str_replace("\n", '<br/>', $strPrintable);

+            $strPrintable = str_replace(" ", '&nbsp;', $strPrintable);

+            echo '<span style="font-size: 10pt; font-family: courier; overflow:scroll; white-space: nowrap">' . $strPrintable . '</span><br/><br/>' . PHP_EOL;			

+        }

+    } else {

+        echo $oDP->getError();

+        exit();

+    }

 	

-	// the server to handle all

-	$oServer = new PNServer($oDP);

+    // the server to handle all

+    $oServer = new PNServer($oDP);

 

-	// set the VAPID key

-	/*

+    // set the VAPID key

+    /*

 	$oVapid = new PNVapid(

 			"mailto:yourmail@yourdomain.de",

 			"the-generated-public-key",

 			"the-generated-private-key"

 	   );

 	*/

-	$oVapid = new PNVapid(

-	       "mailto:s.kien@online.de",

-	       "BDtOCcUUTYvuUzx9ktgYs3mB6tQCjFLNfOkuiaIi_2LNosLbHQY6P91eMzQ8opTDLK_PjJHsjMSiJ-MUOeSjV8E",

-	       "juLDCbPNbObvn-89_o0SEbnBZLMWxlVEjGypyxHEh2M"

-	   );

+    $oVapid = new PNVapid(

+            "mailto:s.kien@online.de",

+            "BDtOCcUUTYvuUzx9ktgYs3mB6tQCjFLNfOkuiaIi_2LNosLbHQY6P91eMzQ8opTDLK_PjJHsjMSiJ-MUOeSjV8E",

+            "juLDCbPNbObvn-89_o0SEbnBZLMWxlVEjGypyxHEh2M"

+        );

 	        

-	$oServer->setVapid($oVapid);

+    $oServer->setVapid($oVapid);

 	

-	// create payload

-	// - we don't set a title - so service worker uses default

-	// - URL to icon can be

-	//    * relative to the origin location of the service worker

-	//    * absolute from the homepage (begining with a '/')

-	//    * complete URL (beginning with https://) 

-	$oPayload = new PNPayload('', "...first text to display.", './elephpant.png');

-	// set tag to group the notifications but always show the popup 

-	$oPayload->setTag('news', true);

-	// and lead the user to thr page of your choice

-	$oPayload->setURL('/where-to-go.php');

+    // create payload

+    // - we don't set a title - so service worker uses default

+    // - URL to icon can be

+    //    * relative to the origin location of the service worker

+    //    * absolute from the homepage (begining with a '/')

+    //    * complete URL (beginning with https://) 

+    $oPayload = new PNPayload('', "...first text to display.", './elephpant.png');

+    // set tag to group the notifications but always show the popup 

+    $oPayload->setTag('news', true);

+    // and lead the user to thr page of your choice

+    $oPayload->setURL('/where-to-go.php');

 	

-	$oServer->setPayload($oPayload);

+    $oServer->setPayload($oPayload);

 

-	// load subscriptions from database (incluing the expired one created above...) 

-	if (!$oServer->loadSubscriptions()) {

-	    echo $oDP->getError();

-	    exit();

-	}

+    // load subscriptions from database (incluing the expired one created above...) 

+    if (!$oServer->loadSubscriptions()) {

+        echo $oDP->getError();

+        exit();

+    }

 	

-	// ... and finally push !

-	if (!$oServer->push()) {

-		echo '<h2>' . $oServer->getError() . '</h2>' . PHP_EOL;

-	} else {

-		$aLog = $oServer->getLog();

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

-		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'] . ')';	

-		}

-	}

+    // ... and finally push !

+    if (!$oServer->push()) {

+        echo '<h2>' . $oServer->getError() . '</h2>' . PHP_EOL;

+    } else {

+        $aLog = $oServer->getLog();

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

+        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'] . ')';	

+        }

+    }

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/Utils/Math.php

Indentation +12 added lines, -12 removed lines

@@ -119,18 +119,18 @@
         return $result;
     }
     
-  	public static function modSub($minuend, $subtrahend, $modulus)
-   	{
-   		return self::mod(self::sub($minuend, $subtrahend), $modulus);
-   	}
+        public static function modSub($minuend, $subtrahend, $modulus)
+        {
+            return self::mod(self::sub($minuend, $subtrahend), $modulus);
+        }
     
-   	public static function modMul($multiplier, $muliplicand, $modulus)
-   	{
-   		return self::mod(self::mul($multiplier, $muliplicand), $modulus);
-   	}
+        public static function modMul($multiplier, $muliplicand, $modulus)
+        {
+            return self::mod(self::mul($multiplier, $muliplicand), $modulus);
+        }
     
-   	public static function modDiv($dividend, $divisor, $modulus)
-   	{
-   		return self::mul($dividend, self::inverseMod($divisor, $modulus), $modulus);
-   	}
+        public static function modDiv($dividend, $divisor, $modulus)
+        {
+            return self::mul($dividend, self::inverseMod($divisor, $modulus), $modulus);
+        }
 }

SKien/PNServer/PNDataProviderSQLite.php

Indentation +3 added lines, -3 removed lines

@@ -66,7 +66,7 @@ 
             if (!file_exists($this->strDBName)) {
                 $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 . ')';
+                    $this->strLastError .= ' (no rights to write on directory ' . $strDir . ')';
                 }
             }
         }
@@ -83,7 +83,7 @@ 
             }
         } else if (!$this->tableExist()) {
             if (strlen($this->strLastError) == 0) {
-               $this->strLastError = 'database table ' . $this->strTableName . ' not exist!';
+                $this->strLastError = 'database table ' . $this->strTableName . ' not exist!';
             }
         }
         return ($this->db && $this->bTableExist);
@@ -209,7 +209,7 @@ 
         if ($this->isConnected()) {
             $iCount = $this->db->querySingle("SELECT count(*) FROM " . $this->strTableName);
             if ($iCount === false) {
-               $this->strLastError = 'SQLite3: ' . $this->db->lastErrorMsg();
+                $this->strLastError = 'SQLite3: ' . $this->db->lastErrorMsg();
             }
         }
         return $iCount;

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.