From f580be11ce02fd55b4eaa3f73126422a27d1ccd1 Mon Sep 17 00:00:00 2001
From: matlam <matz-josh@gmx.de>
Date: Sun, 21 Aug 2016 02:02:13 +0200
Subject: [PATCH 01/14] compatibility with sql_mode=only_full_group_by

---
 admin/modules/reporting/customs/overdued_list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/modules/reporting/customs/overdued_list.php b/admin/modules/reporting/customs/overdued_list.php
index 2eec8c3d..1e11924d 100755
--- a/admin/modules/reporting/customs/overdued_list.php
+++ b/admin/modules/reporting/customs/overdued_list.php
@@ -117,7 +117,7 @@
   // create datagrid
   $reportgrid = new report_datagrid();
   $reportgrid->setSQLColumn('m.member_id AS \''.__('Member ID').'\'');
-  $reportgrid->setSQLorder('l.due_date DESC');
+  $reportgrid->setSQLorder('MAX(l.due_date) DESC');
   $reportgrid->sql_group_by = 'm.member_id';
 
   $overdue_criteria = ' (l.is_lent=1 AND l.is_return=0 AND TO_DAYS(due_date) < TO_DAYS(\''.date('Y-m-d').'\')) ';

From e39e341132fb9c8994e57ba797956b4fc4aa41ba Mon Sep 17 00:00:00 2001
From: matlam <matz-josh@gmx.de>
Date: Thu, 1 Sep 2016 19:16:30 +0200
Subject: [PATCH 02/14] fix wording in bibliography import

---
 admin/modules/bibliography/import.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/modules/bibliography/import.php b/admin/modules/bibliography/import.php
index 401a1fec..eeae576e 100755
--- a/admin/modules/bibliography/import.php
+++ b/admin/modules/bibliography/import.php
@@ -265,7 +265,7 @@
 //  field enclosed
 $form->addTextField('text', 'fieldEnc', __('Field Enclosed With').'*', ''.htmlentities('"').'', 'style="width: 10%;"');
 // number of records to import
-$form->addTextField('text', 'recordNum', __('Number of Records To Export (0 for all records)'), '0', 'style="width: 10%;"');
+$form->addTextField('text', 'recordNum', __('Number of Records To Import (0 for all records)'), '0', 'style="width: 10%;"');
 // records offset
 $form->addTextField('text', 'recordOffset', __('Start From Record'), '1', 'style="width: 10%;"');
 // output the form

From 52239d382b90777669a88c902ac30b05487da320 Mon Sep 17 00:00:00 2001
From: matlam <matz-josh@gmx.de>
Date: Thu, 1 Sep 2016 19:48:56 +0200
Subject: [PATCH 03/14] fix wording in the item import

---
 admin/modules/bibliography/item_import.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/modules/bibliography/item_import.php b/admin/modules/bibliography/item_import.php
index cb6a5329..782670fa 100755
--- a/admin/modules/bibliography/item_import.php
+++ b/admin/modules/bibliography/item_import.php
@@ -215,7 +215,7 @@
 //  field enclosed
 $form->addTextField('text', 'fieldEnc', __('Field Enclosed With').'*', ''.htmlentities('"').'', 'style="width: 10%;"');
 // number of records to import
-$form->addTextField('text', 'recordNum', __('Number of Records To Export (0 for all records)'), '0', 'style="width: 10%;"');
+$form->addTextField('text', 'recordNum', __('Number of Records To Import (0 for all records)'), '0', 'style="width: 10%;"');
 // records offset
 $form->addTextField('text', 'recordOffset', __('Start From Record'), '1', 'style="width: 10%;"');
 // output the form

From 015fcb5a53e2c0b3dd3cf6da5108f309fbe5ac66 Mon Sep 17 00:00:00 2001
From: matlam <matz-josh@gmx.de>
Date: Thu, 1 Sep 2016 21:24:07 +0200
Subject: [PATCH 04/14] prevent notice in opac detail when social shares are
 disabled

