Development

Navigation

← Previous Changeset
Next Changeset →

Changeset 1250

Timestamp:

06/29/08 23:20:44 (2 months ago)

Author:

rats

Message:

Small changes
Fixed #1365: session files for master domain are not removed

Files:

trunk/CHANGELOG (modified) (1 diff)
trunk/engine/tools/ispcpphptemp.sh (modified) (3 diffs)
trunk/gui/admin/change_personal.php (modified) (3 diffs)
trunk/gui/admin/database_update.php (modified) (3 diffs)
trunk/gui/admin/edit_admin.php (modified) (1 diff)
trunk/gui/admin/edit_reseller.php (modified) (6 diffs)
trunk/gui/admin/ispcp_debugger.php (modified) (1 diff)
trunk/gui/admin/manage_users.php (modified) (1 diff)
trunk/gui/client/change_personal.php (modified) (1 diff)
trunk/gui/client/manage_sql.php (modified) (1 diff)
trunk/gui/client/support_system.php (modified) (9 diffs)
trunk/gui/client/view_ticket.php (modified) (1 diff)
trunk/gui/include/debug.php (modified) (1 diff)
trunk/gui/include/ispcp-db-keys.php (modified) (1 diff)
trunk/gui/orderpanel/checkout.php (modified) (1 diff)
trunk/gui/reseller/edit_user.php (modified) (10 diffs)
trunk/gui/themes/omega_original/admin/ahp.tpl (modified) (1 diff)
trunk/gui/themes/omega_original/admin/edit_reseller.tpl (modified) (1 diff)
trunk/gui/themes/omega_original/css/ispcp.css (modified) (11 diffs)

Legend:

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

trunk/CHANGELOG

r1249	r1250
5	5	- TOOLS:
6	6	* Updated phpMyAdmin to 2.11.7
	7	* Fixed #1365: session files for master domain are not removed
7	8
8	9	2008-06-28 Benedikt Heintel

trunk/engine/tools/ispcpphptemp.sh

r1095	r1250
4	4	if [ -f /usr/local/etc/ispcp/ispcp.conf ]
5	5	then
6		for a in `cat /usr/local/etc/ispcp/ispcp.conf \| grep -E '(^APACHE_WWW_DIR\|^PHP_STARTER_DIR)' \| sed -e 's/ //g'`; do
	6	for a in `cat /usr/local/etc/ispcp/ispcp.conf \| grep -E '(^ROOT_DIR\|^APACHE_WWW_DIR\|^PHP_STARTER_DIR)' \| sed -e 's/ //g'`; do
7	7	export $a
8	8	done
9	9	else
10		for a in `cat /etc/ispcp/ispcp.conf \| grep -E '(^APACHE_WWW_DIR\|^PHP_STARTER_DIR)' \| sed -e 's/ //g'`; do
	10	for a in `cat /etc/ispcp/ispcp.conf \| grep -E '(^ROOT_DIR\|^APACHE_WWW_DIR\|^PHP_STARTER_DIR)' \| sed -e 's/ //g'`; do
11	11	export $a
12	12	done
…	…
20	20	fcgidir=${PHP_STARTER_DIR}`echo ${wdir} \| awk "-F${APACHE_WWW_DIR}" '{print $2}'`
21	21
22		if [ ! -f "${fcgidir}/php4/php.ini" ] && [ ! -f "${fcgidir}/php4/php.ini" ]; then
	22	if [ ! -f "${fcgidir}/php4/php.ini" ] && [ ! -f "${fcgidir}/php5/php.ini" ]; then
23	23	continue;
24	24	fi
…	…
54	54	#fi
55	55	done
	56
	57	tmpdir="${ROOT_DIR}/gui/phptmp"
	58	fcgidir=${PHP_STARTER_DIR}/master
	59	if [ -f "${fcgidir}/php4/php.ini" ] \|\| [ -f "${fcgidir}/php5/php.ini" ];then
	60	cur=0
	61	max=1440
	62	for ini in "${fcgidir}/php4/php.ini ${fcgidir}/php5/php.ini"; do
	63	if [ ! -f "$ini" ]; then
	64	continue;
	65	fi
	66	cur=$(sed -n -e 's/^[[:space:]]session.gc_maxlifetime[[:space:]]=[[:space:]]$[0-9]\+$.$/\1/p' ${ini} 2>/dev/null \|\| true);
	67	if [ -z "$cur" ]; then
	68	cur=0
	69	fi
	70	if [ "$cur" -gt "$max" ]; then
	71	max=$cur
	72	fi
	73	done
	74	max=$(($max/60))
	75	nice -n 19 find ${tmpdir} -type f -cmin +${max} -print0 \| xargs -r -0 rm
	76	fi

