diff options
| -rwxr-xr-x | bulk_approval.inc | 10 | ||||
| -rwxr-xr-x | bulk_upload_code.inc | 4 | ||||
| -rwxr-xr-x | code_approval.inc | 2 | ||||
| -rwxr-xr-x | dependency.inc | 6 | ||||
| -rwxr-xr-x | dependency_approval.inc | 2 | ||||
| -rwxr-xr-x | general_deletion.inc | 53 | ||||
| -rwxr-xr-x | lab_migration.module | 48 | ||||
| -rwxr-xr-x | latex.inc | 6 | ||||
| -rwxr-xr-x | proposal.inc | 2 | ||||
| -rwxr-xr-x | run.inc | 2 | ||||
| -rwxr-xr-x | upload_code.inc | 10 | ||||
| -rwxr-xr-x | upload_code_delete.inc | 2 |
12 files changed, 54 insertions, 93 deletions
diff --git a/bulk_approval.inc b/bulk_approval.inc index 69b3c84..ddaddeb 100755 --- a/bulk_approval.inc +++ b/bulk_approval.inc @@ -277,7 +277,7 @@ function lab_migration_bulk_approval_form_submit($form, &$form_state) if ($form_state['clicked_button']['#value'] == 'Submit') { if ($form_state['values']['run']['lab']) - del_lab_pdf($form_state['values']['run']['lab']); + lab_migration_del_lab_pdf($form_state['values']['run']['lab']); if (user_access('lab migration bulk manage code')) { @@ -318,7 +318,7 @@ function lab_migration_bulk_approval_form_submit($form, &$form_state) return; } - if (delete_lab($form_state['values']['run']['lab'])) + if (lab_migration_delete_lab($form_state['values']['run']['lab'])) { drupal_set_message(t('Dis-Approved and Deleted Entire Lab.'), 'status'); } else { @@ -349,7 +349,7 @@ Reason for dis-approval: return; } - if (delete_lab($form_state['values']['run']['lab'])) + if (lab_migration_delete_lab($form_state['values']['run']['lab'])) { drupal_set_message(t('Dis-Approved and Deleted Entire Lab solutions.'), 'status'); @@ -409,7 +409,7 @@ Reason for dis-approval: return; } - if (delete_experiment($form_state['values']['run']['experiment'])) + if (lab_migration_delete_experiment($form_state['values']['run']['experiment'])) { drupal_set_message(t('Dis-Approved and Deleted Entire Experiment.'), 'status'); } else { @@ -444,7 +444,7 @@ Reason for dis-approval: } else if ($form_state['values']['run']['disapprove_solution'] == "1") { - if (delete_solution($form_state['values']['run']['solution'])) + if (lab_migration_delete_solution($form_state['values']['run']['solution'])) { drupal_set_message(t('Solution Dis-Approved and Deleted.'), 'status'); } else { diff --git a/bulk_upload_code.inc b/bulk_upload_code.inc index bc144e3..329f8ff 100755 --- a/bulk_upload_code.inc +++ b/bulk_upload_code.inc @@ -208,10 +208,10 @@ function lab_migration_bulk_upload_code_form($form_state) function lab_migration_bulk_upload_code_form_validate($form, &$form_state) { - if (!check_code_number($form_state['values']['code_number'])) + if (!lab_migration_check_code_number($form_state['values']['code_number'])) form_set_error('code_number', t('Invalid Code Number. Code Number can contain only numbers.')); - if (!check_name($form_state['values']['code_caption'])) + if (!lab_migration_check_name($form_state['values']['code_caption'])) form_set_error('code_caption', t('Caption can contain only alphabets, numbers and spaces.')); if (isset($_FILES['files'])) diff --git a/code_approval.inc b/code_approval.inc index 3288752..745fa6a 100755 --- a/code_approval.inc +++ b/code_approval.inc @@ -230,7 +230,7 @@ function lab_migration_code_approval_form_submit($form, &$form_state) if (!drupal_mail('lab_migration', 'solution_approved', $email_to, language_default(), $param, variable_get('lab_migration_from_email', NULL), TRUE)) drupal_set_message('Error sending email message.', 'error'); } else if ($form_state['values']['approved'] == "2") { - if (delete_solution($solution_id)) + if (lab_migration_delete_solution($solution_id)) { /* sending email */ $email_to = $user_data->mail . ', ' . variable_get('lab_migration_emails', ''); diff --git a/dependency.inc b/dependency.inc index 749a192..11350bb 100755 --- a/dependency.inc +++ b/dependency.inc @@ -5,7 +5,7 @@ function lab_migration_upload_dependency_form($form_state) { global $user; - $proposal_data = get_proposal(); + $proposal_data = lab_migration_get_proposal(); if (!$proposal_data) { drupal_goto(''); return; @@ -77,7 +77,7 @@ function lab_migration_upload_dependency_form_validate($form, &$form_state) form_set_error('', t('Invalid')); } - if (!check_name($form_state['values']['depfile1_caption'])) + if (!lab_migration_check_name($form_state['values']['depfile1_caption'])) form_set_error('code_caption', t('Caption can contain only alphabets, numbers and spaces.')); if (isset($_FILES['files'])) @@ -112,7 +112,7 @@ function lab_migration_upload_dependency_form_submit($form, &$form_state) { $root_path = lab_migration_path(); - $proposal_data = get_proposal(); + $proposal_data = lab_migration_get_proposal(); if (!$proposal_data) { drupal_goto(''); return; diff --git a/dependency_approval.inc b/dependency_approval.inc index 243b76a..430afb4 100755 --- a/dependency_approval.inc +++ b/dependency_approval.inc @@ -115,7 +115,7 @@ function lab_migration_dependency_approval_form_submit($form, &$form_state) if ($solution_data = db_fetch_object($solution_q)) { drupal_set_message('Cannot delete dependency since it is linked with some solutions' , 'error'); } else { - if (delete_dependency($form_state['values']['run']['dependency'])) + if (lab_migration_delete_dependency($form_state['values']['run']['dependency'])) { drupal_set_message('Dependency deleted' , 'status'); diff --git a/general_deletion.inc b/general_deletion.inc index 604768a..fc3a09b 100755 --- a/general_deletion.inc +++ b/general_deletion.inc @@ -4,7 +4,7 @@ /****************************** DELETION FUNCTIONS ****************************/ /******************************************************************************/ -function delete_solution($solution_id) +function lab_migration_delete_solution($solution_id) { global $user; $root_path = lab_migration_path(); @@ -90,7 +90,7 @@ function delete_solution($solution_id) return $status; } -function delete_experiment($experiment_id) +function lab_migration_delete_experiment($experiment_id) { $status = TRUE; $root_path = lab_migration_path(); @@ -109,7 +109,7 @@ function delete_experiment($experiment_id) while ($solution_data = db_fetch_object($solution_q)) { $delete_exp_folder = TRUE; - if (!delete_solution($solution_data->id)) + if (!lab_migration_delete_solution($solution_data->id)) $status = FALSE; } @@ -147,7 +147,7 @@ function delete_experiment($experiment_id) return FALSE; } -function delete_lab($lab_id) +function lab_migration_delete_lab($lab_id) { $status = TRUE; $root_path = lab_migration_path(); @@ -164,7 +164,7 @@ function delete_lab($lab_id) $experiment_q = db_query("SELECT * FROM {lab_migration_experiment} WHERE proposal_id = %d", $proposal_data->id); while ($experiment_data = db_fetch_object($experiment_q)) { - if (!delete_experiment($experiment_data->id)) + if (!lab_migration_delete_experiment($experiment_data->id)) { $status = FALSE; } @@ -172,46 +172,7 @@ function delete_lab($lab_id) return $status; } -function delete_file($file_id) -{ - $root_path = lab_migration_path(); - - $file_q = db_query("SELECT * FROM {lab_migration_solution_files} WHERE id = %d LIMIT 1", $file_id); - $file_data = db_fetch_object($file_q); - if (!$file_data) - { - drupal_set_message('Invalid file specified.', 'error'); - return FALSE; - } - - if (!file_exists($root_path . $file_data->filepath)) - { - drupal_set_message(t('Error deleting !file. File does not exists.', array('!file' => $file_data->filepath)), 'error'); - return FALSE; - } - - /* removing solution file */ - if (!unlink($root_path . $file_data->filepath)) - { - drupal_set_message(t('Error deleting !file', array('!file' => $file_data->filepath)), 'error'); - - /* sending email to admins */ - $email_to = variable_get('lab_migration_emails', ''); - $param['standard']['subject'] = "[ERROR] Error deleting file"; - $param['standard']['body'] = "Error deleting file by " . $user->uid . " at " . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] . " : - file id : " . $file_id . " - file path : " . $file_data->filepath; - if (!drupal_mail('lab_migration', 'standard', $email_to, language_default(), $param, variable_get('lab_migration_from_email', NULL), TRUE)) - drupal_set_message('Error sending email message.', 'error'); - return FALSE; - } else { - /* deleting example files database entries */ - db_query("DELETE FROM {lab_migration_solution_files} WHERE id = %d", $file_id); - return TRUE; - } -} - -function del_lab_pdf($lab_id) +function lab_migration_del_lab_pdf($lab_id) { $root_path = lab_migration_path(); $dir_path = $root_path . "latex/"; @@ -221,7 +182,7 @@ function del_lab_pdf($lab_id) } -function delete_dependency($dependency_id) +function lab_migration_delete_dependency($dependency_id) { global $user; $root_path = lab_migration_path(); diff --git a/lab_migration.module b/lab_migration.module index 977511c..ea3bc4b 100755 --- a/lab_migration.module +++ b/lab_migration.module @@ -411,14 +411,14 @@ function lab_migration_check_valid_filename($file_name) { return TRUE; } -function check_name($name = '') { +function lab_migration_check_name($name = '') { if (!preg_match('/^[0-9a-zA-Z\ ]+$/', $name)) return FALSE; else return TRUE; } -function check_code_number($number = '') { +function lab_migration_check_code_number($number = '') { if (!preg_match('/^[0-9]+$/', $number)) return FALSE; else @@ -431,7 +431,7 @@ function lab_migration_path() { /************************* USER VERIFICATION FUNCTIONS ************************/ -function get_proposal() { +function lab_migration_get_proposal() { global $user; $proposal_q = db_query("SELECT * FROM {lab_migration_proposal} WHERE solution_provider_uid = %d AND solution_status = 2 ORDER BY id DESC LIMIT 1", $user->uid); @@ -463,26 +463,26 @@ function get_proposal() { /***************************** GENERAL FUNCTIONS ******************************/ -function get_category_name($category_id) { - $category_data = ''; - switch ($category_id) - { - case 0: $category_data = 'Not Selected'; break; - case 1: $category_data = 'Fluid Mechanics'; break; - case 2: $category_data = 'Control Theory & Control Systems'; break; - case 3: $category_data = 'Chemical Engineering'; break; - case 4: $category_data = 'Thermodynamics'; break; - case 5: $category_data = 'Mechanical Engineering'; break; - case 6: $category_data = 'Signal Processing'; break; - case 7: $category_data = 'Digital Communications'; break; - case 8: $category_data = 'Electrical Technology'; break; - case 9: $category_data = 'Mathematics & Pure Science'; break; - case 10: $category_data = 'Analog Electronics'; break; - case 11: $category_data = 'Digital Electronics'; break; - case 12: $category_data = 'Computer Programming'; break; - case 13: $category_data = 'Others'; break; - default: $category_data = 'Unknown'; break; - } - return $category_data; +function lab_migration_get_category_name($category_id) { + $category_data = ''; + switch ($category_id) + { + case 0: $category_data = 'Not Selected'; break; + case 1: $category_data = 'Fluid Mechanics'; break; + case 2: $category_data = 'Control Theory & Control Systems'; break; + case 3: $category_data = 'Chemical Engineering'; break; + case 4: $category_data = 'Thermodynamics'; break; + case 5: $category_data = 'Mechanical Engineering'; break; + case 6: $category_data = 'Signal Processing'; break; + case 7: $category_data = 'Digital Communications'; break; + case 8: $category_data = 'Electrical Technology'; break; + case 9: $category_data = 'Mathematics & Pure Science'; break; + case 10: $category_data = 'Analog Electronics'; break; + case 11: $category_data = 'Digital Electronics'; break; + case 12: $category_data = 'Computer Programming'; break; + case 13: $category_data = 'Others'; break; + default: $category_data = 'Unknown'; break; + } + return $category_data; } @@ -64,7 +64,7 @@ function _latex_generate_files($lab_id, $full_lab = FALSE) /* regenerate lab if full lab selected */ if ($full_lab) - del_lab_pdf($proposal_data->id); + lab_migration_del_lab_pdf($proposal_data->id); /* check if lab already generated */ if (file_exists($dir_path . "lab_" . $proposal_data->id . ".pdf")) @@ -180,7 +180,7 @@ function _latex_generate_files($lab_id, $full_lab = FALSE) /*********************** DELETING TEMPORARY FILES ***************************/ /* regenerate lab if full lab selected */ if ($full_lab) - del_lab_pdf($proposal_data->id); + lab_migration_del_lab_pdf($proposal_data->id); } function _latex_copy_script_file() @@ -209,7 +209,7 @@ function _latex_run_script($lab_filename, $solution_provider_filename, $latex_fi function lab_migration_delete_lab_pdf() { $lab_id = arg(3); - del_lab_pdf($lab_id); + lab_migration_del_lab_pdf($lab_id); drupal_set_message(t('Lab schedule for regeneration.'), 'status'); drupal_goto('lab_migration/code_approval/bulk'); return; diff --git a/proposal.inc b/proposal.inc index 8be96e8..06e8c36 100755 --- a/proposal.inc +++ b/proposal.inc @@ -136,7 +136,7 @@ function lab_migration_proposal_form($form_state) function lab_migration_proposal_form_validate($form, &$form_state) { if (!preg_match('/^[0-9\ \+]{0,15}$/', $form_state['values']['contact_ph'])) - form_set_error('mobile', t('Invalid contact phone number')); + form_set_error('contact_ph', t('Invalid contact phone number')); return; } @@ -115,7 +115,7 @@ function lab_migration_run_form($form_state) '</ul>'; } - $category_data = get_category_name($lab_details->category); + $category_data = lab_migration_get_category_name($lab_details->category); $form['run']['lab_details'] = array( '#type' => 'item', diff --git a/upload_code.inc b/upload_code.inc index 982088f..9ac6508 100755 --- a/upload_code.inc +++ b/upload_code.inc @@ -5,7 +5,7 @@ function lab_migration_list_experiments() { global $user; - $proposal_data = get_proposal(); + $proposal_data = lab_migration_get_proposal(); if (!$proposal_data) { drupal_goto(''); return; @@ -72,7 +72,7 @@ function lab_migration_upload_code_form($form_state) { global $user; - $proposal_data = get_proposal(); + $proposal_data = lab_migration_get_proposal(); if (!$proposal_data) { drupal_goto(''); return; @@ -272,10 +272,10 @@ function lab_migration_upload_code_form($form_state) function lab_migration_upload_code_form_validate($form, &$form_state) { - if (!check_code_number($form_state['values']['code_number'])) + if (!lab_migration_check_code_number($form_state['values']['code_number'])) form_set_error('code_number', t('Invalid Code Number. Code Number can contain only numbers.')); - if (!check_name($form_state['values']['code_caption'])) + if (!lab_migration_check_name($form_state['values']['code_caption'])) form_set_error('code_caption', t('Caption can contain only alphabets, numbers and spaces.')); if (isset($_FILES['files'])) @@ -359,7 +359,7 @@ function lab_migration_upload_code_form_submit($form, &$form_state) { $root_path = lab_migration_path(); - $proposal_data = get_proposal(); + $proposal_data = lab_migration_get_proposal(); if (!$proposal_data) { drupal_goto(''); return; diff --git a/upload_code_delete.inc b/upload_code_delete.inc index ca7b3c2..2547f45 100755 --- a/upload_code_delete.inc +++ b/upload_code_delete.inc @@ -46,7 +46,7 @@ function lab_migration_upload_code_delete() } /* deleting solution files */ - if (delete_solution($solution_data->id)) + if (lab_migration_delete_solution($solution_data->id)) { drupal_set_message('Solution deleted.', 'status'); |