diff --git a/admin/helpers/html/jemhtml.php b/admin/helpers/html/jemhtml.php index 2961b8505..ad746c90d 100644 --- a/admin/helpers/html/jemhtml.php +++ b/admin/helpers/html/jemhtml.php @@ -1,8 +1,8 @@ - - - - diff --git a/admin/models/sampledata.php b/admin/models/sampledata.php index 3997d04c4..91513977b 100644 --- a/admin/models/sampledata.php +++ b/admin/models/sampledata.php @@ -75,7 +75,7 @@ public function loadData() // Process queries foreach ($queries as $query) { $query = trim($query); - if ($query != '' && $query{0} != '#') { + if ($query != '' && $query[0] != '#') { $this->_db->setQuery($query); $this->_db->execute(); diff --git a/admin/views/attendees/tmpl/default.php b/admin/views/attendees/tmpl/default.php index 6167e4d58..840aceb74 100644 --- a/admin/views/attendees/tmpl/default.php +++ b/admin/views/attendees/tmpl/default.php @@ -1,8 +1,8 @@ status; if ($status === 1 && $row->waiting == 1) { $status = 2; } - echo JHtml::_('jemhtml.toggleAttendanceStatus', $status, $i, $canChange); + echo JHtml::_('jemhtml.toggleAttendanceStatus', $i, $status, $canChange); ?> jemsettings->regallowcomments)) : ?> diff --git a/admin/views/categories/tmpl/default.php b/admin/views/categories/tmpl/default.php index ba06521ef..dea57b58e 100644 --- a/admin/views/categories/tmpl/default.php +++ b/admin/views/categories/tmpl/default.php @@ -1,8 +1,8 @@ - - + + diff --git a/admin/views/events/tmpl/default.php b/admin/views/events/tmpl/default.php index 77030f9f0..6cc5b099a 100644 --- a/admin/views/events/tmpl/default.php +++ b/admin/views/events/tmpl/default.php @@ -1,8 +1,8 @@ - featured, $i, $canChange); ?> + featured, $canChange); ?> author; ?>
diff --git a/jem.xml b/jem.xml index 0a768a320..c60c5c488 100644 --- a/jem.xml +++ b/jem.xml @@ -1,13 +1,13 @@ com_jem - April 2021 + November 2022 JEM Community - Copyright (C) 2013-2021 joomlaeventmanager.net + Copyright (C) 2013-2022 joomlaeventmanager.net https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL info@joomlaeventmanager.net http://www.joomlaeventmanager.net - 2.3.3 + 2.3.5 COM_JEM_INSTALLATION_DESCRIPTION diff --git a/package/pkg_jem.xml b/package/pkg_jem.xml index 52acff55b..def825865 100644 --- a/package/pkg_jem.xml +++ b/package/pkg_jem.xml @@ -2,14 +2,14 @@ pkg_jem jem - April 2021 - Copyright (C) 2013-2021 joomlaeventmanager.net + November 2022 + Copyright (C) 2013-2022 joomlaeventmanager.net https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL JEM Community info@joomlaeventmanager.net http://www.joomlaeventmanager.net - 2.3.1 + 2.3.5 PKG_JEM_INSTALLATION_DESCRIPTION http://www.joomlaeventmanager.net/ JEM Community diff --git a/pkg_jem_v2.3.3_gut.zip b/pkg_jem_v2.3.3_gut.zip deleted file mode 100644 index 0f0631652..000000000 Binary files a/pkg_jem_v2.3.3_gut.zip and /dev/null differ diff --git a/site/classes/iCalcreator.class.php b/site/classes/iCalcreator.class.php index 31fdc1537..b5cd30c31 100644 --- a/site/classes/iCalcreator.class.php +++ b/site/classes/iCalcreator.class.php @@ -1665,7 +1665,7 @@ function parse( $unparsedtext=FALSE ) { $proprows = array(); for( $i = 0; $i < count( $this->unparsed ); $i++ ) { // concatenate lines $line = rtrim( $this->unparsed[$i], $nl ); - while( isset( $this->unparsed[$i+1] ) && !empty( $this->unparsed[$i+1] ) && ( ' ' == $this->unparsed[$i+1]{0} )) + while( isset( $this->unparsed[$i+1] ) && !empty( $this->unparsed[$i+1] ) && ( ' ' == $this->unparsed[$i+1][0] )) $line .= rtrim( substr( $this->unparsed[++$i], 1 ), $nl ); $proprows[] = $line; @@ -3064,8 +3064,8 @@ function setFreebusy( $fbType, $fbValues, $params=FALSE, $index=FALSE ) { } } elseif(( 3 <= strlen( trim( $fbMember ))) && // string format duration - ( in_array( $fbMember{0}, array( 'P', '+', '-' )))) { - if( 'P' != $fbMember{0} ) + ( in_array( $fbMember[0], array( 'P', '+', '-' )))) { + if( 'P' != $fbMember[0] ) $fbmember = substr( $fbMember, 1 ); $freebusyPairMember = iCalUtilityFunctions::_durationStr2arr( $fbMember ); @@ -3992,7 +3992,7 @@ function setTrigger( $year, $month=null, $day=null, $week=FALSE, $hour=FALSE, $m } elseif(is_string( $year ) && ( is_array( $month ) || empty( $month ))) { // duration or date in a string $params = iCalUtilityFunctions::_setParams( $month ); - if( in_array( $year{0}, array( 'P', '+', '-' ))) { // duration + if( in_array( $year[0], array( 'P', '+', '-' ))) { // duration $relatedStart = ( isset( $params['RELATED'] ) && ( 'END' == strtoupper( $params['RELATED'] ))) ? FALSE : TRUE; $before = ( '-' == $year[0] ) ? TRUE : FALSE; @@ -4255,7 +4255,7 @@ function _makeUid() { $length = 6; $str = null; for( $p = 0; $p < $length; $p++ ) - $unique .= $base{mt_rand( $start, $end )}; + $unique .= $base[mt_rand( $start, $end )]; $this->uid = array( 'params' => null ); $this->uid['value'] = $date.'-'.$unique.'@'.$this->getConfig( 'unique_id' ); @@ -5731,7 +5731,7 @@ function parse( $unparsedtext=null ) { $proprows = array(); for( $i = 0; $i < count( $this->unparsed ); $i++ ) { // concatenate lines $line = rtrim( $this->unparsed[$i], $nl ); - while( isset( $this->unparsed[$i+1] ) && !empty( $this->unparsed[$i+1] ) && ( ' ' == $this->unparsed[$i+1]{0} )) + while( isset( $this->unparsed[$i+1] ) && !empty( $this->unparsed[$i+1] ) && ( ' ' == $this->unparsed[$i+1][0] )) $line .= rtrim( substr( $this->unparsed[++$i], 1 ), $nl ); $proprows[] = $line; @@ -6963,7 +6963,7 @@ public static function _chkdatecfg( $theDate, & $parno, & $params ) { if( isset( $theDate['timestamp'] )) $tzid = ( isset( $theDate['tz'] )) ? $theDate['tz'] : null; else - $tzid = ( isset( $theDate['tz'] )) ? $theDate['tz'] : ( 7 == count( $theDate )) ? end( $theDate ) : null; + $tzid = ( isset( $theDate['tz'] )) ? $theDate['tz'] : (( 7 == count( $theDate )) ? end( $theDate ) : null); if( !empty( $tzid )) { $parno = 7; @@ -7063,7 +7063,7 @@ public static function convEolChar( & $text, $nl ) { $base = 'aAbB!cCdD"eEfF#gGhHiIjJ%kKlL&mMnN/oOpP(rRsS)tTuU=vVxX?uUvV*wWzZ-1234_5678|90'; $len = strlen( $base ) - 1; for( $p = 0; $p < 6; $p++ ) - iCalUtilityFunctions::$baseDelim .= $base{mt_rand( 0, $len )}; + iCalUtilityFunctions::$baseDelim .= $base[mt_rand( 0, $len )]; } /* fix eol chars */ diff --git a/site/classes/output.class.php b/site/classes/output.class.php index 33a07c608..d4e66569e 100644 --- a/site/classes/output.class.php +++ b/site/classes/output.class.php @@ -1,8 +1,8 @@ pagination->getRowOffset( $i ); ?> id); ?> escape($row->name); ?> - status, 0, false); ?> + status, false); ?> diff --git a/site/views/attendees/tmpl/alternative/default.php b/site/views/attendees/tmpl/alternative/default.php index ba582252d..27139cda6 100644 --- a/site/views/attendees/tmpl/alternative/default.php +++ b/site/views/attendees/tmpl/alternative/default.php @@ -1,8 +1,8 @@ status; if ($status === 1 && $row->waiting == 1) { $status = 2; } - echo JHtml::_('jemhtml.toggleAttendanceStatus', $status, $row->id, true); + echo JHtml::_('jemhtml.toggleAttendanceStatus', $row->id, $status, true); ?>id, false, true); + echo JHtml::_('jemhtml.getAttendanceStatusText', $row->id, $status, false, true); ?> diff --git a/site/views/attendees/tmpl/default.php b/site/views/attendees/tmpl/default.php index 5a1520775..ff0ec8944 100644 --- a/site/views/attendees/tmpl/default.php +++ b/site/views/attendees/tmpl/default.php @@ -1,8 +1,8 @@ status; if ($status === 1 && $row->waiting == 1) { $status = 2; } - echo JHtml::_('jemhtml.toggleAttendanceStatus', $status, $row->id, true); + echo JHtml::_('jemhtml.toggleAttendanceStatus', $row->id, $status, true); ?> jemsettings->regallowcomments)) : ?> diff --git a/site/views/attendees/tmpl/responsive/addusers.php b/site/views/attendees/tmpl/responsive/addusers.php index 0ff1762f9..898cda970 100644 --- a/site/views/attendees/tmpl/responsive/addusers.php +++ b/site/views/attendees/tmpl/responsive/addusers.php @@ -1,8 +1,8 @@
getInput('status'); ?> -
+ - +
@@ -90,14 +90,14 @@ function checkList(form)
pagination->getLimitBox(); ?>
-
+
- +
@@ -106,7 +106,7 @@ function checkList(form)
- + @@ -184,10 +184,10 @@ function showUnregistraUntil() loadTemplate('extended'); ?> - jemsettings->frontendpublish != 0) : ?> + loadTemplate('publish'); ?> - + item->attachments) || ($this->jemsettings->attachmentenabled != 0)) : ?> diff --git a/site/views/editevent/tmpl/responsive/chooseusers.php b/site/views/editevent/tmpl/responsive/chooseusers.php index 22a33fb16..1e276d370 100644 --- a/site/views/editevent/tmpl/responsive/chooseusers.php +++ b/site/views/editevent/tmpl/responsive/chooseusers.php @@ -1,8 +1,8 @@ - +
@@ -78,9 +78,9 @@ function checkList(form) - +
- +
@@ -99,7 +99,7 @@ function checkList(form)
pagination->getRowOffset( $i ); ?>
- +
id); @@ -113,13 +113,13 @@ function checkList(form) echo $cb; ?>
- +
escape($row->name); ?>
- +
- status, 0, false); ?> + status, false); ?>
@@ -138,9 +138,9 @@ function checkList(form) - +
- +
diff --git a/site/views/editevent/tmpl/responsive/edit.php b/site/views/editevent/tmpl/responsive/edit.php index ae630c56d..efd938e4b 100644 --- a/site/views/editevent/tmpl/responsive/edit.php +++ b/site/views/editevent/tmpl/responsive/edit.php @@ -1,9 +1,9 @@ item->id); ?>" method="post" name="adminForm" id="adminForm" class="form-validate"> - +
item->recurrence_type > 0) : ?> @@ -147,7 +147,7 @@ function showUnregistraUntil() {
- +
form->getLabel('articletext'); ?> form->getInput('articletext'); ?> @@ -183,7 +183,7 @@ function showUnregistraUntil() {
- + @@ -191,10 +191,9 @@ function showUnregistraUntil() { loadTemplate('extended'); ?> - jemsettings->frontendpublish != 0) : ?> loadTemplate('publish'); ?> - + item->attachments) || ($this->jemsettings->attachmentenabled != 0)) : ?> diff --git a/site/views/editvenue/tmpl/edit.php b/site/views/editvenue/tmpl/edit.php index 2a32e8c92..836f0033d 100644 --- a/site/views/editvenue/tmpl/edit.php +++ b/site/views/editvenue/tmpl/edit.php @@ -1,8 +1,8 @@ - jemsettings->frontendpublish != 0) : ?> + loadTemplate('publish'); ?> - + item->attachments) || ($this->jemsettings->attachmentenabled != 0)) : ?> diff --git a/site/views/editvenue/tmpl/responsive/edit.php b/site/views/editvenue/tmpl/responsive/edit.php index 873ff7700..1b2344890 100644 --- a/site/views/editvenue/tmpl/responsive/edit.php +++ b/site/views/editvenue/tmpl/responsive/edit.php @@ -1,9 +1,9 @@ item->id); ?>" class="form-validate" method="post" name="adminForm" id="venue-form" enctype="multipart/form-data"> - +
params->get('showintrotext')) : ?> @@ -321,10 +321,10 @@ function removerequired() { - jemsettings->frontendpublish != 0) : ?> + loadTemplate('publish'); ?> - + item->attachments) || ($this->jemsettings->attachmentenabled != 0)) : ?> diff --git a/site/views/myattendances/tmpl/alternative/default_attendances.php b/site/views/myattendances/tmpl/alternative/default_attendances.php index e54e0c241..18f54276c 100644 --- a/site/views/myattendances/tmpl/alternative/default_attendances.php +++ b/site/views/myattendances/tmpl/alternative/default_attendances.php @@ -1,8 +1,8 @@ status; if ($status === 1 && $row->waiting == 1) { $status = 2; } - echo JHtml::_('jemhtml.toggleAttendanceStatus', $status, $row->id, false, $this->print); + echo JHtml::_('jemhtml.toggleAttendanceStatus', $row->id, $status, false, $this->print); ?>id, false, true); + echo JHtml::_('jemhtml.getAttendanceStatusText', $row->id, $status, false, true); ?>
@@ -278,4 +278,4 @@ function fullOrdering(id, view) \ No newline at end of file +
diff --git a/site/views/myattendances/tmpl/default_attendances.php b/site/views/myattendances/tmpl/default_attendances.php index 1dbe0534e..73b269d44 100644 --- a/site/views/myattendances/tmpl/default_attendances.php +++ b/site/views/myattendances/tmpl/default_attendances.php @@ -1,8 +1,8 @@ status; if ($status === 1 && $row->waiting == 1) { $status = 2; } - echo JHtml::_('jemhtml.toggleAttendanceStatus', $status, $row->id, false, $this->print); + echo JHtml::_('jemhtml.toggleAttendanceStatus', $row->id, $status, false, $this->print); ?> diff --git a/site/views/myattendances/tmpl/responsive/default_attendances.php b/site/views/myattendances/tmpl/responsive/default_attendances.php index d677ba206..9a6fc2d41 100644 --- a/site/views/myattendances/tmpl/responsive/default_attendances.php +++ b/site/views/myattendances/tmpl/responsive/default_attendances.php @@ -1,6 +1,6 @@
- +
settings->get('global_display',1)) : ?>
@@ -151,16 +151,16 @@ function tableOrdering(order, dir, view) ?>
- +
 lists['order_Dir'], $this->lists['order']); ?>
