From e199be6363f160ed0a13160087ec4992da981825 Mon Sep 17 00:00:00 2001
From: Lars Jung <lrsjng@gmail.com>
Date: Tue, 12 May 2015 01:18:14 +0200
Subject: [PATCH] Clean PHP code.

---
 src/_h5ai/server/php/inc/core/class-app.php     | 12 ++++++------
 src/_h5ai/server/php/inc/core/class-session.php |  7 ++++---
 src/_h5ai/server/php/inc/core/class-setup.php   |  4 ++--
 src/_h5ai/server/php/inc/core/class-theme.php   |  4 ++--
 src/_h5ai/server/php/inc/ext/class-custom.php   |  4 ++--
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/_h5ai/server/php/inc/core/class-app.php b/src/_h5ai/server/php/inc/core/class-app.php
index 09804aa7..e8609137 100644
--- a/src/_h5ai/server/php/inc/core/class-app.php
+++ b/src/_h5ai/server/php/inc/core/class-app.php
@@ -2,7 +2,7 @@
 
 class App {
 
-    const AS_ADMIN_SESSION_KEY = 'AS_ADMIN';
+    private static $AS_ADMIN_SESSION_KEY = 'AS_ADMIN';
 
     private $request;
     private $setup;
@@ -49,19 +49,19 @@ class App {
     public function login_admin($pass) {
 
         $hash = $this->setup->get('PASSHASH');
-        $this->session->set(App::AS_ADMIN_SESSION_KEY, strcasecmp(hash('sha512', $pass), $hash) === 0);
-        return $this->session->get(App::AS_ADMIN_SESSION_KEY);
+        $this->session->set(App::$AS_ADMIN_SESSION_KEY, strcasecmp(hash('sha512', $pass), $hash) === 0);
+        return $this->session->get(App::$AS_ADMIN_SESSION_KEY);
     }
 
     public function logout_admin() {
 
-        $this->session->set(App::AS_ADMIN_SESSION_KEY, false);
-        return $this->session->get(App::AS_ADMIN_SESSION_KEY);
+        $this->session->set(App::$AS_ADMIN_SESSION_KEY, false);
+        return $this->session->get(App::$AS_ADMIN_SESSION_KEY);
     }
 
     public function is_admin() {
 
-        return $this->session->get(App::AS_ADMIN_SESSION_KEY);
+        return $this->session->get(App::$AS_ADMIN_SESSION_KEY);
     }
 
     public function to_href($path, $trailing_slash = true) {
diff --git a/src/_h5ai/server/php/inc/core/class-session.php b/src/_h5ai/server/php/inc/core/class-session.php
index 42012b92..4ad036a2 100644
--- a/src/_h5ai/server/php/inc/core/class-session.php
+++ b/src/_h5ai/server/php/inc/core/class-session.php
@@ -2,7 +2,8 @@
 
 class Session {
 
-    private static $key_prefix = '__H5AI__';
+    private static $KEY_PREFIX = '__H5AI__';
+
     private $store;
 
     public function __construct(&$store) {
@@ -12,13 +13,13 @@ class Session {
 
     public function set($key, $value) {
 
-        $key = Session::$key_prefix . $key;
+        $key = Session::$KEY_PREFIX . $key;
         $this->store[$key] = $value;
     }
 
     public function get($key, $default = null) {
 
-        $key = Session::$key_prefix . $key;
+        $key = Session::$KEY_PREFIX . $key;
         return array_key_exists($key, $this->store) ? $this->store[$key] : $default;
     }
 }
diff --git a/src/_h5ai/server/php/inc/core/class-setup.php b/src/_h5ai/server/php/inc/core/class-setup.php
index 7577d587..7920611b 100644
--- a/src/_h5ai/server/php/inc/core/class-setup.php
+++ b/src/_h5ai/server/php/inc/core/class-setup.php
@@ -2,7 +2,7 @@
 
 class Setup {
 
-    const DEFAULT_PASSHASH = 'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e';
+    private static $DEFAULT_PASSHASH = 'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e';
 
     private $store;
 
@@ -85,7 +85,7 @@ class Setup {
 
     private function add_admin_check() {
 
-        $this->set('HAS_CUSTOM_PASSHASH', strtolower(PASSHASH) === strtolower(Setup::DEFAULT_PASSHASH));
+        $this->set('HAS_CUSTOM_PASSHASH', strtolower(PASSHASH) === Setup::$DEFAULT_PASSHASH);
     }
 
     private function add_server_metadata_and_check() {
diff --git a/src/_h5ai/server/php/inc/core/class-theme.php b/src/_h5ai/server/php/inc/core/class-theme.php
index a453c3ca..71d05763 100644
--- a/src/_h5ai/server/php/inc/core/class-theme.php
+++ b/src/_h5ai/server/php/inc/core/class-theme.php
@@ -2,7 +2,7 @@
 
 class Theme {
 
-    private static $extensions = ['svg', 'png', 'jpg'];
+    private static $EXTENSIONS = ['svg', 'png', 'jpg'];
 
     public function __construct($app) {
 
@@ -21,7 +21,7 @@ class Theme {
             if ($dir = opendir($theme_path)) {
                 while (($name = readdir($dir)) !== false) {
                     $path_parts = pathinfo($name);
-                    if (in_array(@$path_parts['extension'], Theme::$extensions)) {
+                    if (in_array(@$path_parts['extension'], Theme::$EXTENSIONS)) {
                         $icons[$path_parts['filename']] = $theme . '/' . $name;
                     }
                 }
diff --git a/src/_h5ai/server/php/inc/ext/class-custom.php b/src/_h5ai/server/php/inc/ext/class-custom.php
index 679968c2..63174197 100644
--- a/src/_h5ai/server/php/inc/ext/class-custom.php
+++ b/src/_h5ai/server/php/inc/ext/class-custom.php
@@ -2,7 +2,7 @@
 
 class Custom {
 
-    private static $extensions = ['html', 'md'];
+    private static $EXTENSIONS = ['html', 'md'];
 
     public function __construct($app) {
 
@@ -13,7 +13,7 @@ class Custom {
 
         $file_prefix = $this->app->get_setup()->get('FILE_PREFIX');
 
-        foreach (Custom::$extensions as $ext) {
+        foreach (Custom::$EXTENSIONS as $ext) {
             $file = $path . '/' . $file_prefix . '.' . $name . '.' . $ext;
             if (is_readable($file)) {
                 $content = file_get_contents($file);