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 0000000..f395d03 Binary files /dev/null and b/theme/icons_default/grouped_people.png differ 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"; }