Clean code to delete the lab experiment

1 files changed, 134 insertions, 161 deletions

diff --git a/general_deletion.inc b/general_deletion.inc
index d33a2e1..baaec21 100755
--- a/general_deletion.inc
+++ b/general_deletion.inc
@@ -3,7 +3,6 @@
 /******************************************************************************/
 /****************************** DELETION FUNCTIONS ****************************/
 /******************************************************************************/
-
 function lab_migration_delete_solution($solution_id)
 {
     global $user;
@@ -34,64 +33,55 @@ function lab_migration_delete_solution($solution_id)
         drupal_set_message(t('Invalid experiment.'), 'error');
         return FALSE;
     }
-
   /* deleting solution files */
-  //$solution_files_q = db_query("SELECT * FROM {lab_migration_solution_files} WHERE solution_id = %d", $solution_id);
-  $query = db_select('lab_migration_solution_files');
-              $query->fields('lab_migration_solution_files');
-              $query->condition('solution_id', $solution_id);
-              $solution_files_q = $query->execute();
-  while ($solution_files_data = $solution_files_q->fetchObject())
-  {
-    //var_dump($root_path . $solution_files_data->filepath);die;
-    $ex_path = $proposal_data->directory_name . '/' . $solution_files_data->filepath;
-  $dir_path = $root_path . $ex_path;
-  //var_dump($dir_path);die;
-    if (!file_exists($dir_path))
+    $query = db_select('lab_migration_solution_files');
+    $query->fields('lab_migration_solution_files');
+    $query->condition('solution_id', $solution_id);
+    $solution_files_q = $query->execute();
+    while ($solution_files_data = $solution_files_q->fetchObject())
     {
-      $status = FALSE;
-      drupal_set_message(t('Error deleting !file. File does not exists.', array('!file' => $dir_path)), 'error');
-      continue;
-    }
+        $ex_path = $proposal_data->directory_name . '/' . $solution_files_data->filepath;
+        $dir_path = $root_path . $ex_path;
+        if (!file_exists($dir_path))
+        {
+          $status = FALSE;
+          drupal_set_message(t('Error deleting !file. File does not exists.', array('!file' => $dir_path)), 'error');
+          continue;
+        }
     /* removing solution file */
-    if (!unlink($dir_path))
-    {
-
-      $status = FALSE;
-      drupal_set_message(t('Error deleting !file', array('!file' => $dir_path)), 'error');
-
-      /* sending email to admins */
-      $email_to = variable_get('lab_migration_emails', '');
-
-    $from = variable_get('lab_migration_from_email', '');
-    $bcc="";
-    $cc=variable_get('lab_migration_cc_emails', '');
-
-      $param['standard']['subject'] = "[ERROR] Error deleting example file";
-      $param['standard']['body'] = "Error deleting solution files by " . $user->uid . " at " . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] . " :
-        solution id : " . $solution_id . "
-        file id : " .  $solution_files_data->id . "
-        file path : " . $solution_files_data->filepath."
-    PDF path : " . $PdfStatus;
-    $param['standard']['headers']=array('From'=>$from,'MIME-Version'=> '1.0',
-                'Content-Type'=> 'text/plain; charset=UTF-8; format=flowed; delsp=yes',
-                'Content-Transfer-Encoding' => '8Bit',
-                'X-Mailer'=> 'Drupal','Cc' => $cc, 'Bcc' => $bcc);
+        if (!unlink($dir_path))
+        {
+          $status = FALSE;
+          drupal_set_message(t('Error deleting !file', array('!file' => $dir_path)), 'error');
+
+          /* sending email to admins */
+            $email_to = variable_get('lab_migration_emails', '');
+            $from = variable_get('lab_migration_from_email', '');
+            $bcc="";
+            $cc=variable_get('lab_migration_cc_emails', '');
+            $param['standard']['subject'] = "[ERROR] Error deleting example file";
+            $param['standard']['body'] = "Error deleting solution files by " . $user->uid . " at " . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] . " :
+                solution id : " . $solution_id . "
+                file id : " .  $solution_files_data->id . "
+                file path : " . $solution_files_data->filepath."
+            PDF path : " . $PdfStatus;
+            $param['standard']['headers']=array('From'=>$from,'MIME-Version'=> '1.0',
+                        'Content-Type'=> 'text/plain; charset=UTF-8; format=flowed; delsp=yes',
+                        'Content-Transfer-Encoding' => '8Bit',
+                        'X-Mailer'=> 'Drupal','Cc' => $cc, 'Bcc' => $bcc);
     
-      if (!drupal_mail('lab_migration', 'standard', $email_to, language_default(), $param, $from, TRUE))
-        drupal_set_message('Error sending email message.', 'error');
-    } else {
-      /* deleting example files database entries */     
-
-      db_delete('lab_migration_solution_files')
-            ->condition('id', $solution_files_data->id)
-            ->execute();
+            if (!drupal_mail('lab_migration', 'standard', $email_to, language_default(), $param, $from, TRUE))
+            drupal_set_message('Error sending email message.', 'error');
+        } 
+        else {
+          /* deleting example files database entries */     
+          db_delete('lab_migration_solution_files')->condition('id', $solution_files_data->id)->execute();
+        }
     }
