Skip to content

Instantly share code, notes, and snippets.

@remyd1

remyd1/diff mrbs_sql.inc.php

Created November 15, 2018 11:58
Show Gist options
  • Save remyd1/3405f830c8575fb14e2764a86039634e to your computer and use it in GitHub Desktop.
Save remyd1/3405f830c8575fb14e2764a86039634e to your computer and use it in GitHub Desktop.
Download ZIP
Raw
diff mrbs_sql.inc.php
137,142d136
<
< /* ADD REMY SQL MISSING REQUESTS */
< $benef = grr_sql_query1("SELECT beneficiaire FROM ".TABLE_PREFIX."_entry WHERE id='".$id."'");
< $starttime = grr_sql_query1("SELECT start_time FROM ".TABLE_PREFIX."_entry WHERE id='".$id."'");
< /* END ADD REMY */
<
153,168d146
<
< /* START ADD JIMMY */
<
< $is_moderate = grr_sql_query1("SELECT count(*) FROM ".TABLE_PREFIX."_entry_moderate WHERE id = '".$i
d."';");
< if($is_moderate > 0) {
<
< $sql_room = "SELECT room_name FROM ".TABLE_PREFIX."_room WHERE id = '".$id_room."';";
< $machine_name = grr_sql_query1($sql_room);
< $machine_real_name = str_replace("machine-", "bigmem", $machine_name);
< //$machine_real_name returns the whole string if it does not find the pattern which is the case
when $machine_name have a gpu name ( == abso{1,2})
< delete_caldav("2", $machine_real_name, $benef, $starttime);
<
< }
<
< /* END ADD JIMMY */
<
449,451c427
< /* CHANGE IF BY JIMMY */
< if (($moderate == 2) || (($creator == "ADMINISTRATEUR") || (getUserName() == "ADMINISTRATEUR")))
< /* END OF JIMMY CHANGES */
---
> if ($moderate == 2)
453,484d428
< /* ADDED BY REMY */
< //add_caldav($moderate,$starttime,$endtime,$beneficiaire,$description,$room_id);
< /* END OF REMY'S MODIFS */
< }
<
< /* ADDED BY JIMMY */
< function delete_caldav($moderate, $machine, $userB, $starttime) {
<
< if(($moderate == 0) || ($moderate == 2)) {
<
< $start_zone = $starttime + date("Z");
< $cal_starttime = gmdate("YmdTHis", $start_zone);
< $cal_starttime = str_replace("GMT", "T", $cal_starttime);
<
< $content = "/bin/bash /home/mbb/caldav_api/delete_caldav_event.sh ".$machine." ".$userB." ".$cal
_starttime;
< $content = escapeshellcmd($content);
< $last_line = system($content, $retval);
<
< /* Loggin that */
< $filename = "/var/log/caldav.log";
< if (is_writable($filename)) {
< $handle = fopen($filename, "a");
< fwrite($handle, "commande : ".$content);
< fwrite($handle, "\n");
< fwrite($handle, "derniere ligne : ".$last_line);
< fwrite($handle, "\n");
< fwrite($handle, "valeur de retour : ".$retval);
< fwrite($handle, "\n");
< fclose($handle);
< }
< }
<
486,558d429
< /* END OF JIMMY'S MODIFS */
<
< function add_caldav($moderate,$starttime,$endtime,$beneficiaire,$description,$room_id)
< {
< /* ADDED BY REMY
< * moderate = 0 => pas de moderation
< * moderate = 2 => reservation validee apres moderation
< */
< if(($moderate == 0) || ($moderate == 2))
< {
< //convert timestamp in sge date
< // gmt + 2 timezone means that we need to add 7200 seconds
< //$start_zone = $starttime + 7200;
< //$end_zone = $endtime + 7200;
< $start_zone = $starttime + date("Z");
< $end_zone = $endtime + date("Z");
< $cal_starttime = gmdate("YmdTHis", $start_zone);
< $cal_starttime = str_replace("GMT", "T", $cal_starttime);
< // end_zone time is buggy
< $cal_endtime = gmdate("YmdTHis", $end_zone);
< $cal_endtime = str_replace("GMT", "T", $cal_endtime);
<
< $pattern2remove = '/[^A-Za-z0-9\-\_]/';
< $description = preg_replace($pattern2remove, ' ', $description);
< //$description = addslashes($description);
<
< $timestamp_end = $endtime;
< $sql = "SELECT room_name FROM ".TABLE_PREFIX."_room WHERE id = '".$room_id."';";
< $machine_name = grr_sql_query1($sql);
< /* On recupere le chiffre apres le premier tiret "-" correspondant au nom de la ressource
< * ex: machine-1 -> $machine_number = 1
< * Il ne faut donc pas nommer les ressources n'importe comment, ni mettre un hostname comme
"bigmemvz-compute-0-1" (dans ce cas, ca serait 'compute')
< * */
< $machine_number = explode("-", $machine_name);
< $machine_number = $machine_number[1];
< # actuellement seules les machines 2 et 3 sont disponibles
< if(($machine_number == "1") || ($machine_number == "2") || ($machine_number == "3"))
< {
< $content = "/bin/bash /home/mbb/caldav_api/new_caldav_event.sh bigmem".$machine_numb
er." ".protect_data_sql($beneficiaire)." ".$cal_starttime." ".$cal_endtime." '".$description."'";
< add_content_to_caldav($content);
< } elseif((strlen($machine_name) == 5) && (substr($machine_name, 0, 4) == 'abso' )) {
< //$gpu_number = substr($machine_number[0], -1);
< $content = "/bin/bash /home/mbb/caldav_api/new_caldav_event.sh ".$machine_name." ".p
rotect_data_sql($beneficiaire)." ".$cal_starttime." ".$cal_endtime." '".$description."'";
< add_content_to_caldav($content);
< } else {
< $content = "/bin/echo /home/mbb/caldav_api/new_caldav_event.sh ".$machine_name." ".prote
ct_data_sql($beneficiaire)." ".$cal_starttime." ".$cal_endtime." '".$description."'";
< add_content_to_caldav($content);
< }
< }
< }
<
< function add_content_to_caldav($content) {
< $content = escapeshellcmd($content);
< $last_line = system($content, $retval);
< /* Logging that */
< $filename = "/var/log/caldav.log";
< if (is_writable($filename)) {
< $handle = fopen($filename, "a");
< fwrite($handle, "commande : ".$content);
< fwrite($handle, "\n");
< fwrite($handle, "derniere ligne : ".$last_line);
< fwrite($handle, "\n");
< fwrite($handle, "valeur de retour : ".$retval);
< fwrite($handle, "\n");
< fclose($handle);
< }
< }
<
< /* END OF REMY'S MODIFS */
<
<
<
<
766,768c637
< /* CHANGE BY JIMMY */
< if (($moderate == 2) || (($creator == "ADMINISTRATEUR") || (getUserName() == "ADMINISTRATEUR
")))
< /* END OF JIMMY'S CHANGES */
---
> if ($moderate == 2)
868,883c737
< /* MODIFIED BY REMY AND JIMMY
< * je dois recuperer starttime, endtime et beneficiaire en plus
< * */
<
< $sql_cal_select = "SELECT start_time,end_time,beneficiaire,description FROM ".TABLE_PREFIX."_entry WHERE id = '".$_id."';";
< $res = grr_sql_query($sql_cal_select);
< if (! $res) fatal_error(0, grr_sql_error());
< $row_res = grr_sql_row($res, 0);
< $starttime = $row_res[0];
< $endtime = $row_res[1];
< $beneficiaire = $row_res[2];
< $description = $row_res[3];
< grr_sql_free($res);
<
<
< if (($_moderate == 1) || (($beneficiaire == "ADMINISTRATEUR") || (getUserName() == "ADMINISTRATEUR"))) {
---
> if ($_moderate == 1)
885,895d738
< /*$sql_cal_select = "SELECT start_time,end_time,beneficiaire FROM ".TABLE_PREFIX."_entry WHERE id = '".$_id."';";
< $res = grr_sql_query($sql_cal_select);
< if (! $res) fatal_error(0, grr_sql_error());
< $row_res = grr_sql_row($res, 0);
< $starttime = $row_res[0];
< $endtime = $row_res[1];
< $beneficiaire = $row_res[2];
< grr_sql_free($res);*/
< add_caldav("2",$starttime,$endtime,$beneficiaire,$description,$room_id);
< }
< /* END OF REMY'S MODIFS */
926,929c769
< /* MODIFIED BY REMY
< * je dois recuperer starttime, endtime et beneficiaire en plus
< * */
< if ($_moderate == 1) {
---
> if ($_moderate == 1)
931,941d770
< $sql_cal_select = "SELECT start_time,end_time,beneficiaire,$description FROM ".TABLE_PREFIX."_entry WHERE id = '".$entry_tom."';";
< $res = grr_sql_query($sql_cal_select);
< if (! $res) fatal_error(0, grr_sql_error());
< $row_res = grr_sql_row($res, 0);
< $starttime = $row_res[0];
< $endtime = $row_res[1];
< $beneficiaire = $row_res[2];
< grr_sql_free($res);
< add_caldav("2",$starttime,$endtime,$beneficiaire,$description,$room_id);
< }
< /* END OF REMY'S MODIFS */
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment