From: Edward Date: Thu, 4 Oct 2018 02:55:58 +0000 (+0800) Subject: commit X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=5d6be703c6338ce32b8b263449229bc6438c2835 commit --- diff --git a/DataObjects/Images.php b/DataObjects/Images.php index 8d6d68bc..d5728f3b 100644 --- a/DataObjects/Images.php +++ b/DataObjects/Images.php @@ -834,6 +834,8 @@ class Pman_Core_DataObjects_Images extends DB_DataObject $data = $this->rotate(); } + + $base64 = 'data:' . $this->mimetype . ';base64,' . base64_encode($data); return $base64; diff --git a/UpdateDatabase/SetupRequirement.php b/UpdateDatabase/SetupRequirement.php deleted file mode 100644 index 03e616d9..00000000 --- a/UpdateDatabase/SetupRequirement.php +++ /dev/null @@ -1,66 +0,0 @@ -getAuthUser(); - - if(empty($this->authUser)) { - return false; - } - - return true; - } - - function get($base, $opts = array()) - { - $requirements = array(); - - $ff = HTML_FlexyFramework::get(); - - foreach($this->modulesList() as $m) { - - $fd = $ff->rootDir. "/Pman/$m/UpdateDatabase.php"; - - if (!file_exists($fd)) { - continue; - } - require_once $fd; - $cls = new ReflectionClass('Pman_'. $m . '_UpdateDatabase'); - $props = $cls->getDefaultProperties(); - - if(!empty($props['required_extensions'])) { - $extensions = array_merge($extensions, $props['required_extensions']); - } - } - - $error = ''; - - foreach ($extensions as $e){ - - if(extension_loaded($e)) { - continue; - } - - $error .= "$e\n"; - } - - if(!empty($error)) { - $this->jerr($error); - } - - $this->jok("DONE"); - - } -} \ No newline at end of file diff --git a/UpdateDatabase/VerifyVariable.php b/UpdateDatabase/VerifyVariable.php deleted file mode 100644 index 7d762ba4..00000000 --- a/UpdateDatabase/VerifyVariable.php +++ /dev/null @@ -1,70 +0,0 @@ -getAuthUser(); - - if(empty($this->authUser)) { - return false; - } - - return true; - } - - function get($base, $opts = array()) - { - $requirements = array(); - - $ff = HTML_FlexyFramework::get(); - - foreach($this->modulesList() as $m) { - - $fd = $ff->rootDir. "/Pman/$m/UpdateDatabase.php"; - - if (!file_exists($fd)) { - continue; - } - - require_once $fd; - $cls = new ReflectionClass('Pman_'. $m . '_UpdateDatabase'); - $props = $cls->getDefaultProperties(); - - if(!empty($props['required_variable'])) { - $requirements = array_merge($requirements, $props['required_variable']); - } - } - - $error = array(); - - foreach ($requirements as $k => $v){ - - if(empty($ff->{$k})){ - $error[] = "Missing Config: {$k} Config"; - continue; - } - - foreach ($v as $r){ - - if(isset($ff->{$k}[$r])){ - continue; - } - - $error[] = "Missing Config: {$k} - {$r}"; - } - } - - return $error; - } -} \ No newline at end of file