Added Abitility To Use Certificate (PEM) Passwords.

.gitignore

@@ -0,0 +1,4 @@
+
+ManagerAPNS/certs/MyAppName/production.pem
+
+ManagerAPNS/certs/MyAppName/production.pem

ManagerAPNS/certs/MyAppName/cert_config.php

@@ -0,0 +1,7 @@
+<?PHP	
+	$cert_config = array(
+		'passphrase'=>'PEM_PASS_IF_REQUIRED', 
+		'development_cert'=>'ABSOLUTE_PATH_TO_PEM', 
+		'production_cert'=>'ABSOLUTE_PATH_TO_PEM'
+	);
+?>

ManagerAPNS/include/apns-all.php

@@ -16,7 +16,6 @@
 $db = new DbConnect($config->dbAddress, $config->dbUsername, $config->dbPassword, $config->dbName);
 $db->show_errors();
 
-
 $db_aux = mysql_connect($config->dbAddress, $config->dbUsername, $config->dbPassword);
 mysql_select_db($config->dbName, $db_aux);
 
@@ -27,15 +26,19 @@
 }
 
 foreach ($appNameList as $appname) {
-    $production = $config->absolutePath."/certs/".$appname."/production.pem";
-    $sandbox = $config->absolutePath."/certs/".$appname."/sandbox.pem";
+	include_once($config->absolutePath."/certs/".$appname."/cert_config.php");
+
+    $production = $cert_config['production_cert'];
+    $sandbox = $cert_config['development_cert'];
+    $log = $config->absolutePath.$config->logFile;
+    $passPhrase = $cert_config['passphrase'];
 
 	// FETCH $_GET OR CRON ARGUMENTS TO AUTOMATE TASKS
 	$args = (!empty($_GET)) ? $_GET:array('task'=>$argv[1]);
 
 	$args['appname']=$appname;
 
 	// CREATE APNS OBJECT, WITH DATABASE OBJECT AND ARGUMENTS
-	$apns= new APNS($db, $args, $production, $sandbox);
+	$apns= new APNS($db, $args, $production, $sandbox, $log, $passPhrase);
 }
 ?>

ManagerAPNS/include/class_APNS.php

@@ -1,5 +1,8 @@
 <?php
-session_start(); 
+
+if(!session_id()) {
+	session_start(); // NEVER forget this!
+}
 
 #################################################################################
 ## Developed by Manifest Interactive, LLC                                      ##
