grommunio / grommunio-web

plugins/filesbackendOwncloud/php/lib/ocsapi/test/TestClient.php

Indentation +5 added lines, -5 removed lines

@@ -31,7 +31,7 @@ 
 echo "<br>################################## CREATING #######################<br>";
 
 $options = [
-	"shareType" => 3,
+    "shareType" => 3,
 ];
 $created1 = $ocscloient->createShare("/aaaaaa/test.eml", $options);
 print_r($created1);
@@ -39,7 +39,7 @@ 
 echo "<br>################################## UPDATE #######################<br>";
 
 $options = [
-	"shareType" => 3,
+    "shareType" => 3,
 ];
 $ocscloient->updateShare($created1->getId(), "expireDate", "2020-03-23");
 
@@ -56,9 +56,9 @@ 
 echo "<br>################################## READING #######################<br>";
 
 try {
-	$deleteShare = $ocscloient->loadShareByID($share4->getId());
-	print_r($deleteShare);
+    $deleteShare = $ocscloient->loadShareByID($share4->getId());
+    print_r($deleteShare);
 }
 catch (Exception $e) {
-	print_r($e);
+    print_r($e);
 }

Braces +1 added lines, -2 removed lines

@@ -58,7 +58,6 @@
 try {
 	$deleteShare = $ocscloient->loadShareByID($share4->getId());
 	print_r($deleteShare);
-}
-catch (Exception $e) {
+} catch (Exception $e) {
 	print_r($e);
 }

plugins/filesbackendOwncloud/php/class.pluginowncloud.php

Indentation +43 added lines, -43 removed lines

@@ -6,50 +6,50 @@
  * This plugin provides the backend for Owncloud and OCS.
  */
 class PluginFilesbackendOwncloud extends Plugin {
-	/**
-	 * Constructor.
-	 */
-	public function __construct() {
-	}
+    /**
+     * Constructor.
+     */
+    public function __construct() {
+    }
 
-	/**
-	 * Called to initialize the plugin and register for hooks.
-	 */
-	public function init() {
-		$this->registerHook('server.core.settings.init.before');
-	}
+    /**
+     * Called to initialize the plugin and register for hooks.
+     */
+    public function init() {
+        $this->registerHook('server.core.settings.init.before');
+    }
 
-	/**
-	 * Function is executed when a hook is triggered by the PluginManager.
-	 *
-	 * @param string $eventID Identifier of the hook
-	 * @param array  $data    Reference to the data of the triggered hook
-	 */
-	public function execute($eventID, &$data) {
-		switch ($eventID) {
-			case 'server.core.settings.init.before':
-				$this->onBeforeSettingsInit($data);
-				break;
-		}
-	}
+    /**
+     * Function is executed when a hook is triggered by the PluginManager.
+     *
+     * @param string $eventID Identifier of the hook
+     * @param array  $data    Reference to the data of the triggered hook
+     */
+    public function execute($eventID, &$data) {
+        switch ($eventID) {
+            case 'server.core.settings.init.before':
+                $this->onBeforeSettingsInit($data);
+                break;
+        }
+    }
 
-	/**
-	 * Called when the core Settings class is initialized and ready to accept sysadmin default
-	 * settings. Registers the sysadmin defaults for the filesbackendOwncloud plugin.
-	 *
-	 * @param array $data Reference to the data of the triggered hook
-	 */
-	public function onBeforeSettingsInit(&$data) {
-		$data['settingsObj']->addSysAdminDefaults([
-			'zarafa' => [
-				'v1' => [
-					'plugins' => [
-						'filesbackendOwncloud' => [
-							'enable' => true,
-						],
-					],
-				],
-			],
-		]);
-	}
+    /**
+     * Called when the core Settings class is initialized and ready to accept sysadmin default
+     * settings. Registers the sysadmin defaults for the filesbackendOwncloud plugin.
+     *
+     * @param array $data Reference to the data of the triggered hook
+     */
+    public function onBeforeSettingsInit(&$data) {
+        $data['settingsObj']->addSysAdminDefaults([
+            'zarafa' => [
+                'v1' => [
+                    'plugins' => [
+                        'filesbackendOwncloud' => [
+                            'enable' => true,
+                        ],
+                    ],
+                ],
+            ],
+        ]);
+    }
 }

plugins/intranet/php/plugin.intranet.php

Indentation +52 added lines, -52 removed lines

