Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG (revision 1673)
+++ branches/2.8.x/CHANGELOG (revision 1674)
@@ -12,12 +12,18 @@
===============================================================================
-18 Apr-2012 Build 1668 Dietmar Woellbrink (Luisehahne)
+18 Apr-2012 Build 1674 Dietmar Woellbrink (Luisehahne)
+# fixed add-ons upload error (tks to DBS)
++ add tool_icon.png to core module
+! update outpu_filter success an error messages
+! small redesign wb_themes
+# fixed old.format.inc.php fileformat to unix
+18 Apr-2012 Build 1673 Dietmar Woellbrink (Luisehahne)
! fixed signup, remove $admin->print_error methods
+ add send registation mail to systemadministartor
-18 Apr-2012 Build 1668 Dietmar Woellbrink (Luisehahne)
+18 Apr-2012 Build 1672 Dietmar Woellbrink (Luisehahne)
+ add languages vars for signup
-18 Apr-2012 Build 1668 Dietmar Woellbrink (Luisehahne)
+18 Apr-2012 Build 1671 Dietmar Woellbrink (Luisehahne)
# fixes installer and upgrade-script
17 Apr-2012 Build 1670 Werner v.d.Decken(DarkViper)
+ added new global exceptionhandler (class AppException)
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php (revision 1673)
+++ branches/2.8.x/wb/admin/interface/version.php (revision 1674)
@@ -51,5 +51,5 @@
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
if(!defined('VERSION')) define('VERSION', '2.8.3');
-if(!defined('REVISION')) define('REVISION', '1673');
+if(!defined('REVISION')) define('REVISION', '1674');
if(!defined('SP')) define('SP', '');
Index: branches/2.8.x/wb/framework/class.admin.php
===================================================================
--- branches/2.8.x/wb/framework/class.admin.php (revision 1673)
+++ branches/2.8.x/wb/framework/class.admin.php (revision 1674)
@@ -208,7 +208,7 @@
$footer_template->set_block('footer_block', 'show_debug_block', 'show_debug');
- $bDebug = (defined('DEBUG') ? true : false);
+ $bDebug = (defined('DEBUG') ? DEBUG : false);
$bDevInfo = (defined('DEV_INFOS') && (DEV_INFOS == true) && (1 == $this->get_user_id()) ? true : false);
// if( $debug && (1 == $this->get_user_id()))
if( $bDevInfo )
@@ -225,6 +225,7 @@
// $debug = true;
foreach($included_files as $filename)
{
+ if(!is_readable($filename)) { continue; }
if($bDebug)
{
$footer_template->set_var('INCLUDES_ARRAY', str_replace(WB_PATH, '',$filename) );
Index: branches/2.8.x/wb/templates/wb_theme/images/dl.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/2.8.x/wb/templates/wb_theme/images/menu.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/2.8.x/wb/templates/wb_theme/images/view.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/2.8.x/wb/templates/wb_theme/images/menuo.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/2.8.x/wb/templates/wb_theme/images/help.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/2.8.x/wb/templates/wb_theme/images/close.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: branches/2.8.x/wb/templates/wb_theme/images/close.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/2.8.x/wb/templates/wb_theme/images/exit.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: branches/2.8.x/wb/templates/wb_theme/images/exit.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/2.8.x/wb/templates/wb_theme/images/sections.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: branches/2.8.x/wb/templates/wb_theme/images/sections.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/2.8.x/wb/templates/wb_theme/images/home.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/2.8.x/wb/languages/old.format.inc.php
===================================================================
--- branches/2.8.x/wb/languages/old.format.inc.php (revision 1673)
+++ branches/2.8.x/wb/languages/old.format.inc.php (revision 1674)
@@ -152,4 +152,3 @@
$MESSAGE['ADDON']['PRECHECK_FAILED'] = $MESSAGE['ADDON_PRECHECK_FAILED'] ;
$MESSAGE['ADDON']['MANUAL_INSTALLATION'] = $MESSAGE['ADDON_MANUAL_INSTALLATION'] ;
$MESSAGE['ADDON']['MANUAL_INSTALLATION_WARNING'] = $MESSAGE['ADDON_MANUAL_INSTALLATION_WARNING'] ;
-
Index: branches/2.8.x/wb/modules/SecureFormSwitcher/tool_icon.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: branches/2.8.x/wb/modules/SecureFormSwitcher/tool_icon.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/2.8.x/wb/modules/jsadmin/tool_icon.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: branches/2.8.x/wb/modules/jsadmin/tool_icon.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/2.8.x/wb/modules/captcha_control/tool_icon.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: branches/2.8.x/wb/modules/captcha_control/tool_icon.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/2.8.x/wb/modules/output_filter/tool.php
===================================================================
--- branches/2.8.x/wb/modules/output_filter/tool.php (revision 1673)
+++ branches/2.8.x/wb/modules/output_filter/tool.php (revision 1674)
@@ -21,8 +21,10 @@
/* -------------------------------------------------------- */
$modPath = str_replace('\\', '/', dirname(__FILE__)).'/';
- $msgTxt = '';
+ $msgOk = '';
+ $msgError = '';
$msgCls = 'msg-box';
+ $js_back = ADMIN_URL.'/admintools/tool.php?tool=output_filter';
// include the modules language definitions
if(!is_readable($modPath.'languages/'.LANGUAGE .'.php')) {
require_once($modPath.'languages/EN.php');
@@ -29,8 +31,10 @@
} else {
require_once($modPath.'languages/'.LANGUAGE .'.php');
}
-// check if data was submitted
- if($doSave) {
+
+ // check if data was submitted
+ if(isset($_POST['save_settings']))
+ {
// take over post - arguments
$data = array();
$data['sys_rel'] = (int)(intval(isset($_POST['sys_rel']) ? $_POST['sys_rel'] : 0) != 0);
@@ -48,29 +52,35 @@
'`dot_replacement`=\''.mysql_real_escape_string($data['dot_replacement']).'\'';
if($database->query($sql)) {
//anything ok
- $msgTxt = $MESSAGE['RECORD_MODIFIED_SAVED'];
+ $msgOk = $MESSAGE['RECORD_MODIFIED_SAVED'];
$msgCls = 'msg-box';
}else {
// database error
- $msgTxt = $MESSAGE['RECORD_MODIFIED_FAILED'];
+ $msgError = $MESSAGE['RECORD_MODIFIED_FAILED'];
$msgCls = 'error-box';
}
- }else {
+ } else {
// FTAN error
- $msgTxt = $MESSAGE['GENERIC_SECURITY_ACCESS'];
+ $msgError = $MESSAGE['GENERIC_SECURITY_ACCESS'];
$msgCls = 'error-box';
}
- }else {
+
+ if(!$admin_header) { $admin->print_header(); }
+
+ if( $msgError != '')
+ {
+ $admin->print_error($msgError, $js_back);
+ }
+ if( $msgOk != '')
+ {
+ $admin->print_success($msgOk, $js_back);
+ }
+
+ } else {
+}
// read settings from the database to show
require_once($modPath.'filter-routines.php');
$data = getOutputFilterSettings();
- }
- // write out header if needed
- if(!$admin_header) { $admin->print_header(); }
- if( $msgTxt != '') {
- // write message box if needed
- echo ''.$msgTxt.'
';
- }
?>
@@ -77,7 +87,7 @@