Development

Navigation

← Previous Change
Next Change →

client

Timestamp:

08/26/08 22:01:11 (3 months ago)

Author:

scitech

Message:

Fixed #1508: Don't show the Member of group line on protected_user_assign.php if no group memberships Fixed #1468: Are you sure you want to delete %s? | custumers domain management Fixed #1503: Debian Etch postfix-tls is a virtual package of postfix Fixed #1485: master.cf in gentoo shouldn't have default of chroot for smtp (thanks pgentoo)

Files:

trunk/gui/client/protected_user_assign.php (modified) (11 diffs)

Legend:

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

trunk/gui/client/protected_user_assign.php

r1327	r1334
31	31	$tpl->define_dynamic('add_button', 'page');
32	32	$tpl->define_dynamic('remove_button', 'page');
	33	$tpl->define_dynamic('in_group', 'page');
	34	$tpl->define_dynamic('not_in_group', 'page');
33	35
34	36	$theme_color = Config::get('USER_INITIAL_THEME');
…	…
43	45	// ** Functions
44	46	function get_htuser_name(&$sql, &$uuser_id, &$dmn_id) {
45		$query = ~~<<<SQL_QUERY~~
46		select
47		uname
48		from
49		htaccess_users
50		where
51		~~dmn_id~~ = ?
52		and
53		id = ?
54		~~SQL_QUERY~~;
	47	$query = "
	48	SELECT
	49	`uname`
	50	FROM
	51	`htaccess_users`
	52	WHERE
	53	`dmn_id` = ?
	54	AND
	55	`id` = ?
	56	";
55	57
56	58	$rs = exec_query($sql, $query, array($dmn_id, $uuser_id));
…	…
80	82	}
81	83	// get groups
82		$query = ~~<<<SQL_QUERY~~
83		select
84		*
85		from
86		htaccess_groups
87		where
88		~~dmn_id~~ = ?
89		~~SQL_QUERY~~;
	84	$query = "
	85	SELECT
	86	*
	87	FROM
	88	`htaccess_groups`
	89	WHERE
	90	`dmn_id` = ?
	91	";
90	92
91	93	$rs = exec_query($sql, $query, array($dmn_id));
…	…
110	112	if ($uuser_id == $members[$i]) {
111	113	$tpl->assign(
112		array('GRP_IN' => $group_name,
	114	array(
	115	'GRP_IN' => $group_name,
113	116	'GRP_IN_ID' => $group_id,
114		)
115		);
	117	)
	118	);
116	119
117	120	$tpl->parse('ALREADY_IN', '.already_in');
…	…
122	125	if ($grp_in !== $group_id) {
123	126	$tpl->assign(
124		array('GRP_NAME' => $group_name,
	127	array(
	128	'GRP_NAME' => $group_name,
125	129	'GRP_ID' => $group_id,
126		)
127		);
	130	)
	131	);
128	132	$tpl->parse('GRP_AVLB', '.grp_avlb');
129	133	$not_added_in ++;
…	…
134	138	// generate add/remove buttons
135	139	if ($added_in < 1) {
136		$tpl->assign('ALREADY_IN', '');
137		$tpl->assign('REMOVE_BUTTON', '');
	140	$tpl->assign('IN_GROUP', '');
138	141	}
139	142	if ($not_added_in < 1) {
140		$tpl->assign('GRP_AVLB', '');
141		$tpl->assign('ADD_BUTTON', '');
	143	$tpl->assign('NOT_IN_GROUP', '');
142	144	}
143	145	}
…	…
149	151	$group_id = $_POST['groups'];
150	152
151		$query = <<<SQL_QUERY
152		select
153		id,
154		ugroup,
155		members
156		from
157		htaccess_groups
158		where
159		dmn_id = ?
160		and
161		id = ?
162		SQL_QUERY;
	153	$query = "
	154	SELECT
	155	`id`,
	156	`ugroup`,
	157	`members`
	158	FROM
	159	`htaccess_groups`
	160	WHERE
	161	`dmn_id` = ?
	162	AND
	163	`id` = ?
	164	";
	165
