From 48b788eaefea4e4cb6c3eadbf871659bfda1dbed Mon Sep 17 00:00:00 2001
From: Lars Jung <lrsjng@gmail.com>
Date: Sun, 10 May 2015 01:39:18 +0200
Subject: [PATCH] Refactor PHP.

---
 src/_h5ai/server/php/inc/class-bootstrap.php |  2 +-
 src/_h5ai/server/php/inc/core/class-app.php  | 10 +++++-----
 src/_h5ai/server/php/index.php               |  8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/_h5ai/server/php/inc/class-bootstrap.php b/src/_h5ai/server/php/inc/class-bootstrap.php
index 47fef6ef..68ee97bf 100644
--- a/src/_h5ai/server/php/inc/class-bootstrap.php
+++ b/src/_h5ai/server/php/inc/class-bootstrap.php
@@ -141,7 +141,7 @@ class Bootstrap {
                 $cmd = "which";
             }
 
-            foreach (["tar", "zip", "convert", "ffmpeg", "avconv", "du"] as $c) {
+            foreach (["avconv", "convert", "du", "ffmpeg", "tar", "zip"] as $c) {
                 $cmds[$c] = ($cmd !== false) && Util::exec_0($cmd . " " . $c);
             }
 
diff --git a/src/_h5ai/server/php/inc/core/class-app.php b/src/_h5ai/server/php/inc/core/class-app.php
index 1c881261..015a6d9d 100644
--- a/src/_h5ai/server/php/inc/core/class-app.php
+++ b/src/_h5ai/server/php/inc/core/class-app.php
@@ -50,12 +50,12 @@ class App {
 
                 "HAS_WRITABLE_CACHE",
 
-                "HAS_CMD_TAR",
-                "HAS_CMD_ZIP",
-                "HAS_CMD_CONVERT",
-                "HAS_CMD_FFMPEG",
                 "HAS_CMD_AVCONV",
-                "HAS_CMD_DU"
+                "HAS_CMD_CONVERT",
+                "HAS_CMD_DU",
+                "HAS_CMD_FFMPEG",
+                "HAS_CMD_TAR",
+                "HAS_CMD_ZIP"
             ]);
         }
 
diff --git a/src/_h5ai/server/php/index.php b/src/_h5ai/server/php/index.php
index 72273ec5..df9effc4 100644
--- a/src/_h5ai/server/php/index.php
+++ b/src/_h5ai/server/php/index.php
@@ -1,8 +1,8 @@
 <?php
 
-define("BASE_PATH", preg_replace("#[\\\\/]+#", "/", dirname(__FILE__)));
+$basepath = preg_replace("#[\\\\/]+#", "/", dirname(__FILE__));
 
-require_once(BASE_PATH . "/inc/version-check.php");
-require_once(BASE_PATH . "/inc/class-bootstrap.php");
+require_once($basepath . "/inc/version-check.php");
+require_once($basepath . "/inc/class-bootstrap.php");
 
-(new Bootstrap(BASE_PATH))->run();
+(new Bootstrap($basepath))->run();