[phpBT-dev] CVS: phpbt/admin user.php,1.36,1.37

[Benjamin C. <bc...@us...>]

Update of /cvsroot/phpbt/phpbt/admin
In directory usw-pr-cvs1:/tmp/cvs-serv3729/admin

Modified Files:
	user.php 
Log Message:
Converting spaces to tabs :)

Index: user.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/admin/user.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- user.php	2002/01/19 16:09:37	1.36
+++ user.php	2002/01/19 16:21:47	1.37
@@ -26,39 +26,39 @@
 include INCLUDE_PATH.'include.php';
 
 function do_form($userid = 0) {
-  global $q, $me, $_pv, $STRING, $now, $u;
+	global $q, $me, $_pv, $STRING, $now, $u;
 
 	$error = '';
-  // Validation
-  if (!EMAIL_IS_LOGIN && !$_pv['flogin'] = trim($_pv['flogin'])) {
-    $error = $STRING['givelogin'];
-  } elseif (!valid_email($_pv['femail'])) {
-    $error = $STRING['giveemail'];
-  } elseif (!$_pv['fpassword'] = trim($_pv['fpassword'])) {
-    $error = $STRING['givepassword'];
-  }
-  if ($error) {
-    list_items($userid, $error);
-    return;
-  }
-  if (!isset($_pv['factive'])) $_pv['factive'] = 0;
-
-  if (EMAIL_IS_LOGIN) {
-    $login = $_pv['femail'];
-  } else {
-    $login = $_pv['flogin'];
-  }
-
-  if (!$userid) {
-    if (ENCRYPT_PASS) $mpassword = md5($_pv['fpassword']);
-    else $mpassword = $_pv['fpassword'];
-    $new_user_id = $q->nextid(TBL_AUTH_USER);
-    $q->query('insert into '.TBL_AUTH_USER
-      ." (user_id, first_name, last_name, login, email, password, active,
-      created_by, created_date, last_modified_by, last_modified_date)
-      values ($new_user_id, '{$_pv['ffirstname']}', '{$_pv['flastname']}',
-      '$login', '{$_pv['femail']}', '$mpassword', {$_pv['factive']}, $u, $now,
-      $u, $now)");
+	// Validation
+	if (!EMAIL_IS_LOGIN && !$_pv['flogin'] = trim($_pv['flogin'])) {
+		$error = $STRING['givelogin'];
+	} elseif (!valid_email($_pv['femail'])) {
+		$error = $STRING['giveemail'];
+	} elseif (!$_pv['fpassword'] = trim($_pv['fpassword'])) {
+		$error = $STRING['givepassword'];
+	}
+	if ($error) {
+		list_items($userid, $error);
+		return;
+	}
+	if (!isset($_pv['factive'])) $_pv['factive'] = 0;
+
+	if (EMAIL_IS_LOGIN) {
+		$login = $_pv['femail'];
+	} else {
+		$login = $_pv['flogin'];
+	}
+
+	if (!$userid) {
+		if (ENCRYPT_PASS) $mpassword = md5($_pv['fpassword']);
+		else $mpassword = $_pv['fpassword'];
+		$new_user_id = $q->nextid(TBL_AUTH_USER);
+		$q->query('insert into '.TBL_AUTH_USER
+			." (user_id, first_name, last_name, login, email, password, active,
+			created_by, created_date, last_modified_by, last_modified_date)
+			values ($new_user_id, '{$_pv['ffirstname']}', '{$_pv['flastname']}',
+			'$login', '{$_pv['femail']}', '$mpassword', {$_pv['factive']}, $u, $now,
+			$u, $now)");
 		// Add to the selected groups
 		if (isset($_pv['fusergroup']) and is_array($_pv['fusergroup']) and
 			$_pv['fusergroup'][0]) {
@@ -73,120 +73,120 @@
 			" (user_id, group_id, created_by, created_date) 
 			select $new_user_id, group_id, $u, $now from ".TBL_AUTH_GROUP.
 			" where group_name = 'User'");
-  } else {
-    if (ENCRYPT_PASS) {
-      $oldpass = $q->grab_field("select password from ".TBL_AUTH_USER
-        ." where user_id = $userid");
-      if ($oldpass != $_pv['fpassword']) {
-        $pquery = "password = '".md5($_pv['fpassword'])."',";
-      } else {
-        $pquery = '';
-      }
-    } else {
-      $pquery = "password = '{$_pv['fpassword']}',";
-    }
-    $q->query("update ".TBL_AUTH_USER." set first_name = '{$_pv['ffirstname']}',
-      last_name = '{$_pv['flastname']}', login = '$login', 
+	} else {
+		if (ENCRYPT_PASS) {
+			$oldpass = $q->grab_field("select password from ".TBL_AUTH_USER
+				." where user_id = $userid");
+			if ($oldpass != $_pv['fpassword']) {
+				$pquery = "password = '".md5($_pv['fpassword'])."',";
+			} else {
+				$pquery = '';
+			}
+		} else {
+			$pquery = "password = '{$_pv['fpassword']}',";
+		}
+		$q->query("update ".TBL_AUTH_USER." set first_name = '{$_pv['ffirstname']}',
+			last_name = '{$_pv['flastname']}', login = '$login', 
 			email = '{$_pv['femail']}', $pquery active = {$_pv['factive']} 
 			where user_id = '$userid'");
 
-    // Update group memberships
-    // Get user's groups (without dropping the user group)
-    $q->query('select ug.group_id from '.TBL_USER_GROUP.' ug left join '
-      .TBL_AUTH_GROUP.' g using (group_id) '
-      ." where user_id = $userid and group_name <> 'User'");
-    while ($group_id = $q->grab_field()) {
-      $user_groups[] = $group_id;
-    }
-    // Compute differences between old and new
-    if (!isset($user_groups) or !is_array($user_groups)) {
-      $user_groups = array();
-    }
-    if (!isset($_pv['fusergroup']) or !is_array($_pv['fusergroup']) or 
+		// Update group memberships
+		// Get user's groups (without dropping the user group)
+		$q->query('select ug.group_id from '.TBL_USER_GROUP.' ug left join '
+			.TBL_AUTH_GROUP.' g using (group_id) '
+			." where user_id = $userid and group_name <> 'User'");
+		while ($group_id = $q->grab_field()) {
+			$user_groups[] = $group_id;
+		}
+		// Compute differences between old and new
+		if (!isset($user_groups) or !is_array($user_groups)) {
+			$user_groups = array();
+		}
+		if (!isset($_pv['fusergroup']) or !is_array($_pv['fusergroup']) or 
 			!$_pv['fusergroup'][0]) {
-      $_pv['fusergroup'] = array();
-    }
+			$_pv['fusergroup'] = array();
+		}
 
-    $remove_from = array_diff($user_groups, $_pv['fusergroup']);
-    $add_to = array_diff($_pv['fusergroup'], $user_groups);
+		$remove_from = array_diff($user_groups, $_pv['fusergroup']);
+		$add_to = array_diff($_pv['fusergroup'], $user_groups);
 
-    if (count($remove_from)) {
-      foreach ($remove_from as $group) {
-        $q->query('delete from '.TBL_USER_GROUP
-          ." where user_id = $userid and group_id = $group");
-      }
-    }
-    if (count($add_to)) {
-      foreach ($add_to as $group) {
-        $q->query("insert into ".TBL_USER_GROUP
-          ." (user_id, group_id, created_by, created_date)
-          values ('$userid' ,'$group', $u, $now)");
-      }
-    }
-  }
-  header("Location: $me?");
+		if (count($remove_from)) {
+			foreach ($remove_from as $group) {
+				$q->query('delete from '.TBL_USER_GROUP
+					." where user_id = $userid and group_id = $group");
+			}
+		}
+		if (count($add_to)) {
+			foreach ($add_to as $group) {
+				$q->query("insert into ".TBL_USER_GROUP
+					." (user_id, group_id, created_by, created_date)
+					values ('$userid' ,'$group', $u, $now)");
+			}
+		}
+	}
+	header("Location: $me?");
 }
 
 function show_form($userid = 0, $error = '') {
-  global $q, $me, $t, $_pv, $STRING;
+	global $q, $me, $t, $_pv, $STRING;
+
 
+	if ($userid && !$error) {
+		$row = $q->grab("select * from ".TBL_AUTH_USER." where user_id = '$userid'");
 
-  if ($userid && !$error) {
-    $row = $q->grab("select * from ".TBL_AUTH_USER." where user_id = '$userid'");
+		// Get user's groups
+		$q->query('select group_id from '.TBL_USER_GROUP." where user_id = {$row['user_id']}");
+		while ($group_id = $q->grab_field()) {
+			$user_groups[] = $group_id;
+		}
 
-    // Get user's groups
-    $q->query('select group_id from '.TBL_USER_GROUP." where user_id = {$row['user_id']}");
-    while ($group_id = $q->grab_field()) {
-      $user_groups[] = $group_id;
-    }
-
-    $t->set_var(array(
-      'action' => $STRING['edit'],
-      'fuserid' => $row['user_id'],
-      'flogin' => $row['login'],
-      'ffirstname' => stripslashes($row['first_name']),
-      'flastname' => stripslashes($row['last_name']),
-      'femail' => $row['email'],
-      'fpassword' => $row['password'],
-      'factive' => $row['active'] ? 'checked' : '',
-      'fusergroup' => build_select('group', $user_groups)
-      ));
-  } else {
-    $t->set_var(array(
-      'action' => $userid ? $STRING['edit'] : $STRING['addnew'],
-      'error' => $error,
-      'fuserid' => $userid,
-      'flogin' => isset($_pv['flogin']) ? $_pv['flogin'] : '',
-      'ffirstname' => isset($_pv['firstname']) ? 
+		$t->set_var(array(
+			'action' => $STRING['edit'],
+			'fuserid' => $row['user_id'],
+			'flogin' => $row['login'],
+			'ffirstname' => stripslashes($row['first_name']),
+			'flastname' => stripslashes($row['last_name']),
+			'femail' => $row['email'],
+			'fpassword' => $row['password'],
+			'factive' => $row['active'] ? 'checked' : '',
+			'fusergroup' => build_select('group', $user_groups)
+			));
+	} else {
+		$t->set_var(array(
+			'action' => $userid ? $STRING['edit'] : $STRING['addnew'],
+			'error' => $error,
+			'fuserid' => $userid,
+			'flogin' => isset($_pv['flogin']) ? $_pv['flogin'] : '',
+			'ffirstname' => isset($_pv['firstname']) ? 
 				stripslashes($_pv['firstname']) : '',
-      'flastname' => isset($_pv['flastname']) ? 
+			'flastname' => isset($_pv['flastname']) ? 
 				stripslashes($_pv['flastname']) : '',
-      'femail' => isset($_pv['femail']) ? $_pv['femail'] : '',
-      'fpassword' => isset($_pv['fpassword']) ? $_pv['fpassword'] : 
+			'femail' => isset($_pv['femail']) ? $_pv['femail'] : '',
+			'fpassword' => isset($_pv['fpassword']) ? $_pv['fpassword'] : 
 				genpassword(10),
-      'factive' => isset($_pv['factive']) ? ($_pv['factive'] ? 'checked' : '')
-        : 'checked',
-      'fusergroup' => build_select('group', (isset($_pv['fusergroup']) ? 
+			'factive' => isset($_pv['factive']) ? ($_pv['factive'] ? 'checked' : '')
+				: 'checked',
+			'fusergroup' => build_select('group', (isset($_pv['fusergroup']) ? 
 				$_pv['fusergroup'] : array()))
-      ));
-  }
+			));
+	}
 
-  // Show the login field only if login is not tied to email address
-  if (EMAIL_IS_LOGIN) {
-    $t->set_var('loginarea', '');
-  } else {
-    $t->parse('loginarea', 'loginentryarea', true);
-  }
+	// Show the login field only if login is not tied to email address
+	if (EMAIL_IS_LOGIN) {
+		$t->set_var('loginarea', '');
+	} else {
+		$t->parse('loginarea', 'loginentryarea', true);
+	}
 }
 
 function list_items($userid = 0, $error = '') {
-  global $me, $q, $t, $_gv, $STRING, $TITLE;
+	global $me, $q, $t, $_gv, $STRING, $TITLE;
 
-  $t->set_file('content', 'userlist.html');
-  $t->set_block('content', 'row', 'rows');
-  $t->set_block('content', 'loginentryarea', 'loginarea');
+	$t->set_file('content', 'userlist.html');
+	$t->set_block('content', 'row', 'rows');
+	$t->set_block('content', 'loginentryarea', 'loginarea');
 
-  if (empty($_gv['order'])) { 
+	if (empty($_gv['order'])) { 
 		$order = 'login'; 
 		$sort = 'asc'; 
 	} else {
@@ -196,53 +196,53 @@
 	
 	$page = isset($_gv['page']) ? $_gv['page'] : 0;
 	
-  $nr = $q->grab_field("select count(*) from ".TBL_AUTH_USER);
+	$nr = $q->grab_field("select count(*) from ".TBL_AUTH_USER);
 
-  list($selrange, $llimit, $npages, $pages) = multipages($nr, $page,
-    "order=$order&sort=$sort");
+	list($selrange, $llimit, $npages, $pages) = multipages($nr, $page,
+		"order=$order&sort=$sort");
 
-  $t->set_var(array(
-    'pages' => '[ '.$pages.' ]',
-    'first' => $llimit+1,
-    'last' => $llimit+$selrange > $nr ? $nr : $llimit+$selrange,
-    'records' => $nr));
-
-  $q->limit_query("select user_id, first_name, last_name,
-    email, login, created_date, active from ".TBL_AUTH_USER
-    ." order by $order $sort", $selrange, $llimit);
-
-  if (!$q->num_rows()) {
-    $t->set_var('rows',"<tr><td>{$STRING['nousers']}</td></tr>");
-    return;
-  }
-
-  $headers = array(
-    'userid' => 'user_id',
-    'name' =>  'last_name',
-    'login' => 'login',
-    'email' => 'email',
-    'password' => 'password',
-    'active' => 'active',
-    'date' => 'created_date');
+	$t->set_var(array(
+		'pages' => '[ '.$pages.' ]',
+		'first' => $llimit+1,
+		'last' => $llimit+$selrange > $nr ? $nr : $llimit+$selrange,
+		'records' => $nr));
+
+	$q->limit_query("select user_id, first_name, last_name,
+		email, login, created_date, active from ".TBL_AUTH_USER
+		." order by $order $sort", $selrange, $llimit);
+
+	if (!$q->num_rows()) {
+		$t->set_var('rows',"<tr><td>{$STRING['nousers']}</td></tr>");
+		return;
+	}
+
+	$headers = array(
+		'userid' => 'user_id',
+		'name' => 'last_name',
+		'login' => 'login',
+		'email' => 'email',
+		'password' => 'password',
+		'active' => 'active',
+		'date' => 'created_date');
 
-  sorting_headers($me, $headers, $order, $sort);
+	sorting_headers($me, $headers, $order, $sort);
 
 	$i = 0;
-  while ($row = $q->grab()) {
-    $t->set_var(array(
-      'bgcolor' => (++$i % 2 == 0) ? '#dddddd' : '#ffffff',
+	while ($row = $q->grab()) {
+		$t->set_var(array(
+			'bgcolor' => (++$i % 2 == 0) ? '#dddddd' : '#ffffff',
 			'trclass' => $i % 2 ? '' : 'alt',
-      'userid' => $row['user_id'],
-      'login' =>  $row['login'],
-      'name' => stripslashes("{$row['first_name']}&nbsp;{$row['last_name']}"),
-      'email' => $row['email'],
-      'active' => $row['active'] ? 'Yes' : 'No',
-      'date' => date(DATE_FORMAT, $row['created_date'])));
-    $t->parse('rows','row',true);
-  }
+			'userid' => $row['user_id'],
+			'login' => $row['login'],
+			'name' => stripslashes("{$row['first_name']}&nbsp;{$row['last_name']}"),
+			'email' => $row['email'],
+			'active' => $row['active'] ? 'Yes' : 'No',
+			'date' => date(DATE_FORMAT, $row['created_date'])));
+		$t->parse('rows','row',true);
+	}
 
-  show_form($userid, $error);
-  $t->set_var('TITLE', $TITLE['user']);
+	show_form($userid, $error);
+	$t->set_var('TITLE', $TITLE['user']);
 }
 
 $t->set_file('wrap','wrap.html');
@@ -250,10 +250,10 @@
 $perm->check('Admin');
 
 if (isset($_gv['op'])) switch($_gv['op']) {
-  case 'add' : list_items(); break;
-  case 'edit' : list_items($_gv['id']); break;
+	case 'add' : list_items(); break;
+	case 'edit' : list_items($_gv['id']); break;
 } elseif(isset($_pv['submit'])) {
-  do_form($_pv['id']);
+	do_form($_pv['id']);
 } else list_items();
 
 $t->pparse('main',array('content', 'wrap', 'main'));