";
- echo i18n("Note: Deleting judges from this list only deactivates the judge for this year's fair. To completely delete a judge, use the 'Manage Judges' page");
- echo " ";
- echo " ";
- echo i18n("There are %1 total active judges.",array($num),array("the number of judges"));
- echo " ";
- echo i18n("There are %1 complete judges.",array($completeyes),array("the number of judges"));
- echo " ";
- echo i18n("There are %1 incomplete judges.",array($completeno),array("the number of judges"));
- echo " ";
- echo " ";
- echo " ";
-
- send_footer();
-?>
diff --git a/admin/judges_manager.php b/admin/judges_manager.php
deleted file mode 100644
index 233fcd2..0000000
--- a/admin/judges_manager.php
+++ /dev/null
@@ -1,100 +0,0 @@
-
- Copyright (C) 2005 James Grant
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public
- License as published by the Free Software Foundation, version 2.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; see the file COPYING. If not, write to
- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
-*/
-?>
- 'committee_main.php',
- 'Administration' => 'admin/index.php',
- 'Judges' => 'admin/judges.php') );
-
-?>
-
-
-");
- if(isset($_GET['show_what'])) {
- $_SESSION['judgesmanager_show_what']=$_GET['show_what'];
- }
- if($_SESSION['judgesmanager_show_what']) {
- $show_what = $_SESSION['judgesmanager_show_what'];
- } else {
- $show_what = "cy_complete";
- }
- print("");
-
-// echo i18n("Note: Deleting a judge from this screen only unlinks them from the current fairyear");
-
- $editor = new TableEditor('judge');
-
-// $editor->setDebug(true);
-
- switch($show_what) {
- case "all":
- $editor->setOption('judges_show_what', 'all');
- break;
- case "cy_active":
- $editor->setOption('judges_show_what', 'current_year_active');
- break;
- case "cy_complete":
- $editor->setOption('judges_show_what', 'current_year_complete');
- break;
- }
-
- $editor->execute();
-
-
- send_footer();
-?>
diff --git a/admin/user_editor_window.php b/admin/user_editor_window.php
new file mode 100644
index 0000000..8fb8498
--- /dev/null
+++ b/admin/user_editor_window.php
@@ -0,0 +1,100 @@
+
+ Copyright (C) 2005 James Grant
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation, version 2.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+ the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+*/
+?>
+ array(
+ 'name' => 'Personal',
+ 'types' => array('student','judge','committee','volunteer'),
+ 'file' => '../user_personal.php',
+ ),
+ 'judgeother' => array(
+ 'name' => 'Judge Other',
+ 'types' => array('judge'),
+ 'file' => '../judge_other.php',
+ ),
+ 'judgeexpertise' => array(
+ 'name' => 'Expertise',
+ 'types' => array('judge'),
+ 'file' => '../judge_expertise.php',
+ ),
+ 'judgesa' => array(
+ 'name' => 'Special Awards',
+ 'types' => array('judge'),
+ 'file' => '../judge_special_awards.php',
+ ),
+ 'volunteerpos' => array(
+ 'name' => 'Volunteer Positions',
+ 'types' => array('volunteer'),
+ 'file' => '../volunteer_position.php',
+ ),
+
+ );
+
+$selected = $_GET['tab'];
+if(!array_key_exists($selected, $tabs)) $selected = 'personal';
+
+$id = $_GET['id'];
+
+$u = user_load($id);
+send_popup_header(i18n("User Editor").": {$u['name']}");
+
+?>
+
+';
+foreach($tabs as $k=>$t) {
+ $i = array_intersect($t['types'], $u['types']);
+ if(count($i) == 0) continue;
+ $sel = ($selected == $k) ? 'htabsel' : '';
+ $href = "$PHP_SELF?id=$id&tab=$k";
+ echo "
';
+
+unset($_SESSION['embed']);
+unset($_SESSION['embed_edit_id']);
+unset($_SESSION['embed_submit_url']);
+
+$icon_path = $config['SFIABDIRECTORY']."/images/16/";
+$icon_exitension = $config['icon_extension'];
+
+
+ send_popup_footer();
+?>
diff --git a/admin/user_list.php b/admin/user_list.php
new file mode 100644
index 0000000..7dd36a9
--- /dev/null
+++ b/admin/user_list.php
@@ -0,0 +1,225 @@
+
+ Copyright (C) 2005 James Grant
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation, version 2.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+ the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+*/
+?>
+ 'committee_main.php',
+ 'Administration' => 'admin/index.php')
+ );
+?>
+
+
+";
+ echo "- ".i18n('Hide Display Options')."";
+
+ echo "";
+
+ echo "";
+
+ echo " ";
+
+ /* Grab a list of users */
+ $w = array();
+ foreach($show_types as $t) {
+ $w [] = "users.types LIKE '%$t%'";
+ }
+ $where_types = "AND (".join(" OR ", $w).")";
+
+ $where_complete = "";
+ if($show_complete == 'yes') {
+ foreach($show_types as $t) {
+ $where_complete .= "AND ({$t}_complete='yes' OR {$t}_complete IS NULL) ";
+ }
+ }
+
+ if($show_year == 'current')
+ $where_year = "AND year={$config['FAIRYEAR']}";
+
+ echo "
";
+ $querystr="SELECT
+ *
+ FROM
+ users
+ LEFT JOIN `users_committee` ON `users_committee`.`users_id`=`users`.`id`
+ LEFT JOIN `users_judge` ON `users_judge`.`users_id`=`users`.`id`
+ LEFT JOIN `users_volunteer` ON `users_volunteer`.`users_id`=`users`.`id`
+ LEFT JOIN `users_fair` ON `users_fair`.`users_id`=`users`.`id`
+ LEFT JOIN `users_sponsor` ON `users_sponsor`.`users_id`=`users`.`id`
+ WHERE
+ users.deleted='no'
+ $where_year
+ $where_types
+ $where_complete
+ ORDER BY
+ lastname ASC,
+ firstname ASC,
+ year DESC";
+ $q=mysql_query($querystr);
+ echo mysql_error();
+// echo $querystr;
+ $num=mysql_num_rows($q);
+ echo i18n("Listing %1 people total. See the bottom for breakdown of by complete status",array($num));
+
+ echo mysql_error();
+ echo "
";
diff --git a/user_personal.php b/user_personal.php
index c3dedc8..0bff036 100644
--- a/user_personal.php
+++ b/user_personal.php
@@ -71,20 +71,26 @@
/* See if there is an edit request */
- $eid = intval($_GET['edit']);
+ if($_SESSION['embed_edit_id'])
+ $eid = $_SESSION['embed_edit_id'];
+ else
+ $eid = intval($_GET['edit']);
- if($eid != 0) {
- /* There is an edit request, the user must be:
+ /* Force them to edit themselves if no eid found */
+ if($eid == 0) $eid = $_SESSION['users_id'];
+
+ if($_SESSION['users_id'] != $eid) {
+ /* There is an edit request for someone other than the logged in user,
+ * the user must be:
* - on the committee
* - with admin access */
user_auth_required('committee', 'admin');
- $u = user_load($eid);
-
+ $ext_editor = true;
} else {
- /* Else, force them to edit themselves */
- $eid = false;
- $u = user_load($_SESSION['users_id']);
+ /* Else, they are just editing themselves */
+ $ext_editor = false;
}
+ $u = user_load($eid);
/* Load the fields the user can edit, and theones that are required */
@@ -166,10 +172,15 @@
}
//send the header
- if($eid == false) {
- $type = $_SESSION['users_type'];
- $m = ($type == 'committee') ? 'Committee' : $user_what[$type];
- send_header("Personal Information",
+ if($_SESSION['embed'] == true) {
+ echo " ";
+ display_messages();
+ echo "
".i18n("Personal Information")."
";
+ echo " ";
+ } else if($ext_editor == true) {
+ $type = $_SESSION['users_type'];
+ $m = ($type == 'committee') ? 'Committee' : $user_what[$type];
+ send_header("Personal Information",
array("$m Main" => "{$type}_main.php")
,"edit_profile"
);
@@ -183,7 +194,7 @@
);
} else {
send_header("Personal Information for {$u['firstname']} {$u['lastname']}",
- array("Committee Main" => "committee_main.php")
+ array("Judge Registration" => "judge_main.php")
,"edit_profile"
);
}
@@ -196,7 +207,7 @@
}
if(count($errorfields)) {
echo error(i18n('Information will not be saved until the above errors are corrected'));
- } else if ($eid == false) {
+ } else if ($ext_editor == false) {
//output the current status
$newstatus=user_personal_info_status($u);
if($newstatus!='complete')
@@ -248,11 +259,12 @@ function item($user, $fname, $subtext='')
}
- $eidstr = '';
- if($eid != false) {
- $eidstr="?edit=$eid";
+ if($_SESSION['embed'] != true) {
+ echo "
![](\"".$config['SFIABDIRECTORY']."/images/16/button_cancel.".$config['icon_extension']."\")
";
- echo "