trunk/gui/admin/change_personal.php

r1243	r1250
48	48	$query = <<<SQL_QUERY
49	49	select
50		~~fname~~,
51		~~lname~~,
52		~~gender~~,
53		~~firm~~,
54		~~zip~~,
55		~~city~~,
56		~~country~~,
57		~~street1~~,
58		~~street2~~,
59		~~email~~,
60		~~phone~~,
61		~~fax~~
	50	`fname`,
	51	`lname`,
	52	`gender`,
	53	`firm`,
	54	`zip`,
	55	`city`,
	56	`country`,
	57	`street1`,
	58	`street2`,
	59	`email`,
	60	`phone`,
	61	`fax`
62	62	from
63		~~admin~~
	63	`admin`
64	64	where
65		~~admin_id~~ = ?
	65	`admin_id` = ?
66	66	SQL_QUERY;
67	67
…	…
70	70	$tpl->assign(
71	71	array(
72		'FIRST_NAME' => $rs->fields['fname'],
73		'LAST_NAME' => $rs->fields['lname'],
74		'FIRM' => $rs->fields['firm'],
75		'ZIP' => $rs->fields['zip'],
76		'CITY' => $rs->fields['city'],
77		'COUNTRY' => $rs->fields['country'],
78		'STREET_1' => $rs->fields['street1'],
79		'STREET_2' => $rs->fields['street2'],
80		'EMAIL' => $rs->fields['email'],
81		'PHONE' => $rs->fields['phone'],
82		'FAX' => $rs->fields['fax'],
	72	'FIRST_NAME' => empty($rs->fields['fname'])?'':$rs->fields['fname'],
	73	'LAST_NAME' => empty($rs->fields['lname'])?'':$rs->fields['lname'],
	74	'FIRM' => empty($rs->fields['firm'])?'':$rs->fields['firm'],
	75	'ZIP' => empty($rs->fields['zip'])?'':$rs->fields['zip'],
	76	'CITY' => empty($rs->fields['city'])?'':$rs->fields['city'],
	77	'COUNTRY' => empty($rs->fields['country'])?'':$rs->fields['country'],
	78	'STREET_1' => empty($rs->fields['street1'])?'':$rs->fields['street1'],
	79	'STREET_2' => empty($rs->fields['street2'])?'':$rs->fields['street2'],
	80	'EMAIL' => empty($rs->fields['email'])?'':$rs->fields['email'],
	81	'PHONE' => empty($rs->fields['phone'])?'':$rs->fields['phone'],
	82	'FAX' => empty($rs->fields['fax'])?'':$rs->fields['fax'],
83	83	'VL_MALE' => (($rs->fields['gender'] == 'M') ? 'selected' : ''),
84	84	'VL_FEMALE' => (($rs->fields['gender'] == 'F') ? 'selected' : ''),
…	…
104	104	$query = <<<SQL_QUERY
105	105	update
106		~~admin~~
	106	`admin`
107	107	set
108		~~fname~~ = ?,
109		~~lname~~ = ?,
110		~~firm~~ = ?,
111		~~zip~~ = ?,
112		~~city~~ = ?,
113		~~country~~ = ?,
114		~~street1~~ = ?,
115		~~street2~~ = ?,
116		~~email~~ = ?,
117		~~phone~~ = ?,
118		~~fax~~ = ?,
119		~~gender~~ = ?
	108	`fname` = ?,
	109	`lname` = ?,
	110	`firm` = ?,
	111	`zip` = ?,
	112	`city` = ?,
	113	`country` = ?,
	114	`street1` = ?,
	115	`street2` = ?,
	116	`email` = ?,
	117	`phone` = ?,
	118	`fax` = ?,
	119	`gender` = ?
120	120	where
121		~~admin_id~~ = ?
	121	`admin_id` = ?
122	122	SQL_QUERY;
123	123

trunk/gui/admin/database_update.php

r1243	r1250
38	38	$tpl -> define_dynamic('database_update_infos', 'page');
39	39
40		$tpl -> assign(
41		array(
42		'TR_ADMIN_ISPCP_UPDATES_PAGE_TITLE' => tr('ispCP - Virtual Hosting Control System'),
43		'THEME_COLOR_PATH' => "../themes/" . Config::get('USER_INITIAL_THEME'),
44		'THEME_CHARSET' => tr('encoding'),
45		'ISP_LOGO' => get_logo($_SESSION['user_id'])
46		)
47		);
48
49		// Combine the needed url this file
50		$url = 'http://' . Config::get('BASE_SERVER_VHOST') . '/admin/database_update.php';
	40	$tpl -> assign(array(
	41	'TR_ADMIN_ISPCP_UPDATES_PAGE_TITLE' => tr('ispCP - Virtual Hosting Control System'),
	42	'THEME_COLOR_PATH' => "../themes/" . Config::get('USER_INITIAL_THEME'),
	43	'THEME_CHARSET' => tr('encoding'),
	44	'ISP_LOGO' => get_logo($_SESSION['user_id'])
	45	));
51	46
52	47	// $execute is false per default
…	…
63	58
64	59	$tpl->assign(array(
65		'TR_UPDATES_TITLE' => tr('Database updates'),
66		'TR_AVAILABLE_UPDATES' => tr('Available database updates'),
67		'TR_UPDATE' => tr('Update'),
68		'TR_INFOS' => tr('Update details')
	60	'TR_UPDATES_TITLE' => tr('Database updates'),
	61	'TR_AVAILABLE_UPDATES' => tr('Available database updates'),
	62	'TR_UPDATE' => tr('Update'),
	63	'TR_INFOS' => tr('Update details')
69	64	));
70
71	65
72	66	if(checkDatabaseUpdateExists()) {
73	67	$tpl->assign(array(
74		'UPDATE_MESSAGE' => '',
	68	'UPDATE_MESSAGE' => '',
75	69	'DATABASE_UPDATE_MESSAGE' => '',
76		'UPDATE' => tr('New Database update is now available'),
77		'INFOS' => tr('Do you want to execute the Updates now?')
	70	'UPDATE' => tr('New Database update is now available'),
	71	'INFOS' => tr('Do you want to execute the Updates now?')
78	72	));
79	73	$tpl->parse('DATABASE_UPDATE_INFOS', 'database_update_infos');
80	74	} else {
81	75	$tpl->assign(array(
82		'TR_UPDATE_MESSAGE' => tr('No database updates available'),
83		'DATABASE_UPDATE_INFOS' => ''
	76	'TR_UPDATE_MESSAGE' => tr('No database updates available'),
	77	'DATABASE_UPDATE_INFOS' => ''
84	78	));
85	79	$tpl->parse('DATABASE_UPDATE_MESSAGE', 'database_update_message');
…	…
89	83	if($execute) {
90	84	executeDatabaseUpdates();
91		header('Location:' . $~~url~~);
	85	header('Location:' . $_SERVER['PHP_SELF']);
92	86	}
93
94	87
95	88	$tpl->parse('PAGE', 'page');
96	89	$tpl->prnt();
97	90
98		if (Config::get('DUMP_GUI_DEBUG'))
99		dump_gui_debug();
	91	if (Config::get('DUMP_GUI_DEBUG'))dump_gui_debug();
100	92	?>

trunk/gui/admin/edit_admin.php

r1243	r1250
176	176	$user_logged = $_SESSION['user_logged'];
177	177
178		write_log("$user_logged: changes data/password of $edit_username!");
	178	write_log("$user_logged: changes data/password for $edit_username!");
179	179
180	180	if (isset($_POST['send_data']) && !empty($_POST['pass'])) {

trunk/gui/admin/edit_reseller.php

r1243	r1250
149	149	if (!chk_password($_POST['pass'])) {
150	150	set_page_message(tr("Incorrect password length or syntax!"));
151
152	151	return false;
153	152	}
154	153	if ($_POST['pass'] != $_POST['pass_rep']) {
155	154	set_page_message(tr("Entered passwords do not match!"));
156
157	155	return false;
158	156	}
…	…
190	188	if (!ispcp_limit_check($_POST['nreseller_max_sql_db_cnt'], -1)) {
191	189	set_page_message(tr('Incorrect SQL databases limit!'));
192
193	190	return false;
194	191	}
195	192	else if ($_POST['nreseller_max_sql_db_cnt'] == -1 && $_POST['nreseller_max_sql_user_cnt'] != -1) {
196	193	set_page_message(tr('SQL databases limit is <i>disabled</i>!'));
197
198	194	return false;
199	195	}
…	…
204	200	else if ($_POST['nreseller_max_sql_db_cnt'] != -1 && $_POST['nreseller_max_sql_user_cnt'] == -1) {
205	201	set_page_message(tr('SQL users limit is <i>disabled</i>!'));
206
207	202	return false;
208	203	}
…	…
481	476	if (empty($_POST['pass'])) {
482	477	$query = <<<SQL_QUERY
483		update
484		admin
485		set
486		fname = ?,
487		lname = ?,
488		firm = ?,
489		zip = ?,
490		city = ?,
491		country = ?,
492		email = ?,
493		phone = ?,
494		fax = ?,
495		street1 = ?,
496		street2 = ?,
497		gender = ?
498		where
499		admin_id = ?
	478	update
	479	admin
	480	set
	481	fname = ?,
	482	lname = ?,
	483	firm = ?,
	484	zip = ?,
	485	city = ?,
	486	country = ?,
	487	email = ?,
	488	phone = ?,
	489	fax = ?,
	490	street1 = ?,
	491	street2 = ?,
	492	gender = ?
	493	where
	494	admin_id = ?
500	495	SQL_QUERY;
501	496	$rs = exec_query($sql, $query, array($fname,
…	…
515	510	$upass = crypt_user_pass($_POST['pass']);
516	511	$query = <<<SQL_QUERY
517		update
518		admin
519		set
520		admin_pass = ?,
521		fname = ?,
522		lname = ?,
523		firm = ?,
524		zip = ?,
525		city = ?,
526		country = ?,
527		email = ?,
528		phone = ?,
529		fax = ?,
530		street1 = ?,
531		street2 = ?,
532		gender = ?
533		where
534		admin_id = ?
	512	update
	513	admin
	514	set
	515	admin_pass = ?,
	516	fname = ?,
	517	lname = ?,
	518	firm = ?,
	519	zip = ?,
	520	city = ?,
	521	country = ?,
	522	email = ?,
	523	phone = ?,
	524	fax = ?,
	525	street1 = ?,
	526	street2 = ?,
	527	gender = ?
	528	where
	529	admin_id = ?
535	530	SQL_QUERY;
536		$rs = exec_query($sql, $query, array($upass,
537		$fname,
538		$lname,
539		$firm,
540		$zip,
541		$city,
542		$country,
543		$email,
544		$phone,
545		$fax,
546		$street1,
547		$street2,
548		$gender,
549		$edit_id));
	531	$rs = exec_query($sql, $query, array($upass,
	532	$fname,
	533	$lname,
	534	$firm,
	535	$zip,
	536	$city,
	537	$country,
	538	$email,
	539	$phone,
	540	$fax,
	541	$street1,
	542	$street2,
	543	$gender,
	544	$edit_id));
550	545	}
551	546
…	…
560	555	$nreseller_max_disk = clean_input($_POST['nreseller_max_disk']);
561	556	$customer_id = clean_input($_POST['customer_id']);
562
	557
563	558	$query = <<<SQL_QUERY
564	559	update reseller_props

trunk/gui/admin/ispcp_debugger.php

r1241	r1250
24	24
25	25	function count_requests(&$sql, $id_name, $table){
26		~~$query = "select $id_name FROM $table WHERE $id_name = ?~~";
27		$rs = exec_query($sql, $query, ~~Config::get('ITEM_CHANGE_STATUS'~~));
28		$count = $rs->RecordCount();
29		return $count;
	26	$query = "select `$id_name` FROM `$table` WHERE `$id_name` NOT IN (?, ?, ?)";
	27	$rs = exec_query($sql, $query, array(Config::get('ITEM_OK_STATUS'), Config::get('ITEM_DISABLED_STATUS'), Config::get('ITEM_ORDERED_STATUS')));
	28	$count = $rs->RecordCount();
	29	return $count;
30	30	}
31	31

trunk/gui/admin/manage_users.php

r1243	r1250
103	103	*/
104	104
105		if (!~~isset(Config::get('HOSTING_PLANS_LEVEL')~~) \|\| strtolower(Config::get('HOSTING_PLANS_LEVEL')) !== 'admin') {
	105	if (!Config::exists('HOSTING_PLANS_LEVEL') \|\| strtolower(Config::get('HOSTING_PLANS_LEVEL')) !== 'admin') {
106	106	$tpl->assign('EDIT_OPTION', '');
107	107	}

trunk/gui/client/change_personal.php

r1241	r1250
66	66	$tpl->assign(
67	67	array(
68		'FIRST_NAME' => $rs->fields['fname'],
69		'LAST_NAME' => $rs->fields['lname'],
70		'FIRM' => $rs->fields['firm'],
71		'ZIP' => $rs->fields['zip'],
72		'CITY' => $rs->fields['city'],
73		'COUNTRY' => $rs->fields['country'],
74		'STREET_1' => $rs->fields['street1'],
75		'STREET_2' => $rs->fields['street2'],
76		'EMAIL' => $rs->fields['email'],
77		'PHONE' => $rs->fields['phone'],
78		'FAX' => $rs->fields['fax'],
79		'VL_MALE' => (($rs -> fields['gender'] == 'M')? 'selected' : ''),
80		'VL_FEMALE' => (($rs -> fields['gender'] == 'F')? 'selected' : ''),
81		'VL_UNKNOWN' => ((($rs->fields['gender'] == 'U') \|\| (empty($rs->fields['gender']))) ? 'selected' : '')
	68	'FIRST_NAME' => empty($rs->fields['fname'])?'':$rs->fields['fname'],
	69	'LAST_NAME' => empty($rs->fields['lname'])?'':$rs->fields['lname'],
	70	'FIRM' => empty($rs->fields['firm'])?'':$rs->fields['firm'],
	71	'ZIP' => empty($rs->fields['zip'])?'':$rs->fields['zip'],
	72	'CITY' => empty($rs->fields['city'])?'':$rs->fields['city'],
	73	'COUNTRY' => empty($rs->fields['country'])?'':$rs->fields['country'],
	74	'STREET_1' => empty($rs->fields['street1'])?'':$rs->fields['street1'],
	75	'STREET_2' => empty($rs->fields['street2'])?'':$rs->fields['street2'],
	76	'EMAIL' => empty($rs->fields['email'])?'':$rs->fields['email'],
	77	'PHONE' => empty($rs->fields['phone'])?'':$rs->fields['phone'],
	78	'FAX' => empty($rs->fields['fax'])?'':$rs->fields['fax'],
	79	'VL_MALE' => (($rs -> fields['gender'] == 'M')? 'selected' : ''),
	80	'VL_FEMALE' => (($rs -> fields['gender'] == 'F')? 'selected' : ''),
	81	'VL_UNKNOWN' => ((($rs->fields['gender'] == 'U') \|\| (empty($rs->fields['gender']))) ? 'selected' : '')
82	82	)
83	83	);

trunk/gui/client/manage_sql.php

r1241	r1250
112	112	gen_db_user_list($tpl, $sql, $db_id);
113	113	$tpl->assign(
114		array(
115		'DB_ID' => "$db_id",
116		'DB_NAME' => "$db_name"
117		)
118		);
	114	array(
	115	'DB_ID' => "$db_id",
	116	'DB_NAME' => "$db_name"
	117	)
	118	);
119	119	$tpl->parse('DB_LIST', '.db_list');
120	120	$rs->MoveNext();

trunk/gui/client/support_system.php

r1241	r1250
38	38	function get_last_date(&$tpl, &$sql, $ticket_id) {
39	39	$query = <<<SQL_QUERY
40		SELECT
41		ticket_date
42		FROM
43		tickets
44		WHERE
45		~~ticket_id~~ = ?
46		OR
47		~~ticket_reply~~ = ?
48		ORDER BY
49		~~ticket_date~~ DESC
	40	SELECT
	41	`ticket_date`
	42	FROM
	43	`tickets`
	44	WHERE
	45	`ticket_id` = ?
	46	OR
	47	`ticket_reply` = ?
	48	ORDER BY
	49	`ticket_date` DESC
50	50	SQL_QUERY;
51	51
…	…
64	64
65	65	$count_query = <<<SQL_QUERY
66		select
67		count(ticket_id) as cnt
68		from
69		tickets
70		where
71		~~ticket_from~~ = ?
72		and
73		~~ticket_status~~ != 0
74		and
75		~~ticket_reply~~ = 0
	66	select
	67	count(ticket_id) as cnt
	68	from
	69	`tickets`
	70	where
	71	`ticket_from`= ?
	72	and
	73	`ticket_status` != 0
	74	and
	75	`ticket_reply` = 0
76	76	SQL_QUERY;
77	77
…	…
80	80
81	81	$query = <<<SQL_QUERY
82		SELECT
83		~~ticket_id~~,
84		~~ticket_status~~,
85		~~ticket_urgency~~,
86		~~ticket_date~~,
87		~~ticket_subject~~,
88		ticket_message
89		FROM
90		tickets
91		WHERE
92		~~ticket_from~~ = ?
93		AND
94		~~ticket_status~~ != 0
95		AND
96		~~ticket_reply~~ = 0
97		ORDER BY
98		~~ticket_date~~ DESC
99		LIMIT
100		$start_index, $rows_per_page
	82	SELECT
	83	`ticket_id`,
	84	`ticket_status`,
	85	`ticket_urgency`,
	86	`ticket_date`,
	87	`ticket_subject`,
	88	`ticket_message`
	89	FROM
	90	`tickets`
	91	WHERE
	92	`ticket_from` = ?
	93	AND
	94	`ticket_status` != 0
	95	AND
	96	`ticket_reply` = 0
	97	ORDER BY
	98	`ticket_date` DESC
	99	LIMIT
	100	$start_index, $rows_per_page
101	101	SQL_QUERY;
102	102
…	…
104	104
105	105	if ($rs->RecordCount() == 0) {
106		$tpl->assign(array('TICKETS_LIST' => '',
107		'SCROLL_PREV' => '',
108		'SCROLL_NEXT' => ''));
109
	106	$tpl->assign(array(
	107	'TICKETS_LIST' => '',
	108	'SCROLL_PREV' => '',
	109	'SCROLL_NEXT' => ''
	110	));
110	111	set_page_message(tr('You have no support tickets.'));
111	112	} else {
…	…
114	115	$tpl->assign('SCROLL_PREV', '');
115	116	} else {
116		$tpl->assign(array('SCROLL_PREV_GRAY' => '',
117		'PREV_PSI' => $prev_si));
	117	$tpl->assign(array(
	118	'SCROLL_PREV_GRAY' => '',
	119	'PREV_PSI' => $prev_si
	120	));
118	121	}
119	122	$next_si = $start_index + $rows_per_page;
…	…
122	125	$tpl->assign('SCROLL_NEXT', '');
123	126	} else {
124		$tpl->assign(array('SCROLL_NEXT_GRAY' => '',
125		'NEXT_PSI' => $next_si));
	127	$tpl->assign(array(
	128	'SCROLL_NEXT_GRAY' => '',
	129	'NEXT_PSI' => $next_si
	130	));
126	131	}
127	132
…	…
150	155	}
151	156
152		$tpl->assign(array('SUBJECT' => stripslashes($rs->fields['ticket_subject']),
153		'ID' => $ticket_id,
154		'CONTENT' => ($i % 2 == 0) ? 'content' : 'content2'));
	157	$tpl->assign(array(
	158	'SUBJECT' => stripslashes($rs->fields['ticket_subject']),
	159	'ID' => $ticket_id,
	160	'CONTENT' => ($i % 2 == 0) ? 'content' : 'content2'
	161	));
155	162	$tpl->parse('TICKETS_ITEM', '.tickets_item');
156	163	$rs->MoveNext();
…	…
163	170
164	171	$theme_color = Config::get('USER_INITIAL_THEME');
165		$tpl->assign(array('TR_CLIENT_QUESTION_PAGE_TITLE' => tr('ispCP - Client/Questions & Comments'),
166		'THEME_COLOR_PATH' => "../themes/$theme_color",
167		'THEME_CHARSET' => tr('encoding'),
168		'ISP_LOGO' => get_logo($_SESSION['user_id'])));
	172	$tpl->assign(array(
	173	'TR_CLIENT_QUESTION_PAGE_TITLE' => tr('ispCP - Client/Questions & Comments'),
	174	'THEME_COLOR_PATH' => "../themes/$theme_color",
	175	'THEME_CHARSET' => tr('encoding'),
	176	'ISP_LOGO' => get_logo($_SESSION['user_id'])
	177	));
169	178
170	179	// dynamic page data.
…	…
186	195	check_permissions($tpl);
187	196
188		$tpl->assign(array('TR_SUPPORT_SYSTEM' => tr('Support system'),
189		'TR_SUPPORT_TICKETS' => tr('Support tickets'),
190		'TR_NEW' => ' ',
191		'TR_ACTION' => tr('Action'),
192		'TR_URGENCY' => tr('Priority'),
193		'TR_SUBJECT' => tr('Subject'),
194		'TR_LAST_DATA' => tr('Last reply'),
195		'TR_DELETE_ALL' => tr('Delete all'),
196		'TR_OPEN_TICKETS' => tr('Open tickets'),
197		'TR_CLOSED_TICKETS' => tr('Closed tickets'),
198		'TR_DELETE' => tr('Delete'),
199		'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete', true)
200		)
201		);
	197	$tpl->assign(array(
	198	'TR_SUPPORT_SYSTEM' => tr('Support system'),
	199	'TR_SUPPORT_TICKETS' => tr('Support tickets'),
	200	'TR_STATUS' => tr('Status'),
	201	'TR_NEW' => ' ',
	202	'TR_ACTION' => tr('Action'),
	203	'TR_URGENCY' => tr('Priority'),
	204	'TR_SUBJECT' => tr('Subject'),
	205	'TR_LAST_DATA' => tr('Last reply'),
	206	'TR_DELETE_ALL' => tr('Delete all'),
	207	'TR_OPEN_TICKETS' => tr('Open tickets'),
	208	'TR_CLOSED_TICKETS' => tr('Closed tickets'),
	209	'TR_DELETE' => tr('Delete'),
	210	'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete', true)
	211	));
202	212
203	213	gen_page_message($tpl);

trunk/gui/client/view_ticket.php

r1241	r1250
115	115
116	116	$rs = exec_query($sql, $query, array($ticket_id));
117
	117	if ($rs->RecordCount() == 0){
	118	return;
	119	}
118	120	while (!$rs->EOF) {
119	121	$ticket_id = $rs->fields['ticket_id'];

trunk/gui/include/debug.php

r1246	r1250
40	40	echo htmlentities(print_r($_FILES, true));
41	41	echo '</pre>';
	42	return;
42	43	echo '<font color="#0000FF"><u>Content of <b>$GLOBALS</b>:</u><br /></font>';
43	44	echo '<pre>';

trunk/gui/include/ispcp-db-keys.php

r739	r1250
1	1	<?php
2	2
3		$ispcp_db_pass_key = '~~{KEY}~~';
	3	$ispcp_db_pass_key = 'raOZo2`,oRt5t<2jr[RVRkls"6c&HU/N';
4	4
5		$ispcp_db_pass_iv = '~~{IV}~~';
	5	$ispcp_db_pass_iv = 'YD@qXFzU';
6	6
7	7	?>

trunk/gui/orderpanel/checkout.php

r1244	r1250
89	89
90	90	$rs = exec_query($sql, $query, array($user_id, $plan_id, $date, $domain_name, $fname, $lname, $firm, $zip, $city, $country, $email, $phone, $fax, $street1, $street2, $status));
91		print $sql->ErrorMsg();
	91	// print $sql->ErrorMsg();
92	92	$order_id = $sql->Insert_ID();
93	93	send_order_emails($user_id, $domain_name, $fname, $lname, $email, $order_id);

trunk/gui/reseller/edit_user.php

r1247 r1250

40 40 $theme_color = Config::get('USER_INITIAL_THEME');
41 41
42 $tpl->assign(
43 array(
42 $tpl->assign(array(
44 43<