Development

Navigation

← Previous Changeset
Next Changeset →

Changeset 1030

Timestamp:

03/02/08 03:00:12 (9 months ago)

Author:

breaki

Message:

* Fixed #567: finish to implement new ispcp_debugger.php code ('TR_CHANGE_STATUS' has to be implemented in the language files)

Files:

trunk/gui/admin/ispcp_debugger.php (modified) (12 diffs)
trunk/gui/themes/omega_original/admin/ispcp_debugger.tpl (modified) (5 diffs)

Legend:

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

trunk/gui/admin/ispcp_debugger.php

r1014	r1030
23	23	check_login(__FILE__);
24	24
	25	function count_requests(&$sql, $id_name, $table){
	26	global $cfg;
	27
	28	$query = "select $id_name FROM $table WHERE $id_name = ?";
	29	$rs = exec_query($sql, $query, $cfg['ITEM_CHANGE_STATUS']);
	30	$count = $rs->RecordCount();
	31	return $count;
	32	}
	33
25	34	function get_error_domains(&$sql, &$tpl) {
26	35	global $cfg;
…	…
37	46	$dmn_query = <<<SQL_QUERY
38	47	select
39		domain_name, domain_status
	48	domain_name, domain_status, domain_id
40	49	from
41	50	domain
…	…
92	101	'TR_DOMAIN_NAME' => $rs->fields['domain_name'],
93	102	'TR_DOMAIN_ERROR' => $rs->fields['domain_status'],
	103	'CHANGE_ID' => $rs->fields['domain_id'],
	104	'CHANGE_TYPE' => 'domain',
94	105	)
95	106	);
…	…
118	129	$dmn_query = <<<SQL_QUERY
119	130	select
120		alias_name, alias_status
	131	alias_name, alias_status, alias_id
121	132	from
122	133	domain_aliasses
…	…
183	194	'TR_ALIAS_NAME' => $rs->fields['alias_name'],
184	195	'TR_ALIAS_ERROR' => $rs->fields['alias_status'],
	196	'CHANGE_ID' => $rs->fields['alias_id'],
	197	'CHANGE_TYPE' => 'alias',
185	198	)
186	199	);
…	…
208	221	$dmn_query = <<<SQL_QUERY
209	222	select
210		subdomain_name, subdomain_status
	223	subdomain_name, subdomain_status, subdomain_id
211	224	from
212	225	subdomain
…	…
270	283	'TR_SUBDOMAIN_NAME' => $rs->fields['subdomain_name'],
271	284	'TR_SUBDOMAIN_ERROR' => $rs->fields['subdomain_status'],
	285	'CHANGE_ID' => $rs->fields['subdomain_id'],
	286	'CHANGE_TYPE' => 'subdomain',
272	287	)
273	288	);
…	…
296	311	$dmn_query = <<<SQL_QUERY
297	312	select
298		mail_acc, domain_id, mail_type, status
	313	mail_acc, domain_id, mail_type, status, mail_id
299	314	from
300	315	mail_users
…	…
399	414	'TR_MAIL_NAME' => $rs->fields['mail_acc'] . "@" . $domain_name,
400	415	'TR_MAIL_ERROR' => $rs->fields['status'],
	416	'CHANGE_ID' => $rs->fields['mail_id'],
	417	'CHANGE_TYPE' => 'mail',
401	418	)
402	419	);
…	…
409	426	}
410	427	}
	428
	429	$exec_count = count_requests($sql, 'domain_status', 'domain');
	430	$exec_count = $exec_count + count_requests($sql, 'alias_status', 'domain_aliasses');
	431	$exec_count = $exec_count + count_requests($sql, 'subdomain_status', 'subdomain');
	432	$exec_count = $exec_count + count_requests($sql, 'status', 'mail_users');
411	433
412	434	$tpl = new pTemplate();
…	…
451	473	'TR_MAIL_ERRORS' => tr('Mail account errors'),
452	474	'TR_DAEMON_TOOLS' => tr('ispCP Daemon tools'),
453		'TR_EXEC_REQUESTS' => tr('Execute requests')
	475	'TR_EXEC_REQUESTS' => tr('Execute requests'),
	476	'TR_CHANGE_STATUS' => tr('Set status to "change"'),
	477	'EXEC_COUNT' => $exec_count,