@@ -4,60 +4,60 @@
  * Plugin which will enable desktop notifications for new mails.
  */
 class Pluginintranet extends Plugin {
-	/**
-	 * Function initializes the Plugin and registers all hooks.
-	 */
-	public function init() {
-		$this->registerHook('server.core.settings.init.before');
-	}
+    /**
+     * Function initializes the Plugin and registers all hooks.
+     */
+    public function init() {
+        $this->registerHook('server.core.settings.init.before');
+    }
 
-	/**
-	 * Function is executed when a hook is triggered by the PluginManager.
-	 *
-	 * @param string $eventID the id of the triggered hook
-	 * @param mixed  $data    object(s) related to the hook
-	 */
-	public function execute($eventID, &$data) {
-		switch ($eventID) {
-			case 'server.core.settings.init.before':
-				$this->injectPluginSettings($data);
-				break;
-		}
-	}
+    /**
+     * Function is executed when a hook is triggered by the PluginManager.
+     *
+     * @param string $eventID the id of the triggered hook
+     * @param mixed  $data    object(s) related to the hook
+     */
+    public function execute($eventID, &$data) {
+        switch ($eventID) {
+            case 'server.core.settings.init.before':
+                $this->injectPluginSettings($data);
+                break;
+        }
+    }
 
-	/**
-	 * Called when the core Settings class is initialized and ready to accept sysadmin default
-	 * settings. Registers the sysadmin defaults for the desktopnotifications plugin.
-	 *
-	 * @param array $data Reference to the data of the triggered hook
-	 */
-	public function injectPluginSettings(&$data) {
-		$defaultIcon = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNCIgaGVpZ2h0PSIxNCIgdmlld0JveD0iMCAwIDEyMi44OCAxMTMuNiI+PHBhdGggZD0iTTcxLjg5IDEwMC41NnEtMy44NiAzLjgyLTguMzcgNy42M2wzLjc0LS42MmE0OS4zOCA0OS4zOCAwIDAgMCA3LjA4LTJsLjQzLjY0IDEgMS4yN2gwIDBhMTYuNCAxNi40IDAgMCAwIDIuMTMgMiA1NS4yOSA1NS4yOSAwIDAgMS05LjczIDIuOTIgNTguNzMgNTguNzMgMCAwIDEtMjIuODMgMCA1My40OCA1My40OCAwIDAgMS0xMC42LTMuMjcuMjYuMjYgMCAwIDEtLjE0LS4wNyA2Mi4xIDYyLjEgMCAwIDEtOS42LTUuMTdBNTQuNDEgNTQuNDEgMCAwIDEgMTYuNiA5N2E1Mi42OSA1Mi42OSAwIDAgMS02Ljg5LTguMzhBNTkuNzkgNTkuNzkgMCAwIDEgNC40NiA3OWE1NS43OSA1NS43OSAwIDAgMS0zLjM0LTEwLjc4IDU4LjczIDU4LjczIDAgMCAxIDAtMjIuODMgNTIuODYgNTIuODYgMCAwIDEgMy4yOC0xMC42LjMzLjMzIDAgMCAxIC4wNi0uMTRBNjAuMzQgNjAuMzQgMCAwIDEgOS43MSAyNWE1NCA1NCAwIDAgMSA2Ljg5LTguMzkgNTIuMTkgNTIuMTkgMCAwIDEgOC40LTYuOSA1OS43IDU5LjcgMCAwIDEgOS42Ny01LjI1IDU0LjUyIDU0LjUyIDAgMCAxIDEwLjcyLTMuMzQgNTguNzMgNTguNzMgMCAwIDEgMjIuODMgMCA1My44OSA1My44OSAwIDAgMSAxMC42IDMuMjcuMjguMjggMCAwIDEgLjEzLjA3IDYxLjc1IDYxLjc1IDAgMCAxIDkuNjggNS4yNUE1NC40MSA1NC40MSAwIDAgMSA5NyAxNi41OWE1Mi4yNyA1Mi4yNyAwIDAgMSA2Ljg5IDguNDEgNTguMTkgNTguMTkgMCAwIDEgNS4yNSA5LjY3IDU0LjUyIDU0LjUyIDAgMCAxIDMuMzQgMTAuNzRsLjEyLjYtNS40Mi0xLjUzYTQ3IDQ3IDAgMCAwLTIuNi03LjgzIDU0LjIyIDU0LjIyIDAgMCAwLTIuODctNS43Nkg4NS4wOGE2NS40NyA2NS40NyAwIDAgMSA0LjIgOC40OWwtNi4xNi0xLjY2YTY1LjczIDY1LjczIDAgMCAwLTMuODYtNi44M2gtMjB2My40MWwtLjYxLjIyYTEzLjQ4IDEzLjQ4IDAgMCAwLTQuMzYgMi42OHYtNi4zM2gtMjBxLTcuNjcgMTEuOTEtOC42MiAyMy40NGgyNS41N3ExIDIuNDcgMi4wOSA1SDI1LjYyYy4zMSA3Ljg3IDMgMTUuNjcgNy44OCAyMy40NGgyMC44MlY2MS41Nmw1IDExdjEwLjE3aDQuNzZsMi4yOSA1aC03LjA4djE3LjUxYTEyMy44NCAxMjMuODQgMCAwIDAgMTAuNTMtOS42NXExLjA1IDIuNDkgMi4wNyA1ek0xMTQuNzUgOThhNC42NCA0LjY0IDAgMCAxLTEuMTcuNzloLS4wOGE0LjE0IDQuMTQgMCAwIDEtNC4zNi0uNmwtMTEuNi05Ljg0LTQgOS43N2ExMi45MyAxMi45MyAwIDAgMS0xLjE5IDIuMjUgOS4xIDkuMSAwIDAgMS0xLjUxIDEuNzYgNC43OCA0Ljc4IDAgMCAxLTcuNS0uODIgOS4yOCA5LjI4IDAgMCAxLS45Mi0xLjYzYy02LjktMTcuNDktMTYuMjYtMzQuOS0yMy4yNi01Mi40QTMuMTEgMy4xMSAwIDAgMSA2Mi42NSA0M2MxNi43NyAzLjEgMzguNSAxMC4xOSA1NS41NSAxNC43MSA1LjMgMS40IDYuMTYgNi4wNyAyLjI1IDkuNjlhMTIuMjEgMTIuMjEgMCAwIDEtMiAxLjUyYy0zIDEuNy02IDMuNjctOSA1LjQ3bDExLjU1IDkuOWE0LjI1IDQuMjUgMCAwIDEgMSAxLjI2di4wOGE0LjI4IDQuMjggMCAwIDEgLjM5IDEuNDdoMGE0LjI2IDQuMjYgMCAwIDEtLjE2IDEuNTQgNC4zOSA0LjM5IDAgMCAxLS43MiAxLjM5IDk0LjU1IDk0LjU1IDAgMCAxLTYuNzYgNy45N3ptLTMtMy44NGw1LjU5LTYuNTZjLTIuNDYtMi4xMS0xMy0xMC4yOS0xNC4wOS0xMi4yNmEyLjQxIDIuNDEgMCAwIDEgLjgzLTMuMjVjMy42Ni0yIDguMzYtNC44NiAxMS44My03LjE3YTguMzggOC4zOCAwIDAgMCAxLjIyLS44OSA0LjQyIDQuNDIgMCAwIDAgLjc1LS44N2wuMTYtLjMtLjMxLS4xOGEzLjkyIDMuOTIgMCAwIDAtLjc2LS4yNkw2NSA0OC42bDIxLjgzIDQ5LjE0YTQuOCA0LjggMCAwIDAgLjM4LjdsLjIyLjI5LjI4LS4yYTQuNTEgNC41MSAwIDAgMCAuNzMtLjg5IDcuNTEgNy41MSAwIDAgMCAuNjgtMS4zM2MxLjYzLTQgMy40OS05LjQ3IDUuNC0xMy4xN2wuMjMtLjMyYTIuNCAyLjQgMCAwIDEgMy4zNy0uMjdsMTMuNjQgMTEuNTd6bS02MS42MiAxNC4wM2ExMDUuNTYgMTA1LjU2IDAgMCAxLTE5LjI2LTIwLjQ4SDE1LjE2YTUxLjUgNTEuNSAwIDAgMCAxMi42MSAxMiA1Mi44MSA1Mi44MSAwIDAgMCA4Ljg5IDQuOHMuMDcgMCAuMTEuMDdhNDkuMTMgNDkuMTMgMCAwIDAgOS42NCAzIDY1LjEzIDY1LjEzIDAgMCAwIDMuNzUuNjJ6TTExLjg5IDgyLjczSDI3LjdhNTAuNiA1MC42IDAgMCAxLTctMjMuNDRINWE1NS43NSA1NS43NSAwIDAgMCAxIDcuOTRBNDguMjcgNDguMjcgMCAwIDAgOSA3N2E1NC4xNiA1NC4xNiAwIDAgMCAyLjg2IDUuNzZ6TTUgNTQuMzFoMTUuNzVhNTQuMzggNTQuMzggMCAwIDEgNy43Ny0yMy40NEgxMS44OUE1NC4xNiA1NC4xNiAwIDAgMCA5IDM2LjYzczAgLjA3LS4wNy4xYTQ5LjkxIDQ5LjkxIDAgMCAwLTMgOS42NSA1MS40NiA1MS40NiAwIDAgMC0xIDcuOTN6TTE1LjEzIDI1LjloMTYuNTlBMTE3LjcyIDExNy43MiAwIDAgMSA1MC40NiA1LjM1Yy0xLjM5LjE3LTIuNzYuMzctNC4wOC42NWE0OC4zNiA0OC4zNiAwIDAgMC05Ljc1IDMgNTUuMjQgNTUuMjQgMCAwIDAtOC44OSA0LjggNTEuNSA1MS41IDAgMCAwLTEyLjYxIDEyaDB6bTQ4LTIwLjU1QTExNC42MyAxMTQuNjMgMCAwIDEgODEuODggMjUuOWgxNi42YTQ4LjYzIDQ4LjYzIDAgMCAwLTUtNS43NiA0OS44MSA0OS44MSAwIDAgMC03LjYzLTYuMjdBNTMuMjcgNTMuMjcgMCAwIDAgNzcgOS4wNnMtLjA2IDAtLjEtLjA2YTQ5LjE1IDQ5LjE1IDAgMCAwLTkuNjQtM2MtMS4zNi0uMjctMi43My0uNDgtNC4wOS0uNjVoMHptLTMuODQgMy4yNFYyNS45aDE2LjQ5QTExNS42OCAxMTUuNjggMCAwIDAgNTkuMjkgOC41OXptLTUgOTYuNjNWODcuNzFIMzdhMTA1LjY3IDEwNS42NyAwIDAgMCAxNy4zNSAxNy41MXptMC03OS4zMlY4LjU5QTExNi4zIDExNi4zIDAgMCAwIDM3LjgyIDI1Ljl6IiBmaWxsPSIjMmI3OGMyIi8+PC9zdmc+Cg==';
-		$pluginData = [
-			'enable' => PLUGIN_INTRANET_USER_DEFAULT_ENABLE,
-			'button-title' => PLUGIN_INTRANET_BUTTON_TITLE,
-			'url' => PLUGIN_INTRANET_URL,
-			'autostart' => defined('PLUGIN_INTRANET_AUTOSTART') ? (bool) PLUGIN_INTRANET_AUTOSTART : false,
-			'icon' => defined('PLUGIN_INTRANET_ICON') ? PATH_PLUGIN_DIR . '/intranet/' . PLUGIN_INTRANET_ICON : $defaultIcon,
-		];
+    /**
+     * Called when the core Settings class is initialized and ready to accept sysadmin default
+     * settings. Registers the sysadmin defaults for the desktopnotifications plugin.
+     *
+     * @param array $data Reference to the data of the triggered hook
+     */
+    public function injectPluginSettings(&$data) {
+        $defaultIcon = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNCIgaGVpZ2h0PSIxNCIgdmlld0JveD0iMCAwIDEyMi44OCAxMTMuNiI+PHBhdGggZD0iTTcxLjg5IDEwMC41NnEtMy44NiAzLjgyLTguMzcgNy42M2wzLjc0LS42MmE0OS4zOCA0OS4zOCAwIDAgMCA3LjA4LTJsLjQzLjY0IDEgMS4yN2gwIDBhMTYuNCAxNi40IDAgMCAwIDIuMTMgMiA1NS4yOSA1NS4yOSAwIDAgMS05LjczIDIuOTIgNTguNzMgNTguNzMgMCAwIDEtMjIuODMgMCA1My40OCA1My40OCAwIDAgMS0xMC42LTMuMjcuMjYuMjYgMCAwIDEtLjE0LS4wNyA2Mi4xIDYyLjEgMCAwIDEtOS42LTUuMTdBNTQuNDEgNTQuNDEgMCAwIDEgMTYuNiA5N2E1Mi42OSA1Mi42OSAwIDAgMS02Ljg5LTguMzhBNTkuNzkgNTkuNzkgMCAwIDEgNC40NiA3OWE1NS43OSA1NS43OSAwIDAgMS0zLjM0LTEwLjc4IDU4LjczIDU4LjczIDAgMCAxIDAtMjIuODMgNTIuODYgNTIuODYgMCAwIDEgMy4yOC0xMC42LjMzLjMzIDAgMCAxIC4wNi0uMTRBNjAuMzQgNjAuMzQgMCAwIDEgOS43MSAyNWE1NCA1NCAwIDAgMSA2Ljg5LTguMzkgNTIuMTkgNTIuMTkgMCAwIDEgOC40LTYuOSA1OS43IDU5LjcgMCAwIDEgOS42Ny01LjI1IDU0LjUyIDU0LjUyIDAgMCAxIDEwLjcyLTMuMzQgNTguNzMgNTguNzMgMCAwIDEgMjIuODMgMCA1My44OSA1My44OSAwIDAgMSAxMC42IDMuMjcuMjguMjggMCAwIDEgLjEzLjA3IDYxLjc1IDYxLjc1IDAgMCAxIDkuNjggNS4yNUE1NC40MSA1NC40MSAwIDAgMSA5NyAxNi41OWE1Mi4yNyA1Mi4yNyAwIDAgMSA2Ljg5IDguNDEgNTguMTkgNTguMTkgMCAwIDEgNS4yNSA5LjY3IDU0LjUyIDU0LjUyIDAgMCAxIDMuMzQgMTAuNzRsLjEyLjYtNS40Mi0xLjUzYTQ3IDQ3IDAgMCAwLTIuNi03LjgzIDU0LjIyIDU0LjIyIDAgMCAwLTIuODctNS43Nkg4NS4wOGE2NS40NyA2NS40NyAwIDAgMSA0LjIgOC40OWwtNi4xNi0xLjY2YTY1LjczIDY1LjczIDAgMCAwLTMuODYtNi44M2gtMjB2My40MWwtLjYxLjIyYTEzLjQ4IDEzLjQ4IDAgMCAwLTQuMzYgMi42OHYtNi4zM2gtMjBxLTcuNjcgMTEuOTEtOC42MiAyMy40NGgyNS41N3ExIDIuNDcgMi4wOSA1SDI1LjYyYy4zMSA3Ljg3IDMgMTUuNjcgNy44OCAyMy40NGgyMC44MlY2MS41Nmw1IDExdjEwLjE3aDQuNzZsMi4yOSA1aC03LjA4djE3LjUxYTEyMy44NCAxMjMuODQgMCAwIDAgMTAuNTMtOS42NXExLjA1IDIuNDkgMi4wNyA1ek0xMTQuNzUgOThhNC42NCA0LjY0IDAgMCAxLTEuMTcuNzloLS4wOGE0LjE0IDQuMTQgMCAwIDEtNC4zNi0uNmwtMTEuNi05Ljg0LTQgOS43N2ExMi45MyAxMi45MyAwIDAgMS0xLjE5IDIuMjUgOS4xIDkuMSAwIDAgMS0xLjUxIDEuNzYgNC43OCA0Ljc4IDAgMCAxLTcuNS0uODIgOS4yOCA5LjI4IDAgMCAxLS45Mi0xLjYzYy02LjktMTcuNDktMTYuMjYtMzQuOS0yMy4yNi01Mi40QTMuMTEgMy4xMSAwIDAgMSA2Mi42NSA0M2MxNi43NyAzLjEgMzguNSAxMC4xOSA1NS41NSAxNC43MSA1LjMgMS40IDYuMTYgNi4wNyAyLjI1IDkuNjlhMTIuMjEgMTIuMjEgMCAwIDEtMiAxLjUyYy0zIDEuNy02IDMuNjctOSA1LjQ3bDExLjU1IDkuOWE0LjI1IDQuMjUgMCAwIDEgMSAxLjI2di4wOGE0LjI4IDQuMjggMCAwIDEgLjM5IDEuNDdoMGE0LjI2IDQuMjYgMCAwIDEtLjE2IDEuNTQgNC4zOSA0LjM5IDAgMCAxLS43MiAxLjM5IDk0LjU1IDk0LjU1IDAgMCAxLTYuNzYgNy45N3ptLTMtMy44NGw1LjU5LTYuNTZjLTIuNDYtMi4xMS0xMy0xMC4yOS0xNC4wOS0xMi4yNmEyLjQxIDIuNDEgMCAwIDEgLjgzLTMuMjVjMy42Ni0yIDguMzYtNC44NiAxMS44My03LjE3YTguMzggOC4zOCAwIDAgMCAxLjIyLS44OSA0LjQyIDQuNDIgMCAwIDAgLjc1LS44N2wuMTYtLjMtLjMxLS4xOGEzLjkyIDMuOTIgMCAwIDAtLjc2LS4yNkw2NSA0OC42bDIxLjgzIDQ5LjE0YTQuOCA0LjggMCAwIDAgLjM4LjdsLjIyLjI5LjI4LS4yYTQuNTEgNC41MSAwIDAgMCAuNzMtLjg5IDcuNTEgNy41MSAwIDAgMCAuNjgtMS4zM2MxLjYzLTQgMy40OS05LjQ3IDUuNC0xMy4xN2wuMjMtLjMyYTIuNCAyLjQgMCAwIDEgMy4zNy0uMjdsMTMuNjQgMTEuNTd6bS02MS42MiAxNC4wM2ExMDUuNTYgMTA1LjU2IDAgMCAxLTE5LjI2LTIwLjQ4SDE1LjE2YTUxLjUgNTEuNSAwIDAgMCAxMi42MSAxMiA1Mi44MSA1Mi44MSAwIDAgMCA4Ljg5IDQuOHMuMDcgMCAuMTEuMDdhNDkuMTMgNDkuMTMgMCAwIDAgOS42NCAzIDY1LjEzIDY1LjEzIDAgMCAwIDMuNzUuNjJ6TTExLjg5IDgyLjczSDI3LjdhNTAuNiA1MC42IDAgMCAxLTctMjMuNDRINWE1NS43NSA1NS43NSAwIDAgMCAxIDcuOTRBNDguMjcgNDguMjcgMCAwIDAgOSA3N2E1NC4xNiA1NC4xNiAwIDAgMCAyLjg2IDUuNzZ6TTUgNTQuMzFoMTUuNzVhNTQuMzggNTQuMzggMCAwIDEgNy43Ny0yMy40NEgxMS44OUE1NC4xNiA1NC4xNiAwIDAgMCA5IDM2LjYzczAgLjA3LS4wNy4xYTQ5LjkxIDQ5LjkxIDAgMCAwLTMgOS42NSA1MS40NiA1MS40NiAwIDAgMC0xIDcuOTN6TTE1LjEzIDI1LjloMTYuNTlBMTE3LjcyIDExNy43MiAwIDAgMSA1MC40NiA1LjM1Yy0xLjM5LjE3LTIuNzYuMzctNC4wOC42NWE0OC4zNiA0OC4zNiAwIDAgMC05Ljc1IDMgNTUuMjQgNTUuMjQgMCAwIDAtOC44OSA0LjggNTEuNSA1MS41IDAgMCAwLTEyLjYxIDEyaDB6bTQ4LTIwLjU1QTExNC42MyAxMTQuNjMgMCAwIDEgODEuODggMjUuOWgxNi42YTQ4LjYzIDQ4LjYzIDAgMCAwLTUtNS43NiA0OS44MSA0OS44MSAwIDAgMC03LjYzLTYuMjdBNTMuMjcgNTMuMjcgMCAwIDAgNzcgOS4wNnMtLjA2IDAtLjEtLjA2YTQ5LjE1IDQ5LjE1IDAgMCAwLTkuNjQtM2MtMS4zNi0uMjctMi43My0uNDgtNC4wOS0uNjVoMHptLTMuODQgMy4yNFYyNS45aDE2LjQ5QTExNS42OCAxMTUuNjggMCAwIDAgNTkuMjkgOC41OXptLTUgOTYuNjNWODcuNzFIMzdhMTA1LjY3IDEwNS42NyAwIDAgMCAxNy4zNSAxNy41MXptMC03OS4zMlY4LjU5QTExNi4zIDExNi4zIDAgMCAwIDM3LjgyIDI1Ljl6IiBmaWxsPSIjMmI3OGMyIi8+PC9zdmc+Cg==';
+        $pluginData = [
+            'enable' => PLUGIN_INTRANET_USER_DEFAULT_ENABLE,
+            'button-title' => PLUGIN_INTRANET_BUTTON_TITLE,
+            'url' => PLUGIN_INTRANET_URL,
+            'autostart' => defined('PLUGIN_INTRANET_AUTOSTART') ? (bool) PLUGIN_INTRANET_AUTOSTART : false,
+            'icon' => defined('PLUGIN_INTRANET_ICON') ? PATH_PLUGIN_DIR . '/intranet/' . PLUGIN_INTRANET_ICON : $defaultIcon,
+        ];
 
-		$i = 1;
-		while (defined('PLUGIN_INTRANET_URL_' . $i)) {
-			$pluginData['button-title-' . $i] = constant('PLUGIN_INTRANET_BUTTON_TITLE_' . $i);
-			$pluginData['url-' . $i] = constant('PLUGIN_INTRANET_URL_' . $i);
-			$pluginData['autostart-' . $i] = defined('PLUGIN_INTRANET_AUTOSTART_' . $i) ? (bool) constant('PLUGIN_INTRANET_AUTOSTART_' . $i) : false;
-			$pluginData['icon-' . $i] = defined('PLUGIN_INTRANET_ICON_' . $i) ? PATH_PLUGIN_DIR . '/intranet/' . constant('PLUGIN_INTRANET_ICON_' . $i) : $defaultIcon;
-			++$i;
-		}
+        $i = 1;
+        while (defined('PLUGIN_INTRANET_URL_' . $i)) {
+            $pluginData['button-title-' . $i] = constant('PLUGIN_INTRANET_BUTTON_TITLE_' . $i);
+            $pluginData['url-' . $i] = constant('PLUGIN_INTRANET_URL_' . $i);
+            $pluginData['autostart-' . $i] = defined('PLUGIN_INTRANET_AUTOSTART_' . $i) ? (bool) constant('PLUGIN_INTRANET_AUTOSTART_' . $i) : false;
+            $pluginData['icon-' . $i] = defined('PLUGIN_INTRANET_ICON_' . $i) ? PATH_PLUGIN_DIR . '/intranet/' . constant('PLUGIN_INTRANET_ICON_' . $i) : $defaultIcon;
+            ++$i;
+        }
 
-		$data['settingsObj']->addSysAdminDefaults([
-			'zarafa' => [
-				'v1' => [
-					'plugins' => [
-						'intranet' => $pluginData,
-					],
-				],
-			],
-		]);
-	}
+        $data['settingsObj']->addSysAdminDefaults([
+            'zarafa' => [
+                'v1' => [
+                    'plugins' => [
+                        'intranet' => $pluginData,
+                    ],
+                ],
+            ],
+        ]);
+    }
 }

