Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remap old config variables #1509

Merged
merged 4 commits into from
Jul 15, 2024
Merged

Remap old config variables #1509

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
297ce40
symbbase.php refactor
egbot Jul 11, 2024
8c9e5f0
Remap old system variables to current format
egbot Jul 13, 2024
fdae670
Merge pull request #1508 from BioKIC/Development
egbot Jul 13, 2024
40d4e40
Minor bug fix
egbot Jul 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion checklists/checklist.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ function changeImageSource(elem){
<?php
$spUrl = "../taxa/index.php?taxauthid=1&taxon=$tid&clid=".$clid;
if($imgSrc){
$imgSrc = (array_key_exists("imageDomain",$GLOBALS)&&substr($imgSrc,0,4)!="http"?$GLOBALS["imageDomain"] : "") . $imgSrc;
$imgSrc = (array_key_exists('IMAGE_DOMAIN', $GLOBALS) && substr($imgSrc, 0, 4) != 'http' ? $GLOBALS['IMAGE_DOMAIN'] : "") . $imgSrc;
echo "<a href='" . $spUrl . "' target='_blank'>";
echo "<img src='" . $imgSrc . "' />";
echo "</a>";
Expand Down
2 changes: 1 addition & 1 deletion checklists/mswordexport.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
$imgSrc = ($tu?$tu:$u);
if($imageCnt%4 == 1) $table->addRow();
if($imgSrc){
$imgSrc = (array_key_exists('imageDomain',$GLOBALS)&&substr($imgSrc,0,4)!='http'?$GLOBALS['imageDomain']:'').$imgSrc;
$imgSrc = (array_key_exists('IMAGE_DOMAIN', $GLOBALS) && substr($imgSrc, 0, 4) != 'http' ? $GLOBALS['IMAGE_DOMAIN'] : '') . $imgSrc;
$cell = $table->addCell(null,$imageCellStyle);
$textrun = $cell->addTextRun('imagePara');
$textrun->addImage($imgSrc,array('width'=>160,'height'=>160));
Expand Down
2 changes: 1 addition & 1 deletion classes/DwcArchiverCore.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public function setTargetPath($tp = ''){
$this->targetPath = $tp;
} else {
//Set to temp download path
$tPath = $GLOBALS["tempDirRoot"];
$tPath = $GLOBALS['TEMP_DIR_ROOT'];
if (!$tPath) {
$tPath = ini_get('upload_tmp_dir');
}
Expand Down
2 changes: 1 addition & 1 deletion classes/GamesManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public function setOOTD($oodID,$clid){
while(($row = $rs->fetch_object()) && ($cnt < 6)){
$file = '';
if (substr($row->url, 0, 1) == '/'){
if(isset($GLOBALS['imageDomain']) && $GLOBALS['imageDomain']) $file = $GLOBALS['imageDomain'].$row->url;
if(!empty($GLOBALS['IMAGE_DOMAIN'])) $file = $GLOBALS['IMAGE_DOMAIN'] . $row->url;
else $file = $domain.$row->url;
}
else{
Expand Down
23 changes: 12 additions & 11 deletions classes/GlossaryManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,18 @@ class GlossaryManager extends Manager {

public function __construct(){
parent::__construct(null, 'write');
$this->imageRootPath = $GLOBALS["imageRootPath"];
$this->imageRootPath = $GLOBALS['$IMAGE_ROOT_PATH'];
if(substr($this->imageRootPath,-1) != "/") $this->imageRootPath .= "/";
$this->imageRootUrl = $GLOBALS["imageRootUrl"];
$this->imageRootUrl = $GLOBALS['$IMAGE_ROOT_URL'];
if(substr($this->imageRootUrl,-1) != "/") $this->imageRootUrl .= "/";
if(array_key_exists('imgTnWidth',$GLOBALS)){
$this->tnPixWidth = $GLOBALS['imgTnWidth'];
if(!empty($GLOBALS['IMG_TN_WIDTH'])){
$this->tnPixWidth = $GLOBALS['IMG_WEB_WIDTH'];
egbot marked this conversation as resolved.
Show resolved Hide resolved
}
if(array_key_exists('imgWebWidth',$GLOBALS)){
$this->webPixWidth = $GLOBALS['imgWebWidth'];
if(!empty($GLOBALS['IMG_WEB_WIDTH'])){
$this->webPixWidth = $GLOBALS['IMG_WEB_WIDTH'];
}
if(array_key_exists('imgFileSizeLimit',$GLOBALS)){
$this->webFileSizeLimit = $GLOBALS['imgFileSizeLimit'];
if(!empty($GLOBALS['IMG_FILE_SIZE_LIMIT'])){
$this->webFileSizeLimit = $GLOBALS['IMG_FILE_SIZE_LIMIT'];
}
}

Expand Down Expand Up @@ -907,9 +907,10 @@ private function databaseImage($imgWebUrl,$imgTnUrl,$imgLgUrl){
global $SYMB_UID;
if(!$imgWebUrl) return 'ERROR: web url is null ';
$urlBase = $this->urlBase;
//If central images are on remote server and new ones stored locally, then we need to use full domain
//e.g. this portal is sister portal to central portal
if($GLOBALS['imageDomain']) $urlBase = $this->getDomain().$urlBase;
if(!empty($GLOBALS['IMAGE_DOMAIN'])){
//Central images are on remote server and new ones stored locally, thus need to use full local domain (this portal is sister portal to central portal)
$urlBase = $this->getDomain().$urlBase;
}
if(strtolower(substr($imgWebUrl,0,7)) != 'http://' && strtolower(substr($imgWebUrl,0,8)) != 'https://'){
$imgWebUrl = $urlBase.$imgWebUrl;
}
Expand Down
7 changes: 2 additions & 5 deletions classes/GlossaryUpload.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,11 +442,8 @@ private function getUploadGlossaryFieldArr(){

//Setters and getters
private function setUploadTargetPath(){
$tPath = $GLOBALS["tempDirRoot"];
if(!$tPath){
$tPath = ini_get('upload_tmp_dir');
}
if(!$tPath && isset($GLOBALS["TEMP_DIR_ROOT"])){
$tPath = ini_get('upload_tmp_dir');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirming this is an intended change in logic. The proposed code will default to using the upload_temp_directory returned by ini_get('upload_tmp_dir') unless that function returns false. The previous logic appears to default to the value in $GLOBALS["tempDirRoot"] . Perhaps the intent is to default to the new $GLOBALS["TEMP_DIR_ROOT"] and fallback to ini_get('upload_tmp_dir') if that global is empty ? (line 446 will short-circuit on !$Path )

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, defaulting to upload_tmp_dir is the attended action. The old code defaulted to using the old variable format (tempDirRoot), and then upload_tmp_dir, and then the new format (TEMP_DIR_ROOT), which is a little screwy. Simply defaulting to upload_tmp_dir, and then TEMP_DIR_ROOT, is perfect. Thanks for checking.

if(!$tPath && !empty($GLOBALS['TEMP_DIR_ROOT'])){
$tPath = $GLOBALS['TEMP_DIR_ROOT'];
}
if(!$tPath){
Expand Down
14 changes: 7 additions & 7 deletions classes/ImageBatchProcessor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
// If running as standalone scripts outside of the Symbiota file structure, you must include ImageLocalProcessor class (ImageLocalProcessor.php)
if(isset($SERVER_ROOT) && $SERVER_ROOT){
include_once($SERVER_ROOT.'/classes/ImageLocalProcessor.php');
@include_once($serverRoot.'/classes/SpecProcessorGPI.php');
@include_once($serverRoot.'/classes/SpecProcessorNEVP.php');
@include_once($SERVER_ROOT.'/classes/SpecProcessorGPI.php');
@include_once($SERVER_ROOT.'/classes/SpecProcessorNEVP.php');
}
elseif(isset($serverRoot) && $serverRoot){
if(file_exists($serverRoot.'/config/dbconnection.php')){
if(file_exists($serverRoot.'/config/dbconnection.php')){
include_once($serverRoot.'/config/dbconnection.php');
}
else{
include_once('ImageBatchConnectionFactory.php');
}
if (file_exists($serverRoot.'/classes/ImageLocalProcessor.php')) {
if (file_exists($serverRoot.'/classes/ImageLocalProcessor.php')) {
@require_once($serverRoot.'/classes/ImageLocalProcessor.php');
}
// Check for the symbiota class files used herein for parsing
Expand All @@ -30,13 +30,13 @@
}
else{
//Files reside in same folder and script is run from within the folder
if(file_exists('ImageLocalProcessor.php')) {
if(file_exists('ImageLocalProcessor.php')) {
@require_once('ImageLocalProcessor.php');
}
if(file_exists('SpecProcessorGPI.php')) {
if(file_exists('SpecProcessorGPI.php')) {
@require_once('SpecProcessorGPI.php');
}
if (file_exists('SpecProcessorNEVP.php')) {
if (file_exists('SpecProcessorNEVP.php')) {
@require_once('SpecProcessorNEVP.php');
}
}
Expand Down
4 changes: 2 additions & 2 deletions classes/ImageDetailManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ public function getImageMetadata(){

public function editImage($postArr){
$status = "";
$searchStr = $GLOBALS["imageRootUrl"];
$searchStr = $GLOBALS['IMAGE_ROOT_URL'];
if(substr($searchStr,-1) != "/") $searchStr .= "/";
$replaceStr = $GLOBALS["imageRootPath"];
$replaceStr = $GLOBALS['IMAGE_ROOT_PATH'];
if(substr($replaceStr,-1) != "/") $replaceStr .= "/";
$url = $postArr["url"];
$tnUrl = $postArr["thumbnailurl"];
Expand Down
4 changes: 2 additions & 2 deletions classes/ImageImport.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,12 @@ public function getTranslation($inStr){
}

private function setUploadTargetPath(){
$tPath = $GLOBALS["tempDirRoot"];
$tPath = $GLOBALS['TEMP_DIR_ROOT'];
if(!$tPath){
$tPath = ini_get('upload_tmp_dir');
}
if(!$tPath){
$tPath = $GLOBALS["serverRoot"]."/temp/downloads";
$tPath = $GLOBALS['SERVER_ROOT']."/temp/downloads";
}
if(substr($tPath,-1) != '/') $tPath .= "/";
$this->uploadTargetPath = $tPath;
Expand Down
28 changes: 14 additions & 14 deletions classes/ImageLocalProcessor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ function __construct(){
ini_set('memory_limit','1024M');
//Use deaults located within symbini, if they are available
//Will be replaced by values within configuration file, if they are set
if(isset($GLOBALS['imgWebWidth']) && $GLOBALS['imgWebWidth']) $this->webPixWidth = $GLOBALS['imgWebWidth'];
if(isset($GLOBALS['imgTnWidth']) && $GLOBALS['imgTnWidth']) $this->tnPixWidth = $GLOBALS['imgTnWidth'];
if(isset($GLOBALS['imgLgWidth']) && $GLOBALS['imgLgWidth']) $this->lgPixWidth = $GLOBALS['imgLgWidth'];
if(isset($GLOBALS['imgFileSizeLimit']) && $GLOBALS['imgFileSizeLimit']) $this->webFileSizeLimit = $GLOBALS['imgFileSizeLimit'];
if(!empty($GLOBALS['IMG_WEB_WIDTH'])) $this->webPixWidth = $GLOBALS['IMG_WEB_WIDTH'];
if(!empty($GLOBALS['IMG_TN_WIDTH'])) $this->tnPixWidth = $GLOBALS['IMG_TN_WIDTH'];
if(!empty($GLOBALS['IMG_LG_WIDTH'])) $this->lgPixWidth = $GLOBALS['IMG_LG_WIDTH'];
if(!empty($GLOBALS['IMG_FILE_SIZE_LIMIT'])) $this->webFileSizeLimit = $GLOBALS['IMG_FILE_SIZE_LIMIT'];
}

function __destruct(){
Expand Down Expand Up @@ -246,7 +246,7 @@ private function setImagePaths(){
//Set target base path
if(!$this->targetPathBase){
//Assume that we should use the portal's default image root path
$this->targetPathBase = $GLOBALS['imageRootPath'];
$this->targetPathBase = $GLOBALS['IMAGE_ROOT_PATH'];
}
if($this->targetPathBase && substr($this->targetPathBase,-1) != '/' && substr($this->targetPathBase,-1) != "\\"){
$this->targetPathBase .= '/';
Expand All @@ -255,9 +255,9 @@ private function setImagePaths(){
//Set image base URL
if(!$this->imgUrlBase){
//Assume that we should use the portal's default image url prefix
$this->imgUrlBase = $GLOBALS['imageRootUrl'];
$this->imgUrlBase = $GLOBALS['IMAGE_ROOT_URL'];
}
if(isset($GLOBALS['imageDomain']) && $GLOBALS['imageDomain']){
if(!empty($GLOBALS['IMAGE_DOMAIN'])){
//Since imageDomain is set, portal is not central portal thus add portals domain to url base
if(substr($this->imgUrlBase,0,7) != 'http://' && substr($this->imgUrlBase,0,8) != 'https://'){
$urlPrefix = "http://";
Expand Down Expand Up @@ -587,7 +587,7 @@ private function processImageFile($imageArr, $targetFileName, $targetPath, $path
$fileNameBase = substr($sourceFileName,0,$p);
}
list($width, $height) = ImageShared::getImgDim($sourcePath.$sourceFileName);

if($width && $height){
$fileSize = 0;
if(substr($sourcePath,0,7)=='http://' || substr($sourcePath,0,8)=='https://') {
Expand All @@ -601,7 +601,7 @@ private function processImageFile($imageArr, $targetFileName, $targetPath, $path
//ob_flush();
//flush();


//Set large image
$lgUrl = '';
if($this->lgProcessingCode){
Expand Down Expand Up @@ -649,7 +649,7 @@ private function processImageFile($imageArr, $targetFileName, $targetPath, $path
}
$imgHash = md5_file($targetPath.$lgTargetFileName);
if($imgHash) $imageArr['mediamd5'] = $imgHash;

}
elseif($this->lgProcessingCode == 2){
// 2 = map to source
Expand Down Expand Up @@ -2115,11 +2115,11 @@ private function uriExists($url) {

$localUrl = '';
if(substr($url,0,1) == '/'){
if(isset($GLOBALS['imageDomain']) && $GLOBALS['imageDomain']){
$url = $GLOBALS['imageDomain'].$url;
if(!empty($GLOBALS['IMAGE_DOMAIN'])){
$url = $GLOBALS['IMAGE_DOMAIN'].$url;
}
elseif($GLOBALS['imageRootUrl'] && strpos($url,$GLOBALS['imageRootUrl']) === 0){
$localUrl = str_replace($GLOBALS['imageRootUrl'],$GLOBALS['imageRootPath'],$url);
elseif($GLOBALS['IMAGE_ROOT_URL'] && strpos($url,$GLOBALS['IMAGE_ROOT_URL']) === 0){
$localUrl = str_replace($GLOBALS['IMAGE_ROOT_URL'],$GLOBALS['IMAGE_ROOT_PATH'],$url);
}
else{
$urlPrefix = "http://";
Expand Down
34 changes: 17 additions & 17 deletions classes/ImageShared.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,21 +70,21 @@ public function __construct($conn = null){
$this->connShared = true;
}
else $this->conn = MySQLiConnectionFactory::getCon('write');
$this->imageRootPath = $GLOBALS["imageRootPath"];
$this->imageRootPath = $GLOBALS['IMAGE_ROOT_PATH'];
if(substr($this->imageRootPath,-1) != "/") $this->imageRootPath .= "/";
$this->imageRootUrl = $GLOBALS["imageRootUrl"];
$this->imageRootUrl = $GLOBALS['IMAGE_ROOT_URL'];
if(substr($this->imageRootUrl,-1) != "/") $this->imageRootUrl .= "/";
if(array_key_exists('imgTnWidth',$GLOBALS)){
$this->tnPixWidth = $GLOBALS['imgTnWidth'];
if(array_key_exists('IMG_TN_WIDTH',$GLOBALS)){
$this->tnPixWidth = $GLOBALS['IMG_TN_WIDTH'];
}
if(array_key_exists('imgWebWidth',$GLOBALS)){
$this->webPixWidth = $GLOBALS['imgWebWidth'];
if(array_key_exists('IMG_WEB_WIDTH',$GLOBALS)){
$this->webPixWidth = $GLOBALS['IMG_WEB_WIDTH'];
}
if(array_key_exists('imgLgWidth',$GLOBALS)){
$this->lgPixWidth = $GLOBALS['imgLgWidth'];
if(array_key_exists('IMG_LG_WIDTH',$GLOBALS)){
$this->lgPixWidth = $GLOBALS['IMG_LG_WIDTH'];
}
if(array_key_exists('imgFileSizeLimit',$GLOBALS)){
$this->webFileSizeLimit = $GLOBALS['imgFileSizeLimit'];
if(array_key_exists('IMG_FILE_SIZE_LIMIT',$GLOBALS)){
$this->webFileSizeLimit = $GLOBALS['IMG_FILE_SIZE_LIMIT'];
}
//Needed to avoid 403 errors
ini_set('user_agent','Mozilla/4.0 (compatible; MSIE 6.0)');
Expand Down Expand Up @@ -235,8 +235,8 @@ public function parseUrl($url){
$url = str_replace(' ','%20',$url);
//If image is relative, add proper domain
if(substr($url,0,1) == '/'){
if(isset($GLOBALS['imageDomain']) && $GLOBALS['imageDomain']){
$url = $GLOBALS['imageDomain'].$url;
if(!empty($GLOBALS['IMAGE_DOMAIN'])){
$url = $GLOBALS['IMAGE_DOMAIN'] . $url;
}
else{
$url = $this->getDomainUrl().$url;
Expand Down Expand Up @@ -409,12 +409,12 @@ public function processImage(){
}

public function createNewImage($subExt, $targetWidth, $qualityRating = 0, $targetPathOverride = ''){
global $useImageMagick;
global $USE_IMAGE_MAGICK;
$status = false;
if($this->sourcePath){
if(!$qualityRating) $qualityRating = $this->jpgCompression;

if($useImageMagick) {
if($USE_IMAGE_MAGICK) {
// Use ImageMagick to resize images
$status = $this->createNewImageImagick($subExt,$targetWidth,$qualityRating,$targetPathOverride);
}
Expand Down Expand Up @@ -574,7 +574,7 @@ public function getUrlBase(){
$urlBase = $this->urlBase;
//If central images are on remote server and new ones stored locally, then we need to use full domain
//e.g. this portal is sister portal to central portal
if($GLOBALS['imageDomain']) $urlBase = $this->getDomainUrl().$urlBase;
if($GLOBALS['IMAGE_DOMAIN']) $urlBase = $this->getDomainUrl().$urlBase;
return $urlBase;
}

Expand Down Expand Up @@ -1006,8 +1006,8 @@ public function uriExists($uri) {
$fileName = str_replace($GLOBALS['IMAGE_ROOT_URL'],$GLOBALS['IMAGE_ROOT_PATH'],$uri);
if(file_exists($fileName)) return true;
}
if(isset($GLOBALS['imageDomain']) && $GLOBALS['imageDomain']){
$uri = $GLOBALS['imageDomain'].$uri;
if(!empty($GLOBALS['IMAGE_DOMAIN'])){
$uri = $GLOBALS['IMAGE_DOMAIN'].$uri;
}
else{
$uri = $urlPrefix.$uri;
Expand Down
8 changes: 4 additions & 4 deletions classes/KeyCharAdmin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ public function uploadCsImage($formArr){
global $PARAMS_ARR;
$statusStr = '';
if(is_numeric($formArr['cid']) && is_numeric($formArr['cs'])){
$imageRootPath = $GLOBALS["imageRootPath"];
$imageRootPath = $GLOBALS['IMAGE_ROOT_PATH'];
if(substr($imageRootPath,-1) != "/") $imageRootPath .= "/";
if(file_exists($imageRootPath)){
$imageRootPath .= 'ident/';
Expand All @@ -297,7 +297,7 @@ public function uploadCsImage($formArr){
}
}
//Create url prefix
$imageRootUrl = $GLOBALS["imageRootUrl"];
$imageRootUrl = $GLOBALS['IMAGE_ROOT_URL'];
if(substr($imageRootUrl,-1) != "/") $imageRootUrl .= "/";
$imageRootUrl .= 'ident/csimgs/';

Expand Down Expand Up @@ -381,7 +381,7 @@ private function createNewCsImage($path){
public function deleteCsImage($csImgId){
$statusStr = 'SUCCESS: image uploaded successful';
//Remove image from file system
$imageRootPath = $GLOBALS["imageRootPath"];
$imageRootPath = $GLOBALS['IMAGE_ROOT_PATH'];
if(substr($imageRootPath,-1) != "/") $imageRootPath .= "/";
$imageRootPath .= 'ident/csimgs/';
$sql = 'SELECT url FROM kmcsimages WHERE csimgid = '.$csImgId;
Expand Down Expand Up @@ -534,7 +534,7 @@ public function setLanguage($l){

public function setLangId($lang=''){
if(!$lang){
if($GLOBALS['defaultLang']) $lang = $GLOBALS['defaultLang'];
if($GLOBALS['DEFAULT_LANG']) $lang = $GLOBALS['DEFAULT_LANG'];
else $lang = 'English';
}
if(is_numeric($lang)) $this->langId = $lang;
Expand Down
4 changes: 2 additions & 2 deletions classes/OccurrenceDownload.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,9 +531,9 @@ private function setTableJoins($sqlWhere){
}

private function getOutputFilePath(){
$retStr = $GLOBALS['tempDirRoot'];
$retStr = $GLOBALS['TEMP_DIR_ROOT'];
if(!$retStr){
$retStr = $GLOBALS['serverRoot'];
$retStr = $GLOBALS['SERVER_ROOT'];
if(substr($retStr,-1) != '/' && substr($retStr,-1) != "\\") $retStr .= '/';
$retStr .= 'temp/';
}
Expand Down
4 changes: 2 additions & 2 deletions classes/OccurrenceEditorImages.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ class OccurrenceEditorImages extends OccurrenceEditorManager {

public function __construct(){
parent::__construct();
$this->imageRootPath = $GLOBALS["imageRootPath"];
$this->imageRootPath = $GLOBALS['IMAGE_ROOT_PATH'];
if(substr($this->imageRootPath,-1) != "/") $this->imageRootPath .= "/";
$this->imageRootUrl = $GLOBALS["imageRootUrl"];
$this->imageRootUrl = $GLOBALS['IMAGE_ROOT_URL'];
if(substr($this->imageRootUrl,-1) != "/") $this->imageRootUrl .= "/";
}

Expand Down
9 changes: 5 additions & 4 deletions classes/OccurrenceExsiccatae.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,13 +721,14 @@ public function getCollArr($ometid = 0){
}

public function getTargetCollArr(){
global $USER_RIGHTS;
$retArr = array();
$collArr = array();
if(isset($GLOBALS['CollAdmin'])){
$collArr = $GLOBALS['CollAdmin'];
if(isset($USER_RIGHTS['CollAdmin'])){
$collArr = $USER_RIGHTS['CollAdmin'];
}
if(isset($GLOBALS['CollEditor'])){
$collArr = array_merge($collArr,$GLOBALS['CollEditor']);
if(isset($USER_RIGHTS['CollEditor'])){
$collArr = array_merge($collArr, $USER_RIGHTS['CollEditor']);
}
if($collArr){
$sql ='SELECT DISTINCT c.collid, c.collectionname, c.institutioncode, c.collectioncode '.
Expand Down
Loading