From 8d1d572061afeb9ab491d9afc9ef143aba8faba0 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Tue, 19 Aug 2008 13:04:34 -0400
Subject: [PATCH] Updating userctrl.php

---
 templates/userctrl.tpl | 18 +++++++--------
 userctrl.php           | 52 +++++++++++++++++++++++++++++++++---------
 2 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/templates/userctrl.tpl b/templates/userctrl.tpl
index e855310..3831244 100644
--- a/templates/userctrl.tpl
+++ b/templates/userctrl.tpl
@@ -29,7 +29,7 @@
 				<div class="box-head" style="text-align: <%- $stylevar['left'] %>"><%-T("User Options")%></div>
 
 				<div class="box-mid">
-					<if condition="bugdar::$options['authmethod'] == 'default'">
+					<% if (bugdar::$options['authmethod'] == 'default'): %>
 					<fieldset>
 						<legend><%-T("Display Name")%></legend>
 						<input type="text" name="displayname" value="<%- $userinfo['displayname'] %>" size="25" style="width: 100%" maxlength="250" />
@@ -39,13 +39,13 @@
 					<fieldset>
 						<legend><%-T("Show Email Publicly")%></legend>
 						<input type="radio" name="showemail" value="1"<% if ($userinfo['showemail']): %> checked="checked"<% endif %> /> <%-T("Yes")%>
-						<input type="radio" name="showemail" value="0"<if condition="!$userinfo['showemail']"> checked="checked"<% endif %> /> <%-T("No")%>
+						<input type="radio" name="showemail" value="0"<% if (!$userinfo['showemail']): %> checked="checked"<% endif %> /> <%-T("No")%>
 					</fieldset>
 
 					<fieldset>
 						<legend><%-T("Show Status Colors on Bug Listings")%></legend>
 						<input type="radio" name="showcolors" value="1"<% if ($userinfo['showcolors']): %> checked="checked"<% endif %> /> <%-T("Yes")%>
-						<input type="radio" name="showcolors" value="0"<if condition="!$userinfo['showcolors']"> checked="checked"<% endif %> /> <%-T("No")%>
+						<input type="radio" name="showcolors" value="0"<% if (!$userinfo['showcolors']): %> checked="checked"<% endif %> /> <%-T("No")%>
 					</fieldset>
 
 					<fieldset>
@@ -59,8 +59,8 @@
 					</fieldset>
 
 					<fieldset>
-						<legend>{@"Observe Daylight Savings Time (DST)"}</legend>
-						<input type="checkbox" name="usedst" value="1"<% if ($userinfo['usedst']): %> checked="checked"<% endif %> /> {@"Yes, I'm currently observing DST"}
+						<legend><%-T("Observe Daylight Savings Time (DST)")%></legend>
+						<input type="checkbox" name="usedst" value="1"<% if ($userinfo['usedst']): %> checked="checked"<% endif %> /> <%-T("Yes, I'm currently observing DST")%>
 					</fieldset>
 				</div>
 			</div>
@@ -103,7 +103,7 @@
 					</tr>
 
 					<tr style="text-align: center">
-						<td style="text-align: <%- $stylevar['left'] %>">{@"'Duplicates' field is changed"}</td>
+						<td style="text-align: <%- $stylevar['left'] %>"><%-T("'Duplicates' field is changed")%></td>
 						<td><input type="checkbox" name="emailopts[1][128]"<%- $checked[1][128] %> value="1" /></td>
 						<td><input type="checkbox" name="emailopts[2][128]"<%- $checked[2][128] %> value="1" /></td>
 						<td><input type="checkbox" name="emailopts[4][128]"<%- $checked[4][128] %> value="1" /></td>
@@ -121,7 +121,7 @@
 					</tr>
 
 					<tr style="text-align: center">
-						<td style="text-align: $stylevar[left]"><%-T("A new attachment is added")%></td>
+						<td style="text-align: <%- $stylevar[left] %>"><%-T("A new attachment is added")%></td>
 						<td><input type="checkbox" name="emailopts[1][512]"<%- $checked[1][512] %> value="1" /></td>
 						<td><input type="checkbox" name="emailopts[2][512]"<%- $checked[2][512] %> value="1" /></td>
 						<td><input type="checkbox" name="emailopts[4][512]"<%- $checked[4][512] %> value="1" /></td>
@@ -130,7 +130,7 @@
 					</tr>
 
 					<tr class="altcolor textcenter">
-						<td style="text-align: $stylevar[left]"><%-T("Any other field changes")%></td>
+						<td style="text-align: <%- $stylevar[left] %>"><%-T("Any other field changes")%></td>
 						<td><input type="checkbox" name="emailopts[1][1024]"<%- $checked[1][1024] %> value="1" /></td>
 						<td><input type="checkbox" name="emailopts[2][1024]"<%- $checked[2][1024] %> value="1" /></td>
 						<td><input type="checkbox" name="emailopts[4][1024]"<%- $checked[4][1024] %> value="1" /></td>
