diff --git a/admin/admin_template/default/index_template.inc.php b/admin/admin_template/default/index_template.inc.php
index 99691d67..c502c8e4 100755
--- a/admin/admin_template/default/index_template.inc.php
+++ b/admin/admin_template/default/index_template.inc.php
@@ -34,8 +34,8 @@
-
+
@@ -64,7 +64,15 @@
@@ -294,4 +294,4 @@
let fileName = $(this).val().replace(/\\/g, '/').replace(/.*\//, '');
$(this).parent('.custom-file').find('.custom-file-label').text(fileName);
});
-
\ No newline at end of file
+
diff --git a/admin/modules/bibliography/index.php b/admin/modules/bibliography/index.php
index f9f80b8b..651b4f46 100755
--- a/admin/modules/bibliography/index.php
+++ b/admin/modules/bibliography/index.php
@@ -226,8 +226,15 @@ function getimagesizefromstring($string_data)
$image_upload->setAllowableFormat($sysconf['allowed_images']);
$image_upload->setMaxSize($sysconf['max_image_upload'] * 1024);
$image_upload->setUploadDir(IMGBS . 'docs');
+
+ $img_title = $data['title'].'_'.date("YmdHis");
+ if(strlen($data['title']) > 70){
+ $img_title = substr($data['title'], 0, 70).'_'.date("YmdHis");
+ }
+
+ $new_filename = strtolower('cover_'. preg_replace("/[^a-zA-Z0-9]+/", "-", $img_title));
// upload the file and change all space characters to underscore
- $img_upload_status = $image_upload->doUpload('image', preg_replace('@\s+@i', '_', $_FILES['image']['name']));
+ $img_upload_status = $image_upload->doUpload('image', $new_filename);
if ($img_upload_status == UPLOAD_SUCCESS) {
$data['image'] = $dbs->escape_string($image_upload->new_filename);
// write log
@@ -235,8 +242,9 @@ function getimagesizefromstring($string_data)
utility::jsToastr('Bibliography', __('Image Uploaded Successfully'), 'success');
} else {
// write log
+ $data['image'] = NULL;
utility::writeLogs($dbs, 'staff', $_SESSION['uid'], 'bibliography', 'ERROR : ' . $_SESSION['realname'] . ' FAILED TO upload image file ' . $image_upload->new_filename . ', with error (' . $image_upload->error . ')');
- utility::jsToastr('Bibliography', __('Image Uploaded Failed'), 'error');
+ utility::jsToastr('Bibliography', __('Image Uploaded Failed').'
diff --git a/admin/admin_template/nightmode/index_template.inc.php b/admin/admin_template/nightmode/index_template.inc.php
index ba45809b..ae4f6c39 100755
--- a/admin/admin_template/nightmode/index_template.inc.php
+++ b/admin/admin_template/nightmode/index_template.inc.php
@@ -60,7 +60,15 @@
- Official Website'); ?>
+ Official Website'); ?>
'.$image_upload->error, 'error'); } } else if (!empty($_POST['base64picstring'])) { list($filedata, $filedom) = explode('#image/type#', $_POST['base64picstring']); @@ -261,6 +269,13 @@ function getimagesizefromstring($string_data) if ($sysconf['log']['biblio']) { $_prevrawdata = api::biblio_load($dbs, $_POST['updateRecordID']); } + + // Remove previous popular biblio data from cache if opac use default template + if ($sysconf['template']['theme'] == 'default' && $_POST['opacHide'] != $_POST['opacHideOrigin']) { + require SB . 'api/v1/helpers/Cache.php'; + Cache::destroy('biblio_popular'); + } + /* UPDATE RECORD MODE */ // remove input date unset($data['input_date']); @@ -1063,6 +1078,7 @@ function affectedDetail($obj_db, $array_data) // biblio hide from opac $hide_options[] = array('0', __('Show')); $hide_options[] = array('1', __('Hide')); + $form->addHidden('opacHideOrigin', $rec_d['opac_hide']??0); $form->addRadio('opacHide', __('Hide in OPAC'), $hide_options, isset($rec_d['opac_hide']) && $rec_d['opac_hide'] ? '1' : '0'); // biblio promote to front page $promote_options[] = array('0', __('Don\'t Promote')); diff --git a/admin/modules/bibliography/item.php b/admin/modules/bibliography/item.php index 9a1475ad..2fa8327d 100755 --- a/admin/modules/bibliography/item.php +++ b/admin/modules/bibliography/item.php @@ -260,7 +260,7 @@ // default biblio title and biblio ID $b_title = $rec_d['title']; $b_id = $rec_d['biblio_id']; - if (trim($rec_d['call_number']) == '') { + if (trim($rec_d['call_number']??'') == '') { $biblio_q = $dbs->query('SELECT call_number FROM biblio WHERE biblio_id='.$rec_d['biblio_id']); $biblio_d = $biblio_q->fetch_assoc(); $rec_d['call_number'] = $biblio_d['call_number']; diff --git a/admin/modules/bibliography/item_import.php b/admin/modules/bibliography/item_import.php index 42a12552..f0531f3a 100755 --- a/admin/modules/bibliography/item_import.php +++ b/admin/modules/bibliography/item_import.php @@ -133,30 +133,39 @@ $item_status = utility::getID($dbs, 'mst_item_status', 'item_status_id', 'item_status_name', $field[9], $stat_id_cache); $item_status = $item_status?'\''.$item_status.'\'':'NULL'; $site = $field[10]?'\''.$field[10].'\'':'NULL'; - $source = $field[11]?'\''.$field[11].'\'':'NULL'; + $source = $field[11]?'\''.$field[11].'\'':'0'; $invoice = $field[12]?'\''.$field[12].'\'':'NULL'; $price = $field[13]?'\''.$field[13].'\'':'NULL'; $price_currency = $field[14]?'\''.$field[14].'\'':'NULL'; $invoice_date = $field[15]?'\''.$field[15].'\'':'NULL'; - $input_date = '\''.$field[16].'\''; - $last_update = '\''.$field[17].'\''; - - // sql insert string - $sql_str = "INSERT INTO item (item_code, call_number, coll_type_id, - inventory_code, received_date, supplier_id, - order_no, location_id, order_date, item_status_id, site, - source, invoice, price, price_currency, invoice_date, - input_date, last_update) - VALUES ($item_code, $call_number, $coll_type, - $inventory_code, $received_date, $supplier, - $order_no, $location, $order_date, $item_status, $site, - $source, $invoice, $price, $price_currency, $invoice_date, - $input_date, $last_update)"; + $input_date = $field[16]?'\''.$field[16].'\'':'\''.date('Y-m-d H:i:s').'\''; + $last_update = $field[17]?'\''.$field[17].'\'':'\''.date('Y-m-d H:i:s').'\''; + $title = $field[18]; // first field is header if (isset($_POST['header']) && $n < 1) { $n++; + continue; } else { + + // get biblio_id + $b_q = $dbs->query(sprintf("select biblio_id from biblio where title = '%s'", $title)); + if($b_q->num_rows < 1) continue; + $b_d = $b_q->fetch_row(); + $biblio_id = $b_d[0]; + + // sql insert string + $sql_str = "INSERT INTO item (biblio_id, item_code, call_number, coll_type_id, + inventory_code, received_date, supplier_id, + order_no, location_id, order_date, item_status_id, site, + source, invoice, price, price_currency, invoice_date, + input_date, last_update) + VALUES ($biblio_id, $item_code, $call_number, $coll_type, + $inventory_code, $received_date, $supplier, + $order_no, $location, $order_date, $item_status, $site, + $source, $invoice, $price, $price_currency, $invoice_date, + $input_date, $last_update)"; + // send query // die($sql_str); $dbs->query($sql_str); diff --git a/admin/modules/bibliography/marcexport.php b/admin/modules/bibliography/marcexport.php index 8fbf72cb..9eda19a6 100644 --- a/admin/modules/bibliography/marcexport.php +++ b/admin/modules/bibliography/marcexport.php @@ -45,7 +45,7 @@ // check if PEAR is installed ob_start(); -include 'File/MARC.php'; +include MDLBS . 'bibliography/File/MARC.php'; ob_end_clean(); if (!class_exists('File_MARC')) { die('
'.__('PEAR, File_MARC
@@ -216,14 +216,14 @@
require LIB.'biblio_list_index.inc.php';
}
// table spec
- $table_spec = 'search_biblio';
+ $table_spec = 'search_biblio AS `index`';
$datagrid->setSQLColumn('biblio_id',
'title AS \''.__('Title').'\'',
'author AS \''.__('Author').'\'');
} else {
require LIB.'biblio_list.inc.php';
// table spec
- $table_spec = 'search_biblio';
+ $table_spec = 'search_biblio AS `index`';
$datagrid->setSQLColumn('biblio_id',
'title AS \''.__('Title').'\'',
'author AS \''.__('Author').'\'');
diff --git a/admin/modules/bibliography/pop_attach.php b/admin/modules/bibliography/pop_attach.php
index 8cb9a2fb..487b6913 100755
--- a/admin/modules/bibliography/pop_attach.php
+++ b/admin/modules/bibliography/pop_attach.php
@@ -88,6 +88,8 @@
$fdata['file_url'] = $dbs->escape_string($url);
$fdata['file_dir'] = $dbs->escape_string($file_dir);
$fdata['file_desc'] = $dbs->escape_string(trim(strip_tags($_POST['fileDesc'])));
+ if(isset($_POST['fileKey']) && trim($_POST['fileKey']) !== '')
+ $fdata['file_key'] = $dbs->escape_string(trim(strip_tags($_POST['fileKey'])));
$fdata['mime_type'] = $sysconf['mimetype'][$file_ext];
$fdata['input_date'] = date('Y-m-d H:i:s');
$fdata['last_update'] = $fdata['input_date'];
@@ -110,6 +112,8 @@
$fdata['file_url'] = $dbs->escape_string($fdata['file_name']);
$fdata['file_dir'] = 'literal{NULL}';
$fdata['file_desc'] = $dbs->escape_string(trim(strip_tags($_POST['fileDesc'])));
+ if(isset($_POST['fileKey']) && trim($_POST['fileKey']) !== '')
+ $fdata['file_key'] = $dbs->escape_string(trim(strip_tags($_POST['fileKey'])));
$fdata['mime_type'] = 'text/uri-list';
$fdata['input_date'] = date('Y-m-d H:i:s');
$fdata['last_update'] = $fdata['input_date'];
@@ -144,7 +148,10 @@
// file biblio access update
$update1 = $sql_op->update('biblio_attachment', array('access_type' => $data['access_type'], 'access_limit' => $data['access_limit'], 'placement' => $data['placement']), 'biblio_id='.$updateBiblioID.' AND file_id='.$fileID);
// file description update
- $update2 = $sql_op->update('files', array('file_title' => $title, 'file_url' => $url, 'file_desc' => $dbs->escape_string(trim($_POST['fileDesc']))), 'file_id='.$fileID);
+ $file_desc_update = array('file_title' => $title, 'file_url' => $url, 'file_desc' => $dbs->escape_string(trim($_POST['fileDesc'])));
+ if(isset($_POST['fileKey']))
+ $file_desc_update['file_key'] = $dbs->escape_string(trim(strip_tags($_POST['fileKey'])));
+ $update2 = $sql_op->update('files', $file_desc_update, 'file_id='.$fileID);
if ($update1) {
utility::jsToastr('File Attachment', __('File Attachment data updated!'), 'success');
echo '';
+ exit;
+}
+
+?>
+
+
+setSQLColumn('c.comment_id', 'b.title', 'c.comment AS `' . __('Comment') . '`', 'm.member_name AS `' . __('Comment By') . '`', 'c.input_date AS `' . __('Comment At') . '`');
+$datagrid->setSQLorder('c.input_date DESC');
+$datagrid->invisible_fields = [0];
+
+// is there any search
+if (isset($_GET['keywords']) AND $_GET['keywords']) {
+ $keywords = utility::filterData('keywords', 'get', true, true, true);
+ $criteria_str = "c.comment LIKE '%{$keywords}%' OR m.member_name LIKE '%{$keywords}%'";
+ $datagrid->setSQLCriteria($criteria_str);
+}
+
+function addTitle($dbs, $data)
+{
+ return '' . __('Title') . ' :
' . $data[1] . '
' . "\n";
- $_overdue_data .= '
';
-
-
- // message
- $_message = str_ireplace(array('', '', '', ''),
- array($this->member_id, $this->member_name, $_overdue_data, $_curr_date), $_msg_tpl);
-
- $mail->isHTML(true); // Set email format to HTML
- $mail->Subject = str_replace(array('{member_name}', '{member_email}'), array($this->member_name, $this->member_email), __('Overdue Notice for Member {member_name} ({member_email})'));
- $mail->msgHTML($_message);
- $mail->AltBody = strip_tags($_message);
-
- $mail->send();
- return array('status' => 'SENT', 'message' => 'Overdue notification E-Mail have been sent to ' . $this->member_email);
- } catch (Exception $exception) {
- return array('status' => 'ERROR', 'message' => "Message could not be sent. Mailer Error: {$mail->ErrorInfo}");
- }
- }
-}
+obj_db = $obj_db;
+ // get member data from database
+ $_member_q = $this->obj_db->query(sprintf("SELECT m.*,mt.* FROM member AS m
+ LEFT JOIN mst_member_type AS mt ON m.member_type_id=mt.member_type_id
+ WHERE member_id='%s'", $str_member_id));
+
+ if ($_member_q->num_rows > 0) {
+ // set the is_member property flag to TRUE
+ $this->is_member = true;
+ $_member_d = $_member_q->fetch_assoc();
+ // assign database value to class properties
+ $this->member_id = $_member_d['member_id'];
+ $this->member_name = $_member_d['member_name'];
+ $this->member_type_id = $_member_d['member_type_id'];
+ $this->member_type_name = $_member_d['member_type_name'];
+ $this->register_date = $_member_d['register_date'];
+ $this->expire_date = $_member_d['expire_date'];
+ $this->member_email = $_member_d['member_email'];
+ $this->inst_name = $_member_d['inst_name'];
+ $this->member_image = $_member_d['member_image'];
+ $this->member_notes = $_member_d['member_notes'];
+ $this->is_pending = (bool)$_member_d['is_pending'];
+ $this->member_type_prop = array(
+ 'loan_limit' => $_member_d['loan_limit'],
+ 'loan_periode' => $_member_d['loan_periode'],
+ 'enable_reserve' => $_member_d['enable_reserve'],
+ 'reserve_limit' => $_member_d['reserve_limit'],
+ 'member_periode' => $_member_d['member_periode'],
+ 'reborrow_limit' => $_member_d['reborrow_limit'],
+ 'fine_each_day' => $_member_d['fine_each_day'],
+ 'grace_periode' => $_member_d['grace_periode']
+ );
+
+ // is membership expired ?
+ // compare it with current date
+ $_current_date = date('Y-m-d');
+ $_expired_date = simbio_date::compareDates($_current_date, $_member_d['expire_date']);
+ if ($_expired_date <= $_member_d['expire_date']) {
+ $this->is_expire = false;
+ }
+ }
+ }
+
+
+ # checking wether member is valid or not
+ # return : boolean
+ public function valid()
+ {
+ return $this->is_member;
+ }
+
+
+ # checking wether membership is already expired
+ # return : boolean
+ public function isExpired()
+ {
+ return $this->is_expire;
+ }
+
+
+ # checking wether membership is pending
+ # return : boolean
+ public function isPending()
+ {
+ return $this->is_pending;
+ }
+
+
+ # get all member properties
+ # retuen : array
+ public function getMemberTypeProp()
+ {
+ // return all member information as an array
+ return $this->member_type_prop;
+ }
+
+
+ # get info about item being lent by member
+ # return : array
+ protected function getItemLoan($int_loan_rules = 0)
+ {
+ $_arr_on_loan = array();
+ // count how many items is in loan for this member
+ if ($int_loan_rules) {
+ $_sql_str = "SELECT item_code FROM loan AS l
+ WHERE member_id='".$this->member_id."' AND is_lent=1 AND is_return=0 AND loan_rules_id=$int_loan_rules";
+ } else {
+ $_sql_str = "SELECT item_code FROM loan AS l
+ WHERE member_id='".$this->member_id."' AND is_lent=1 AND is_return=0";
+ }
+ $_count_q = $this->obj_db->query($_sql_str);
+ while ($_count_d = $_count_q->fetch_row()) {
+ $_arr_on_loan[] = $_count_d[0];
+ }
+
+ return $_arr_on_loan;
+ }
+
+
+ # get an array of member's overdue data
+ public static function getOverduedLoan($obj_db, $str_member_id)
+ { //
+
+ $_overdues = array();
+ $_ovd_title_q = $obj_db->query(sprintf('SELECT l.loan_id, l.item_code, i.price, i.price_currency,
+ b.title, l.loan_date,
+ l.due_date, (TO_DAYS(DATE(NOW()))-TO_DAYS(due_date)) AS \'Overdue Days\'
+ FROM loan AS l
+ LEFT JOIN item AS i ON l.item_code=i.item_code
+ LEFT JOIN biblio AS b ON i.biblio_id=b.biblio_id
+ WHERE (l.is_lent=1 AND l.is_return=0 AND TO_DAYS(due_date) < TO_DAYS(\''.date('Y-m-d').'\')) AND l.member_id=\'%s\'', $str_member_id));
+ while ($_ovd_title_d = $_ovd_title_q->fetch_assoc()) {
+ $_overdues[] = $_ovd_title_d;
+ }
+
+ return $_overdues;
+ }
+
+
+ # send overdue notice e-mail
+ public function sendOverdueNotice()
+ {
+ global $sysconf;
+ $mail = new PHPMailer\PHPMailer\PHPMailer(true);
+ try {
+ //Server settings
+ $mail->SMTPDebug = $sysconf['mail']['debug']; // Enable verbose debug output
+ $mail->isSMTP(); // Send using SMTP
+ $mail->Host = $sysconf['mail']['server']; // Set the SMTP server to send through
+ $mail->SMTPAuth = $sysconf['mail']['auth_enable']; // Enable SMTP authentication
+ $mail->Username = $sysconf['mail']['auth_username']; // SMTP username
+ $mail->Password = $sysconf['mail']['auth_password']; // SMTP password
+ if ($sysconf['mail']['SMTPSecure'] === 'tls') { // Enable TLS encryption; `PHPMailer::ENCRYPTION_SMTPS` encouraged
+ $mail->SMTPSecure = PHPMailer\PHPMailer\PHPMailer::ENCRYPTION_STARTTLS;
+ } else if ($sysconf['mail']['SMTPSecure'] === 'ssl') {
+ $mail->SMTPSecure = PHPMailer\PHPMailer\PHPMailer::ENCRYPTION_SMTPS;
+ }
+ $mail->Port = $sysconf['mail']['server_port']; // TCP port to connect to, use 465 for `PHPMailer::ENCRYPTION_SMTPS` above
+
+ //Recipients
+ $mail->setFrom($sysconf['mail']['from'], $sysconf['mail']['from_name']);
+ $mail->addReplyTo($sysconf['mail']['reply_to'], $sysconf['mail']['reply_to_name']);
+ $mail->addAddress($this->member_email, $this->member_name);
+
+ // Content
+ // get message template
+ ob_start();
+ include SB . 'admin/admin_template/overdue-mail-tpl.php';
+ require MDLBS . 'circulation/circulation_base_lib.inc.php';
+
+ $circulation = new circulation($this->obj_db, $this->member_id);
+ $circulation->ignore_holidays_fine_calc = $sysconf['ignore_holidays_fine_calc'];
+ $circulation->holiday_dayname = $_SESSION['holiday_dayname'];
+ $circulation->holiday_date = $_SESSION['holiday_date'];
+
+ $_msg_tpl = ob_get_clean();
+
+ // date
+ $_curr_date = date('Y-m-d H:i:s');
+
+ // compile overdue data
+ $_overdue_data = '' . "\n";
+ $_overdue_data .= '
';
+
+
+ // message
+ $_message = str_ireplace(array('', '', '', ''),
+ array($this->member_id, $this->member_name, $_overdue_data, $_curr_date), $_msg_tpl);
+
+ $mail->isHTML(true); // Set email format to HTML
+ $mail->Subject = str_replace(array('{member_name}', '{member_email}'), array($this->member_name, $this->member_email), __('Overdue Notice for Member {member_name} ({member_email})'));
+ $mail->msgHTML($_message);
+ $mail->AltBody = strip_tags($_message);
+
+ $mail->send();
+ return array('status' => 'SENT', 'message' => 'Overdue notification E-Mail have been sent to ' . $this->member_email);
+ } catch (Exception $exception) {
+ return array('status' => 'ERROR', 'message' => "Message could not be sent. Mailer Error: {$mail->ErrorInfo}");
+ }
+ }
+}
diff --git a/admin/modules/reporting/customs/dl_counter.php b/admin/modules/reporting/customs/dl_counter.php
index 7b849031..40efaa02 100644
--- a/admin/modules/reporting/customs/dl_counter.php
+++ b/admin/modules/reporting/customs/dl_counter.php
@@ -135,7 +135,7 @@
}
if (isset($_GET['author']) AND !empty($_GET['author'])) {
$author = $dbs->escape_string($_GET['author']);
- $criteria .= ' AND b.author_name LIKE \'%'.$author.'%\'';
+ $criteria .= ' AND b.author LIKE \'%'.$author.'%\'';
}
if (isset($_GET['publishYear']) AND !empty($_GET['publishYear'])) {
$publish_year = $dbs->escape_string(trim($_GET['publishYear']));
diff --git a/admin/modules/reporting/customs/dl_detail.php b/admin/modules/reporting/customs/dl_detail.php
index d23af741..5a791ced 100644
--- a/admin/modules/reporting/customs/dl_detail.php
+++ b/admin/modules/reporting/customs/dl_detail.php
@@ -142,7 +142,7 @@
}
if (isset($_GET['author']) AND !empty($_GET['author'])) {
$author = $dbs->escape_string($_GET['author']);
- $criteria .= ' AND b.author_name LIKE \'%'.$author.'%\'';
+ $criteria .= ' AND b.author LIKE \'%'.$author.'%\'';
}
if (isset($_GET['publishYear']) AND !empty($_GET['publishYear'])) {
$publish_year = $dbs->escape_string(trim($_GET['publishYear']));
diff --git a/admin/modules/reporting/customs/item_titles_list.php b/admin/modules/reporting/customs/item_titles_list.php
index 0927f4b3..fd15e745 100755
--- a/admin/modules/reporting/customs/item_titles_list.php
+++ b/admin/modules/reporting/customs/item_titles_list.php
@@ -1,4 +1,5 @@
'.__('You don\'t have enough privileges to access this area!').'
');
+ die('' . $data[1] . '
'.$data[2].'
';
+}
+
+$datagrid->modifyColumnContent(2, 'callback{addTitle}');
+
+// set table and table header attributes
+$datagrid->table_attr = 'id="dataList" class="s-table table"';
+$datagrid->table_header_attr = 'class="dataListHeader" style="font-weight: bold;"';
+// edit and checkbox property
+$datagrid->edit_property = false;
+$datagrid->chbox_property = array('itemID', __('Delete'));
+// set delete proccess URL
+$datagrid->chbox_form_URL = $_SERVER['PHP_SELF'];
+$datagrid->column_width = array(0 => '5%', 1 => '75%');
+// put the result into variables
+$datagrid_result = $datagrid->createDataGrid($dbs, $table, 20, $can_read);
+
+if (isset($_GET['keywords']) AND $_GET['keywords']) {
+ $msg = str_replace('{result->num_rows}', $datagrid->num_rows, __('Found {result->num_rows} from your keywords'));
+ echo '' . $msg . ' : "' . htmlspecialchars($_GET['keywords']) . '"
';
+}
+echo $datagrid_result;
\ No newline at end of file
diff --git a/admin/modules/master_file/submenu.php b/admin/modules/master_file/submenu.php
index 87c2a976..9889ec22 100755
--- a/admin/modules/master_file/submenu.php
+++ b/admin/modules/master_file/submenu.php
@@ -41,6 +41,7 @@
$menu[] = array(__('Label'), MWB.'master_file/label.php', __('Special Labels for Titles to Show Up On Homepage'));
$menu[] = array(__('Frequency'), MWB.'master_file/frequency.php', __('Frequency'));
$menu[] = array('Header', __('TOOLS'));
+$menu[] = array(__('Comment Management'), MWB.'master_file/detail_comment.php', __('List of members comment about biblio'));
$menu[] = array(__('Cataloging Servers'), MWB.'master_file/p2pservers.php', __('List of available Copy Cataloging Servers'));
$menu[] = array(__('Item Code Pattern'), MWB.'master_file/item_code_pattern.php', __('Manage item code pattern'));
$menu[] = array(__('Orphaned Author'), MWB.'master_file/author.php?type=orphaned', __('Orphaned Authors'));
diff --git a/admin/modules/membership/index.php b/admin/modules/membership/index.php
index 3b18f52f..993e13ec 100755
--- a/admin/modules/membership/index.php
+++ b/admin/modules/membership/index.php
@@ -76,7 +76,7 @@ function getimagesizefromstring($string_data)
$query_image = $dbs->query("SELECT member_id FROM member WHERE member_id='{$member_id}' AND member_image='{$image_name}'");
if (!empty($query_image->num_rows)) {
- $_delete = $dbs->query(sprintf('UPDATE member SET member_image=NULL WHERE member_id=%d', $member_id));
+ $_delete = $dbs->query(sprintf("UPDATE member SET member_image=NULL WHERE member_id='%s", $member_id));
if ($_delete) {
$postImage = stripslashes($_POST['img']);
$postImage = str_replace('/', '', $postImage);
@@ -232,7 +232,7 @@ function getimagesizefromstring($string_data)
// update custom data
if (isset($custom_data)) {
// check if custom data for this record exists
- $_sql_check_custom_q = sprintf('SELECT member_id FROM member_custom WHERE member_id=%d', $updateRecordID);
+ $_sql_check_custom_q = sprintf("SELECT member_id FROM member_custom WHERE member_id='%s'", $updateRecordID);
$check_custom_q = $dbs->query($_sql_check_custom_q);
if ($check_custom_q->num_rows) {
@$sql_op->update('member_custom', $custom_data, 'member_id=\''.$updateRecordID.'\'');
@@ -431,7 +431,7 @@ function getimagesizefromstring($string_data)
$form->submit_button_attr = 'name="saveData" value="'.__('Update').'" class="s-btn btn btn-primary"';
// custom field data query
- $_sql_rec_cust_q = sprintf('SELECT * FROM member_custom WHERE member_id=%d', $itemID);
+ $_sql_rec_cust_q = sprintf("SELECT * FROM member_custom WHERE member_id='%s'", $itemID);
$rec_cust_q = $dbs->query($_sql_rec_cust_q);
$rec_cust_d = $rec_cust_q->fetch_assoc();
diff --git a/admin/modules/membership/member_base_lib.inc.php b/admin/modules/membership/member_base_lib.inc.php
index baff807b..0e00fecb 100755
--- a/admin/modules/membership/member_base_lib.inc.php
+++ b/admin/modules/membership/member_base_lib.inc.php
@@ -1,233 +1,233 @@
-obj_db = $obj_db;
- // get member data from database
- $_member_q = $this->obj_db->query(sprintf("SELECT m.*,mt.* FROM member AS m
- LEFT JOIN mst_member_type AS mt ON m.member_type_id=mt.member_type_id
- WHERE member_id='%s'", $str_member_id));
-
- if ($_member_q->num_rows > 0) {
- // set the is_member property flag to TRUE
- $this->is_member = true;
- $_member_d = $_member_q->fetch_assoc();
- // assign database value to class properties
- $this->member_id = $_member_d['member_id'];
- $this->member_name = $_member_d['member_name'];
- $this->member_type_id = $_member_d['member_type_id'];
- $this->member_type_name = $_member_d['member_type_name'];
- $this->register_date = $_member_d['register_date'];
- $this->expire_date = $_member_d['expire_date'];
- $this->member_email = $_member_d['member_email'];
- $this->inst_name = $_member_d['inst_name'];
- $this->member_image = $_member_d['member_image'];
- $this->member_notes = $_member_d['member_notes'];
- $this->is_pending = (bool)$_member_d['is_pending'];
- $this->member_type_prop = array(
- 'loan_limit' => $_member_d['loan_limit'],
- 'loan_periode' => $_member_d['loan_periode'],
- 'enable_reserve' => $_member_d['enable_reserve'],
- 'reserve_limit' => $_member_d['reserve_limit'],
- 'member_periode' => $_member_d['member_periode'],
- 'reborrow_limit' => $_member_d['reborrow_limit'],
- 'fine_each_day' => $_member_d['fine_each_day'],
- 'grace_periode' => $_member_d['grace_periode']
- );
-
- // is membership expired ?
- // compare it with current date
- $_current_date = date('Y-m-d');
- $_expired_date = simbio_date::compareDates($_current_date, $_member_d['expire_date']);
- if ($_expired_date <= $_member_d['expire_date']) {
- $this->is_expire = false;
- }
- }
- }
-
-
- # checking wether member is valid or not
- # return : boolean
- public function valid()
- {
- return $this->is_member;
- }
-
-
- # checking wether membership is already expired
- # return : boolean
- public function isExpired()
- {
- return $this->is_expire;
- }
-
-
- # checking wether membership is pending
- # return : boolean
- public function isPending()
- {
- return $this->is_pending;
- }
-
-
- # get all member properties
- # retuen : array
- public function getMemberTypeProp()
- {
- // return all member information as an array
- return $this->member_type_prop;
- }
-
-
- # get info about item being lent by member
- # return : array
- protected function getItemLoan($int_loan_rules = 0)
- {
- $_arr_on_loan = array();
- // count how many items is in loan for this member
- if ($int_loan_rules) {
- $_sql_str = "SELECT item_code FROM loan AS l
- WHERE member_id='".$this->member_id."' AND is_lent=1 AND is_return=0 AND loan_rules_id=$int_loan_rules";
- } else {
- $_sql_str = "SELECT item_code FROM loan AS l
- WHERE member_id='".$this->member_id."' AND is_lent=1 AND is_return=0";
- }
- $_count_q = $this->obj_db->query($_sql_str);
- while ($_count_d = $_count_q->fetch_row()) {
- $_arr_on_loan[] = $_count_d[0];
- }
-
- return $_arr_on_loan;
- }
-
-
- # get an array of member's overdue data
- public static function getOverduedLoan($obj_db, $str_member_id)
- { //
-
- $_overdues = array();
- $_ovd_title_q = $obj_db->query(sprintf('SELECT l.loan_id, l.item_code, i.price, i.price_currency,
- b.title, l.loan_date,
- l.due_date, (TO_DAYS(DATE(NOW()))-TO_DAYS(due_date)) AS \'Overdue Days\'
- FROM loan AS l
- LEFT JOIN item AS i ON l.item_code=i.item_code
- LEFT JOIN biblio AS b ON i.biblio_id=b.biblio_id
- WHERE (l.is_lent=1 AND l.is_return=0 AND TO_DAYS(due_date) < TO_DAYS(\''.date('Y-m-d').'\')) AND l.member_id=\'%s\'', $str_member_id));
- while ($_ovd_title_d = $_ovd_title_q->fetch_assoc()) {
- $_overdues[] = $_ovd_title_d;
- }
-
- return $_overdues;
- }
-
-
- # send overdue notice e-mail
- public function sendOverdueNotice()
- {
- global $sysconf;
- $mail = new PHPMailer\PHPMailer\PHPMailer(true);
- try {
- //Server settings
- //$mail->SMTPDebug = PHPMailer\PHPMailer\SMTP::DEBUG_SERVER; // Enable verbose debug output
- $mail->isSMTP(); // Send using SMTP
- $mail->Host = $sysconf['mail']['server']; // Set the SMTP server to send through
- $mail->SMTPAuth = $sysconf['mail']['auth_enable']; // Enable SMTP authentication
- $mail->Username = $sysconf['mail']['auth_username']; // SMTP username
- $mail->Password = $sysconf['mail']['auth_password']; // SMTP password
- if ($sysconf['mail']['SMTPSecure'] === 'tls') { // Enable TLS encryption; `PHPMailer::ENCRYPTION_SMTPS` encouraged
- $mail->SMTPSecure = PHPMailer\PHPMailer\PHPMailer::ENCRYPTION_STARTTLS;
- } else if ($sysconf['mail']['SMTPSecure'] === 'ssl') {
- $mail->SMTPSecure = PHPMailer\PHPMailer\PHPMailer::ENCRYPTION_SMTPS;
- }
- $mail->Port = $sysconf['mail']['server_port']; // TCP port to connect to, use 465 for `PHPMailer::ENCRYPTION_SMTPS` above
-
- //Recipients
- $mail->setFrom($sysconf['mail']['from'], $sysconf['mail']['from_name']);
- $mail->addReplyTo($sysconf['mail']['reply_to'], $sysconf['mail']['reply_to_name']);
- $mail->addAddress($this->member_email, $this->member_name);
-
- // Content
- // get message template
- ob_start();
- include SB . 'admin/admin_template/overdue-mail-tpl.php';
- require MDLBS . 'circulation/circulation_base_lib.inc.php';
-
- $circulation = new circulation($this->obj_db, $this->member_id);
- $circulation->ignore_holidays_fine_calc = $sysconf['ignore_holidays_fine_calc'];
- $circulation->holiday_dayname = $_SESSION['holiday_dayname'];
- $circulation->holiday_date = $_SESSION['holiday_date'];
-
- $_msg_tpl = ob_get_clean();
-
- // date
- $_curr_date = date('Y-m-d H:i:s');
-
- // compile overdue data
- $_overdue_data = '' . __('Query took') . ' ' . $datagrid->query_time . ' ' . __('second(s) to complete') . '
| ' . __('Title') . ' | ' . __('Item Code') . ' | ' . __('Loan Date') . ' | ' . __('Due Date') . ' | ' . __('Overdue') . ' |
|---|---|---|---|---|
| ' . $_overdue['title'] . ' | ' . $_overdue['item_code'] . ' | ' . $_overdue['loan_date'] . ' | ' . $_overdue['due_date'] . ' | ' . $circulation->countOverdueValue($_overdue['loan_id'], date('Y-m-d'))['days'] . ' ' . __('days') . ' | ' . "\n"; - $_overdue_data .= '
| ' . __('Title') . ' | ' . __('Item Code') . ' | ' . __('Loan Date') . ' | ' . __('Due Date') . ' | ' . __('Overdue') . ' |
|---|---|---|---|---|
| ' . $_overdue['title'] . ' | ' . $_overdue['item_code'] . ' | ' . $_overdue['loan_date'] . ' | ' . $_overdue['due_date'] . ' | ' . $circulation->countOverdueValue($_overdue['loan_id'], date('Y-m-d'))['days'] . ' ' . __('days') . ' | ' . "\n"; + $_overdue_data .= '
' . __('You don\'t have enough privileges to access this area!') . '
');
}
-require SIMBIO.'simbio_GUI/table/simbio_table.inc.php';
-require SIMBIO.'simbio_GUI/paging/simbio_paging.inc.php';
-require SIMBIO.'simbio_GUI/form_maker/simbio_form_element.inc.php';
-require SIMBIO.'simbio_DB/datagrid/simbio_dbgrid.inc.php';
-require MDLBS.'reporting/report_dbgrid.inc.php';
+require SIMBIO . 'simbio_GUI/table/simbio_table.inc.php';
+require SIMBIO . 'simbio_GUI/paging/simbio_paging.inc.php';
+require SIMBIO . 'simbio_GUI/form_maker/simbio_form_element.inc.php';
+require SIMBIO . 'simbio_DB/datagrid/simbio_dbgrid.inc.php';
+require MDLBS . 'reporting/report_dbgrid.inc.php';
$page_title = 'Items/Copies Report';
$reportView = false;
@@ -58,7 +59,7 @@
?>
-
+
@@ -86,7 +87,7 @@
while ($gmd_d = $gmd_q->fetch_row()) {
$gmd_options[] = array($gmd_d[0], $gmd_d[1]);
}
- echo simbio_form_element::selectList('gmd[]', $gmd_options, '','multiple="multiple" size="5" class="form-control col-3"');
+ echo simbio_form_element::selectList('gmd[]', $gmd_options, '', 'multiple="multiple" size="5" class="form-control col-3"');
?>
@@ -110,7 +111,7 @@
while ($status_d = $status_q->fetch_row()) {
$status_options[] = array($status_d[0], $status_d[1]);
}
- echo simbio_form_element::selectList('status', $status_options,'','class="form-control col-2"');
+ echo simbio_form_element::selectList('status', $status_options, '', 'class="form-control col-2"');
?>
@@ -122,7 +123,7 @@
while ($loc_d = $loc_q->fetch_row()) {
$loc_options[] = array($loc_d[0], $loc_d[1]);
}
- echo simbio_form_element::selectList('location', $loc_options,'','class="form-control col-2"');
+ echo simbio_form_element::selectList('location', $loc_options, '', 'class="form-control col-2"');
?>
@@ -141,8 +142,10 @@
-
-
+
+
+
+
table_attr = 'class="s-table table table-sm table-bordered"';
- $reportgrid->setSQLColumn('i.item_code AS \''.__('Item Code').'\'',
- 'b.title AS \''.__('Title').'\'',
- 'ct.coll_type_name AS \''.__('Collection Type').'\'',
- 'i.item_status_id AS \''.__('Item Status').'\'',
- 'b.call_number AS \''.__('Call Number').'\'', 'i.biblio_id');
+ $reportgrid->setSQLColumn(
+ 'i.item_code AS \'' . __('Item Code') . '\'',
+ 'b.title AS \'' . __('Title') . '\'',
+ 'ct.coll_type_name AS \'' . __('Collection Type') . '\'',
+ 'i.item_status_id AS \'' . __('Item Status') . '\'',
+ 'b.call_number AS \'' . __('Call Number') . '\'',
+ 'i.biblio_id'
+ );
$reportgrid->setSQLorder('b.title ASC');
// is there any search
$criteria = 'b.biblio_id IS NOT NULL ';
- if (isset($_GET['title']) AND !empty($_GET['title'])) {
+ if (isset($_GET['title']) and !empty($_GET['title'])) {
$keyword = $dbs->escape_string(trim($_GET['title']));
$words = explode(' ', $keyword);
if (count($words) > 1) {
@@ -176,17 +182,17 @@
$concat_sql .= ') ';
$criteria .= $concat_sql;
} else {
- $criteria .= ' AND (b.title LIKE \'%'.$keyword.'%\' OR b.isbn_issn LIKE \'%'.$keyword.'%\')';
+ $criteria .= ' AND (b.title LIKE \'%' . $keyword . '%\' OR b.isbn_issn LIKE \'%' . $keyword . '%\')';
}
}
- if (isset($_GET['itemCode']) AND !empty($_GET['itemCode'])) {
+ if (isset($_GET['itemCode']) and !empty($_GET['itemCode'])) {
$item_code = $dbs->escape_string(trim($_GET['itemCode']));
- $criteria .= ' AND i.item_code LIKE \'%'.$item_code.'%\'';
+ $criteria .= ' AND i.item_code LIKE \'%' . $item_code . '%\'';
}
if (isset($_GET['collType'])) {
$coll_type_IDs = '';
foreach ($_GET['collType'] as $id) {
- $id = (integer)$id;
+ $id = (int)$id;
if ($id) {
$coll_type_IDs .= "$id,";
}
@@ -196,10 +202,10 @@
$criteria .= " AND i.coll_type_id IN($coll_type_IDs)";
}
}
- if (isset($_GET['gmd']) AND !empty($_GET['gmd'])) {
+ if (isset($_GET['gmd']) and !empty($_GET['gmd'])) {
$gmd_IDs = '';
foreach ($_GET['gmd'] as $id) {
- $id = (integer)$id;
+ $id = (int)$id;
if ($id) {
$gmd_IDs .= "$id,";
}
@@ -209,25 +215,25 @@
$criteria .= " AND b.gmd_id IN($gmd_IDs)";
}
}
- if (isset($_GET['status']) AND $_GET['status']!='0') {
+ if (isset($_GET['status']) and $_GET['status'] != '0') {
$status = $dbs->escape_string(trim($_GET['status']));
- $criteria .= ' AND i.item_status_id=\''.$status.'\'';
+ $criteria .= ' AND i.item_status_id=\'' . $status . '\'';
}
- if (isset($_GET['class']) AND ($_GET['class'] != '')) {
+ if (isset($_GET['class']) and ($_GET['class'] != '')) {
$class = $dbs->escape_string($_GET['class']);
- $criteria .= ' AND b.classification LIKE \''.$class.'%\'';
+ $criteria .= ' AND b.classification LIKE \'' . $class . '%\'';
}
- if (isset($_GET['location']) AND !empty($_GET['location'])) {
+ if (isset($_GET['location']) and !empty($_GET['location'])) {
$location = $dbs->escape_string(trim($_GET['location']));
- $criteria .= ' AND i.location_id=\''.$location.'\'';
+ $criteria .= ' AND i.location_id=\'' . $location . '\'';
}
- if (isset($_GET['publishYear']) AND !empty($_GET['publishYear'])) {
+ if (isset($_GET['publishYear']) and !empty($_GET['publishYear'])) {
$publish_year = $dbs->escape_string(trim($_GET['publishYear']));
- $criteria .= ' AND b.publish_year LIKE \'%'.$publish_year.'%\'';
+ $criteria .= ' AND b.publish_year LIKE \'%' . $publish_year . '%\'';
}
if (isset($_GET['recsEachPage'])) {
- $recsEachPage = (integer)$_GET['recsEachPage'];
- $num_recs_show = ($recsEachPage >= 20 && $recsEachPage <= 200)?$recsEachPage:$num_recs_show;
+ $recsEachPage = (int)$_GET['recsEachPage'];
+ $num_recs_show = ($recsEachPage >= 20 && $recsEachPage <= 200) ? $recsEachPage : $num_recs_show;
}
$reportgrid->setSQLCriteria($criteria);
@@ -242,21 +248,21 @@ function showTitleAuthors($obj_db, $array_data)
$_biblio_q = $obj_db->query('SELECT b.title, a.author_name FROM biblio AS b
LEFT JOIN biblio_author AS ba ON b.biblio_id=ba.biblio_id
LEFT JOIN mst_author AS a ON ba.author_id=a.author_id
- WHERE b.biblio_id='.$array_data[5]);
+ WHERE b.biblio_id=' . $array_data[5]);
$_authors = '';
while ($_biblio_d = $_biblio_q->fetch_row()) {
$_title = $_biblio_d[0];
- $_authors .= $_biblio_d[1].' - ';
+ $_authors .= $_biblio_d[1] . ' - ';
}
$_authors = substr_replace($_authors, '', -3);
- $_output = $_title.''.$_authors.''."\n"; + $_output = $_title . '
' . $_authors . '' . "\n"; return $_output; } function showStatus($obj_db, $array_data) { $output = __('Available'); - $q = $obj_db->query('SELECT item_status_name FROM mst_item_status WHERE item_status_id=\''.$array_data[3].'\''); - if(!empty($q->num_rows)){ + $q = $obj_db->query('SELECT item_status_name FROM mst_item_status WHERE item_status_id=\'' . $array_data[3] . '\''); + if (!empty($q->num_rows)) { $d = $q->fetch_row(); $s = $d[0]; $output = $s; @@ -269,14 +275,28 @@ function showStatus($obj_db, $array_data) $reportgrid->modifyColumnContent(3, 'callback{showStatus}'); $reportgrid->invisible_fields = array(5); + // show spreadsheet export button + $reportgrid->show_spreadsheet_export = true; + // put the result into variables echo $reportgrid->createDataGrid($dbs, $table_spec, $num_recs_show); - echo ''; + $xlsquery = "SELECT i.item_code AS '" . __('Item Code') . "', + b.title AS '" . __('Title') . "', + ct.coll_type_name AS '" . __('Collection Type') . "', + i.item_status_id AS '" . __('Item Status') . "', + b.call_number AS '" . __('Call Number') . "' FROM " . + $table_spec . " WHERE " . $criteria; + // echo $xlsquery; + unset($_SESSION['xlsdata']); + $_SESSION['xlsquery'] = $xlsquery; + $_SESSION['tblout'] = "title_list_item"; + $content = ob_get_clean(); // include the page template - require SB.'/admin/'.$sysconf['admin_template']['dir'].'/printed_page_tpl.php'; + require SB . '/admin/' . $sysconf['admin_template']['dir'] . '/printed_page_tpl.php'; } diff --git a/admin/modules/system/app_user.php b/admin/modules/system/app_user.php index 6ff5be94..ab99f29d 100755 --- a/admin/modules/system/app_user.php +++ b/admin/modules/system/app_user.php @@ -74,6 +74,8 @@ function getUserType($obj_db, $array_data, $col) { if ($query_image->num_rows > 0) { $_delete = $dbs->query(sprintf('UPDATE user SET user_image=NULL WHERE user_id=%d', $_POST['uimg'])); if ($_delete) { + // Change upict + $_SESSION['upict'] = 'person.png'; $postImage = stripslashes($_POST['img']); $postImage = str_replace('/', '', $postImage); @unlink(sprintf(IMGBS.'persons/%s', $postImage)); @@ -177,6 +179,8 @@ function getUserType($obj_db, $array_data, $col) { // upload status alert if (isset($upload_status)) { if ($upload_status == UPLOAD_SUCCESS) { + // Change upict + $_SESSION['upict'] = $data['user_image']; // write log utility::writeLogs($dbs, 'staff', $_SESSION['uid'], 'system/user', $_SESSION['realname'].' upload image file '.$upload->new_filename, 'User image', 'Upload'); utility::jsAlert(__('Image Uploaded Successfully')); @@ -200,6 +204,8 @@ function getUserType($obj_db, $array_data, $col) { // upload status alert if (isset($upload_status)) { if ($upload_status == UPLOAD_SUCCESS) { + // Change upict + $_SESSION['upict'] = $data['user_image']; // write log utility::writeLogs($dbs, 'staff', $_SESSION['uid'], 'system/user', $_SESSION['realname'].' upload image file '.$upload->new_filename, 'User image', 'Upload'); utility::jsAlert(__('Image Uploaded Successfully')); diff --git a/admin/modules/system/backup.php b/admin/modules/system/backup.php index c7e6fc09..d017eeaf 100755 --- a/admin/modules/system/backup.php +++ b/admin/modules/system/backup.php @@ -123,19 +123,53 @@ ?>
-
+
-
-
+
+
+
+
+