More refactorings.

This commit is contained in:
Lars Jung 2014-05-21 02:21:46 +02:00
parent 351c395f82
commit 0b28a9eea1
3 changed files with 163 additions and 156 deletions

View File

@ -3,184 +3,167 @@
class Api {
private $app;
private $actions, $app, $options;
public function __construct($app) {
$this->actions = array("get", "getThumbHref", "download", "upload", "delete", "rename");
$this->app = $app;
$this->options = $app->get_options();
}
public function apply() {
$options = $this->app->get_options();
$action = use_request_param("action");
if ($action === "get") {
$response = array();
if (has_request_param("setup")) {
use_request_param("setup");
$response["setup"] = $this->app->get_setup();
}
if (has_request_param("options")) {
use_request_param("options");
$response["options"] = $this->app->get_options();
}
if (has_request_param("types")) {
use_request_param("types");
$response["types"] = $this->app->get_types();
}
if (has_request_param("langs")) {
use_request_param("langs");
$response["langs"] = $this->app->get_l10n_list();
}
if (has_request_param("l10n")) {
use_request_param("l10n");
$iso_codes = use_request_param("l10nCodes");
$iso_codes = explode(":", $iso_codes);
$response["l10n"] = $this->app->get_l10n($iso_codes);
}
if (has_request_param("custom")) {
use_request_param("custom");
$url = use_request_param("customHref");
$response["custom"] = $this->app->get_customizations($url);
}
if (has_request_param("items")) {
use_request_param("items");
$url = use_request_param("itemsHref");
$what = use_request_param("itemsWhat");
$what = is_numeric($what) ? intval($what, 10) : 1;
$response["items"] = $this->app->get_items($url, $what);
}
if (count($_REQUEST)) {
$response["unused"] = $_REQUEST;
}
json_exit($response);
if (in_array($action, $this->actions)) {
$methodname = "on_$action";
$this->$methodname();
}
json_fail(100, "unsupported request");
}
else if ($action === "getThumbHref") {
json_fail(1, "thumbnails disabled", !$options["thumbnails"]["enabled"]);
json_fail(2, "thumbnails not supported", !HAS_PHP_JPG);
private function on_get() {
$type = use_request_param("type");
$src_url = use_request_param("href");
$mode = use_request_param("mode");
$width = use_request_param("width");
$height = use_request_param("height");
$response = array();
$thumb = new Thumb($this->app);
$thumb_url = $thumb->thumb($type, $src_url, $mode, $width, $height);
json_fail(3, "thumbnail creation failed", $thumb_url === null);
if (has_request_param("setup")) {
json_exit(array("absHref" => $thumb_url));
use_request_param("setup");
$response["setup"] = $this->app->get_setup();
}
if (has_request_param("options")) {
else if ($action === "download") {
json_fail(1, "downloads disabled", !$options["download"]["enabled"]);
$as = use_request_param("as");
$type = use_request_param("type");
$hrefs = use_request_param("hrefs");
$archive = new Archive($this->app);
$hrefs = explode("|:|", trim($hrefs));
set_time_limit(0);
header("Content-Type: application/octet-stream");
header("Content-Disposition: attachment; filename=\"$as\"");
header("Connection: close");
$rc = $archive->output($type, $hrefs);
json_fail("packaging failed", $rc !== 0);
exit;
use_request_param("options");
$response["options"] = $this->app->get_options();
}
if (has_request_param("types")) {
else if ($action === "upload") {
$href = use_request_param("href");
json_fail(1, "wrong HTTP method", strtolower($_SERVER["REQUEST_METHOD"]) !== "post");
json_fail(2, "something went wrong", !array_key_exists("userfile", $_FILES));
$userfile = $_FILES["userfile"];
json_fail(3, "something went wrong [" . $userfile["error"] . "]", $userfile["error"] !== 0);
json_fail(4, "folders not supported", file_get_contents($userfile["tmp_name"]) === "null");
$upload_dir = $this->app->to_path($href);
$code = $this->app->get_http_code($href);
json_fail(5, "upload dir no h5ai folder or ignored", $code !== MAGIC_SEQUENCE || $this->app->is_ignored($upload_dir));
$dest = $upload_dir . "/" . utf8_encode($userfile["name"]);
json_fail(6, "already exists", file_exists($dest));
json_fail(7, "can't move uploaded file", !move_uploaded_file($userfile["tmp_name"], $dest));
json_exit();
use_request_param("types");
$response["types"] = $this->app->get_types();
}
if (has_request_param("langs")) {
else if ($action === "delete") {
json_fail(1, "deletion disabled", !$options["delete"]["enabled"]);
$hrefs = use_request_param("hrefs");
$hrefs = explode("|:|", trim($hrefs));
$errors = array();
foreach ($hrefs as $href) {
$d = normalize_path(dirname($href), true);
$n = basename($href);
$code = $this->app->get_http_code($d);
if ($code == MAGIC_SEQUENCE && !$this->app->is_ignored($n)) {
$abs_path = $this->app->to_path($href);
if (!unlink($abs_path)) {
$errors[] = $href;
}
}
}
json_fail(2, "deletion failed for some", count($errors) > 0);
json_exit();
use_request_param("langs");
$response["langs"] = $this->app->get_l10n_list();
}
if (has_request_param("l10n")) {
else if ($action === "rename") {
use_request_param("l10n");
$iso_codes = use_request_param("l10nCodes");
$iso_codes = explode(":", $iso_codes);
$response["l10n"] = $this->app->get_l10n($iso_codes);
}
json_fail(1, "renaming disabled", !$options["rename"]["enabled"]);
if (has_request_param("custom")) {
$href = use_request_param("href");
$name = use_request_param("name");
use_request_param("custom");
$url = use_request_param("customHref");
$response["custom"] = $this->app->get_customizations($url);
}
if (has_request_param("items")) {
use_request_param("items");
$url = use_request_param("itemsHref");
$what = use_request_param("itemsWhat");
$what = is_numeric($what) ? intval($what, 10) : 1;
$response["items"] = $this->app->get_items($url, $what);
}
if (count($_REQUEST)) {
$response["unused"] = $_REQUEST;
}
json_exit($response);
}
private function on_getThumbHref() {
json_fail(1, "thumbnails disabled", !$this->options["thumbnails"]["enabled"]);
json_fail(2, "thumbnails not supported", !HAS_PHP_JPG);
$type = use_request_param("type");
$src_url = use_request_param("href");
$mode = use_request_param("mode");
$width = use_request_param("width");
$height = use_request_param("height");
$thumb = new Thumb($this->app);
$thumb_url = $thumb->thumb($type, $src_url, $mode, $width, $height);
json_fail(3, "thumbnail creation failed", $thumb_url === null);
json_exit(array("absHref" => $thumb_url));
}
private function on_download() {
json_fail(1, "downloads disabled", !$this->options["download"]["enabled"]);
$as = use_request_param("as");
$type = use_request_param("type");
$hrefs = use_request_param("hrefs");
$archive = new Archive($this->app);
$hrefs = explode("|:|", trim($hrefs));
set_time_limit(0);
header("Content-Type: application/octet-stream");
header("Content-Disposition: attachment; filename=\"$as\"");
header("Connection: close");
$rc = $archive->output($type, $hrefs);
json_fail("packaging failed", $rc !== 0);
exit;
}
private function on_upload() {
$href = use_request_param("href");
json_fail(1, "wrong HTTP method", strtolower($_SERVER["REQUEST_METHOD"]) !== "post");
json_fail(2, "something went wrong", !array_key_exists("userfile", $_FILES));
$userfile = $_FILES["userfile"];
json_fail(3, "something went wrong [" . $userfile["error"] . "]", $userfile["error"] !== 0);
json_fail(4, "folders not supported", file_get_contents($userfile["tmp_name"]) === "null");
$upload_dir = $this->app->to_path($href);
$code = $this->app->get_http_code($href);
json_fail(5, "upload dir no h5ai folder or ignored", $code !== MAGIC_SEQUENCE || $this->app->is_ignored($upload_dir));
$dest = $upload_dir . "/" . utf8_encode($userfile["name"]);
json_fail(6, "already exists", file_exists($dest));
json_fail(7, "can't move uploaded file", !move_uploaded_file($userfile["tmp_name"], $dest));
json_exit();
}
private function on_delete() {
json_fail(1, "deletion disabled", !$this->options["delete"]["enabled"]);
$hrefs = use_request_param("hrefs");
$hrefs = explode("|:|", trim($hrefs));
$errors = array();
foreach ($hrefs as $href) {
$d = normalize_path(dirname($href), true);
$n = basename($href);
@ -190,16 +173,40 @@ class Api {
if ($code == MAGIC_SEQUENCE && !$this->app->is_ignored($n)) {
$abs_path = $this->app->to_path($href);
$folder = normalize_path(dirname($abs_path));
if (!rename($abs_path, $folder . "/" . $name)) {
json_fail(2, "renaming failed");
if (!unlink($abs_path)) {
$errors[] = $href;
}
}
json_exit();
}
json_fail(100, "unsupported request");
json_fail(2, "deletion failed for some", count($errors) > 0);
json_exit();
}
private function on_rename() {
json_fail(1, "renaming disabled", !$this->options["rename"]["enabled"]);
$href = use_request_param("href");
$name = use_request_param("name");
$d = normalize_path(dirname($href), true);
$n = basename($href);
$code = $this->app->get_http_code($d);
if ($code == MAGIC_SEQUENCE && !$this->app->is_ignored($n)) {
$abs_path = $this->app->to_path($href);
$folder = normalize_path(dirname($abs_path));
if (!rename($abs_path, $folder . "/" . $name)) {
json_fail(2, "renaming failed");
}
}
json_exit();
}
}

View File

@ -22,8 +22,8 @@ class App {
public function get_setup() {
$consts = get_defined_constants(true)['user'];
$consts['PHP_VERSION'] = PHP_VERSION;
$consts = get_defined_constants(true)["user"];
$consts["PHP_VERSION"] = PHP_VERSION;
return $consts;
}
@ -99,8 +99,8 @@ class App {
return 500;
}
foreach ($this->options["view"]["indexFiles"] as $if) {
if (file_exists($path . "/" . $if)) {
foreach ($this->options["view"]["indexFiles"] as $name) {
if (file_exists($path . "/" . $name)) {
return 200;
}
}

View File

@ -43,7 +43,7 @@ function setup() {
// PATHS
$script_name = getenv("SCRIPT_NAME");
if (SERVER_NAME === "lighttpd") {
$script_name = preg_replace("#^.*//#", "/", $script_name);
$script_name = preg_replace("#^.*?//#", "/", $script_name);
}
define("APP_URL", normalize_path(dirname(dirname(dirname($script_name))), true));
define("APP_PATH", normalize_path(dirname(dirname(dirname(dirname(__FILE__)))), false));