Skip to content

Commit

Permalink
Merge pull request #91 from Egnarts94/dev23-depebo
Browse files Browse the repository at this point in the history 
Dev23 depebo
  • Loading branch information
@depebo
depebo authored Mar 14, 2020
2 parents 973499f + 0bf1659 commit 4f4021d
Show file tree
Hide file tree
Showing 32 changed files with 325 additions and 251 deletions.
12 changes: 2 additions & 10 deletions admin/controllers/attendee.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,7 @@ public function cancel()
JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));

$attendee = JTable::getInstance('jem_register', '');
if (version_compare(JVERSION, '3.2', 'lt')) {
$attendee->bind(JRequest::get('post')); // before Joomla! 3.2.0 there is no good way to get them all from JInput :(
} else {
$attendee->bind(JFactory::getApplication()->input->post->getArray(/*get them all*/));
}
$attendee->bind(JFactory::getApplication()->input->post->getArray(/*get them all*/));
$attendee->checkin();

$this->setRedirect('index.php?option=com_jem&view=attendees&eventid='.JFactory::getApplication()->input->getInt('event', 0));
Expand All @@ -78,11 +74,7 @@ public function save()
$task = $jinput->getCmd('task');

// Retrieving $post
if (version_compare(JVERSION, '3.2', 'lt')) {
$post = JRequest::get('post'); // before Joomla! 3.2.0 we must and can use JRequest
} else {
$post = $jinput->post->getArray(/*get them all*/);
}
$post = $jinput->post->getArray(/*get them all*/);

// Retrieving email-setting
$sendemail = $jinput->getInt('sendemail','0');
Expand Down
4 changes: 2 additions & 2 deletions admin/controllers/imagehandler.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,10 @@ public function uploadimage()

//upload the image
if (!JFile::upload($file['tmp_name'], $filepath)) {
echo "<script> alert('".JText::_('COM_JEM_UPLOAD_FAILED')."'); window.history.go(-1); </script>\n";
echo "<script> alert('".JText::_('COM_JEM_UPLOAD_FAILED')."'); </script>\n";
$app->close();
} else {
echo "<script> alert('".JText::_('COM_JEM_UPLOAD_COMPLETE')."'); window.history.go(-1); window.parent.SelectImage('$filename', '$filename'); </script>\n";
echo "<script> alert('".JText::_('COM_JEM_UPLOAD_COMPLETE')."'); window.parent.SelectImage('$filename', '$filename'); </script>\n";
$app->close();
}
}
Expand Down
6 changes: 3 additions & 3 deletions admin/language/en-GB/en-GB.com_jem.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -856,9 +856,9 @@ COM_JEM_TIME_NAME="Time Suffix"
COM_JEM_LAYOUT_STYLE_SETTINGS="Style"
COM_JEM_SHOW_LAYOUT_STYLE="Layout Style"
COM_JEM_SHOW_LAYOUT_STYLE_DESC="Choose style the frontend should be shown. Select between old table style or a modern responsive style."
COM_JEM_SHOW_LAYOUT_STYLE_LEGACY="Default Table Style"
COM_JEM_SHOW_LAYOUT_STYLE_RESPONSIVE="Modern Responsive Style"
COM_JEM_SHOW_LAYOUT_STYLE_ALTERNATIVE="Alternative Responsive Style"
COM_JEM_SHOW_LAYOUT_STYLE_LEGACY="Legacy (Table Style)"
COM_JEM_SHOW_LAYOUT_STYLE_RESPONSIVE="Default (Responsive Style)"
COM_JEM_SHOW_LAYOUT_STYLE_ALTERNATIVE="Alternative (Responsive Style)"
COM_JEM_INCLUDE_ICON_FONT="Use Icon Font"
COM_JEM_INCLUDE_ICON_FONT_DESC="Use icon font instead of images for print icons etc."
COM_JEM_EVENT_HANDLING="Event Handling"
Expand Down
2 changes: 1 addition & 1 deletion jem.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<license>https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
<authorEmail>info@joomlaeventmanager.net</authorEmail>
<authorUrl>http://www.joomlaeventmanager.net</authorUrl>
<version>2.3.0-beta2</version>
<version>2.3.0-beta3</version>
<description>COM_JEM_INSTALLATION_DESCRIPTION</description>

