Merge pull request #163 from BioKIC/Development

Updates from BioKIC/Development
BioKIC · May 16, 2024 · 8fe2d62 · 8fe2d62
2 parents fb050e3 + 7cc0ba5
commit 8fe2d62
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/classes/DwcArchiverBaseManager.php b/classes/DwcArchiverBaseManager.php
@@ -10,7 +10,7 @@ class DwcArchiverBaseManager extends Manager{
 	protected $charSetSource = '';
 	protected $charSetOut = '';
 	protected $sqlBase;
-	protected $fileHandler;
+	private $fileHandler;
 
 	public function __construct($conType, $connOverride){
 		parent::__construct(null, $conType, $connOverride);
@@ -42,7 +42,7 @@ public function writeOutRecordBlock($occidArr){
 					$this->writeOutRecord($r);
 				}
 				$rs->free();
-				fclose($this->fileHandler);
+				if($this->fileHandler) fclose($this->fileHandler);
 			}
 			else{
 				$this->logOrEcho('ERROR writing out to extension file: '.$this->conn->error."\n");

diff --git a/classes/OccurrenceEditorManager.php b/classes/OccurrenceEditorManager.php
@@ -793,9 +793,11 @@ private function setAdditionalIdentifiers(&$occurrenceArr){
 					foreach($occurArr['identifiers'] as $idKey => $idArr){
 						$idName = $idArr['name'];
 						$idValue = $idArr['value'];
-						if(array_key_exists($idValue, $otherCatNumArr)){
-							if(!$idName && $otherCatNumArr[$idValue]) $occurrenceArr[$occid]['identifiers'][$idKey]['name'] = $otherCatNumArr[$idValue];
-							unset($otherCatNumArr[$idValue]);
+						foreach($otherCatNumArr as $ocnValue => $ocnTag){
+							if($ocnValue == $idValue || $ocnValue == $idName . ' ' . $idValue){
+								if(!$idName && $otherCatNumArr[$idValue]) $occurrenceArr[$occid]['identifiers'][$idKey]['name'] = $otherCatNumArr[$idValue];
+								unset($otherCatNumArr[$ocnValue]);
+							}
 						}
 					}
 				}

diff --git a/collections/misc/collpermissions.php b/collections/misc/collpermissions.php
@@ -15,8 +15,8 @@
 }
 else $action = "";
 $collId = array_key_exists("collid",$_REQUEST) ? filter_var($_REQUEST["collid"], FILTER_SANITIZE_NUMBER_INT) : 0;
-$targetUID = array_key_exists('uid', $_POST) ? filter_var($targetUID, FILTER_SANITIZE_NUMBER_INT) : 0;
-$persObsCollId = array_key_exists('persobscollid', $_POST) ? filter_var($persObsCollId, FILTER_SANITIZE_NUMBER_INT) : 0;
+$targetUID = array_key_exists('uid', $_POST) ? filter_var($_POST['uid'], FILTER_SANITIZE_NUMBER_INT) : 0;
+$persObsCollId = array_key_exists('persobscollid', $_POST) ? filter_var($_POST['persobscollid'], FILTER_SANITIZE_NUMBER_INT) : 0;
 
 $permManager = new PermissionsManager();
 

diff --git a/config/symbbase.php b/config/symbbase.php
@@ -2,7 +2,7 @@
 header('X-Frame-Options: DENY');
 header('Cache-control: private'); // IE 6 FIX
 date_default_timezone_set('America/Phoenix');
-$CODE_VERSION = '3.0.28';
+$CODE_VERSION = '3.0.29';
 
 if(!isset($CLIENT_ROOT) && isset($clientRoot)) $CLIENT_ROOT = $clientRoot;
 if(substr($CLIENT_ROOT,-1) == '/') $CLIENT_ROOT = substr($CLIENT_ROOT,0,strlen($CLIENT_ROOT)-1);

diff --git a/includes/citationcollection_template.php b/includes/citationcollection_template.php
@@ -1 +1,4 @@
-	<?php echo $collData['collectionname']; ?>. Occurrence dataset (ID: <?php echo $collData['recordid'] ?>) <?php echo $collData['dwcaurl']; ?> accessed via the <?php echo ($DEFAULT_TITLE) ? $DEFAULT_TITLE : "Custom title for the portal"; ?> Portal, <?php echo $SERVER_HOST . $CLIENT_ROOT; ?>, <?php echo date('Y-m-d'); ?>).
+<?php
+if(!isset($collData) && isset($this->collArr)) $collData = $this->collArr;
+?>
+<?php echo $collData['collectionname']; ?>. Occurrence dataset (ID: <?php echo $collData['recordid'] ?>) <?php echo $collData['dwcaurl']; ?> accessed via the <?php echo ($DEFAULT_TITLE) ? $DEFAULT_TITLE : "Custom title for the portal"; ?> Portal, <?php echo $SERVER_HOST . $CLIENT_ROOT; ?>, <?php echo date('Y-m-d'); ?>).