Project

General

Profile

« Previous | Next » 

Revision 998

Added by Ruud over 15 years ago

Droplets upgrade script fixes
Added warning message in output_filter

View differences:

trunk/CHANGELOG
11 11
! = Update/Change
12 12

  
13 13
------------------------------------- 2.8.0 -------------------------------------
14
17-June-2009 Ruud Eisinga
15
# Bugfix in "droplets/upgrade.php" - wrong parameter order for adding fields.
16
	also the query for "normal" upgrades had a typo.
17
! Added warning in output_filter that the function will be removed in 2.9
14 18
17-June-2009 Dietrich Roland Pehlke
15 19
# Bugfix in "droplets/upgrade.php" - wrong tablename change to the correct one
16 20
+ Add upgrade-script to droplets
trunk/wb/modules/droplets/tool.php
148 148
	global $database;
149 149
	$query_droplets = $database->query("SELECT name FROM ".TABLE_PREFIX."mod_droplets WHERE name = '$name'");
150 150
	return ($query_droplets->numRows() == 1);
151

  
152

  
153

  
154 151
}
155

  
156 152
?>
trunk/wb/modules/droplets/upgrade.php
24 24
	 */
25 25
	
26 26
	if (function_exists('db_add_field')) {
27
		db_add_field($table, "admin_edit", "INT NOT NULL default '0'");
28
		db_add_field($table, "admin_view", "INT NOT NULL default '0'");
29
		db_add_field($table, "show_wysiwyg", "INT NOT NULL default '0'");
27
		db_add_field("admin_edit", 'mod_droplets', "INT NOT NULL default '0'");
28
		db_add_field("admin_view", 'mod_droplets', "INT NOT NULL default '0'");
29
		db_add_field("show_wysiwyg", 'mod_droplets', "INT NOT NULL default '0'");
30 30
	} else {
31 31
		/**
32 32
		 * Not call by the upgrade-script
......
35 35
			`admin_edit` INT NOT NULL default '0',
36 36
			`admin_view` INT NOT NULL default '0',
37 37
			`show_wysiwyg` INT NOT NULL default '0'
38
			)";
38
			)");
39 39
	}
40 40
}
41 41
?>
trunk/wb/modules/output_filter/tool.php
27 27
if(!defined('WB_PATH')) die(header('Location: ../index.php'));
28 28

  
29 29
// check if module language file exists for the language set by the user (e.g. DE, EN)
30
$MOD_MAIL_FILTER['WARNING']	= '<p style="color: red; line-height:1.5em;"><strong>Warning: </strong>This function is now available as a Droplet. The next major release of website baker will not include this filter anymore. Please concider using the <a href="?tool=droplets">Droplet</a> [[EmailFilter]]</p>';
30 31
if(!file_exists(WB_PATH .'/modules/output_filter/languages/'.LANGUAGE .'.php')) {
31 32
	// no module language file exists for the language set by the user, include default module language file EN.php
32 33
	require_once(WB_PATH .'/modules/output_filter/languages/EN.php');
......
69 70
	
70 71
	// output the form with values from the database
71 72
	echo '<p>' .$MOD_MAIL_FILTER['HOWTO'] .'</p>';
73
	echo $MOD_MAIL_FILTER['WARNING'];
72 74
?>
73 75
<form name="store_settings" action="<?php echo $_SERVER['REQUEST_URI'];?>" method="post">
74 76
	<table width="98%" cellspacing="0" cellpadding="5px" class="row_a">
trunk/wb/modules/output_filter/languages/NL.php
29 29
// Headings and text outputs
30 30
$MOD_MAIL_FILTER['HEADING']				= 'Beheersinstellingen: Output Filter';
31 31
$MOD_MAIL_FILTER['HOWTO']				= 'Hier kan je de uitvoer filteren met onderstaande opties.<p style="line-height:1.5em;"><strong>Tip: </strong>Mailto links kunnen gecodeerd worden door een Javascript functie. Om van deze optie gebruik te kunnen maken moet je de PHP code <code style="background:#FFA;color:#900;">&lt;?php register_frontend_modfiles(\'js\');?&gt;</code> in de &lt;head&gt; sectie van het index.php bestand van je template plaatsen. Zonder deze aanpassing zal enkel het @ teken in het mailto deel vervangen worden.</p>';
32
$MOD_MAIL_FILTER['WARNING']				= '<p style="color: red; line-height:1.5em;"><strong>Waarschuwing: </strong>Deze functionaliteit is vanaf nu ook beschikbaar als Droplet. De volgende versie van Website Baker (2.9) zal dit filter dan ook niet meer ondersteunen. Gebruik voortaan de <a href="?tool=droplets">Droplet</a> [[EmailFilter]]</p>';
32 33

  
33 34
// Text and captions of form elements
34 35
$MOD_MAIL_FILTER['BASIC_CONF']			= 'E-mail Configuratie';
trunk/wb/modules/output_filter/languages/EN.php
29 29
// Headings and text outputs
30 30
$MOD_MAIL_FILTER['HEADING']				= 'Options: Output Filter';
31 31
$MOD_MAIL_FILTER['HOWTO']						= 'You can configure the output filtering with the options below.<p style="line-height:1.5em;"><strong>Tip: </strong>Mailto links can be encrypted by a Javascript function. To make use of this option, one needs to add the PHP code <code style="background:#FFA;color:#900;">&lt;?php register_frontend_modfiles(\'js\');?&gt;</code> into the &lt;head&gt; section of the index.php of your template. Without this modification, only the @ character in the mailto part will be replaced.</p>';
32
$MOD_MAIL_FILTER['WARNING']						= '<p style="color: red; line-height:1.5em;"><strong>Warning: </strong>This function is now available as a Droplet. The next major release of website baker will not include this filter anymore. Please concider using the <a href="?tool=droplets">Droplet</a> [[EmailFilter]]</p>';
32 33

  
33 34
// Text and captions of form elements
34 35
$MOD_MAIL_FILTER['BASIC_CONF']			= 'Basic Email Configuration';

Also available in: Unified diff