Merge pull request #9 from BioKIC/master

update
BioKIC · Apr 2, 2021 · 9302485 · 9302485
2 parents 60120e0 + aa69132
commit 9302485
Show file tree

Hide file tree

Showing 107 changed files with 3,214 additions and 2,095 deletions.
diff --git a/agents/agent.php b/agents/agent.php
@@ -14,42 +14,42 @@
 
 $agent = new Agent();
 $agentview = new AgentView();
-if (strlen($agentid) > 0 ) { 
+if (strlen($agentid) > 0 ) {
   $agent->load($agentid);
   $agentview->setModel($agent);
-} elseif (strlen($uuid)>0) { 
-  if (UuidFactory::is_valid($uuid)) { 
+} elseif (strlen($uuid)>0) {
+  if (UuidFactory::is_valid($uuid)) {
      $agent->loadByGUID($uuid);
      $agentview->setModel($agent);
-  } 
+  }
 }
 
 $done = FALSE;
-if ($force=='turtle') { 
-       deliverTurtle(); 
+if ($force=='turtle') {
+       deliverTurtle();
        $done = TRUE;
 }
-if ($force=='rdfxml') { 
-       deliverRdfXml(); 
+if ($force=='rdfxml') {
+       deliverRdfXml();
        $done = TRUE;
 }
 reset($accept);
 while (!$done && list($key, $mediarange) = each($accept)) {
     if ($mediarange=='text/turtle') {
-       deliverTurtle(); 
+       deliverTurtle();
        $done = TRUE;
-    } 
+    }
     if ($mediarange=='application/rdf+xml') {
-       deliverRdfXml(); 
+       deliverRdfXml();
        $done = TRUE;
-    } 
+    }
 }
-if (!$done) { 
+if (!$done) {
   Header("Content-Type: text/html; charset=".$CHARSET);
   $spDisplay = " Agent: ". $agent->getMinimalName();
   pageheader($agent);
   $am = new AgentManager();
-  if ($am->isAgentEditor()) { 
+  if ($am->isAgentEditor()) {
      echo "<div id='commandDiv'><span class='link' id='editLink'>Edit</span>&nbsp;<span class='link' id='viewLink'>View</span>&nbsp;<span class='link' id='createLink'>New</span></div>";
      echo "
      <script type='text/javascript'>
@@ -69,7 +69,7 @@
                   console.dir( xhr );
                }
             });
-            return false; 
+            return false;
         });
         $('#viewLink').click(function () {
             $.ajax({
@@ -87,7 +87,7 @@
                   console.dir( xhr );
                }
             });
-            return false; 
+            return false;
         });
         $('#createLink').click(function () {
             $.ajax({
@@ -105,15 +105,15 @@
                   console.dir( xhr );
                }
             });
-            return false; 
+            return false;
         });
      </script>
      ";
-  } 
+  }
   echo "<div id='agentDetailDiv".$agent->getagentid()."'>";
   echo $agentview->getDetailsView();
   echo "</div>";
