Index: trunk/CHANGELOG =================================================================== --- trunk/CHANGELOG (revision 783) +++ trunk/CHANGELOG (revision 784) @@ -11,6 +11,8 @@ ! = Update/Change ------------------------------------- 2.7.0 ------------------------------------- +01-Apr-2008 Christian Sommer +! added updated edit CSS functions to the Form module 31-Mar-2008 Christian Sommer # fixed bug in output filter (mailto links with HTML entities in optional part) 29-Mar-2008 Christian Sommer Index: trunk/wb/modules/form/edit_css.php =================================================================== --- trunk/wb/modules/form/edit_css.php (revision 783) +++ trunk/wb/modules/form/edit_css.php (revision 784) @@ -27,21 +27,42 @@ require('../../config.php'); require(WB_PATH.'/modules/admin.php'); +/** + DEFINE LANGUAGE DEPENDING OUTPUTS FOR THE EDIT CSS PART +*/ +$lang_dir = WB_PATH .'/modules/' .$_POST['mod_dir'] .'/languages/'; +if(file_exists($lang_dir .LANGUAGE .'.php')) { + // try to include custom language file if exists + require_once($lang_dir .LANGUAGE .'.php'); +} elseif(file_exists($lang_dir .'EN.php')) { + // try to include default module language file + require_once($lang_dir .'EN.php'); +} + +// set defaults if output varibles are not set in the languages files +if(!isset($CAP_EDIT_CSS)) $CAP_EDIT_CSS = 'Edit CSS'; +if(!isset($HEADING_CSS_FILE)) $HEADING_CSS_FILE = 'Actual module file: '; +if(!isset($TXT_EDIT_CSS_FILE)) $TXT_EDIT_CSS_FILE = 'Edit the CSS definitions in the textarea below.'; + // include functions to edit the optional module CSS files (frontend.css, backend.css) require_once('css.functions.php'); +// check if the module directory is valid +$mod_dir = check_module_dir($_POST['mod_dir']); +if($mod_dir == '') die(header('Location: index.php')); + // check if action is: save or edit -if(isset($_GET['action']) && $_GET['action'] == 'save' && - isset($_POST['edit_file']) && mod_file_exists($_POST['edit_file'])) { +if($_POST['action'] == 'save' && mod_file_exists($mod_dir, $_POST['edit_file'])) { /** - SAVE THE UPDATED CONTENTS TO THE CSS FILE + SAVE THE UPDATED CONTENTS TO THE CSS FILE */ + $css_content = ''; if(isset($_POST['css_codepress']) && strlen($_POST['css_codepress']) > 0) { - // if Javascript is enabled, take contents from hidden field: css_codepress + // Javascript is enabled so take contents from hidden field: css_codepress $css_content = stripslashes($_POST['css_codepress']); } elseif(isset($_POST['css_data']) && strlen($_POST['css_data']) > 0) { - // if Javascript is disabled, take contens from textarea: css_data + // Javascript disabled, take contens from textarea: css_data $css_content = stripslashes($_POST['css_data']); } @@ -62,14 +83,20 @@ $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); } + } else { /** - MODIFY CONTENTS OF THE CSS FILE VIA TEXT AREA + MODIFY CONTENTS OF THE CSS FILE VIA TEXT AREA */ - + // include the backend.css file if exists + if(file_exists(WB_PATH .'/modules/' .$mod_dir .'/backend.css')) { + echo '\n"; + } + // check which module file to edit (frontend.css, backend.css or '') - $css_file = ''; - if(isset($_GET['edit_file'])) $css_file = edit_mod_file($_GET['edit_file']); + $css_file = (in_array($_POST['edit_file'], array('frontend.css', 'backend.css'))) ? $_POST['edit_file'] : ''; // display output if($css_file == '') { @@ -79,10 +106,10 @@ $output = "back"; echo $output; + } else { // store content of the module file in variable $css_content = @file_get_contents(dirname(__FILE__) .'/' .$css_file); - // output content of module file to textareas // make sure that codepress stuff is only used if the framework is available $CODEPRESS['CLASS'] = ''; @@ -91,20 +118,23 @@ $CODEPRESS['CLASS'] = 'class="codepress css" '; $CODEPRESS['JS'] = 'onclick="javascript: css_codepress.value = area_codepress.getCode();"'; } - + + // write out heading + echo '

