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 with 27,050 additions and 26,857 deletions.
  1. +7 −0 README.md
  2. +55 −55 admin/admin_delete.php
  3. +304 −304 admin/admin_edit.php
  4. +29 −29 admin/admin_login.php
  5. +4 −4 admin/admin_logout.php
  6. +97 −97 admin/admin_pw.php
  7. +29 −29 admin/admin_rights.php
  8. +137 −137 admin/admin_show.php
  9. +95 −95 admin/admin_type_delete.php
  10. +141 −141 admin/admin_type_edit.php
  11. +33 −33 admin/admin_type_show.php
  12. +46 −46 admin/calendar_ics.php
  13. +3 −3 admin/calendar_main.php
  14. +82 −82 admin/cronjob_edit.php
  15. +56 −56 admin/cronjob_main.php
  16. +58 −58 admin/download_delete.php
  17. +91 −91 admin/download_edit.php
  18. +36 −36 admin/download_file.php
  19. +77 −77 admin/download_main.php
  20. +138 −138 admin/download_upload.php
  21. +24 −24 admin/emails_download_attachment.php
  22. +93 −93 admin/emails_main.php
  23. +73 −73 admin/emails_view.php
  24. +35 −35 admin/events_delete.php
  25. +146 −146 admin/events_edit.php
  26. +142 −142 admin/experiment_add_participants.php
  27. +198 −198 admin/experiment_customize_enrol_conf.php
  28. +214 −214 admin/experiment_customize_reminder.php
  29. +50 −50 admin/experiment_delete.php
  30. +111 −111 admin/experiment_drop_participants.php
  31. +306 −306 admin/experiment_edit.php
  32. +187 −187 admin/experiment_mail_participants.php
  33. +83 −83 admin/experiment_mail_preview.php
  34. +18 −18 admin/experiment_mailqueue_show.php
  35. +1 −1 admin/experiment_main.php
  36. +2 −2 admin/experiment_my.php
  37. +1 −1 admin/experiment_old.php
  38. +508 −508 admin/experiment_participants_show.php
  39. +7 −7 admin/experiment_participants_show_pdf.php
  40. +336 −336 admin/experiment_recruitment_report.php
  41. +368 −368 admin/experiment_show.php
  42. +84 −84 admin/experiment_type_delete.php
  43. +171 −171 admin/experiment_type_edit.php
  44. +19 −19 admin/experiment_type_main.php
  45. +39 −39 admin/faq_delete.php
  46. +88 −88 admin/faq_edit.php
  47. +16 −16 admin/faq_main.php
  48. +15 −15 admin/footer.php
  49. +43 −43 admin/header.php
  50. +235 −235 admin/import_prepare.php
  51. +5 −5 admin/index.php
  52. +116 −116 admin/lang_edit.php
  53. +100 −100 admin/lang_item_delete.php
  54. +208 −208 admin/lang_item_edit.php
  55. +246 −246 admin/lang_item_main.php
  56. +97 −97 admin/lang_lang_add.php
  57. +137 −137 admin/lang_lang_delete.php
  58. +85 −85 admin/lang_lang_edit.php
  59. +72 −72 admin/lang_lang_export.php
  60. +195 −195 admin/lang_lang_import.php
  61. +136 −136 admin/lang_main.php
  62. +42 −42 admin/lang_symbol_delete.php
  63. +69 −69 admin/lang_symbol_edit.php
  64. +5 −5 admin/mailqueue_show.php
  65. +27 −27 admin/nonoutputheader.php
  66. +131 −131 admin/options_colors.php
  67. +36 −36 admin/options_default_queries.php
  68. +81 −81 admin/options_edit.php
  69. +91 −91 admin/options_main.php
  70. +86 −86 admin/options_ordered_lists.php
  71. +83 −83 admin/options_participant_profile.php
  72. +109 −109 admin/options_participant_profile_add.php
  73. +63 −63 admin/options_participant_profile_delete.php
  74. +305 −305 admin/options_participant_profile_edit.php
  75. +64 −64 admin/options_profile_template.php
  76. +103 −103 admin/options_profile_template_edit.php
  77. +113 −113 admin/options_saved_queries.php
  78. +89 −89 admin/participant_status_delete.php
  79. +260 −260 admin/participant_status_edit.php
  80. +51 −51 admin/participant_status_main.php
  81. +90 −90 admin/participants_bulk_mail.php
  82. +108 −108 admin/participants_duplicates.php
  83. +130 −130 admin/participants_edit.php
  84. +115 −115 admin/participants_main.php
  85. +233 −233 admin/participants_show.php
  86. +72 −72 admin/participants_unconfirmed.php
  87. +74 −74 admin/participation_status_delete.php
  88. +214 −214 admin/participation_status_edit.php
  89. +44 −44 admin/participation_status_main.php
  90. +109 −109 admin/payments_budget_delete.php
  91. +144 −144 admin/payments_budget_edit.php
  92. +32 −32 admin/payments_budget_main.php
  93. +68 −68 admin/payments_budget_view.php
  94. +113 −113 admin/payments_budget_view_details.php
  95. +59 −59 admin/session_delete.php
  96. +326 −326 admin/session_edit.php
  97. +40 −40 admin/session_send_reminder.php
  98. +98 −98 admin/statistics_graph.php
  99. +47 −47 admin/statistics_main.php
  100. +88 −88 admin/statistics_participants.php
  101. +12 −12 admin/statistics_show_log.php
  102. +24 −24 admin/statistics_system.php
  103. +69 −69 admin/subpool_delete.php
  104. +127 −127 admin/subpool_edit.php
  105. +33 −33 admin/subpool_main.php
  106. +111 −111 config/system.php
  107. +22 −17 install/CHANGELOG
  108. +10 −10 install/INSTALL.howto
  109. +5 −5 install/LICENSE
  110. +11 −2 install/UPGRADE.howto
  111. +160 −0 install/convert_orsee302db_to_UTF8.php
  112. +358 −358 install/data_import.php
  113. +367 −282 install/install.sql
  114. +2 −2 install/settings-dist.php
  115. +1 −1 public/captcha.php
  116. +8 −8 public/contact.php
  117. +8 −8 public/disabled.php
  118. +102 −102 public/faq.php
  119. +11 −11 public/faq_vote.php
  120. +14 −14 public/footer.php
  121. +121 −121 public/header.php
  122. +7 −7 public/impressum.php
  123. +21 −21 public/index.php
  124. +62 −62 public/participant_change_pw.php
  125. +35 −35 public/participant_confirm.php
  126. +206 −206 public/participant_create.php
  127. +35 −35 public/participant_delete.php
  128. +64 −64 public/participant_edit.php
  129. +43 −43 public/participant_login.php
  130. +52 −52 public/participant_login_mob.php
  131. +4 −4 public/participant_logout.php
  132. +163 −163 public/participant_reset_pw.php
  133. +347 −347 public/participant_show.php
  134. +381 −381 public/participant_show_mob.php
  135. +7 −7 public/privacy.php
  136. +7 −7 public/rules.php
  137. +2 −2 public/show_calendar.php
  138. +8 −8 style/orsee/html_footer.php
  139. +59 −60 style/orsee/html_header.php
  140. +2 −2 style/orsee2/html_footer.php
  141. +41 −41 style/orsee2/html_header.php
  142. +503 −503 tagsets/calendar.php
  143. +67 −67 tagsets/class.ezpdf.php
  144. +1,523 −1,523 tagsets/class.fmailbox.php
  145. +27 −27 tagsets/class.json.php
  146. +277 −277 tagsets/class.pdf.php
  147. +3 −3 tagsets/class.phplot.php
  148. +332 −332 tagsets/cronjobs.php
  149. +1,275 −1,275 tagsets/email.php
  150. +156 −156 tagsets/expadmin.php
  151. +772 −772 tagsets/experimentmail.php
  152. +710 −710 tagsets/experiments.php
  153. +340 −340 tagsets/expregister.php
  154. +10 −10 tagsets/faqs.php
  155. +266 −266 tagsets/formhelpers.php
  156. +217 −217 tagsets/helpers.php
  157. +529 −529 tagsets/html_stuff.php
  158. +305 −376 tagsets/javascripts.php
  159. +38 −38 tagsets/laboratories.php
  160. +253 −253 tagsets/language.php
  161. +191 −191 tagsets/logfunctions.php
  162. +216 −216 tagsets/mailqueue.php
  163. +300 −300 tagsets/options.php
  164. +175 −176 tagsets/orsee_mysql.php
  165. +1,419 −1,419 tagsets/participant.php
  166. +155 −155 tagsets/payments.php
  167. +214 −214 tagsets/pdfoutput.php
  168. +8 −8 tagsets/public_content.php
  169. +945 −945 tagsets/query.php
  170. +649 −649 tagsets/query_modules.php
  171. +7 −7 tagsets/session_handler.php
  172. +241 −241 tagsets/sessions.php
  173. +190 −190 tagsets/site.php
  174. +729 −729 tagsets/stats.php
  175. +54 −54 tagsets/subpools.php
  176. +75 −75 tagsets/survey.php
  177. +217 −217 tagsets/updownloads.php
@@ -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.
You can’t perform that action at this time.