mirror/php-monstra
1
0
Fork 0
mirror of https://github.com/monstra-cms/monstra.git synced 2025-08-04 20:27:40 +02:00
Code Issues Releases Wiki Activity

Themes Plugin: fix all get files methods. Return empty array if folders doesnt exists.

Browse Source
This commit is contained in:
Awilum
2012-09-26 01:18:24 +03:00
parent 9196601896
commit fb76534523
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/box/themes/themes.admin.php
View File

@@ -18,12 +18,11 @@
// Init vsrs // Init vsrs
$themes_site = Themes::getSiteThemes(); $themes_site = Themes::getSiteThemes();
$themes_admin = Themes::getAdminThemes(); $themes_admin = Themes::getAdminThemes();
$templates = Themes::getTemplates(); $templates = Themes::getTemplates();
$chunks = Themes::getChunks(); $chunks = Themes::getChunks();
$styles = Themes::getStyles(); $styles = Themes::getStyles();
$scripts = Themes::getScripts(); $scripts = Themes::getScripts();
$errors = array(); $errors = array();
$chunk_path = THEMES_SITE . DS . $current_site_theme . DS; $chunk_path = THEMES_SITE . DS . $current_site_theme . DS;
$template_path = THEMES_SITE . DS . $current_site_theme . DS; $template_path = THEMES_SITE . DS . $current_site_theme . DS;
$style_path = THEMES_SITE . DS . $current_site_theme . DS . 'css' . DS; $style_path = THEMES_SITE . DS . $current_site_theme . DS . 'css' . DS;
@@ -477,7 +476,7 @@
// Delete script // Delete script
// ------------------------------------- // -------------------------------------
case "delete_script": case "delete_script":
File::delete($style_path.Request::get('filename').'.js'); File::delete($script_path.Request::get('filename').'.js');
Notification::set('success', __('Script <i>:name</i> deleted', 'themes', array(':name' => File::name(Request::get('filename'))))); Notification::set('success', __('Script <i>:name</i> deleted', 'themes', array(':name' => File::name(Request::get('filename')))));
Request::redirect('index.php?id=themes'); Request::redirect('index.php?id=themes');
break; break;

18
plugins/box/themes/themes.plugin.php
View File

@@ -74,7 +74,7 @@
* Get Templates * Get Templates
* *
* @param string $theme Theme name * @param string $theme Theme name
* @return array * @return mixed
*/ */
public static function getTemplates($theme = null) { public static function getTemplates($theme = null) {
@@ -87,7 +87,7 @@
// Get all templates in current theme folder // Get all templates in current theme folder
$templates = File::scan(THEMES_SITE . DS . $theme, '.template.php'); $templates = File::scan(THEMES_SITE . DS . $theme, '.template.php');
return $templates; return ($templates) ? $templates : array();
} }
@@ -95,7 +95,7 @@
* Get Chunks * Get Chunks
* *
* @param string $theme Theme name * @param string $theme Theme name
* @return array * @return mixed
*/ */
public static function getChunks($theme = null) { public static function getChunks($theme = null) {
@@ -108,14 +108,14 @@
// Get all templates in current theme folder // Get all templates in current theme folder
$chunks = File::scan(THEMES_SITE . DS . $theme, '.chunk.php'); $chunks = File::scan(THEMES_SITE . DS . $theme, '.chunk.php');
return $chunks; return ($chunks) ? $chunks : array();
} }
/** /**
* Get Styles * Get Styles
* *
* @param string $theme Theme name * @param string $theme Theme name
* @return array * @return mixed
*/ */
public static function getStyles($theme = null) { public static function getStyles($theme = null) {
@@ -128,7 +128,7 @@
// Get all templates in current theme folder // Get all templates in current theme folder
$styles = File::scan(THEMES_SITE . DS . $theme . DS . 'css', '.css'); $styles = File::scan(THEMES_SITE . DS . $theme . DS . 'css', '.css');
return $styles; return ($styles) ? $styles : array();
} }
@@ -136,7 +136,7 @@
* Get Scripts * Get Scripts
* *
* @param string $theme Theme name * @param string $theme Theme name
* @return array * @return mixed
*/ */
public static function getScripts($theme = null) { public static function getScripts($theme = null) {
@@ -147,9 +147,9 @@
$scripts = array(); $scripts = array();
// Get all templates in current theme folder // Get all templates in current theme folder
$scripts = File::scan(THEMES_SITE . DS . $theme . DS . 'js', '.js'); $scripts = File::scan(THEMES_SITE . DS . $theme . DS . 'js' . DS , '.js');
return $scripts; return ($scripts) ? $scripts : array();
} }
} }