plugins/smime/test/smimeTest.php

Indentation +4 added lines, -4 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 
 if (class_exists('\PHPUnit\Framework\TestCase')) {
-	class_alias('\PHPUnit\Framework\TestCase', '\PHPUnit_Framework_TestCase');
+    class_alias('\PHPUnit\Framework\TestCase', '\PHPUnit_Framework_TestCase');
 }
 
 if (!defined('OPENSSL_CONF_PATH')) {
-	define('OPENSSL_CONF_PATH', '/etc/ssl/openssl.cnf');
+    define('OPENSSL_CONF_PATH', '/etc/ssl/openssl.cnf');
 }
 
 // Mock grommunio Web Log
@@ -13,8 +13,8 @@ 
 define('LOGLEVEL_INFO', 0);
 
 class Log {
-	public static function Write($level, $message) {
-	}
+    public static function Write($level, $message) {
+    }
 }
 
 abstract class SMIMETest extends PHPUnit_Framework_TestCase {

plugins/smime/test/certificateTest.php

Indentation +67 added lines, -67 removed lines

@@ -9,83 +9,83 @@
  * @coversNothing
  */
 class CertificateTest extends SMIMETest {
-	protected function setUp() {
-		$this->countryName = "NL";
-		$this->stateOrProvinceName = "Zuid Holland";
-		$this->localityName = "Delft";
-		$this->organizationName = "grommunio";
-		$this->organizationalUnitName = "Dev";
-		$this->commonName = "John";
-		$this->emailAddress = "dev@grommunio.com";
-		$dn = [
-			"countryName" => $this->countryName,
-			"stateOrProvinceName" => $this->stateOrProvinceName,
-			"localityName" => $this->localityName,
-			"organizationName" => $this->organizationName,
-			"organizationalUnitName" => $this->organizationalUnitName,
-			"commonName" => $this->commonName,
-			"emailAddress" => $this->emailAddress,
-		];
-		$config = ['config' => OPENSSL_CONF_PATH];
-		$daysvalid = 365;
-		$privkey = openssl_pkey_new();
-		$csr = openssl_csr_new($dn, $privkey, $config);
-		$this->validFrom = time();
-		$this->validTo = time() + (86400 * 365);
-		$sscert = openssl_csr_sign($csr, null, $privkey, $daysvalid, $config);
-		openssl_x509_export($sscert, $publickey);
+    protected function setUp() {
+        $this->countryName = "NL";
+        $this->stateOrProvinceName = "Zuid Holland";
+        $this->localityName = "Delft";
+        $this->organizationName = "grommunio";
+        $this->organizationalUnitName = "Dev";
+        $this->commonName = "John";
+        $this->emailAddress = "dev@grommunio.com";
+        $dn = [
+            "countryName" => $this->countryName,
+            "stateOrProvinceName" => $this->stateOrProvinceName,
+            "localityName" => $this->localityName,
+            "organizationName" => $this->organizationName,
+            "organizationalUnitName" => $this->organizationalUnitName,
+            "commonName" => $this->commonName,
+            "emailAddress" => $this->emailAddress,
+        ];
+        $config = ['config' => OPENSSL_CONF_PATH];
+        $daysvalid = 365;
+        $privkey = openssl_pkey_new();
+        $csr = openssl_csr_new($dn, $privkey, $config);
+        $this->validFrom = time();
+        $this->validTo = time() + (86400 * 365);
+        $sscert = openssl_csr_sign($csr, null, $privkey, $daysvalid, $config);
+        openssl_x509_export($sscert, $publickey);
 
-		$this->certdata = $publickey;
-		$this->cert = new Certificate($this->certdata);
-	}
+        $this->certdata = $publickey;
+        $this->cert = new Certificate($this->certdata);
+    }
 
-	public function testEmailaddress() {
-		$this->assertEquals($this->cert->emailAddress(), $this->emailAddress);
-	}
+    public function testEmailaddress() {
+        $this->assertEquals($this->cert->emailAddress(), $this->emailAddress);
+    }
 
-	public function testDerPem() {
-		$pem = $this->cert->pem();
-		$der = $this->cert->der();
+    public function testDerPem() {
+        $pem = $this->cert->pem();
+        $der = $this->cert->der();
 
-		// FIXME: remove der2pem
-		$this->assertEquals($pem, der2pem($der));
-		$this->assertEquals($this->certdata, $pem);
-	}
+        // FIXME: remove der2pem
+        $this->assertEquals($pem, der2pem($der));
+        $this->assertEquals($this->certdata, $pem);
+    }
 
-	public function testValidFrom() {
-		$this->assertEquals($this->cert->validFrom(), $this->validFrom);
-	}
+    public function testValidFrom() {
+        $this->assertEquals($this->cert->validFrom(), $this->validFrom);
+    }
 
-	public function testValidTo() {
-		$this->assertEquals($this->cert->validTo(), $this->validTo);
-	}
+    public function testValidTo() {
+        $this->assertEquals($this->cert->validTo(), $this->validTo);
+    }
 
-	public function testExpired() {
-		$this->assertEquals($this->cert->valid(), false);
-	}
+    public function testExpired() {
+        $this->assertEquals($this->cert->valid(), false);
+    }
 
-	public function testCAURL() {
-		$this->assertEmpty($this->cert->caURL());
-	}
+    public function testCAURL() {
+        $this->assertEmpty($this->cert->caURL());
+    }
 
-	public function testOCSPURL() {
-		$this->assertEmpty($this->cert->ocspURL());
-	}
+    public function testOCSPURL() {
+        $this->assertEmpty($this->cert->ocspURL());
+    }
 
-	public function testIssuer() {
-		$issuer = $this->cert->issuer(true);
-		$this->assertInternalType('object', $issuer);
-	}
+    public function testIssuer() {
+        $issuer = $this->cert->issuer(true);
+        $this->assertInternalType('object', $issuer);
+    }
 
-	public function testFingerprint() {
-		$this->assertNotEmpty($this->cert->fingerprint());
-		$this->assertNotEmpty($this->cert->fingerprint('md5'));
-	}
+    public function testFingerprint() {
+        $this->assertNotEmpty($this->cert->fingerprint());
+        $this->assertNotEmpty($this->cert->fingerprint('md5'));
+    }
 
-	public function testGetName() {
-		$name = $this->cert->getName();
-		$this->assertContains($this->emailAddress, $name);
-		$this->assertContains($this->countryName, $name);
-		$this->assertContains($this->stateOrProvinceName, $name);
-	}
+    public function testGetName() {
+        $name = $this->cert->getName();
+        $this->assertContains($this->emailAddress, $name);
+        $this->assertContains($this->countryName, $name);
+        $this->assertContains($this->stateOrProvinceName, $name);
+    }
 }

plugins/smime/test/testOCSPCertificate.php

Indentation +30 added lines, -30 removed lines

@@ -8,43 +8,43 @@
  * @coversNothing
  */
 class OCSPCertificateTest extends \PHPUnit_Framework_TestCase {
-	protected $cert;
+    protected $cert;
 
-	protected function setUp() {
-		$this->certdata = file_get_contents('./test/user.crt');
-		$this->cert = new Certificate($this->certdata);
-	}
+    protected function setUp() {
+        $this->certdata = file_get_contents('./test/user.crt');
+        $this->cert = new Certificate($this->certdata);
+    }
 
-	public function testEmailaddress() {
-		$this->assertEquals($this->cert->emailAddress(), 'user1@farmer.lan');
-	}
+    public function testEmailaddress() {
+        $this->assertEquals($this->cert->emailAddress(), 'user1@farmer.lan');
+    }
 
-	public function testDerPem() {
-		$pem = $this->cert->pem();
-		$der = $this->cert->der();
+    public function testDerPem() {
+        $pem = $this->cert->pem();
+        $der = $this->cert->der();
 
-		// FIXME: remove der2pem
-		$this->assertEquals($pem, der2pem($der));
-		$this->assertEquals($this->certdata, $pem);
-	}
+        // FIXME: remove der2pem
+        $this->assertEquals($pem, der2pem($der));
+        $this->assertEquals($this->certdata, $pem);
+    }
 
-	public function testValidFrom() {
-		$this->assertEquals($this->cert->validFrom(), 1491298233);
-	}
+    public function testValidFrom() {
+        $this->assertEquals($this->cert->validFrom(), 1491298233);
+    }
 
-	public function testValidTo() {
-		$this->assertEquals($this->cert->validTo(), 1523698233);
-	}
+    public function testValidTo() {
+        $this->assertEquals($this->cert->validTo(), 1523698233);
+    }
 
-	public function testExpired() {
-		$this->assertEquals($this->cert->valid(), false);
-	}
+    public function testExpired() {
+        $this->assertEquals($this->cert->valid(), false);
+    }
 
-	public function testCAURL() {
-		$this->assertNotEmpty($this->cert->caURL());
-	}
+    public function testCAURL() {
+        $this->assertNotEmpty($this->cert->caURL());
+    }
 
-	public function testOCSPURL() {
-		$this->assertNotEmpty($this->cert->ocspURL());
-	}
+    public function testOCSPURL() {
+        $this->assertNotEmpty($this->cert->ocspURL());
+    }
 }

plugins/smime/test/uploadCertificateTest.php

Indentation +106 added lines, -106 removed lines

@@ -14,110 +14,110 @@
  * @coversNothing
  */
 class UploadCertificateTest extends SMIMETest {
-	public const DAY_EPOCH = 86400;
-	public const PASSPHRASE = 'test';
-	public const EMAIL_ADDRESS = 'dev@grommunio.com';
-
-	// Cache private key generation
-	private $privkey = '';
-
-	private function generatePKCS12($emailAddress = self::EMAIL_ADDRESS, $passphrase = self::PASSPHRASE) {
-		$validFrom = time();
-		$validTo = time() + self::DAY_EPOCH * 365;
-		$daysvalid = ($validTo - $validFrom) / self::DAY_EPOCH;
-		$dn = [
-			"countryName" => "NL",
-			"stateOrProvinceName" => "Zuid Holland",
-			"localityName" => "Delft",
-			"organizationName" => "grommunio",
-			"organizationalUnitName" => "Dev",
-			"commonName" => "John",
-			"emailAddress" => $emailAddress,
-		];
-		$config = ['config' => OPENSSL_CONF_PATH];
-		if (empty($this->privkey)) {
-			$this->privkey = openssl_pkey_new();
-		}
-
-		$csr = openssl_csr_new($dn, $this->privkey, $config);
-		$sscert = openssl_csr_sign($csr, null, $this->privkey, $daysvalid, $config);
-		openssl_x509_export($sscert, $publickey);
-		openssl_pkcs12_export($publickey, $out, $this->privkey, $passphrase);
-
-		return $out;
-	}
-
-	/**
-	 * @param string $days string formatted as -500d or +500d
-	 */
-	private function generatePKCS12Faketime($days) {
-		$libfaketime = '/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1';
-		if (!file_exists($libfaketime)) {
-			// Arch libfaketime location
-			$libfaketime = '/usr/lib/faketime/libfaketime.so.1';
-		}
-
-		return base64_decode(shell_exec("LD_PRELOAD='{$libfaketime}' FAKETIME={$days} php ./test/create_pkcs12.php"));
-	}
-
-	/**
-	 * Test a valid generate certificate.
-	 */
-	public function testValidCert() {
-		$pkcs12 = $this->generatePKCS12();
-		list($message, $cert, $data) = validateUploadedPKCS($pkcs12, self::PASSPHRASE, self::EMAIL_ADDRESS);
-		$this->assertEquals($message, '');
-		$this->assertNotEmpty($cert);
-		$this->assertNotEmpty($data);
-	}
-
-	/**
-	 * Test an invalid PKCS#12 format.
-	 */
-	public function testFaultyPKCS12() {
-		$this->assertEquals(validateUploadedPKCS('burp', 'burp', 'foo@bar.nl')[0], 'Unable to decrypt certificate');
-	}
-
-	/**
-	 * Test an incorrect passphrase.
-	 */
-	public function testIncorrectPassphrase() {
-		$pkcs12 = $this->generatePKCS12();
-		$this->assertEquals(validateUploadedPKCS($pkcs12, 'burp', 'foo@bar.nl')[0], 'Unable to decrypt certificate');
-	}
-
-	/**
-	 * Test incorrect email address, which does not match the account <-> cert.
-	 */
-	public function testIncorrectEmailAddress() {
-		$pkcs12 = $this->generatePKCS12();
-		$this->assertEquals(
-			validateUploadedPKCS($pkcs12, self::PASSPHRASE, 'foo@bar.nl')[0],
-			"Certificate email address doesn't match grommunio Web account " . self::EMAIL_ADDRESS
-		);
-	}
-
-	/**
-	 * Test an expired certificate.
-	 */
-	public function testCertificateDateExpired() {
-		$pkcs12 = $this->generatePKCS12Faketime('-500d');
-		list($message, $cert, $data) = validateUploadedPKCS($pkcs12, self::PASSPHRASE, self::EMAIL_ADDRESS);
-		$validTo = date('Y-m-d', $data['validTo_time_t']);
-
-		$this->assertEquals($message, sprintf("Certificate was expired on %s. Certificate has not been imported", $validTo));
-		$this->assertNotEmpty($cert);
-	}
-
-	/**
-	 * Test an certificate in the future.
-	 */
-	public function testCertificateNotValid() {
-		$pkcs12 = $this->generatePKCS12Faketime('+500d');
-		list($message, $cert, $data) = validateUploadedPKCS($pkcs12, self::PASSPHRASE, self::EMAIL_ADDRESS);
-		$validFrom = date('Y-m-d', $data['validFrom_time_t']);
-
-		$this->assertEquals($message, sprintf("Certificate is not yet valid %s. Certificate has not been imported", $validFrom));
-		$this->assertNotEmpty($cert);
-	}
+    public const DAY_EPOCH = 86400;
+    public const PASSPHRASE = 'test';
+    public const EMAIL_ADDRESS = 'dev@grommunio.com';
+
+    // Cache private key generation
+    private $privkey = '';
+
+    private function generatePKCS12($emailAddress = self::EMAIL_ADDRESS, $passphrase = self::PASSPHRASE) {
+        $validFrom = time();
+        $validTo = time() + self::DAY_EPOCH * 365;
+        $daysvalid = ($validTo - $validFrom) / self::DAY_EPOCH;
+        $dn = [
+            "countryName" => "NL",
+            "stateOrProvinceName" => "Zuid Holland",
+            "localityName" => "Delft",
+            "organizationName" => "grommunio",
+            "organizationalUnitName" => "Dev",
+            "commonName" => "John",
+            "emailAddress" => $emailAddress,
+        ];
+        $config = ['config' => OPENSSL_CONF_PATH];
+        if (empty($this->privkey)) {
+            $this->privkey = openssl_pkey_new();
+        }
+
+        $csr = openssl_csr_new($dn, $this->privkey, $config);
+        $sscert = openssl_csr_sign($csr, null, $this->privkey, $daysvalid, $config);
+        openssl_x509_export($sscert, $publickey);
+        openssl_pkcs12_export($publickey, $out, $this->privkey, $passphrase);
+
+        return $out;
+    }
+
+    /**
+     * @param string $days string formatted as -500d or +500d
+     */
+    private function generatePKCS12Faketime($days) {
+        $libfaketime = '/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1';
+        if (!file_exists($libfaketime)) {
+            // Arch libfaketime location
+            $libfaketime = '/usr/lib/faketime/libfaketime.so.1';
+        }
+
+        return base64_decode(shell_exec("LD_PRELOAD='{$libfaketime}' FAKETIME={$days} php ./test/create_pkcs12.php"));
+    }
+
+    /**
+     * Test a valid generate certificate.
+     */
+    public function testValidCert() {
+        $pkcs12 = $this->generatePKCS12();
+        list($message, $cert, $data) = validateUploadedPKCS($pkcs12, self::PASSPHRASE, self::EMAIL_ADDRESS);
+        $this->assertEquals($message, '');
+        $this->assertNotEmpty($cert);
+        $this->assertNotEmpty($data);
+    }
+
+    /**
+     * Test an invalid PKCS#12 format.
+     */
+    public function testFaultyPKCS12() {
+        $this->assertEquals(validateUploadedPKCS('burp', 'burp', 'foo@bar.nl')[0], 'Unable to decrypt certificate');
+    }
+
+    /**
+     * Test an incorrect passphrase.
+     */
+    public function testIncorrectPassphrase() {
+        $pkcs12 = $this->generatePKCS12();
+        $this->assertEquals(validateUploadedPKCS($pkcs12, 'burp', 'foo@bar.nl')[0], 'Unable to decrypt certificate');
+    }
+
+    /**
+     * Test incorrect email address, which does not match the account <-> cert.
+     */
+    public function testIncorrectEmailAddress() {
+        $pkcs12 = $this->generatePKCS12();
+        $this->assertEquals(
+            validateUploadedPKCS($pkcs12, self::PASSPHRASE, 'foo@bar.nl')[0],
+            "Certificate email address doesn't match grommunio Web account " . self::EMAIL_ADDRESS
+        );
+    }
+
+    /**
+     * Test an expired certificate.
+     */
+    public function testCertificateDateExpired() {
+        $pkcs12 = $this->generatePKCS12Faketime('-500d');
+        list($message, $cert, $data) = validateUploadedPKCS($pkcs12, self::PASSPHRASE, self::EMAIL_ADDRESS);
+        $validTo = date('Y-m-d', $data['validTo_time_t']);
+
+        $this->assertEquals($message, sprintf("Certificate was expired on %s. Certificate has not been imported", $validTo));
+        $this->assertNotEmpty($cert);
+    }
+
+    /**
+     * Test an certificate in the future.
+     */
+    public function testCertificateNotValid() {
+        $pkcs12 = $this->generatePKCS12Faketime('+500d');
+        list($message, $cert, $data) = validateUploadedPKCS($pkcs12, self::PASSPHRASE, self::EMAIL_ADDRESS);
+        $validFrom = date('Y-m-d', $data['validFrom_time_t']);
+
+        $this->assertEquals($message, sprintf("Certificate is not yet valid %s. Certificate has not been imported", $validFrom));
+        $this->assertNotEmpty($cert);
+    }
 }

plugins/smime/php/lib/X509.php

Indentation +355 added lines, -355 removed lines

@@ -11,368 +11,368 @@
  * Certificate Revocation List (CRL) Profile (http://www.ietf.org/rfc/rfc5280.txt)
  */
 class X509Helper extends Der {
-	public function generalName() {
-		$tag = $this->peek();
-
-		switch ($tag) {
-			case 0:
-				$res['otherName'] = $this->oid(-6);
-				break;
-
-			case 1:
-				$res['rfc822Name'] = $this->next(-22);
-				break;
-
-			case 2:
-				$res['dNSName'] = $this->next(-22);
-				break;
-
-			case 4:
-				$this->next(4);
-				$res['directoryName'] = $this->name();
-				$res['directoryName_'] = $this->nameasstring($res['directoryName']);
-				break;
-
-			case 6:
-				$res['uniformResourceIdentifier'] = $this->next(-22);
-				break;
-
-			default:
-				throw new \Exception("Unsupported GeneralName: {$tag}");
+    public function generalName() {
+        $tag = $this->peek();
+
+        switch ($tag) {
+            case 0:
+                $res['otherName'] = $this->oid(-6);
+                break;
+
+            case 1:
+                $res['rfc822Name'] = $this->next(-22);
+                break;
+
+            case 2:
+                $res['dNSName'] = $this->next(-22);
+                break;
+
+            case 4:
+                $this->next(4);
+                $res['directoryName'] = $this->name();
+                $res['directoryName_'] = $this->nameasstring($res['directoryName']);
+                break;
+
+            case 6:
+                $res['uniformResourceIdentifier'] = $this->next(-22);
+                break;
+
+            default:
+                throw new \Exception("Unsupported GeneralName: {$tag}");
 #                trigger_error("Unsupported GeneralName: $tag", E_USER_ERROR);
-		}
-
-		return $res;
-	}
-
-	public function generalNames($tag = null) {
-		$res = [];
-		$this->beginsequence($tag);
-		while ($this->in()) {
-			$res[] = $this->generalName();
-		}
-		$this->end();
-
-		return $res;
-	}
-
-	public function nameasstring($name) {
-		$rdnd = '';
-		$res = '';
-		$abbvrs = [
-			'countryName' => 'c',
-			'organizationName' => 'o',
-			'commonName' => 'cn',
-			'stateOrProvinceName' => 'state',
-			'localityName' => 'l',
-			'organizationalUnitName' => 'ou',
-			'domainComponent' => 'dc',
-		];
-		foreach ($name as $rdn) {
-			$mrdnd = '';
-			$r = "";
-			foreach ($rdn as $type => $value) {
-				if (substr($type, -1) == '*') {
-					continue;
-				}
-				$type = empty($abbvrs[$type]) ? $type : $abbvrs[$type];
-				$r .= $mrdnd . $type . '=' . $value;
-				$mrdnd = '+';
-			}
-			$res .= $rdnd . $r;
-			$rdnd = ',';
-		}
-
-		return $res;
-	}
+        }
+
+        return $res;
+    }
+
+    public function generalNames($tag = null) {
+        $res = [];
+        $this->beginsequence($tag);
+        while ($this->in()) {
+            $res[] = $this->generalName();
+        }
+        $this->end();
+
+        return $res;
+    }
+
+    public function nameasstring($name) {
+        $rdnd = '';
+        $res = '';
+        $abbvrs = [
+            'countryName' => 'c',
+            'organizationName' => 'o',
+            'commonName' => 'cn',
+            'stateOrProvinceName' => 'state',
+            'localityName' => 'l',
+            'organizationalUnitName' => 'ou',
+            'domainComponent' => 'dc',
+        ];
+        foreach ($name as $rdn) {
+            $mrdnd = '';
+            $r = "";
+            foreach ($rdn as $type => $value) {
+                if (substr($type, -1) == '*') {
+                    continue;
+                }
+                $type = empty($abbvrs[$type]) ? $type : $abbvrs[$type];
+                $r .= $mrdnd . $type . '=' . $value;
+                $mrdnd = '+';
+            }
+            $res .= $rdnd . $r;
+            $rdnd = ',';
+        }
+
+        return $res;
+    }
 }
 
 class X509 extends Der {
-	protected $xtns;
-
-	protected $keyUsages = [
-		'digitalSignature',
-		'contentCommitment',
-		'keyEncipherment',
-		'dataEncipherment',
-		'keyAgreement',
-		'keyCertSign',
-		'cRLSign',
-		'encipherOnly',
-		'decipherOnly',
-	];
-
-	public function __construct() {
-		$this->xtns = new X509Helper();
-	}
-
-	public function certificate($der) {
-		$this->init($der);
-
-		return $this->certificate_do();
-	}
-
-	protected function certificate_do() {
-		$cert['certificate_der'] = $this->der(); # inclusive signatureAlgorithm and signature
-		$this->beginsequence();
-		$cert['tbsCertificate'] = $this->tbsCertificate();
-		$cert['signatureAlgorithm'] = $this->signatureAlgorithm();
-		$cert['signature'] = $this->next(3);
-		$this->end();
-
-		return $cert;
-		# print_r($cert);
-	}
-
-	protected function tbsCertificate() {
-		$res['tbsCertificate_der'] = $this->der();
-		$this->beginsequence();
-		$res['version'] = 0;
-		if ($this->peek(0)) {
-			$res['version'] = $this->next(2);
-		}
-		$res['serialNumber_der'] = $this->der();
-		$res['serialNumber'] = $this->next(2);
-		$res['signature'] = $this->signatureAlgorithm();
-		$res['issuer_der'] = $this->der();
-		$res['issuer'] = $this->name();
-		$res['issuer_'] = $this->xtns->nameasstring($res['issuer']);
-		$res['validity'] = $this->validity();
-		$res['subject_der'] = $this->der();
-		$res['subject'] = $this->name();
-		$res['subject_'] = $this->xtns->nameasstring($res['subject']);
-		$this->beginsequence();
-		$res['subjectPublicKeyInfo']['algorithm'] = $this->signatureAlgorithm();
-		$res['subjectPublicKeyInfo']['subjectPublicKey'] = $this->next(3);
-		$this->end();
-		if ($this->peek() == 1) { # issuerUniqueID IMPLICIT
-			$this->next(1);
-		}
-		if ($this->peek() == 2) { # subjectUniqueID IMPLICIT
-			$this->next(1);
-		}
-		if ($this->peek(3)) {
-			$res['extensions'] = $this->extensions();
-		}
-		$this->end();
-
-		return $res;
-	}
-
-	protected function validity() {
-		$this->beginsequence();
-		$res = ['notBefore' => $this->time(), 'notAfter' => $this->time()];
-		$this->end();
-
-		return $res;
-	}
-
-	protected function keyUsage($der) {
-		$this->xtns->init($der);
-		$bitstring = $this->xtns->next(3);
-
-		/*
+    protected $xtns;
+
+    protected $keyUsages = [
+        'digitalSignature',
+        'contentCommitment',
+        'keyEncipherment',
+        'dataEncipherment',
+        'keyAgreement',
+        'keyCertSign',
+        'cRLSign',
+        'encipherOnly',
+        'decipherOnly',
+    ];
+
+    public function __construct() {
+        $this->xtns = new X509Helper();
+    }
+
+    public function certificate($der) {
+        $this->init($der);
+
+        return $this->certificate_do();
+    }
+
+    protected function certificate_do() {
+        $cert['certificate_der'] = $this->der(); # inclusive signatureAlgorithm and signature
+        $this->beginsequence();
+        $cert['tbsCertificate'] = $this->tbsCertificate();
+        $cert['signatureAlgorithm'] = $this->signatureAlgorithm();
+        $cert['signature'] = $this->next(3);
+        $this->end();
+
+        return $cert;
+        # print_r($cert);
+    }
+
+    protected function tbsCertificate() {
+        $res['tbsCertificate_der'] = $this->der();
+        $this->beginsequence();
+        $res['version'] = 0;
+        if ($this->peek(0)) {
+            $res['version'] = $this->next(2);
+        }
+        $res['serialNumber_der'] = $this->der();
+        $res['serialNumber'] = $this->next(2);
+        $res['signature'] = $this->signatureAlgorithm();
+        $res['issuer_der'] = $this->der();
+        $res['issuer'] = $this->name();
+        $res['issuer_'] = $this->xtns->nameasstring($res['issuer']);
+        $res['validity'] = $this->validity();
+        $res['subject_der'] = $this->der();
+        $res['subject'] = $this->name();
+        $res['subject_'] = $this->xtns->nameasstring($res['subject']);
+        $this->beginsequence();
+        $res['subjectPublicKeyInfo']['algorithm'] = $this->signatureAlgorithm();
+        $res['subjectPublicKeyInfo']['subjectPublicKey'] = $this->next(3);
+        $this->end();
+        if ($this->peek() == 1) { # issuerUniqueID IMPLICIT
+            $this->next(1);
+        }
+        if ($this->peek() == 2) { # subjectUniqueID IMPLICIT
+            $this->next(1);
+        }
+        if ($this->peek(3)) {
+            $res['extensions'] = $this->extensions();
+        }
+        $this->end();
+
+        return $res;
+    }
+
+    protected function validity() {
+        $this->beginsequence();
+        $res = ['notBefore' => $this->time(), 'notAfter' => $this->time()];
+        $this->end();
+
+        return $res;
+    }
+
+    protected function keyUsage($der) {
+        $this->xtns->init($der);
+        $bitstring = $this->xtns->next(3);
+
+        /*
 		  Convert to 'binary' string - '1' in front to not have prefix zeroes removed
 		  Let go of the last ord(substr($ku[0]['value'], 0, 1) bits as per the BIT STRING der spec
 		  as well as the '1' prefix from above
 		 */
 
-		$unusedbits = ord(substr($bitstring, 0, 1));
-		$ku = base_convert(bin2hex(chr(1) . substr($bitstring, 1)), 16, 2);
-		$ku = substr($ku, 1, -$unusedbits);
-		$res = [];
-		for ($c = 0; $c < strlen($ku); ++$c) {
-			if ($ku[$c]) {
-				$res[$this->keyUsages[$c]] = 1;
-			}
-		}
-
-		return $res;
-	}
-
-	protected function authorityInfoAccess($der) {
-		$this->xtns->init($der);
-		$this->xtns->beginsequence();
-		while ($this->xtns->in()) {
-			$this->xtns->beginsequence();
-			$accessMethod = $this->xtns->oid();
-			$res[$accessMethod][] = [
-				# 'accessMethod' => $accessMethod,
-				'accessLocation' => $this->xtns->generalName(),
-			];
-			$this->xtns->end();
-		}
-		$this->xtns->end();
-
-		return $res;
-	}
-
-	protected function certificatePolicies($der) {
-		$this->xtns->init($der);
-
-		$res = [];
-		$this->xtns->beginsequence();
-		while ($this->xtns->in()) {
-			$this->xtns->beginsequence();
-			$PolicyInformation['policyIdentifier'] = $this->xtns->oid();
-			if ($this->xtns->in()) {
-				$this->xtns->beginsequence();
-				while ($this->xtns->in()) {
-					$this->xtns->beginsequence();
-					$policyQualifier = [];
-					$policyQualifierId = $this->xtns->oid();
-					$policyQualifier['policyQualifierId'] = $policyQualifierId;
-					if ($policyQualifierId == 'cps') {
-						$policyQualifier['cPSuri'] = $this->xtns->next(22);
-					}
-					elseif ($policyQualifierId == 'unotice') {
-						$this->xtns->beginsequence();
-						if ($this->xtns->peek() == 16) {
-							$this->xtns->beginsequence();
-							$policyQualifier['UserNotice']['noticeRef']['organisation'] = $this->xtns->next();
-							$this->xtns->beginsequence();
-							while ($this->xtns->in()) {
-								$policyQualifier['UserNotice']['noticeRef']['noticeNumbers'][] = $this->xtns->next(2);
-							}
-							$this->xtns->end();
-							$this->xtns->end();
-						}
-						if ($this->xtns->in()) {
-							$policyQualifier['UserNotice']['explicitText'] = $this->xtns->next();
-						}
-						$this->xtns->end();
-					}
-
-					$PolicyInformation['qualifier'][] = $policyQualifier;
-					$this->xtns->end();
-				}
-				$this->xtns->end();
-			}
-			$this->xtns->end();
-			$res[] = $PolicyInformation;
-		}
-		$this->xtns->end();
-
-		return $res;
-	}
-
-	protected function cRLDistributionPoints($der) {
-		$this->xtns->init($der);
-		$this->xtns->beginsequence();
-		while ($this->xtns->in()) {
-			$res = [];
-			$this->xtns->beginsequence();
-			if ($this->xtns->peek(0)) {
-				if ($this->xtns->peek() == 0) {
-					$res['distributionPoint']['fullname'][] = $this->xtns->generalnames(0);
-				}
-				if ($this->xtns->peek() == 1) {
-					$res['distributionPoint']['nameRelativeToCRLIssuer'][] = $this->xtns->name(1);
-				}
-			}
-			if ($this->xtns->peek() == 1) {
-				$res['reasons'] = $this->xtns->next(1);
-			}
-			if ($this->xtns->peek() == 2) {
-				$res['cRLIssuer'] = $this->xtns->next(2);
-			}
-			$this->xtns->end();
-			$crldps[] = $res;
-		}
-		$this->xtns->end();
-
-		return $crldps;
-	}
-
-	protected function authorityKeyIdentifier($der) {
-		$this->xtns->init($der);
-		$this->xtns->beginsequence();
-		if ($this->xtns->peek() == 0) {
-			$res['keyIdentifier'] = chunk_split(bin2hex($this->xtns->next()), 2, ':');
-		}
-		if ($this->xtns->in() && $this->xtns->peek() == 1) {
-			$res['authorityCertIssuer'] = $this->xtns->GeneralNames();
-		}
-		if ($this->xtns->in() && $this->xtns->peek() == 2) {
-			$res['authorityCertSerialNumber'] = $this->xtns->next();
-		}
-		$this->xtns->end();
-
-		return $res;
-	}
-
-	protected function subjectKeyIdentifier($der) {
-		$this->xtns->init($der);
-		$res['keyIdentifier'] = chunk_split(bin2hex($this->xtns->next(4)), 2, ':');
-
-		return $res;
-	}
-
-	protected function basicConstraints($der) {
-		$res['cA'] = false;
-		$this->xtns->init($der);
-		$this->xtns->beginsequence();
-		if ($this->xtns->in()) {
-			$res['cA'] = $this->xtns->next(1);
-		}
-		# pathLenConstraint optional even if cA is true ???
-		if ($res['cA'] && $this->xtns->in()) {
-			$res['pathLenConstraint'] = $this->xtns->next(2);
-		}
-		$this->xtns->end();
-
-		return $res;
-	}
-
-	protected function extKeyUsage($der) {
-		$this->xtns->init($der);
-		$this->xtns->beginsequence();
-		while ($this->xtns->in()) {
-			$res[$this->xtns->oid()] = 1;
-		}
-		$this->xtns->end();
-
-		return $res;
-	}
-
-	protected function subjectAltName($der) {
-		$this->xtns->init($der);
-		$this->xtns->beginsequence();
-		while ($this->xtns->in()) {
-			$res['subjectAltName'][] = $this->xtns->generalName();
-		}
-		$this->xtns->end();
-
-		return $res;
-	}
-
-	protected function privateKeyUsagePeriod($der) {
-		$this->xtns->init($der);
-		$this->xtns->beginsequence();
-		if ($this->xtns->in() && $this->xtns->peek() == 0) {
-			$res['notBefore'] = $this->xtns->time(-24);
-		}
-		if ($this->xtns->in() && $this->xtns->peek() == 1) {
-			$res['notAfter'] = $this->xtns->time(-24);
-		}
-		$this->xtns->end();
-
-		return $res;
-	}
-
-	protected function ocspNoCheck($der) {
-		$this->xtns->init($der);
-
-		return $this->xtns->next();
-	}
-
-	# RFC 2313 p. 15 ...
-
-	public function RSASignatureValue($der) {
-		$this->xtns->init($der);
-		$res['digestAlgorithm']['algorithm'] = $this->xtns->oid();
-		$res['digestAlgorithm']['parameters'] = $this->next();
-
-		return $res;
-	}
+        $unusedbits = ord(substr($bitstring, 0, 1));
+        $ku = base_convert(bin2hex(chr(1) . substr($bitstring, 1)), 16, 2);
+        $ku = substr($ku, 1, -$unusedbits);
+        $res = [];
+        for ($c = 0; $c < strlen($ku); ++$c) {
+            if ($ku[$c]) {
+                $res[$this->keyUsages[$c]] = 1;
+            }
+        }
+
+        return $res;
+    }
+
+    protected function authorityInfoAccess($der) {
+        $this->xtns->init($der);
+        $this->xtns->beginsequence();
+        while ($this->xtns->in()) {
+            $this->xtns->beginsequence();
+            $accessMethod = $this->xtns->oid();
+            $res[$accessMethod][] = [
+                # 'accessMethod' => $accessMethod,
+                'accessLocation' => $this->xtns->generalName(),
+            ];
+            $this->xtns->end();
+        }
+        $this->xtns->end();
+
+        return $res;
+    }
+
+    protected function certificatePolicies($der) {
+        $this->xtns->init($der);
+
+        $res = [];
+        $this->xtns->beginsequence();
+        while ($this->xtns->in()) {
+            $this->xtns->beginsequence();
+            $PolicyInformation['policyIdentifier'] = $this->xtns->oid();
+            if ($this->xtns->in()) {
+                $this->xtns->beginsequence();
+                while ($this->xtns->in()) {
+                    $this->xtns->beginsequence();
+                    $policyQualifier = [];
+                    $policyQualifierId = $this->xtns->oid();
+                    $policyQualifier['policyQualifierId'] = $policyQualifierId;
+                    if ($policyQualifierId == 'cps') {
+                        $policyQualifier['cPSuri'] = $this->xtns->next(22);
+                    }
+                    elseif ($policyQualifierId == 'unotice') {
+                        $this->xtns->beginsequence();
+                        if ($this->xtns->peek() == 16) {
+                            $this->xtns->beginsequence();
+                            $policyQualifier['UserNotice']['noticeRef']['organisation'] = $this->xtns->next();
+                            $this->xtns->beginsequence();
+                            while ($this->xtns->in()) {
+                                $policyQualifier['UserNotice']['noticeRef']['noticeNumbers'][] = $this->xtns->next(2);
+                            }
+                            $this->xtns->end();
+                            $this->xtns->end();
+                        }
+                        if ($this->xtns->in()) {
+                            $policyQualifier['UserNotice']['explicitText'] = $this->xtns->next();
+                        }
+                        $this->xtns->end();
+                    }
+
+                    $PolicyInformation['qualifier'][] = $policyQualifier;
+                    $this->xtns->end();
+                }
+                $this->xtns->end();
+            }
+            $this->xtns->end();
+            $res[] = $PolicyInformation;
+        }
+        $this->xtns->end();
+
+        return $res;
+    }
+
+    protected function cRLDistributionPoints($der) {
+        $this->xtns->init($der);
+        $this->xtns->beginsequence();
+        while ($this->xtns->in()) {
+            $res = [];
+            $this->xtns->beginsequence();
+            if ($this->xtns->peek(0)) {
+                if ($this->xtns->peek() == 0) {
+                    $res['distributionPoint']['fullname'][] = $this->xtns->generalnames(0);
+                }
+                if ($this->xtns->peek() == 1) {
+                    $res['distributionPoint']['nameRelativeToCRLIssuer'][] = $this->xtns->name(1);
+                }
+            }
+            if ($this->xtns->peek() == 1) {
+                $res['reasons'] = $this->xtns->next(1);
+            }
+            if ($this->xtns->peek() == 2) {
+                $res['cRLIssuer'] = $this->xtns->next(2);
+            }
+            $this->xtns->end();
+            $crldps[] = $res;
+        }
+        $this->xtns->end();
+
+        return $crldps;
+    }
+
+    protected function authorityKeyIdentifier($der) {
+        $this->xtns->init($der);
+        $this->xtns->beginsequence();
+        if ($this->xtns->peek() == 0) {
+            $res['keyIdentifier'] = chunk_split(bin2hex($this->xtns->next()), 2, ':');
+        }
+        if ($this->xtns->in() && $this->xtns->peek() == 1) {
+            $res['authorityCertIssuer'] = $this->xtns->GeneralNames();
+        }
+        if ($this->xtns->in() && $this->xtns->peek() == 2) {
+            $res['authorityCertSerialNumber'] = $this->xtns->next();
+        }
+        $this->xtns->end();
+
+        return $res;
+    }
+
+    protected function subjectKeyIdentifier($der) {
+        $this->xtns->init($der);
+        $res['keyIdentifier'] = chunk_split(bin2hex($this->xtns->next(4)), 2, ':');
+
+        return $res;
+    }
+
+    protected function basicConstraints($der) {
+        $res['cA'] = false;
+        $this->xtns->init($der);
+        $this->xtns->beginsequence();
+        if ($this->xtns->in()) {
+            $res['cA'] = $this->xtns->next(1);
+        }
+        # pathLenConstraint optional even if cA is true ???
+        if ($res['cA'] && $this->xtns->in()) {
+            $res['pathLenConstraint'] = $this->xtns->next(2);
+        }
+        $this->xtns->end();
+
+        return $res;
+    }
+
+    protected function extKeyUsage($der) {
+        $this->xtns->init($der);
+        $this->xtns->beginsequence();
+        while ($this->xtns->in()) {
+            $res[$this->xtns->oid()] = 1;
+        }
+        $this->xtns->end();
+
+        return $res;
+    }
+
+    protected function subjectAltName($der) {
+        $this->xtns->init($der);
+        $this->xtns->beginsequence();
+        while ($this->xtns->in()) {
+            $res['subjectAltName'][] = $this->xtns->generalName();
+        }
+        $this->xtns->end();
+
+        return $res;
+    }
+
+    protected function privateKeyUsagePeriod($der) {
+        $this->xtns->init($der);
+        $this->xtns->beginsequence();
+        if ($this->xtns->in() && $this->xtns->peek() == 0) {
+            $res['notBefore'] = $this->xtns->time(-24);
+        }
+        if ($this->xtns->in() && $this->xtns->peek() == 1) {
+            $res['notAfter'] = $this->xtns->time(-24);
+        }
+        $this->xtns->end();
+
+        return $res;
+    }
+
+    protected function ocspNoCheck($der) {
+        $this->xtns->init($der);
+
+        return $this->xtns->next();
+    }
+
+    # RFC 2313 p. 15 ...
+
+    public function RSASignatureValue($der) {
+        $this->xtns->init($der);
+        $res['digestAlgorithm']['algorithm'] = $this->xtns->oid();
+        $res['digestAlgorithm']['parameters'] = $this->next();
+
+        return $res;
+    }
 }

Braces +1 added lines, -2 removed lines

@@ -224,8 +224,7 @@
 					$policyQualifier['policyQualifierId'] = $policyQualifierId;
 					if ($policyQualifierId == 'cps') {
 						$policyQualifier['cPSuri'] = $this->xtns->next(22);
-					}
-					elseif ($policyQualifierId == 'unotice') {
+					} elseif ($policyQualifierId == 'unotice') {
 						$this->xtns->beginsequence();
 						if ($this->xtns->peek() == 16) {
 							$this->xtns->beginsequence();

plugins/smime/php/lib/Ocsp.php

Indentation +203 added lines, -203 removed lines

@@ -6,207 +6,207 @@
  * OCSP is able to encode OCSPRequests and decode OCSPResponses - just enough for NemID use.
  */
 class OCSP extends X509 {
-	public function request($certids = []) {
-		$certids_der = '';
-		foreach ($certids as $certid) {
-			$certids_der .= $this->sequence(
-				$this->sequence($this->s2oid($certid['hash_alg'])) .
-							$this->octetstring($certid['issuerNameHash']) .
-							$this->octetstring($certid['issuerKeyHash']) .
-							$certid['serialNumber_der']
-			);
-		}
-
-		return $this->sequence($this->sequence($this->sequence($this->sequence($certids_der))));
-	}
-
-	private function sequence($pdu) {
-		return "\x30" . self::len($pdu) . $pdu;
-	}
-
-	protected function octetstring($s) {
-		return "\x04" . $this->len($s) . $s;
-	}
-
-	/** serialNumber is now in DER encoding - no need to convert from bc to DER
-	 * so this is not used any more.
-	 *
-	 * @param mixed $d
-	 */
-	private function d2i($d) {
-		$der = '';
-		while ($d) {
-			$der .= chr(bcmod($d, 256));
-			$d = bcdiv($d, 256, 0);
-		}
-
-		return "\x02" . $this->len($der) . strrev($der);
-	}
-
-	private function len($i) {
-		$i = strlen($i);
-		if ($i <= 127) {
-			$res = pack('C', $i);
-		}
-		elseif ($i <= 255) {
-			$res = pack('CC', 0x81, $i);
-		}
-		elseif ($i <= 65535) {
-			$res = pack('Cn', 0x82, $i);
-		}
-		else {
-			$res = pack('CN', 0x84, $i);
-		}
-
-		return $res;
-	}
-
-	protected function s2oid($s) {
-		$e = explode('.', $s);
-		$der = chr(40 * $e[0] + $e[1]);
-
-		foreach (array_slice($e, 2) as $c) {
-			$mask = 0;
-			$derrev = '';
-			while ($c) {
-				$derrev .= chr(bcmod($c, 128) + $mask);
-				$c = bcdiv($c, 128, 0);
-				$mask = 128;
-			}
-			$der .= strrev($derrev);
-		}
-
-		return "\x06" . $this->len($der) . $der;
-	}
-
-	public function certOcspID($certid = [], $hash_alg = 'sha256') {
-		$hash_algs = ['sha1' => "1.3.14.3.2.26", 'sha256' => "2.16.840.1.101.3.4.2.1"];
-
-		return [
-			'hash_alg' => $hash_algs[$hash_alg],
-			'issuerNameHash' => openssl_digest($certid['issuerName'], $hash_alg, true),
-			'issuerKeyHash' => openssl_digest($certid['issuerKey'], $hash_alg, true),
-			'serialNumber_der' => $certid['serialNumber_der'],
-		];
-	}
-
-	public function response($der) {
-		$this->init($der);
-		$this->beginsequence();
-		$ocspresponse['responseStatus'] = $this->responseStatus();
-		if ($ocspresponse['responseStatus'] == 'successful') {
-			$ocspresponse['responseBytes'] = $this->responseBytes();
-		}
-		$this->end();
-
-		return $ocspresponse;
-	}
-
-	protected function responseStatus() {
-		$responsestatus = [
-			'successful',
-			'malformedRequest',
-			'internalError',
-			'tryLater',
-			'NOT USED',
-			'sigRequired',
-			'unauthorized',
-		];
-
-		return $responsestatus[$this->next(10)];
-	}
-
-	protected function responseBytes() {
-		$this->next(0);
-		$this->beginsequence();
-		$res['responseType'] = $this->oid();
-		if ($res['responseType'] == 'ocspBasic') {
-			$res['BasicOCSPResponse'] = $this->ocspBasic($this->next(4));
-		}
-		$this->end();
-
-		return $res;
-	}
-
-	protected function ocspBasic($der) {
-		$this->xtns->init($der);
-		$this->xtns->beginsequence();
-		$res['tbsResponseData_der'] = $this->xtns->der();
-		$res['tbsResponseData'] = $this->tbsResponseData();
-		$res['signatureAlgorithm'] = $this->xtns->signatureAlgorithm();
-		$res['signature'] = $this->xtns->next(3);
-
-		if ($this->xtns->peek() === 0) {
-			$this->xtns->next(0);
-			if ($this->xtns->peek() === 16) {
-				$this->xtns->beginsequence();
-				$x = new X509();
-				while ($this->xtns->in()) {
-					$res['certs'][] = $x->certificate($this->xtns->der(null, true)); # get and continue past ...
-				}
-				$this->xtns->end();
-			}
-		}
-		$this->xtns->end();
-
-		return $res;
-	}
-
-	protected function tbsResponseData() {
-		$res['version'] = 0;
-		$this->xtns->beginsequence();
-		if ($this->xtns->peek() == 0) {
-			$this->xtns->next(0);
-			$res['version'] = $this->xtns->next(2);
-		}
-		$choice = $this->xtns->peek();
-		$this->xtns->next();
-		if ($choice == 1) {
-			$res['responderID']['byName'] = $this->xtns->name();
-		}
-		elseif ($choice == 2) {
-			$res['responderID']['byKey'] = $this->xtns->keyident();
-		}
-		$res['producedAt'] = $this->xtns->time();
-		$res['responses'] = $this->singleResponses();
-		$this->xtns->end();
-
-		return $res;
-	}
-
-	protected function singleResponses() {
-		$this->xtns->beginsequence();
-		while ($this->xtns->in()) {
-			$this->xtns->beginsequence();
-			$srres['certID'] = $this->certID();
-			$certstatuses = ['good', 'revoked', 'unknown'];
-			$srres['certStatus'] = $certstatuses[$this->xtns->peek()];
-			$this->xtns->next();
-			$srres['thisUpdate'] = $this->xtns->time();
-			if ($this->xtns->in() && $this->xtns->peek() == 0) {
-				$this->xtns->next(0);
-				$srres['nextupdate'] = $this->xtns->time();
-			}
-			if ($this->xtns->in() && $this->xtns->peek() == 1) {
-				$this->xtns->next(1);
-				$srres['singleextensions'] = $this->xtns->next;
-			}
-			$res[] = $srres;
-			$this->xtns->end();
-		}
-		$this->xtns->end();
-
-		return $res;
-	}
-
-	public function certID() {
-		$this->xtns->beginsequence();
-		$res['hashAlgorithm'] = $this->xtns->signatureAlgorithm();
-		$res['issuerNameHash'] = $this->xtns->next(4);
-		$res['issuerKeyHash'] = $this->xtns->next(4);
-		$res['serialNumber'] = $this->xtns->next(2);
-		$this->xtns->end();
-
-		return $res;
-	}
+    public function request($certids = []) {
+        $certids_der = '';
+        foreach ($certids as $certid) {
+            $certids_der .= $this->sequence(
+                $this->sequence($this->s2oid($certid['hash_alg'])) .
+                            $this->octetstring($certid['issuerNameHash']) .
+                            $this->octetstring($certid['issuerKeyHash']) .
+                            $certid['serialNumber_der']
+            );
+        }
+
+        return $this->sequence($this->sequence($this->sequence($this->sequence($certids_der))));
+    }
+
+    private function sequence($pdu) {
+        return "\x30" . self::len($pdu) . $pdu;
+    }
+
+    protected function octetstring($s) {
+        return "\x04" . $this->len($s) . $s;
+    }
+
+    /** serialNumber is now in DER encoding - no need to convert from bc to DER
+     * so this is not used any more.
+     *
+     * @param mixed $d
+     */
+    private function d2i($d) {
+        $der = '';
+        while ($d) {
+            $der .= chr(bcmod($d, 256));
+            $d = bcdiv($d, 256, 0);
+        }
+
+        return "\x02" . $this->len($der) . strrev($der);
+    }
+
+    private function len($i) {
+        $i = strlen($i);
+        if ($i <= 127) {
+            $res = pack('C', $i);
+        }
+        elseif ($i <= 255) {
+            $res = pack('CC', 0x81, $i);
+        }
+        elseif ($i <= 65535) {
+            $res = pack('Cn', 0x82, $i);
+        }
+        else {
+            $res = pack('CN', 0x84, $i);
+        }
+
+        return $res;
+    }
+
+    protected function s2oid($s) {
+        $e = explode('.', $s);
+        $der = chr(40 * $e[0] + $e[1]);
+
+        foreach (array_slice($e, 2) as $c) {
+            $mask = 0;
+            $derrev = '';
+            while ($c) {
+                $derrev .= chr(bcmod($c, 128) + $mask);
+                $c = bcdiv($c, 128, 0);
+                $mask = 128;
+            }
+            $der .= strrev($derrev);
+        }
+
+        return "\x06" . $this->len($der) . $der;
+    }
+
+    public function certOcspID($certid = [], $hash_alg = 'sha256') {
+        $hash_algs = ['sha1' => "1.3.14.3.2.26", 'sha256' => "2.16.840.1.101.3.4.2.1"];
+
+        return [
+            'hash_alg' => $hash_algs[$hash_alg],
+            'issuerNameHash' => openssl_digest($certid['issuerName'], $hash_alg, true),
+            'issuerKeyHash' => openssl_digest($certid['issuerKey'], $hash_alg, true),
+            'serialNumber_der' => $certid['serialNumber_der'],
+        ];
+    }
+
+    public function response($der) {
+        $this->init($der);
+        $this->beginsequence();
+        $ocspresponse['responseStatus'] = $this->responseStatus();
+        if ($ocspresponse['responseStatus'] == 'successful') {
+            $ocspresponse['responseBytes'] = $this->responseBytes();
+        }
+        $this->end();
+
+        return $ocspresponse;
+    }
+
+    protected function responseStatus() {
+        $responsestatus = [
+            'successful',
+            'malformedRequest',
+            'internalError',
+            'tryLater',
+            'NOT USED',
+            'sigRequired',
+            'unauthorized',
+        ];
+
+        return $responsestatus[$this->next(10)];
+    }
+
+    protected function responseBytes() {
+        $this->next(0);
+        $this->beginsequence();
+        $res['responseType'] = $this->oid();
+        if ($res['responseType'] == 'ocspBasic') {
+            $res['BasicOCSPResponse'] = $this->ocspBasic($this->next(4));
+        }
+        $this->end();
+
+        return $res;
+    }
+
+    protected function ocspBasic($der) {
+        $this->xtns->init($der);
+        $this->xtns->beginsequence();
+        $res['tbsResponseData_der'] = $this->xtns->der();
+        $res['tbsResponseData'] = $this->tbsResponseData();
+        $res['signatureAlgorithm'] = $this->xtns->signatureAlgorithm();
+        $res['signature'] = $this->xtns->next(3);
+
+        if ($this->xtns->peek() === 0) {
+            $this->xtns->next(0);
+            if ($this->xtns->peek() === 16) {
+                $this->xtns->beginsequence();
+                $x = new X509();
+                while ($this->xtns->in()) {
+                    $res['certs'][] = $x->certificate($this->xtns->der(null, true)); # get and continue past ...
+                }
+                $this->xtns->end();
+            }
+        }
+        $this->xtns->end();
+
+        return $res;
+    }
+
+    protected function tbsResponseData() {
+        $res['version'] = 0;
+        $this->xtns->beginsequence();
+        if ($this->xtns->peek() == 0) {
+            $this->xtns->next(0);
+            $res['version'] = $this->xtns->next(2);
+        }
+        $choice = $this->xtns->peek();
+        $this->xtns->next();
+        if ($choice == 1) {
+            $res['responderID']['byName'] = $this->xtns->name();
+        }
+        elseif ($choice == 2) {
+            $res['responderID']['byKey'] = $this->xtns->keyident();
+        }
+        $res['producedAt'] = $this->xtns->time();
+        $res['responses'] = $this->singleResponses();
+        $this->xtns->end();
+
+        return $res;
+    }
+
+    protected function singleResponses() {
+        $this->xtns->beginsequence();
+        while ($this->xtns->in()) {
+            $this->xtns->beginsequence();
+            $srres['certID'] = $this->certID();
+            $certstatuses = ['good', 'revoked', 'unknown'];
+            $srres['certStatus'] = $certstatuses[$this->xtns->peek()];
+            $this->xtns->next();
+            $srres['thisUpdate'] = $this->xtns->time();
+            if ($this->xtns->in() && $this->xtns->peek() == 0) {
+                $this->xtns->next(0);
+                $srres['nextupdate'] = $this->xtns->time();
+            }
+            if ($this->xtns->in() && $this->xtns->peek() == 1) {
+                $this->xtns->next(1);
+                $srres['singleextensions'] = $this->xtns->next;
+            }
+            $res[] = $srres;
+            $this->xtns->end();
+        }
+        $this->xtns->end();
+
+        return $res;
+    }
+
+    public function certID() {
+        $this->xtns->beginsequence();
+        $res['hashAlgorithm'] = $this->xtns->signatureAlgorithm();
+        $res['issuerNameHash'] = $this->xtns->next(4);
+        $res['issuerKeyHash'] = $this->xtns->next(4);
+        $res['serialNumber'] = $this->xtns->next(2);
+        $this->xtns->end();
+
+        return $res;
+    }
 }

Braces +4 added lines, -8 removed lines

@@ -47,14 +47,11 @@ 
 		$i = strlen($i);
 		if ($i <= 127) {
 			$res = pack('C', $i);
-		}
-		elseif ($i <= 255) {
+		} elseif ($i <= 255) {
 			$res = pack('CC', 0x81, $i);
-		}
-		elseif ($i <= 65535) {
+		} elseif ($i <= 65535) {
 			$res = pack('Cn', 0x82, $i);
-		}
-		else {
+		} else {
 			$res = pack('CN', 0x84, $i);
 		}
 
@@ -163,8 +160,7 @@ 
 		$this->xtns->next();
 		if ($choice == 1) {
 			$res['responderID']['byName'] = $this->xtns->name();
-		}
-		elseif ($choice == 2) {
+		} elseif ($choice == 2) {
 			$res['responderID']['byKey'] = $this->xtns->keyident();
 		}
 		$res['producedAt'] = $this->xtns->time();