";
- $num_rows = mysql_num_rows($result);
+ $num_rows = $result->rowCount();
if ($num_rows > 0) {
$i = 1;
- while($row = db_fetch_object($result)) {
+ while($row = $result->fetchObject()) {
/* fixing title string */
$title = "";
$edition = "";
@@ -752,9 +912,18 @@ function textbook_companion_aicte_proposal_all() {
}
/* check if user has already submitted a proposal */
- $proposal_q = db_query("SELECT * FROM {textbook_companion_proposal} WHERE uid = %d ORDER BY id DESC LIMIT 1", $user->uid);
+
+ /* $proposal_q = db_query("SELECT * FROM {textbook_companion_proposal} WHERE uid = %d ORDER BY id DESC LIMIT 1", $user->uid);*/
+
+ $query = db_select('textbook_companion_proposal');
+ $query->fields('textbook_companion_proposal');
+ $query->condition('uid', $user->uid);
+ $query->orderBy('id', 'DESC');
+ $query->range(0, 1);
+ $proposal_q = $query->execute();
+
if ($proposal_q) {
- if ($proposal_data = db_fetch_object($proposal_q)) {
+ if ($proposal_data = $proposal_q->fetchObject()) {
switch ($proposal_data->proposal_status) {
case 0:
drupal_set_message(t('We have already received your proposal. We will get back to you soon.'), 'status');
@@ -788,7 +957,8 @@ function textbook_companion_aicte_proposal_all() {
$page_content .= "Search :
";
$page_content .= "
";
//$page_content .= drupal_get_form("textbook_companion_aicte_report_form");
- $page_content .= drupal_get_form("textbook_companion_aicte_proposal_form");
+ $textbook_companion_aicte_proposal_form = drupal_get_form("textbook_companion_aicte_proposal_form");
+ $page_content .= drupal_render($textbook_companion_aicte_proposal_form);
return $page_content;
}
/*non aicte book proposal */
@@ -805,9 +975,18 @@ function textbook_companion_nonaicte_proposal_all() {
}
/* check if user has already submitted a proposal */
- $proposal_q = db_query("SELECT * FROM {textbook_companion_proposal} WHERE uid = %d ORDER BY id DESC LIMIT 1", $user->uid);
+
+ /*$proposal_q = db_query("SELECT * FROM {textbook_companion_proposal} WHERE uid = %d ORDER BY id DESC LIMIT 1", $user->uid);*/
+
+ $query = db_select('textbook_companion_proposal');
+ $query->fields('textbook_companion_proposal');
+ $query->condition('uid', $user->uid);
+ $query->orderBy('id', 'DESC');
+ $query->range(0, 1);
+ $proposal_q = $query->execute();
+
if ($proposal_q) {
- if ($proposal_data = db_fetch_object($proposal_q)) {
+ if ($proposal_data = $proposal_q->fetchObject()) {
switch ($proposal_data->proposal_status) {
case 0:
drupal_set_message(t('We have already received your proposal. We will get back to you soon.'), 'status');
@@ -834,8 +1013,9 @@ function textbook_companion_nonaicte_proposal_all() {
}
}
- //variable_del("aicte_".$user->uid);
- $page_content .= drupal_get_form("book_proposal_nonaicte_form");
+ //variable_del("aicte_".$user->uid);
+ $book_proposal_nonaicte_form = drupal_get_form("book_proposal_nonaicte_form");
+ $page_content .= drupal_render($book_proposal_nonaicte_form);
return $page_content;
}
@@ -844,18 +1024,24 @@ function textbook_companion_proposal_all() {
global $user;
$page_content = "";
- if (!$user->uid) {
-
- $page_content .= "
";
- $page_content .= "Please Login to create a proposal. ";
- $page_content .= " ";
- return $page_content;
- }
+ // if (!$user->uid) {
+ // drupal_set_message('It is mandatory to login on this website to access the proposal form', 'error');
+ // return;
+ // }
/* check if user has already submitted a proposal */
- $proposal_q = db_query("SELECT * FROM {textbook_companion_proposal} WHERE uid = %d ORDER BY id DESC LIMIT 1", $user->uid);
+
+ /*$proposal_q = db_query("SELECT * FROM {textbook_companion_proposal} WHERE uid = %d ORDER BY id DESC LIMIT 1", $user->uid);*/
+
+ $query = db_select('textbook_companion_proposal');
+ $query->fields('textbook_companion_proposal');
+ $query->condition('uid', $user->uid);
+ $query->orderBy('id', 'DESC');
+ $query->range(0, 1);
+ $proposal_q = $query->execute();
+
if ($proposal_q) {
- if ($proposal_data = db_fetch_object($proposal_q)) {
+ if ($proposal_data =$proposal_q->fetchObject()) {
switch ($proposal_data->proposal_status) {
case 0:
drupal_set_message(t('We have already received your proposal. We will get back to you soon.'), 'status');
@@ -884,31 +1070,49 @@ function textbook_companion_proposal_all() {
$selections = variable_get("aicte_".$user->uid, "");
if($selections) {
- $selections = implode(",", $selections);
- $query = "
+
+ /*$query = "
SELECT * FROM textbook_companion_aicte
WHERE id IN ({$selections})
";
- $result = db_query($query);
- $row1 = db_fetch_object($result);
- $row2 = db_fetch_object($result);
- $row3 = db_fetch_object($result);
- $page_content .= drupal_get_form("book_proposal_form", $row1, $row2, $row3);
+ $result = db_query($query);*/
+
+ $query = db_select('textbook_companion_aicte');
+ $query->fields('textbook_companion_aicte');
+ $query->condition('id',$selections[0]);
+ $result1 = $query->execute();
+ $row1 = $result1->fetchObject();
+
+ $query = db_select('textbook_companion_aicte');
+ $query->fields('textbook_companion_aicte');
+ $query->condition('id',$selections[1]);
+ $result2 = $query->execute();
+ $row2 = $result2->fetchObject();
+
+ $query = db_select('textbook_companion_aicte');
+ $query->fields('textbook_companion_aicte');
+ $query->condition('id',$selections[2]);
+ $result3 = $query->execute();
+ $row3 = $result3->fetchObject();
+ $book_proposal_form = drupal_get_form("book_proposal_form", $row1, $row2, $row3);
+
+ $page_content .= drupal_render($book_proposal_form);
} else {
- $page_content .= drupal_get_form("book_proposal_form");
- // drupal_goto("aicte_proposal");
+ // $book_proposal_form = drupal_get_form("book_proposal_form");
+ // $page_content .= drupal_render($book_proposal_form);
+ drupal_goto("aicte_proposal");
}
return $page_content;
}
-function book_proposal_form($form_state, $row1=NULL, $row2=NULL, $row3=NULL)
+function book_proposal_form($form,&$form_state, $row1=NULL, $row2=NULL, $row3=NULL)
{
global $user;
$form = array();
$form['imp_notice'] = array(
'#type' => 'item',
- '#value' => '
Please fill up this form carefully as the details entered here will be exactly written in the Textbook Companion ',
+ '#markup' => '
Please fill up this form carefully as the details entered here will be exactly written in the Textbook Companion ',
);
$form['full_name'] = array(
@@ -981,59 +1185,6 @@ function book_proposal_form($form_state, $row1=NULL, $row2=NULL, $row3=NULL)
'#maxlength' => 50,
'#required' => TRUE,
);
- $form['city'] = array(
- '#type' => 'textfield',
- '#title' => t('City/Village'),
- '#size' => 50,
- '#maxlength' => 50,
- '#required' => TRUE,
- );
- $form['states'] = array(
- '#type' => 'select',
- '#title' => t('State'),
- '#options' => array (
- '' => 'Please select....',
- 'Andhra Pradesh' => 'Andhra Pradesh',
- 'Arunachal Pradesh' => 'Arunachal Pradesh',
- 'Assam' => 'Assam',
- 'Bihar' => 'Bihar',
- 'Chhattisgarh' => 'Chhattisgarh',
- 'Goa' => 'Goa',
- 'Gujarat' => 'Gujarat',
- 'Haryana' => 'Haryana',
- 'Himachal Pradesh' => 'Himachal Pradesh',
- 'Jammu & Kashmir' => 'Jammu & Kashmir',
- 'Jharkhand' => 'Jharkhand',
- 'Karnataka' => 'Karnataka',
- 'Kerala' => 'Kerala',
- 'Madhya Pradesh' => 'Madhya Pradesh',
- 'Maharashtra' => 'Maharashtra',
- 'Manipur' => 'Manipur',
- 'Meghalaya' => 'Meghalaya',
- 'Mizoram' => 'Mizoram',
- 'Nagaland' => 'Nagaland',
- 'Odisha' => 'Odisha',
- 'Punjab' => 'Punjab',
- 'Rajasthan' => 'Rajasthan',
- 'Sikkim' => 'Sikkim',
- 'Tamil Nadu' => 'Tamil Nadu',
- 'Telangana' => 'Telangana',
- 'Tripura' => 'Tripura',
- 'Uttarakhand' => 'Uttarakhand',
- 'Uttar Pradesh'=> 'Uttar Pradesh',
- 'West Bengal' => 'West Bengal',
- 'Andaman & Nicobar' => 'Andaman & Nicobar',
- 'Chandigarh' => 'Chandigarh',
- 'Dadra and Nagar Haveli' => 'Dadra and Nagar Haveli',
- 'Daman & Diu' => 'Daman & Diu',
- 'Delhi' => 'Delhi',
- 'Lakshadweep' => 'Lakshadweep',
- 'Puducherry' => 'Puducherry',
- 'Others' => 'Others',
- ),
- '#required' => TRUE,
-
- );
$form['faculty'] = array(
'#type' => 'hidden',
'#value' => 'None',
@@ -1105,7 +1256,7 @@ function book_proposal_form($form_state, $row1=NULL, $row2=NULL, $row3=NULL)
'#size' => 30,
'#maxlength' => 100,
'#required' => TRUE,
- '#value' => $row1->book,
+ '#default_value' => $row1->book,
'#disabled' => ($row1->book?TRUE:FALSE),
);
$form['preference1']['author1'] = array(
@@ -1114,7 +1265,7 @@ function book_proposal_form($form_state, $row1=NULL, $row2=NULL, $row3=NULL)
'#size' => 30,
'#maxlength' => 100,
'#required' => TRUE,
- '#value' => $row1->author,
+ '#default_value' => $row1->author,
'#disabled' => ($row1->author?TRUE:FALSE),
);
$form['preference1']['isbn1'] = array(
@@ -1123,7 +1274,7 @@ function book_proposal_form($form_state, $row1=NULL, $row2=NULL, $row3=NULL)
'#size' => 30,
'#maxlength' => 25,
'#required' => TRUE,
- '#value' => $row1->isbn,
+ '#default_value' => $row1->isbn,
'#disabled' => ($row1->isbn?TRUE:FALSE),
);
$form['preference1']['publisher1'] = array(
@@ -1132,7 +1283,7 @@ function book_proposal_form($form_state, $row1=NULL, $row2=NULL, $row3=NULL)
'#size' => 30,
'#maxlength' => 50,
'#required' => TRUE,
- '#value' => $row1->publisher,
+ '#default_value' => $row1->publisher,
);
$form['preference1']['edition1'] = array(
'#type' => 'textfield',
@@ -1140,7 +1291,7 @@ function book_proposal_form($form_state, $row1=NULL, $row2=NULL, $row3=NULL)
'#size' => 4,
'#maxlength' => 2,
'#required' => TRUE,
- '#value' => $row1->edition,
+ '#default_value' => $row1->edition,
);
$form['preference1']['year1'] = array(
'#type' => 'textfield',
@@ -1148,7 +1299,7 @@ function book_proposal_form($form_state, $row1=NULL, $row2=NULL, $row3=NULL)
'#size' => 4,
'#maxlength' => 4,
'#required' => TRUE,
- '#value' => $row1->year,
+ '#default_value' => $row1->year,
);
$form['preference2'] = array(
'#type' => 'fieldset',
@@ -1162,7 +1313,7 @@ function book_proposal_form($form_state, $row1=NULL, $row2=NULL, $row3=NULL)
'#size' => 30,
'#maxlength' => 100,
'#required' => TRUE,
- '#value' => $row2->book,
+ '#default_value' => $row2->book,
'#disabled' => ($row2->book?TRUE:FALSE),
);
$form['preference2']['author2'] = array(
@@ -1171,7 +1322,7 @@ function book_proposal_form($form_state, $row1=NULL, $row2=NULL, $row3=NULL)
'#size' => 30,
'#maxlength' => 100,
'#required' => TRUE,
- '#value' => $row2->author,
+ '#default_value' => $row2->author,
'#disabled' => ($row2->author?TRUE:FALSE),
);
$form['preference2']['isbn2'] = array(
@@ -1180,7 +1331,7 @@ function book_proposal_form($form_state, $row1=NULL, $row2=NULL, $row3=NULL)
'#size' => 30,
'#maxlength' => 25,
'#required' => TRUE,
- '#value' => $row2->isbn,
+ '#default_value' => $row2->isbn,
'#disabled' => ($row2->isbn?TRUE:FALSE),
);
$form['preference2']['publisher2'] = array(
@@ -1189,7 +1340,7 @@ function book_proposal_form($form_state, $row1=NULL, $row2=NULL, $row3=NULL)
'#size' => 30,
'#maxlength' => 50,
'#required' => TRUE,
- '#value' => $row2->publisher,
+ '#default_value' => $row2->publisher,
);
$form['preference2']['edition2'] = array(
'#type' => 'textfield',
@@ -1197,7 +1348,7 @@ function book_proposal_form($form_state, $row1=NULL, $row2=NULL, $row3=NULL)
'#size' => 4,
'#maxlength' => 2,
'#required' => TRUE,
- '#value' => $row2->edition,
+ '#default_value' => $row2->edition,
);
$form['preference2']['year2'] = array(
'#type' => 'textfield',
@@ -1205,7 +1356,7 @@ function book_proposal_form($form_state, $row1=NULL, $row2=NULL, $row3=NULL)
'#size' => 4,
'#maxlength' => 4,
'#required' => TRUE,
- '#value' => $row2->year,
+ '#default_value' => $row2->year,
);
$form['preference3'] = array(
'#type' => 'fieldset',
@@ -1219,7 +1370,7 @@ function book_proposal_form($form_state, $row1=NULL, $row2=NULL, $row3=NULL)
'#size' => 30,
'#maxlength' => 100,
'#required' => TRUE,
- '#value' => $row3->book,
+ '#default_value' => $row3->book,
'#disabled' => ($row3->book?TRUE:FALSE),
);
$form['preference3']['author3'] = array(
@@ -1228,7 +1379,7 @@ function book_proposal_form($form_state, $row1=NULL, $row2=NULL, $row3=NULL)
'#size' => 30,
'#maxlength' => 100,
'#required' => TRUE,
- '#value' => $row3->author,
+ '#default_value' => $row3->author,
'#disabled' => ($row3->author?TRUE:FALSE),
);
$form['preference3']['isbn3'] = array(
@@ -1237,7 +1388,7 @@ function book_proposal_form($form_state, $row1=NULL, $row2=NULL, $row3=NULL)
'#size' => 30,
'#maxlength' => 25,
'#required' => TRUE,
- '#value' => $row3->isbn,
+ '#default_value' => $row3->isbn,
'#disabled' => ($row3->isbn?TRUE:FALSE),
);
$form['preference3']['publisher3'] = array(
@@ -1246,7 +1397,7 @@ function book_proposal_form($form_state, $row1=NULL, $row2=NULL, $row3=NULL)
'#size' => 30,
'#maxlength' => 50,
'#required' => TRUE,
- '#value' => $row3->publisher,
+ '#default_value' => $row3->publisher,
);
$form['preference3']['edition3'] = array(
'#type' => 'textfield',
@@ -1254,7 +1405,7 @@ function book_proposal_form($form_state, $row1=NULL, $row2=NULL, $row3=NULL)
'#size' => 4,
'#maxlength' => 2,
'#required' => TRUE,
- '#value' => $row3->edition,
+ '#default_value' => $row3->edition,
);
$form['preference3']['year3'] = array(
'#type' => 'textfield',
@@ -1262,7 +1413,7 @@ function book_proposal_form($form_state, $row1=NULL, $row2=NULL, $row3=NULL)
'#size' => 4,
'#maxlength' => 4,
'#required' => TRUE,
- '#value' => $row3->year,
+ '#default_value' => $row3->year,
);
$form['termconditions'] = array(
'#type' => 'checkboxes',
@@ -1276,25 +1427,20 @@ function book_proposal_form($form_state, $row1=NULL, $row2=NULL, $row3=NULL)
'#value' => t('Submit')
);
- /* #value fix for #default_value bug drupal6 */
+ /* #value fix for #default_value bug drupal6
foreach(array("preference1", "preference2", "preference3") as $preference) {
foreach($form[$preference] as $key => $value) {
if(!$form[$preference][$key]["#value"]) {
unset($form[$preference][$key]["#value"]);
}
}
- }
+ }*/
return $form;
}
-function book_proposal_form_validate($form, &$form_state)
+function book_proposal_form_validate($form,&$form_state)
{
-if($form_state['values']['city']== ''){
- form_set_error('city', t('Invalid city/village'));
- }
- if($form_state['values']['state']== ''){
- form_set_error('state', t('Invalid state'));
- }
+
/* mobile */
if (!preg_match('/^[0-9\ \+]{0,15}$/', $form_state['values']['mobile']))
form_set_error('mobile', t('Invalid mobile number'));
@@ -1353,6 +1499,7 @@ if($form_state['values']['city']== ''){
function book_proposal_form_submit($form, &$form_state)
{
+
global $user;
$selections = variable_get("aicte_".$user->uid, "");
@@ -1373,23 +1520,55 @@ function book_proposal_form_submit($form, &$form_state)
}
//var_dump($form_state['values']);
-
- $query = "INSERT INTO {textbook_companion_proposal}
- (uid, approver_uid, full_name, mobile, gender, how_project, course, branch, university, city, state, faculty, reviewer, completion_date, creation_date, approval_date, proposal_status, scilab_version, operating_system, teacher_email) VALUES (".$user->uid.", 0, '".ucwords(strtolower($form_state['values']['full_name']))."', '".$form_state['values']['mobile']."', '".$form_state['values']['gender']."', '".$form_state['values']['how_project']."', '".$form_state['values']['course']."', '".$form_state['values']['branch']."', '".$form_state['values']['university']."', '".$form_state['values']['city']."','".$form_state['values']['state']."' ,'".ucwords(strtolower($form_state['values']['faculty']))."', '".ucwords(strtolower($form_state['values']['reviewer']))."', '".$completion_date_timestamp."', '".time()."', 0, 0, '".$scilab_version."', '".$form_state['values']['operating_system']."', '".$form_state['values']['faculty_email']."')";
+var_dump('okk');
+ /*$query = "INSERT INTO {textbook_companion_proposal}
+ (uid, approver_uid, full_name, mobile, gender, how_project, course, branch, university, faculty, reviewer, completion_date, creation_date, approval_date, proposal_status, scilab_version, operating_system, teacher_email) VALUES (".$user->uid.", 0, '".ucwords(strtolower($form_state['values']['full_name']))."', '".$form_state['values']['mobile']."', '".$form_state['values']['gender']."', '".$form_state['values']['how_project']."', '".$form_state['values']['course']."', '".$form_state['values']['branch']."', '".$form_state['values']['university']."', '".ucwords(strtolower($form_state['values']['faculty']))."', '".ucwords(strtolower($form_state['values']['reviewer']))."', '".$completion_date_timestamp."', '".time()."', 0, 0, '".$scilab_version."', '".$form_state['values']['operating_system']."', '".$form_state['values']['faculty_email']."')";
+
+ $result = db_query($query);*/
+
+
+$query = "INSERT INTO {textbook_companion_proposal}
+ (uid, approver_uid, full_name, mobile, gender, how_project, course, branch, university, faculty, reviewer, completion_date, creation_date, approval_date, proposal_status, scilab_version, operating_system, teacher_email, message) VALUES (:uid, :approver_uid, :full_name, :mobile, :gender, :how_project, :course, :branch, :university, :faculty, :reviewer, :completion_date,
+ :creation_date, :approval_date, :proposal_status, :scilab_version, :operating_system,
+:teacher_email, :message)";
+$args = array(
+ ":uid" => $user->uid,
+ ":approver_uid" => 0,
+ ":full_name" => ucwords(strtolower($form_state['values']['full_name'])),
+ ":mobile" =>$form_state['values']['mobile'],
+ ":gender" => $form_state['values']['gender'],
+ ":how_project" => $form_state['values']['how_project'],
+ ":course" => $form_state['values']['course'],
+ ":branch" => $form_state['values']['branch'],
+ ":university" => $form_state['values']['university'],
+ ":faculty" => ucwords(strtolower($form_state['values']['faculty'])),
+ ":reviewer" => ucwords(strtolower($form_state['values']['reviewer'])),
+ ":completion_date" => $completion_date_timestamp,
+ ":creation_date" => time(),
+ ":approval_date" => 0,
+ ":proposal_status" => 0,
+ ":scilab_version" => $scilab_version,
+ ":operating_system" => $form_state['values']['operating_system'],
+ ":teacher_email" => $form_state['values']['faculty_email'],
+ ":message" => 'None',
+ );
+
+ $result = db_query($query, $args, array('return' => Database::RETURN_INSERT_ID));
+
- $result = db_query($query);
if (!$result)
{
drupal_set_message(t('Error receiving your proposal. Please try again.'), 'error');
return;
}
/* proposal id */
- $proposal_id = db_last_insert_id('textbook_companion_proposal', 'id');
+ // $proposal_id = db_last_insert_id('textbook_companion_proposal', 'id');
+ $proposal_id = $result;
/* inserting first book preference */
if ($form_state['values']['book1'])
{
- $result = db_query("INSERT INTO {textbook_companion_preference}
+ /*$result = db_query("INSERT INTO {textbook_companion_preference}
(proposal_id, pref_number, book, author, isbn, publisher, edition, year, category, approval_status) VALUES
(%d, %d, '%s', '%s', '%s', '%s', '%s', '%s', %d, %d)",
$proposal_id,
@@ -1402,25 +1581,56 @@ function book_proposal_form_submit($form, &$form_state)
$form_state['values']['year1'],
0,
0
- );
+ );*/
+
+ $query = "INSERT INTO {textbook_companion_preference}
+ (proposal_id, pref_number, book, author, isbn, publisher, edition, year, category, approval_status) VALUES (:proposal_id, :pref_number, :book, :author, :isbn, :publisher, :edition, :year, :category, :approval_status)
+ ";
+
+ $args = array(
+ ":proposal_id" => $proposal_id,
+ ":pref_number" => 1,
+ ":book" => ucwords(strtolower($form_state['values']['book1'])),
+ ":author" => ucwords(strtolower($form_state['values']['author1'])),
+ ":isbn" => $form_state['values']['isbn1'],
+ ":publisher" => ucwords(strtolower($form_state['values']['publisher1'])),
+ ":edition" => $form_state['values']['edition1'],
+ ":year" => $form_state['values']['year1'],
+ ":category" => 0,
+ ":approval_status" => 0,
+ );
+ $result = db_query($query, $args, array('return' => Database::RETURN_INSERT_ID));
+
+
if (!$result)
{
drupal_set_message(t('Error receiving your first book preference.'), 'error');
} else {
- $preference_id = db_last_insert_id("textbook_companion_preference", "id");
- $query = "
+
+ //$preference_id = db_last_insert_id("textbook_companion_preference", "id");
+
+ $preference_id = $result;
+
+ /*$query = "
UPDATE textbook_companion_aicte
SET preference_id = {$preference_id}
WHERE id = {$selections[0]}
";
- db_query($query);
+ db_query($query);*/
+
+ $query = db_update('textbook_companion_aicte');
+ $query->fields(array(
+ 'preference_id' => $preference_id,
+ ));
+ $query->condition('id', $selections[0]);
+ $num_updated = $query->execute();
}
}
/* inserting second book preference */
if ($form_state['values']['book2'])
{
- $result = db_query("INSERT INTO {textbook_companion_preference}
+ /*$result = db_query("INSERT INTO {textbook_companion_preference}
(proposal_id, pref_number, book, author, isbn, publisher, edition, year, category, approval_status) VALUES
(%d, %d, '%s', '%s', '%s', '%s', '%s', '%s', %d, %d)",
$proposal_id,
@@ -1434,24 +1644,53 @@ function book_proposal_form_submit($form, &$form_state)
0,
0
);
+*/
+
+ $query = "INSERT INTO {textbook_companion_preference}
+ (proposal_id, pref_number, book, author, isbn, publisher, edition, year, category, approval_status) VALUES (:proposal_id, :pref_number, :book, :author, :isbn, :publisher, :edition, :year, :category, :approval_status)
+ ";
+
+ $args = array(
+ ":proposal_id" => $proposal_id,
+ ":pref_number" => 2,
+ ":book" => ucwords(strtolower($form_state['values']['book2'])),
+ ":author" => ucwords(strtolower($form_state['values']['author2'])),
+ ":isbn" => $form_state['values']['isbn2'],
+ ":publisher" => ucwords(strtolower($form_state['values']['publisher2'])),
+ ":edition" => $form_state['values']['edition2'],
+ ":year" => $form_state['values']['year2'],
+ ":category" => 0,
+ ":approval_status" => 0
+ );
+ $result = db_query($query, $args, array('return' => Database::RETURN_INSERT_ID));
+
if (!$result)
{
drupal_set_message(t('Error receiving your second book preference.'), 'error');
} else {
- $preference_id = db_last_insert_id("textbook_companion_preference", "id");
- $query = "
+
+ //$preference_id = db_last_insert_id("textbook_companion_preference", "id");
+ $preference_id = $result;
+
+ /*$query = "
UPDATE textbook_companion_aicte
SET preference_id = {$preference_id}
WHERE id = {$selections[1]}
";
- db_query($query);
+ db_query($query);*/
+ $query = db_update('textbook_companion_aicte');
+ $query->fields(array(
+ 'preference_id' => $preference_id,
+ ));
+ $query->condition('id', $selections[1]);
+ $num_updated = $query->execute();
}
}
/* inserting third book preference */
if ($form_state['values']['book3'])
{
- $result = db_query("INSERT INTO {textbook_companion_preference}
+ /*$result = db_query("INSERT INTO {textbook_companion_preference}
(proposal_id, pref_number, book, author, isbn, publisher, edition, year, category, approval_status) VALUES
(%d, %d, '%s', '%s', '%s', '%s', '%s', '%s', %d, %d)",
$proposal_id,
@@ -1464,28 +1703,67 @@ function book_proposal_form_submit($form, &$form_state)
$form_state['values']['year3'],
0,
0
- );
+ );*/
+
+ $query = "INSERT INTO {textbook_companion_preference}
+ (proposal_id, pref_number, book, author, isbn, publisher, edition, year, category, approval_status) VALUES (:proposal_id, :pref_number, :book, :author, :isbn, :publisher, :edition, :year, :category, :approval_status)
+ ";
+
+ $args = array(
+ ":proposal_id" => $proposal_id,
+ ":pref_number" => 3,
+ ":book" => ucwords(strtolower($form_state['values']['book3'])),
+ ":author" => ucwords(strtolower($form_state['values']['author3'])),
+ ":isbn" => $form_state['values']['isbn3'],
+ ":publisher" => ucwords(strtolower($form_state['values']['publisher3'])),
+ ":edition" => $form_state['values']['edition3'],
+ ":year" => $form_state['values']['year3'],
+ ":category" => 0,
+ ":approval_status" => 0
+ );
+ $result = db_query($query, $args, array('return' => Database::RETURN_INSERT_ID));
+
if (!$result)
{
drupal_set_message(t('Error receiving your third book preference.'), 'error');
} else {
- $preference_id = db_last_insert_id("textbook_companion_preference", "id");
- $query = "
+ $preference_id = $result;
+
+ /*$query = "
UPDATE textbook_companion_aicte
SET preference_id = {$preference_id}
WHERE id = {$selections[2]}
";
- db_query($query);
+ db_query($query);*/
+
+ $query = db_update('textbook_companion_aicte');
+ $query->fields(array(
+ 'preference_id' => $preference_id,
+ ));
+ $query->condition('id', $selections[2]);
+ $num_updated = $query->execute();
+
}
/* locking the books in the textbook_companion_aicte table */
foreach ($selections as $selection) {
- $query = "
+ /*$query = "
UPDATE textbook_companion_aicte
SET status = 1, uid = {$user->uid}, proposal_id = {$proposal_id}
WHERE id = {$selection} AND status = 0
";
- db_query($query);
+ db_query($query);*/
+
+ $query = db_update('textbook_companion_aicte');
+ $query->fields(array(
+ 'status' => 1,
+ 'uid' => $user->uid,
+ 'proposal_id' => $proposal_id,
+ ));
+ $query->condition('id', $selection);
+ $query->condition('status', 0);
+ $num_updated = $query->execute();
+
}
if (!$result)
{
@@ -1521,18 +1799,57 @@ function textbook_companion_mail($key, &$message, $params)
// bcc to textbook_companion_emails
$message['headers'] += $tbc_bcc_emails;
/* initializing data */
- $proposal_q = db_query("SELECT * FROM {textbook_companion_proposal} WHERE id = %d LIMIT 1", $params['proposal_received']['proposal_id']);
- $proposal_data = db_fetch_object($proposal_q);
- $preference1_q = db_query("SELECT * FROM {textbook_companion_preference} WHERE proposal_id = %d AND pref_number = %d LIMIT 1", $params['proposal_received']['proposal_id'], 1);
- $preference1_data = db_fetch_object($preference1_q);
- $preference2_q = db_query("SELECT * FROM {textbook_companion_preference} WHERE proposal_id = %d AND pref_number = %d LIMIT 1", $params['proposal_received']['proposal_id'], 2);
- $preference2_data = db_fetch_object($preference2_q);
- $preference3_q = db_query("SELECT * FROM {textbook_companion_preference} WHERE proposal_id = %d AND pref_number = %d LIMIT 1", $params['proposal_received']['proposal_id'], 3);
- $preference3_data = db_fetch_object($preference3_q);
+
+ /*$proposal_q = db_query("SELECT * FROM {textbook_companion_proposal} WHERE id = %d LIMIT 1", $params['proposal_received']['proposal_id']);
+ $proposal_data = db_fetch_object($proposal_q);*/
+
+ $query = db_select('textbook_companion_proposal');
+ $query->fields('textbook_companion_proposal');
+ $query->condition('id', $params['proposal_received']['proposal_id']);
+ $query->range(0, 1);
+ $result = $query->execute();
+ $proposal_data =$result->fetchObject();
+
+ /*$preference1_q = db_query("SELECT * FROM {textbook_companion_preference} WHERE proposal_id = %d AND pref_number = %d LIMIT 1", $params['proposal_received']['proposal_id'], 1);
+ $preference1_data = db_fetch_object($preference1_q);*/
+
+ $query = db_select('textbook_companion_preference');
+ $query->fields('textbook_companion_preference');
+ $query->condition('proposal_id',$params['proposal_received']['proposal_id']);
+ $query->condition('pref_number', 1);
+ $query->range(0, 1);
+ $result = $query->execute();
+ $preference1_data =$result->fetchObject();
+
+
+ /*$preference2_q = db_query("SELECT * FROM {textbook_companion_preference} WHERE proposal_id = %d AND pref_number = %d LIMIT 1", $params['proposal_received']['proposal_id'], 2);
+ $preference2_data = db_fetch_object($preference2_q);*/
+
+ $query = db_select('textbook_companion_preference');
+ $query->fields('textbook_companion_preference');
+ $query->condition('proposal_id', $params['proposal_received']['proposal_id']);
+ $query->condition('pref_number',2);
+ $query->range(0, 1);
+ $result = $query->execute();
+ $preference2_data =$result->fetchObject();
+
+
+ /*$preference3_q = db_query("SELECT * FROM {textbook_companion_preference} WHERE proposal_id = %d AND pref_number = %d LIMIT 1", $params['proposal_received']['proposal_id'], 3);
+ $preference3_data = db_fetch_object($preference3_q);*/
+
+ $query = db_select('textbook_companion_preference');
+ $query->fields('textbook_companion_preference');
+ $query->condition('proposal_id', $params['proposal_received']['proposal_id']);
+ $query->condition('pref_number', 3);
+ $query->range(0, 1);
+ $result = $query->execute();
+ $preference3_data =$result->fetchObject();
+
+
$user_data = user_load($params['proposal_received']['user_id']);
- $message['subject'] = t('[!site_name] Your book proposal has been received', array('!site_name' => variable_get('site_name', '')), $language->language);
- $message['body'] = t('
+ $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,
We have received your following book proposal:
@@ -1580,26 +1897,64 @@ The book will not be alloted to you until we receive the sample codes.
Best Wishes,
-!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), $language->language);
+!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), array('language' => $language->language)));
break;
case 'proposal_disapproved':
// bcc to textbook_companion_emails
$message['headers'] += $tbc_bcc_emails;
/* initializing data */
- $proposal_q = db_query("SELECT * FROM {textbook_companion_proposal} WHERE id = %d LIMIT 1", $params['proposal_disapproved']['proposal_id']);
- $proposal_data = db_fetch_object($proposal_q);
- $preference1_q = db_query("SELECT * FROM {textbook_companion_preference} WHERE proposal_id = %d AND pref_number = %d LIMIT 1", $params['proposal_disapproved']['proposal_id'], 1);
- $preference1_data = db_fetch_object($preference1_q);
- $preference2_q = db_query("SELECT * FROM {textbook_companion_preference} WHERE proposal_id = %d AND pref_number = %d LIMIT 1", $params['proposal_disapproved']['proposal_id'], 2);
- $preference2_data = db_fetch_object($preference2_q);
- $preference3_q = db_query("SELECT * FROM {textbook_companion_preference} WHERE proposal_id = %d AND pref_number = %d LIMIT 1", $params['proposal_disapproved']['proposal_id'], 3);
- $preference3_data = db_fetch_object($preference3_q);
+
+ /*$proposal_q = db_query("SELECT * FROM {textbook_companion_proposal} WHERE id = %d LIMIT 1", $params['proposal_disapproved']['proposal_id']);
+ $proposal_data = db_fetch_object($proposal_q);*/
+
+ $query = db_select('textbook_companion_proposal');
+ $query->fields('textbook_companion_proposal');
+ $query->condition('id', $params['proposal_disapproved']['proposal_id']);
+ $query->range(0, 1);
+ $result = $query->execute();
+ $proposal_data =$result->fetchObject();
+
+ /*$preference1_q = db_query("SELECT * FROM {textbook_companion_preference} WHERE proposal_id = %d AND pref_number = %d LIMIT 1", $params['proposal_disapproved']['proposal_id'], 1);
+ $preference1_data = db_fetch_object($preference1_q);*/
+
+ $query = db_select('textbook_companion_preference');
+ $query->fields('textbook_companion_preference');
+ $query->condition('proposal_id', $params['proposal_disapproved']['proposal_id']);
+ $query->condition('pref_number', 1);
+ $query->range(0, 1);
+ $result = $query->execute();
+ $preference1_data =$result->fetchObject();
+
+
+ /*$preference2_q = db_query("SELECT * FROM {textbook_companion_preference} WHERE proposal_id = %d AND pref_number = %d LIMIT 1", $params['proposal_disapproved']['proposal_id'], 2);
+ $preference2_data = db_fetch_object($preference2_q);*/
+
+ $query = db_select('textbook_companion_preference');
+ $query->fields('textbook_companion_preference');
+ $query->condition('proposal_id', $params['proposal_disapproved']['proposal_id']);
+ $query->condition('pref_number', 2);
+ $query->range(0, 1);
+ $result = $query->execute();
+ $preference2_data =$result->fetchObject();
+
+
+ /*$preference3_q = db_query("SELECT * FROM {textbook_companion_preference} WHERE proposal_id = %d AND pref_number = %d LIMIT 1", $params['proposal_disapproved']['proposal_id'], 3);
+ $preference3_data = db_fetch_object($preference3_q);*/
+
+ $query = db_select('textbook_companion_preference');
+ $query->fields('textbook_companion_preference');
+ $query->condition('proposal_id', $params['proposal_disapproved']['proposal_id']);
+ $query->condition('pref_number', 3);
+ $query->range(0, 1);
+ $result = $query->execute();
+ $preference3_data =$result->fetchObject();
+
$user_data = user_load($params['proposal_disapproved']['user_id']);
- $message['subject'] = t('[!site_name] Your book proposal has been disapproved', array('!site_name' => variable_get('site_name', '')), $language->language);
+ $message['subject'] = t('[!site_name] Your book proposal has been disapproved', array('!site_name' => variable_get('site_name', '')), array('language' => $language->language));
if($proposal_data->proposal_type != 1){
- $message['body'] = t('
+ $message['body'] =array('body' => t('
Dear !user_name,
Your following book proposal has been disapproved:
@@ -1644,11 +1999,11 @@ Year of publication : ' . $preference3_data->year . '
Best Wishes,
-!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), $language->language);
+!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), array('language' => $language->language)));
}
else{
//Non AICTE book proposal dissaprove//
-$message['body'] = t('
+$message['body'] = array('body' => t('
Dear !user_name,
Your following book proposal has been disapproved:
@@ -1679,7 +2034,7 @@ Year of publication : ' . $preference1_data->year . '
Best Wishes,
-!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), $language->language);
+!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), array('language' => $language->language)));
}
break;
@@ -1688,15 +2043,33 @@ Best Wishes,
// bcc to textbook_companion_emails
$message['headers'] += $tbc_bcc_emails;
/* initializing data */
- $proposal_q = db_query("SELECT * FROM {textbook_companion_proposal} WHERE id = %d LIMIT 1", $params['proposal_received']['proposal_id']);
- $proposal_data = db_fetch_object($proposal_q);
- $preference1_q = db_query("SELECT * FROM {textbook_companion_preference} WHERE proposal_id = %d AND pref_number = %d LIMIT 1", $params['proposal_received']['proposal_id'], 1);
- $preference1_data = db_fetch_object($preference1_q);
-
+
+ /*$proposal_q = db_query("SELECT * FROM {textbook_companion_proposal} WHERE id = %d LIMIT 1", $params['proposal_received']['proposal_id']);
+ $proposal_data = db_fetch_object($proposal_q);*/
+
+ $query = db_select('textbook_companion_proposal');
+ $query->fields('textbook_companion_proposal');
+ $query->condition('id', $params['proposal_received']['proposal_id']);
+ $query->range(0, 1);
+ $result = $query->execute();
+ $proposal_data =$result->fetchObject();
+
+
+ /*$preference1_q = db_query("SELECT * FROM {textbook_companion_preference} WHERE proposal_id = %d AND pref_number = %d LIMIT 1", $params['proposal_received']['proposal_id'], 1);
+ $preference1_data = db_fetch_object($preference1_q);*/
+
+ $query = db_select('textbook_companion_preference');
+ $query->fields('textbook_companion_preference');
+ $query->condition('proposal_id',$params['proposal_received']['proposal_id']);
+ $query->condition('pref_number', 1);
+ $query->range(0, 1);
+ $result = $query->execute();
+ $preference1_data=$result->fetchObject();
+
$user_data = user_load($params['proposal_received']['user_id']);
- $message['subject'] = t('[!site_name] Your book proposal has been received', array('!site_name' => variable_get('site_name', '')), $language->language);
- $message['body'] = t('
+ $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,
We have received your following book proposal:
@@ -1729,21 +2102,38 @@ The book will not be alloted to you until we receive the sample codes.
Best Wishes,
-!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), $language->language);
+!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), array('language' => $language->language)));
break;
case 'nonaicte_proposal_to_pi':
// bcc to textbook_companion_emails
$message['headers'] += $tbc_bcc_emails;
/* initializing data */
- $proposal_q = db_query("SELECT * FROM {textbook_companion_proposal} WHERE id = %d LIMIT 1", $params['proposal_received']['proposal_id']);
- $proposal_data = db_fetch_object($proposal_q);
- $preference1_q = db_query("SELECT * FROM {textbook_companion_preference} WHERE proposal_id = %d AND pref_number = %d LIMIT 1", $params['proposal_received']['proposal_id'], 1);
- $preference1_data = db_fetch_object($preference1_q);
+
+ /*$proposal_q = db_query("SELECT * FROM {textbook_companion_proposal} WHERE id = %d LIMIT 1", $params['proposal_received']['proposal_id']);
+ $proposal_data = db_fetch_object($proposal_q);*/
+
+ $query = db_select('textbook_companion_proposal');
+ $query->fields('textbook_companion_proposal');
+ $query->condition('id', $params['proposal_received']['proposal_id']);
+ $query->range(0, 1);
+ $result = $query->execute();
+ $proposal_data=$result->fetchObject();
+
+ /* $preference1_q = db_query("SELECT * FROM {textbook_companion_preference} WHERE proposal_id = %d AND pref_number = %d LIMIT 1", $params['proposal_received']['proposal_id'], 1);
+ $preference1_data = db_fetch_object($preference1_q);*/
+
+ $query = db_select('textbook_companion_preference');
+ $query->fields('textbook_companion_preference');
+ $query->condition('proposal_id', $params['proposal_received']['proposal_id']);
+ $query->condition('pref_number', 1);
+ $query->range(0, 1);
+ $result = $query->execute();
+ $preference1_data=$result->fetchObject();
$user_data = user_load($params['proposal_received']['user_id']);
- $message['subject'] = t('[!site_name] New Non AICTE book suggestion has been received', array('!site_name' => variable_get('site_name', '')), $language->language);
- $message['body'] = t('
+ $message['subject'] = t('[!site_name] New Non AICTE book suggestion has been received', array('!site_name' => variable_get('site_name', '')), array('language' => $language->language));
+ $message['body'] = array('body' => t('
Dear all,
We have received following Non AICTE book suggestion:
@@ -1771,7 +2161,7 @@ Please click here to provide your feedback: http://scilab.in/comments
Best Wishes,
-!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), $language->language);
+!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), array('language' => $language->language)));
break;
@@ -1779,14 +2169,33 @@ Best Wishes,
case 'proposal_approved':
// bcc to textbook_companion_emails
$message['headers'] += $tbc_bcc_emails;
- $proposal_q = db_query("SELECT * FROM {textbook_companion_proposal} WHERE id = %d LIMIT 1", $params['proposal_approved']['proposal_id']);
- $proposal_data = db_fetch_object($proposal_q);
- $approved_preference_q = db_query("SELECT * FROM {textbook_companion_preference} WHERE proposal_id = %d AND approval_status = 1 LIMIT 1", $params['proposal_approved']['proposal_id']);
- $approved_preference_data = db_fetch_object($approved_preference_q);
+
+ /*$proposal_q = db_query("SELECT * FROM {textbook_companion_proposal} WHERE id = %d LIMIT 1", $params['proposal_approved']['proposal_id']);
+ $proposal_data = db_fetch_object($proposal_q);*/
+
+ $query = db_select('textbook_companion_proposal');
+ $query->fields('textbook_companion_proposal');
+ $query->condition('id', $params['proposal_approved']['proposal_id']);
+ $query->range(0, 1);
+ $result = $query->execute();
+ $proposal_data=$result->fetchObject();
+
+
+ /* $approved_preference_q = db_query("SELECT * FROM {textbook_companion_preference} WHERE proposal_id = %d AND approval_status = 1 LIMIT 1", $params['proposal_approved']['proposal_id']);
+ $approved_preference_data = db_fetch_object($approved_preference_q);*/
+
+ $query = db_select('textbook_companion_preference');
+ $query->fields('textbook_companion_preference');
+ $query->condition('proposal_id', $params['proposal_approved']['proposal_id']);
+ $query->condition('approval_status', 1);
+ $query->range(0, 1);
+ $result = $query->execute();
+ $approved_preference_data=$result->fetchObject();
+
$user_data = user_load($params['proposal_approved']['user_id']);
- $message['subject'] = t('[!site_name] Your book proposal has been approved', array('!site_name' => variable_get('site_name', '')), $language->language);
- $message['body'] = t('
+ $message['subject'] = t('[!site_name] Your book proposal has been approved', array('!site_name' => variable_get('site_name', '')), array('language' => $language->language));
+ $message['body'] =array('body' => t('
Dear !user_name,
Your following book proposal has been approved:
@@ -1816,21 +2225,39 @@ Please contact us by sending an e-mail to textbook@scilab.in in case you wish to
Best Wishes,
-!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), $language->language);
+!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name),array('language' => $language->language)));
break;
case 'proposal_completed':
// bcc to textbook_companion_emails
$message['headers'] += $tbc_bcc_emails;
- $proposal_q = db_query("SELECT * FROM {textbook_companion_proposal} WHERE id = %d LIMIT 1", $params['proposal_completed']['proposal_id']);
- $proposal_data = db_fetch_object($proposal_q);
- $approved_preference_q = db_query("SELECT * FROM {textbook_companion_preference} WHERE proposal_id = %d AND approval_status = 1 LIMIT 1", $params['proposal_completed']['proposal_id']);
- $approved_preference_data = db_fetch_object($approved_preference_q);
+ /*$proposal_q = db_query("SELECT * FROM {textbook_companion_proposal} WHERE id = %d LIMIT 1", $params['proposal_completed']['proposal_id']);
+ $proposal_data = db_fetch_object($proposal_q);*/
+
+ $query = db_select('textbook_companion_proposal');
+ $query->fields('textbook_companion_proposal');
+ $query->condition('id', $params['proposal_completed']['proposal_id']);
+ $query->range(0, 1);
+ $result = $query->execute();
+ $proposal_data=$result->fetchObject();
+
+ /*$approved_preference_q = db_query("SELECT * FROM {textbook_companion_preference} WHERE proposal_id = %d AND approval_status = 1 LIMIT 1", $params['proposal_completed']['proposal_id']);
+ $approved_preference_data = db_fetch_object($approved_preference_q);*/
+
+ $query = db_select('textbook_companion_preference');
+ $query->fields('textbook_companion_preference');
+ $query->condition('proposal_id', $params['proposal_completed']['proposal_id']);
+ $query->condition('approval_status', 1);
+ $query->range(0, 1);
+ $result = $query->execute();
+ $approved_preference_data=$result->fetchObject();
+
+
$user_data = user_load($params['proposal_completed']['user_id']);
- $message['subject'] = t('[!site_name] Congratulations for completion of the book.', array('!site_name' => variable_get('site_name', '')), $language->language);
- $message['body'] = t('
+ $message['subject'] = t('[!site_name] Congratulations for completion of the book.', array('!site_name' => variable_get('site_name', '')), array('language' => $language->language));
+ $message['body'] =array('body' => t('
Dear !user_name,
Following book has been completed sucessfully by you:
@@ -1860,18 +2287,27 @@ Now you should be able to propose a new book...
Best Wishes,
-!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), $language->language);
+!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name),array('language' => $language->language)));
break;
case 'example_uploaded':
// bcc to textbook_companion_emails
$message['headers'] += $tbc_bcc_emails;
- $example_q = db_query("SELECT * FROM {textbook_companion_example} WHERE id = %d LIMIT 1", $params['example_uploaded']['example_id']);
- $example_data = db_fetch_object($example_q);
+
+ /*$example_q = db_query("SELECT * FROM {textbook_companion_example} WHERE id = %d LIMIT 1", $params['example_uploaded']['example_id']);
+ $example_data = db_fetch_object($example_q);*/
+
+ $query = db_select('textbook_companion_example');
+ $query->fields('textbook_companion_example');
+ $query->condition('id', $params['example_uploaded']['example_id']);
+ $query->range(0, 1);
+ $result = $query->execute();
+ $example_data=$result->fetchObject();
+
$user_data = user_load($params['example_uploaded']['user_id']);
- $message['subject'] = t('[!site_name] You have uploaded example', array('!site_name' => variable_get('site_name', '')), $language->language);
- $message['body'] = t('
+ $message['subject'] = t('[!site_name] You have uploaded example', array('!site_name' => variable_get('site_name', '')), array('language' => $language->language));
+ $message['body'] =array('body' => t('
Dear !user_name,
You have uploaded the following example:
@@ -1886,18 +2322,27 @@ The codes cannot be approved unless the convention is followed.
Best Wishes,
-!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), $language->language);
+!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), array('language' => $language->language)));
break;
case 'example_updated':
// bcc to textbook_companion_emails
$message['headers'] += $tbc_bcc_emails;
- $example_q = db_query("SELECT * FROM {textbook_companion_example} WHERE id = %d LIMIT 1", $params['example_updated']['example_id']);
- $example_data = db_fetch_object($example_q);
+
+ /*$example_q = db_query("SELECT * FROM {textbook_companion_example} WHERE id = %d LIMIT 1", $params['example_updated']['example_id']);
+ $example_data = db_fetch_object($example_q);*/
+
+ $query = db_select('textbook_companion_example');
+ $query->fields('textbook_companion_example');
+ $query->condition('id', $params['example_updated']['example_id']);
+ $query->range(0, 1);
+ $result = $query->execute();
+ $example_data=$result->fetchObject();
+
$user_data = user_load($params['example_updated']['user_id']);
- $message['subject'] = t('[!site_name] You have updated example', array('!site_name' => variable_get('site_name', '')), $language->language);
- $message['body'] = t('
+ $message['subject'] = t('[!site_name] You have updated example', array('!site_name' => variable_get('site_name', '')), array('language' => $language->language));
+ $message['body'] =array('body' => t('
Dear !user_name,
You have updated the following example:
@@ -1909,18 +2354,27 @@ The example is still under review. You will be notified when it has been approve
Best Wishes,
-!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), $language->language);
+!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), array('language' => $language->language)));
break;
case 'example_updated_admin':
// bcc to textbook_companion_emails
$message['headers'] += $tbc_bcc_emails;
- $example_q = db_query("SELECT * FROM {textbook_companion_example} WHERE id = %d LIMIT 1", $params['example_updated_admin']['example_id']);
- $example_data = db_fetch_object($example_q);
+
+ /*$example_q = db_query("SELECT * FROM {textbook_companion_example} WHERE id = %d LIMIT 1", $params['example_updated_admin']['example_id']);
+ $example_data = db_fetch_object($example_q);*/
+
+ $query = db_select('textbook_companion_example');
+ $query->fields('textbook_companion_example');
+ $query->condition('id', $params['example_updated_admin']['example_id']);
+ $query->range(0, 1);
+ $result = $query->execute();
+ $example_data=$result->fetchObject();
+
$user_data = user_load($params['example_updated_admin']['user_id']);
- $message['subject'] = t('[!site_name] Reviewer have updated example', array('!site_name' => variable_get('site_name', '')), $language->language);
- $message['body'] = t('
+ $message['subject'] = t('[!site_name] Reviewer have updated example', array('!site_name' => variable_get('site_name', '')), array('language' => $language->language));
+ $message['body'] = array('body' =>t('
Dear !user_name,
Reviewer have updated the following example:
@@ -1930,18 +2384,28 @@ Caption : ' . $example_data->caption . '
Best Wishes,
-!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), $language->language);
+!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name),array('language' => $language->language)));
break;
case 'example_approved':
// bcc to textbook_companion_emails
$message['headers'] += $tbc_bcc_emails;
- $example_q = db_query("SELECT * FROM {textbook_companion_example} WHERE id = %d LIMIT 1", $params['example_approved']['example_id']);
- $example_data = db_fetch_object($example_q);
+
+ /*$example_q = db_query("SELECT * FROM {textbook_companion_example} WHERE id = %d LIMIT 1", $params['example_approved']['example_id']);
+ $example_data = db_fetch_object($example_q);*/
+
+ $query = db_select('textbook_companion_example');
+ $query->fields('textbook_companion_example');
+ $query->condition('id', $params['example_approved']['example_id']);
+ $query->range(0, 1);
+ $result = $query->execute();
+ $example_data=$result->fetchObject();
+
+
$user_data = user_load($params['example_approved']['user_id']);
- $message['subject'] = t('[!site_name] Your uploaded example has been approved', array('!site_name' => variable_get('site_name', '')), $language->language);
- $message['body'] = t('
+ $message['subject'] = t('[!site_name] Your uploaded example has been approved', array('!site_name' => variable_get('site_name', '')), array('language' => $language->language));
+ $message['body'] =array('body' => t('
Dear !user_name,
Your following example has been approved:
@@ -1951,7 +2415,7 @@ Caption : ' . $example_data->caption . '
Best Wishes,
-!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), $language->language);
+!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), array('language' => $language->language)));
break;
case 'example_disapproved':
@@ -1959,8 +2423,8 @@ Best Wishes,
$message['headers'] += $tbc_bcc_emails;
$user_data = user_load($params['example_disapproved']['user_id']);
- $message['subject'] = t('[!site_name] Your uploaded example has been disapproved', array('!site_name' => variable_get('site_name', '')), $language->language);
- $message['body'] = t('
+ $message['subject'] = t('[!site_name] Your uploaded example has been disapproved', array('!site_name' => variable_get('site_name', '')), array('language' => $language->language));
+ $message['body'] = array('body' =>t('
Dear !user_name,
Your following example has been disapproved:
@@ -1972,7 +2436,7 @@ Reason for dis-approval : ' . $params['example_disapproved']['message'] . '
Best Wishes,
-!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), $language->language);
+!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name),array('language' => $language->language)));
break;
case 'example_deleted_user':
@@ -1980,8 +2444,8 @@ Best Wishes,
$message['headers'] += $tbc_bcc_emails;
$user_data = user_load($params['example_deleted_user']['user_id']);
- $message['subject'] = t('[!site_name] User has deleted pending example', array('!site_name' => variable_get('site_name', '')), $language->language);
- $message['body'] = t('
+ $message['subject'] = t('[!site_name] User has deleted pending example', array('!site_name' => variable_get('site_name', '')), array('language' => $language->language));
+ $message['body'] =array('body' => t('
Dear !user_name,
Your following pending example has been deleted :
@@ -1993,7 +2457,7 @@ Caption : ' . $params['example_deleted_user']['example_caption'] . '
Best Wishes,
-!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), $language->language);
+!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), array('language' => $language->language)));
break;
case 'dependency_uploaded':
@@ -2002,8 +2466,8 @@ Best Wishes,
$user_data = user_load($params['dependency_uploaded']['user_id']);
$dependency_files = implode(',', $params['dependency_uploaded']['dependency_names']);
- $message['subject'] = t('[!site_name] You have uploaded dependency file', array('!site_name' => variable_get('site_name', '')), $language->language);
- $message['body'] = t('
+ $message['subject'] = t('[!site_name] You have uploaded dependency file', array('!site_name' => variable_get('site_name', '')), array('language' => $language->language));
+ $message['body'] = array('body' =>t('
Dear !user_name,
You have uploaded following dependency files :
@@ -2011,7 +2475,8 @@ You have uploaded following dependency files :
Best Wishes,
-!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), $language->language);
+!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name),
+array('language' => $language->language)));
break;
case 'feedback_received':
@@ -2019,8 +2484,8 @@ Best Wishes,
$message['headers'] += $tbc_bcc_emails;
$user_data = user_load($params['feedback_received']['user_id']);
- $message['subject'] = t('[!site_name] We have received your feedback', array('!site_name' => variable_get('site_name', '')), $language->language);
- $message['body'] = t('
+ $message['subject'] = t('[!site_name] We have received your feedback', array('!site_name' => variable_get('site_name', '')), array('language' => $language->language));
+ $message['body'] = array('body' =>t('
Dear !user_name,
We have received your following feedback
@@ -2034,7 +2499,7 @@ Your feedback :
Best Wishes,
-!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), $language->language);
+!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), array('language' => $language->language)));
break;
case 'internshipform':
@@ -2043,8 +2508,8 @@ Best Wishes,
$user_data = user_load($params['internshipform']['user_id']);
- $message['subject'] = t('[!site_name] We have received your feedback', array('!site_name' => variable_get('site_name', '')), $language->language);
- $message['body'] = t('
+ $message['subject'] = t('[!site_name] We have received your feedback', array('!site_name' => variable_get('site_name', '')), array('language' => $language->language));
+ $message['body'] = array('body' =>t('
Dear !user_name,
We have received your Internship Form Application for the book
@@ -2055,7 +2520,7 @@ Example No.: ' . $params['internshipform']['example_no'] . '
Best Wishes,
-!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), $language->language);
+!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name),array('language' => $language->language)));
break;
case 'copyrighttransferform':
@@ -2064,8 +2529,8 @@ case 'copyrighttransferform':
$user_data = user_load($params['copyrighttransferform']['user_id']);
- $message['subject'] = t('[!site_name] We have received your feedback', array('!site_name' => variable_get('site_name', '')), $language->language);
- $message['body'] = t('
+ $message['subject'] = t('[!site_name] We have received your feedback', array('!site_name' => variable_get('site_name', '')), array('language' => $language->language));
+ $message['body'] =array('body' => t('
Dear !user_name,
We have received your Copyright Form Application for the book
@@ -2076,7 +2541,7 @@ Example No.: ' . $params['copyrighttransferform']['example_no'] . '
Best Wishes,
-!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), $language->language);
+!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name),array('language' => $language->language)));
break;
case 'undertakingform':
@@ -2085,8 +2550,8 @@ case 'undertakingform':
$user_data = user_load($params['undertakingform']['user_id']);
- $message['subject'] = t('[!site_name] We have received your feedback', array('!site_name' => variable_get('site_name', '')), $language->language);
- $message['body'] = t('
+ $message['subject'] = t('[!site_name] We have received your feedback', array('!site_name' => variable_get('site_name', '')), array('language' => $language->language));
+ $message['body'] =array('body' => t('
Dear !user_name,
We have received your Undertaking Form Application for the book
@@ -2097,7 +2562,7 @@ Example No.: ' . $params['undertakingform']['example_no'] . '
Best Wishes,
-!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), $language->language);
+!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), array('language' => $language->language)));
break;
@@ -2107,8 +2572,8 @@ case 'remark':
$user_data = user_load($params['remark']['user_id']);
- $message['subject'] = t('[!site_name] A remark has been given.Please check your contact detail form', array('!site_name' => variable_get('site_name', '')), $language->language);
- $message['body'] = t('
+ $message['subject'] = t('[!site_name] A remark has been given.Please check your contact detail form', array('!site_name' => variable_get('site_name', '')), array('language' => $language->language));
+ $message['body'] =array('body' => t('
Dear !user_name,
A Remark has been given.Please check your Contact Detail Form
@@ -2119,7 +2584,7 @@ Example No.: ' . $params['internshipform']['example_no'] . '
Best Wishes,
-!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), $language->language);
+!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), array('language' => $language->language)));
break;
case 'cheque_sent':
@@ -2128,8 +2593,8 @@ Best Wishes,
$user_data = user_load($params['cheque_sent']['user_id']);
- $message['subject'] = t('[!site_name] We have received your feedback', array('!site_name' => variable_get('site_name', '')), $language->language);
- $message['body'] = t('
+ $message['subject'] = t('[!site_name] We have received your feedback', array('!site_name' => variable_get('site_name', '')), array('language' => $language->language));
+ $message['body'] =array('body' => t('
Dear !user_name,
We have Sent Cheque for the following book proposed
@@ -2140,7 +2605,7 @@ Example No.: ' . $params['cheque_sent']['example_no'] . '
Best Wishes,
-!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), $language->language);
+!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), array('language' => $language->language)));
break;
@@ -2161,8 +2626,17 @@ function textbook_companion_ajax()
{
$chapter_number = arg(3);
$preference_id = arg(4);
- $chapter_q = db_query("SELECT * FROM {textbook_companion_chapter} WHERE number = %d AND preference_id = %d LIMIT 1", $chapter_number, $preference_id);
- if ($chapter_data = db_fetch_object($chapter_q))
+
+ /*$chapter_q = db_query("SELECT * FROM {textbook_companion_chapter} WHERE number = %d AND preference_id = %d LIMIT 1", $chapter_number, $preference_id);*/
+
+ $query = db_select('textbook_companion_chapter');
+ $query->fields('textbook_companion_chapter');
+ $query->condition('number', $chapter_number);
+ $query->condition('preference_id', $preference_id);
+ $query->range(0, 1);
+ $chapter_q = $query->execute();
+
+ if ($chapter_data = $chapter_q->fetchObject())
{
echo $chapter_data->name;
return;
@@ -2173,8 +2647,17 @@ function textbook_companion_ajax()
$example_number = arg(5);
$chapter_id = 0;
- $chapter_q = db_query("SELECT * FROM {textbook_companion_chapter} WHERE number = %d AND preference_id = %d LIMIT 1", $chapter_number, $preference_id);
- if (!$chapter_data = db_fetch_object($chapter_q))
+
+ /* $chapter_q = db_query("SELECT * FROM {textbook_companion_chapter} WHERE number = %d AND preference_id = %d LIMIT 1", $chapter_number, $preference_id);*/
+
+ $query = db_select('textbook_companion_chapter');
+ $query->fields('textbook_companion_chapter');
+ $query->condition('number',$chapter_number);
+ $query->condition('preference_id', $preference_id);
+ $query->range(0, 1);
+ $chapter_q = $query->execute();
+
+ if (!$chapter_data = $chapter_q->fetchObject())
{
echo '';
return;
@@ -2182,8 +2665,16 @@ function textbook_companion_ajax()
$chapter_id = $chapter_data->id;
}
- $example_q = db_query("SELECT * FROM {textbook_companion_example} WHERE chapter_id = %d AND number = '%s' LIMIT 1", $chapter_id, $example_number);
- if ($example_data = db_fetch_object($example_q))
+ /*$example_q = db_query("SELECT * FROM {textbook_companion_example} WHERE chapter_id = %d AND number = '%s' LIMIT 1", $chapter_id, $example_number);*/
+
+ $query = db_select('textbook_companion_example');
+ $query->fields('textbook_companion_example');
+ $query->condition('chapter_id', $chapter_id);
+ $query->condition('number', $example_number);
+ $query->range(0, 1);
+ $example_q = $query->execute();
+
+ if ($example_data =$example_q->fetchObject())
{
if ($example_data->approval_status == 1)
echo 'Warning! Example already approved. You cannot upload the same example again.';
@@ -2232,16 +2723,31 @@ function delete_example($example_id)
$root_path = textbook_companion_path();
$status = TRUE;
- $example_q = db_query("SELECT * FROM {textbook_companion_example} WHERE id = %d", $example_id);
- $example_data = db_fetch_object($example_q);
+ /*$example_q = db_query("SELECT * FROM {textbook_companion_example} WHERE id = %d", $example_id);
+ $example_data = db_fetch_object($example_q);*/
+
+ $query = db_select('textbook_companion_example');
+ $query->fields('textbook_companion_example');
+ $query->condition('id', $example_id);
+ $example_q = $query->execute();
+ $example_data =$example_q->fetchObject();
+
if (!$example_data)
{
drupal_set_message(t('Invalid example.'), 'error');
return FALSE;
}
- $chapter_q = db_query("SELECT * FROM {textbook_companion_chapter} WHERE id = %d", $example_data->chapter_id);
- $chapter_data = db_fetch_object($chapter_q);
+ /*$chapter_q = db_query("SELECT * FROM {textbook_companion_chapter} WHERE id = %d", $example_data->chapter_id);
+ $chapter_data = db_fetch_object($chapter_q);*/
+
+ $query = db_select('textbook_companion_chapter');
+ $query->fields('textbook_companion_chapter');
+ $query->condition('id', $example_data->chapter_id);
+ $chapter_q = $query->execute();
+ $chapter_data=$chapter_q->fetchObject();
+
+
if (!$chapter_data)
{
drupal_set_message(t('Invalid example chapter.'), 'error');
@@ -2249,8 +2755,15 @@ function delete_example($example_id)
}
/* deleting example files */
- $examples_files_q = db_query("SELECT * FROM {textbook_companion_example_files} WHERE example_id = %d", $example_id);
- while ($examples_files_data = db_fetch_object($examples_files_q))
+
+ /*$examples_files_q = db_query("SELECT * FROM {textbook_companion_example_files} WHERE example_id = %d", $example_id);*/
+
+ $query = db_select('textbook_companion_example_files');
+ $query->fields('textbook_companion_example_files');
+ $query->condition('example_id', $example_id);
+ $examples_files_q = $query->execute();
+
+ while ($examples_files_data =$examples_files_q->fetchObject())
{
if (!file_exists($root_path . $examples_files_data->filepath))
{
@@ -2260,7 +2773,7 @@ function delete_example($example_id)
}
/* removing example file */
- if (!unlink($root_path . $examples_files_data->filepath))
+ if (!drupal_unlink($root_path . $examples_files_data->filepath))
{
$status = FALSE;
drupal_set_message(t('Error deleting !file', array('!file' => $examples_files_data->filepath)), 'error');
@@ -2268,15 +2781,21 @@ function delete_example($example_id)
/* sending email to admins */
$email_to = variable_get('textbook_companion_emails', '');
$param['standard']['subject'] = "[ERROR] Error deleting example file";
- $param['standard']['body'] = "Error deleting example files by " . $user->uid . " at " . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] . " :
+ $param['standard']['body'] = array(0 =>"Error deleting example files by " . $user->uid . " at " . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] . " :
example id : " . $example_id . "
file id : " . $examples_files_data->id . "
- file path : " . $examples_files_data->filepath;
+ file path : " . $examples_files_data->filepath);
if (!drupal_mail('textbook_companion', 'standard', $email_to, language_default(), $param, variable_get('textbook_companion_from_email', NULL), TRUE))
drupal_set_message('Error sending email message.', 'error');
} else {
/* deleting example files database entries */
- db_query("DELETE FROM {textbook_companion_example_files} WHERE id = %d", $examples_files_data->id);
+
+ /*db_query("DELETE FROM {textbook_companion_example_files} WHERE id = %d", $examples_files_data->id);*/
+ $query = db_delete('textbook_companion_example_files');
+ $query->condition('id', $examples_files_data->id);
+ $num_deleted = $query->execute();
+
+
}
}
@@ -2286,28 +2805,45 @@ function delete_example($example_id)
/* removing example folder */
$ex_path = $chapter_data->preference_id . '/' . 'CH' . $chapter_data->number . '/' . 'EX' . $example_data->number;
$dir_path = $root_path . $ex_path;
+
+
if (is_dir($dir_path))
{
- if (!rmdir($dir_path))
+ if (!drupal_rmdir($dir_path))
{
+
+
drupal_set_message(t('Error deleting folder !folder', array('!folder' => $dir_path)), 'error');
/* sending email to admins */
$email_to = variable_get('textbook_companion_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']['body'] = array(0 => "Error deleting folder " . $dir_path . " by " . $user->uid . " at " . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
if (!drupal_mail('textbook_companion', 'standard', $email_to, language_default(), $param, variable_get('textbook_companion_from_email', NULL), TRUE))
drupal_set_message('Error sending email message.', 'error');
return FALSE;
+
+
}
+
} else {
+
+
drupal_set_message(t('Cannot delete example folder. !folder does not exists.', array('!folder' => $dir_path)), 'error');
return FALSE;
}
/* deleting example dependency and exmaple database entries */
- db_query("DELETE FROM {textbook_companion_example_dependency} WHERE example_id = %d", $example_id);
- db_query("DELETE FROM {textbook_companion_example} WHERE id = %d", $example_id);
+
+/*db_query("DELETE FROM {textbook_companion_example_dependency} WHERE example_id = %d", $example_id);*/
+ $query = db_delete('textbook_companion_example_dependency');
+ $query->condition('example_id', $example_id);
+ $num_deleted = $query->execute();
+
+ /*db_query("DELETE FROM {textbook_companion_example} WHERE id = %d", $example_id);*/
+ $query = db_delete('textbook_companion_example');
+ $query->condition('id', $example_id);
+ $num_deleted = $query->execute();
return $status;
}
@@ -2317,8 +2853,15 @@ function delete_chapter($chapter_id)
$status = TRUE;
$root_path = textbook_companion_path();
- $chapter_q = db_query("SELECT * FROM {textbook_companion_chapter} WHERE id = %d", $chapter_id);
- $chapter_data = db_fetch_object($chapter_q);
+ /*$chapter_q = db_query("SELECT * FROM {textbook_companion_chapter} WHERE id = %d", $chapter_id);
+ $chapter_data = db_fetch_object($chapter_q);*/
+
+ $query = db_select('textbook_companion_chapter');
+ $query->fields('textbook_companion_chapter');
+ $query->condition('id', $chapter_id);
+ $chapter_q = $query->execute();
+ $chapter_data =$chapter_q->fetchObject();
+
if (!$chapter_data)
{
drupal_set_message('Invalid chapter.', 'error');
@@ -2326,8 +2869,15 @@ function delete_chapter($chapter_id)
}
/* deleting examples */
- $example_q = db_query("SELECT * FROM {textbook_companion_example} WHERE chapter_id = %d", $chapter_id);
- while ($example_data = db_fetch_object($example_q))
+
+ /*$example_q = db_query("SELECT * FROM {textbook_companion_example} WHERE chapter_id = %d", $chapter_id);*/
+
+ $query = db_select('textbook_companion_example');
+ $query->fields('textbook_companion_example');
+ $query->condition('chapter_id', $chapter_id);
+ $example_q = $query->execute();
+
+ while ($example_data = $example_q->fetchObject())
{
if (!delete_example($example_data->id))
$status = FALSE;
@@ -2353,7 +2903,12 @@ function delete_chapter($chapter_id)
return FALSE;
} else {
/* deleting chapter details from database */
- db_query("DELETE FROM {textbook_companion_chapter} WHERE id = %d", $chapter_id);
+
+ /*db_query("DELETE FROM {textbook_companion_chapter} WHERE id = %d", $chapter_id);*/
+ $query = db_delete('textbook_companion_chapter');
+ $query->condition('id', $chapter_id);
+ $num_deleted = $query->execute();
+
return TRUE;
}
} else {
@@ -2369,8 +2924,14 @@ function delete_book($book_id)
$status = TRUE;
$root_path = textbook_companion_path();
- $preference_q = db_query("SELECT * FROM {textbook_companion_preference} WHERE id = %d", $book_id);
- $preference_data = db_fetch_object($preference_q);
+ /*$preference_q = db_query("SELECT * FROM {textbook_companion_preference} WHERE id = %d", $book_id);
+ $preference_data = db_fetch_object($preference_q);*/
+ $query = db_select('textbook_companion_preference');
+ $query->fields('textbook_companion_preference');
+ $query->condition('id', $book_id);
+ $preference_q = $query->execute();
+ $preference_data =$preference_q->fetchObject();
+
if (!$preference_data)
{
drupal_set_message('Invalid book.', 'error');
@@ -2378,8 +2939,14 @@ function delete_book($book_id)
}
/* delete chapters */
- $chapter_q = db_query("SELECT * FROM {textbook_companion_chapter} WHERE preference_id = %d", $preference_data->id);
- while ($chapter_data = db_fetch_object($chapter_q))
+
+ /*$chapter_q = db_query("SELECT * FROM {textbook_companion_chapter} WHERE preference_id = %d", $preference_data->id);*/
+ $query = db_select('textbook_companion_chapter');
+ $query->fields('textbook_companion_chapter');
+ $query->condition('preference_id', $preference_data->id);
+ $chapter_q = $query->execute();
+
+ while ($chapter_data = $chapter_q->fetchObject())
{
if (!delete_chapter($chapter_data->id))
{
@@ -2393,8 +2960,15 @@ function delete_file($file_id)
{
$root_path = textbook_companion_path();
- $file_q = db_query("SELECT * FROM {textbook_companion_example_files} WHERE id = %d LIMIT 1", $file_id);
- $file_data = db_fetch_object($file_q);
+ /*$file_q = db_query("SELECT * FROM {textbook_companion_example_files} WHERE id = %d LIMIT 1", $file_id);*/
+
+ $query = db_select('textbook_companion_example_files');
+ $query->fields('textbook_companion_example_files');
+ $query->condition('id', $file_id);
+ $query->range(0, 1);
+ $file_q = $query->execute();
+
+ $file_data = $file_q->fetchObject();
if (!$file_data)
{
drupal_set_message('Invalid file specified.', 'error');
@@ -2423,7 +2997,12 @@ function delete_file($file_id)
return FALSE;
} else {
/* deleting example files database entries */
- db_query("DELETE FROM {textbook_companion_example_files} WHERE id = %d", $file_id);
+
+ /*db_query("DELETE FROM {textbook_companion_example_files} WHERE id = %d", $file_id);*/
+ $query = db_delete('textbook_companion_example_files');
+ $query->condition('id', $file_id);
+ $num_deleted = $query->execute();
+
return TRUE;
}
}
@@ -2438,7 +3017,7 @@ function book_proposal_nonaicte_form($form_state)
$form = array();
$form['imp_notice'] = array(
'#type' => 'item',
- '#value' => '
Please fill up this form carefully as the details entered here will be exactly written in the Textbook Companion and also follow the additional guidelines. ',
+ '#markup' => '
Please fill up this form carefully as the details entered here will be exactly written in the Textbook Companion and also follow the additional guidelines. ',
);
$form['guidelines'] = array(
'#type' => 'fieldset',
@@ -2450,7 +3029,7 @@ function book_proposal_nonaicte_form($form_state)
$form['guidelines']['book'] = array(
'#type' => 'item',
'#required' => TRUE,
- '#value' => '
+ '#markup' => '
All the fields are compulsory
Proof (example: syllabus) to the usage/ popularity of the textbook must be provided in the references box below
Please make sure that the book proposed by you has at least 80 examples which include numerical computations and which can be coded in Scilab
@@ -2536,17 +3115,26 @@ function book_proposal_nonaicte_form($form_state)
);
$form['city'] = array(
'#type' => 'textfield',
- '#title' => t('City/Village'),
- '#size' => 50,
- '#maxlength' => 50,
+ '#title' => t('City/ Village'),
+ '#size' => 80,
+ '#maxlength' => 150,
'#required' => TRUE,
- );
- $form['states'] = array(
- '#type' => 'select',
+ '#attributes' =>array('placeholder' =>'Insert location of your institute/ university....'),
+ );
+$form['pincode'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Pincode'),
+ '#size' => 30,
+ '#maxlength' => 6,
+ '#required' => TRUE,
+ '#attributes' =>array('placeholder' =>'Insert pincode of your city/ village....'),
+);
+$form['all_state'] = array(
+ '#type' => 'select',
'#title' => t('State'),
- '#options' => array (
- '' => 'Please select....',
- 'Andhra Pradesh' => 'Andhra Pradesh',
+ '#options' => array(
+ '0' => 'Please select...',
+ 'Andhra Pradesh' => t('Andhra Pradesh'),
'Arunachal Pradesh' => 'Arunachal Pradesh',
'Assam' => 'Assam',
'Bihar' => 'Bihar',
@@ -2585,7 +3173,10 @@ function book_proposal_nonaicte_form($form_state)
'Others' => 'Others',
),
'#required' => TRUE,
- );
+ '#tree' => TRUE,
+ '#validated' => TRUE,
+ );
+
$form['faculty'] = array(
'#type' => 'hidden',
'#value' => 'None',
@@ -2623,6 +3214,7 @@ function book_proposal_nonaicte_form($form_state)
'#maxlength' => 50,
//'#required' => TRUE,
'#description' => t('Specify the Older version used'),
+ '#states' => array('visible' => array(':input[name="version"]' => array('value' => 'olderversion'),),),
);
$form['completion_date'] = array(
'#type' => 'textfield',
@@ -2656,6 +3248,7 @@ function book_proposal_nonaicte_form($form_state)
'#type' => 'textarea',
'#size' => 300,
'#maxlength' => 300,
+ '#states' => array('visible' => array(':input[name="reason[Other reason]"]' => array('checked' => TRUE),),),
//'#required' => FALSE,
);
$form['proposal_type'] = array(
@@ -2683,7 +3276,7 @@ function book_proposal_nonaicte_form($form_state)
'#size' => 30,
'#maxlength' => 100,
'#required' => TRUE,
- '#value' => $row1->book,
+ '#default_value' => $row1->book,
'#disabled' => ($row1->book?TRUE:FALSE),
);
$form['preference1']['author1'] = array(
@@ -2692,7 +3285,7 @@ function book_proposal_nonaicte_form($form_state)
'#size' => 30,
'#maxlength' => 100,
'#required' => TRUE,
- '#value' => $row1->author,
+ '#default_value' => $row1->author,
'#disabled' => ($row1->author?TRUE:FALSE),
);
$form['preference1']['isbn1'] = array(
@@ -2701,7 +3294,7 @@ function book_proposal_nonaicte_form($form_state)
'#size' => 30,
'#maxlength' => 25,
'#required' => TRUE,
- '#value' => $row1->isbn,
+ '#default_value' => $row1->isbn,
'#disabled' => ($row1->isbn?TRUE:FALSE),
);
$form['preference1']['publisher1'] = array(
@@ -2710,7 +3303,7 @@ function book_proposal_nonaicte_form($form_state)
'#size' => 30,
'#maxlength' => 50,
'#required' => TRUE,
- '#value' => $row1->publisher,
+ '#default_value' => $row1->publisher,
);
$form['preference1']['edition1'] = array(
'#type' => 'textfield',
@@ -2718,7 +3311,7 @@ function book_proposal_nonaicte_form($form_state)
'#size' => 4,
'#maxlength' => 2,
'#required' => TRUE,
- '#value' => $row1->edition,
+ '#default_value' => $row1->edition,
);
$form['preference1']['year1'] = array(
'#type' => 'textfield',
@@ -2726,7 +3319,7 @@ function book_proposal_nonaicte_form($form_state)
'#size' => 4,
'#maxlength' => 4,
'#required' => TRUE,
- '#value' => $row1->year,
+ '#default_value' => $row1->year,
);
$form['termconditions'] = array(
@@ -2741,25 +3334,17 @@ function book_proposal_nonaicte_form($form_state)
'#value' => t('Submit')
);
- /* #value fix for #default_value bug drupal6 */
+ /* #value fix for #default_value bug drupal6
foreach(array("preference1") as $preference) {
foreach($form[$preference] as $key => $value) {
if(!$form[$preference][$key]["#value"]) {
unset($form[$preference][$key]["#value"]);
}
}
- }
+ }*/
return $form;
}
-function book_proposal_nonaicte_form_validate($form, &$form_state)
-{
-if($form_state['values']['city']== ''){
- form_set_error('city', t('Invalid city/village'));
- }
- if($form_state['values']['state']== ''){
- form_set_error('state', t('Invalid state'));
- }
-}
+
function book_proposal_nonaicte_form_submit($form, &$form_state)
{
@@ -2802,23 +3387,75 @@ function book_proposal_nonaicte_form_submit($form, &$form_state)
if($form_state['values']['version'] == 'olderversion'){
$scilab_version = $form_state['values']['older'];
}
+
+ //var_dump($form_state['values']);
- $query = "INSERT INTO {textbook_companion_proposal}
- (uid, approver_uid, full_name, mobile, gender, how_project, course, branch, university, faculty, reviewer, reference, completion_date, creation_date, approval_date, proposal_status, scilab_version, operating_system, teacher_email, proposal_type, reason ) VALUES (".$user->uid.", 0, '".ucwords(strtolower($form_state['values']['full_name']))."', '".$form_state['values']['mobile']."', '".$form_state['values']['gender']."', '".$form_state['values']['how_project']."', '".$form_state['values']['course']."', '".$form_state['values']['branch']."', '".$form_state['values']['university']."', '".$form_state['values']['city']."','".$form_state['values']['state']."' ,'".ucwords(strtolower($form_state['values']['faculty']))."', '".ucwords(strtolower($form_state['values']['reviewer']))."', '".$form_state['values']['reference']."', '".$completion_date_timestamp."', '".time()."', 0, 0, '".$scilab_version."', '".$form_state['values']['operating_system']."', '".$form_state['values']['faculty_email']."','".$form_state['values']['proposal_type']."','".$my_reason."')";
+ /*$query = "INSERT INTO {textbook_companion_proposal}
+ (uid, approver_uid, full_name, mobile, gender, how_project, course, branch, university, faculty, reviewer, reference, completion_date, creation_date, approval_date, proposal_status, scilab_version, operating_system, teacher_email, proposal_type, reason ) VALUES (".$user->uid.", 0, '".ucwords(strtolower($form_state['values']['full_name']))."', '".$form_state['values']['mobile']."', '".$form_state['values']['gender']."', '".$form_state['values']['how_project']."', '".$form_state['values']['course']."', '".$form_state['values']['branch']."', '".$form_state['values']['university']."', '".ucwords(strtolower($form_state['values']['faculty']))."', '".ucwords(strtolower($form_state['values']['reviewer']))."', '".strtolower($form_state['values']['reference'])."', '".$completion_date_timestamp."', '".time()."', 0, 0, '".$scilab_version."', '".$form_state['values']['operating_system']."', '".$form_state['values']['faculty_email']."','".$form_state['values']['proposal_type']."','".$my_reason."')";*/
+
+
+
+/*$query = "INSERT INTO {textbook_companion_proposal}
+ (uid, approver_uid, full_name, mobile, gender, how_project, course, branch, university,city, pincode, state, faculty, reviewer, reference, completion_date, creation_date, message, approval_date, proposal_status, scilab_version, operating_system, teacher_email, proposal_type, reason ) VALUES (:uid, :approver_uid, :full_name, :mobile, :gender, :how_project, :course, :branch, :university, :city, :pincode, :state,
+ :faculty, :reviewer, :reference, :expected_completion_date, :creation_date,:message,
+ :approval_date, :proposal_status, :scilab_version, :operating_system, :teacher_email,: proposal_type, :reason)"; */
+
+
+ $query = "
+INSERT INTO {textbook_companion_proposal}
+ (uid, approver_uid, full_name, mobile, gender, how_project, course, branch, university, city, pincode, state, faculty, reviewer, reference, completion_date, creation_date, approval_date, proposal_status, message, scilab_version, operating_system, teacher_email, proposal_type, reason) VALUES (:uid, :approver_uid, :full_name, :mobile, :gender, :how_project, :course, :branch, :university, :city, :pincode, :state,
+:faculty, :reviewer, :reference, :completion_date, :creation_date, :approval_date, :proposal_status, :message, :scilab_version,
+ :operating_system, :teacher_email, :proposal_type, :reason)
+";
+
+ // $result = db_query($query);
+
+
+$args = array(
+ ":uid"=> $user->uid,
+ ":approver_uid"=> 0,
+ ":full_name"=> ucwords(strtolower($form_state['values']['full_name'])),
+ ":mobile"=> $form_state['values']['mobile'],
+ ":gender"=> $form_state['values']['gender'],
+ ":how_project"=> $form_state['values']['how_project'],
+ ":course"=> $form_state['values']['course'],
+ ":branch"=> $form_state['values']['branch'],
+ ":university"=> $form_state['values']['university'],
+ ":city"=> $form_state['values']['city'],
+ ":pincode"=> $form_state['values']['pincode'],
+ ":state"=> $form_state['values']['all_state'],
+ ":faculty"=> ucwords(strtolower($form_state['values']['faculty'])),
+ ":reviewer"=> ucwords(strtolower($form_state['values']['reviewer'])),
+ ":reference"=> strtolower($form_state['values']['reference']),
+ ":completion_date"=> $completion_date_timestamp,
+ ":creation_date"=> time(),
+ ":approval_date"=> time(),
+ ":proposal_status"=> 0,
+ ":message"=> 'None',
+ ":scilab_version"=>$scilab_version,
+ ":operating_system"=>$form_state['values']['operating_system'],
+ ":teacher_email"=>$form_state['values']['faculty_email'],
+ ":proposal_type"=>$form_state['values']['proposal_type'],
+ ":reason"=> $my_reason,
+ );
+var_dump($args);
+ $result = db_query($query, $args, array('return' => Database::RETURN_INSERT_ID));
+
- $result = db_query($query);
if (!$result)
{
drupal_set_message(t('Error receiving your proposal. Please try again.'), 'error');
return;
}
/* proposal id */
- $proposal_id = db_last_insert_id('textbook_companion_proposal', 'id');
+ //$proposal_id = db_last_insert_id('textbook_companion_proposal', 'id');
+ //$proposal_id = db_last_insert_id('textbook_companion_proposal', 'id');
+ $proposal_id = $result;
/* inserting first book preference */
if ($form_state['values']['book1'])
{
- $result = db_query("INSERT INTO {textbook_companion_preference}
+ /*$result = db_query("INSERT INTO {textbook_companion_preference}
(proposal_id, pref_number, book, author, isbn, publisher, edition, year, category, approval_status, nonaicte_book) VALUES
(%d, %d, '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d)",
$proposal_id,
@@ -2832,7 +3469,29 @@ function book_proposal_nonaicte_form_submit($form, &$form_state)
0,
0,
1
- );
+ );*/
+
+
+$query = "INSERT INTO {textbook_companion_preference}
+ (proposal_id, pref_number, book, author, isbn, publisher, edition, year, category, approval_status, nonaicte_book) VALUES
+ (:proposal_id, :pref_number, :book, :author, :isbn, :publisher, :edition, :year, :category, :approval_status, :nonaicte_book)";
+
+$args = array(
+ ":proposal_id"=> $proposal_id,
+ ":pref_number"=> 1,
+ ":book"=> ucwords(strtolower($form_state['values']['book1'])),
+ ":author"=> ucwords(strtolower($form_state['values']['author1'])),
+ ":isbn"=> $form_state['values']['isbn1'],
+ ":publisher"=> ucwords(strtolower($form_state['values']['publisher1'])),
+ ":edition"=> $form_state['values']['edition1'],
+ ":year"=> $form_state['values']['year1'],
+ ":category"=> 0,
+ ":approval_status"=> 0,
+ ":nonaicte_book"=> 1,
+ );
+
+ $result = db_query($query, $args);
+
if (!$result)
{
drupal_set_message(t('Error receiving your first book preference.'), 'error');
@@ -2862,14 +3521,13 @@ function del_book_pdf($book_id)
if (file_exists($dir_path . $pdf_filename))
unlink($dir_path . $pdf_filename);
}
+
function textbook_companion_init(){
- //drupal_add_css('http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css', array('type' => 'external'));
- //drupal_add_js('http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css', array('type' => 'external'));
- //drupal_add_js(drupal_get_path('module', 'textbook_companion') .'/js/jquery-ui.js');
- //drupal_add_js(drupal_get_path('module', 'textbook_companion') .'/js/jquery.js');
+
$path = drupal_get_path('module', 'textbook_companion');
drupal_add_js($path . '/css/textbook_companion.css');
drupal_add_js($path . '/js/textbook_companion.js');
drupal_add_js($path . '/js/jquery-1.7.1.js');
- drupal_add_js($path . '/js/tbc-download.js');
+
}
+
--
cgit