Support Joomla 4, remove detail link, fix translation

.gitignore

@@ -0,0 +1,2 @@
+/*.zip
+/.idea/

language/de-DE.mod_cm_birthday.ini

@@ -97,6 +97,7 @@ COM_CLUBMANAGEMENT_MEMBERSHIPS_FIELD_ID_LABEL="Id"
 COM_CLUBMANAGEMENT_MEMBERSHIPS_FIELD_MODIFIEDBY_LABEL="Verändert von"
 COM_CLUBMANAGEMENT_MEMBERSHIPS_FIELD_MODIFIEDDATE_LABEL="Verändert am"
 COM_CLUBMANAGEMENT_MEMBERSHIPS_FIELD_PERSON_LABEL="Person"
+COM_CLUBMANAGEMENT_MEMBERSHIPS_FIELD_PERSON_ID_LABEL="Person Id"
 COM_CLUBMANAGEMENT_MEMBERSHIPS_FIELD_PUBLISHED_DESC="Soll die Mitgliedschaft veröffentlicht werden?"
 COM_CLUBMANAGEMENT_MEMBERSHIPS_FIELD_PUBLISHED_LABEL="Veröffentlichen"
 COM_CLUBMANAGEMENT_MEMBERSHIPS_FIELD_STATE_DESC="Status der Mitgliedschaft."

language/de-DE.mod_cm_birthday.sys.ini

@@ -7,6 +7,6 @@
 ;@authorEmail	momo_102@bluemail.ch
 
 ;Module
-MOD_CM_BIRTHDAY_XML_NAME="Vereinsverwaltung - Geburtstags-Modul"
+MOD_CM_BIRTHDAY="Vereinsverwaltung - Geburtstags-Modul"
 MOD_CM_BIRTHDAY_XML_DESC="Anzeige der nächsten Geburtstage in einem Modul."
 MOD_CM_BIRTHDAY_XML_UPDATE="Vereinsverwaltung - Geburtstags-Modul Aktualisierungen"

language/en-GB.mod_cm_birthday.ini

@@ -97,6 +97,7 @@ COM_CLUBMANAGEMENT_MEMBERSHIPS_FIELD_ID_LABEL="Id"
 COM_CLUBMANAGEMENT_MEMBERSHIPS_FIELD_MODIFIEDBY_LABEL="Modified by"
 COM_CLUBMANAGEMENT_MEMBERSHIPS_FIELD_MODIFIEDDATE_LABEL="Modified date"
 COM_CLUBMANAGEMENT_MEMBERSHIPS_FIELD_PERSON_LABEL="Person"
+COM_CLUBMANAGEMENT_MEMBERSHIPS_FIELD_PERSON_ID_LABEL="Person Id"
 COM_CLUBMANAGEMENT_MEMBERSHIPS_FIELD_PUBLISHED_DESC="Should the membership be published?"
 COM_CLUBMANAGEMENT_MEMBERSHIPS_FIELD_PUBLISHED_LABEL="Published"
 COM_CLUBMANAGEMENT_MEMBERSHIPS_FIELD_STATE_DESC="State of the membership."

language/en-GB.mod_cm_birthday.sys.ini

@@ -7,6 +7,6 @@
 ;@authorEmail	momo_102@bluemail.ch
 
 ;Module
+MOD_CM_BIRTHDAY="Club management - Birthday module"
 MOD_CM_BIRTHDAY_XML_DESC="Display next birthdays in a module."
-MOD_CM_BIRTHDAY_XML_NAME="Club management - Birthday modul"
 MOD_CM_BIRTHDAY_XML_UPDATE="Club management - Birthday modul Updates"

mod_cm_birthday.php

@@ -12,6 +12,8 @@
 // Check to ensure this file is included in Joomla!
 defined('_JEXEC') or die('Restricted access');
 
+use Joomla\CMS\Uri\Uri;
+
 function getBirthdayData($fields, $where, $order) {
 	$fields[0] = 'DISTINCT '.$fields[0]; //Ugly hack to eliminate duplicates
 	$db = JFactory::getDBO();
@@ -26,25 +28,17 @@ function getBirthdayData($fields, $where, $order) {
 	return $data;
 }
 
-function displayBirthdays($type, $items, $details, $cols, $colcount, $params, $cmparams, $uri, $bdtext='') {
+function displayBirthdays($type, $items, $cols, $colcount, $params, $cmparams, $bdtext='') {
 	$name = array();
-	$collink = $params->get('detail_column_link');
 	$coloffset  = 4;
 	foreach($items as $item) {
 		$row = (array) $item;
 		$birthday = array_pop($row);
 		$birthdate = array_pop($row);
 		$id = array_pop($row);
 		$row = array_values($row);
-		if ($details) {
-			$uri->setVar("id",$id);
-		}
 		for($j=0;$j<$colcount;$j++) {
-			if ($details && ($collink == $cols[$j])) {
-				$row[$j] = '<a href="'.$uri->toString().'" class="modal" rel="{handler: \'iframe\', size: {x: '.$cmparams->get('detail_width').', y: '.$cmparams->get('detail_height').'}}">'.htmlspecialchars($row[$j], ENT_QUOTES, 'UTF-8').'</a>';
-			} else {
-				$row[$j] = htmlspecialchars($row[$j], ENT_QUOTES, 'UTF-8');
-			}
+            $row[$j] = htmlspecialchars($row[$j], ENT_QUOTES, 'UTF-8');
 		}
 		$agetext = '';
 		if ($params->get('column_next_age') == '1') {
@@ -69,11 +63,7 @@ function displayBirthdays($type, $items, $details, $cols, $colcount, $params, $c
 					break;
 			}
 		}
-		if ($details && ($params->get('detail_column_link') != '')) {
-			$name[] = '<a href="'.$uri->toString().'" class="modal" rel="{handler: \'iframe\', size: {x: '.$cmparams->get('detail_width').", y: ".$cmparams->get('detail_height').'}}">'.htmlspecialchars(implode(' ',$row), ENT_QUOTES, 'UTF-8').'</a>'.$birthday;
-		} else {
-			$name[] = htmlspecialchars(implode(' ',$row), ENT_QUOTES, 'UTF-8').$birthday;
-		}
+		$name[] = implode(' ',$row).$birthday;
 	}
 	return $name;
 }
@@ -89,17 +79,6 @@ function displayBirthdays($type, $items, $details, $cols, $colcount, $params, $c
 $title_today = $params->get('title_today');
 $title_next = $params->get('title_next');
 $details = false;
-$curi = JFactory::getURI();
-$uri = JURI::getInstance($curi->toString());
-if ($params->get('detail_enable') != '0') {
-	$details = true;
-	$uri->setVar('layout','detail');
-	$uri->setVar('tmpl','component');
-	$uri->setVar('Itemid','');
-	$uri->setVar('option','com_clubmanagement');
-	$uri->setVar('view','person');
-	$uri->setVar('format','html');
-}
 // Get columns
 $cols = array();
 for ($i=1;$i<=4;$i++) {
@@ -126,8 +105,13 @@ function displayBirthdays($type, $items, $details, $cols, $colcount, $params, $c
 if ($params->get('memberstate') == 'closed') {
 	$whereList[] = '`m`.`end` IS NOT NULL AND NOT `m`.`end`=\'0000-00-00\'';
 }
-if ($params->get('membertype') != '') {
-	$whereList[] = '`m`.`type`=\''.$params->get('membertype').'\'';
+$membertype = $params->get('membertype');
+if (is_array($membertype)) {
+    $whereList[] = '`m`.`type` IN (\''.implode('\', \'',$membertype).'\')';
+} else {
+    if (($membertype != '*') && ($membertype != '')) {
+    	$whereList[] = '`m`.`type`=\''.$membertype.'\'';
+    }
 }
 if ($params->get('publicity') == 'published') {
 	$whereList[] = '`m`.`published`=1';
@@ -148,9 +132,6 @@ function displayBirthdays($type, $items, $details, $cols, $colcount, $params, $c
 	$dataNext = array();
 }
 // Display
-if ($details) {
-	JHTML::_('behavior.modal');
-}
 if ($params->get('css') != '') {
 	echo '<style type="text/css" media="screen">'.$EOL.$params->get('css').$EOL.'</style>'.$EOL;
 }
@@ -160,7 +141,7 @@ function displayBirthdays($type, $items, $details, $cols, $colcount, $params, $c
 	if (!empty($title_today)) {
 		echo $TAB.$TAB.'<div class="cmbirth_today_title">'.$title_today.'</div>'.$EOL;
 	}
-	$name = displayBirthdays('today', $dataToday, $details, $cols, $colcount, $params, $cmparams, $uri, JText::_('MOD_CM_BIRTHDAY_TODAY'));
+	$name = displayBirthdays('today', $dataToday, $cols, $colcount, $params, $cmparams, JText::_('MOD_CM_BIRTHDAY_TODAY'));
 	echo $TAB.$TAB.'<div class="cmbirth_today_person">'.implode($params->get('delimiter'),$name).'</div>'.$EOL;
 	echo $TAB.'</div>'.$EOL;
 }
@@ -169,9 +150,9 @@ function displayBirthdays($type, $items, $details, $cols, $colcount, $params, $c
 	if (!empty($title_next)) {
 		echo $TAB.$TAB.'<div class="cmbirth_next_title">'.$title_next.'</div>'.$EOL;
 	}
-	$name = displayBirthdays('next', $dataNext, $details, $cols, $colcount, $params, $cmparams, $uri);
+	$name = displayBirthdays('next', $dataNext, $cols, $colcount, $params, $cmparams);
 	echo $TAB.$TAB.'<div class="cmbirth_next_person">'.implode($params->get('delimiter'),$name).'</div>'.$EOL;
 	echo $TAB.'</div>'.$EOL;
 }
 echo '</div>'.$EOL;
-?>
+?>

mod_cm_birthday.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<extension type="module" version="3.2" client="site" method="upgrade">
-	<name>MOD_CM_BIRTHDAY_XML_NAME</name>
+<extension type="module" version="4.2" client="site" method="upgrade">
+	<name>MOD_CM_BIRTHDAY</name>
 	<creationDate>August 2016</creationDate>
 	<author>Norbert Kuemin</author>
 	<authorEmail>momo_102@bluemail.ch</authorEmail>
 	<copyright>(C) 2011-2016 Norbert Kuemin</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<version>3.0.6</version>
+	<version>4.0.0</version>
 	<description>MOD_CM_BIRTHDAY_XML_DESC</description>
 	<files>
 		<filename>index.html</filename>
@@ -23,7 +23,7 @@
 		<fields name="params">
 			<fieldset name="basic"
 				  addfieldpath="/administrator/components/com_clubmanagement/models/fields">
-				<field name="membertype" type="cmselection" label="COM_CLUBMANAGEMENT_MEMBERSHIPS_FIELD_TYPE_LABEL" description="COM_CLUBMANAGEMENT_MEMBERSHIPS_FIELD_TYPE_DESC" paramname="member_types" hide_none="false"/>
+				<field name="membertype" type="cmselection" label="COM_CLUBMANAGEMENT_MEMBERSHIPS_FIELD_TYPE_LABEL" description="COM_CLUBMANAGEMENT_MEMBERSHIPS_FIELD_TYPE_DESC" paramname="member_types" hide_none="false" multiple="true"/>
 				<field name="memberstate" type="list" default="current" label="COM_CLUBMANAGEMENT_MEMBERSHIPS_FIELD_STATE_LABEL" description="COM_CLUBMANAGEMENT_MEMBERSHIPS_FIELD_STATE_DESC">
 					<option value="current">COM_CLUBMANAGEMENT_MEMBERSHIPS_FIELD_STATE_CURRENT</option>
 					<option value="closed">COM_CLUBMANAGEMENT_MEMBERSHIPS_FIELD_STATE_TERMINATED</option>
@@ -55,12 +55,6 @@
 				<field name="titel_next" type="text" size="50" default="" label="MOD_CM_BIRTHDAY_TITEL_NEXT_LABEL" description="MOD_CM_BIRTHDAY_TITEL_NEXT_DESC"/>
 				<field name="delimiter" type="text" size="50" default=", " label="MOD_CM_BIRTHDAY_DELIMITER_LABEL" description="MOD_CM_BIRTHDAY_DELIMITER_DESC"/>
 				<field name="css" type="textarea" default="" label="MOD_CM_BIRTHDAY_CSS_LABEL" description="MOD_CM_BIRTHDAY_CSS_DESC" rows="5" cols="50"/>
-				<field name="@spacer" type="spacer" default="" label="" description="" />
-				<field name="detail_enable" type="radio" default="0" label="MOD_CM_BIRTHDAY_ENABLE_DETAILS_LABEL" description="MOD_CM_BIRTHDAY_ENABLE_DETAILS_DESC">
-					<option value="0">JNO</option>
-					<option value="1">JYES</option>
-				</field>
-				<field name="detail_column_link" type="cmmembershipcolumn" columntype="view" default="" label="MOD_CM_BIRTHDAY_DETAIL_LINK_COLUMN_LABEL" description="MOD_CM_BIRTHDAY_DETAIL_LINK_COLUMN_DESC"/>
 			</fieldset>
 		</fields>
 	</config>

tools/build.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+EXTENSION=$(grep "<name>" *.xml | sed 's/[ \t]*<[\/]*name>[\r\n]*//g' | tr '[:upper:]' '[:lower:]')
+VERSION=$(grep "<version>" *.xml | sed 's/[ \t]*<[\/]*version>[\r\n]*//g' | tr '[:upper:]' '[:lower:]')
+OBJECTLIST="language ${EXTENSION}.xml ${EXTENSION}.php index.html LICENSE"
+ZIPFILENAME="./${EXTENSION}-${VERSION}.zip"
+
+if [ -r "${ZIPFILENAME}" ]; then
+        rm "${ZIPFILENAME}"
+fi
+zip -qr "${ZIPFILENAME}" ${OBJECTLIST}