mirrors/h5ai
1
0
Fork 0
mirror of https://github.com/lrsjng/h5ai.git synced 2025-06-04 00:58:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor PHP. Switch to explicit string literals where possible.

Browse source
This commit is contained in:
Lars Jung 2015-05-11 12:32:34 +02:00
parent f363e78601
commit 0719eeeb90
2 changed files with 80 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

148
src/_h5ai/server/php/inc/core/class-setup.php
View file

@ -2,8 +2,8 @@
class Setup { class Setup {
const DEFAULT_PASSHASH = "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e"; const DEFAULT_PASSHASH = 'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e';
const AS_ADMIN_SESSION_KEY = "__H5AI_AS_ADMIN__"; const AS_ADMIN_SESSION_KEY = '__H5AI_AS_ADMIN__';
private $consts; private $consts;
@ -25,17 +25,17 @@ class Setup {
private function set($key, $value) { private function set($key, $value) {
if (array_key_exists($key, $this->consts)) { if (array_key_exists($key, $this->consts)) {
Logger::log("setup key already taken", [ Logger::log('setup key already taken', [
"key" => $key, 'key' => $key,
"value" => $value, 'value' => $value,
"found" => $this->consts[$key] 'found' => $this->consts[$key]
]); ]);
exit; exit;
} }
if (!is_string($value) && !is_bool($value)) { if (!is_string($value) && !is_bool($value)) {
Logger::log("setup value neither string nor boolean", [ Logger::log('setup value neither string nor boolean', [
"key" => $key, 'key' => $key,
"value" => $value 'value' => $value
]); ]);
exit; exit;
} }
@ -46,7 +46,7 @@ class Setup {
public function get($key) { public function get($key) {
if (!array_key_exists($key, $this->consts)) { if (!array_key_exists($key, $this->consts)) {
Logger::log("setup key not found", ["key" => $key]); Logger::log('setup key not found', ['key' => $key]);
exit; exit;
} }
@ -55,132 +55,132 @@ class Setup {
private function setup_php() { private function setup_php() {
$this->set("PHP_VERSION", PHP_VERSION); $this->set('PHP_VERSION', PHP_VERSION);
$this->set("MIN_PHP_VERSION", MIN_PHP_VERSION); $this->set('MIN_PHP_VERSION', MIN_PHP_VERSION);
$this->set("HAS_PHP_EXIF", function_exists("exif_thumbnail")); $this->set('HAS_PHP_EXIF', function_exists('exif_thumbnail'));
$has_php_jpeg = false; $has_php_jpeg = false;
if (function_exists("gd_info")) { if (function_exists('gd_info')) {
$infos = gd_info(); $infos = gd_info();
$has_php_jpeg = array_key_exists("JPEG Support", $infos) && $infos["JPEG Support"]; $has_php_jpeg = array_key_exists('JPEG Support', $infos) && $infos['JPEG Support'];
} }
$this->set("HAS_PHP_JPEG", $has_php_jpeg); $this->set('HAS_PHP_JPEG', $has_php_jpeg);
} }
private function setup_app() { private function setup_app() {
$this->set("NAME", "{{pkg.name}}"); $this->set('NAME', '{{pkg.name}}');
$this->set("VERSION", "{{pkg.version}}"); $this->set('VERSION', '{{pkg.version}}');
$this->set("FILE_PREFIX", "_{{pkg.name}}"); $this->set('FILE_PREFIX', '_{{pkg.name}}');
} }
private function setup_admin() { private function setup_admin() {
$this->set("AS_ADMIN_SESSION_KEY", Setup::AS_ADMIN_SESSION_KEY); $this->set('AS_ADMIN_SESSION_KEY', Setup::AS_ADMIN_SESSION_KEY);
$this->set("AS_ADMIN", isset($_SESSION[Setup::AS_ADMIN_SESSION_KEY]) && $_SESSION[Setup::AS_ADMIN_SESSION_KEY] === true); $this->set('AS_ADMIN', isset($_SESSION[Setup::AS_ADMIN_SESSION_KEY]) && $_SESSION[Setup::AS_ADMIN_SESSION_KEY] === true);
$this->set("PASSHASH", PASSHASH); $this->set('PASSHASH', PASSHASH);
$this->set("HAS_CUSTOM_PASSHASH", strtolower(PASSHASH) === strtolower(Setup::DEFAULT_PASSHASH)); $this->set('HAS_CUSTOM_PASSHASH', strtolower(PASSHASH) === strtolower(Setup::DEFAULT_PASSHASH));
} }
private function setup_server() { private function setup_server() {
$server_name = null; $server_name = null;
$server_version = null; $server_version = null;
$server_software = getenv("SERVER_SOFTWARE"); $server_software = getenv('SERVER_SOFTWARE');
if ($server_software && preg_match("#^(.*?)(?:/(.*?))?(?: |$)#", strtolower($server_software), $matches)) { if ($server_software && preg_match('#^(.*?)(?:/(.*?))?(?: |$)#', strtolower($server_software), $matches)) {
$server_name = $matches[1]; $server_name = $matches[1];
$server_version = count($matches) > 2 ? $matches[2] : ''; $server_version = count($matches) > 2 ? $matches[2] : '';
} }
$this->set("SERVER_NAME", $server_name); $this->set('SERVER_NAME', $server_name);
$this->set("SERVER_VERSION", $server_version); $this->set('SERVER_VERSION', $server_version);
$this->set("HAS_SERVER", in_array($server_name, ["apache", "lighttpd", "nginx", "cherokee"])); $this->set('HAS_SERVER', in_array($server_name, ['apache', 'lighttpd', 'nginx', 'cherokee']));
} }
private function setup_paths() { private function setup_paths() {
$script_name = getenv("SCRIPT_NAME"); $script_name = getenv('SCRIPT_NAME');
if ($this->get("SERVER_NAME") === "lighttpd") { if ($this->get('SERVER_NAME') === 'lighttpd') {
$script_name = preg_replace("#^.*?//#", "/", $script_name); $script_name = preg_replace('#^.*?//#', '/', $script_name);
} }
$this->set("APP_HREF", Util::normalize_path(dirname(dirname(dirname($script_name))), true)); $this->set('APP_HREF', Util::normalize_path(dirname(dirname(dirname($script_name))), true));
$this->set("APP_PATH", Util::normalize_path(dirname(dirname(dirname(dirname(dirname(__FILE__))))), false)); $this->set('APP_PATH', Util::normalize_path(dirname(dirname(dirname(dirname(dirname(__FILE__))))), false));
$this->set("ROOT_HREF", Util::normalize_path(dirname($this->get("APP_HREF")), true)); $this->set('ROOT_HREF', Util::normalize_path(dirname($this->get('APP_HREF')), true));
$this->set("ROOT_PATH", Util::normalize_path(dirname($this->get("APP_PATH")), false)); $this->set('ROOT_PATH', Util::normalize_path(dirname($this->get('APP_PATH')), false));
$index_href = null; $index_href = null;
if (@is_readable(Util::normalize_path($this->get("APP_PATH") . "/server/php/index.php", false))) { if (@is_readable(Util::normalize_path($this->get('APP_PATH') . '/server/php/index.php', false))) {
$index_href = Util::normalize_path($this->get("APP_HREF") . "/server/php/index.php", false); $index_href = Util::normalize_path($this->get('APP_HREF') . '/server/php/index.php', false);
} }
$this->set("INDEX_HREF", $index_href); $this->set('INDEX_HREF', $index_href);
} }
private function setup_cache() { private function setup_cache() {
$this->set("CACHE_HREF", Util::normalize_path($this->get("APP_HREF") . "/cache", true)); $this->set('CACHE_HREF', Util::normalize_path($this->get('APP_HREF') . '/cache', true));
$this->set("CACHE_PATH", Util::normalize_path($this->get("APP_PATH") . "/cache", false)); $this->set('CACHE_PATH', Util::normalize_path($this->get('APP_PATH') . '/cache', false));
$this->set("HAS_WRITABLE_CACHE", @is_writable($this->get("CACHE_PATH"))); $this->set('HAS_WRITABLE_CACHE', @is_writable($this->get('CACHE_PATH')));
} }
private function setup_cmds() { private function setup_cmds() {
$this->set("CMDS_PATH", Util::normalize_path($this->get("CACHE_PATH") . "/cmds.json", false)); $this->set('CMDS_PATH', Util::normalize_path($this->get('CACHE_PATH') . '/cmds.json', false));
$cmds = Util::load_commented_json($this->get("CMDS_PATH")); $cmds = Util::load_commented_json($this->get('CMDS_PATH'));
if (sizeof($cmds) === 0 || $this->update_cached_setup) { if (sizeof($cmds) === 0 || $this->update_cached_setup) {
$cmds["command"] = Util::exec_0("command -v command"); $cmds['command'] = Util::exec_0('command -v command');
$cmds["which"] = Util::exec_0("which which"); $cmds['which'] = Util::exec_0('which which');
$cmd = false; $cmd = false;
if ($cmds["command"]) { if ($cmds['command']) {
$cmd = "command -v"; $cmd = 'command -v';
} else if ($cmds["which"]) { } else if ($cmds['which']) {
$cmd = "which"; $cmd = 'which';
} }
foreach (["avconv", "convert", "du", "ffmpeg", "tar", "zip"] as $c) { foreach (['avconv', 'convert', 'du', 'ffmpeg', 'tar', 'zip'] as $c) {
$cmds[$c] = ($cmd !== false) && Util::exec_0($cmd . " " . $c); $cmds[$c] = ($cmd !== false) && Util::exec_0($cmd . ' ' . $c);
} }
Util::save_json($this->get("CMDS_PATH"), $cmds); Util::save_json($this->get('CMDS_PATH'), $cmds);
} }
foreach ($cmds as $c => $has) { foreach ($cmds as $c => $has) {
$this->set("HAS_CMD_" . strtoupper($c), $has); $this->set('HAS_CMD_' . strtoupper($c), $has);
} }
} }
public function to_jsono() { public function to_jsono() {
$keys = [ $keys = [
"APP_HREF", 'APP_HREF',
"ROOT_HREF", 'ROOT_HREF',
"VERSION", 'VERSION',
"AS_ADMIN", 'AS_ADMIN',
"HAS_CUSTOM_PASSHASH" 'HAS_CUSTOM_PASSHASH'
]; ];
if ($this->get("AS_ADMIN")) { if ($this->get('AS_ADMIN')) {
$keys = array_merge($keys, [ $keys = array_merge($keys, [
"PHP_VERSION", 'PHP_VERSION',
"MIN_PHP_VERSION", 'MIN_PHP_VERSION',
"HAS_PHP_EXIF", 'HAS_PHP_EXIF',
"HAS_PHP_JPEG", 'HAS_PHP_JPEG',
"SERVER_NAME", 'SERVER_NAME',
"SERVER_VERSION", 'SERVER_VERSION',
"HAS_SERVER", 'HAS_SERVER',
"INDEX_HREF", 'INDEX_HREF',
"HAS_WRITABLE_CACHE", 'HAS_WRITABLE_CACHE',
"HAS_CMD_AVCONV", 'HAS_CMD_AVCONV',
"HAS_CMD_CONVERT", 'HAS_CMD_CONVERT',
"HAS_CMD_DU", 'HAS_CMD_DU',
"HAS_CMD_FFMPEG", 'HAS_CMD_FFMPEG',
"HAS_CMD_TAR", 'HAS_CMD_TAR',
"HAS_CMD_ZIP" 'HAS_CMD_ZIP'
]); ]);
} }

12
src/_h5ai/server/php/inc/core/class-theme.php
View file

@ -2,7 +2,7 @@
class Theme { class Theme {
private static $extensions = ["svg", "png", "jpg"]; private static $extensions = ['svg', 'png', 'jpg'];
function __construct($app) { function __construct($app) {
@ -11,9 +11,9 @@ class Theme {
public function get_icons() { public function get_icons() {
$app_path = $this->app->get_setup()->get("APP_PATH"); $app_path = $this->app->get_setup()->get('APP_PATH');
$theme = $this->app->query_option("view.theme", "-NONE-"); $theme = $this->app->query_option('view.theme', '-NONE-');
$theme_path = "${app_path}/client/images/themes/${theme}"; $theme_path = $app_path . '/client/images/themes/' . $theme;
$icons = []; $icons = [];
@ -21,8 +21,8 @@ class Theme {
if ($dir = opendir($theme_path)) { if ($dir = opendir($theme_path)) {
while (($name = readdir($dir)) !== false) { while (($name = readdir($dir)) !== false) {
$path_parts = pathinfo($name); $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}"; $icons[$path_parts['filename']] = $theme . '/' . $name;
} }
} }
closedir($dir); closedir($dir);