Commit 41f3030e authored by François Jacquet's avatar François Jacquet
Browse files

$_REQUEST[modname] => $_REQUEST['modname']

parent 51bd7562
......@@ -14,7 +14,7 @@ function HackingLog()
$headers .= 'Reply-To:'.$RosarioNotifyAddress . "\r\n" . 'X-Mailer:PHP/' . phpversion();
$params = '-f '.$RosarioNotifyAddress;
@mail($RosarioNotifyAddress,'HACKING ATTEMPT',"INSERT INTO HACKING_LOG (HOST_NAME,IP_ADDRESS,LOGIN_DATE,VERSION,PHP_SELF,DOCUMENT_ROOT,SCRIPT_NAME,MODNAME,QUERY_STRING,USERNAME) values('$_SERVER[SERVER_NAME]','$_SERVER[REMOTE_ADDR]','".date('Y-m-d')."','$RosarioVersion','$_SERVER[PHP_SELF]','$_SERVER[DOCUMENT_ROOT]','$_SERVER[SCRIPT_NAME]','$_REQUEST[modname]','$_SERVER[QUERY_STRING]','".User('USERNAME')."')", $headers, $params);
@mail($RosarioNotifyAddress,'HACKING ATTEMPT',"INSERT INTO HACKING_LOG (HOST_NAME,IP_ADDRESS,LOGIN_DATE,VERSION,PHP_SELF,DOCUMENT_ROOT,SCRIPT_NAME,MODNAME,QUERY_STRING,USERNAME) values('".$_SERVER['SERVER_NAME']."','".$_SERVER['REMOTE_ADDR']."','".date('Y-m-d')."','".$RosarioVersion."','".$_SERVER['PHP_SELF']."','".$_SERVER['DOCUMENT_ROOT']."','".$_SERVER['SCRIPT_NAME']."','".$_REQUEST['modname']."','".$_SERVER['QUERY_STRING']."','".User('USERNAME')."')", $headers, $params);
}
exit;
}
......
......@@ -74,8 +74,8 @@ if(isset($_REQUEST['student_id']) && $_REQUEST['student_id']!='new')
AND s.STUDENT_ID='".$_REQUEST['student_id']."' AND ('$date' BETWEEN s.START_DATE AND s.END_DATE OR s.END_DATE IS NULL)
ORDER BY p.SORT_ORDER"),$functions);
$columns = array('PERIOD_TITLE'=>_('Period'),'COURSE'=>_('Course'),'ATTENDANCE_CODE'=>_('Attendance Code'),'ATTENDANCE_TEACHER_CODE'=>_('Teacher\'s Entry'),'ATTENDANCE_REASON'=>_('Comments'));
echo "<FORM action=Modules.php?modname=$_REQUEST[modname]&modfunc=student&student_id=$_REQUEST[student_id] method=POST>";
DrawHeader(ProgramTitle(),'<INPUT type=submit value=Update>');
echo '<FORM action="Modules.php?modname='.$_REQUEST['modname'].'&modfunc=student&student_id='.$_REQUEST['student_id'].'" method="POST">';
DrawHeader(ProgramTitle(),'<INPUT type="submit" value="'._('Update').'" />');
DrawHeader(PrepareDate($date,'_date'));
ListOutput($schedule_RET,$columns,_('Course'),_('Courses'));
echo '</FORM>';
......@@ -140,8 +140,8 @@ else
$extra['columns_after']['PERIOD_'.$period['PERIOD_ID']] = $period['SHORT_NAME'];
}
echo "<FORM action=Modules.php?modname=$_REQUEST[modname] method=POST>";
DrawHeader(ProgramTitle(),'<INPUT type=submit value=Update>');
echo '<FORM action="Modules.php?modname='.$_REQUEST['modname'].'" method="POST">';
DrawHeader(ProgramTitle(),'<INPUT type="submit" value="'._('Update').'" />');
if($REQ_codes)
{
......@@ -153,8 +153,8 @@ else
else
$code_pulldowns = _makeCodeSearch();
if(UserStudentID())
$current_student_link = "<A HREF=Modules.php?modname=$_REQUEST[modname]&modfunc=student&month_date=$_REQUEST[month_date]&day_date=$_REQUEST[day_date]&year_date=$_REQUEST[year_date]&student_id=".UserStudentID().">Current Student</A></TD><TD>";
DrawHeader(PrepareDate($date,'_date'),'<TABLE><TR><TD>'.$current_student_link.button('add','',"# onclick='javascript:addHTML(\"".str_replace('"','\"',_makeCodeSearch())."\",\"code_pulldowns\"); return false;'").'</TD><TD><DIV id=code_pulldowns>'.$code_pulldowns.'</DIV></TD></TR></TABLE>');
$current_student_link = '<A HREF="Modules.php?modname='.$_REQUEST['modname'].'&modfunc=student&month_date='.$_REQUEST['month_date'].'&day_date='.$_REQUEST['day_date'].'&year_date='.$_REQUEST['year_date'].'&student_id='.UserStudentID().'">'._('Current Student').'</A></TD><TD>';
DrawHeader(PrepareDate($date,'_date'),'<TABLE><TR><TD>'.$current_student_link.button('add','',"# onclick='javascript:addHTML(\"".str_replace('"','\"',_makeCodeSearch())."\",\"code_pulldowns\"); return false;'").'</TD><TD><DIV id="code_pulldowns">'.$code_pulldowns.'</DIV></TD></TR></TABLE>');
$_REQUEST['search_modfunc'] = 'list';
Search('student_id',$extra);
......
......@@ -97,10 +97,10 @@ if(empty($_REQUEST['modfunc']))
$attendance_codes_RET = DBGet($QI,array('TITLE'=>'_makeTextInput','SHORT_NAME'=>'_makeTextInput','SORT_ORDER'=>'_makeTextInput','TYPE'=>'_makeSelectInput','STATE_CODE'=>'_makeSelectInput','DEFAULT_CODE'=>'_makeCheckBoxInput'));
}
$tabs = array(array('title'=>_('Attendance'),'link'=>"Modules.php?modname=$_REQUEST[modname]&table=0"));
$tabs = array(array('title'=>_('Attendance'),'link'=>'Modules.php?modname='.$_REQUEST['modname'].'&table=0'));
$categories_RET = DBGet(DBQuery("SELECT ID,TITLE FROM ATTENDANCE_CODE_CATEGORIES WHERE SYEAR='".UserSyear()."' AND SCHOOL_ID='".UserSchool()."'"));
foreach($categories_RET as $category)
$tabs[] = array('title'=>$category['TITLE'],'link'=>"Modules.php?modname=$_REQUEST[modname]&table=".$category['ID']);
$tabs[] = array('title'=>$category['TITLE'],'link'=>'Modules.php?modname='.$_REQUEST['modname'].'&table='.$category['ID']);
if($_REQUEST['table']!='new')
{
......@@ -116,10 +116,10 @@ if(empty($_REQUEST['modfunc']))
$link['add']['html'] = array('TITLE'=>_makeTextInput('','TITLE'),'SHORT_NAME'=>_makeTextInput('','SHORT_NAME'),'SORT_ORDER'=>_makeTextInput('','SORT_ORDER'),'TYPE'=>_makeSelectInput('','TYPE'),'DEFAULT_CODE'=>_makeCheckBoxInput('','DEFAULT_CODE'));
if($_REQUEST['table']=='0')
$link['add']['html']['STATE_CODE'] = _makeSelectInput('','STATE_CODE');
$link['remove']['link'] = "Modules.php?modname=$_REQUEST[modname]&modfunc=remove&table=$_REQUEST[table]";
$link['remove']['link'] = 'Modules.php?modname='.$_REQUEST['modname'].'&modfunc=remove&table='.$_REQUEST['table'];
$link['remove']['variables'] = array('id'=>'ID');
$tabs[] = array('title'=>button('add','','',14),'link'=>"Modules.php?modname=$_REQUEST[modname]&table=new");
$tabs[] = array('title'=>button('add','','',14),'link'=>'Modules.php?modname='.$_REQUEST['modname'].'&table=new');
}
else
{
......@@ -128,10 +128,10 @@ if(empty($_REQUEST['modfunc']))
$LO_columns = array('TITLE'=>_('Title'),'SORT_ORDER'=>_('Sort Order'));
$link['add']['html'] = array('TITLE'=>_makeTextInput('','TITLE'),'SORT_ORDER'=>_makeTextInput('','SORT_ORDER'));
$link['remove']['link'] = "Modules.php?modname=$_REQUEST[modname]&modfunc=remove&table=new";
$link['remove']['link'] = 'Modules.php?modname='.$_REQUEST['modname'].'&modfunc=remove&table=new';
$link['remove']['variables'] = array('id'=>'ID');
$tabs[] = array('title'=>button('add','','',14),'link'=>"Modules.php?modname=$_REQUEST[modname]&table=new");
$tabs[] = array('title'=>button('add','','',14),'link'=>'Modules.php?modname='.$_REQUEST['modname'].'&table=new');
}
$LO_ret = DBGet(DBQuery($sql),$functions);
......@@ -142,8 +142,7 @@ if(empty($_REQUEST['modfunc']))
if(isset($error)) echo $error;
//modif Francois: css WPadmin
// echo '<span class="center">'.WrapTabs($tabs,"Modules.php?modname=$_REQUEST[modname]&table=$_REQUEST[table]").'</span>';
$LO_options = array('count'=>false,'download'=>false,'search'=>false,'header'=>WrapTabs($tabs,"Modules.php?modname=$_REQUEST[modname]&table=$_REQUEST[table]"));
$LO_options = array('count'=>false,'download'=>false,'search'=>false,'header'=>WrapTabs($tabs,'Modules.php?modname='.$_REQUEST['modname'].'&table='.$_REQUEST['table']));
// ListOutput($LO_ret,$LO_columns,'.','.',$link,array(),array('count'=>false,'download'=>false,'search'=>false));
ListOutput($LO_ret,$LO_columns,'.','.',$link,array(),$LO_options);
......
......@@ -46,8 +46,8 @@ if($_REQUEST['period_id'])
{
$extra['SELECT'] .= ",(SELECT count(*) FROM ATTENDANCE_PERIOD ap,ATTENDANCE_CODES ac
WHERE ac.ID=ap.ATTENDANCE_CODE AND (ac.STATE_CODE='A' OR ac.STATE_CODE='H') AND ap.STUDENT_ID=ssm.STUDENT_ID
AND ap.PERIOD_ID='$_REQUEST[period_id]'
AND ap.SCHOOL_DATE BETWEEN '$start_date' AND '$end_date' AND ac.SYEAR=ssm.SYEAR) AS STATE_ABS";
AND ap.PERIOD_ID='".$_REQUEST['period_id']."'
AND ap.SCHOOL_DATE BETWEEN '".$start_date."' AND '".$end_date."' AND ac.SYEAR=ssm.SYEAR) AS STATE_ABS";
$extra['columns_after']['STATE_ABS'] = _('State Abs');
$codes_RET = DBGet(DBQuery("SELECT ID,TITLE FROM ATTENDANCE_CODES WHERE SYEAR='".UserSyear()."' AND SCHOOL_ID='".UserSchool()."' AND TABLE_NAME='0' AND (DEFAULT_CODE!='Y' OR DEFAULT_CODE IS NULL)"));
......@@ -56,8 +56,8 @@ if($_REQUEST['period_id'])
foreach($codes_RET as $code)
{
$extra['SELECT'] .= ",(SELECT count(*) FROM ATTENDANCE_PERIOD ap,ATTENDANCE_CODES ac
WHERE ac.ID=ap.ATTENDANCE_CODE AND ac.ID='$code[ID]' AND ap.PERIOD_ID='$_REQUEST[period_id]' AND ap.STUDENT_ID=ssm.STUDENT_ID
AND ap.SCHOOL_DATE BETWEEN '$start_date' AND '$end_date') AS ABS_$code[ID]";
WHERE ac.ID=ap.ATTENDANCE_CODE AND ac.ID='".$code['ID']."' AND ap.PERIOD_ID='".$_REQUEST['period_id']."' AND ap.STUDENT_ID=ssm.STUDENT_ID
AND ap.SCHOOL_DATE BETWEEN '".$start_date."' AND '".$end_date."') AS ABS_".$code['ID'];
$extra['columns_after']["ABS_$code[ID]"] = $code['TITLE'];
}
}
......@@ -66,11 +66,11 @@ else
{
$extra['SELECT'] = ",(SELECT COALESCE((sum(STATE_VALUE-1)*-1),0.0) FROM ATTENDANCE_DAY ad
WHERE ad.STUDENT_ID=ssm.STUDENT_ID
AND ad.SCHOOL_DATE BETWEEN '$start_date' AND '$end_date' AND ad.SYEAR=ssm.SYEAR) AS STATE_ABS";
AND ad.SCHOOL_DATE BETWEEN '".$start_date."' AND '".$end_date."' AND ad.SYEAR=ssm.SYEAR) AS STATE_ABS";
//modif Francois: add translation
$extra['columns_after']['STATE_ABS'] = _('Days Absent');
}
$extra['link']['FULL_NAME']['link'] = "Modules.php?modname=$_REQUEST[modname]&day_start=$_REQUEST[day_start]&day_end=$_REQUEST[day_end]&month_start=$_REQUEST[month_start]&month_end=$_REQUEST[month_end]&year_start=$_REQUEST[year_start]&year_end=$_REQUEST[year_end]&period_id=$_REQUEST[period_id]";
$extra['link']['FULL_NAME']['link'] = 'Modules.php?modname='.$_REQUEST['modname'].'&day_start='.$_REQUEST['day_start'].'&day_end='.$_REQUEST['day_end'].'&month_start='.$_REQUEST['month_start'].'&month_end='.$_REQUEST['month_end'].'&year_start='.$_REQUEST['year_start'].'&year_end='.$_REQUEST['year_end'].'&period_id='.$_REQUEST['period_id'];
$extra['link']['FULL_NAME']['variables'] = array('student_id'=>'STUDENT_ID');
//if((!$_REQUEST['search_modfunc'] || $_ROSARIO['modules_search']) && !$_REQUEST['student_id'])
// $extra['new'] = true;
......@@ -87,7 +87,7 @@ if(UserStudentID())
DrawHeader($name_RET[1]['FULL_NAME']);
$PHP_tmp_SELF = PreparePHP_SELF();
$absences_RET = DBGet(DBQuery("SELECT ap.STUDENT_ID,ap.PERIOD_ID,ap.SCHOOL_DATE,ac.SHORT_NAME,ac.STATE_CODE,ad.STATE_VALUE,ad.COMMENT AS OFFICE_COMMENT,ap.COMMENT AS TEACHER_COMMENT FROM ATTENDANCE_PERIOD ap,ATTENDANCE_DAY ad,ATTENDANCE_CODES ac WHERE ap.STUDENT_ID=ad.STUDENT_ID AND ap.SCHOOL_DATE=ad.SCHOOL_DATE AND ap.ATTENDANCE_CODE=ac.ID AND (ac.DEFAULT_CODE!='Y' OR ac.DEFAULT_CODE IS NULL) AND ap.STUDENT_ID='".UserStudentID()."' AND ap.SCHOOL_DATE BETWEEN '$start_date' AND '$end_date' AND ad.SYEAR='".UserSyear()."' ORDER BY ap.SCHOOL_DATE"),array(),array('SCHOOL_DATE','PERIOD_ID'));
$absences_RET = DBGet(DBQuery("SELECT ap.STUDENT_ID,ap.PERIOD_ID,ap.SCHOOL_DATE,ac.SHORT_NAME,ac.STATE_CODE,ad.STATE_VALUE,ad.COMMENT AS OFFICE_COMMENT,ap.COMMENT AS TEACHER_COMMENT FROM ATTENDANCE_PERIOD ap,ATTENDANCE_DAY ad,ATTENDANCE_CODES ac WHERE ap.STUDENT_ID=ad.STUDENT_ID AND ap.SCHOOL_DATE=ad.SCHOOL_DATE AND ap.ATTENDANCE_CODE=ac.ID AND (ac.DEFAULT_CODE!='Y' OR ac.DEFAULT_CODE IS NULL) AND ap.STUDENT_ID='".UserStudentID()."' AND ap.SCHOOL_DATE BETWEEN '".$start_date."' AND '".$end_date."' AND ad.SYEAR='".UserSyear()."' ORDER BY ap.SCHOOL_DATE"),array(),array('SCHOOL_DATE','PERIOD_ID'));
foreach($absences_RET as $school_date=>$absences)
{
$i++;
......
......@@ -148,14 +148,12 @@ echo $note;
$LO_columns = array('FULL_NAME'=>_('Student'),'STUDENT_ID'=>sprintf(_('%s ID'),Config('NAME')),'GRADE_ID'=>_('Grade Level')) + $columns;
//$tabs[] = array('title'=>'Attendance','link'=>"Modules.php?modname=$_REQUEST[modname]&table=0&month_date=$_REQUEST[month_date]&day_date=$_REQUEST[day_date]&year_date=$_REQUEST[year_date]");
//$categories_RET = DBGet(DBQuery("SELECT ID,TITLE FROM ATTENDANCE_CODE_CATEGORIES WHERE SYEAR='".UserSyear()."' AND SCHOOL_ID='".UserSchool()."'"));
foreach($categories_RET as $category)
$tabs[] = array('title'=>ParseMLField($category['TITLE']),'link'=>"Modules.php?modname=$_REQUEST[modname]&table=$category[ID]&month_date=$_REQUEST[month_date]&day_date=$_REQUEST[day_date]&year_date=$_REQUEST[year_date]");
$tabs[] = array('title'=>ParseMLField($category['TITLE']),'link'=>'Modules.php?modname='.$_REQUEST['modname'].'&table='.$category['ID'].'&month_date='.$_REQUEST['month_date'].'&day_date='.$_REQUEST['day_date'].'&year_date='.$_REQUEST['year_date']);
echo '<BR />';
if(count($categories_RET))
$LO_options = array('download'=>false,'search'=>false,'header'=>WrapTabs($tabs,"Modules.php?modname=$_REQUEST[modname]&table=$_REQUEST[table]&month_date=$_REQUEST[month_date]&day_date=$_REQUEST[day_date]&year_date=$_REQUEST[year_date]"));
$LO_options = array('download'=>false,'search'=>false,'header'=>WrapTabs($tabs,'Modules.php?modname='.$_REQUEST['modname'].'&table='.$_REQUEST['table'].'&month_date='.$_REQUEST['month_date'].'&day_date='.$_REQUEST['day_date'].'&year_date='.$_REQUEST['year_date']));
else
$LO_options = array();
......
......@@ -111,9 +111,9 @@ $extra['new'] = true;
//$extra['force_search'] = true;
$extra['singular'] = _('Referral');
$extra['plural'] = _('Referrals');
$extra['link']['FULL_NAME']['link'] = "Modules.php?modname=$_REQUEST[modname]";
$extra['link']['FULL_NAME']['link'] = 'Modules.php?modname='.$_REQUEST['modname'];
$extra['link']['FULL_NAME']['variables'] = array('referral_id'=>'ID');
$extra['link']['remove']['link'] = "Modules.php?modname=$_REQUEST[modname]&modfunc=remove";
$extra['link']['remove']['link'] = 'Modules.php?modname='.$_REQUEST['modname'].'&modfunc=remove';
$extra['link']['remove']['variables'] = array('id'=>'ID');
if($_REQUEST['search_modfunc']=='list' && $_REQUEST['student_header']=='true')
......
......@@ -69,7 +69,7 @@ if($_REQUEST['modfunc']=='remove' && AllowEdit())
{
if(DeletePrompt(_('Activity')))
{
DBQuery("DELETE FROM ELIGIBILITY_ACTIVITIES WHERE ID='$_REQUEST[id]'");
DBQuery("DELETE FROM ELIGIBILITY_ACTIVITIES WHERE ID='".$_REQUEST['id']."'");
unset($_REQUEST['modfunc']);
}
}
......@@ -82,10 +82,10 @@ if($_REQUEST['modfunc']!='remove')
$columns = array('TITLE'=>_('Title'),'START_DATE'=>_('Begins'),'END_DATE'=>_('Ends'));
$link['add']['html'] = array('TITLE'=>makeTextInput('','TITLE'),'START_DATE'=>makeDateInput('','START_DATE'),'END_DATE'=>makeDateInput('','END_DATE'));
$link['remove']['link'] = "Modules.php?modname=$_REQUEST[modname]&modfunc=remove";
$link['remove']['link'] = 'Modules.php?modname='.$_REQUEST['modname'].'&modfunc=remove';
$link['remove']['variables'] = array('id'=>'ID');
echo '<FORM action="Modules.php?modname='.$_REQUEST[modname].'&modfunc=update" method="POST">';
echo '<FORM action="Modules.php?modname='.$_REQUEST['modname'].'&modfunc=update" method="POST">';
DrawHeader('',SubmitButton(_('Save')));
ListOutput($activities_RET,$columns,'Activity','Activities',$link);
echo '<span class="center">'.SubmitButton(_('Save')).'</span>';
......
......@@ -105,7 +105,7 @@ if(UserStudentID() && !$_REQUEST['modfunc'])
$activities[$value['ID']] = $value['TITLE'];
}
$link['remove']['link'] = "Modules.php?modname=$_REQUEST[modname]&modfunc=remove&start_date=$_REQUEST[start_date]";
$link['remove']['link'] = 'Modules.php?modname='.$_REQUEST['modname'].'&modfunc=remove&start_date='.$_REQUEST['start_date'];
$link['remove']['variables'] = array('activity_id'=>'ACTIVITY_ID');
//modif Francois: css WPadmin
// $link['add']['html']['TITLE'] = '<TABLE class="cellpadding-0 cellspacing-0"><TR><TD>'.SelectInput('','new_activity','',$activities).'</TD><TD><INPUT type=submit value="'._('Add').'"></TD></TR></TABLE>';
......
......@@ -33,7 +33,7 @@ $staff_RET = DBGet(DBQuery("SELECT fst.TRANSACTION_ID,fst.STAFF_ID,fst.SYEAR,(SE
//echo '<pre>'; var_dump($students_RET); echo '</pre>';
//echo '<pre>'; var_dump($users_RET); echo '</pre>';
echo '<FORM action="Modules.php?modname='.$_REQUEST[modname].'&modfunc=update" method="POST">';
echo '<FORM action="Modules.php?modname='.$_REQUEST['modname'].'&modfunc=update" method="POST">';
DrawHeader('',SubmitButton(_('Save')));
$columns = array('TRANSACTION_ID'=>_('ID'),'ACCOUNT_ID'=>_('Account ID'),'SYEAR'=>_('School Year'),'FULL_NAME'=>_('Student'),'STUDENTS'=>_('Students'),'SCHOOL_ID'=>_('School'));
ListOutput($students_RET,$columns,'Student Transaction w/o School','Student Transactions w/o School',false,array(),array('save'=>false,'search'=>false));
......@@ -54,14 +54,12 @@ function _students($value,$column)
function _make_school($value,$column)
{ global $THIS_RET,$schools_select;
return SelectInput($value,"student[$THIS_RET[TRANSACTION_ID]]",'',$schools_select[$THIS_RET['SYEAR']]);
//function SelectInput($value,$name,$title='',$options,$allow_na=_('N/A'),$extra='',$div=true)
return SelectInput($value,'student['.$THIS_RET['TRANSACTION_ID'].']','',$schools_select[$THIS_RET['SYEAR']]);
}
function _make_staff_school($value,$column)
{ global $THIS_RET,$schools_select;
return SelectInput($value,"staff[$THIS_RET[TRANSACTION_ID]]",'',$schools_select[$THIS_RET['SYEAR']]);
//function SelectInput($value,$name,$title='',$options,$allow_na=_('N/A'),$extra='',$div=true)
return SelectInput($value,'staff['.$THIS_RET['TRANSACTION_ID'].']','',$schools_select[$THIS_RET['SYEAR']]);
}
?>
......@@ -28,8 +28,8 @@ else
}
$header = '<TABLE class="cellpadding-0 cellspacing-0" style="height:14px;"><TR>';
//modif Francois: remove DrawTab params
$header .= '<TD style="width:10px;"></TD><TD>'.DrawTab(_('Students'),"Modules.php?modname=$_REQUEST[modname]&day_date=$_REQUEST[day_date]&month_date=$_REQUEST[month_date]&year_date=$_REQUEST[year_date]&type=student").'</TD>';
$header .= '<TD style="width:10px;"></TD><TD>'.DrawTab(_('Users'), "Modules.php?modname=$_REQUEST[modname]&day_date=$_REQUEST[day_date]&month_date=$_REQUEST[month_date]&year_date=$_REQUEST[year_date]&type=staff").'</TD>';
$header .= '<TD style="width:10px;"></TD><TD>'.DrawTab(_('Students'),'Modules.php?modname='.$_REQUEST['modname'].'&day_date='.$_REQUEST['day_date'].'&month_date='.$_REQUEST['month_date'].'&year_date='.$_REQUEST['year_date'].'&type=student').'</TD>';
$header .= '<TD style="width:10px;"></TD><TD>'.DrawTab(_('Users'),'Modules.php?modname='.$_REQUEST['modname'].'&day_date='.$_REQUEST['day_date'].'&month_date='.$_REQUEST['month_date'].'&year_date='.$_REQUEST['year_date'].'&type=staff').'</TD>';
$header .= '<TD style="width:10px;"></TD></TR></TABLE>';
DrawHeader(($_SESSION['FSA_type']=='staff' ? _('User') : _('Student')).' '.ProgramTitle(),(User('PROFILE')=='student'?'':'<TABLE style="background-color:#ffffff;"><TR><TD>'.$header.'</TD></TR></TABLE>'));
......@@ -38,7 +38,7 @@ if($_REQUEST['search_modfunc']=='list')
{
$PHP_tmp_SELF = PreparePHP_SELF();
echo '<FORM action="'.$PHP_tmp_SELF.'" method="POST">';
DrawHeader(PrepareDate($date,'_date').' : <INPUT type=submit value='._('Go').'>');
DrawHeader(PrepareDate($date,'_date').' : <INPUT type="submit" value="'._('Go').'" />');
echo '</FORM>';
include('modules/Food_Service/'.($_REQUEST['type']=='staff' ? 'Users' : 'Students').'/BalanceReport.php');
......
......@@ -145,10 +145,10 @@ else
$tabs = array();
foreach($menus_RET as $id=>$meal)
$tabs[] = array('title'=>$meal[1]['TITLE'],'link'=>"Modules.php?modname=$_REQUEST[modname]&menu_id=$id&month=$_REQUEST[month]&year=$_REQUEST[year]");
$tabs[] = array('title'=>$meal[1]['TITLE'],'link'=>'Modules.php?modname='.$_REQUEST['modname'].'&menu_id=$id&month='.$_REQUEST['month'].'&year='.$_REQUEST['year']);
$extra = array('save'=>false,'search'=>false,
'header'=>WrapTabs($tabs,"Modules.php?modname=$_REQUEST[modname]&menu_id=$_REQUEST[menu_id]&month=$_REQUEST[month]&year=$_REQUEST[year]"));
'header'=>WrapTabs($tabs,'Modules.php?modname='.$_REQUEST['modname'].'&menu_id='.$_REQUEST['menu_id'].'&month='.$_REQUEST['month'].'&year='.$_REQUEST['year']));
$singular = sprintf(_('%s Day'), $menus_RET[$_REQUEST['menu_id']][1]['TITLE']);
$plural = sprintf(_('%s Days'), $menus_RET[$_REQUEST['menu_id']][1]['TITLE']);
......
......@@ -41,21 +41,21 @@ if((!$_REQUEST['cat_id'] || !$categories_RET[$_REQUEST['menu_id']][$_REQUEST['ca
$meals = array();
foreach($menus_RET as $id=>$menu)
$meals[] = array('title'=>$menu[1]['TITLE'],'link'=>"Modules.php?modname=$_REQUEST[modname]&menu_id=$id");
$meals[] = array('title'=>$menu[1]['TITLE'],'link'=>'Modules.php?modname='.$_REQUEST['modname'].'&menu_id='.$id);
$cats = array();
//modif Francois: fix error Warning: Invalid argument supplied for foreach()
if (isset($categories_RET[$_REQUEST['menu_id']]))
{
foreach($categories_RET[$_REQUEST['menu_id']] as $category_id=>$category)
$cats[] = array('title'=>$category[1]['TITLE'],'link'=>"Modules.php?modname=$_REQUEST[modname]&cat_id=$category_id");
$cats[] = array('title'=>$category[1]['TITLE'],'link'=>'Modules.php?modname='.$_REQUEST['modname'].'&cat_id='.$category_id);
}
$items_RET = DBGet(DBQuery("SELECT *,(SELECT ICON FROM FOOD_SERVICE_ITEMS WHERE ITEM_ID=fsmi.ITEM_ID) AS ICON FROM FOOD_SERVICE_MENU_ITEMS fsmi WHERE MENU_ID='$_REQUEST[menu_id]' AND CATEGORY_ID='$_REQUEST[cat_id]' ORDER BY (SELECT SORT_ORDER FROM FOOD_SERVICE_CATEGORIES WHERE CATEGORY_ID=fsmi.CATEGORY_ID),SORT_ORDER"));
echo '<BR />';
echo '<span class="center">'.WrapTabs($meals,"Modules.php?modname=$_REQUEST[modname]&menu_id=$_REQUEST[menu_id]").'</span>';
echo '<span class="center">'.WrapTabs($meals,'Modules.php?modname='.$_REQUEST['modname'].'&menu_id='.$_REQUEST['menu_id']).'</span>';
if(count($items_RET))
{
......@@ -79,5 +79,5 @@ if(count($items_RET))
echo '</TABLE>';
}
//modif Francois: remove WrapTabs params
echo '<span class="center">'.WrapTabs($cats,"Modules.php?modname=$_REQUEST[modname]&cat_id=$_REQUEST[cat_id]").'</span>';
?>
echo '<span class="center">'.WrapTabs($cats,'Modules.php?modname='.$_REQUEST['modname'].'&cat_id='.$_REQUEST['cat_id']).'</span>';
?>
\ No newline at end of file
......@@ -134,7 +134,7 @@ if(empty($_REQUEST['modfunc']))
$tabs = array();
foreach($menus_RET as $id=>$menu)
$tabs[] = array('title'=>$menu[1]['TITLE'],'link'=>"Modules.php?modname=$_REQUEST[modname]&tab_id=$id");
$tabs[] = array('title'=>$menu[1]['TITLE'],'link'=>'Modules.php?modname='.$_REQUEST['modname'].'&tab_id='.$id);
if($_REQUEST['tab_id']!='new')
{
......@@ -154,11 +154,11 @@ if(empty($_REQUEST['modfunc']))
$LO_columns = array('ITEM_ID'=>_('Menu Item'),'ICON'=>_('Icon'),'CATEGORY_ID'=>_('Category'),'DOES_COUNT'=>_('Include in Counts'),'SORT_ORDER'=>_('Sort Order'));
$link['add']['html'] = array('ITEM_ID'=>makeSelectInput('','ITEM_ID'),'CATEGORY_ID'=>makeSelectInput('','CATEGORY_ID'),'DOES_COUNT'=>makeCheckboxInput('','DOES_COUNT'),'SORT_ORDER'=>makeTextInput('','SORT_ORDER'));
$link['remove']['link'] = "Modules.php?modname=$_REQUEST[modname]&modfunc=remove&tab_id=$_REQUEST[tab_id]";
$link['remove']['link'] = 'Modules.php?modname='.$_REQUEST['modname'].'&modfunc=remove&tab_id='.$_REQUEST['tab_id'];
$link['remove']['variables'] = array('menu_item_id'=>'MENU_ITEM_ID');
$link['add']['html']['remove'] = button('add');
$tabs[] = array('title'=>button('add','','',14),'link'=>"Modules.php?modname=$_REQUEST[modname]&tab_id=new");
$tabs[] = array('title'=>button('add','','',14),'link'=>'Modules.php?modname='.$_REQUEST['modname'].'&tab_id=new');
//modif Francois: add translation
$singular = sprintf(_('%s Item'), $menus_RET[$_REQUEST['tab_id']][1]['TITLE']);
$plural = sprintf(_('%s Items'), $menus_RET[$_REQUEST['tab_id']][1]['TITLE']);
......@@ -189,11 +189,11 @@ if(empty($_REQUEST['modfunc']))
}
$link['add']['html'] = array('DESCRIPTION'=>makeTextInput('','DESCRIPTION'),'SHORT_NAME'=>makeTextInput('','SHORT_NAME'),'ICON'=>makeSelectInput('','ICON'),'SORT_ORDER'=>makeTextInput('','SORT_ORDER'),'PRICE'=>makeTextInput('','PRICE'),'PRICE_REDUCED'=>makeTextInput('','PRICE_REDUCED'),'PRICE_FREE'=>makeTextInput('','PRICE_FREE'),'PRICE_STAFF'=>makeTextInput('','PRICE_STAFF'));
$link['remove']['link'] = "Modules.php?modname=$_REQUEST[modname]&modfunc=remove&tab_id=$_REQUEST[tab_id]";
$link['remove']['link'] = 'Modules.php?modname='.$_REQUEST['modname'].'&modfunc=remove&tab_id='.$_REQUEST['tab_id'];
$link['remove']['variables'] = array('item_id'=>'ITEM_ID');
$link['add']['html']['remove'] = button('add');
$tabs[] = array('title'=>button('add','','',14),'link'=>"Modules.php?modname=$_REQUEST[modname]&tab_id=new");
$tabs[] = array('title'=>button('add','','',14),'link'=>'Modules.php?modname='.$_REQUEST['modname'].'&tab_id=new');
}
$LO_ret = DBGet(DBQuery($sql),$functions);
......@@ -206,7 +206,7 @@ if(empty($_REQUEST['modfunc']))
if(isset($error)) echo ErrorMessage($error);
$extra = array('save'=>false,'search'=>false,
'header'=>WrapTabs($tabs,"Modules.php?modname=$_REQUEST[modname]&tab_id=$_REQUEST[tab_id]"));
'header'=>WrapTabs($tabs,'Modules.php?modname='.$_REQUEST['modname'].'&tab_id='.$_REQUEST['tab_id']));
if($_REQUEST['tab_id']!='new')
ListOutput($LO_ret,$LO_columns,$singular,$plural,$link,array(),$extra);
else
......
......@@ -134,7 +134,7 @@ if($_REQUEST['type_select']=='sales')
foreach($types_totals[''] as $key=>$value)
if($value==0)
unset($types_columns[$key]);
$LO_types[] = array(array('TYPE'=>'<b>'._('Totals').'</b>','ELLIGIBLE'=>'<b>'.number_format($users_totals['']['ELLIGIBLE'],1).'</b>','DAYS_POSSIBLE'=>'<b>'.number_format($users_totals['']['DAYS']/$users_totals['']['ELLIGIBLE'],1).'</b>','TOTAL_ELLIGIBLE'=>'<b>'.$users_totals['']['DAYS'].'</b>','PARTICIPATED'=>'<b>'.$users_totals['']['PARTICIPATED'].'</b>','TOTAL'=>'<b>'.number_format($total,2).'</b>') + array_map('bold_format',$types_totals['']));
$LO_types[] = array(array('TYPE'=>'<b>'._('Totals').'</b>','ELLIGIBLE'=>'<b>'.number_format($users_totals['']['ELLIGIBLE'],1).'</b>','DAYS_POSSIBLE'=>'<b>'.number_format((!empty($users_totals['']['ELLIGIBLE']) ? $users_totals['']['DAYS']/$users_totals['']['ELLIGIBLE'] : 0),1).'</b>','TOTAL_ELLIGIBLE'=>'<b>'.$users_totals['']['DAYS'].'</b>','PARTICIPATED'=>'<b>'.$users_totals['']['PARTICIPATED'].'</b>','TOTAL'=>'<b>'.number_format($total,2).'</b>') + array_map('bold_format',$types_totals['']));
unset($LO_types[0]);
$LO_columns = array('TYPE'=>_('Type'),'DISCOUNT'=>_('Discount')) + $users_columns + $types_columns + array('TOTAL'=>_('Total'));
}
......@@ -175,10 +175,10 @@ echo '<BR />';
$tabs = array();
foreach($menus_RET as $id=>$menu)
$tabs[] = array('title'=>$menu[1]['TITLE'],'link'=>"Modules.php?modname=$_REQUEST[modname]&menu_id=$id&day_start=$_REQUEST[day_start]&month_start=$_REQUEST[month_start]&year_start=$_REQUEST[year_start]&day_end=$_REQUEST[day_end]&month_end=$_REQUEST[month_end]&year_end=$_REQUEST[year_end]&type_select=$_REQUEST[type_select]");
$tabs[] = array('title'=>$menu[1]['TITLE'],'link'=>'Modules.php?modname='.$_REQUEST['modname'].'&menu_id='.$id.'&day_start='.$_REQUEST['day_start'].'&month_start='.$_REQUEST['month_start'].'&year_start='.$_REQUEST['year_start'].'&day_end='.$_REQUEST['day_end'].'&month_end='.$_REQUEST['month_end'].'&year_end='.$_REQUEST['year_end'].'&type_select='.$_REQUEST['type_select']);
$LO_options = array('count'=>false,'download'=>false,'search'=>false,
'header'=>WrapTabs($tabs,"Modules.php?modname=$_REQUEST[modname]&menu_id=$_REQUEST[menu_id]&day_start=$_REQUEST[day_start]&month_start=$_REQUEST[month_start]&year_start=$_REQUEST[year_start]&day_end=$_REQUEST[day_end]&month_end=$_REQUEST[month_end]&year_end=$_REQUEST[year_end]&type_select=$_REQUEST[type_select]"));
'header'=>WrapTabs($tabs,'Modules.php?modname='.$_REQUEST['modname'].'&menu_id='.$_REQUEST['menu_id'].'&day_start='.$_REQUEST['day_start'].'&month_start='.$_REQUEST['month_start'].'&year_start='.$_REQUEST['year_start'].'&day_end='.$_REQUEST['day_end'].'&month_end='.$_REQUEST['month_end'].'&year_end='.$_REQUEST['year_end'].'&type_select='.$_REQUEST['type_select']));
ListOutput($LO_types,$LO_columns,'.','.',array(),array(array('')),$LO_options);
echo '</FORM>';
......
......@@ -119,7 +119,7 @@ if(empty($_REQUEST['modfunc']))
$tabs = array();
foreach($menus_RET as $id=>$menu)
$tabs[] = array('title'=>$menu[1]['TITLE'],'link'=>"Modules.php?modname=$_REQUEST[modname]&tab_id=$id");
$tabs[] = array('title'=>$menu[1]['TITLE'],'link'=>'Modules.php?modname='.$_REQUEST['modname'].'&tab_id='.$id);
if($_REQUEST['tab_id']!='new')
{
......@@ -129,11 +129,11 @@ if(empty($_REQUEST['modfunc']))
$LO_columns = array('TITLE'=>sprintf(_('%s Category'),$menus_RET[$_REQUEST['tab_id']][1]['TITLE']),'SORT_ORDER'=>_('Sort Order'));
$link['add']['html'] = array('TITLE'=>makeTextInput('','TITLE'),'SORT_ORDER'=>makeTextInput('','SORT_ORDER'));
$link['remove']['link'] = "Modules.php?modname=$_REQUEST[modname]&modfunc=remove&tab_id=$_REQUEST[tab_id]&category_id=$_REQUEST[category_id]";
$link['remove']['link'] = 'Modules.php?modname='.$_REQUEST['modname'].'&modfunc=remove&tab_id='.$_REQUEST['tab_id'].'&category_id='.$_REQUEST['category_id'];
$link['remove']['variables'] = array('category_id'=>'CATEGORY_ID');
$link['add']['html']['remove'] = button('add');
$tabs[] = array('title'=>button('add','','',14),'link'=>"Modules.php?modname=$_REQUEST[modname]&tab_id=new");
$tabs[] = array('title'=>button('add','','',14),'link'=>'Modules.php?modname='.$_REQUEST['modname'].'&tab_id=new');
$singular = sprintf(_('%s Category'), $menus_RET[$_REQUEST['tab_id']][1]['TITLE']);
$plural = sprintf(_('%s Categories'), $menus_RET[$_REQUEST['tab_id']][1]['TITLE']);
}
......@@ -144,11 +144,11 @@ if(empty($_REQUEST['modfunc']))
$LO_columns = array('TITLE'=>_('Meal'),'SORT_ORDER'=>_('Sort Order'));
$link['add']['html'] = array('TITLE'=>makeTextInput('','TITLE'),'SORT_ORDER'=>makeTextInput('','SORT_ORDER'));
$link['remove']['link'] = "Modules.php?modname=$_REQUEST[modname]&modfunc=remove&tab_id=new";
$link['remove']['link'] = 'Modules.php?modname='.$_REQUEST['modname'].'&modfunc=remove&tab_id=new';
$link['remove']['variables'] = array('menu_id'=>'MENU_ID');
$link['add']['html']['remove'] = button('add');
$tabs[] = array('title'=>button('add','','',14),'link'=>"Modules.php?modname=$_REQUEST[modname]&tab_id=new");
$tabs[] = array('title'=>button('add','','',14),'link'=>'Modules.php?modname='.$_REQUEST['modname'].'&tab_id=new');
}
$LO_ret = DBGet(DBQuery($sql),$functions);
......@@ -159,7 +159,7 @@ if(empty($_REQUEST['modfunc']))
if(isset($error)) echo $error;
$extra = array('save'=>false,'search'=>false,
'header'=>WrapTabs($tabs,"Modules.php?modname=$_REQUEST[modname]&tab_id=$_REQUEST[tab_id]"));
'header'=>WrapTabs($tabs,'Modules.php?modname='.$_REQUEST['modname'].'&tab_id='.$_REQUEST['tab_id']));
if($_REQUEST['tab_id']!='new')
ListOutput($LO_ret,$LO_columns,$singular,$plural,$link,array(),$extra);
else
......
......@@ -84,7 +84,7 @@ if(!$_REQUEST['modfunc'] && UserStudentID())
// find other students associated with the same account
$xstudents = DBGet(DBQuery("SELECT s.STUDENT_ID,s.FIRST_NAME||' '||s.LAST_NAME AS FULL_NAME FROM STUDENTS s,FOOD_SERVICE_STUDENT_ACCOUNTS fssa WHERE fssa.ACCOUNT_ID='".$student['ACCOUNT_ID']."' AND s.STUDENT_ID=fssa.STUDENT_ID AND s.STUDENT_ID!='".UserStudentID()."'".($_REQUEST['include_inactive']?'':" AND exists(SELECT '' FROM STUDENT_ENROLLMENT WHERE STUDENT_ID=s.STUDENT_ID AND SYEAR='".UserSyear()."' AND (START_DATE<=CURRENT_DATE AND (END_DATE IS NULL OR CURRENT_DATE<=END_DATE)))")));
echo '<FORM action="Modules.php?modname='.$_REQUEST[modname].'&modfunc=update" method="POST">';
echo '<FORM action="Modules.php?modname='.$_REQUEST['modname'].'&modfunc=update" method="POST">';
DrawHeader('<label>'.CheckBoxOnclick('include_inactive').' '._('Include Inactive Students in Shared Account').'</label>',SubmitButton(_('Save')));
......
......@@ -125,7 +125,7 @@ if(UserStudentID() && !$_REQUEST['modfunc'])
}
unset($LO_ret[0]);
$link['remove'] = array('link'=>"Modules.php?modname=$_REQUEST[modname]&modfunc=remove&menu_id=$_REQUEST[menu_id]",
$link['remove'] = array('link'=>'Modules.php?modname='.$_REQUEST['modname'].'&modfunc=remove&menu_id='.$_REQUEST['menu_id'],
'variables'=>array('id'=>'SALE_ID'));
//modif Francois: css WPadmin
// $link['add']['html'] = array('DESCRIPTION'=>'<TABLE class="cellpadding-0 cellspacing-0"><TR><TD>'.SelectInput('','item_sn','',$items).'</TD></TR></TABLE>','ICON'=>'<TABLE class="cellpadding-0 cellspacing-0"><TR><TD><INPUT type=submit value='._('Add').'></TD></TR></TABLE>','remove'=>button('add'));
......@@ -134,10 +134,10 @@ if(UserStudentID() && !$_REQUEST['modfunc'])
$tabs = array();
foreach($menus_RET as $id=>$menu)
$tabs[] = array('title'=>$menu[1]['TITLE'],'link'=>"Modules.php?modname=$_REQUEST[modname]&menu_id=$id");
$tabs[] = array('title'=>$menu[1]['TITLE'],'link'=>'Modules.php?modname='.$_REQUEST['modname'].'&menu_id='.$id);
$extra = array('save'=>false,'search'=>false,
'header'=>WrapTabs($tabs,"Modules.php?modname=$_REQUEST[modname]&menu_id=$_REQUEST[menu_id]"));
'header'=>WrapTabs($tabs,'Modules.php?modname='.$_REQUEST['modname'].'&menu_id='.$_REQUEST['menu_id']));
echo '<BR />';
echo '<FORM action="Modules.php?modname='.$_REQUEST['modname'].'&modfunc=add&menu_id='.$_REQUEST['menu_id'].'" method="POST">';
......
......@@ -81,7 +81,7 @@ switch($day)
if(mb_strpos($days,$day)===false)
{
echo '<FORM action="Modules.php?modname='.$_REQUEST[modname].'&table='.$_REQUEST[table].'" method="POST">';
echo '<FORM action="Modules.php?modname='.$_REQUEST['modname'].'&table='.$_REQUEST['table'].'" method="POST">';
DrawHeader(PrepareDate($date,'_date',false,array('submit'=>true)));
echo '</FORM>';
ErrorMessage(array(_('This period does not meet on the selected date.')),'fatal');
......@@ -149,10 +149,10 @@ $LO_columns = array('DESCRIPTION'=>_('Item'),'COUNT'=>_('Count'));
{
$tabs = array();
foreach($menus_RET as $id=>$meal)
$tabs[] = array('title'=>$meal[1]['TITLE'],'link'=>"Modules.php?modname=$_REQUEST[modname]&menu_id=$id&day_date=$_REQUEST[day_date]&month_date=$_REQUEST[month_date]&year_date=$_REQUEST[year_date]");
$tabs[] = array('title'=>$meal[1]['TITLE'],'link'=>'Modules.php?modname='.$_REQUEST['modname'].'&menu_id='.$id.'&day_date='.$_REQUEST['day_date'].'&month_date='.$_REQUEST['month_date'].'&year_date='.$_REQUEST['year_date']);
echo '<BR />';
echo '<span class="center">'.WrapTabs($tabs,"Modules.php?modname=$_REQUEST[modname]&menu_id=$_REQUEST[menu_id]&day_date=$_REQUEST[day_date]&month_date=$_REQUEST[month_date]&year_date=$_REQUEST[year_date]").'</span>';
echo '<span class="center">'.WrapTabs($tabs,'Modules.php?modname='.$_REQUEST['modname'].'&menu_id='.$_REQUEST['menu_id'].'&day_date='.$_REQUEST['day_date'].'&month_date='.$_REQUEST['month_date'].'&year_date='.$_REQUEST['year_date']).'</span>';
$extra = array('count'=>false,'download'=>false,'search'=>false);
}
else
......
......@@ -114,10 +114,10 @@ if(count($menus_RET)>1)
{
$tabs = array();
foreach($menus_RET as $id=>$menu)
$tabs[] = array('title'=>$menu[1]['TITLE'],'link'=>"Modules.php?modname=$_REQUEST[modname]&menu_id=$id");
$tabs[] = array('title'=>$menu[1]['TITLE'],'link'=>'Modules.php?modname='.$_REQUEST['modname'].'&menu_id='.$id);
echo '<BR />';
echo '<span class="center">'.WrapTabs($tabs,"Modules.php?modname=$_REQUEST[modname]&menu_id=$_REQUEST[menu_id]").'</span>';
echo '<span class="center">'.WrapTabs($tabs,'Modules.php?modname='.$_REQUEST['modname'].'&menu_id='.$_REQUEST['menu_id']).'</span>';
}
echo '<TABLE class="width-100p"><TR><TD>';
......
......@@ -98,7 +98,7 @@ if(!$_REQUEST['modfunc'] && UserStaffID())
if($staff['ACCOUNT_ID'])
{
echo '<FORM action="Modules.php?modname='.$_REQUEST[modname].'&modfunc=update" method="POST">';
echo '<FORM action="Modules.php?modname='.$_REQUEST['modname'].'&modfunc=update" method="POST">';
DrawHeader('',SubmitButton(_('Save'),'submit[save]').($staff['BALANCE'] == 0 ? SubmitButton(_('Delete Account'),'submit[delete]') : ''));
}
else
......
......@@ -99,7 +99,7 @@ if(UserStaffID() && !$_REQUEST['modfunc'])
}
unset($LO_ret[0]);
$link['remove'] = array('link'=>"Modules.php?modname=$_REQUEST[modname]&modfunc=remove&menu_id=$_REQUEST[menu_id]",
$link['remove'] = array('link'=>'Modules.php?modname='.$_REQUEST['modname'].'&modfunc=remove&menu_id='.$_REQUEST['menu_id'],
'variables'=>array('id'=>'SALE_ID'));
//modif Francois: css WPadmin
// $link['add']['html'] = array('DESCRIPTION'=>'<TABLE class="cellpadding-0 cellspacing-0"><TR><TD>'.SelectInput('','item_sn','',$items).'</TD></TR></TABLE>','ICON'=>'<TABLE class="cellpadding-0 cellspacing-0"><TR><TD><INPUT type=submit value='._('Add').'></TD></TR></TABLE>','remove'=>button('add'));
......@@ -108,10 +108,10 @@ if(UserStaffID() && !$_REQUEST['modfunc'])