diff --git a/common.inc.php b/common.inc.php
index a153cdee..05c4d0c6 100644
--- a/common.inc.php
+++ b/common.inc.php
@@ -35,6 +35,7 @@ function send_header($title="", $nav=null, $icon=null, $titletranslated=false) {
global $roles;
global $prependdir;
global $conference;
+ global $theme;
//do this so we can use send_header() a little more loosly and not worry about it being sent more than once.
if($HEADER_SENT) return;
@@ -45,8 +46,11 @@ function send_header($title="", $nav=null, $icon=null, $titletranslated=false) {
<? if($title && !$titletranslated) echo i18n($title); else if($title) echo $title; else echo i18n($config['fairname']); ?>
-
-
+\n";
+ }
+?>
@@ -205,6 +209,7 @@ if(is_array($nav)) {
?>
';
}
+ */
if(is_array($_SESSION['roles'])) {
foreach($_SESSION['roles'] AS $roletype) {
$roleid=$roles[$roletype]['id'];
- $q=mysql_query("SELECT * FROM rolestasks WHERE roles_id='$roleid' AND pid=0 ORDER BY task");
+ $q=mysql_query("SELECT * FROM rolestasks WHERE roles_id='$roleid' AND pid=0 AND conferencetype='{$conference['type']}' ORDER BY task");
if(mysql_num_rows($q)==1) {
$setPrimaryNav=true;
}
diff --git a/db/db.code.version.txt b/db/db.code.version.txt
index 485369e4..b35cfafd 100644
--- a/db/db.code.version.txt
+++ b/db/db.code.version.txt
@@ -1 +1 @@
-205
+206
diff --git a/db/db.update.206.sql b/db/db.update.206.sql
new file mode 100644
index 00000000..f8ef7837
--- /dev/null
+++ b/db/db.update.206.sql
@@ -0,0 +1 @@
+ALTER TABLE `rolestasks` ADD `conferencetype` ENUM( 'sciencefair', 'scienceolympics' ) NOT NULL;
diff --git a/super/roletasks.php b/super/roletasks.php
index 4c2bdb92..038acf07 100644
--- a/super/roletasks.php
+++ b/super/roletasks.php
@@ -27,17 +27,17 @@
$level=0;
-function doTree($id,$roleid) {
+function doTree($id,$roleid,$ctype) {
global $level;
global $config;
$level++;
- $q=mysql_query("SELECT * FROM rolestasks WHERE pid=$id AND roles_id='$roleid' ORDER BY ord");
+ $q=mysql_query("SELECT * FROM rolestasks WHERE pid=$id AND roles_id='$roleid' AND conferencetype='".mysql_real_escape_string($ctype)."' ORDER BY ord");
echo "
";
while($r=mysql_fetch_object($q)) {
echo "
id}\">";
//can only delete if there's no children
- $tq=mysql_query("SELECT * FROM rolestasks WHERE pid='$r->id'");
+ $tq=mysql_query("SELECT * FROM rolestasks WHERE pid='$r->id' AND conferencetype='".mysql_real_escape_string($ctype)."'");
if(mysql_num_rows($tq)==0) {
echo "id)\"> ";
}
@@ -57,7 +57,7 @@ function doTree($id,$roleid) {
echo "id}\">";
echo "
\n";
- doTree($r->id,$roleid);
+ doTree($r->id,$roleid,$ctype);
}
$level--;
if($level<4) {
@@ -73,7 +73,8 @@ function doTree($id,$roleid) {
if($_GET['action']=="load") {
if($_GET['roleid']) {
$roleid=intval($_GET['roleid']);
- doTree(0,$roleid);
+ $ctype=trim($_GET['ctype']);
+ doTree(0,$roleid,$ctype);
}
exit;
}
@@ -81,26 +82,29 @@ function doTree($id,$roleid) {
if($_POST['action']=="addtask") {
$pid=intval($_POST['pid']);
$roleid=intval($_POST['roleid']);
+ $ctype=trim($_POST['ctype']);
if($pid==0)
$level=0;
else {
- $q=mysql_query("SELECT * FROM rolestasks WHERE id='$pid'");
+ $q=mysql_query("SELECT * FROM rolestasks WHERE id='$pid' AND conferencetype='".mysql_real_escape_string($ctype)."'");
$r=mysql_fetch_object($q);
$level=$r->level+1;
}
- $q=mysql_query("SELECT MAX(ord) AS o FROM rolestasks WHERE pid='$pid'");
+ $q=mysql_query("SELECT MAX(ord) AS o FROM rolestasks WHERE pid='$pid' AND conferencetype='".mysql_real_escape_string($ctype)."'");
$r=mysql_fetch_object($q);
$ord=$r->o+1;
- print_r($r);
- mysql_query("INSERT INTO rolestasks (pid,roles_id,level,task,ord,link) VALUES (
+ mysql_query("INSERT INTO rolestasks (pid,roles_id,level,task,ord,link,conferencetype) VALUES (
'$pid',
'$roleid',
'$level',
'".mysql_real_escape_string($_POST['task'])."',
'$ord',
- '')");
+ '',
+ '".mysql_real_escape_string($ctype)."'
+ )");
+ echo mysql_error();
exit;
}
@@ -183,31 +187,39 @@ NOT intended for end-user usage. This tool exists only temporarily for develope
![](\"{$config['SFIABDIRECTORY']}/images/16/button_cancel.png\")
";
}
@@ -57,7 +57,7 @@ function doTree($id,$roleid) {
echo "id}\">";
echo " \n";
- doTree($r->id,$roleid);
+ doTree($r->id,$roleid,$ctype);
}
$level--;
if($level<4) {
@@ -73,7 +73,8 @@ function doTree($id,$roleid) {
if($_GET['action']=="load") {
if($_GET['roleid']) {
$roleid=intval($_GET['roleid']);
- doTree(0,$roleid);
+ $ctype=trim($_GET['ctype']);
+ doTree(0,$roleid,$ctype);
}
exit;
}
@@ -81,26 +82,29 @@ function doTree($id,$roleid) {
if($_POST['action']=="addtask") {
$pid=intval($_POST['pid']);
$roleid=intval($_POST['roleid']);
+ $ctype=trim($_POST['ctype']);
if($pid==0)
$level=0;
else {
- $q=mysql_query("SELECT * FROM rolestasks WHERE id='$pid'");
+ $q=mysql_query("SELECT * FROM rolestasks WHERE id='$pid' AND conferencetype='".mysql_real_escape_string($ctype)."'");
$r=mysql_fetch_object($q);
$level=$r->level+1;
}
- $q=mysql_query("SELECT MAX(ord) AS o FROM rolestasks WHERE pid='$pid'");
+ $q=mysql_query("SELECT MAX(ord) AS o FROM rolestasks WHERE pid='$pid' AND conferencetype='".mysql_real_escape_string($ctype)."'");
$r=mysql_fetch_object($q);
$ord=$r->o+1;
- print_r($r);
- mysql_query("INSERT INTO rolestasks (pid,roles_id,level,task,ord,link) VALUES (
+ mysql_query("INSERT INTO rolestasks (pid,roles_id,level,task,ord,link,conferencetype) VALUES (
'$pid',
'$roleid',
'$level',
'".mysql_real_escape_string($_POST['task'])."',
'$ord',
- '')");
+ '',
+ '".mysql_real_escape_string($ctype)."'
+ )");
+ echo mysql_error();
exit;
}
@@ -183,31 +187,39 @@ NOT intended for end-user usage. This tool exists only temporarily for develope