From 8f255f4eb83d428acfdf106502926d126b2699e0 Mon Sep 17 00:00:00 2001 From: jacob Date: Thu, 18 Nov 2010 22:46:46 +0000 Subject: [PATCH] Added an icon for conference management. Added fields in the config for teachers --- db/db.code.version.txt | 2 +- db/db.update.223.sql | 33 +++++++++++++++++++++++++ theme/icons_default/grouped_people.png | Bin 0 -> 2525 bytes theme/icons_default/icons.php | 1 + user.inc.php | 2 +- 5 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 db/db.update.223.sql create mode 100644 theme/icons_default/grouped_people.png diff --git a/db/db.code.version.txt b/db/db.code.version.txt index c200906..5f277ae 100644 --- a/db/db.code.version.txt +++ b/db/db.code.version.txt @@ -1 +1 @@ -222 +223 diff --git a/db/db.update.223.sql b/db/db.update.223.sql new file mode 100644 index 0000000..ae00689 --- /dev/null +++ b/db/db.update.223.sql @@ -0,0 +1,33 @@ +INSERT INTO `config` ( +`var` , +`val` , +`category` , +`type` , +`type_values` , +`ord` , +`description` , +`year` , +`conferences_id` , +`section` , +`conferencetypes` +) +VALUES ( +'teacher_personal_fields', 'phonehome,phonecell,phonework,org,address,city,province,lang', 'Teacher Registration', 'multisel', 'sex=Gender|phonehome=Home Phone|phonework=Work Phone|phonecell=Cell Phone|fax=Fax|org=Organization|birthdate=Birthdate|lang=Preferred Language|address=Address and PostalCode|city=City|province=Province', '500', 'Personal Information to ask for on the Teacher personal information page (in addition to Name and Email)', '-1', '-1', 'conference', 'sciencefair,scienceolympics' +); + +INSERT INTO `config` ( +`var` , +`val` , +`category` , +`type` , +`type_values` , +`ord` , +`description` , +`year` , +`conferences_id` , +`section` , +`conferencetypes` +) +VALUES ( +'teacher_personal_required', 'phonehome,address,city,province', 'Teacher Registration', 'multisel', 'sex=Gender|phonehome=Home Phone|phonework=Work Phone|phonecell=Cell Phone|fax=Fax|org=Organization|birthdate=Birthdate|lang=Preferred Language|address=Address and PostalCode|city=City|province=Province', '600', 'Required Personal Information on the Teacher personal information page (Name and Email is always required)', '-1', '-1', 'conference', 'sciencefair,scienceolympics' +); diff --git a/theme/icons_default/grouped_people.png b/theme/icons_default/grouped_people.png new file mode 100644 index 0000000000000000000000000000000000000000..f395d0338a5bdff7d0ec4d0f9d2c20f291715794 GIT binary patch literal 2525 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 literal 0 HcmV?d00001 diff --git a/theme/icons_default/icons.php b/theme/icons_default/icons.php index 6a71190..c4454dd 100644 --- a/theme/icons_default/icons.php +++ b/theme/icons_default/icons.php @@ -72,5 +72,6 @@ $theme_icons['icons']['new_version_checker']="numbers.png"; $theme_icons['icons']['rollover_fiscal_year']="rollover_fiscal.png"; $theme_icons['icons']['backup_restore']="rebuild.png"; + $theme_icons['icons']['conferences']="grouped_people.png"; ?> diff --git a/user.inc.php b/user.inc.php index 37f6b49..ced39c3 100644 --- a/user.inc.php +++ b/user.inc.php @@ -1173,7 +1173,7 @@ function user_judge_registration_status() { global $config; $now = date('Y-m-d H:i:s'); - if(array_key_exists('judgeregopen', $config['dates'])){ + if(is_array($config['dates']) && array_key_exists('judgeregopen', $config['dates'])){ if($now < $config['dates']['judgeregopen']) return "notopenyet"; if($now > $config['dates']['judgeregclose']) return "closed"; }