454	478	)
455	479	);
456	480
457		~~// Handy way to change domain/subdomain/alias/mail status~~
458		~~// TODO: write implementation in the GUI~~
459	481	if (isset($_GET['action'])) {
460	482	if ($_GET['action'] == 'run_engine') {
…	…
463	485	set_page_message(tr('Daemon returned %d as status code', $c));
464	486	} else if ($_GET['action'] == 'change_status' && (
465		isset($_GET['account_id']) && isset($_GET['new_status']) && isset($_GET['type']))) {
466
467		switch ($_GET['new_status']) {
468		case $cfg['ITEM_OK_STATUS']:
469		case $cfg['ITEM_DISABLED_STATUS']:
470		case $cfg['ITEM_ADD_STATUS']:
471		case $cfg['ITEM_CHANGE_STATUS']:
472		case $cfg['ITEM_TOENABLE_STATUS']:
473		case $cfg['ITEM_RESTORE_STATUS']:
474		case $cfg['ITEM_TODISABLED_STATUS']:
475		case $cfg['ITEM_DELETE_STATUS']:
476		case $cfg['ITEM_ORDERED_STATUS']:
	487	isset($_GET['id']) && isset($_GET['type']))) {
	488	switch ($_GET['type']) {
	489	case 'domain':
	490	$query = 'UPDATE domain SET domain_status = "change" WHERE domain_id = ?';
	491	break;
	492	case 'alias':
	493	$query = 'UPDATE domain_aliasses SET alias_status = "change" WHERE alias_id = ?';
	494	break;
	495	case 'subdomain':
	496	$query = 'UPDATE subdomain SET subdomain_status = "change" WHERE subdomain_id = ?';
	497	break;
	498	case 'mail':
	499	$query = 'UPDATE mail_users SET status = "change" WHERE mail_id = ?';
477	500	break;
478	501	default:
479		set_page_message(tr('Unknown ~~domain status~~!'));
	502	set_page_message(tr('Unknown type!'));
480	503	user_goto('ispcp_debugger.php');
481	504	break;
482	505	}
483	506
484		switch ($_GET['type']) {
485		case 'domain':
486		$query = 'UPDATE domain SET domain_status = ? WHERE domain_id = ?';
487		break;
488		case 'alias':
489		$query = 'UPDATE domain_aliasses SET alias_status = ? WHERE alias_id = ?';
490		break;
491		case 'subdomain':
492		$query = 'UPDATE subdomain SET subdomain_status = ? WHERE subdomain_id = ?';
493		break;
494		case 'mail':
495		$query = 'UPDATE mail_users SET status = ? WHERE mail_id = ?';
496		break;
497		default:
498		set_page_message(tr('Unknown account type!'));
499		user_goto('ispcp_debugger.php');
500		break;
501		}
502
503		if (!is_int($_GET['account_id'])) {
504		set_page_message(tr('Invalid account id!'));
505		user_goto('ispcp_debugger.php');
506		}
507
508		$rs = exec_query($sql, $query, array($_GET['new_status'], $_GET['account_id']));
	507	$rs = exec_query($sql, $query, $_GET['id']);
509	508
510	509	if ($rs !== false) {

trunk/gui/themes/omega_original/admin/ispcp_debugger.tpl

r1014	r1030
62	62	<td> </td>
63	63	<td class="{CONTENT}">
64		{TR_DOMAIN_NAME}<br />
	64	{TR_DOMAIN_NAME} - <a href="ispcp_debugger.php?action=change_status&id={CHANGE_ID}&type={CHANGE_TYPE}" class="link">{TR_CHANGE_STATUS}</a><br />
65	65	<font color="red">{TR_DOMAIN_ERROR}</font>
66	66	</td>
…	…
84	84	<td> </td>
85	85	<td class="{CONTENT}">
86		{TR_ALIAS_NAME}<br />
	86	{TR_ALIAS_NAME} - <a href="ispcp_debugger.php?action=change_status&id={CHANGE_ID}&type={CHANGE_TYPE}" class="link">{TR_CHANGE_STATUS}</a><br />
87	87	<font color="red">{TR_ALIAS_ERROR}</font>
88	88	</td>
…	…
106	106	<td> </td>
107	107	<td class="{CONTENT}">
108		{TR_SUBDOMAIN_NAME}<br />
	108	{TR_SUBDOMAIN_NAME} - <a href="ispcp_debugger.php?action=change_status&id={CHANGE_ID}&type={CHANGE_TYPE}" class="link">{TR_CHANGE_STATUS}</a><br />
109	109	<font color="red">{TR_SUBDOMAIN_ERROR}</font>
110	110	</td>
…	…
128	128	<td> </td>
129	129	<td class="{CONTENT}">
130		{TR_MAIL_NAME}<br />
	130	{TR_MAIL_NAME} - <a href="ispcp_debugger.php?action=change_status&id={CHANGE_ID}&type={CHANGE_TYPE}" class="link">{TR_CHANGE_STATUS}</a><br />
131	131	<font color="red">{TR_MAIL_ERROR}</font>
132	132	</td>
…	…
142	142	<tr>
143	143	<td> </td>
144		<td><a href="ispcp_debugger.php?action=run_engine" class="link">{TR_EXEC_REQUESTS}</a></td>
	144	<td><a href="ispcp_debugger.php?action=run_engine" class="link">{EXEC_COUNT} {TR_EXEC_REQUESTS}</a></td>
145	145	</tr>
146	146	</table>