<!-- Runs on install/uninstall/update; New in 1.6 -->
Expand Down
2 changes: 1 addition & 1 deletion modules/mod_jem/mod_jem.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<creationDate>August 2019</creationDate>
<copyright>copyright (C) 2013-2019 joomlaeventmanager.net</copyright>
<license>https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
<version>2.3.0-beta2</version>
<version>2.3.0-beta3</version>
<description>MOD_JEM_XML_DESCRIPTION</description>

<scriptfile>script.php</scriptfile>
Expand Down
2 changes: 1 addition & 1 deletion modules/mod_jem_banner/mod_jem_banner.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<creationDate>August 2019</creationDate>
<copyright>copyright (C) 2014-2019 joomlaeventmanager.net</copyright>
<license>https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
<version>2.3.0-beta2</version>
<version>2.3.0-beta3</version>
<description>MOD_JEM_BANNER_XML_DESCRIPTION</description>

<scriptfile>script.php</scriptfile>
Expand Down
2 changes: 1 addition & 1 deletion modules/mod_jem_cal/mod_jem_cal.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<creationDate>August 2019</creationDate>
<copyright>Copyright (C) 2013-2019 joomlaeventmanager.net</copyright>
<license>https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
<version>2.3.0-beta2</version>
<version>2.3.0-beta3</version>
<description>MOD_JEM_CAL_XML_DESCRIPTION</description>

<scriptfile>script.php</scriptfile>
Expand Down
2 changes: 1 addition & 1 deletion modules/mod_jem_calajax/mod_jem_calajax.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<license>https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
<authorEmail>info@joomlaeventmanager.net</authorEmail>
<authorUrl>http://www.qivva.com</authorUrl>
<version>2.3.0-beta2</version>
<version>2.3.0-beta3</version>
<description>MOD_JEM_CALAJAX_XML_DESCRIPTION</description>

<files>
Expand Down
2 changes: 1 addition & 1 deletion modules/mod_jem_jubilee/mod_jem_jubilee.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<creationDate>August 2019</creationDate>
<copyright>copyright (C) 2015-2019 joomlaeventmanager.net</copyright>
<license>https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
<version>2.3.0-beta2</version>
<version>2.3.0-beta3</version>
<description>MOD_JEM_JUBILEE_XML_DESCRIPTION</description>

<scriptfile>script.php</scriptfile>
Expand Down
2 changes: 1 addition & 1 deletion modules/mod_jem_teaser/mod_jem_teaser.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<creationDate>August 2019</creationDate>
<copyright>copyright (C) 2013-2019 joomlaeventmanager.net</copyright>
<license>https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
<version>2.3.0-beta2</version>
<version>2.3.0-beta3</version>
<description>MOD_JEM_TEASER_XML_DESCRIPTION</description>