' .$HEADING_CSS_FILE .'"' .$css_file .'"

'; + // include button to switch between frontend.css and backend.css (only shown if both files exists) + toggle_css_file($mod_dir, $css_file); + echo '

' .$TXT_EDIT_CSS_FILE .'

'; + + // output content of module file to textareas ?> -
- - + + + + - -

"

- -

+ + Index: trunk/wb/modules/form/css.functions.php =================================================================== --- trunk/wb/modules/form/css.functions.php (revision 783) +++ trunk/wb/modules/form/css.functions.php (revision 784) @@ -23,85 +23,85 @@ */ -// DEFINE LANGUAGE DEPENDING OUTPUTS FOR THE EDIT CSS PART -$lang_dir = WB_PATH .'/modules/' .basename(dirname(__FILE__)) .'/languages/'; -if(file_exists($lang_dir .LANGUAGE .'.php')) { - // try to include custom language file if exists - require_once($lang_dir .LANGUAGE .'.php'); -} elseif(file_exists($lang_dir .'EN.php')) { - // try to include default module language file - require_once($lang_dir .'EN.php'); +// prevent this file from being accessed directly +if(!defined('WB_PATH')) die(header('Location: index.php')); + +// this function checks the validity of the specified module directory +if(!function_exists('check_module_dir')) { + function check_module_dir($mod_dir) { + // check if module directory is formal correct (only characters: "a-z,0-9,_,-") + if(!preg_match('/^[a-z0-9_-]+$/iD', $mod_dir)) return ''; + // check if the module folder contains the required info.php file + return (file_exists(WB_PATH .'/modules/' .$mod_dir .'/info.php')) ? $mod_dir : ''; + } } -// set defaults if output varibles are not set in the languages files -if(!isset($CAP_EDIT_CSS)) $CAP_EDIT_CSS = 'Edit CSS'; -if(!isset($CAP_TOGGLE_CSS)) $CAP_TOGGLE_CSS = 'Switch to '; -if(!isset($HEADING_CSS_FILE)) $HEADING_CSS_FILE = 'Actual module file: '; -if(!isset($TXT_EDIT_CSS_FILE)) $TXT_EDIT_CSS_FILE = 'Edit the CSS definitions in the textarea below.'; - // this function checks if the specified optional module file exists if (!function_exists('mod_file_exists')) { - function mod_file_exists($mod_file='frontend.css') { - // extract the module directory - $mod_dir = basename(dirname(__FILE__)) .'/' .$mod_file; - return file_exists(WB_PATH .'/modules/' .$mod_dir); + function mod_file_exists($mod_dir, $mod_file='frontend.css') { + // check if the module file exists + return file_exists(WB_PATH .'/modules/' .$mod_dir .'/' .$mod_file); } } -// this function displays a "Edit CSS" button in modify.php -// if the optional module files (module.css, module.js) if exists +// this function displays the "Edit CSS" button in modify.php if (!function_exists('css_edit')) { - function css_edit() { + function css_edit($mod_dir) { global $page_id, $section_id, $CAP_EDIT_CSS; - // extract the module directory - $mod_dir = basename(dirname(__FILE__)); - $frontend_css = mod_file_exists('frontend.css'); - $backend_css = mod_file_exists('backend.css'); + // check if specified module directory is valid + if(check_module_dir($mod_dir) == '') return; + + // check if frontend.css or backend.css exist + $frontend_css = mod_file_exists($mod_dir, 'frontend.css'); + $backend_css = mod_file_exists($mod_dir, 'backend.css'); + + // output the edit CSS submtin button if required if($frontend_css || $backend_css) { - // display link to edit the optional CSS module files - $file = $frontend_css ? 'frontend.css' : 'backend.css'; - $output = '
'; - $output .= $CAP_EDIT_CSS .'
'; - echo $output; - } - } + // default text used for the edit CSS routines if not defined in the modules language file + if(!isset($CAP_EDIT_CSS)) $CAP_EDIT_CSS = 'Edit CSS'; + if(!isset($HEADING_CSS_FILE)) $HEADING_CSS_FILE = 'Actual module file: '; + if(!isset($TXT_EDIT_CSS_FILE)) $TXT_EDIT_CSS_FILE = 'Edit the CSS definitions in the textarea below.'; + ?> + + + + + + + +
+ '; - $output .= $CAP_TOGGLE_CSS .$toggle_file .''; - echo $output; + if(mod_file_exists($mod_dir, $toggle_file)) { + ?> +
+ + + + + + +
+ \ No newline at end of file Index: trunk/wb/modules/form/modify_settings.php =================================================================== --- trunk/wb/modules/form/modify_settings.php (revision 783) +++ trunk/wb/modules/form/modify_settings.php (revision 784) @@ -63,9 +63,10 @@ ?>