-  }
 
-  if (!$status)
+    if (!$status)
     return FALSE;
-$query = db_select('lab_migration_solution');
+    $query = db_select('lab_migration_solution');
     $query->fields('lab_migration_solution');
     $query->condition('id', $solution_id);
     $solution_q = $query->execute();
@@ -111,121 +101,113 @@ $query = db_select('lab_migration_solution');
     $query->condition('id', $experiment_data->proposal_id);
     $proposal_q = $query->execute();
     $proposal_data = $proposal_q->fetchObject();
-  $dir_path = $root_path . $proposal_data->directory_name . '/EXP' . $experiment_data->number . '/CODE' . $solution_data->code_number;
-  //var_dump($dir_path);die;
-  if (is_dir($dir_path))
-  {
-    if (!rmdir($dir_path))
+    $dir_path = $root_path . $proposal_data->directory_name . '/EXP' . $experiment_data->number . '/CODE' . $solution_data->code_number;
+    if (is_dir($dir_path))
     {
-      drupal_set_message(t('Error deleting folder !folder', array('!folder' => $dir_path)), 'error');
-
-      /* sending email to admins */
-      $email_to = variable_get('lab_migration_emails', '');
-    $from = variable_get('lab_migration_from_email', '');
-    $bcc="";
-    $cc=variable_get('lab_migration_cc_emails', '');
-
-
-      $param['standard']['subject'] = "[ERROR] Error deleting folder";
-      $param['standard']['body'] = "Error deleting folder " . $dir_path . " by " . $user->uid . " at " . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
-      $param['standard']['headers']=array('From'=>$from,'MIME-Version'=> '1.0',
-                'Content-Type'=> 'text/plain; charset=UTF-8; format=flowed; delsp=yes',
-                'Content-Transfer-Encoding' => '8Bit',
-                'X-Mailer'=> 'Drupal','Cc' => $cc, 'Bcc' => $bcc);
-    
-
-      if (!drupal_mail('lab_migration', 'standard', $email_to, language_default(), $param, $from, TRUE))
-        drupal_set_message('Error sending email message.', 'error');
-      return FALSE;
+        if (!rmdir($dir_path))
+        {
+            drupal_set_message(t('Error deleting folder !folder', array('!folder' => $dir_path)), 'error');
+
+          /* sending email to admins */
+            $email_to = variable_get('lab_migration_emails', '');
+            $from = variable_get('lab_migration_from_email', '');
+            $bcc="";
+            $cc=variable_get('lab_migration_cc_emails', '');
+
+
+            $param['standard']['subject'] = "[ERROR] Error deleting folder";
+            $param['standard']['body'] = "Error deleting folder " . $dir_path . " by " . $user->uid . " at " . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+            $param['standard']['headers']=array('From'=>$from,'MIME-Version'=> '1.0',
+                        'Content-Type'=> 'text/plain; charset=UTF-8; format=flowed; delsp=yes',
+                        'Content-Transfer-Encoding' => '8Bit',
+                        'X-Mailer'=> 'Drupal','Cc' => $cc, 'Bcc' => $bcc);
+        
+            if (!drupal_mail('lab_migration', 'standard', $email_to, language_default(), $param, $from, TRUE))
+                drupal_set_message('Error sending email message.', 'error');
+          return FALSE;
+        }
+    } 
+    else 
+    {
+        drupal_set_message(t('Cannot delete solution folder. !folder does not exists.', array('!folder' => $dir_path)), 'error');
+        return FALSE;
     }
-  } else {
-    drupal_set_message(t('Cannot delete solution folder. !folder does not exists.', array('!folder' => $dir_path)), 'error');
-    return FALSE;
-  }
 