@@ -158,7 +158,7 @@
 		</td>
 
 		<td>
-			<if condition="bugdar::$options['authmethod'] == 'default'">
+			<% if (bugdar::$options['authmethod'] == 'default'): %>
 			<!-- password and email -->
 			<div class="box">
 				<div class="box-head" style="text-align: <%- $stylevar['left'] %>">
diff --git a/userctrl.php b/userctrl.php
index 6c05092..3981483 100644
--- a/userctrl.php
+++ b/userctrl.php
@@ -33,8 +33,6 @@ require_once('./global.php');
 require_once('./includes/class_api_error.php');
 require_once('./includes/api_user.php');
 
-APIError(array(new API_Error_Handler($message), 'user_cumulative'));
-
 if (!bugdar::$userinfo['userid'])
 {
 	$message->errorPermission();
@@ -42,7 +40,7 @@ if (!bugdar::$userinfo['userid'])
 
 $userapi = new UserAPI($bugsys);
 $userapi->set('userid',		bugdar::$userinfo['userid']);
-$userapi->set_condition();
+$userapi->setCondition();
 
 $userinfo = bugdar::$userinfo;
 
@@ -210,10 +208,15 @@ if ($_REQUEST['do'] == 'modify')
 	$defaultsortkey = construct_option_select('defaultsortkey', ListSorter::fetch_by_text(false), $userinfo['defaultsortkey']);
 	$defaultsortas = construct_option_select('defaultsortas', ListSorter::fetch_as_text(false), $userinfo['defaultsortas']);
 	
-	foreach ($datef->fetch_timezone_list() AS $value => $label)
+	foreach ($datef->fetch_timezone_list() as $value => $label)
 	{
-		$selected = ($value == $userinfo['timezone']);
-		eval('$tzselect .= "' . $template->fetch('selectoption') . '";');
+		$tpl = new BSTemplate('selectoption');
+		$tpl->vars = array(
+			'value'		=> $value,
+			'label'		=> $label,
+			'selected'	=> ($value == $userinfo['timezone'])
+		);
+		$tzselect .= $tpl->evaluate()->getTemplate();
 	}
 	
 	$checked = array();
@@ -264,15 +267,27 @@ if ($_REQUEST['do'] == 'modify')
 			{
 				$columns["$column"] = bugdar::$options['columnoptions']["$column"];
 			}
-			eval('$columnOptions .= "' . $template->fetch('userctrl_column') . '";');
+			$tpl = new BSTemplate('userctrl_column');
+			$tpl->vars = array(
+				'columns'	=> $columns,
+				'column'	=> $column,
+				'name'		=> $name
+			);
+			$columnOptions .= $tpl->evaluate()->getTemplate();
 		}
 	}
 	else
 	{
 		$columns = $input->in['columnoptions'];
-		foreach (ListSorter::fetch_by_text(false) AS $column => $name)
+		foreach (ListSorter::fetch_by_text(false) as $column => $name)
 		{
-			eval('$columnOptions .= "' . $template->fetch('userctrl_column') . '";');
+			$tpl = new BSTemplate('userctrl_column');
+			$tpl->vars = array(
+				'columns'	=> $columns,
+				'column'	=> $column,
+				'name'		=> $name
+			);
+			$columnOptions .= $tpl->evaluate()->getTemplate();
 		}
 	}
 	
@@ -281,10 +296,25 @@ if ($_REQUEST['do'] == 'modify')
 	$searchesFetch = $db->query("SELECT * FROM " . TABLE_PREFIX . "search WHERE name IS NOT NULL AND userid = " . bugdar::$userinfo['userid']);
 	foreach ($searchesFetch as $search)
 	{
-		eval('$searches .= "' . $template->fetch('userctrl_search') . '";');
+		$tpl = new BSTemplate('userctrl_search');
+		$tpl->vars = array('search' => $search);
+		$searches .= $tpl->evaluate()->getTemplate();
 	}
 	
-	eval('$template->flush("' . $template->fetch('userctrl') . '");');
+	$tpl = new BSTemplate('userctrl');
+	$tpl->vars = array(
+		'checked'			=> $checked,
+		'userinfo'			=> $userinfo,
+		'searches'			=> $searches,
+		'defaultsortkey'	=> $defaultsortkey,
+		'hidestatusesnum'	=> $hidestatusesnum,
+		'hidestatuses'		=> $hidestatuses,
+		'defaultsortas'		=> $defaultsortas,
+		'columnOptions'		=> $columnOptions,
+		'langselect'		=> $langselect,
+		'tzselect'			=> $tzselect
+	);
+	$tpl->evaluate()->flush();
 }
 
 /*=====================================================================*\
-- 
2.22.5