construct!!! + css_edit('form'); ?>
Index: trunk/wb/modules/form/languages/NL.php =================================================================== --- trunk/wb/modules/form/languages/NL.php (revision 783) +++ trunk/wb/modules/form/languages/NL.php (revision 784) @@ -31,7 +31,6 @@ // Variables for the module CSS edit outputs $CAP_EDIT_CSS = 'Wijzig CSS'; -$CAP_TOGGLE_CSS = 'Wijzig '; $HEADING_CSS_FILE = 'Actuele module bestand: '; $TXT_EDIT_CSS_FILE = 'Wijzig de CSS definities in het textveld hieronder.'; Index: trunk/wb/modules/form/languages/EN.php =================================================================== --- trunk/wb/modules/form/languages/EN.php (revision 783) +++ trunk/wb/modules/form/languages/EN.php (revision 784) @@ -31,7 +31,6 @@ // Variables for the module CSS edit outputs $CAP_EDIT_CSS = 'Edit CSS'; -$CAP_TOGGLE_CSS = 'Edit '; $HEADING_CSS_FILE = 'Actual module file: '; $TXT_EDIT_CSS_FILE = 'Edit the CSS definitions in the textarea below.'; Index: trunk/wb/modules/form/languages/RU.php =================================================================== --- trunk/wb/modules/form/languages/RU.php (revision 783) +++ trunk/wb/modules/form/languages/RU.php (revision 784) @@ -31,7 +31,6 @@ // Variables for the module CSS edit outputs $CAP_EDIT_CSS = 'Редактировать CSS'; -$CAP_TOGGLE_CSS = 'Редактировать '; $HEADING_CSS_FILE = 'Имя файла: '; $TXT_EDIT_CSS_FILE = 'Измените CSS файл, если необходимо:'; Index: trunk/wb/modules/form/languages/DE.php =================================================================== --- trunk/wb/modules/form/languages/DE.php (revision 783) +++ trunk/wb/modules/form/languages/DE.php (revision 784) @@ -31,7 +31,6 @@ // Variablen fuer Textausgabe der frontend.css/backend.css Bearbeitung $CAP_EDIT_CSS = 'Bearbeite CSS'; -$CAP_TOGGLE_CSS = 'Wechsle zu '; $HEADING_CSS_FILE = 'Aktuelle Moduldatei: '; $TXT_EDIT_CSS_FILE = 'Bearbeite die CSS Definitionen im nachfolgenden Textfeld.'; Index: trunk/wb/modules/form/backend.css =================================================================== --- trunk/wb/modules/form/backend.css (revision 783) +++ trunk/wb/modules/form/backend.css (revision 784) @@ -5,16 +5,18 @@ border-top: 1px dashed #fff; } -div.mod_form_edit_css { - width: 100%; +/* + The definitions below provide the style for the edit CSS button + Required CSS class name: input.mod_moduledirectory_edit_css +*/ +input.mod_form_edit_css { + color: #000; + background-color: #F0F0F0; + border: 1px solid gray; + padding: 2px; + margin: 0; + margin-left: 625px; margin-top: -20px; - margin-bottom: 15px; - text-align: right; -} - -div.mod_form_edit_css a { - width: 100px; - padding: 5px; - border: 1px solid; - background-color: #F0F0F0; + margin-bottom: 5px; + width: 110px; } \ No newline at end of file