-  if ($findobjects==1) { 
+  if ($findobjects==1) {
     echo $am->getPrettyListOfCollectionObjectsForCollector($agent->getagentid());
   }
   footer();
@@ -128,13 +128,13 @@ function deliverTurtle() {
    echo $agentview->getAsTurtle();
 }
 
-function deliverRdfXml() { 
+function deliverRdfXml() {
    global $agent, $agentview, $charset;
    Header("Content-Type: application/rdf+xml; charset=".$CHARSET);
    echo $agentview->getAsRdfXml();
 }
 
-function pageheader($agent) { 
+function pageheader($agent) {
    global $SERVER_ROOT, $DEFAULT_TITLE, $spDisplay, $CLIENT_ROOT, $agent_indexCrumbs, $charset;
 echo '<!DOCTYPE HTML>
 <html>
@@ -146,11 +146,9 @@ function pageheader($agent) {
 	<link href="../css/main.css<?php echo (isset($CSS_VERSION_LOCAL)?'?ver='.$CSS_VERSION_LOCAL:''); ?>" type="text/css" rel="stylesheet" />
 	<link href="../css/jquery-ui_accordian.css" type="text/css" rel="stylesheet" />
 	<script type="text/javascript" src="../js/jquery.js"></script>
-	<script type="text/javascript" src="../js/jquery-ui.js"></script>
-	<script type="text/javascript">';
-    // include_once($SERVER_ROOT.'/includes/googleanalytics.php'); 
-echo '</script>
-	<script type="text/javascript">
+	<script type="text/javascript" src="../js/jquery-ui.js"></script>';
+    // include_once($SERVER_ROOT.'/includes/googleanalytics.php');
+echo '<script type="text/javascript">
 		var currentLevel = ' . ($descrDisplayLevel?$descrDisplayLevel:"1"). ';
 		var levelArr = new Array('. ($descr?"'".implode("','",array_keys($descr))."'":"") . ');
 	</script>
@@ -163,14 +161,14 @@ function pageheader($agent) {
       array_push($agent_indexCrumbs,"<a href='$CLIENT_ROOT/index.php'>Home</a>");
       array_push($agent_indexCrumbs,"<a href='$CLIENT_ROOT/agents/index.php'>Agents</a>");
    }
-   if (isset($agent)) { 
+   if (isset($agent)) {
       $name = $agent->getMinimalName();
       $queryname = $agent->getMinimalName(false);
-   } 
+   }
    if (strlen($name)>0) {
       array_push($agent_indexCrumbs,"<a href='$CLIENT_ROOT/agents/index.php?name=$queryname'>Search</a>");
       array_push($agent_indexCrumbs,$name);
-   } 
+   }
    echo "<div class='navpath'>";
    $last = array_pop($agent_indexCrumbs);
    echo implode($agent_indexCrumbs, " &gt;&gt;");
@@ -179,10 +177,10 @@ function pageheader($agent) {
    echo "</div>";
 
 }
-
 
 
-function footer() { 
+
+function footer() {
    global $SERVER_ROOT,$CLIENT_ROOT;
   include($SERVER_ROOT.'/includes/footer.php');
   echo "</body>\n</html>";

diff --git a/agents/index.php b/agents/index.php
@@ -99,11 +99,9 @@ function pageheader($name) {
 	<link href="../css/main.css'.(isset($CSS_VERSION_LOCAL)?'?ver='.$CSS_VERSION_LOCAL:'').'" type="text/css" rel="stylesheet" />
 	<link href="../css/speciesprofilebase.css" type="text/css" rel="stylesheet" />
 	<script type="text/javascript" src="../js/jquery.js"></script>
-	<script type="text/javascript" src="../js/jquery-ui.js"></script>
-	<script type="text/javascript">';
+	<script type="text/javascript" src="../js/jquery-ui.js"></script>';
     // include_once($SERVER_ROOT.'/includes/googleanalytics.php');
-echo '</script>
-	<script type="text/javascript">
+echo '<script type="text/javascript">
 		var currentLevel = ' . ($descrDisplayLevel?$descrDisplayLevel:"1"). ';
 		var levelArr = new Array('. ($descr?"'".implode("','",array_keys($descr))."'":"") . ');
 	</script>

diff --git a/checklists/checklist.php b/checklists/checklist.php
@@ -121,12 +121,10 @@
 		echo '<link href="'.$CLIENT_ROOT.'/css/base.css?ver=1" type="text/css" rel="stylesheet" />';
 		echo '<link href="'.$CLIENT_ROOT.'/css/main.css?ver=1" type="text/css" rel="stylesheet" />';
 	}
+	include_once($SERVER_ROOT.'/includes/googleanalytics.php');
 	?>
 	<script type="text/javascript" src="../js/jquery.js"></script>
 	<script type="text/javascript" src="../js/jquery-ui.js"></script>
-	<script type="text/javascript">
-		<?php include_once($SERVER_ROOT.'/includes/googleanalytics.php'); ?>
-	</script>
 	<script type="text/javascript">
 		<?php if($clid) echo 'var clid = '.$clid.';'; ?>
 		$( function() {

diff --git a/checklists/checklistmap.php b/checklists/checklistmap.php
@@ -27,10 +27,8 @@
       echo '<link href="'.$CLIENT_ROOT.'/css/base.css?ver=1" type="text/css" rel="stylesheet" />';
       echo '<link href="'.$CLIENT_ROOT.'/css/main.css?ver=1" type="text/css" rel="stylesheet" />';
     }
-	?>
-	<script type="text/javascript">
-		<?php include_once($SERVER_ROOT.'/includes/googleanalytics.php'); ?>
-	</script>
+    include_once($SERVER_ROOT.'/includes/googleanalytics.php');
+    ?>
 	<script src="//maps.googleapis.com/maps/api/js?v=3.exp&libraries=drawing<?php echo (isset($GOOGLE_MAP_KEY) && $GOOGLE_MAP_KEY?'&key='.$GOOGLE_MAP_KEY:''); ?>"></script>
 	<script type="text/javascript">
 		var map;

diff --git a/checklists/dynamicchecklist.php b/checklists/dynamicchecklist.php
@@ -1,5 +1,4 @@
 <?php
-//error_reporting(E_ALL);
 include_once('../config/symbini.php');
 include_once($SERVER_ROOT.'/classes/DynamicChecklistManager.php');
 header("Content-Type: text/html; charset=".$CHARSET);
@@ -9,6 +8,7 @@
 $radius = $_POST['radius'];
 $radiusUnits = $_POST['radiusunits'];
 $dynamicRadius = (isset($DYN_CHECKLIST_RADIUS)?$DYN_CHECKLIST_RADIUS:10);
+$taxa = $_POST['taxa'];
 $tid = $_POST['tid'];
 $interface = $_POST['interface'];
 
@@ -18,24 +18,24 @@
 if(!is_numeric($radius)) $radius = 0;
 if($radiusUnits != 'mi') $radiusUnits == 'km';
 if(!is_numeric($dynamicRadius)) $dynamicRadius = 10;
+$taxa = filter_var($taxa,FILTER_SANITIZE_STRING);
 if(!is_numeric($tid)) $tid = 0;
 
 $dynClManager = new DynamicChecklistManager();
 
-if(is_numeric($radius)){
-	$dynClid = $dynClManager->createChecklist($lat, $lng, $radius, $radiusUnits, $tid);
-}
-else{
-	$dynClid = $dynClManager->createDynamicChecklist($lat, $lng, $dynamicRadius, $tid);
-}
+if($taxa && !$tid) $tid = $dynClManager->getTid($taxa);
+$dynClid = 0;
+if($radius) $dynClid = $dynClManager->createChecklist($lat, $lng, $radius, $radiusUnits, $tid);
+else $dynClid = $dynClManager->createDynamicChecklist($lat, $lng, $dynamicRadius, $tid);
 
-if($interface == "key"){
-	header("Location: ".$CLIENT_ROOT."/ident/key.php?dynclid=".$dynClid."&taxon=All Species");
-}
-else{
-	header("Location: ".$CLIENT_ROOT."/checklists/checklist.php?dynclid=".$dynClid);
+if($dynClid){
+	if($interface == "key"){
+		header("Location: ".$CLIENT_ROOT."/ident/key.php?dynclid=".$dynClid."&taxon=All Species");
+	}
+	else{
+		header("Location: ".$CLIENT_ROOT."/checklists/checklist.php?dynclid=".$dynClid);
+	}
 }
-ob_flush();
-flush();
+else echo 'ERROR generating checklist';
 $dynClManager->removeOldChecklists();
 ?>
diff --git a/checklists/dynamicmap.php b/checklists/dynamicmap.php
@@ -6,32 +6,32 @@
 $tid = array_key_exists('tid',$_REQUEST)?$_REQUEST['tid']:0;
 $taxa = array_key_exists('taxa',$_REQUEST)?$_REQUEST['taxa']:'';
 $interface = array_key_exists('interface',$_REQUEST)&&$_REQUEST['interface']?$_REQUEST['interface']:'checklist';
+$latCen = array_key_exists('lat',$_REQUEST)?$_REQUEST['lat']:'';
+$longCen = array_key_exists('long',$_REQUEST)?$_REQUEST['long']:'';
+$zoomInt = array_key_exists('zoom',$_REQUEST)?$_REQUEST['zoom']:'';
 
 //Sanitation
 if(!is_numeric($tid)) $tid = 0;
 $taxa = filter_var($taxa,FILTER_SANITIZE_STRING);
 if($interface && $interface != 'key') $interface = 'checklist';
 
 //$dynClManager = new DynamicChecklistManager();
-
-$latCen = 41.0;
-$longCen = -95.0;
-$coorArr = explode(";",$MAPPING_BOUNDARIES);
-if($coorArr && count($coorArr) == 4){
-	$latCen = ($coorArr[0] + $coorArr[2])/2;
-	$longCen = ($coorArr[1] + $coorArr[3])/2;
-}
-$coordRange = 50;
-if($coorArr && count($coorArr) == 4) $coordRange = ($coorArr[0] - $coorArr[2]);
-$zoomInt = 5;
-if($coordRange < 20){
-	$zoomInt = 6;
-}
-elseif($coordRange > 35 && $coordRange < 40){
-	$zoomInt = 4;
+if(!$latCen || !$longCen){
+	$latCen = 41.0;
+	$longCen = -95.0;
+	$coorArr = explode(";",$MAPPING_BOUNDARIES);
+	if($coorArr && count($coorArr) == 4){
+		$latCen = ($coorArr[0] + $coorArr[2])/2;
+		$longCen = ($coorArr[1] + $coorArr[3])/2;
+	}
 }
-elseif($coordRange > 40){
-	$zoomInt = 3;
+if(!$zoomInt){
+	$zoomInt = 5;
+	$coordRange = 50;
+	if($coorArr && count($coorArr) == 4) $coordRange = ($coorArr[0] - $coorArr[2]);
+	if($coordRange < 20) $zoomInt = 6;
+	elseif($coordRange > 35 && $coordRange < 40) $zoomInt = 4;
+	elseif($coordRange > 40) $zoomInt = 3;
 }
 ?>
 <html>

diff --git a/checklists/index.php b/checklists/index.php
@@ -1,9 +1,10 @@
 <?php
 include_once('../config/symbini.php');
 include_once($SERVER_ROOT.'/classes/ChecklistManager.php');
+include_once($SERVER_ROOT.'/content/lang/checklists/index.'.$LANG_TAG.'.php');
 header("Content-Type: text/html; charset=".$CHARSET);
 
-$pid = array_key_exists("pid",$_REQUEST)?$_REQUEST["pid"]:0;
+$pid = array_key_exists('pid',$_REQUEST)?$_REQUEST['pid']:0;
 
 $clManager = new ChecklistManager();
 $clManager->setProj($pid);
@@ -21,57 +22,52 @@
 		echo '<link href="'.$CLIENT_ROOT.'/css/base.css?ver=1" type="text/css" rel="stylesheet" />';
 		echo '<link href="'.$CLIENT_ROOT.'/css/main.css?ver=1" type="text/css" rel="stylesheet" />';
 	}
+	include_once($SERVER_ROOT.'/includes/googleanalytics.php');
 	?>
-	<script type="text/javascript">
-		<?php include_once($SERVER_ROOT.'/includes/googleanalytics.php'); ?>
-	</script>
 </head>
 <body>
 	<?php
-	$displayLeftMenu = (isset($checklists_indexMenu)?$checklists_indexMenu:"true");
-	include($SERVER_ROOT."/includes/header.php");
-	echo "<div class='navpath'>";
-	echo "<a href='../index.php'>Home</a> &gt;&gt; ";
-	if(isset($checklists_indexCrumbs) && $checklists_indexCrumbs) echo $checklists_indexCrumbs.' &gt;&gt;';
-	echo " <b>Species Checklists</b>";
-	echo "</div>";
+	$displayLeftMenu = (isset($checklists_indexMenu)?$checklists_indexMenu:'true');
+	include($SERVER_ROOT.'/includes/header.php');
 	?>
-	<!-- This is inner text! -->
+	<div class="navpath">
+		<a href="../index.php"><?php echo (isset($LANG['NAV_HOME'])?$LANG['NAV_HOME']:'Home'); ?></a> &gt;&gt;
+		<b><?php echo (isset($LANG['SPECIES_INVENTORIES'])?$LANG['SPECIES_INVENTORIES']:'Species Inventories'); ?></b>
+	</div>
 	<div id="innertext">
-		<h1>Species Checklists</h1>
-        <div style='margin:20px;'>
+		<h1><?php echo (isset($LANG['SPECIES_INVENTORIES'])?$LANG['SPECIES_INVENTORIES']:'Species Inventories'); ?></h1>
+        <div style="margin:20px;">
 			<?php
             $researchArr = $clManager->getChecklists();
 			if($researchArr){
 				foreach($researchArr as $pid => $projArr){
 					?>
-					<div style='margin:3px 0px 0px 15px;'>
-						<h3><?php echo $projArr['name']; ?>
-							<a href="<?php echo "clgmap.php?pid=".$pid; ?>" title='Show checklists on map'>
-								<img src='../images/world.png' style='width:10px;border:0' />
-							</a>
-						</h3>
-						<div>
-							<ul>
-								<?php
-								foreach($projArr['clid'] as $clid => $clName){
-									echo "<li><a href='checklist.php?clid=".$clid."&pid=".$pid."'>".$clName."</a></li>\n";
-								}
-								?>
-							</ul>
-						</div>
-					</div>
+					<h3>
+						<?php
+						$projName = $projArr['name'];
+						if($projName == 'Miscellaneous Inventories') $projName = (isset($LANG['MISC_INVENTORIES'])?$LANG['MISC_INVENTORIES']:'Miscellaneous Inventories');
+						echo $projName;
+						?>
+						<a href="<?php echo "clgmap.php?pid=".$pid; ?>" title='<?php echo (isset($LANG['SHOW_MAP'])?$LANG['SHOW_MAP']:'Show inventories on map'); ?>'>
+							<img src='../images/world.png' style='width:10px;border:0' />
+						</a>
+					</h3>
+					<ul>
+						<?php
+						foreach($projArr['clid'] as $clid => $clName){
+							echo '<li><a href="checklist.php?clid='.$clid.'&pid='.$pid.'">'.$clName.'</a></li>';
+						}
+						?>
+					</ul>
 					<?php
 				}
 			}
-			else{
-				echo '<div><b>No Checklists returned</b></div>';
-			}
+			else echo '<div><b>'.(isset($LANG['NO_INVENTORIES'])?$LANG['NO_INVENTORIES']:'No inventories returned').'</b></div>';
 			?>
 		</div>
 	</div>
 	<?php
-		include($SERVER_ROOT."/includes/footer.php");
+	include($SERVER_ROOT.'/includes/footer.php');
 	?>
 </body>
 </html>