---
 template/default/detail_template.php     | 2 +-
 template/lightweight/detail_template.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/template/default/detail_template.php b/template/default/detail_template.php
index 03c1cbfb..8edb8a9d 100644
--- a/template/default/detail_template.php
+++ b/template/default/detail_template.php
@@ -10,7 +10,7 @@
   ============================================= -->
   <h3 class="s-detail-type"><?php echo $gmd_name ?></h3>
   <h4 class="s-detail-title" itemprop="name" property="name"><?php echo $title ?></h4>
-  <?php echo $social_shares ?>
+  <?php if($sysconf['social_shares']) { echo $social_shares; } ?>
   <br>
   <div class="s-detail-author" itemprop="author" property="author" itemscope itemtype="http://schema.org/Person">
   <?php echo  $authors ?>
diff --git a/template/lightweight/detail_template.php b/template/lightweight/detail_template.php
index 03c1cbfb..8edb8a9d 100644
--- a/template/lightweight/detail_template.php
+++ b/template/lightweight/detail_template.php
@@ -10,7 +10,7 @@
   ============================================= -->
   <h3 class="s-detail-type"><?php echo $gmd_name ?></h3>
   <h4 class="s-detail-title" itemprop="name" property="name"><?php echo $title ?></h4>
-  <?php echo $social_shares ?>
+  <?php if($sysconf['social_shares']) { echo $social_shares; } ?>
   <br>
   <div class="s-detail-author" itemprop="author" property="author" itemscope itemtype="http://schema.org/Person">
   <?php echo  $authors ?>

From 9ef42b65d1b153f60dd2905124268dc5f6802fed Mon Sep 17 00:00:00 2001
From: matlam <matz-josh@gmx.de>
Date: Thu, 8 Sep 2016 23:40:36 +0200
Subject: [PATCH 05/14] fix notice in bibliography form

---
 admin/modules/bibliography/index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/modules/bibliography/index.php b/admin/modules/bibliography/index.php
index ceab86be..6653c2ab 100755
--- a/admin/modules/bibliography/index.php
+++ b/admin/modules/bibliography/index.php
@@ -375,12 +375,12 @@ function getimagesizefromstring($string_data)
         $itemcode .= $chars[1];
 
         $item_insert_sql = sprintf("INSERT IGNORE INTO item (biblio_id, item_code, call_number, coll_type_id)
-        VALUES (%d, '%s', '%s', %d)", $updateRecordID?$updateRecordID:$last_biblio_id, $itemcode, $data['call_number'], $_POST['collTypeID']);
+        VALUES (%d, '%s', '%s', %d)", isset($updateRecordID)?$updateRecordID:$last_biblio_id, $itemcode, $data['call_number'], $_POST['collTypeID']);
         @$dbs->query($item_insert_sql);
       }
     }
 
-    echo '<script type="text/javascript">parent.$(\'#mainContent\').simbioAJAX(\''.MWB.'bibliography/index.php\', {method: \'post\', addData: \'itemID='.$last_biblio_id.'&detail=true\'});</script>';
+    echo '<script type="text/javascript">parent.$(\'#mainContent\').simbioAJAX(\''.MWB.'bibliography/index.php\', {method: \'post\', addData: \'itemID='.(isset($updateRecordID)?$updateRecordID:$last_biblio_id).'&detail=true\'});</script>';
     exit();
   }
   exit();

From c7b4d60637a6ffe01c078462098aecb372984f5b Mon Sep 17 00:00:00 2001
From: matlam <matz-josh@gmx.de>
Date: Wed, 14 Sep 2016 23:32:01 +0200
Subject: [PATCH 06/14] remove sleep from member lookup

no idea why a sleep(1) was at the top
of the file
---
 admin/modules/membership/member_AJAX_response.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/admin/modules/membership/member_AJAX_response.php b/admin/modules/membership/member_AJAX_response.php
