mirrors/h5ai
1
0
Fork 0
mirror of https://github.com/lrsjng/h5ai.git synced 2025-05-24 20:14:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor PHP.

Browse source
This commit is contained in:
Lars Jung 2015-05-02 18:01:03 +02:00
parent 6e54ba2f73
commit d2031d57d2
3 changed files with 30 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/_h5ai/client/js/inc/main/info.js
View file

@ -72,7 +72,7 @@ modulejs.define('main/info', ['$', 'config'], function ($, config) {
addTest( addTest(
'Image thumbs', 'PHP GD extension with JPEG support available', 'Image thumbs', 'PHP GD extension with JPEG support available',
setup.HAS_PHP_JPG setup.HAS_PHP_JPEG
); );
addTest( addTest(

2
src/_h5ai/server/php/inc/class-api.php
View file

@ -77,7 +77,7 @@ class Api {
private function on_getThumbHref() { private function on_getThumbHref() {
Util::json_fail(Util::RC_DISABLED, "thumbnails disabled", !$this->app->get_option("thumbnails.enabled", false)); Util::json_fail(Util::RC_DISABLED, "thumbnails disabled", !$this->app->get_option("thumbnails.enabled", false));
Util::json_fail(Util::RC_UNSUPPORTED, "thumbnails not supported", !HAS_PHP_JPG); Util::json_fail(Util::RC_UNSUPPORTED, "thumbnails not supported", !HAS_PHP_JPEG);
$type = Util::get_request_param("type"); $type = Util::get_request_param("type");
$src_url = Util::get_request_param("href"); $src_url = Util::get_request_param("href");

55
src/_h5ai/server/php/inc/class-bootstrap.php
View file

@ -4,13 +4,14 @@ class Bootstrap {
public static function run() { public static function run() {
Bootstrap::setup_misc(); $bs = new Bootstrap();
Bootstrap::setup_admin(); $bs->setup_php();
Bootstrap::setup_php(); $bs->setup_app();
Bootstrap::setup_server(); $bs->setup_admin();
Bootstrap::setup_paths(); $bs->setup_server();
Bootstrap::setup_cache(); $bs->setup_paths();
Bootstrap::setup_ext_cmds(); $bs->setup_cache();
$bs->setup_ext_cmds();
$app = new App(); $app = new App();
if (Util::is_post_request()) { if (Util::is_post_request()) {
@ -23,12 +24,26 @@ class Bootstrap {
} }
private static function setup_misc() { private function setup_php() {
putenv("LANG=en_US.UTF-8"); putenv("LANG=en_US.UTF-8");
setlocale(LC_CTYPE, "en_US.UTF-8"); setlocale(LC_CTYPE, "en_US.UTF-8");
date_default_timezone_set("UTC"); date_default_timezone_set("UTC");
define("MIN_PHP_VERSION", "5.4.0");
define("HAS_MIN_PHP_VERSION", version_compare(PHP_VERSION, MIN_PHP_VERSION) >= 0);
define("HAS_PHP_EXIF", function_exists("exif_thumbnail"));
$has_php_jpeg = false;
if (function_exists("gd_info")) {
$infos = gd_info();
$has_php_jpeg = array_key_exists("JPEG Support", $infos) && $infos["JPEG Support"];
}
define("HAS_PHP_JPEG", $has_php_jpeg);
}
private function setup_app() {
define("NAME", "{{pkg.name}}"); define("NAME", "{{pkg.name}}");
define("VERSION", "{{pkg.version}}"); define("VERSION", "{{pkg.version}}");
@ -38,7 +53,7 @@ class Bootstrap {
} }
private static function setup_admin() { private function setup_admin() {
session_start(); session_start();
define("AS_ADMIN_SESSION_KEY", "__H5AI_AS_ADMIN__"); define("AS_ADMIN_SESSION_KEY", "__H5AI_AS_ADMIN__");
@ -47,21 +62,7 @@ class Bootstrap {
} }
private static function setup_php() { private function setup_server() {
define("MIN_PHP_VERSION", "5.4.0");
define("HAS_MIN_PHP_VERSION", version_compare(PHP_VERSION, MIN_PHP_VERSION) >= 0);
define("HAS_PHP_EXIF", function_exists("exif_thumbnail"));
$has_php_jpg = false;
if (function_exists("gd_info")) {
$infos = gd_info();
$has_php_jpg = array_key_exists("JPG Support", $infos) && $infos["JPG Support"] || array_key_exists("JPEG Support", $infos) && $infos["JPEG Support"];
}
define("HAS_PHP_JPG", $has_php_jpg);
}
private static function setup_server() {
$server_name = null; $server_name = null;
$server_version = null; $server_version = null;
@ -77,7 +78,7 @@ class Bootstrap {
} }
private static function setup_paths() { private function setup_paths() {
$script_name = getenv("SCRIPT_NAME"); $script_name = getenv("SCRIPT_NAME");
if (SERVER_NAME === "lighttpd") { if (SERVER_NAME === "lighttpd") {
@ -108,7 +109,7 @@ class Bootstrap {
} }
private static function setup_cache() { private function setup_cache() {
define("CACHE_HREF", Util::normalize_path(APP_HREF . "/cache", true)); define("CACHE_HREF", Util::normalize_path(APP_HREF . "/cache", true));
define("CACHE_PATH", Util::normalize_path(APP_PATH . "/cache", false)); define("CACHE_PATH", Util::normalize_path(APP_PATH . "/cache", false));
@ -116,7 +117,7 @@ class Bootstrap {
} }
private static function setup_ext_cmds() { private function setup_ext_cmds() {
define("CMDS_PATH", Util::normalize_path(CACHE_PATH . "/cmds.json", false)); define("CMDS_PATH", Util::normalize_path(CACHE_PATH . "/cmds.json", false));