Development

Navigation

← Previous Changeset
Next Changeset →

Changeset 1125

Timestamp:

04/24/08 19:51:03 (4 months ago)

Author:

zothos

Message:

* Fixed #1205: webtools - small layout issue...
* Fixed #1206: german languag error -> variable not replaced
* Enhanced DB update functionality

Files:

trunk/CHANGELOG (modified) (1 diff)
trunk/gui/client/sql_add_user.php (modified) (1 diff)
trunk/gui/include/database-update-functions.php (modified) (4 diffs)
trunk/gui/themes/omega_original/client/webtools.tpl (modified) (1 diff)
trunk/language-files/de_DE.po (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/CHANGELOG

r1124	r1125
1	1	ispCP ω 1.0.0 Changelog
2	2	~~~~~~~~~~~~~~~~~~~~~~~~~~~~
	3
	4	2008-04-24 Jochen Manz
	5	- GUI:
	6	* Fixed #1205: webtools - small layout issue...
	7	* Fixed #1206: german languag error -> variable not replaced
	8	* Enhanced DB update functionality
3	9
4	10	2008-04-24 Benedikt Heintel

trunk/gui/client/sql_add_user.php

r1014	r1125
304	304	$rs = exec_query($sql, $query, array($db_user, $user_pass));
305	305
306		write_log($_SESSION['user_logged'] . ": add SQL user: " . $db_~~name~~);
	306	write_log($_SESSION['user_logged'] . ": add SQL user: " . $db_user);
307	307	set_page_message(tr('SQL user successfully added!'));
308	308	user_goto('manage_sql.php');

trunk/gui/include/database-update-functions.php

r1124	r1125
34	34
35	35	$query = "SELECT * FROM `config` WHERE `name` = 'DATABASE_REVISION'";
36		$rs = ~~execute_query($sql,~~ $query);
	36	$rs = $sql->Execute($query);
37	37	$current_revision = (int)$rs->fields['value'];
38	38
…	…
70	70
71	71	/*
72		* C~~hange the database revision to $newRevision~~
	72	* Combine the needed function name, and return it
73	73	*/
74		function setDatabaseRevision($newRevision) {
75		global $sql;
76
77		$query = "UPDATE config SET value = ? WHERE name = ?";
78		$rs = exec_query($sql, $query, array($newRevision, "DATABASE_REVISION"));
	74	function returnFunctionName($revision) {
	75	$functionName = "_databaseUpdate_" . $revision;
	76
	77	return $functionName;
79	78	}
80	79
81	80	/*
82		* Combine the needed function name, and return it
83		*/
84		function returnFunctionName($revision) {
85		return $functionName = "_databaseUpdate_" . $revision;
86		}
87
88		/*
89		* Execute all available update functions
	81	* Execute all available update functions.
90	82	*/
91	83	function executeDatabaseUpdates() {
	84	global $sql;
	85
92	86	while(checkNewRevisionExists()) {
93		$newRevision = getNextRevision();
94		$functionName ~~= returnFunctionName($newRevision, true~~);
	87	$newRevision = getNextRevision();
	88	$functionName = returnFunctionName($newRevision);
95	89
96	90	if(function_exists($functionName)) {
97		$rs = $functionName();
98		setDatabaseRevision($newRevision);
	91	$queryArray = $functionName();
	92
	93	// Query to set the new Database Revision
	94	$queryArray[] = "UPDATE `config` SET `value` = '$newRevision' WHERE `name` = 'DATABASE_REVISION'";
	95
	96	$sql->StartTrans();
	97
	98	foreach($queryArray as $query) {
	99	$sql->Execute($query);
	100	}
	101
	102	// Prompt a error when a update fails
	103	if ($sql->HasFailedTrans()) {
	104	set_page_message(tr("Db update %s failed", $newRevision));
	105	}
	106
	107	$sql->CompleteTrans();
	108	unset($queryArray);
99	109	}
100	110	}
…	…
107	117
108	118	/*
109		* Initital Update. Insert the Revision.
	119	* Initital Update. Insert the first Revision.
110	120	*/
111	121	function _databaseUpdate_1() {
112		global $sql;
113
114		$query = "INSERT INTO config (name, value) VALUES (? , ?)";
115		exec_query($sql, $query, array('DATABASE_REVISION', '1'));
	122	$sqlUpd = "INSERT INTO config (name, value) VALUES (DATABASE_REVISION , 1)";
	123
	124	return $sqlUpd;
116	125	}
117	126
…	…
123	132	*/
124	133	function _databaseUpdate_2() {
125		~~global $sql; // we need the gloabl database connection~~
126
127	134	$sqlUpd = array(); // we need several SQL Statements...
128	135
129	136	// domain mail + forward
130		$sqlUpd[] ~~= "UPDATE `mail_users`, `domain`~~
131		~~SET `mail_addr` = CONCAT(`mail_acc`,'@',`domain_name`)~~
132		~~WHERE `mail_users`.`domain_id` = `domain`.`domain_id`~~
133		AND (`mail_type` = 'normal_mail' OR `mail_type` = 'normal_forward')";
	137	$sqlUpd[] = "UPDATE `mail_users`, `domain`"
	138	. "SET `mail_addr` = CONCAT(`mail_acc`,'@',`domain_name`)"
	139	. "WHERE `mail_users`.`domain_id` = `domain`.`domain_id`"
	140	. "AND (`mail_type` = 'normal_mail' OR `mail_type` = 'normal_forward')";
134	141
135	142	// domain-alias mail + forward
136		$sqlUpd[] ~~= "UPDATE `mail_users`, `domain_aliasses`~~
137		~~SET `mail_addr` = CONCAT(`mail_acc`,'@',`alias_name`)~~
138		~~WHERE `mail_users`.`domain_id` = `domain_aliasses`.`domain_id` AND `mail_users`.`sub_id` = `domain_aliasses`.`alias_id`~~
139		AND (`mail_type` = 'alias_mail' OR `mail_type` = 'alias_forward')";
	143	$sqlUpd[] = "UPDATE `mail_users`, `domain_aliasses`"
	144	. "SET `mail_addr` = CONCAT(`mail_acc`,'@',`alias_name`)"
	145	. "WHERE `mail_users`.`domain_id` = `domain_aliasses`.`domain_id` AND `mail_users`.`sub_id` = `domain_aliasses`.`alias_id`"
	146	. "AND (`mail_type` = 'alias_mail' OR `mail_type` = 'alias_forward')";
140	147
141	148	// subdomain mail + forward
142		$sqlUpd[] ~~= "UPDATE `mail_users`, `subdomain`, `domain`~~
143		~~SET `mail_addr` = CONCAT(`mail_acc`,'@',`subdomain_name`,'.',`domain_name`)~~
144		~~WHERE `mail_users`.`domain_id` = `subdomain`.`domain_id` AND `mail_users`.`sub_id` = `subdomain`.`subdomain_id`~~
145		~~AND `mail_users`.`domain_id` = `domain`.`domain_id`~~
146		AND (`mail_type` = 'subdom_mail' OR `mail_type` = 'subdom_forward')";
	149	$sqlUpd[] = "UPDATE `mail_users`, `subdomain`, `domain`"
	150	. "SET `mail_addr` = CONCAT(`mail_acc`,'@',`subdomain_name`,'.',`domain_name`)"
	151	. "WHERE `mail_users`.`domain_id` = `subdomain`.`domain_id` AND `mail_users`.`sub_id` = `subdomain`.`subdomain_id`"
	152	. "AND `mail_users`.`domain_id` = `domain`.`domain_id`"
	153	. "AND (`mail_type` = 'subdom_mail' OR `mail_type` = 'subdom_forward')";
147	154
148	155	// domain catchall
149		$sqlUpd[] ~~= "UPDATE `mail_users`, `domain`~~
150		~~SET `mail_addr` = CONCAT('@',`domain_name`)~~
151		~~WHERE `mail_users`.`domain_id` = `domain`.`domain_id`~~
152		AND `mail_type` = 'normal_catchall'";
	156	$sqlUpd[] = "UPDATE `mail_users`, `domain`"
	157	. "SET `mail_addr` = CONCAT('@',`domain_name`)"
	158	. "WHERE `mail_users`.`domain_id` = `domain`.`domain_id`"
	159	. "AND `mail_type` = 'normal_catchall'";
153	160
154	161	// domain-alias catchall
155		$sqlUpd[] ~~= "UPDATE `mail_users`, `domain_aliasses`~~
156		~~SET `mail_addr` = CONCAT('@',`alias_name`)~~
157		~~WHERE `mail_users`.`domain_id` = `domain_aliasses`.`domain_id` AND `mail_users`.`sub_id` = `domain_aliasses`.`alias_id`~~
158		AND `mail_type` = 'alias_catchall'";
	162	$sqlUpd[] = "UPDATE `mail_users`, `domain_aliasses`"
	163	. "SET `mail_addr` = CONCAT('@',`alias_name`)"
	164	. "WHERE `mail_users`.`domain_id` = `domain_aliasses`.`domain_id` AND `mail_users`.`sub_id` = `domain_aliasses`.`alias_id`"
	165	. "AND `mail_type` = 'alias_catchall'";
159	166
160	167	// subdomain catchall
161		$sqlUpd[] ~~= "UPDATE `mail_users`, `subdomain`, `domain`~~
162		~~SET `mail_addr` = CONCAT('@',`subdomain_name`,'.',`domain_name`)~~
163		~~WHERE `mail_users`.`domain_id` = `subdomain`.`domain_id` AND `mail_users`.`sub_id` = `subdomain`.`subdomain_id`~~
164		~~AND `mail_users`.`domain_id` = `domain`.`domain_id`~~
165		AND `mail_type` = 'subdom_catchall'";
	168	$sqlUpd[] = "UPDATE `mail_users`, `subdomain`, `domain`"
	169	. "SET `mail_addr` = CONCAT('@',`subdomain_name`,'.',`domain_name`)"
	170	. "WHERE `mail_users`.`domain_id` = `subdomain`.`domain_id` AND `mail_users`.`sub_id` = `subdomain`.`subdomain_id`"
	171	. "AND `mail_users`.`domain_id` = `domain`.`domain_id`"
	172	. "AND `mail_type` = 'subdom_catchall'";
166	173
167		// go for it: run them all
168		foreach($sqlUpd as $s) {
169		$sql->Execute($s);
170		}
171
172		} // end of _databaseUpdate_2
	174	return $sqlUpd;
	175	}
173	176
174	177	/*
175	178	* Fix for ticket #1139 http://www.isp-control.net/ispcp/ticket/1139 (Benedikt Heintel, 2008-03-27)
176		* Fix for ticket #1196 http://www.isp-control.net/ispcp/ticket/1196 (Benedikt Heintel, 2008-04-23)
177	179	*/
178	180	function _databaseUpdate_3() {
179		global $sql; // we need the gloabl database connection
	181	$sqlUpd[] = "ALTER IGNORE TABLE `orders_settings` CHANGE `id` `id` int(10) unsigned NOT NULL auto_increment;";
	182
	183	return $sqlUpd;
	184	}
180	185
181		// Ticket #1139
182		$sqlUpd[] = "ALTER IGNORE TABLE `orders_settings` CHANGE `id` `id` int(10) unsigned NOT NULL auto_increment;";
183
184		// Ticket #1196
	186	/*
	187	* Fix for ticket #1196 http://www.isp-control.net/ispcp/ticket/1196 (Benedikt Heintel, 2008-04-23)
	188	*/
	189	function _databaseUpdate_4() {
	190	$sqlUpd = array();
	191
185	192	$sqlUpd[] = "ALTER IGNORE TABLE `mail_users` CHANGE `mail_auto_respond` `mail_auto_respond_text` text collate utf8_unicode_ci;";
186	193	$sqlUpd[] = "ALTER IGNORE TABLE `mail_users` ADD `mail_auto_respond` BOOL NOT NULL default '0' AFTER `status`;";
187	194	$sqlUpd[] = "ALTER IGNORE TABLE `mail_users` CHANGE `mail_type` `mail_type` varchar(30);";
188
189		// go for it: run them all
190		foreach($sqlUpd as $s) {
191		$sql->Execute($s);
192		}
193
194		} // end of _databaseUpdate_3
	195
	196	return $sqlUpd;
	197	}
195	198	?>

trunk/gui/themes/omega_original/client/webtools.tpl

r1068	r1125
68	68	<tr>
69	69	<td width="65"><a href="error_pages.php"><img src="{THEME_COLOR_PATH}/images/icons/errordocsicon.gif" width="46" height="46" border="0"></a></td>
70		<td ~~width="1065"~~><a href="error_pages.php" class="link">  {TR_ERROR_PAGES}</a><br />
	70	<td><a href="error_pages.php" class="link">  {TR_ERROR_PAGES}</a><br />
71	71	{TR_ERROR_PAGES_TEXT}</td>
72	72	</tr>

trunk/language-files/de_DE.po

r1116	r1125
3129	3129
3130	3130	msgid "Confirmation for domain order {DOMAIN}!"
3131		msgstr "Bestell-Bestätigung für Ihre Domain {D~~omain~~}"
	3131	msgstr "Bestell-Bestätigung für Ihre Domain {DOMAIN}"
3132	3132
3133	3133	msgid ""