diff options
| -rwxr-xr-x | cfd_case_study.module | 4 | ||||
| -rwxr-xr-x | manage_proposal.inc | 16 | ||||
| -rwxr-xr-x | proposal.inc | 2 |
3 files changed, 3 insertions, 19 deletions
diff --git a/cfd_case_study.module b/cfd_case_study.module index 2ae0ed7..76d7fbc 100755 --- a/cfd_case_study.module +++ b/cfd_case_study.module @@ -379,11 +379,11 @@ function cfd_case_study_check_code_number($number = '') } function cfd_case_study_path() { - return $_SERVER['DOCUMENT_ROOT'] . base_path() . 'uploads/case_study_uploads/'; + return $_SERVER['DOCUMENT_ROOT'] . base_path() . 'cfd_uploads/case_study_uploads/'; } function cfd_case_study_file_path($value='') { - return $_SERVER['DOCUMENT_ROOT'] . base_path() . 'uploads/'; + return $_SERVER['DOCUMENT_ROOT'] . base_path() . 'cfd_uploads/'; } /************************* USER VERIFICATION FUNCTIONS ************************/ function cfd_case_study_get_proposal() diff --git a/manage_proposal.inc b/manage_proposal.inc index cec5890..69b20cb 100755 --- a/manage_proposal.inc +++ b/manage_proposal.inc @@ -139,22 +139,6 @@ function cfd_case_study_proposal_approval_form($form, &$form_state) drupal_goto('case-study-project/manage-proposal'); return; } - if ($proposal_data->project_guide_name == "NULL" || $proposal_data->project_guide_name == "") - { - $project_guide_name = "Not Entered"; - } //$proposal_data->project_guide_name == NULL - else - { - $project_guide_name = $proposal_data->project_guide_name; - } - if ($proposal_data->project_guide_email_id == "NULL" || $proposal_data->project_guide_email_id == "") - { - $project_guide_email_id = "Not Entered"; - } //$proposal_data->project_guide_email_id == NULL - else - { - $project_guide_email_id = $proposal_data->project_guide_email_id; - } $form['contributor_name'] = array( '#type' => 'item', '#markup' => l($proposal_data->name_title . ' ' . $proposal_data->contributor_name, 'user/' . $proposal_data->uid), diff --git a/proposal.inc b/proposal.inc index ffd590d..8c22858 100755 --- a/proposal.inc +++ b/proposal.inc @@ -547,5 +547,5 @@ function cfd_case_study_proposal_form_submit($form, &$form_state) } function case_study_path() { - return $_SERVER['DOCUMENT_ROOT'] . base_path() . 'uploads/case_study_uploads/'; + return $_SERVER['DOCUMENT_ROOT'] . base_path() . 'cfd_uploads/case_study_uploads/'; } |