index cbf21e74..e8712883 100755
--- a/admin/modules/membership/member_AJAX_response.php
+++ b/admin/modules/membership/member_AJAX_response.php
@@ -21,7 +21,6 @@
 // key to authenticate
 define('INDEX_AUTH', '1');
 
-sleep(1);
 require '../../../sysconfig.inc.php';
 // IP based access limitation
 require LIB.'ip_based_access.inc.php';

From 96627b0f9ade3768ed97dfc147cedaf44a49d182 Mon Sep 17 00:00:00 2001
From: matlam <matz-josh@gmx.de>
Date: Wed, 14 Sep 2016 23:33:16 +0200
Subject: [PATCH 07/14] fix member lookup for non-ascii characters

---
 js/form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/form.js b/js/form.js
index 5be6b279..375b00f1 100755
--- a/js/form.js
+++ b/js/form.js
@@ -147,7 +147,7 @@ var showDropDown = function(strURL, strElmntID, strAddParams) {
   var listObj = $('#'+strElmntID + 'List');
   if (inputVal.length < 4) { listObj.hide(); return; }
   // populate list ID
-  jsonToList(strURL, strElmntID, 'inputSearchVal=' + escape(inputVal) + '&' + strAddParams);
+  jsonToList(strURL, strElmntID, 'inputSearchVal=' + encodeURIComponent(inputVal) + '&' + strAddParams);
   if (noResult) { return; }
   // show list
   listObj.css({'left': inputObjXY.left+'px', 'width': inputObjWidth+'px', 'display': 'block'});

From 560969f7ca2337acf7b830a0027b523f4275d3fc Mon Sep 17 00:00:00 2001
From: matlam <matz-josh@gmx.de>
Date: Thu, 15 Sep 2016 04:11:24 +0200
Subject: [PATCH 08/14] prevent notices when editing a bibliography in a popup

---
 admin/modules/bibliography/pop_biblio.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/admin/modules/bibliography/pop_biblio.php b/admin/modules/bibliography/pop_biblio.php
index 6cc4c481..2f35128d 100755
--- a/admin/modules/bibliography/pop_biblio.php
+++ b/admin/modules/bibliography/pop_biblio.php
@@ -44,6 +44,10 @@
   $_POST['itemID'] = $_GET['itemID'];
 }
 
+if (isset($_GET['itemCollID'])) {
+  $_POST['itemCollID'] = $_GET['itemCollID'];
+}
+
 $_GET['inPopUp'] = true;
 
 ob_start();

From df9e4947c9aa39a1e71862c9a97f58a7d83ee7f7 Mon Sep 17 00:00:00 2001
From: matlam <matz-josh@gmx.de>
Date: Sun, 18 Sep 2016 18:17:34 +0200
Subject: [PATCH 09/14] fix detail view if comments are disabled

---
 template/classic/detail_template.php     | 4 ++--
 template/default/detail_template.php     | 2 +-
 template/lightweight/detail_template.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/template/classic/detail_template.php b/template/classic/detail_template.php
index ef799948..cd307cc3 100644
--- a/template/classic/detail_template.php
+++ b/template/classic/detail_template.php
@@ -170,7 +170,7 @@
 <?php endif ?>
 
 <!-- Comment -->
-<?php // if(isset($_SESSION['mid'])) : ?>
+<?php if(isset($_SESSION['mid']) && $sysconf['comment']['enable']) : ?>
 
 <div class="slims-card slims-card--default">
 	<div class="slims-card--header">
@@ -179,4 +179,4 @@
 	<?php echo showComment($biblio_id); ?>
 </div>
 
-<?php // endif ?>
\ No newline at end of file
+<?php endif ?>
diff --git a/template/default/detail_template.php b/template/default/detail_template.php
index 8edb8a9d..5486d624 100644
--- a/template/default/detail_template.php
+++ b/template/default/detail_template.php
@@ -177,7 +177,7 @@
 
   <!-- Comment
   ============================================= -->  
