Menu
▾
▴
[phpBT-dev] CVS: phpbt/admin os.php,1.16,1.17 project.php,1.25,1.26 resolution.php,1.17,1.18 severity.php,1.13,1.14 status.php,1.17,1.18 user.php,1.32,1.33
|
From: Benjamin C. <bc...@us...> - 2001-11-22 05:14:36
|
Update of /cvsroot/phpbt/phpbt/admin
In directory usw-pr-cvs1:/tmp/cvs-serv18210
Modified Files:
os.php project.php resolution.php severity.php status.php
user.php
Log Message:
Code cleanup
Index: os.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/admin/os.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- os.php 2001/11/13 03:53:04 1.16
+++ os.php 2001/11/22 05:14:33 1.17
@@ -26,8 +26,10 @@
include INCLUDE_PATH.'include.php';
function do_form($osid = 0) {
- global $q, $me, $fname, $fregex, $fsortorder, $STRING;
+ global $q, $me, $_pv, $STRING;
+ extract($_pv);
+ $error = '';
// Validation
if (!$fname = trim($fname))
$error = $STRING['givename'];
@@ -42,9 +44,9 @@
}
function show_form($osid = 0, $error = '') {
- global $q, $me, $t, $fname, $fregex, $fsortorder, $STRING;
+ global $q, $me, $t, $_pv, $STRING;
- #$t->set_file('content','osform.html');
+ extract($_pv);
if ($osid && !$error) {
$row = $q->grab("select * from ".TBL_OS." where os_id = '$osid'");
$t->set_var(array(
@@ -58,20 +60,29 @@
'action' => $osid ? $STRING['edit'] : $STRING['addnew'],
'error' => $error,
'fosid' => $osid,
- 'fname' => $fname,
- 'fregex' => $fregex,
- 'fsortorder' => $fsortorder));
+ 'fname' => isset($fname) ? $fname : '',
+ 'fregex' => isset($fregex) ? $fregex : '',
+ 'fsortorder' => isset($fsortorder) ? $fsortorder : ''));
}
}
function list_items($osid = 0, $error = '') {
- global $q, $t, $selrange, $order, $sort, $STRING, $TITLE;
+ global $me, $q, $t, $_gv, $STRING, $TITLE;
$t->set_file('content','oslist.html');
$t->set_block('content','row','rows');
- if (!$order) { $order = 'sort_order'; $sort = 'asc'; }
+ if (empty($_gv['order'])) {
+ $order = 'sort_order';
+ $sort = 'asc';
+ } else {
+ $order = $_gv['order'];
+ $sort = $_gv['sort'];
+ }
+
+ $page = isset($_gv['page']) ? $_gv['page'] : 0;
+
$nr = $q->query("select count(*) from ".TBL_OS." where os_id = '$osid' order by $order $sort");
list($selrange, $llimit, $npages, $pages) = multipages($nr,$page,
@@ -99,6 +110,7 @@
sorting_headers($me, $headers, $order, $sort);
+ $i = 0;
while ($row = $q->grab()) {
$t->set_var(array(
'bgcolor' => (++$i % 2 == 0) ? '#dddddd' : '#ffffff',
@@ -118,11 +130,11 @@
$perm->check('Admin');
-if ($op) switch($op) {
+if (isset($_gv['op'])) switch($_gv['op']) {
case 'add' : list_items(); break;
- case 'edit' : list_items($id); break;
-} elseif($submit) {
- do_form($id);
+ case 'edit' : list_items($_gv['id']); break;
+} elseif(isset($_pv['submit'])) {
+ do_form($_pv['id']);
} else list_items();
$t->pparse('main',array('content','wrap','main'));
Index: project.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/admin/project.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- project.php 2001/11/13 03:53:04 1.25
+++ project.php 2001/11/22 05:14:33 1.26
@@ -28,6 +28,7 @@
function save_version($versionid = 0) {
global $q, $me, $_pv, $STRING, $now, $u;
+ $error = '';
// Validation
if (!$_pv['vf_version'] = trim($_pv['vf_version']))
$error['version'] = $STRING['giveversion'];
@@ -66,7 +67,7 @@
$t->set_var(array(
'vf_error' => $error,
'versionid' => $versionid,
- 'vf_version' => $vf_version,
+ 'vf_version' => isset($vf_version) ? $vf_version : '',
'vf_active' => isset($vf_active) && !$vf_active ? '' : ' checked',
'vf_action' => $versionid ? $STRING['edit'] : $STRING['addnew']));
}
@@ -81,6 +82,7 @@
return;
}
+ $i = 0;
while ($row = $q->grab()) {
$t->set_var(array(
'bgcolor' => (++$i % 2 == 0) ? '#dddddd' : '#ffffff',
@@ -97,6 +99,7 @@
function save_component($componentid = 0) {
global $q, $me, $_pv, $u, $STRING, $now;
+ $error = '';
// Validation
if (!$_pv['cf_name'] = trim($_pv['cf_name']))
$error['component'] = $STRING['givename'];
@@ -143,9 +146,9 @@
$t->set_var(array(
'cf_error' => $error,
'componentid' => $componentid,
- 'cf_name' => $cf_name,
- 'cf_description' => $cf_description,
- 'cf_owner' => build_select('owner', $cf_owner),
+ 'cf_name' => isset($cf_name) ? $cf_name : '',
+ 'cf_description' => isset($cf_description) ? $cf_description : '',
+ 'cf_owner' => build_select('owner', (isset($cf_owner) ? $cf_owner : '')),
'cf_active' => (isset($cf_active) and !$cf_active) ? '' : 'checked',
'cf_action' => $componentid ? $STRING['edit'] : $STRING['addnew']));
}
@@ -160,14 +163,14 @@
return;
}
+ $i = 0;
while ($row = $q->grab()) {
$t->set_var(array(
'bgcolor' => (++$i % 2 == 0) ? '#dddddd' : '#ffffff',
'trclass' => $i % 2 ? '' : 'alt',
'compid' => $row['component_id'],
'compname' => $row['component_name'],
- 'compdesc' => stripslashes($row['project_desc']),
- 'owner' => $row['Owner'],
+ 'compdesc' => stripslashes($row['component_desc']),
'compactive' => $row['active'] ? 'Y' : 'N',
'createdby' => $row['created_by'],
'compdate' => date(DATE_FORMAT,$row['created_date']),
@@ -256,8 +259,10 @@
} else {
$t->set_file('content','project-add.html');
}
- show_version($_gv['versionid'], $error['version']);
- show_component($_gv['componentid'], $error['component']);
+ show_version((isset($_gv['versionid']) ? $_gv['versionid'] : 0),
+ (isset($error['version']) ? $error['version'] : ''));
+ show_component((isset($_gv['componentid']) ? $_gv['componentid'] : 0),
+ (isset($error['component']) ? $error['component'] : ''));
}
function list_projects() {
Index: resolution.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/admin/resolution.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- resolution.php 2001/11/13 03:53:04 1.17
+++ resolution.php 2001/11/22 05:14:33 1.18
@@ -26,8 +26,10 @@
include INCLUDE_PATH.'include.php';
function do_form($resolutionid = 0) {
- global $q, $me, $fname, $fdescription, $fsortorder, $STRING;
+ global $q, $me, $_pv, $STRING;
+ extract($_pv);
+ $error = '';
// Validation
if (!$fname = trim($fname))
$error = $STRING['givename'];
@@ -48,8 +50,9 @@
}
function show_form($resolutionid = 0, $error = '') {
- global $q, $me, $t, $fname, $fdescription, $fsortorder, $STRING;
+ global $q, $me, $t, $_pv, $STRING;
+ extract($_pv);
if ($resolutionid && !$error) {
$row = $q->grab("select * from ".TBL_RESOLUTION.
" where resolution_id = '$resolutionid'");
@@ -64,20 +67,29 @@
'action' => $resolutionid ? $STRING['edit'] : $STRING['addnew'],
'error' => $error,
'fresolutionid' => $resolutionid,
- 'fname' => $fname,
- 'fdescription' => $fdescription,
- 'fsortorder' => $fsortorder));
+ 'fname' => isset($fname) ? $fname : '',
+ 'fdescription' => isset($fdescription) ? $fdescription : '',
+ 'fsortorder' => isset($fsortorder) ? $fsortorder : 0));
}
}
function list_items($resolutionid = 0, $error = '') {
- global $q, $t, $selrange, $order, $sort, $STRING, $TITLE;
+ global $me, $q, $t, $STRING, $TITLE, $_gv;
$t->set_file('content','resolutionlist.html');
$t->set_block('content','row','rows');
- if (!$order) { $order = 'sort_order'; $sort = 'asc'; }
+ if (empty($_gv['order'])) {
+ $order = 'sort_order';
+ $sort = 'asc';
+ } else {
+ $order = $_gv['order'];
+ $sort = $_gv['sort'];
+ }
+
+ $page = isset($_gv['page']) ? $_gv['page'] : 0;
+
$nr = $q->query("select count(*) from ".TBL_RESOLUTION.
" where resolution_id = '$resolutionid' order by $order $sort");
@@ -106,6 +118,7 @@
sorting_headers($me, $headers, $order, $sort);
+ $i = 0;
while ($row = $q->grab()) {
$t->set_var(array(
'bgcolor' => (++$i % 2 == 0) ? '#dddddd' : '#ffffff',
@@ -125,11 +138,11 @@
$perm->check('Admin');
-if ($op) switch($op) {
+if (isset($_gv['op'])) switch($_gv['op']) {
case 'add' : list_items(); break;
- case 'edit' : list_items($id); break;
-} elseif($submit) {
- do_form($id);
+ case 'edit' : list_items($_gv['id']); break;
+} elseif(isset($_pv['submit'])) {
+ do_form($_pv['id']);
} else list_items();
$t->pparse('main',array('content','wrap','main'));
Index: severity.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/admin/severity.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- severity.php 2001/11/13 03:53:04 1.13
+++ severity.php 2001/11/22 05:14:33 1.14
@@ -26,8 +26,10 @@
include INCLUDE_PATH.'include.php';
function do_form($severityid = 0) {
- global $q, $me, $fname, $fdescription, $fsortorder, $fcolor, $STRING;
+ global $q, $me, $_pv, $STRING;
+ extract($_pv);
+ $error = '';
// Validation
if (!$fname = trim($fname))
$error = $STRING['givename'];
@@ -65,23 +67,32 @@
'action' => $severityid ? $STRING['edit'] : $STRING['addnew'],
'error' => $error,
'fseverityid' => $severityid,
- 'fname' => $_pv['fname'] ? stripslashes($_pv['fname']) : '',
- 'fdescription' => $_pv['fdescription'] ?
+ 'fname' => isset($_pv['fname']) ? stripslashes($_pv['fname']) : '',
+ 'fdescription' => isset($_pv['fdescription']) ?
stripslashes($_pv['fdescription']) : '',
- 'fsortorder' => $_pv['fsortorder'] ? $_pv['fsortorder'] : '',
- 'fcolor' => $_pv['fcolor'] ? $_pv['fcolor'] : ''
+ 'fsortorder' => isset($_pv['fsortorder']) ? $_pv['fsortorder'] : '',
+ 'fcolor' => isset($_pv['fcolor']) ? $_pv['fcolor'] : ''
));
}
}
function list_items($severityid = 0, $error = '') {
- global $q, $t, $selrange, $order, $sort, $STRING, $TITLE, $me;
+ global $me, $q, $t, $_gv, $STRING, $TITLE;
$t->set_file('content','severitylist.html');
$t->set_block('content','row','rows');
- if (!$order) { $order = 'sort_order'; $sort = 'asc'; }
+ if (empty($_gv['order'])) {
+ $order = 'sort_order';
+ $sort = 'asc';
+ } else {
+ $order = $_gv['order'];
+ $sort = $_gv['sort'];
+ }
+
+ $page = isset($_gv['page']) ? $_gv['page'] : 0;
+
$nr = $q->query("select count(*) from ".TBL_SEVERITY.
" where severity_id = '$severityid' order by $order $sort");
@@ -112,6 +123,7 @@
sorting_headers($me, $headers, $order, $sort);
+ $i = 0;
while ($row = $q->grab()) {
$t->set_var(array(
'bgcolor' => USE_SEVERITY_COLOR ? $row['severity_color'] :
@@ -132,11 +144,11 @@
$perm->check('Admin');
-if ($op) switch($op) {
+if (isset($_gv['op'])) switch($_gv['op']) {
case 'add' : list_items(); break;
- case 'edit' : list_items($id); break;
-} elseif($submit) {
- do_form($id);
+ case 'edit' : list_items($_gv['id']); break;
+} elseif(isset($_pv['submit'])) {
+ do_form($_pv['id']);
} else list_items();
$t->pparse('main',array('content','wrap','main'));
Index: status.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/admin/status.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- status.php 2001/11/13 03:53:04 1.17
+++ status.php 2001/11/22 05:14:33 1.18
@@ -26,8 +26,10 @@
include INCLUDE_PATH.'include.php';
function do_form($statusid = 0) {
- global $q, $me, $fname, $fdescription, $fsortorder, $STRING;
+ global $q, $me, $_pv, $STRING;
+ extract($_pv);
+ $error = '';
// Validation
if (!$fname = trim($fname))
$error = $STRING['givename'];
@@ -48,8 +50,9 @@
}
function show_form($statusid = 0, $error = '') {
- global $q, $me, $t, $fname, $fdescription, $fsortorder, $STRING;
+ global $q, $me, $t, $_pv, $STRING;
+ extract($_pv);
if ($statusid && !$error) {
$row = $q->grab("select * from ".TBL_STATUS.
" where status_id = '$statusid'");
@@ -64,20 +67,29 @@
'action' => $statusid ? $STRING['edit'] : $STRING['addnew'],
'error' => $error,
'fstatusid' => $statusid,
- 'fname' => $fname,
- 'fdescription' => $fdescription,
- 'fsortorder' => $fsortorder));
+ 'fname' => isset($fname) ? $fname : '',
+ 'fdescription' => isset($fdescription) ? $fdescription : '',
+ 'fsortorder' => isset($fsortorder) ? $fsortorder : 0));
}
}
function list_items($statusid = 0, $error = '') {
- global $q, $t, $selrange, $order, $sort, $STRING, $TITLE;
+ global $me, $q, $t, $_gv, $STRING, $TITLE;
$t->set_file('content','statuslist.html');
$t->set_block('content','row','rows');
- if (!$order) { $order = 'sort_order'; $sort = 'asc'; }
+ if (empty($_gv['order'])) {
+ $order = 'sort_order';
+ $sort = 'asc';
+ } else {
+ $order = $_gv['order'];
+ $sort = $_gv['sort'];
+ }
+
+ $page = isset($_gv['page']) ? $_gv['page'] : 0;
+
$nr = $q->query("select count(*) from ".TBL_STATUS.
" where status_id = '$statusid' order by $order $sort");
@@ -106,6 +118,7 @@
sorting_headers($me, $headers, $order, $sort);
+ $i = 0;
while ($row = $q->grab()) {
$t->set_var(array(
'bgcolor' => (++$i % 2 == 0) ? '#dddddd' : '#ffffff',
@@ -125,11 +138,11 @@
$perm->check('Admin');
-if ($op) switch($op) {
+if (isset($_gv['op'])) switch($_gv['op']) {
case 'add' : list_items(); break;
- case 'edit' : list_items($id); break;
-} elseif($submit) {
- do_form($id);
+ case 'edit' : list_items($_gv['id']); break;
+} elseif(isset($_pv['submit'])) {
+ do_form($_pv['id']);
} else list_items();
$t->pparse('main',array('content','wrap','main'));
Index: user.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/admin/user.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- user.php 2001/11/13 03:53:04 1.32
+++ user.php 2001/11/22 05:14:33 1.33
@@ -28,6 +28,7 @@
function do_form($userid = 0) {
global $q, $me, $_pv, $STRING, $now, $u;
+ $error = '';
// Validation
if (!LOGIN_IS_EMAIL && !$_pv['flogin'] = trim($_pv['flogin'])) {
$error = $STRING['givelogin'];
@@ -144,15 +145,19 @@
$t->set_var(array(
'action' => $userid ? $STRING['edit'] : $STRING['addnew'],
'error' => $error,
- 'fuserid' => $_pv['userid'],
- 'flogin' => $_pv['flogin'],
- 'ffirstname' => stripslashes($_pv['firstname']),
- 'flastname' => stripslashes($_pv['flastname']),
- 'femail' => $_pv['femail'],
- 'fpassword' => $_pv['fpassword'] ? $_pv['fpassword'] : genpassword(10),
+ 'fuserid' => $userid,
+ 'flogin' => isset($_pv['flogin']) ? $_pv['flogin'] : '',
+ 'ffirstname' => isset($_pv['firstname']) ?
+ stripslashes($_pv['firstname']) : '',
+ 'flastname' => isset($_pv['flastname']) ?
+ stripslashes($_pv['flastname']) : '',
+ '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', $_pv['fusergroup'])
+ 'fusergroup' => build_select('group', (isset($_pv['fusergroup']) ?
+ $_pv['fusergroup'] : array()))
));
}
@@ -165,13 +170,22 @@
}
function list_items($userid = 0, $error = '') {
- global $me, $q, $t, $selrange, $order, $sort, $STRING, $TITLE, $page;
+ 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');
- if (!$order) { $order = 'login'; $sort = 'asc'; }
+ if (empty($_gv['order'])) {
+ $order = 'login';
+ $sort = 'asc';
+ } else {
+ $order = $_gv['order'];
+ $sort = $_gv['sort'];
+ }
+
+ $page = isset($_gv['page']) ? $_gv['page'] : 0;
+
$nr = $q->grab_field("select count(*) from ".TBL_AUTH_USER);
list($selrange, $llimit, $npages, $pages) = multipages($nr, $page,
@@ -203,6 +217,7 @@
sorting_headers($me, $headers, $order, $sort);
+ $i = 0;
while ($row = $q->grab()) {
$t->set_var(array(
'bgcolor' => (++$i % 2 == 0) ? '#dddddd' : '#ffffff',
@@ -224,11 +239,11 @@
$perm->check('Admin');
-if ($op) switch($op) {
+if (isset($_gv['op'])) switch($_gv['op']) {
case 'add' : list_items(); break;
- case 'edit' : list_items($id); break;
-} elseif($submit) {
- do_form($id);
+ case 'edit' : list_items($_gv['id']); break;
+} elseif(isset($_pv['submit'])) {
+ do_form($_pv['id']);
} else list_items();
$t->pparse('main',array('content', 'wrap', 'main'));
|
