From e08d13a9af9d13cca8a33e872070669433074c3e Mon Sep 17 00:00:00 2001 From: Diego Najar Date: Mon, 2 Oct 2017 23:17:32 +0200 Subject: [PATCH] Pages for Content --- bl-kernel/admin/controllers/logout.php | 3 +-- bl-kernel/dblanguage.class.php | 9 +-------- bl-kernel/helpers/filesystem.class.php | 8 ++++++++ bl-kernel/user.class.php | 5 +++++ bl-languages/en.json | 4 +++- 5 files changed, 18 insertions(+), 11 deletions(-) diff --git a/bl-kernel/admin/controllers/logout.php b/bl-kernel/admin/controllers/logout.php index 2857f37b..8aa4adef 100644 --- a/bl-kernel/admin/controllers/logout.php +++ b/bl-kernel/admin/controllers/logout.php @@ -20,7 +20,6 @@ // Main after POST // ============================================================================ -if( $Login->logout()) -{ +if ($Login->logout()) { Redirect::home(); } diff --git a/bl-kernel/dblanguage.class.php b/bl-kernel/dblanguage.class.php index 206f443a..cbcfd67a 100644 --- a/bl-kernel/dblanguage.class.php +++ b/bl-kernel/dblanguage.class.php @@ -32,13 +32,6 @@ class dbLanguage extends dbJSON unset($this->db['language-data']); } - /* - public function exists($key) - { - return isset( $this->db[$key] ); - } - */ - public function locale() { if (isset($this->data['locale'])) { @@ -65,7 +58,7 @@ class dbLanguage extends dbJSON return $this->db[$key]; } - return 'NO AVAILABLE: '.$string; + file_put_contents(DEBUG_FILE, $key.PHP_EOL, FILE_APPEND); return $string; } diff --git a/bl-kernel/helpers/filesystem.class.php b/bl-kernel/helpers/filesystem.class.php index fec8cca6..d34edb17 100644 --- a/bl-kernel/helpers/filesystem.class.php +++ b/bl-kernel/helpers/filesystem.class.php @@ -66,6 +66,10 @@ class Filesystem { public static function copyRecursive($source, $destination) { + if (!self::directoryExists($source)) { + return false; + } + $destination = rtrim($destination, '/'); foreach($iterator = new RecursiveIteratorIterator( @@ -82,6 +86,10 @@ class Filesystem { public static function deleteRecursive($source) { + if (!self::directoryExists($source)) { + return false; + } + foreach(new RecursiveIteratorIterator( new RecursiveDirectoryIterator($source, FilesystemIterator::SKIP_DOTS), RecursiveIteratorIterator::CHILD_FIRST) as $item) { diff --git a/bl-kernel/user.class.php b/bl-kernel/user.class.php index b6ab25f1..42cdd7d3 100644 --- a/bl-kernel/user.class.php +++ b/bl-kernel/user.class.php @@ -83,6 +83,11 @@ class User return $this->getField('facebook'); } + public function codepen() + { + return $this->getField('codepen'); + } + public function googlePlus() { return $this->getField('googlePlus'); diff --git a/bl-languages/en.json b/bl-languages/en.json index 4d1cb319..ba9eeb20 100644 --- a/bl-languages/en.json +++ b/bl-languages/en.json @@ -241,5 +241,7 @@ "latest-content": "Latest content", "default-message": "Default message", "no-parent": "No parent", - "have-you-seen-my-ball": "Have you seen my ball?" + "have-you-seen-my-ball": "Have you seen my ball?", + "pagebreak": "Page break", + "this-plugin-may-not-be-supported-by-this-version-of-bludit": "This plugin may not be supported by this version of Bludit" } \ No newline at end of file