Fix future date handling for membership / boardentries

Display URL's as links

Author: momo10216

com_clubmanagement.xml

@@ -6,7 +6,7 @@
 	<creationDate>December 2017</creationDate>
 	<copyright>(C) 2017 Norbert Kuemin</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<version>3.0.18</version>
+	<version>3.0.19</version>
 	<description>COM_CLUBMANAGEMENT_XML_DESC</description>
 
 	<install>

site/models/boardentries.php

@@ -130,11 +130,12 @@ protected function getListQuery() {
 		$publicity = $this->paramsMenuEntry->get('publicity');
 		$catid = $this->paramsMenuEntry->get('catid');
 		if ($state == "current") {
-			array_push($where,"(".$db->quoteName('b.end')." IS NULL OR ".$db->quoteName('b.end')." = '0000-00-00')");
+			array_push($where,"(".$db->quoteName('b.end')." IS NULL OR ".$db->quoteName('b.end')." = '0000-00-00' OR DATE(".$db->quoteName('b.end').") >= NOW())");
 		}
 		if ($state == "closed") {
 			array_push($where,$db->quoteName('b.end')." IS NOT NULL");
 			array_push($where,$db->quoteName('b.end')." <> '0000-00-00'");
+			array_push($where,"DATE(".$db->quoteName('b.end').") < NOW()");
 		}
 		if (is_array($job)) {
 			array_push($where,$db->quoteName('b.job')." IN (".implode(", ",$db->quote($job)).")");

site/models/memberships.php

@@ -127,11 +127,12 @@ protected function getListQuery() {
 		$publicity = $this->paramsMenuEntry->get('publicity');
 		$catid = $this->paramsMenuEntry->get('catid');
 		if ($state == "current") {
-			array_push($where,"(".$db->quoteName('m.end')." IS NULL OR ".$db->quoteName('m.end')." = '0000-00-00')");
+			array_push($where,"(".$db->quoteName('m.end')." IS NULL OR ".$db->quoteName('m.end')." = '0000-00-00' OR DATE(".$db->quoteName('m.end').") >= NOW())");
 		}
 		if ($state == "closed") {
 			array_push($where,$db->quoteName('m.end')." IS NOT NULL");
 			array_push($where,$db->quoteName('m.end')." <> '0000-00-00'");
+			array_push($where,"DATE(".$db->quoteName('m.end').") < NOW()");
 		}
 		if (is_array($membertype)) {
 			array_push($where,$db->quoteName('m.type')." IN (".implode(", ",$db->quote($membertype)).")");

site/views/boardentries/tmpl/address.php

@@ -98,6 +98,10 @@
 						if ($lines[$i]) { $lines[$i] .= " "; }
 						if ($details && ($this->paramsMenuEntry->get( 'detail_column_link' ) == $field) && ($data != "")) {
 							$data = "<a href=\"".$uri->toString()."\" class=\"modal\" rel=\"{handler: 'iframe', size: {x: ".$this->paramsMenuComponent->get( 'detail_width' ).", y: ".$this->paramsComponent->get( 'detail_height' )."}}\">".$data."</a>";
+						} else {
+							if ($field == 'person_url') {
+								$data = '<a href="'.$data.'" target="_new">'.$data.'</a>';
+							}
 						}
 						$lines[$i] .= $data;
 						$lines[$i] = trim($lines[$i]);

site/views/boardentries/tmpl/card.php

@@ -121,6 +121,10 @@ function getImageDir($imageDir) {
 					if ($lines[$i]) { $lines[$i] .= ' '; }
 					if ($details && ($this->paramsMenuEntry->get('detail_column_link') == $field) && ($data != '')) {
 						$data = '<a href="'.$uri->toString().'" class="modal" rel="{handler: \'iframe\', size: {x: '.$detailWidth.', y: '.$detailHeight.'}}">'.$data.'</a>';
+					} else {
+						if ($field == 'person_url') {
+							$data = '<a href="'.$data.'" target="_new">'.$data.'</a>';
+						}
 					}
 					$lines[$i] .= $data;
 					$lines[$i] = trim($lines[$i]);

site/views/boardentries/tmpl/default.php

@@ -120,6 +120,9 @@
 				if ($details && (($detailColumn == "") || ($detailColumn == $field))) {
 					echo "<a href=\"".$uri->toString()."\" class=\"modal\" rel=\"{handler: 'iframe', size: {x: ".$detailWidth.", y: ".$detailHeight."}}\">".$data."</a>";
 				} else {
+					if ($field == 'person_url') {
+						$data = '<a href="'.$data.'" target="_new">'.$data.'</a>';
+					}
 					echo $data;
 				}
 				echo "</td>";

site/views/memberships/tmpl/address.php

@@ -104,6 +104,10 @@
 						if ($lines[$i]) { $lines[$i] .= " "; }
 						if ($details && ($this->paramsMenuEntry->get( 'detail_column_link' ) == $field) && ($data != "")) {
 							$data = "<a href=\"".$uri->toString()."\" class=\"modal\" rel=\"{handler: 'iframe', size: {x: ".$this->paramsMenuComponent->get('detail_width').", y: ".$this->paramsComponent->get('detail_height')."}}\">".$data."</a>";
+						} else {
+							if ($field == 'person_url') {
+								$data = '<a href="'.$data.'" target="_new">'.$data.'</a>';
+							}
 						}
 						$lines[$i] .= $data;
 						$lines[$i] = trim($lines[$i]);

site/views/memberships/tmpl/card.php

@@ -112,11 +112,14 @@ function getImageDir($imageDir) {
 				} else {
 					if (isset($row[$field])) { $data = $row[$field]; }
 				}
-
 				if (strlen($data) > 0) {
 					if ($lines[$i]) { $lines[$i] .= " "; }
 					if ($details && ($this->paramsMenuEntry->get('detail_column_link') == $field) && ($data != "")) {
 						$data = '<a href="'.$uri->toString().'" class="modal" rel="{handler: \'iframe\', size: {x: '.$detailWidth.', y: '.$detailHeight.'}}">'.$data.'</a>';
+					} else {
+						if ($field == 'person_url') {
+							$data = '<a href="'.$data.'" target="_new">'.$data.'</a>';
+						}
 					}
 					$lines[$i] .= $data;
 					$lines[$i] = trim($lines[$i]);

site/views/memberships/tmpl/default.php

@@ -116,6 +116,9 @@
 				if ($details && (($detailColumn == "") || ($detailColumn == $field))) {
 					echo "<a href=\"".$uri->toString()."\" class=\"modal\" rel=\"{handler: 'iframe', size: {x: ".$detailWidth.", y: ".$detailHeight."}}\">".$data."</a>";
 				} else {
+					if ($field == 'person_url') {
+						$data = '<a href="'.$data.'" target="_new">'.$data.'</a>';
+					}
 					echo $data;
 				}
 				echo "</td>";