Merge branch 'JEM-4.3.1-dev'

jemproject · Nov 15, 2024 · f08b997 · f08b997
2 parents 893be55 + fa7cdf9
commit f08b997
Show file tree

Hide file tree

Showing 146 changed files with 2,706 additions and 2,260 deletions.
diff --git a/3rd/plg_tagjem/tagjem.php b/3rd/plg_tagjem/tagjem.php
@@ -183,7 +183,7 @@ function acymailingtagjem_show(){
         echo $tabs->startPane('jem_tab');
         echo $tabs->startPanel(Text::_('JOOMEXT_EVENT'), 'jem_event');
         ?>
-        <script type="text/javascript">
+        <script>
             <!--
             var selectedContents = new Array();
             function applyContent(contentid, rowClass){
@@ -348,7 +348,7 @@ function updateTag()
         echo $tabs->startPanel(Text::_('UPCOMING_EVENTS'), 'jem_auto');
         $type = $app->input->request->getString('type');
         ?>
-        <script type="text/javascript">
+        <script>
             <!--
             var selectedCat = new Array();
             function applyAutoEvent(catid,rowClass){

diff --git a/3rd/plg_tagjem/tagjem.xml b/3rd/plg_tagjem/tagjem.xml
@@ -2,7 +2,7 @@
 <extension version="4.0" type="plugin" group="acymailing" method="upgrade">
 	<name>AcyMailing 5.x Tag: insert events from JEM 4</name>
 	<creationDate>October 2024</creationDate>
-	<version>4.3.0</version>
+	<version>4.3.1</version>
 	<author>Acyba, JEM Community</author>
 	<authorEmail>[email protected], [email protected]</authorEmail>
 	<authorUrl>https://www.acymailing.com, https://www.joomlaeventmanager.net</authorUrl>

diff --git a/_old nighlties/pkg_jem_v4.3.1.b1.zip b/_old nighlties/pkg_jem_v4.3.1.b1.zip
diff --git a/_old nighlties/pkg_jem_v4.3.1.b2.zip b/_old nighlties/pkg_jem_v4.3.1.b2.zip
diff --git a/_old nighlties/pkg_jem_v4.3.1.b3.zip b/_old nighlties/pkg_jem_v4.3.1.b3.zip
diff --git a/_old nighlties/pkg_jem_v4.3.1.b4.zip b/_old nighlties/pkg_jem_v4.3.1.b4.zip
diff --git a/admin/assets/sampledata.sql b/admin/assets/sampledata.sql
diff --git a/admin/help/en-GB/editevents.html b/admin/help/en-GB/editevents.html
@@ -143,7 +143,7 @@ <h3>Registration</h3>
 <p><strong>Registration:</strong>
 	Select if users should be able to register to this Event. The options are No, Yes or Invited Users Only.</p>
 <p><strong>Registration Annulation:</strong>
-	Select if users should be able to annulate their registration from this Event. The options are No, Yes or Until .... hours before the event starts.</p>
+	Select if users should be able to annulate their registration from this Event. The options are No, Yes or Limited .... datetime before the event starts.</p>
 <p><strong>Max Places:</strong>
 	Enter the maximum capacity for the event. When there is no maximum, enter 0 for unlimited registrations.</p>
 <p><strong>Booked Places:</strong>

diff --git a/admin/help/en-GB/modernlayout.html b/admin/help/en-GB/modernlayout.html
@@ -2,7 +2,7 @@
         "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="https://www.w3.org/1999/xhtml/" lang="en-GB" xml:lang="en-GB">
 <head>
-  <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
   <title><span>14</span>JEM Responsive</title>
   <link href="../css/help.css" rel="stylesheet" type="text/css" />
 </head>

diff --git a/admin/help/en-GB/settings.html b/admin/help/en-GB/settings.html
@@ -2,6 +2,7 @@
 	"https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="https://www.w3.org/1999/xhtml/" lang="en-GB" xml:lang="en-GB">
 <head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 	<title><span>03</span>Settings</title>
 	<link href="../css/help.css" rel="stylesheet" type="text/css" />
 </head>

diff --git a/admin/helpers/html/jemhtml.php b/admin/helpers/html/jemhtml.php
@@ -274,7 +274,7 @@ static public function icon($image, $icon, $alt, $attribs = null, $no_iconfont =
 		if (!$useiconfont) {
 			$html = HTMLHelper::_('image', $image, Text::_($alt), $attribs, $relative);
 		} elseif (!empty($attribs)) {
-            $html = '<span ' . trim((is_array($attribs) ? ArrayHelper::toString($attribs) : $attribs) . ' /') . '><i class="' . $icon . '"></i></span>';
+            $html = '<span ' . trim((is_array($attribs) ? ArrayHelper::toString($attribs) : $attribs)) . '><i class="' . $icon . '"></i></span>';
 		} else {
 			$html = '<i class="'.$icon.'" aria-hidden="true"></i>';
 		}

diff --git a/admin/language/en-GB/com_jem.ini b/admin/language/en-GB/com_jem.ini
@@ -172,26 +172,30 @@ COM_JEM_EVENT_ERROR_NAME="Fill in: title"
 COM_JEM_EVENT_FIELD_ARTICLETEXT_LABEL="Event Description"
 COM_JEM_EVENT_FIELD_ARTICLETEXT_DESC="Enter the description in the box below"
 COM_JEM_EVENT_FIELD_ENABLE_REGISTRATION="Registration"
-COM_JEM_EVENT_FIELD_ENABLE_REGISTRATION_DESC="When enabled, users can register for the event. Options include: Yes, No, or From N hours before the event starts."
+COM_JEM_EVENT_FIELD_ENABLE_REGISTRATION_DESC="When enabled, users can register for the event. Options include: Yes, No, or From a datetime before the event starts."
 COM_JEM_EVENT_FIELD_REGISTRATION_FROM="Registration opens on"
 COM_JEM_EVENT_FIELD_REGISTRATION_FROM_DESC="Enter the datetime before the event starts when registrations are allowed."
 COM_JEM_EVENT_FIELD_REGISTRATION_FROM_POSTFIX=" (from)"
 COM_JEM_EVENT_FIELD_REGISTRATION_FROM_HINT="YYYY-MM-DD HH:MM:SS"
 COM_JEM_FROM="From"
+COM_JEM_EVENT_FIELD_FROM="Limited"
 COM_JEM_EVENT_FIELD_REGISTRATION_UNTIL="Registration closes on"
 COM_JEM_EVENT_FIELD_REGISTRATION_UNTIL_DESC="Enter the datetime before the event starts when registrations aren't allowed."
 COM_JEM_EVENT_FIELD_REGISTRATION_UNTIL_POSTFIX=" (until)"
 COM_JEM_EVENT_FIELD_REGISTRATION_UNTIL_HINT="YYYY-MM-DD HH:MM:SS"
 ; COM_JEM_EVENT_FIELD_ENABLE_UNREGISTRATION="Enable unregistration"
 ; COM_JEM_EVENT_FIELD_ENABLE_UNREGISTRATION_DESC="OBSOLETE - Enable unregistration"
 COM_JEM_EVENT_FIELD_ENABLE_ANNULATION="Allow cancellation"
-COM_JEM_EVENT_FIELD_ENABLE_ANNULATION_DESC="When enabled, users can cancel their registration for the event. Options include: Yes, No, or Until N hours before the event starts."
+COM_JEM_EVENT_FIELD_ENABLE_ANNULATION_DESC="When enabled, users can cancel their registration for the event. Options include: Yes, No, or Until a datetime before the event starts."
 COM_JEM_EVENT_FIELD_ANNULATION_UNTIL="Cancellations allowed until"
 COM_JEM_EVENT_FIELD_ANNULATION_UNTIL_DESC="Enter the datetime before the event starts during which cancellations are allowed."
 COM_JEM_EVENT_FIELD_ANNULATION_UNTIL_POSTFIX=" (until)"
 COM_JEM_EVENT_FIELD_ANNULATION_UNTIL_HINT="YYYY-MM-DD HH:MM:SS"
-COM_JEM_UNTIL="until"
+COM_JEM_UNTIL="Until"
+COM_JEM_EVENT_FIELD_UNTIL="Limited"
 COM_JEM_INVITED_USERS_ONLY="Invited users only"
+COM_JEM_EDITEVENT_FIELD_REG_INVITED_ONLY="Set Invited users only"
+COM_JEM_EDITEVENT_FIELD_REG_INVITED_ONLY_DESC="This option restricts event registration to users who have received a specific invitation from the event administrator. Only those directly invited are allowed to register or participate in the event."
 COM_JEM_EVENT_FIELD_FEATURED_DESC="Mark this event as Featured"
 COM_JEM_EVENT_FIELD_HITS_LABEL="Hits"
 COM_JEM_EVENT_FIELD_HITS_DESC="Hits"

diff --git a/admin/models/event.php b/admin/models/event.php
@@ -403,16 +403,25 @@ public function save($data)
 
         if($save) {
 
+            // set to null if registration is empty
+            if($data['registra_from'] == ''){
+                $data['registra_from'] = null;
+            }
+            if($data['registra_until'] == ''){
+                $data['registra_until'] = null;
+            }
+            if($data['unregistra_until'] == ''){
+                $data['unregistra_until'] = null;
+            }
+            if($data['reginvitedonly']== null){
+                $data['reginvitedonly'] = 0;
+            }
+
             // event maybe first of recurrence set -> dissolve complete set
             if (JemHelper::dissolve_recurrence($data['id'])) {
                 $this->cleanCache();
             }
 
-            // on frontend we have dedicated field for 'reginvitedonly' -> set 'registra' to +2 then
-            if (array_key_exists('reginvitedonly', $data) && ($data['reginvitedonly'] == 1)) {
-                $data['registra'] = ($data['registra'] == 1) ? 3 : 2;
-            }
-
             if ($data['dates'] == null || $data['recurrence_type'] == '0') {
                 $data['recurrence_number'] = '0';
                 $data['recurrence_byday'] = '0';
@@ -528,7 +537,7 @@ public function save($data)
             }
         }else{
             // Update field of this event
-            $fieldAllow=['title', 'locid', 'cats', 'dates', 'enddates', 'times', 'endtimes', 'title', 'alias', 'modified', 'modified_by', 'version', 'author_ip', 'created', 'introtext', 'meta_keywords', 'meta_description', 'datimage', 'checked_out', 'checked_out_time', 'registra', 'unregistra', 'unregistra_until', 'maxplaces', 'minbookeduser', 'maxbookeduser', 'reservedplaces', 'waitinglist', 'requestanswer', 'seriesbooking', 'singlebooking', 'published', 'contactid', 'custom1', 'custom2', 'custom3', 'custom4', 'custom5', 'custom6', 'custom7', 'custom8', 'custom9', 'custom10', 'fulltext', 'created_by_alias', 'access', 'featured', 'language'];
+            $fieldAllow=['title', 'locid', 'cats', 'dates', 'enddates', 'times', 'endtimes', 'title', 'alias', 'modified', 'modified_by', 'version', 'author_ip', 'created', 'introtext', 'meta_keywords', 'meta_description', 'datimage', 'checked_out', 'checked_out_time', 'registra', 'registra_from', 'registra_until', 'unregistra', 'unregistra_until', 'maxplaces', 'minbookeduser', 'maxbookeduser', 'reservedplaces', 'waitinglist', 'requestanswer', 'seriesbooking', 'singlebooking', 'published', 'contactid', 'custom1', 'custom2', 'custom3', 'custom4', 'custom5', 'custom6', 'custom7', 'custom8', 'custom9', 'custom10', 'fulltext', 'created_by_alias', 'access', 'featured', 'language'];
             $saved = true;
             $fieldsupdated="";
             foreach ($diff as $d => $value){
@@ -829,9 +838,8 @@ public function updateField($eventid, $field, $value)
                     $db->execute();
                 }
             } else {
-
                 // Update the value of field into events table
-                $db->setQuery('UPDATE #__jem_events SET ' . $field . ' = ' . (($value!==null AND $value!='')? $db->quote($value) : 'null') . ' WHERE id = ' . $db->quote($eventid));
+                $db->setQuery('UPDATE #__jem_events SET ' . $field . ' = ' . ($value!==null ? $db->quote($value) : 'null') . ' WHERE id = ' . $db->quote($eventid));
                 $db->execute();
             }