Project

General

Profile

« Previous | Next » 

Revision 1674

Added by Dietmar over 12 years ago

  1. 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
  2. fixed old.format.inc.php fileformat to unix

View differences:

branches/2.8.x/CHANGELOG
12 12
===============================================================================
13 13

  
14 14

  
15
18 Apr-2012 Build 1668 Dietmar Woellbrink (Luisehahne)
15
18 Apr-2012 Build 1674 Dietmar Woellbrink (Luisehahne)
16
# fixed add-ons upload error (tks to DBS)
17
+ add tool_icon.png to core module
18
! update outpu_filter success an error messages
19
! small redesign wb_themes
20
# fixed old.format.inc.php fileformat to unix
21
18 Apr-2012 Build 1673 Dietmar Woellbrink (Luisehahne)
16 22
! fixed signup, remove $admin->print_error methods
17 23
+ add send registation mail to systemadministartor
18
18 Apr-2012 Build 1668 Dietmar Woellbrink (Luisehahne)
24
18 Apr-2012 Build 1672 Dietmar Woellbrink (Luisehahne)
19 25
+ add languages vars for signup
20
18 Apr-2012 Build 1668 Dietmar Woellbrink (Luisehahne)
26
18 Apr-2012 Build 1671 Dietmar Woellbrink (Luisehahne)
21 27
# fixes installer and upgrade-script
22 28
17 Apr-2012 Build 1670 Werner v.d.Decken(DarkViper)
23 29
+ added new global exceptionhandler (class AppException)
branches/2.8.x/wb/admin/interface/version.php
51 51

  
52 52
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
53 53
if(!defined('VERSION')) define('VERSION', '2.8.3');
54
if(!defined('REVISION')) define('REVISION', '1673');
54
if(!defined('REVISION')) define('REVISION', '1674');
55 55
if(!defined('SP')) define('SP', '');
branches/2.8.x/wb/framework/class.admin.php
208 208

  
209 209
		$footer_template->set_block('footer_block', 'show_debug_block', 'show_debug');
210 210

  
211
		$bDebug = (defined('DEBUG') ? true : false);
211
		$bDebug = (defined('DEBUG') ? DEBUG : false);
212 212
		$bDevInfo = (defined('DEV_INFOS') && (DEV_INFOS == true) && (1 == $this->get_user_id()) ? true : false);
213 213
//         if( $debug && (1 == $this->get_user_id()))
214 214
        if( $bDevInfo )
......
225 225
			// $debug = true;
226 226
			foreach($included_files as $filename)
227 227
			{
228
				if(!is_readable($filename)) { continue; }
228 229
				if($bDebug)
229 230
				{
230 231
					$footer_template->set_var('INCLUDES_ARRAY', str_replace(WB_PATH, '',$filename) );
branches/2.8.x/wb/languages/old.format.inc.php
152 152
$MESSAGE['ADDON']['PRECHECK_FAILED']  = $MESSAGE['ADDON_PRECHECK_FAILED'] ;
153 153
$MESSAGE['ADDON']['MANUAL_INSTALLATION']  = $MESSAGE['ADDON_MANUAL_INSTALLATION'] ;
154 154
$MESSAGE['ADDON']['MANUAL_INSTALLATION_WARNING']  = $MESSAGE['ADDON_MANUAL_INSTALLATION_WARNING'] ;
155

  
branches/2.8.x/wb/modules/output_filter/tool.php
21 21
/* -------------------------------------------------------- */
22 22

  
23 23
	$modPath = str_replace('\\', '/', dirname(__FILE__)).'/';
24
	$msgTxt = '';
24
	$msgOk = '';
25
	$msgError = '';
25 26
	$msgCls = 'msg-box';
27
	$js_back = ADMIN_URL.'/admintools/tool.php?tool=output_filter';
26 28
// include the modules language definitions
27 29
	if(!is_readable($modPath.'languages/'.LANGUAGE .'.php')) {
28 30
		require_once($modPath.'languages/EN.php');
29 31
	} else {
30 32
		require_once($modPath.'languages/'.LANGUAGE .'.php');
31 33
	}
32
// check if data was submitted
33
	if($doSave) {
34

  
35
	// check if data was submitted
36
	if(isset($_POST['save_settings']))
37
	{
34 38
	// take over post - arguments
35 39
		$data = array();
36 40
		$data['sys_rel']       = (int)(intval(isset($_POST['sys_rel']) ? $_POST['sys_rel'] : 0) != 0);
......
48 52
					  '`dot_replacement`=\''.mysql_real_escape_string($data['dot_replacement']).'\'';
49 53
			if($database->query($sql)) {
50 54
			//anything ok
51
				$msgTxt = $MESSAGE['RECORD_MODIFIED_SAVED'];
55
				$msgOk = $MESSAGE['RECORD_MODIFIED_SAVED'];
52 56
				$msgCls = 'msg-box';
53 57
			}else {
54 58
			// database error
55
				$msgTxt = $MESSAGE['RECORD_MODIFIED_FAILED'];
59
				$msgError = $MESSAGE['RECORD_MODIFIED_FAILED'];
56 60
				$msgCls = 'error-box';
57 61
			}
58
		}else {
62
		} else {
59 63
		// FTAN error
60
			$msgTxt = $MESSAGE['GENERIC_SECURITY_ACCESS'];
64
			$msgError = $MESSAGE['GENERIC_SECURITY_ACCESS'];
61 65
			$msgCls = 'error-box';
62 66
		}
63
	}else {
67

  
68
		if(!$admin_header) { $admin->print_header(); }
69

  
70
		if( $msgError != '')
71
		{
72
			$admin->print_error($msgError, $js_back);
73
		}
74
		if( $msgOk != '')
75
		{
76
			$admin->print_success($msgOk, $js_back);
77
		}
78

  
79
	}  else {
80
}
64 81
	// read settings from the database to show
65 82
		require_once($modPath.'filter-routines.php');
66 83
		$data = getOutputFilterSettings();
67
	}
68
	// write out header if needed
69
	if(!$admin_header) { $admin->print_header(); }
70
	if( $msgTxt != '') {
71
	// write message box if needed
72
		echo '<div class="'.$msgCls.'">'.$msgTxt.'</div>';
73
	}
74 84
?>
75 85
<h2><?php echo $MOD_MAIL_FILTER['HEADING']; ?></h2>
76 86
<p><?php echo $MOD_MAIL_FILTER['HOWTO']; ?></p>
77 87
<p><?php echo $MOD_MAIL_FILTER['HOWTOTIP']; ?></p>
78 88
<form name="store_settings" action="<?php echo $_SERVER['REQUEST_URI'];?>" method="post">
79 89
	<?php echo $admin->getFTAN(); ?>
80
	<input type="hidden" name="action" value="save" />
90
	<input type="hidden" name="save_settings" value="save" />
81 91
	<table summary="" width="98%" cellspacing="0" cellpadding="5" class="row_a">
82 92
	<tr><td colspan="2"><strong><?php echo $MOD_MAIL_FILTER['BASIC_CONF'];?>:</strong></td></tr>
83 93
	<tr>

Also available in: Unified diff