Skip to content
Permalink
Browse files
Merge branch 'develop' for Release 3.0.3
  • Loading branch information
bgreiner committed Oct 12, 2015
2 parents 6da7e46 + e6d9002 commit 8731f5ab38ee30ca95840a945e8997ee5b757554
Showing 177 changed files with 27,050 additions and 26,857 deletions.
@@ -13,6 +13,13 @@ For installation and usage manual see [wiki documentation](http://www.orsee.org/

Please use the [ORSEE bug tracker](http://www.orsee.org/web/tracker.php) for reporting issues.

Becoming a developer
------------

Please refer to [Developer wiki area](https://github.com/orsee/orsee/wiki) for
the details on coding style, how to contribute to the project and other
useful information for developers.

License
------------

@@ -10,84 +10,84 @@
if (isset($_REQUEST['admin_id']) && $_REQUEST['admin_id']) $admin_id=$_REQUEST['admin_id'];
else { redirect ("admin/"); $proceed=false; }
}

if ($proceed) {

if (isset($_REQUEST['betternot']) && $_REQUEST['betternot']) {
redirect ('admin/admin_edit.php?admin_id='.$admin_id);
$proceed=false;
}
if (isset($_REQUEST['betternot']) && $_REQUEST['betternot']) {
redirect ('admin/admin_edit.php?admin_id='.$admin_id);
$proceed=false;
}
}

if ($proceed) {

if (isset($_REQUEST['reallydelete']) && $_REQUEST['reallydelete']) $reallydelete=true;
else $reallydelete=false;

$allow=check_allow('admin_delete','admin_edit.php?admin_id='.$admin_id);
$allow=check_allow('admin_delete','admin_edit.php?admin_id='.$admin_id);
}

if ($proceed) {

$admin=orsee_db_load_array("admin",$admin_id,"admin_id");
$admin=orsee_db_load_array("admin",$admin_id,"admin_id");

echo '<center>';

echo '<center>';

if ($reallydelete) {

if ($reallydelete) {
$pars=array(':admin_id'=>$admin_id);
$query="DELETE FROM ".table('admin')."
WHERE admin_id= :admin_id";
$result=or_query($query,$pars);
log__admin("admin_delete",$admin['adminname']);

$pars=array(':admin_id'=>$admin_id);
$query="DELETE FROM ".table('admin')."
WHERE admin_id= :admin_id";
$result=or_query($query,$pars);
log__admin("admin_delete",$admin['adminname']);
message (lang('admin_deleted').': '.$admin['adminname']);

message (lang('admin_deleted').': '.$admin['adminname']);
redirect ('admin/admin_show.php');
$proceed=false;
}

redirect ('admin/admin_show.php');
$proceed=false;
}

}

if ($proceed) {

// form

$num_experiments=experiment__count_experiments("experimenter LIKE :adminname",array(':adminname'=>'%|'.$admin['adminname'].'|%'));
if ($num_experiments>0) {
echo lang('admin_delete_warning');
}
echo '
<TABLE class="or_formtable">
<TR><TD colspan="2">
<TABLE width="100%" border=0 class="or_panel_title"><TR>
<TD style="background: '.$color['panel_title_background'].'; color: '.$color['panel_title_textcolor'].'" align="center">
'.$admin['fname'].' '.$admin['lname'].' ('.$admin['adminname'].')
</TD>
</TR></TABLE>
</TD></TR>
<TR>
<TD colspan=2>
'.lang('do_you_really_want_to_delete').'
<BR><BR>';
dump_array($admin); echo '
</TD>
</TR>
<TR>
<TD align=left>
'.button_link('admin_delete.php?admin_id='.$admin_id.'&reallydelete=true',
lang('yes_delete'),'check-square biconred').'
</TD>
<TD align=right>
'.button_link('admin_delete.php?admin_id='.$admin_id.'&betternot=true',
lang('no_sorry'),'undo bicongreen').'
</TD>
</TR>
</TABLE>
</center>';
// form

$num_experiments=experiment__count_experiments("experimenter LIKE :adminname",array(':adminname'=>'%|'.$admin['adminname'].'|%'));

if ($num_experiments>0) {
echo lang('admin_delete_warning');
}

echo '
<TABLE class="or_formtable">
<TR><TD colspan="2">
<TABLE width="100%" border=0 class="or_panel_title"><TR>
<TD style="background: '.$color['panel_title_background'].'; color: '.$color['panel_title_textcolor'].'" align="center">
'.$admin['fname'].' '.$admin['lname'].' ('.$admin['adminname'].')
</TD>
</TR></TABLE>
</TD></TR>
<TR>
<TD colspan=2>
'.lang('do_you_really_want_to_delete').'
<BR><BR>';
dump_array($admin); echo '
</TD>
</TR>
<TR>
<TD align=left>
'.button_link('admin_delete.php?admin_id='.$admin_id.'&reallydelete=true',
lang('yes_delete'),'check-square biconred').'
</TD>
<TD align=right>
'.button_link('admin_delete.php?admin_id='.$admin_id.'&betternot=true',
lang('no_sorry'),'undo bicongreen').'
</TD>
</TR>
</TABLE>
</center>';

}
include ("footer.php");

0 comments on commit 8731f5a

Please sign in to comment.