- jemsettings->showtitle == 1) : ?> + jemsettings->showtitle == 1) : ?>
 lists['order_Dir'], $this->lists['order']); ?>
- + jemsettings->showlocate == 1) : ?>
 lists['order_Dir'], $this->lists['order']); ?>
@@ -174,12 +174,12 @@ function tableOrdering(order, dir, view)
 lists['order_Dir'], $this->lists['order']); ?>
event->waitinglist):*/ ?> -
lists['order_Dir'], $this->lists['order']); ?>
+
lists['order_Dir'], $this->lists['order']); ?>
jemsettings->regallowcomments)) : ?>
-
+
    @@ -191,8 +191,8 @@ function tableOrdering(order, dir, view)
  • - - + +
    venueslug))."'>".$this->escape($row->venue).""; ?> escape($row->venue); ?> - +
    -
    - + jemsettings->showcity == 1) : ?> @@ -263,12 +263,12 @@ function tableOrdering(order, dir, view) categories, $this->jemsettings->catlinklist)); ?> - +
    status; if ($status === 1 && $row->waiting == 1) { $status = 2; } - echo JHtml::_('jemhtml.toggleAttendanceStatus', $status, $row->id, false, $this->print); + echo JHtml::_('jemhtml.toggleAttendanceStatus', $row->id, $status, false, $this->print); ?>
    @@ -298,4 +298,4 @@ function tableOrdering(order, dir, view) \ No newline at end of file + diff --git a/site/views/venueslist/tmpl/default_venues.php b/site/views/venueslist/tmpl/default_venues.php index a3b1549f8..04937b426 100644 --- a/site/views/venueslist/tmpl/default_venues.php +++ b/site/views/venueslist/tmpl/default_venues.php @@ -1,8 +1,8 @@ -