-  <?php if(isset($_SESSION['mid'])) : ?>
+  <?php if(isset($_SESSION['mid']) && $sysconf['comment']['enable']) : ?>
   <h3><i class="fa fa-comments-o"></i> <?php echo __('Comments'); ?></h3>
   <?php echo showComment($biblio_id); ?>
   <?php endif; ?>
diff --git a/template/lightweight/detail_template.php b/template/lightweight/detail_template.php
index 8edb8a9d..5486d624 100644
--- a/template/lightweight/detail_template.php
+++ b/template/lightweight/detail_template.php
@@ -177,7 +177,7 @@
 
   <!-- Comment
   ============================================= -->  
-  <?php if(isset($_SESSION['mid'])) : ?>
+  <?php if(isset($_SESSION['mid']) && $sysconf['comment']['enable']) : ?>
   <h3><i class="fa fa-comments-o"></i> <?php echo __('Comments'); ?></h3>
   <?php echo showComment($biblio_id); ?>
   <?php endif; ?>

From f82a730c1692d7a00cace255d8e0b2fffd01d8f3 Mon Sep 17 00:00:00 2001
From: matlam <matz-josh@gmx.de>
Date: Fri, 23 Sep 2016 00:31:58 +0200
Subject: [PATCH 10/14] disable display_errors again

it seems that is was accidently
activated by d30f592448e69693f00576aec1a58b285b0b0ae4
---
 sysconfig.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysconfig.inc.php b/sysconfig.inc.php
index a3fb9cd6..894e766a 100755
--- a/sysconfig.inc.php
+++ b/sysconfig.inc.php
@@ -45,7 +45,7 @@ function stripslashes_deep($value)
   $_REQUEST = array_map('stripslashes_deep', $_REQUEST);
 }
 // turn off all error messages for security reason
-@ini_set('display_errors', true);
+@ini_set('display_errors', false);
 // check if safe mode is on
 if ((bool) ini_get('safe_mode')) {
     define('SENAYAN_IN_SAFE_MODE', 1);

From 8d5c1e08b8f41b205a2213182902703d23a009e7 Mon Sep 17 00:00:00 2001
From: matlam <matz-josh@gmx.de>
Date: Tue, 15 Nov 2016 00:19:23 +0100
Subject: [PATCH 11/14] show extended items as "Not Returned Yet" in the loan
 history

---
 admin/modules/circulation/member_loan_hist.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/modules/circulation/member_loan_hist.php b/admin/modules/circulation/member_loan_hist.php
index b3cd0669..adaf3e3d 100755
--- a/admin/modules/circulation/member_loan_hist.php
+++ b/admin/modules/circulation/member_loan_hist.php
@@ -62,7 +62,7 @@
         'l.item_code AS \''.__('Item Code').'\'',
         'b.title AS \''.__('Title').'\'',
         'l.loan_date AS \''.__('Loan Date').'\'',
-        'IF(return_date IS NULL, \'<i>'.__('Not Returned Yet').'</i>\', return_date) AS \''.__('Returned Date').'\'');
+        'IF(is_return = 0, \'<i>'.__('Not Returned Yet').'</i>\', return_date) AS \''.__('Returned Date').'\'');
     $datagrid->setSQLorder("l.loan_date DESC");
 
     $criteria = 'l.member_id=\''.$dbs->escape_string($memberID).'\' ';

From 7aa154a9701346c95564577c9411071847fb85b1 Mon Sep 17 00:00:00 2001
From: matlam <matz-josh@gmx.de>
Date: Wed, 30 Nov 2016 18:12:49 +0100
Subject: [PATCH 12/14] fix thumbnails for .jpeg files

the file ending is used to identify
the file type and .jpeg was not handled correctly
---
 lib/minigalnano/createthumb.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/minigalnano/createthumb.php b/lib/minigalnano/createthumb.php