-  /* deleting solution dependency and solution database entries */  
-  db_delete('lab_migration_solution_dependency')->condition('solution_id', $solution_id)->execute();
-
-  db_delete('lab_migration_solution')->condition('id', $solution_id)->execute();
-
-  return $status;
+      /* deleting solution dependency and solution database entries */  
+    db_delete('lab_migration_solution_dependency')->condition('solution_id', $solution_id)->execute();
+    db_delete('lab_migration_solution')->condition('id', $solution_id)->execute();
+    return $status;
 }
 
 function lab_migration_delete_experiment($experiment_id)
 {
-  $status = TRUE;
-  $root_path = lab_migration_path();
-  $query = db_select('lab_migration_experiment');
-              $query->fields('lab_migration_experiment');
-              $query->condition('id', $experiment_id);
-              $experiment_q = $query->execute();
-  $experiment_data = $experiment_q->fetchObject();
-  $query = db_select('lab_migration_proposal');
+    $status = TRUE;
+    $root_path = lab_migration_path();
+    $query = db_select('lab_migration_experiment');
+    $query->fields('lab_migration_experiment');
+    $query->condition('id', $experiment_id);
+    $experiment_q = $query->execute();
+    $experiment_data = $experiment_q->fetchObject();
+    $query = db_select('lab_migration_proposal');
     $query->fields('lab_migration_proposal');
     $query->condition('id', $form_state['values']['lab']);
     $proposal_q = $query->execute();
     $proposal_data = $proposal_q->fetchObject();
-  if (!$experiment_data)
-  {
-    drupal_set_message('Invalid experiment.', 'error');
-    return FALSE;
-  }
-
-  /* deleting solutions */
- $query = db_select('lab_migration_solution');
-              $query->fields('lab_migration_solution');
-              $query->condition('experiment_id', $experiment_id);
-              $solution_q = $query->execute();
-
-  $delete_exp_folder = FALSE;
-  while ($solution_data = $solution_q->fetchObject())
-  {
-    $delete_exp_folder = TRUE;
-    if (!lab_migration_delete_solution($solution_data->id))
-      $status = FALSE;
-  }
-
-  if (!$delete_exp_folder)
-  {
-    return TRUE;
-  }
-
-  if ($status)
-  {
-    $dir_path = $root_path . $proposal_data->directory_name . '/EXP' . $experiment_data->number;
-
-    if (is_dir($dir_path))
+    if (!$experiment_data)
     {
-      $res = rmdir($dir_path);
-      if (!$res)
-      {
-        drupal_set_message(t('Error deleting experiment folder !folder', array('!folder' => $dir_path)), 'error');
-  
-        /* sending email to admins */
-        $email_to = variable_get('lab_migration_emails', '');
-
-    $from = variable_get('lab_migration_from_email', '');
-    $bcc="";
-    $cc=variable_get('lab_migration_cc_emails', '');
-    
-
-        $param['standard']['subject'] = "[ERROR] Error deleting experiment folder";
-        $param['standard']['body'] = "Error deleting folder " . $dir_path;
-    $param['standard']['headers']=array('From'=>$from,'MIME-Version'=> '1.0',
-                'Content-Type'=> 'text/plain; charset=UTF-8; format=flowed; delsp=yes',
-                'Content-Transfer-Encoding' => '8Bit',
-                'X-Mailer'=> 'Drupal','Cc' => $cc, 'Bcc' => $bcc);
-        if (!drupal_mail('lab_migration', 'standard', $email_to, language_default(), $param,$from, TRUE))
-          drupal_set_message('Error sending email message.', 'error');
+        drupal_set_message('Invalid experiment.', 'error');
         return FALSE;
-      } else {
+    }
+  /* deleting solutions */
+    $query = db_select('lab_migration_solution');
+    $query->fields('lab_migration_solution');
+    $query->condition('experiment_id', $experiment_id);
+    $solution_q = $query->execute();
+    $delete_exp_folder = FALSE;
+    while ($solution_data = $solution_q->fetchObject())
+    {
+        $delete_exp_folder = TRUE;
+        if (!lab_migration_delete_solution($solution_data->id))
+          $status = FALSE;
+    }
+    if (!$delete_exp_folder)
+    {
         return TRUE;
-      }
-    } else {
-      drupal_set_message(t('Cannot delete experiment folder. !folder does not exists.', array('!folder' => $dir_path)), 'error');
-      return FALSE;
     }
-  }
+    if ($status)
+    {
+        $dir_path = $root_path . $proposal_data->directory_name . '/EXP' . $experiment_data->number;
+        if (is_dir($dir_path))
+        {
+          $res = rmdir($dir_path);
+          if (!$res)
+          {
+            drupal_set_message(t('Error deleting experiment folder !folder', array('!folder' => $dir_path)), 'error');
+            /* sending email to admins */
+            $email_to = variable_get('lab_migration_emails', '');
+            $from = variable_get('lab_migration_from_email', '');
+            $bcc="";
+            $cc=variable_get('lab_migration_cc_emails', '');
+            $param['standard']['subject'] = "[ERROR] Error deleting experiment folder";
+            $param['standard']['body'] = "Error deleting folder " . $dir_path;
+            $param['standard']['headers']=array('From'=>$from,'MIME-Version'=> '1.0',
+                    'Content-Type'=> 'text/plain; charset=UTF-8; format=flowed; delsp=yes',
+                    'Content-Transfer-Encoding' => '8Bit',
+                    'X-Mailer'=> 'Drupal','Cc' => $cc, 'Bcc' => $bcc);
+                if (!drupal_mail('lab_migration', 'standard', $email_to, language_default(), $param,$from, TRUE))
+              drupal_set_message('Error sending email message.', 'error');
+            return FALSE;
+          } 
+          else 
+          {
+            return TRUE;
+          }
+        } 
+        else {
+          drupal_set_message(t('Cannot delete experiment folder. !folder does not exists.', array('!folder' => $dir_path)), 'error');
+          return FALSE;
+        }
+    }
   return FALSE;
 }
 
@@ -258,12 +240,3 @@ function lab_migration_delete_lab($lab_id)
   return $status;
 }
 
-function lab_migration_del_lab_pdf($lab_id)
-{
-  $root_path = lab_migration_path();
-  $dir_path = $root_path . "latex/";
-  $pdf_filename = "lab_" . $lab_id . ".pdf";
-  if (file_exists($dir_path . $pdf_filename))
-    unlink($dir_path . $pdf_filename);
-}
-