<scriptfile>script.php</scriptfile>
Expand Down
2 changes: 1 addition & 1 deletion modules/mod_jem_teaser/tmpl/responsive/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
$modal = 'notmodal';
}
/*
if (JRequest::getVar('jem-rss','0') == 1) {
if (JFactory::getApplication()->input->getInt('jem-rss','0') == 1) {
ob_get_clean();
createRSSfeed($list);
jexit();
Expand Down
2 changes: 1 addition & 1 deletion modules/mod_jem_wide/mod_jem_wide.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<creationDate>August 2019</creationDate>
<copyright>copyright (C) 2013-2019 joomlaeventmanager.net</copyright>
<license>https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
<version>2.3.0-beta2</version>
<version>2.3.0-beta3</version>
<description>MOD_JEM_WIDE_XML_DESCRIPTION</description>

<scriptfile>script.php</scriptfile>
Expand Down
2 changes: 1 addition & 1 deletion package/pkg_jem.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<authorEmail>info@joomlaeventmanager.net</authorEmail>
<authorUrl>http://www.joomlaeventmanager.net</authorUrl>

<version>2.3.0-beta2</version>
<version>2.3.0-beta3</version>
<description>PKG_JEM_INSTALLATION_DESCRIPTION</description>
<url>http://www.joomlaeventmanager.net/</url>
<packager>JEM Community</packager>
Expand Down
2 changes: 1 addition & 1 deletion plugins/plg_content_jem/jem.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<creationDate>August 2019</creationDate>
<copyright>copyright (C) 2013-2019 joomlaeventmanager.net</copyright>
<license>https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
<version>2.3.0-beta2</version>
<version>2.3.0-beta3</version>
<description>PLG_CONTENT_JEM_XML_DESCRIPTION</description>

<files>
Expand Down
2 changes: 1 addition & 1 deletion plugins/plg_content_jemlistevents/jemlistevents.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<authorUrl>www.joomlaeventmanager.net</authorUrl>
<copyright>copyright (C) 2013-2019 joomlaeventmanager.net</copyright>
<license>https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
<version>2.3.0-beta2</version>
<version>2.3.0-beta3</version>
<description>PLG_CONTENT_JEMLISTEVENTS_XML_DESCRIPTION</description>

<files>
Expand Down
2 changes: 1 addition & 1 deletion plugins/plg_finder_jem/jem.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<authorUrl>http://www.joomlaeventmanager.net</authorUrl>
<copyright>copyright (C) 2013-2019 joomlaeventmanager.net</copyright>
<license>https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
<version>2.3.0-beta2</version>
<version>2.3.0-beta3</version>
<description>PLG_FINDER_JEM_XML_DESCRIPTION</description>

<!-- <scriptfile>script.php</scriptfile> -->
Expand Down
2 changes: 1 addition & 1 deletion plugins/plg_jem_comments/comments.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<authorUrl>http://www.joomlaeventmanager.net</authorUrl>
<copyright>copyright (C) 2013-2019 joomlaeventmanager.net</copyright>
<license>https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
<version>2.3.0-beta2</version>
<version>2.3.0-beta3</version>
<description>PLG_JEM_COMMENTS_XML_DESCRIPTION</description>

<files>
Expand Down
2 changes: 1 addition & 1 deletion plugins/plg_jem_mailer/mailer.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<authorUrl>http://www.joomlaeventmanager.net</authorUrl>
<copyright>copyright (C) 2013-2019 joomlaeventmanager.net</copyright>
<license>https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
<version>2.3.0-beta2</version>
<version>2.3.0-beta3</version>
<description>PLG_JEM_MAILER_XML_DESCRIPTION</description>

<files>
Expand Down
2 changes: 1 addition & 1 deletion plugins/plg_quickicon_jem/jemquickicon.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<authorUrl>http://www.joomlaeventmanager.net</authorUrl>
<copyright>copyright (C) 2013-2019 joomlaeventmanager.net</copyright>
<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
<version>2.3.0-beta2</version>
<version>2.3.0-beta3</version>
<description>JEM Quick Icon</description>

<files>
Expand Down
2 changes: 1 addition & 1 deletion plugins/plg_search_jem/jem.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<creationDate>August 2019</creationDate>
<copyright>copyright (C) 2013-2019 joomlaeventmanager.net</copyright>
<license>https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
<version>2.3.0-beta2</version>
<version>2.3.0-beta3</version>
<description>PLG_SEARCH_JEM_XML_DESCRIPTION</description>

<files>
Expand Down
6 changes: 6 additions & 0 deletions site/language/en-GB/en-GB.com_jem.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -610,6 +610,12 @@ COM_JEM_VENUE_COPY_VENUE="Copy venue"
COM_JEM_VENUE_COPY_COORDINATES="Copy coordinates"
COM_JEM_EDITEVENT_EXTENDED_TAB="Extended"
COM_JEM_EDITEVENT_PUBLISH_TAB="Publishing"
COM_JEM_EDITVENUE_EXTENDED_TAB="Extended"
COM_JEM_EDITVENUE_PUBLISH_TAB="Publishing"
COM_JEM_EDITVENUE_IMAGE_LEGEND="Image"
COM_JEM_EDITVENUE_URL_LEGEND="URL"
COM_JEM_EDITVENUE_PUBLISHING_LEGEND="Publishing"
COM_JEM_EDITVENUE_DESCRIPTION_LEGEND="Description"


; ERRORS
Expand Down
2 changes: 1 addition & 1 deletion site/models/forms/venue.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
/>
<field name="locdescription" type="editor"
filter="safehtml"
hide="pagebreak,readmore,image"
hide="pagebreak"
class="inputbox"
rows="3" cols="20"
width="100%"
Expand Down
1 change: 0 additions & 1 deletion site/views/attendees/tmpl/responsive/print.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@
<tr class="<?php echo "row$k"; ?>">
<td><?php echo ++$i; ?></td>
<td><?php echo $regname ? $row->name : $row->username; ?></td>
<td><?php if (!empty($row->uregdate)) { echo JHtml::_('date', $row->uregdate, JText::_('DATE_FORMAT_LC2')); } ?></td>
<?php if ($this->enableemailaddress == 1) : ?>
<td><?php echo $row->email; ?></td>
<?php endif; ?>
Expand Down
Loading

0 comments on commit 4f4021d

Please sign in to comment.