163	166	$rs = exec_query($sql, $query, array($dmn_id, $group_id));
164	167
…	…
172	175	$change_status = Config::get('ITEM_CHANGE_STATUS');
173	176
174		$update_query = ~~<<<SQL_QUERY~~
175		~~update~~
176		~~htaccess_groups~~
177		~~set~~
178		~~members~~ = ?,
179		~~status~~ = ?
180		~~where~~
181		id = ?
182		~~and~~
183		~~dmn_id~~ = ?
184		~~SQL_QUERY~~;
	177	$update_query = "
	178	UPDATE
	179	`htaccess_groups`
	180	SET
	181	`members` = ?,
	182	`status` = ?
	183	WHERE
	184	`id` = ?
	185	AND
	186	`dmn_id` = ?
	187	";
185	188
186	189	$rs_update = exec_query($sql, $update_query, array($members, $change_status, $group_id, $dmn_id));
…	…
188	191	$change_status = Config::get('ITEM_CHANGE_STATUS');
189	192
190		$query = ~~<<<SQL_QUERY~~
191		~~update~~
192		~~htaccess~~
193		~~set~~
194		~~status~~ = ?
195		~~where~~
196		~~dmn_id~~ = ?
197		~~SQL_QUERY~~;
	193	$query = "
	194	UPDATE
	195	`htaccess`
	196	SET
	197	`status` = ?
	198	WHERE
	199	`dmn_id` = ?
	200	";
198	201
199	202	$rs_update_htaccess = exec_query($sql, $query, array($change_status, $dmn_id));
…	…
212	215	$uuser_id = clean_input($_POST['nadmin_name']);
213	216
214		$query = <<<SQL_QUERY
215		select
216		id,
217		ugroup,
218		members
219		from
220		htaccess_groups
221		where
222		dmn_id = ?
223		and
224		id = ?
225		SQL_QUERY;
	217	$query = "
	218	SELECT
	219	`id`,
	220	`ugroup`,
	221	`members`
	222	FROM
	223	`htaccess_groups`
	224	WHERE
	225	`dmn_id` = ?
	226	AND
	227	`id` = ?
	228	";
	229
226	230	$rs = exec_query($sql, $query, array($dmn_id, $group_id));
227	231
…	…
233	237	$members = preg_replace("/,$/", "", "$members");
234	238
235		$update_query = ~~<<<SQL_QUERY~~
236		~~update~~
237		~~htaccess_groups~~
238		~~set~~
239		~~members~~ = ?
240		~~where~~
241		id = ?
242		~~and~~
243		~~dmn_id~~ = ?
244		~~SQL_QUERY~~;
	239	$update_query = "
	240	UPDATE
	241	`htaccess_groups`
	242	SET
	243	`members` = ?
	244	WHERE
	245	`id` = ?
	246	AND
	247	`dmn_id` = ?
	248	";
245	249
246	250	$rs_update = exec_query($sql, $update_query, array($members, $group_id, $dmn_id));
247	251
248	252	$change_status = Config::get('ITEM_CHANGE_STATUS');
249		$query = ~~<<<SQL_QUERY~~
250		~~update~~
251		~~htaccess~~
252		~~set~~
253		~~status~~ = ?
254		~~where~~
255		~~dmn_id~~ = ?
256		~~SQL_QUERY~~;
	253	$query = "
	254	UPDATE
	255	`htaccess`
	256	SET
	257	`status` = ?
	258	WHERE
	259	`dmn_id` = ?
	260	";
257	261	$rs_update_htaccess = exec_query($sql, $query, array($change_status, $dmn_id));
258	262

Development

Navigation

Changeset 1334 for trunk/gui/client

Legend:

trunk/gui/client/protected_user_assign.php

Download in other formats: