added prams and fixed book dependancy issue

4 files changed, 29 insertions, 49 deletions

diff --git a/code.inc b/code.inc
index ef5d569..aa99d85 100755
--- a/code.inc
+++ b/code.inc
@@ -226,15 +226,13 @@ $(document).ready(function(){
       '#options' => _list_of_book_titles(),
   );*/
   
-  
-  
-   $form['existing_depfile']['dep_book'] = array(
+   list($files_options, $files_options_class) = _list_of_book_dependency_files($preference_data->id);
+
+$form['existing_depfile']['dep_book'] = array(
       '#type' => 'item',
       '#title' => t('Dependency Files'),
     
   );
-
-  list($files_options, $files_options_class) = _list_of_book_dependency_files();
   $form['existing_depfile']['dep_chapter_example_files'] = array(
       '#type' => 'checkboxes',
       //'#title' => t('Dependency Files'),
@@ -243,8 +241,7 @@ $(document).ready(function(){
       '#prefix' => '<div id="ckb" style="height:500px;overflow:auto;">',
       '#suffix' =>'</div>',
       '#multiple' => TRUE,
-  );
-
+      );
   $form['existing_depfile']['dep_upload'] = array(
       '#type' => 'item',          
       '#markup' => '<hr style="color:red">'. l('Upload New Depedency Files', 'textbook_companion/code/upload_dep'),
@@ -681,7 +678,7 @@ function upload_examples_form_submit($form, &$form_state) {
     			'Content-Transfer-Encoding' => '8Bit',
     			'X-Mailer'=> 'Drupal','Cc' => $cc, 'Bcc' => $bcc);
   
-  if (!drupal_mail('textbook_companion', 'example_uploaded', $email_to, language_default(), $param, $from, TRUE))
+  if (!drupal_mail('textbook_companion', 'example_uploaded', $email_to, language_default(), $params, $from, TRUE))
     drupal_set_message('Error sending email message.', 'error');
 
   drupal_goto('textbook_companion/code');
@@ -792,7 +789,7 @@ function _upload_examples_delete()
     			'Content-Transfer-Encoding' => '8Bit',
     			'X-Mailer'=> 'Drupal','Cc' => $cc, 'Bcc' => $bcc);
 
-    if (!drupal_mail('textbook_companion', 'example_deleted_user', $email_to, language_default(), $param, $from, TRUE))
+    if (!drupal_mail('textbook_companion', 'example_deleted_user', $email_to, language_default(), $params, $from, TRUE))
       drupal_set_message('Error sending email message.', 'error');
   } else {
     drupal_set_message('Error deleting example.', 'status');
@@ -829,38 +826,27 @@ function _list_of_book_titles()
   return $book_titles;
 }
 
-function _list_of_book_dependency_files()
+function _list_of_book_dependency_files($book_id)
 {
+  global $user;
   $book_dependency_files = array();
   $book_dependency_files_class = array();
 
-  /*$book_dependency_files_q = db_query("SELECT * FROM {textbook_companion_dependency_files} ORDER BY filename ASC");*/
-
-	/*$query = db_select('textbook_companion_dependency_files');
-	$query->fields('textbook_companion_dependency_files');
-	$query->orderBy('filename', 'ASC');*/
-	
-/*	$query = db_select('textbook_companion_dependency_files', 'tcdp');
-	$query->fields('tcdp');
-	$query->fields('tcp', array('book', 'author','publisher', 'edition', 'year'));
-	$query->leftJoin('textbook_companion_preference', 'tcp', 'tcdp.preference_id = tcp.id');
-	$result = $query->execute();*/
-	
-	$book_dependency_files_q = db_query("
-                                            select * from {textbook_companion_dependency_files} tcdf 
-                                            LEFT JOIN textbook_companion_preference pe on tcdf.preference_id=pe.id 
-                                            LEFT JOIN textbook_companion_proposal po ON pe.proposal_id = po.id 
-                                            WHERE po.proposal_status = 3 AND pe.approval_status = 1
-                                           ");
+                $query = db_select('textbook_companion_dependency_files');
+                $query->fields('textbook_companion_dependency_files');
+                $query->condition('preference_id', $book_id);
+                $query->orderBy('filename', 'ASC');
+                $book_dependency_files_q = $query->execute();
 
 
   while ($book_dependency_files_data = $book_dependency_files_q->fetchObject())
   {
+
     $temp_caption = '';
-    if ($book_dependency_files_data->caption)
-      $temp_caption .= ' ===>[Caption: ' . $book_dependency_files_data->caption . ' ' .', Book: '. $book_dependency_files_data->book .', Author: '. $book_dependency_files_data->author . ', Publisher: '. $book_dependency_files_data->publisher . ', Edition: '. $book_dependency_files_data->edition .', Year: '. $book_dependency_files_data->year.']';
+    if ($book_dependency_files_data->caption){
     $book_dependency_files[$book_dependency_files_data->id] = l($book_dependency_files_data->filename , 'download/dependency/' . $book_dependency_files_data->id, array('attributes' => array('class' => 'title'))). $temp_caption;
     $book_dependency_files_class[$book_dependency_files_data->id] = $book_dependency_files_data->preference_id;
+    }
   }
   return array($book_dependency_files, $book_dependency_files_class);
 }
diff --git a/editcodeadmin.inc b/editcodeadmin.inc
index ac7951f..b1903de 100755
--- a/editcodeadmin.inc
+++ b/editcodeadmin.inc
@@ -5,7 +5,7 @@
 /***************************** EDIT EXAMPLE ***********************************/
 /******************************************************************************/
 
-function upload_examples_admin_edit_form($form_state)
+function upload_examples_admin_edit_form($form, $form_state)
 {
   global $user;
   $example_id = arg(2);
@@ -1073,7 +1073,7 @@ function upload_examples_admin_edit_form_submit($form, &$form_state)
   $email_to = $user_data->mail;
   $param['example_updated_admin']['example_id'] = $example_id;
   $param['example_updated_admin']['user_id'] = $proposal_data->uid;
-  if (!drupal_mail('textbook_companion', 'example_updated_admin', $email_to, language_default(), $param, variable_get('textbook_companion_from_email', NULL), TRUE))
+  if (!drupal_mail('textbook_companion', 'example_updated_admin', $email_to, language_default(), $params, variable_get('textbook_companion_from_email', NULL), TRUE))
     drupal_set_message('Error sending email message.', 'error');
 
   drupal_set_message(t("Example successfully udpated."), 'status');
diff --git a/manage_proposal.inc b/manage_proposal.inc
index 4527146..648faac 100755
--- a/manage_proposal.inc
+++ b/manage_proposal.inc
@@ -418,7 +418,7 @@ if($form_state['values']['proposal_type']==0){
     			'X-Mailer'=> 'Drupal','Cc' => $cc, 'Bcc' => $bcc);
     
 
-    if (!drupal_mail('textbook_companion', 'proposal_disapproved', $email_to , language_default(), $param,$from, TRUE))
+    if (!drupal_mail('textbook_companion', 'proposal_disapproved', $email_to , language_default(), $params,$from, TRUE))
       drupal_set_message('Error sending email message.', 'error');
 
     drupal_set_message('Book proposal dis-approved. User has been notified of the dis-approval.', 'error');
@@ -468,7 +468,7 @@ if($form_state['values']['proposal_type']==0){
     			'Content-Transfer-Encoding' => '8Bit',
     			'X-Mailer'=> 'Drupal','Cc' => $cc, 'Bcc' => $bcc);
   
-  if (!drupal_mail('textbook_companion', 'proposal_approved', $email_to , language_default(), $param, $from, TRUE))
+  if (!drupal_mail('textbook_companion', 'proposal_approved', $email_to , language_default(), $params, $from, TRUE))
     drupal_set_message('Error sending email message.', 'error');
 
   drupal_set_message('Book proposal approved. User has been notified of the approval', 'status');
@@ -1668,7 +1668,7 @@ function _failed_all($preference_id=0, $confirm="") {
 
     $message = $body;        
     //drupal_mail($message);
-    //drupal_mail('', 'standard', $email_to, language_default(), $param, variable_get('textbook_companion_from_email', NULL), TRUE))
+    //drupal_mail('', 'standard', $email_to, language_default(), $params, variable_get('textbook_companion_from_email', NULL), TRUE))
     $from = variable_get('textbook_companion_from_email', NULL);
     $bcc = variable_get('textbook_companion_emails_fail_rem_bcc', NULL);
     fail_rem_send_mail( $from, $to, $bcc, $subject, $message);
diff --git a/textbook_companion.module b/textbook_companion.module
index f51e38e..09eae65 100755
--- a/textbook_companion.module
+++ b/textbook_companion.module
@@ -2129,7 +2129,7 @@ Best Wishes,
 
 	$query = db_select('textbook_companion_proposal');
 	$query->fields('textbook_companion_proposal');
-	$query->condition('id', $params['proposal_received']['proposal_id']);
+	$query->condition('id', $params['nonaicte_proposal_received']['proposal_id']);
 	$query->range(0, 1);
 	$result = $query->execute();
 	$proposal_data =$result->fetchObject();
@@ -2146,17 +2146,13 @@ Best Wishes,
                 WHERE proposal_id = :proposal_id AND pref_number = :pref_number LIMIT 1
                ";
       $args = array(
-                    ':proposal_id' => $params['proposal_received']['proposal_id'],
+                    ':proposal_id' => $params['nonaicte_proposal_received']['proposal_id'],
                     ':pref_number' => 1,                    
       );
       $preference1_q = db_query($query,$args);
       $preference1_data = $preference1_q->fetchObject();
-
-	
-	
-
-      $user_data = user_load($params['proposal_received']['user_id']);
-      $message['headers'] = $params['proposal_received']['headers']; 
+      $user_data = user_load($params['nonaicte_proposal_received']['user_id']);
+      $message['headers'] = $params['nonaicte_proposal_received']['headers'];
       $message['subject'] = t('[!site_name] Your book proposal has been received', array('!site_name' => variable_get('site_name', '')),array('language' => $language->language));
       $message['body'] =array('body' => t('
 Dear !user_name,
@@ -2173,7 +2169,7 @@ College Teacher / Professor : ' . $proposal_data->faculty . '
 Reviewer : ' .  $proposal_data->reviewer . '
 Expected date of completion : ' .  date('d-m-Y', $proposal_data->completion_date) . '
 
-Your Non AICTE Book Preferences :
+Your Non AICTE Book Preferences:
 
 Book Preference :-
 Title of the book : ' . $preference1_data->book . '
@@ -2185,7 +2181,7 @@ Year of publication : ' . $preference1_data->year . '
 Category : ' . $preference1_data->category_name . '
 
 
-Uploaded Sample Code :'.$samplecodefilename.'
+Uploaded Sample Code : '.$samplecodefilename.'
 
 Your proposal is under review and you will soon receive an email from us regarding the same.
 
@@ -2198,7 +2194,7 @@ case 'nonaicte_proposal_to_pi':
 
 	$query = db_select('textbook_companion_proposal');
 	$query->fields('textbook_companion_proposal');
-	$query->condition('id', $params['proposal_received']['proposal_id']);
+	$query->condition('id', $params['nonaicte_proposal_received']['proposal_id']);
 	$query->range(0, 1);
 	$result = $query->execute();
 	$proposal_data=$result->fetchObject();
@@ -2207,7 +2203,7 @@ case 'nonaicte_proposal_to_pi':
 
 	$query = db_select('textbook_companion_preference');
 	$query->fields('textbook_companion_preference');
-	$query->condition('proposal_id', $params['proposal_received']['proposal_id']);
+	$query->condition('proposal_id', $params['nonaicte_proposal_received']['proposal_id']);
 	$query->condition('pref_number', 1);
 	$query->range(0, 1);
 	$result = $query->execute();
@@ -2248,8 +2244,6 @@ Best Wishes,
 !site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), array('language' => $language->language)));
       break;
 
-
-
     case 'proposal_approved':     
 
 	$query = db_select('textbook_companion_proposal');