index 4b81d1a7..d1000314 100755
--- a/lib/minigalnano/createthumb.php
+++ b/lib/minigalnano/createthumb.php
@@ -91,7 +91,7 @@ function genContentType($imagefilename)
 genContentType($imagefilename);
 
 $target = imagecreatetruecolor($res_width,$res_height);
-if (preg_match("/.jpg$/i", $imagefilename)) $source = imagecreatefromjpeg($imagefilename);
+if (preg_match("/.jpg$|.jpeg$/i", $imagefilename)) $source = imagecreatefromjpeg($imagefilename);
 if (preg_match("/.gif$/i", $imagefilename)) $source = imagecreatefromgif($imagefilename);
 if (preg_match("/.png$/i", $imagefilename)) $source = imagecreatefrompng($imagefilename);
 
@@ -105,7 +105,7 @@ function genContentType($imagefilename)
 imagedestroy($source);
 
 if ($cache['exist'] == false) {
-  if (preg_match("/.jpg$/i", $imagefilename)) {
+  if (preg_match("/.jpg$|.jpeg$/i", $imagefilename)) {
     imagejpeg($target,null,90);
     imagejpeg($target,$cache['file'],90);
   }

From 3cf1f2789e1fd010affbe280b98409566c254274 Mon Sep 17 00:00:00 2001
From: matlam <matz-josh@gmx.de>
Date: Sat, 7 Jan 2017 12:00:25 +0100
Subject: [PATCH 13/14] unify wording of Title

in the list of the lost items at the finish of the stock take
Title was named "Document Title"
I changed it to Title so that it is always called the same and
to remove the need to translate another word
---
 admin/modules/stock_take/finish.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/modules/stock_take/finish.php b/admin/modules/stock_take/finish.php
index 431f5e45..492f3a57 100755
--- a/admin/modules/stock_take/finish.php
+++ b/admin/modules/stock_take/finish.php
@@ -100,7 +100,7 @@
         echo '<table style="width: 100%; border: 1px solid #666;" cellspacing="0">';
         echo '<tr>';
         echo '<th class="dataListHeader">' . __('Item Code') . '</th>
-            <th class="dataListHeader">' . __('Document Title') . '</th>
+            <th class="dataListHeader">' . __('Title') . '</th>
             <th class="dataListHeader">' . __('Classification') . '</th>';
         echo '</tr>'."\n";
         while ($lost_item_d = $lost_item_q->fetch_row()) {

From 5d2f9a512a9c4365508b54e895709f66f6bfd46b Mon Sep 17 00:00:00 2001
From: matlam <matz-josh@gmx.de>
Date: Sat, 7 Jan 2017 13:18:07 +0100
Subject: [PATCH 14/14] put member search result on top of transaction finished
 message in the circulation module

The message "Transaction finished" hid part of the search result
when searching for a member by name immediately after finishing a transaction
---
 admin/admin_template/default-dz/assets/css/style.css | 1 +
 admin/admin_template/default/assets/css/style.css    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/admin/admin_template/default-dz/assets/css/style.css b/admin/admin_template/default-dz/assets/css/style.css
index b0840044..1549de8a 100644
--- a/admin/admin_template/default-dz/assets/css/style.css
+++ b/admin/admin_template/default-dz/assets/css/style.css
@@ -1432,6 +1432,7 @@ tr.dataListHeader > td > a {
 #memberIDList {
 	margin-top: -5px;
 	width: 181px !important;
+        z-index: 1;
 }
 .ajaxDDlist {
 	border-color: #ddd !important;
diff --git a/admin/admin_template/default/assets/css/style.css b/admin/admin_template/default/assets/css/style.css
index dee8ce32..17869517 100644
--- a/admin/admin_template/default/assets/css/style.css
+++ b/admin/admin_template/default/assets/css/style.css
@@ -1432,6 +1432,7 @@ tr.dataListHeader > td > a {
 #memberIDList {
 	margin-top: -5px;
 	width: 181px !important;
+        z-index: 1;
 }
 .ajaxDDlist {
 	border-color: #ddd !important;