@@ -190,7 +193,7 @@ class APNS {
 	 * @param string $logPath Path to the log file.
 	 * @access 	public
 	 */
-	function __construct($db, $args=NULL, $certificate=NULL, $sandboxCertificate=NULL, $logPath=NULL) {
+	function __construct($db, $args=NULL, $certificate=NULL, $sandboxCertificate=NULL, $logPath=NULL, $certificate_password=NULL) {
 
 		if(!empty($certificate) && file_exists($certificate))
 		{
@@ -209,12 +212,14 @@ function __construct($db, $args=NULL, $certificate=NULL, $sandboxCertificate=NUL
 			'production'=>array(
 				'certificate'=>$this->certificate,
 				'ssl'=>$this->ssl,
-				'feedback'=>$this->feedback
+				'feedback'=>$this->feedback, 
+				'certificate_password'=>$certificate_password
 			),
 			'sandbox'=>array(
 				'certificate'=>$this->sandboxCertificate,
 				'ssl'=>$this->sandboxSsl,
-				'feedback'=>$this->sandboxFeedback
+				'feedback'=>$this->sandboxFeedback, 
+				'certificate_password'=>$certificate_password
 			)
 		);
 		if ($logPath !== null) {
@@ -523,6 +528,11 @@ private function _iterateMessages($sql) {
 	private function _connectSSLSocket($development) {
 		$ctx = stream_context_create();
 		stream_context_set_option($ctx, 'ssl', 'local_cert', $this->apnsData[$development]['certificate']);
+		if ($this->apnsData[$development]['certificate_password'] != NULL && 
+			$this->apnsData[$development]['certificate_password']) {
+			stream_context_set_option($ctx, 'ssl', 'passphrase', $this->apnsData[$development]['certificate_password']);
+		}
+
 		$this->sslStreams[$development] = stream_socket_client($this->apnsData[$development]['ssl'], $error, $errorString, 100, (STREAM_CLIENT_CONNECT|STREAM_CLIENT_PERSISTENT), $ctx);
 		if(!$this->sslStreams[$development]){
 			$this->_triggerError("Failed to connect to APNS: {$error} {$errorString}.");
@@ -662,6 +672,10 @@ private function _pushMessage($pid, $message, $token, $development){
 	 */
 	private function _checkFeedback($development){
 		$ctx = stream_context_create();
+		if ($this->apnsData[$development]['certificate_password'] != NULL && 
+			$this->apnsData[$development]['certificate_password']) {
+			stream_context_set_option($ctx, 'ssl', 'passphrase', $this->apnsData[$development]['certificate_password']);
+		}
 		stream_context_set_option($ctx, 'ssl', 'local_cert', $this->apnsData[$development]['certificate']);
 		stream_context_set_option($ctx, 'ssl', 'verify_peer', false);
 		$fp = stream_socket_client($this->apnsData[$development]['feedback'], $error,$errorString, 100, (STREAM_CLIENT_CONNECT|STREAM_CLIENT_PERSISTENT), $ctx);
@@ -1160,4 +1174,4 @@ public function processQueue(){
 		$this->_fetchMessages();
 	}
 }
-?>
+?>

ManagerAPNS/include/config.php

@@ -9,10 +9,11 @@
 
 	class EasyAPNSConfiguration {
 		private $appList = array();
-		public $dbUsername = "user"; //TO CHANGE
-		public $dbPassword = "pass";//TO CHANGE
-		public $dbName = "database";//TO CHANGE
+		public $dbUsername = "DB_USERNAME"; //TO CHANGE
+		public $dbPassword = "DB_PASS";//TO CHANGE
+		public $dbName = "DB_NAME";//TO CHANGE
 		public $dbAddress = "localhost";//TO CHANGE
-		public $absolutePath = "/absolute/path/to/install/dir/";//TO CHANGE
+		public $logFile = "/log/APNSLog.log";
+		public $absolutePath = "/var/www/httpdocs/MY_DOMAIN/public_html/ManagerAPNS";
 	}
-?>
+?>

ManagerAPNS/include/sendFetch.php

@@ -24,16 +24,24 @@
 	}
 
 	$appname = $_POST['appname'];
-
-	$production = $config->absolutePath."/certs/".$appname."/production.pem";
-	$sandbox = $config->absolutePath."/certs/".$appname."/sandbox.pem";
+	require_once($config->absolutePath."/certs/".$appname."/cert_config.php");
+
+    $production = $cert_config['production_cert'];
+    $sandbox = $cert_config['development_cert'];
 
 	$db = new DbConnect($config->dbAddress, $config->dbUsername, $config->dbPassword, $config->dbName);
 	$db->show_errors();
 
 	$args = array();
 	$args["task"] = "fetch";
 	$args["appname"]=$appname;
-	$apns= new APNS($db, $args, $production, $sandbox);
+	$apns= new APNS(
+		$db, 
+		$args, 
+		$production, 
+		$sandbox, 
+		$config->absolutePath.$config->logFile, 
+		$cert_config['passphrase']
+	);
 
 ?>

ManagerAPNS/include/sendFlush.php

@@ -7,7 +7,13 @@
  * @link https://github.com/apascual/ManagerAPNS
  */
 
-	session_start(); // NEVER forget this!
+ error_reporting(E_ALL);
+ini_set('display_errors', 1);
+
+ 	if(!session_id()) {
+		session_start(); // NEVER forget this!
+	}
+
 	if(!isset($_SESSION['loggedin']))
 	{
 		header("Location: index.php");
@@ -23,16 +29,25 @@
 	}
 
 	$appname = $_POST['appname'];
-
-	$production = $config->absolutePath."/certs/".$appname."/production.pem";
-	$sandbox = $config->absolutePath."/certs/".$appname."/sandbox.pem";
+	require_once($config->absolutePath."/certs/".$appname."/cert_config.php");
+
+    $production = $cert_config['production_cert'];
+    $sandbox = $cert_config['development_cert'];
 
 	$db = new DbConnect($config->dbAddress, $config->dbUsername, $config->dbPassword, $config->dbName);
 	$db->show_errors();
 
 	$args = array();
 	$args["task"] = "flush";
 	$args["appname"]=$appname;
-	$apns= new APNS($db, $args, $production, $sandbox);
+
+	$apns= new APNS(
+		$db, 
+		$args, 
+		$production, 
+		$sandbox, 
+		$config->absolutePath.$config->logFile, 
+		$cert_config['passphrase']
+	);
 
 ?>

ManagerAPNS/include/sendPush.php

@@ -7,7 +7,13 @@
  * @link https://github.com/apascual/ManagerAPNS
  */
 
-	session_start(); // NEVER forget this!
+ error_reporting(E_ALL);
+ini_set('display_errors', 1);
+
+ 	if(!session_id()) {
+		session_start(); // NEVER forget this!
+	}
+
 	if(!isset($_SESSION['loggedin']))
 	{
 		header("Location: index.php");
@@ -26,30 +32,39 @@
 	}
 
     $appname = $_POST['appname'];
-
-    $production = $config->absolutePath."/certs/".$appname."/production.pem";
-    $sandbox = $config->absolutePath."/certs/".$appname."/sandbox.pem";
+	require_once($config->absolutePath."/certs/".$appname."/cert_config.php");
+
+    $production = $cert_config['production_cert'];
+    $sandbox = $cert_config['development_cert'];
 
     $db = new DbConnect($config->dbAddress, $config->dbUsername, $config->dbPassword, $config->dbName);
 	$db->show_errors();
+
+	$apns= new APNS(
+		$db, 
+		NULL, 
+		$production, 
+		$sandbox, 
+		$config->absolutePath.$config->logFile, 
+		$cert_config['passphrase']
+	);
 
-	$apns= new APNS($db, NULL, $production, $sandbox);
 	$pidList = explode(';', $_POST['pid']);
 
 	settype($_POST['badge'], "int");
 	foreach ($pidList as $key => $value) {
 		$pid = $value;
 		settype($pid, "int");
 
-		if($_POST['date'])
+		if(array_key_exists('date', $_POST))
 			$apns->newMessage($pid,$_POST['date']);
 		else
 			$apns->newMessage($pid);
 
 		$apns->addMessageAlert($_POST['message']);
 		$apns->addMessageBadge($_POST['badge']);
 		$apns->addMessageSound($_POST['sound']);
-        $apns->addMessageCustom('url', $_POST['url']);
+        $apns->addMessageCustom('url', (array_key_exists('url', $_POST) ? $_POST['url'] : null));
 		$apns->queueMessage();
 	}
 ?>