Tiqr / tiqr-server-libphp

TestServer/TestServerController.php

Spacing +21 added lines, -21 removed lines

@@ -40,15 +40,15 @@ 
     private function initTiqrLibrary()
     {
         // Initialise the tiqr-server-library autoloader
-        $tiqr_dir = __DIR__ . '/../library/tiqr';
-        $vendor_dir = __DIR__ . '/../vendor';
+        $tiqr_dir = __DIR__.'/../library/tiqr';
+        $vendor_dir = __DIR__.'/../vendor';
 
-        require_once $tiqr_dir . '/Tiqr/AutoLoader.php';
+        require_once $tiqr_dir.'/Tiqr/AutoLoader.php';
 
         $autoloader = Tiqr_AutoLoader::getInstance([
             'tiqr.path' => $tiqr_dir,
-            'phpqrcode.path' => $vendor_dir . '/kairos/phpqrcode',
-            'zend.path' => $vendor_dir . '/zendframework/zendframework1/library'
+            'phpqrcode.path' => $vendor_dir.'/kairos/phpqrcode',
+            'zend.path' => $vendor_dir.'/zendframework/zendframework1/library'
         ]);
         $autoloader->setIncludePath();
     }
@@ -58,7 +58,7 @@ 
      */
     private function getStorageDir(): string
     {
-        $storage_dir = __DIR__ . '/storage';
+        $storage_dir = __DIR__.'/storage';
         if (!is_dir($storage_dir)) {
             if (false == mkdir($storage_dir)) {
                 TestServerApp::error_exit(500, "Error creating storage directory: $storage_dir");
@@ -184,17 +184,17 @@ 
         // The session ID is used for communicating enrollment status between this tiqr server and
         // the web browser displaying the enrollment interface. It is not used between the tiqr client and
         // this server. We do not use it.
-        $session_id = 'session_id_' . time();
+        $session_id = 'session_id_'.time();
         $app::log_info("Created session $session_id");
 
         // The user_id to create. Get it from the request, if it is not there use a test user ID.
-        $user_id = $app->getGET()['user_id'] ?? 'test-user-' . time();
+        $user_id = $app->getGET()['user_id'] ?? 'test-user-'.time();
 
         if ($this->userStorage->userExists($user_id)) {
             $app::log_warning("$user_id already exists");
         }
 
-        $user_display_name = $user_id . '\'s display name';
+        $user_display_name = $user_id.'\'s display name';
 
         // Create enrollemnt key. The display name we set here is returned in the metadata generated by
         // getEnrollmentMetadata.
@@ -202,10 +202,10 @@ 
         //       App differs from the user's displayname on the server.
         $enrollment_key = $this->tiqrService->startEnrollmentSession($user_id, $user_display_name, $session_id);
         $app::log_info("Started enrollment session $enrollment_key");
-        $metadataUrl = $this->host_url . "/metadata";
-        $enroll_string = $this->tiqrService->generateEnrollString($metadataUrl) . "?enrollment_key=$enrollment_key";
+        $metadataUrl = $this->host_url."/metadata";
+        $enroll_string = $this->tiqrService->generateEnrollString($metadataUrl)."?enrollment_key=$enrollment_key";
         $encoded_enroll_string = htmlentities(urlencode($enroll_string));
-        $image_url = "/qr?code=" . $encoded_enroll_string;
+        $image_url = "/qr?code=".$encoded_enroll_string;
 
         $view->StartEnrollment(htmlentities($enroll_string), $image_url);
     }
@@ -247,8 +247,8 @@ 
         // -----END NOTE-----
 
         // Add enrollment_secret to the $enrollment_url
-        $enrollment_url = $this->host_url . "/finish-enrollment?enrollment_secret=$enrollment_secret";
-        $authentication_url = $this->host_url . '/authentication';
+        $enrollment_url = $this->host_url."/finish-enrollment?enrollment_secret=$enrollment_secret";
+        $authentication_url = $this->host_url.'/authentication';
         // Get the enrollment data
         $enrollment_metadata = $this->tiqrService->getEnrollmentMetadata($enrollment_key, $authentication_url, $enrollment_url);
         if (false == $enrollment_metadata) {
@@ -365,10 +365,10 @@ 
     private function logo(App $app)
     {
         // Source: https://nl.wikipedia.org/wiki/Bestand:Philips_PM5544.svg
-        $name = __DIR__ . '/Philips_PM5544.jpg';
+        $name = __DIR__.'/Philips_PM5544.jpg';
         $fp = fopen($name, 'rb');
         header('Content-Type: image/jpeg');
-        header('Content-Length: ' . filesize($name));
+        header('Content-Length: '.filesize($name));
         fpassthru($fp);
         fclose($fp);
     }
@@ -379,7 +379,7 @@ 
         $users = array();
         foreach (scandir($storageDir) as $filename) {
             if (substr($filename, -5, 5) == '.json') {
-                $user = json_decode(file_get_contents($storageDir . '/' . $filename), true);
+                $user = json_decode(file_get_contents($storageDir.'/'.$filename), true);
                 if (($user != NULL) && ($user['secret'])) {
                     foreach ($user as $k => $v) {
                         $user[$k] = htmlentities($v);
@@ -393,7 +393,7 @@ 
 
     private function start_authenticate(App $app, TestServerView $view)
     {
-        $session_id = 'session_id_' . time();
+        $session_id = 'session_id_'.time();
         $app::log_info("Created session $session_id");
 
         // The user_id to authenticate. Get it from the request, if it is not there use an empty user ID
@@ -422,7 +422,7 @@ 
         $app::log_info('Started authentication URL');
         $app::log_info("authentication_url=$authentication_URL");
 
-        $image_url = "/qr?code=" . htmlentities(urlencode($authentication_URL));
+        $image_url = "/qr?code=".htmlentities(urlencode($authentication_URL));
 
         $response = '';
         if (strlen($user_id) > 0) {
@@ -432,7 +432,7 @@ 
             $app::log_info("secret=$secret");
             $exploded = explode('/', $authentication_URL);
             $session_key = $exploded[3]; // hex encoded session
-            $challenge = $exploded[4];   // 10 digit hex challenge
+            $challenge = $exploded[4]; // 10 digit hex challenge
             $app::log_info("challenge=$challenge");
             $ocra = new Tiqr_OCRAWrapper('OCRA-1:HOTP-SHA1-6:QH10-S');
             $response = $ocra->calculateResponse($secret, $challenge, $session_key);
@@ -518,7 +518,7 @@ 
         }
 
         // Lookup the secret of the user by ID
-        $userSecret = $this->userStorage->getSecret($userId);   // Assume this works
+        $userSecret = $this->userStorage->getSecret($userId); // Assume this works
         $app::log_info("userSercret=$userSecret");
 
         $app::log_info("Authenticating user");

Braces +1 added lines, -2 removed lines

@@ -261,8 +261,7 @@
                 foreach ($value1 as $key2 => $value2) {
                     $app::log_info("Metadata: $key1/$key2=$value2");
                 }
-            }
-            else {
+            } else {
                 $app::log_info("Metadata: $key1=$value1");
             }
         }

TestServer/TestServerApp.php

Spacing +2 added lines, -2 removed lines

@@ -76,14 +76,14 @@
         if ($uri[0] != '/') {
             self::error_exit(500, 'REQUEST_URI must start with "/"');
         }
-        self::log_info('--');   // End of the HTTP dump
+        self::log_info('--'); // End of the HTTP dump
 
         $path = parse_url($uri, PHP_URL_PATH);
 
         try {
             $this->router->Route($this, $path);
         } catch (Exception $e) {
-            self::error_exit(500, 'Exception: ' . $e->getMessage() . "\n\n" . $e->getTraceAsString());
+            self::error_exit(500, 'Exception: '.$e->getMessage()."\n\n".$e->getTraceAsString());
         }
     }
 

TestServer/TestServerView.php

Spacing +2 added lines, -2 removed lines

@@ -96,7 +96,7 @@ 
     {
         $refreshurl = '/start-authenticate';
         if (strlen($user_id) > 0) {
-            $refreshurl.= "?user_id=$user_id";
+            $refreshurl .= "?user_id=$user_id";
         }
         $this->begin();
         echo <<<HTML
@@ -107,7 +107,7 @@ 
 <code>$authentication_URL</code>
 <br />
 HTML;
-        if (strlen($response)>0) {
+        if (strlen($response) > 0) {
             echo <<<HTML
 <p>The response (for offline validation) is: <code>$response</code></p>
 HTML;

TestServer/app.php

Spacing +6 added lines, -6 removed lines

@@ -14,18 +14,18 @@
 
 namespace TestServer;
 
-require_once __DIR__ . '/TestServerApp.php';
-require_once __DIR__ . '/TestServerController.php';
-require_once __DIR__ . '/TestServerView.php';
+require_once __DIR__.'/TestServerApp.php';
+require_once __DIR__.'/TestServerController.php';
+require_once __DIR__.'/TestServerView.php';
 
 // TODO: Update / set configuration. See readme
 $config_filename = 'config';
 
-$config_dir = __DIR__ . '/config/';
+$config_dir = __DIR__.'/config/';
 
 $config = array();
-if (file_exists($config_dir . $config_filename)) {
-    $config = json_decode(file_get_contents($config_dir . $config_filename), true);
+if (file_exists($config_dir.$config_filename)) {
+    $config = json_decode(file_get_contents($config_dir.$config_filename), true);
 }
 
 $host_url = $config['host_url'] ?? 'http://localhost:8000';