Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[10619] XoopsModules/extcal/trunk/modules/extcal
|
From: <be...@us...> - 2013-01-01 18:19:39
|
Revision: 10619
http://sourceforge.net/p/xoops/svn/10619
Author: beckmi
Date: 2013-01-01 18:19:34 +0000 (Tue, 01 Jan 2013)
Log Message:
-----------
Updating to RC3 (see changelog.txt)
Modified Paths:
--------------
XoopsModules/extcal/trunk/modules/extcal/admin/index.php
XoopsModules/extcal/trunk/modules/extcal/class/event.php
XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt
XoopsModules/extcal/trunk/modules/extcal/language/english/admin.php
XoopsModules/extcal/trunk/modules/extcal/language/english/main.php
XoopsModules/extcal/trunk/modules/extcal/post.php
XoopsModules/extcal/trunk/modules/extcal/print.php
XoopsModules/extcal/trunk/modules/extcal/templates/extcal_view_search.html
XoopsModules/extcal/trunk/modules/extcal/xoops_version.php
Modified: XoopsModules/extcal/trunk/modules/extcal/admin/index.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/admin/index.php 2013-01-01 14:16:08 UTC (rev 10618)
+++ XoopsModules/extcal/trunk/modules/extcal/admin/index.php 2013-01-01 18:19:34 UTC (rev 10619)
@@ -1,222 +1,222 @@
-<?php
-
-include '../../../include/cp_header.php';
-include '../../../class/xoopsformloader.php';
-include 'admin_header.php';
-
-function extgalleryLastVersion()
-{
- //return @file_get_contents("http://www.zoullou.net/extcal.version"); //the Website is not longer working
-}
-
-function isUpToDate()
-{
- $version = extgalleryLastVersion();
- return $GLOBALS['xoopsModule']->getVar('version') >= $version;
-}
-
-if (isset($_GET['op'])) {
- $op = $_GET['op'];
-} else {
- if (isset($_POST['op'])) {
- $op = $_POST['op'];
- } else {
- $op = 'default';
- }
-}
-if (isset($_GET['fct'])) {
- $fct = $_GET['fct'];
-} else {
- $fct = 'default';
-}
-
-switch ($op) {
-
- case 'notification':
-
- switch ($fct) {
-
- case 'send':
-
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header(
- 'index.php', 3, _NOPERM . "<br />"
- . implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())
- );
- exit;
- }
- xoops_cp_header();
- adminMenu(1);
-
- $myts =& MyTextSanitizer::getInstance();
- $xoopsMailer =& getMailer();
- $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
- $eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
- $eventMemberHandler = xoops_getmodulehandler(_EXTCAL_CLS_MEMBER, _EXTCAL_MODULE);
- $extcalTime = ExtcalTime::getHandler();
- $extcalConfig =& ExtcalConfig::getHandler();
- $xoopsModuleConfig = $extcalConfig->getModuleConfig();
-
- $event = $eventHandler->getEvent($_POST['event_id'], $xoopsUser, true);
- $cat = $catHandler->getCat($event->getVar('cat_id'), $xoopsUser, 'all');
-
- $xoopsMailer->setToUsers($eventMemberHandler->getMembers($_POST['event_id']));
- $xoopsMailer->setFromName($myts->oopsStripSlashesGPC($_POST['mail_fromname']));
- $xoopsMailer->setFromEmail($myts->oopsStripSlashesGPC($_POST['mail_fromemail']));
- $xoopsMailer->setSubject($myts->oopsStripSlashesGPC($_POST['mail_subject']));
- $xoopsMailer->setBody($myts->oopsStripSlashesGPC($_POST['mail_body']));
- if (in_array("mail", $_POST['mail_send_to'])) {
- $xoopsMailer->useMail();
- }
- if (in_array("pm", $_POST['mail_send_to'])
- && empty($_POST['mail_inactive'])
- ) {
- $xoopsMailer->usePM();
- }
- $tag = array(
- 'EV_CAT' => $cat->getVar('cat_name'), 'EV_TITLE' => $event->getVar('event_title'), 'EV_START' => $extcalTime->getFormatedDate($xoopsModuleConfig['date_long'], $event->getVar('event_start')), 'EV_END' => $extcalTime->getFormatedDate($xoopsModuleConfig['date_long'], $event->getVar('event_end')), 'EV_LINK'
- => XOOPS_URL . '/modules/extcal/event.php?event='
- . $event->getVar('event_id')
- );
- $xoopsMailer->assign($tag);
- $xoopsMailer->send(true);
- echo $xoopsMailer->getSuccess();
- echo $xoopsMailer->getErrors();
-
- xoops_cp_footer();
-
- break;
-
- case 'default':
- default:
-
- xoops_cp_header();
-
- $fromemail = !empty($xoopsConfig['adminmail'])
- ? $xoopsConfig['adminmail']
- : $xoopsUser->getVar("email", "E");
- $subjectCaption = _AM_EXTCAL_SUBJECT
- . "<br /><br /><span style='font-size:x-small;font-weight:bold;'>"
- . _AM_EXTCAL_USEFUL_TAGS
- . "</span><br /><span style='font-size:x-small;font-weight:normal;'>"
- . _AM_EXTCAL_MAILTAGS6 . "<br />" . _AM_EXTCAL_MAILTAGS2
- . "</span> ";
- $bodyCaption = _AM_EXTCAL_BODY
- . "<br /><br /><span style='font-size:x-small;font-weight:bold;'>"
- . _AM_EXTCAL_USEFUL_TAGS
- . "</span><br /><span style='font-size:x-small;font-weight:normal;'>"
- . _AM_EXTCAL_MAILTAGS1 . "<br />" . _AM_EXTCAL_MAILTAGS2
- . "<br />" . _AM_EXTCAL_MAILTAGS3 . "<br />"
- . _AM_EXTCAL_MAILTAGS4 . "<br />" . _AM_EXTCAL_MAILTAGS5
- . "<br />" . _AM_EXTCAL_MAILTAGS6 . "<br />"
- . _AM_EXTCAL_MAILTAGS7 . "<br />" . _AM_EXTCAL_MAILTAGS8
- . "<br />" . _AM_EXTCAL_MAILTAGS9
- . "</span> ";
- $toCheckBbox = new XoopsFormCheckBox(_AM_EXTCAL_SEND_TO, "mail_send_to", "mail");
- $toCheckBox->addOption("mail", _AM_EXTCAL_EMAIL);
- $toCheckBox->addOption("pm", _AM_EXTCAL_PM);
-
- echo
- '<fieldset><legend style="font-weight:bold; color:#990000;">'
- . _AM_EXTCAL_APPROVED_EVENT . '</legend>';
- echo
- '<fieldset><legend style="font-weight:bold; color:#0A3760;">'
- . _AM_EXTCAL_INFORMATION . '</legend>';
- echo _AM_EXTCAL_INFO_SEND_NOTIF;
- echo '</fieldset><br />';
- $form = new XoopsThemeForm(_AM_EXTCAL_SEND_NOTIFICATION, "mailusers", "index.php?op=notification&fct=send", 'post', true);
- $form->addElement(new XoopsFormText(_AM_EXTCAL_FROM_NAME, "mail_fromname", 30, 255, $xoopsConfig['sitename']), true);
- $form->addElement(new XoopsFormText(_AM_EXTCAL_FROM_EMAIL, "mail_fromemail", 30, 255, $fromemail), true);
- $form->addElement(new XoopsFormText($subjectCaption, "mail_subject", 50, 255, _AM_EXTCAL_SEND_NOTIFICATION_SUBJECT), true);
- $form->addElement(new XoopsFormTextArea($bodyCaption, "mail_body", _AM_EXTCAL_SEND_NOTIFICATION_BODY, 10), true);
- $form->addElement($toCheckBox, true);
- $form->addElement(new XoopsFormHidden('event_id', $_GET['event_id']), false);
- $form->addElement(new XoopsFormButton("", "mail_submit", _SEND, "submit"));
- $form->display();
- echo '</fieldset>';
-
- xoops_cp_footer();
-
- break;
-
- }
-
- break;
-
- default:
- case 'default':
- // @author Gregory Mage (Aka Mage)
- //***************************************************************************************
- xoops_cp_header();
-// include_once XOOPS_ROOT_PATH . "/modules/extcal/class/admin.php";
- $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
- $eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
- $indexAdmin = new ModuleAdmin();
- $indexAdmin->addInfoBox(_MI_EXTCAL_DASHBOARD);
- $indexAdmin->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, "<infolabel>" ._AM_EXTCAL_INDEX_CATEGORIES. "</infolabel>", $catHandler->getCount(), 'Green');
- $indexAdmin->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, "<infolabel>" ._AM_EXTCAL_INDEX_EVENT. "</infolabel>", $eventHandler->getCount(new Criteria('event_approved', 1)), 'Green');
- $indexAdmin->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, "<infolabel>" ._AM_EXTCAL_INDEX_PENDING. "</infolabel>", $eventHandler->getCount(new Criteria('event_approved', 0)),'Red');
- $criteriaCompo = new CriteriaCompo();
- $criteriaCompo->add(new Criteria('event_approved', 1));
- $criteriaCompo->add(new Criteria('event_start', time(), '>='));
- $indexAdmin->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, "<infolabel>" ._AM_EXTCAL_INDEX_APPROVED."</infolabel><infotext>", $eventHandler->getCount($criteriaCompo)."</infotext>",'Red');
-
- $indexAdmin->addConfigBoxLine();
- $indexAdmin->addConfigBoxLine(_AM_EXTCAL_PEAR_PATH);
- $indexAdmin->addConfigBoxLine(_EXTCAL_PEAR_ROOT,'folder');
-
-//JJD
-// $indexAdmin->addConfigBoxLine(XOOPS_ROOT_PATH,'folder');
-
-// $indexAdmin->addLineConfigLabel(_AM_EXTCAL_CONFIG_PHP, $xoopsModule->getInfo("min_php"), 'php');
-// $indexAdmin->addLineConfigLabel(_AM_EXTCAL_CONFIG_XOOPS, $xoopsModule->getInfo("min_xoops"), 'xoops');
- echo $indexAdmin->addNavigation('index.php');
- echo $indexAdmin->renderIndex();
- //***************************************************************************************
- $pendingEvent = $eventHandler->objectToArray($eventHandler->getPendingEvent(), array('cat_id'));
- $eventHandler->formatEventsDate($pendingEvent, 'd/m/Y');
-
- echo'<fieldset><legend style="font-weight:bold; color:#990000;">'
- . _AM_EXTCAL_PENDING_EVENT . '</legend>';
- echo'<fieldset><legend style="font-weight:bold; color:#0A3760;">'
- . _AM_EXTCAL_INFORMATION . '</legend>';
-// echo '<img src="../images/icons/on.png" /> '._AM_EXTCAL_INFO_APPROVE_PENDING_EVENT.'<br />';
- echo'<img src='. $pathIcon16.'/edit.png /> '. _AM_EXTCAL_INFO_EDIT_PENDING_EVENT . '<br />';
- echo'<img src='. $pathIcon16.'/delete.png /> ' . _AM_EXTCAL_INFO_DELETE_PENDING_EVENT . '<br />';
- echo '</fieldset><br />';
-
- echo '<table class="outer" style="width:100%;">';
- echo '<tr style="text-align:center;">';
- echo '<th>' . _AM_EXTCAL_CATEGORY . '</th>';
- echo '<th>' . _AM_EXTCAL_TITLE . '</th>';
- echo '<th>' . _AM_EXTCAL_START_DATE . '</th>';
- echo '<th>' . _AM_EXTCAL_ACTION . '</th>';
- echo '</tr>';
-
- if (count($pendingEvent) > 0) {
- $i = 0;
- foreach (
- $pendingEvent as $event
- ) {
- $class = ($i++ % 2 == 0) ? 'even' : 'odd';
- echo '<tr style="text-align:center;" class="' . $class . '">';
- echo '<td>' . $event['cat']['cat_name'] . '</td>';
- echo '<td>' . $event['event_title'] . '</td>';
- echo '<td>' . $event['formated_event_start'] . '</td>';
- echo '<td style="width:10%; text-align:center;">';
- echo'<a href="event.php?op=modify&event_id='. $event['event_id'] . '"><img src='. $pathIcon16.'/edit.png /></a> ';
- echo'<a href="event.php?op=delete&event_id='. $event['event_id'] . '"><img src='. $pathIcon16.'/delete.png /></a>';
- echo '</td>';
- echo '</tr>';
- }
- } else {
- echo '<tr><td colspan="4">' . _AM_EXTCAL_NO_PENDING_EVENT . '</td></tr>';
- }
-
- echo '</table></fieldset><br />';
-
- include 'admin_footer.php';
-
- break;
-}
-
+<?php
+
+include '../../../include/cp_header.php';
+include '../../../class/xoopsformloader.php';
+include 'admin_header.php';
+
+function extgalleryLastVersion()
+{
+ //return @file_get_contents("http://www.zoullou.net/extcal.version"); //the Website is not longer working
+}
+
+function isUpToDate()
+{
+ $version = extgalleryLastVersion();
+ return $GLOBALS['xoopsModule']->getVar('version') >= $version;
+}
+
+if (isset($_GET['op'])) {
+ $op = $_GET['op'];
+} else {
+ if (isset($_POST['op'])) {
+ $op = $_POST['op'];
+ } else {
+ $op = 'default';
+ }
+}
+if (isset($_GET['fct'])) {
+ $fct = $_GET['fct'];
+} else {
+ $fct = 'default';
+}
+
+switch ($op) {
+
+ case 'notification':
+
+ switch ($fct) {
+
+ case 'send':
+
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header(
+ 'index.php', 3, _NOPERM . "<br />"
+ . implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())
+ );
+ exit;
+ }
+ xoops_cp_header();
+ adminMenu(1);
+
+ $myts =& MyTextSanitizer::getInstance();
+ $xoopsMailer =& getMailer();
+ $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
+ $eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
+ $eventMemberHandler = xoops_getmodulehandler(_EXTCAL_CLS_MEMBER, _EXTCAL_MODULE);
+ $extcalTime = ExtcalTime::getHandler();
+ $extcalConfig =& ExtcalConfig::getHandler();
+ $xoopsModuleConfig = $extcalConfig->getModuleConfig();
+
+ $event = $eventHandler->getEvent($_POST['event_id'], $xoopsUser, true);
+ $cat = $catHandler->getCat($event->getVar('cat_id'), $xoopsUser, 'all');
+
+ $xoopsMailer->setToUsers($eventMemberHandler->getMembers($_POST['event_id']));
+ $xoopsMailer->setFromName($myts->oopsStripSlashesGPC($_POST['mail_fromname']));
+ $xoopsMailer->setFromEmail($myts->oopsStripSlashesGPC($_POST['mail_fromemail']));
+ $xoopsMailer->setSubject($myts->oopsStripSlashesGPC($_POST['mail_subject']));
+ $xoopsMailer->setBody($myts->oopsStripSlashesGPC($_POST['mail_body']));
+ if (in_array("mail", $_POST['mail_send_to'])) {
+ $xoopsMailer->useMail();
+ }
+ if (in_array("pm", $_POST['mail_send_to'])
+ && empty($_POST['mail_inactive'])
+ ) {
+ $xoopsMailer->usePM();
+ }
+ $tag = array(
+ 'EV_CAT' => $cat->getVar('cat_name'), 'EV_TITLE' => $event->getVar('event_title'), 'EV_START' => $extcalTime->getFormatedDate($xoopsModuleConfig['date_long'], $event->getVar('event_start')), 'EV_END' => $extcalTime->getFormatedDate($xoopsModuleConfig['date_long'], $event->getVar('event_end')), 'EV_LINK'
+ => XOOPS_URL . '/modules/extcal/event.php?event='
+ . $event->getVar('event_id')
+ );
+ $xoopsMailer->assign($tag);
+ $xoopsMailer->send(true);
+ echo $xoopsMailer->getSuccess();
+ echo $xoopsMailer->getErrors();
+
+ xoops_cp_footer();
+
+ break;
+
+ case 'default':
+ default:
+
+ xoops_cp_header();
+
+ $fromemail = !empty($xoopsConfig['adminmail'])
+ ? $xoopsConfig['adminmail']
+ : $xoopsUser->getVar("email", "E");
+ $subjectCaption = _AM_EXTCAL_SUBJECT
+ . "<br /><br /><span style='font-size:x-small;font-weight:bold;'>"
+ . _AM_EXTCAL_USEFUL_TAGS
+ . "</span><br /><span style='font-size:x-small;font-weight:normal;'>"
+ . _AM_EXTCAL_MAILTAGS6 . "<br />" . _AM_EXTCAL_MAILTAGS2
+ . "</span> ";
+ $bodyCaption = _AM_EXTCAL_BODY
+ . "<br /><br /><span style='font-size:x-small;font-weight:bold;'>"
+ . _AM_EXTCAL_USEFUL_TAGS
+ . "</span><br /><span style='font-size:x-small;font-weight:normal;'>"
+ . _AM_EXTCAL_MAILTAGS1 . "<br />" . _AM_EXTCAL_MAILTAGS2
+ . "<br />" . _AM_EXTCAL_MAILTAGS3 . "<br />"
+ . _AM_EXTCAL_MAILTAGS4 . "<br />" . _AM_EXTCAL_MAILTAGS5
+ . "<br />" . _AM_EXTCAL_MAILTAGS6 . "<br />"
+ . _AM_EXTCAL_MAILTAGS7 . "<br />" . _AM_EXTCAL_MAILTAGS8
+ . "<br />" . _AM_EXTCAL_MAILTAGS9
+ . "</span> ";
+ $toCheckBbox = new XoopsFormCheckBox(_AM_EXTCAL_SEND_TO, "mail_send_to", "mail");
+ $toCheckBox->addOption("mail", _AM_EXTCAL_EMAIL);
+ $toCheckBox->addOption("pm", _AM_EXTCAL_PM);
+
+ echo
+ '<fieldset><legend style="font-weight:bold; color:#990000;">'
+ . _AM_EXTCAL_APPROVED_EVENT . '</legend>';
+ echo
+ '<fieldset><legend style="font-weight:bold; color:#0A3760;">'
+ . _AM_EXTCAL_INFORMATION . '</legend>';
+ echo _AM_EXTCAL_INFO_SEND_NOTIF;
+ echo '</fieldset><br />';
+ $form = new XoopsThemeForm(_AM_EXTCAL_SEND_NOTIFICATION, "mailusers", "index.php?op=notification&fct=send", 'post', true);
+ $form->addElement(new XoopsFormText(_AM_EXTCAL_FROM_NAME, "mail_fromname", 30, 255, $xoopsConfig['sitename']), true);
+ $form->addElement(new XoopsFormText(_AM_EXTCAL_FROM_EMAIL, "mail_fromemail", 30, 255, $fromemail), true);
+ $form->addElement(new XoopsFormText($subjectCaption, "mail_subject", 50, 255, _AM_EXTCAL_SEND_NOTIFICATION_SUBJECT), true);
+ $form->addElement(new XoopsFormTextArea($bodyCaption, "mail_body", _AM_EXTCAL_SEND_NOTIFICATION_BODY, 10), true);
+ $form->addElement($toCheckBox, true);
+ $form->addElement(new XoopsFormHidden('event_id', $_GET['event_id']), false);
+ $form->addElement(new XoopsFormButton("", "mail_submit", _SEND, "submit"));
+ $form->display();
+ echo '</fieldset>';
+
+ xoops_cp_footer();
+
+ break;
+
+ }
+
+ break;
+
+ default:
+ case 'default':
+ // @author Gregory Mage (Aka Mage)
+ //***************************************************************************************
+ xoops_cp_header();
+// include_once XOOPS_ROOT_PATH . "/modules/extcal/class/admin.php";
+ $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
+ $eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
+ $indexAdmin = new ModuleAdmin();
+ $indexAdmin->addInfoBox(_MI_EXTCAL_DASHBOARD);
+ $indexAdmin->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, "<infolabel>" ._AM_EXTCAL_INDEX_CATEGORIES. "</infolabel>", $catHandler->getCount(), 'Green');
+ $indexAdmin->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, "<infolabel>" ._AM_EXTCAL_INDEX_EVENT. "</infolabel>", $eventHandler->getCount(new Criteria('event_approved', 1)), 'Green');
+ $indexAdmin->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, "<infolabel>" ._AM_EXTCAL_INDEX_PENDING. "</infolabel>", $eventHandler->getCount(new Criteria('event_approved', 0)),'Red');
+ $criteriaCompo = new CriteriaCompo();
+ $criteriaCompo->add(new Criteria('event_approved', 1));
+ $criteriaCompo->add(new Criteria('event_start', time(), '>='));
+ $indexAdmin->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, "<infolabel>" ._AM_EXTCAL_INDEX_APPROVED."</infolabel><infotext>", $eventHandler->getCount($criteriaCompo)."</infotext>",'Green');
+
+ $indexAdmin->addConfigBoxLine();
+ $indexAdmin->addConfigBoxLine(_AM_EXTCAL_PEAR_PATH);
+ $indexAdmin->addConfigBoxLine(_EXTCAL_PEAR_ROOT,'folder');
+
+//JJD
+// $indexAdmin->addConfigBoxLine(XOOPS_ROOT_PATH,'folder');
+
+// $indexAdmin->addLineConfigLabel(_AM_EXTCAL_CONFIG_PHP, $xoopsModule->getInfo("min_php"), 'php');
+// $indexAdmin->addLineConfigLabel(_AM_EXTCAL_CONFIG_XOOPS, $xoopsModule->getInfo("min_xoops"), 'xoops');
+ echo $indexAdmin->addNavigation('index.php');
+ echo $indexAdmin->renderIndex();
+ //***************************************************************************************
+ $pendingEvent = $eventHandler->objectToArray($eventHandler->getPendingEvent(), array('cat_id'));
+ $eventHandler->formatEventsDate($pendingEvent, 'd/m/Y');
+
+ echo'<fieldset><legend style="font-weight:bold; color:#990000;">'
+ . _AM_EXTCAL_PENDING_EVENT . '</legend>';
+ echo'<fieldset><legend style="font-weight:bold; color:#0A3760;">'
+ . _AM_EXTCAL_INFORMATION . '</legend>';
+// echo '<img src="../images/icons/on.png" /> '._AM_EXTCAL_INFO_APPROVE_PENDING_EVENT.'<br />';
+ echo'<img src='. $pathIcon16.'/edit.png /> '. _AM_EXTCAL_INFO_EDIT_PENDING_EVENT . '<br />';
+ echo'<img src='. $pathIcon16.'/delete.png /> ' . _AM_EXTCAL_INFO_DELETE_PENDING_EVENT . '<br />';
+ echo '</fieldset><br />';
+
+ echo '<table class="outer" style="width:100%;">';
+ echo '<tr style="text-align:center;">';
+ echo '<th>' . _AM_EXTCAL_CATEGORY . '</th>';
+ echo '<th>' . _AM_EXTCAL_TITLE . '</th>';
+ echo '<th>' . _AM_EXTCAL_START_DATE . '</th>';
+ echo '<th>' . _AM_EXTCAL_ACTION . '</th>';
+ echo '</tr>';
+
+ if (count($pendingEvent) > 0) {
+ $i = 0;
+ foreach (
+ $pendingEvent as $event
+ ) {
+ $class = ($i++ % 2 == 0) ? 'even' : 'odd';
+ echo '<tr style="text-align:center;" class="' . $class . '">';
+ echo '<td>' . $event['cat']['cat_name'] . '</td>';
+ echo '<td>' . $event['event_title'] . '</td>';
+ echo '<td>' . $event['formated_event_start'] . '</td>';
+ echo '<td style="width:10%; text-align:center;">';
+ echo'<a href="event.php?op=modify&event_id='. $event['event_id'] . '"><img src='. $pathIcon16.'/edit.png /></a> ';
+ echo'<a href="event.php?op=delete&event_id='. $event['event_id'] . '"><img src='. $pathIcon16.'/delete.png /></a>';
+ echo '</td>';
+ echo '</tr>';
+ }
+ } else {
+ echo '<tr><td colspan="4">' . _AM_EXTCAL_NO_PENDING_EVENT . '</td></tr>';
+ }
+
+ echo '</table></fieldset><br />';
+
+ include 'admin_footer.php';
+
+ break;
+}
+
Modified: XoopsModules/extcal/trunk/modules/extcal/class/event.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/event.php 2013-01-01 14:16:08 UTC (rev 10618)
+++ XoopsModules/extcal/trunk/modules/extcal/class/event.php 2013-01-01 18:19:34 UTC (rev 10619)
@@ -796,6 +796,7 @@
{
$catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
$fileHandler = xoops_getmodulehandler(_EXTCAL_CLS_FILE, _EXTCAL_MODULE);
+
/***************************************************/
include_once XOOPS_ROOT_PATH . "/modules/extcal/class/etablissement.php";
if ($siteSide == 'admin') {
@@ -1574,6 +1575,7 @@
$ts = mktime(0, 0, 0, $month, 1, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==0) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 0) {
$dayOfWeek++;
@@ -1587,6 +1589,7 @@
$ts = mktime(0, 0, 0, $month, 1, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==1) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 1) {
$dayOfWeek++;
@@ -1600,6 +1603,7 @@
$ts = mktime(0, 0, 0, $month, 1, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==2) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 2) {
$dayOfWeek++;
@@ -1613,6 +1617,7 @@
$ts = mktime(0, 0, 0, $month, 1, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==3) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 3) {
$dayOfWeek++;
@@ -1626,6 +1631,7 @@
$ts = mktime(0, 0, 0, $month, 1, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==4) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 4) {
$dayOfWeek++;
@@ -1639,6 +1645,7 @@
$ts = mktime(0, 0, 0, $month, 1, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==5) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 5) {
$dayOfWeek++;
@@ -1652,6 +1659,7 @@
$ts = mktime(0, 0, 0, $month, 1, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==6) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 6) {
$dayOfWeek++;
@@ -1665,6 +1673,7 @@
$ts = mktime(0, 0, 0, $month, 7, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==0) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 0) {
$dayOfWeek++;
@@ -1678,6 +1687,7 @@
$ts = mktime(0, 0, 0, $month, 7, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==1) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 1) {
$dayOfWeek++;
@@ -1691,6 +1701,7 @@
$ts = mktime(0, 0, 0, $month, 7, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==2) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 2) {
$dayOfWeek++;
@@ -1704,6 +1715,7 @@
$ts = mktime(0, 0, 0, $month, 7, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==3) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 3) {
$dayOfWeek++;
@@ -1717,6 +1729,7 @@
$ts = mktime(0, 0, 0, $month, 7, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==4) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 4) {
$dayOfWeek++;
@@ -1730,6 +1743,7 @@
$ts = mktime(0, 0, 0, $month, 7, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==5) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 5) {
$dayOfWeek++;
@@ -1743,6 +1757,7 @@
$ts = mktime(0, 0, 0, $month, 7, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==6) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 6) {
$dayOfWeek++;
@@ -1756,6 +1771,7 @@
$ts = mktime(0, 0, 0, $month, 14, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==0) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 0) {
$dayOfWeek++;
@@ -1769,6 +1785,7 @@
$ts = mktime(0, 0, 0, $month, 14, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==1) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 1) {
$dayOfWeek++;
@@ -1782,6 +1799,7 @@
$ts = mktime(0, 0, 0, $month, 14, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==2) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 2) {
$dayOfWeek++;
@@ -1795,6 +1813,7 @@
$ts = mktime(0, 0, 0, $month, 14, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==3) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 3) {
$dayOfWeek++;
@@ -1807,7 +1826,8 @@
case '3TH':
$ts = mktime(0, 0, 0, $month, 14, $year);
- $dayOfWeek = date('w', $ts);
+ $dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==4) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 4) {
$dayOfWeek++;
@@ -1821,6 +1841,7 @@
$ts = mktime(0, 0, 0, $month, 14, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==5) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 5) {
$dayOfWeek++;
@@ -1834,6 +1855,7 @@
$ts = mktime(0, 0, 0, $month, 14, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==6) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 6) {
$dayOfWeek++;
@@ -1847,6 +1869,7 @@
$ts = mktime(0, 0, 0, $month, 21, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==0) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 0) {
$dayOfWeek++;
@@ -1860,6 +1883,7 @@
$ts = mktime(0, 0, 0, $month, 21, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==1) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 1) {
$dayOfWeek++;
@@ -1873,6 +1897,7 @@
$ts = mktime(0, 0, 0, $month, 21, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==2) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 2) {
$dayOfWeek++;
@@ -1886,6 +1911,7 @@
$ts = mktime(0, 0, 0, $month, 21, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==3) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 3) {
$dayOfWeek++;
@@ -1899,6 +1925,7 @@
$ts = mktime(0, 0, 0, $month, 21, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==4) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 4) {
$dayOfWeek++;
@@ -1912,6 +1939,7 @@
$ts = mktime(0, 0, 0, $month, 21, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==5) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 5) {
$dayOfWeek++;
@@ -1925,6 +1953,7 @@
$ts = mktime(0, 0, 0, $month, 21, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==6) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 6) {
$dayOfWeek++;
Modified: XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt 2013-01-01 14:16:08 UTC (rev 10618)
+++ XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt 2013-01-01 18:19:34 UTC (rev 10619)
@@ -1,5 +1,13 @@
-2012/04/02: Version 2.37 RC2
+2013/01/01: Version 2.37 RC3
===================================
+- fixed: bug in setting recurring events for a x-day of the month, when 1st of the month is on the following day of the week.
+ E.g. if you select 3rd Thursday, and the first day of the month is on Friday, extCal would set the event on the 2nd Thursday
+- fixed: added location info in Print, if not empty (sabahan/mamba)
+- fixed: if not auto-approved, event is set as pending (sabahan/mamba)
+- fixed: redirect after updating or creating an event (sabahan/mamba)
+
+2012/12/22: Version 2.37 RC2
+===================================
- fixed: attachment bug (JammerPro/mamba)
- fixed: past events not being visible consistently, when selected by user in Preferences (mamba)
- fixed: displaying the correct week in Week view when the first day of the week is Monday (mamba)
Modified: XoopsModules/extcal/trunk/modules/extcal/language/english/admin.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/language/english/admin.php 2013-01-01 14:16:08 UTC (rev 10618)
+++ XoopsModules/extcal/trunk/modules/extcal/language/english/admin.php 2013-01-01 18:19:34 UTC (rev 10619)
@@ -76,7 +76,7 @@
define('_AM_EXTCAL_ICONE_CLONE',"Clone");
define('_AM_EXTCAL_ICONE_DELETE',"Delete");
define('_AM_EXTCAL_ICONE_EDIT',"Edit");
-define('_AM_EXTCAL_INDEX_APPROVED',"Events for approval: %s");
+define('_AM_EXTCAL_INDEX_APPROVED',"Approved future events: %s");
define('_AM_EXTCAL_INDEX_CATEGORIES',"Number of categories: %s");
define('_AM_EXTCAL_INDEX_EVENT',"Number of Events in DB: %s");
define('_AM_EXTCAL_INDEX_PENDING',"Pending events: %s");
Modified: XoopsModules/extcal/trunk/modules/extcal/language/english/main.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/language/english/main.php 2013-01-01 14:16:08 UTC (rev 10618)
+++ XoopsModules/extcal/trunk/modules/extcal/language/english/main.php 2013-01-01 18:19:34 UTC (rev 10619)
@@ -87,9 +87,9 @@
define('_MD_EXTCAL_ETABLISSEMENT_MAP2','View Map');
define('_MD_EXTCAL_ETABLISSEMENT_NOM','Name');
define('_MD_EXTCAL_ETABLISSEMENT_ORGANISATEUR','Organizer');
-define('_MD_EXTCAL_ETABLISSEMENT_PRICE','Price');
+define('_MD_EXTCAL_ETABLISSEMENT_PRICE','Price: ');
define('_MD_EXTCAL_ETABLISSEMENT_SITE','Website');
-define('_MD_EXTCAL_ETABLISSEMENT_TARIFS','Price');
+define('_MD_EXTCAL_ETABLISSEMENT_TARIFS','Price:');
define('_MD_EXTCAL_ETABLISSEMENT_TEL_FIXE','Phone number');
define('_MD_EXTCAL_ETABLISSEMENT_TEL_PORTABLE','Mobile Phone');
define('_MD_EXTCAL_ETABLISSEMENT_VILLE','City');
@@ -228,4 +228,6 @@
define('_MD_EXTCAL_ICONE','Icon');
define('_MD_EXTCAL_SITE',"Website");
-define('_MD_EXTCAL_VISIT_SITE',"Visit the Website");
\ No newline at end of file
+define('_MD_EXTCAL_VISIT_SITE',"Visit the Website");
+
+define('_MD_EXTCAL_EVENT_UPDATED','Event Updated');
\ No newline at end of file
Modified: XoopsModules/extcal/trunk/modules/extcal/post.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/post.php 2013-01-01 14:16:08 UTC (rev 10618)
+++ XoopsModules/extcal/trunk/modules/extcal/post.php 2013-01-01 18:19:34 UTC (rev 10619)
@@ -1,164 +1,166 @@
-<?php
-
-include '../../mainfile.php';
-$GLOBALS['xoopsOption']['template_main'] = 'extcal_post.html';
-
-include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-include 'class/form/extcalform.php';
-include 'class/perm.php';
-
-include_once XOOPS_ROOT_PATH . '/modules/extcal/include/functions.php';
-include_once XOOPS_ROOT_PATH . '/modules/extcal/include/constantes.php';
-
-$permHandler = ExtcalPerm::getHandler();
-$xoopsUser = $xoopsUser ? $xoopsUser : null;
-
-if (!$permHandler->isAllowed($xoopsUser, 'extcal_cat_submit', intval($_POST['cat_id']))) {
- redirect_header("index.php", 3);
- exit;
-}
-
-// Getting eXtCal object's handler
-$eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
-
-if (isset($_POST['form_preview'])) {
-
- include XOOPS_ROOT_PATH . '/header.php';
-
- // Title of the page
- $xoopsTpl->assign('xoops_pagetitle', _MI_EXTCAL_SUBMIT_EVENT);
-
- $data = array(
- 'event_title' => $_POST['event_title'],
- 'cat_id' => intval($_POST['cat_id']),
- 'event_desc' => $_POST['event_desc'],
- 'event_nbmember' => intval($_POST['event_nbmember']),
- 'event_contact' => $_POST['event_contact'],
- 'event_url' => $_POST['event_url'],
- 'event_email' => $_POST['event_email'],
- 'event_address' => $_POST['event_address'],
- 'event_approved' => 1,
- 'event_start' => $_POST['event_start'],
- 'have_end' => $_POST['have_end'],
- 'event_end' => $_POST['event_end'],
- 'dohtml' => intval($xoopsModuleConfig['allow_html']),
- 'event_price' => $_POST['event_price'],
- 'event_organisateur' => $_POST['event_organisateur'],
- 'event_icone' => $_POST['event_icone']
- );
-
- if (isset($_POST['event_id'])) {
- $data['event_id'] = intval($_POST['event_id']);
- }
-
- // Creating tempory event object to apply Object data filtering
- $event = $eventHandler->createEventForPreview($data);
- $event = $eventHandler->objectToArray($event, array('cat_id'), 'p');
-
- // Adding formated date for start and end event
- $eventHandler->formatEventDate($event, $xoopsModuleConfig['event_date_event']);
-
- // Assigning event to the template
- $xoopsTpl->assign('event', $event);
-
-// $lang = array(
-// 'start' => _MD_EXTCAL_START, 'end' => _MD_EXTCAL_END, 'contact_info' => _MD_EXTCAL_CONTACT_INFO, 'email' => _MD_EXTCAL_EMAIL, 'url' => _MD_EXTCAL_URL, 'whos_going' => _MD_EXTCAL_WHOS_GOING, 'whosnot_going' => _MD_EXTCAL_WHOSNOT_GOING
-// );
-// // Assigning language data to the template
-// $xoopsTpl->assign('lang', $lang);
-
- $event['cat_id'] = intval($_POST['cat_id']);
- $event['have_end'] = $_POST['have_end'];
-
- // Display the submit form
- $form = $eventHandler->getEventForm('user', 'preview', $event);
- $formBody = $form->render();
- $xoopsTpl->assign('preview', true);
- $xoopsTpl->assign('formBody', $formBody);
-
- include XOOPS_ROOT_PATH . '/footer.php';
-
-} elseif (isset($_POST['form_submit'])) {
- if (!isset($_POST['rrule_weekly_interval'])) $_POST['rrule_weekly_interval']=0;
-// ext_echoArray($_POST, '',true);
-// exit;
-// $ts = print_r($_POST,true);
-// echo "<pre>{$ts}</pre>";
- // If the date format is wrong
-// if (
-// !preg_match(_EXTCAL_MOTIF_DATE, $_POST['event_start']['date'])
-// || !preg_match(_EXTCAL_MOTIF_DATE, $_POST['event_end']['date'])
-// ) {
-// redirect_header(
-// 'index.php', 3, _MD_EXTCAL_WRONG_DATE_FORMAT . "<br />"
-// . implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())
-// );
-// exit;
-// }
- ///////////////////////////////////////////////////////////////////////////////
- extcal_loadImg($_REQUEST, $event_picture1, $event_picture2);
- ///////////////////////////////////////////////////////////////////////////////
-
- include_once XOOPS_ROOT_PATH . '/modules/extcal/class/perm.php';
-
- $fileHandler = xoops_getmodulehandler(_EXTCAL_CLS_FILE, _EXTCAL_MODULE);
- $permHandler = ExtcalPerm::getHandler();
- $approve = $permHandler->isAllowed($xoopsUser, 'extcal_cat_autoapprove', intval($_POST['cat_id']));
-
- $data = array(
- 'event_title' => $_POST['event_title'],
- 'cat_id' => $_POST['cat_id'],
- 'event_desc' => $_POST['event_desc'],
- 'event_nbmember' => $_POST['event_nbmember'],
- 'event_organisateur'=>$_POST['event_organisateur'],
- 'event_contact' => $_POST['event_contact'],
- 'event_url' => $_POST['event_url'],
- 'event_email' => $_POST['event_email'],
- 'event_address' => $_POST['event_address'],
- 'event_approved' => 1,
- 'event_start' => $_POST['event_start'],
- 'have_end' => $_POST['have_end'],
- 'event_end' => $_POST['event_end'],
- 'event_picture1'=>@$event_picture1,
- 'event_picture2'=>@$event_picture2,
- 'event_price'=>@$_POST['event_price'],
- 'event_etablissement'=>$_POST['event_etablissement'],
- 'dohtml' => $xoopsModuleConfig['allow_html'],
- 'event_icone'=>$_POST['event_icone']
-
- );
-
- if (isset($_POST['event_id'])) {
-
- $eventHandler->modifyEvent(intval($_POST['event_id']), $data);
- $fileHandler->updateEventFile(intval($_POST['event_id']));
- $fileHandler->createFile(intval($_POST['event_id']));
-
- } else {
-
- $data['event_submitter'] = ($xoopsUser) ? $xoopsUser->getVar('uid') : 0;
- $data['event_submitdate'] = time();
-
- $eventHandler->createEvent($data);
- $fileHandler->createFile($eventHandler->getInsertId());
-
- if (!$approve) {
- $notifyEvent = 'new_event_pending';
- } else {
- $notifyEvent = 'new_event';
- }
-
- $notificationHandler =& xoops_gethandler('notification');
- $notificationHandler->triggerEvent('global', 0, $notifyEvent, array('EVENT_TITLE' => $_POST['event_title']));
- if ($approve == 1) {
- $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
- $cat = $catHandler->getCat(intval($_POST['cat_id']), $xoopsUser, 'all');
- $notificationHandler->triggerEvent('cat', intval($_POST['cat_id']), 'new_event_cat', array('EVENT_TITLE' => $_POST['event_title'], 'CAT_NAME' => $cat->getVar('cat_name')));
- }
-
- }
-
- redirect_header(_EXTCAL_FILE_NEW_EVENT, 3, _MD_EXTCAL_EVENT_CREATED, false);
-
-}
-?>
+<?php
+
+include '../../mainfile.php';
+$GLOBALS['xoopsOption']['template_main'] = 'extcal_post.html';
+
+include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+include 'class/form/extcalform.php';
+include 'class/perm.php';
+
+include_once XOOPS_ROOT_PATH . '/modules/extcal/include/functions.php';
+include_once XOOPS_ROOT_PATH . '/modules/extcal/include/constantes.php';
+
+$permHandler = ExtcalPerm::getHandler();
+$xoopsUser = $xoopsUser ? $xoopsUser : null;
+
+if (!$permHandler->isAllowed($xoopsUser, 'extcal_cat_submit', intval($_POST['cat_id']))) {
+ redirect_header("index.php", 3);
+ exit;
+}
+
+// Getting eXtCal object's handler
+$eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
+
+if (isset($_POST['form_preview'])) {
+
+ include XOOPS_ROOT_PATH . '/header.php';
+
+ // Title of the page
+ $xoopsTpl->assign('xoops_pagetitle', _MI_EXTCAL_SUBMIT_EVENT);
+
+ $data = array(
+ 'event_title' => $_POST['event_title'],
+ 'cat_id' => intval($_POST['cat_id']),
+ 'event_desc' => $_POST['event_desc'],
+ 'event_nbmember' => intval($_POST['event_nbmember']),
+ 'event_contact' => $_POST['event_contact'],
+ 'event_url' => $_POST['event_url'],
+ 'event_email' => $_POST['event_email'],
+ 'event_address' => $_POST['event_address'],
+ 'event_approved' => 1,
+ 'event_start' => $_POST['event_start'],
+ 'have_end' => $_POST['have_end'],
+ 'event_end' => $_POST['event_end'],
+ 'dohtml' => intval($xoopsModuleConfig['allow_html']),
+ 'event_price' => $_POST['event_price'],
+ 'event_organisateur' => $_POST['event_organisateur'],
+ 'event_icone' => $_POST['event_icone']
+ );
+
+ if (isset($_POST['event_id'])) {
+ $data['event_id'] = intval($_POST['event_id']);
+ }
+
+ // Creating tempory event object to apply Object data filtering
+ $event = $eventHandler->createEventForPreview($data);
+ $event = $eventHandler->objectToArray($event, array('cat_id'), 'p');
+
+ // Adding formated date for start and end event
+ $eventHandler->formatEventDate($event, $xoopsModuleConfig['event_date_event']);
+
+ // Assigning event to the template
+ $xoopsTpl->assign('event', $event);
+
+// $lang = array(
+// 'start' => _MD_EXTCAL_START, 'end' => _MD_EXTCAL_END, 'contact_info' => _MD_EXTCAL_CONTACT_INFO, 'email' => _MD_EXTCAL_EMAIL, 'url' => _MD_EXTCAL_URL, 'whos_going' => _MD_EXTCAL_WHOS_GOING, 'whosnot_going' => _MD_EXTCAL_WHOSNOT_GOING
+// );
+// // Assigning language data to the template
+// $xoopsTpl->assign('lang', $lang);
+
+ $event['cat_id'] = intval($_POST['cat_id']);
+ $event['have_end'] = $_POST['have_end'];
+
+ // Display the submit form
+ $form = $eventHandler->getEventForm('user', 'preview', $event);
+ $formBody = $form->render();
+ $xoopsTpl->assign('preview', true);
+ $xoopsTpl->assign('formBody', $formBody);
+
+ include XOOPS_ROOT_PATH . '/footer.php';
+
+} elseif (isset($_POST['form_submit'])) {
+ if (!isset($_POST['rrule_weekly_interval'])) $_POST['rrule_weekly_interval']=0;
+// ext_echoArray($_POST, '',true);
+// exit;
+// $ts = print_r($_POST,true);
+// echo "<pre>{$ts}</pre>";
+ // If the date format is wrong
+// if (
+// !preg_match(_EXTCAL_MOTIF_DATE, $_POST['event_start']['date'])
+// || !preg_match(_EXTCAL_MOTIF_DATE, $_POST['event_end']['date'])
+// ) {
+// redirect_header(
+// 'index.php', 3, _MD_EXTCAL_WRONG_DATE_FORMAT . "<br />"
+// . implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())
+// );
+// exit;
+// }
+ ///////////////////////////////////////////////////////////////////////////////
+ extcal_loadImg($_REQUEST, $event_picture1, $event_picture2);
+ ///////////////////////////////////////////////////////////////////////////////
+
+ include_once XOOPS_ROOT_PATH . '/modules/extcal/class/perm.php';
+
+ $fileHandler = xoops_getmodulehandler(_EXTCAL_CLS_FILE, _EXTCAL_MODULE);
+ $permHandler = ExtcalPerm::getHandler();
+ $approve = $permHandler->isAllowed($xoopsUser, 'extcal_cat_autoapprove', intval($_POST['cat_id']));
+
+ $data = array(
+ 'event_title' => $_POST['event_title'],
+ 'cat_id' => $_POST['cat_id'],
+ 'event_desc' => $_POST['event_desc'],
+ 'event_nbmember' => $_POST['event_nbmember'],
+ 'event_organisateur'=>$_POST['event_organisateur'],
+ 'event_contact' => $_POST['event_contact'],
+ 'event_url' => $_POST['event_url'],
+ 'event_email' => $_POST['event_email'],
+ 'event_address' => $_POST['event_address'],
+ 'event_approved' => (($approve == false) ? 0 : 1),
+ 'event_start' => $_POST['event_start'],
+ 'have_end' => $_POST['have_end'],
+ 'event_end' => $_POST['event_end'],
+ 'event_picture1'=>@$event_picture1,
+ 'event_picture2'=>@$event_picture2,
+ 'event_price'=>@$_POST['event_price'],
+ 'event_etablissement'=>$_POST['event_etablissement'],
+ 'dohtml' => $xoopsModuleConfig['allow_html'],
+ 'event_icone'=>$_POST['event_icone']
+
+ );
+
+ if (isset($_POST['event_id'])) {
+
+ $eventHandler->modifyEvent(intval($_POST['event_id']), $data);
+ $fileHandler->updateEventFile(intval($_POST['event_id']));
+ $fileHandler->createFile(intval($_POST['event_id']));
+
+redirect_header('event.php?event='.$_POST['event_id'], 3, _MD_EXTCAL_EVENT_UPDATED, false);
+
+ } else {
+
+ $data['event_submitter'] = ($xoopsUser) ? $xoopsUser->getVar('uid') : 0;
+ $data['event_submitdate'] = time();
+
+ $eventHandler->createEvent($data);
+ $fileHandler->createFile($eventHandler->getInsertId());
+
+ if (!$approve) {
+ $notifyEvent = 'new_event_pending';
+ } else {
+ $notifyEvent = 'new_event';
+ }
+
+ $notificationHandler =& xoops_gethandler('notification');
+ $notificationHandler->triggerEvent('global', 0, $notifyEvent, array('EVENT_TITLE' => $_POST['event_title']));
+ if ($approve == 1) {
+ $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
+ $cat = $catHandler->getCat(intval($_POST['cat_id']), $xoopsUser, 'all');
+ $notificationHandler->triggerEvent('cat', intval($_POST['cat_id']), 'new_event_cat', array('EVENT_TITLE' => $_POST['event_title'], 'CAT_NAME' => $cat->getVar('cat_name')));
+ }
+
+ }
+
+ redirect_header(_EXTCAL_FILE_CALMONTH, 3, _MD_EXTCAL_EVENT_CREATED, false);
+
+}
+?>
Modified: XoopsModules/extcal/trunk/modules/extcal/print.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/print.php 2013-01-01 14:16:08 UTC (rev 10618)
+++ XoopsModules/extcal/trunk/modules/extcal/print.php 2013-01-01 18:19:34 UTC (rev 10619)
@@ -13,23 +13,27 @@
}
$eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
$event = $eventHandler->objectToArray($eventHandler->getEvent($eventId), array('cat_id'));
+
+//adding location
+$locationHandler = xoops_getmodulehandler('etablissement', _EXTCAL_MODULE);
+if ($event['event_etablissement'] > 0) {
+ $location = $locationHandler->objectToArray($locationHandler->getEtablissement($event['event_etablissement'], true));
+}
+
// Adding formated date for start and end event
$eventHandler->formatEventDate($event, $xoopsModuleConfig['event_date_event']);
echo
'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'
- . "\n";
+ . "\n";
echo '<html xmlns="http://www.w3.org/1999/xhtml">' . "\n";
echo '<head>' . "\n";
-echo'<meta http-equiv="content-type" content="text/html; charset=' . _CHARSET
- . '" />' . "\n";
-echo'<title>' . $event['cat']['cat_name'] . ' - ' . $event['event_title']
- . '</title>' . "\n";
+echo'<meta http-equiv="content-type" content="text/html; charset=' . _CHARSET . '" />' . "\n";
+echo'<title>' . $event['cat']['cat_name'] . ' - ' . $event['event_title'] . '</title>' . "\n";
echo '</head>' . "\n";
echo '<body onload="window.print()">' . "\n";
echo
- '<table style="border:1px solid black; width:640px;" cellspacing="0" cellspadding="0">'
- . "\n";
+ '<table style="border:1px solid black; width:640px;" cellspacing="0" cellspadding="0">' . "\n";
echo '<tr>' . "\n";
echo '<td colspan="2" style="font-size:1.2em; border:1px solid black;">' . "\n";
echo $event['event_title'] . "\n";
@@ -38,51 +42,133 @@
echo '<tr>' . "\n";
echo '<td style="width:50%; border:1px solid black;">' . "\n";
echo '<b>' . $event['cat']['cat_name'] . '</b><br />' . "\n";
-echo'<span style="font-weight:normal;">' . $event['cat']['cat_desc'] . '</span>'
- . "\n";
+echo'<span style="font-weight:normal;">' . $event['cat']['cat_desc'] . '</span>' . "\n";
echo '</td>' . "\n";
echo '<td style="border:1px solid black;">' . "\n";
if (!$event['event_isrecur']) {
- echo'<b>' . _MD_EXTCAL_START . ' :</b> <span style="font-weight:normal;">'
- . $event['formated_event_start'] . '</span><br />' . "\n";
- echo'<b>' . _MD_EXTCAL_END . ' :</b> <span style="font-weight:normal;">'
- . $event['formated_event_end'] . '</span>' . "\n";
+ echo'<b>' . _MD_EXTCAL_START . ' :</b> <span style="font-weight:normal;">' . $event['formated_event_start']
+ . '</span><br />' . "\n";
+ echo'<b>' . _MD_EXTCAL_END . ' :</b> <span style="font-weight:normal;">' . $event['formated_event_end'] . '</span>'
+ . "\n";
} else {
- echo'<b>' . _MD_EXTCAL_RECCUR_RULE
- . ' :</b> <span style="font-weight:normal;">'
- . $event['formated_reccur_rule'] . '</span>' . "\n";
+ echo'<b>' . _MD_EXTCAL_RECCUR_RULE . ' :</b> <span style="font-weight:normal;">' . $event['formated_reccur_rule']
+ . '</span>' . "\n";
}
echo '</td>' . "\n";
echo '</tr>' . "\n";
-if ($event['event_contact'] != ''){
+
echo '<tr>' . "\n";
-echo '<td style="border:1px solid black;">' . "\n";
-echo '<b>' . _MD_EXTCAL_CONTACT_INFO . '</b><br />' . "\n";
-echo'<span style="font-weight:normal;">' . $event['event_contact'] . '<br />'
- . "\n";
-echo $event['event_address'] . '</span>' . "\n";
-echo '</td>' . "\n";
-echo '<td style="border:1px solid black;">' . "\n";
-echo'<b>' . _MD_EXTCAL_EMAIL . ' :</b> <a href="mailto:' . $event['event_email']
- . '">' . $event['event_email'] . '</a><br />' . "\n";
-echo'<b>' . _MD_EXTCAL_URL . ' :</b> <a href="' . $event['event_url'] . '">'
- . $event['event_url'] . '</a>' . "\n";
-echo '</td>' . "\n";
+echo'<td style="border:1px solid black;">' . $event['event_desc'] . '</td>' . "\n";
+echo'<td style="border:1px solid black;">' . _MD_EXTCAL_ETABLISSEMENT_PRICE . $event['event_price'] . ' '
+ . _MD_EXTCAL_DEVISE2 . '</td>' . "\n";
echo '</tr>' . "\n";
+
+//show contact info
+if ($event['event_contact'] != '') {
+ echo '<tr>' . "\n";
+ echo '<td style="border:1px solid black;">' . "\n";
+ echo '<b>' . _MD_EXTCAL_CONTACT_INFO . '</b><br />' . "\n";
+ echo'<span style="font-weight:normal;">' . $event['event_organisateur'] . '<br />' . "\n";
+ echo'<span style="font-weight:normal;">' . $event['event_contact'] . '<br />' . "\n";
+ echo $event['event_address'] . '</span>' . "\n";
+ echo '</td>' . "\n";
+ echo '<td style="border:1px solid black;">' . "\n";
+ echo'<b>' . _MD_EXTCAL_EMAIL . ' :</b> <a href="mailto:' . $event['event_email'] . '">' . $event['event_email']
+ . '</a><br />' . "\n";
+ echo'<b>' . _MD_EXTCAL_URL . ' :</b> <a href="' . $event['event_url'] . '">' . $event['event_url'] . '</a>' . "\n";
+ echo '</td>' . "\n";
+ echo '</tr>' . "\n";
}
+//show location
+if ($event['event_etablissement'] = 0) {
+ echo '<tr>' . "\n";
-echo '<tr>' . "\n";
-echo'<td colspan="2" style="border:1px solid black;">' . $event['event_desc']
- . '</td>' . "\n";
-echo '</tr>' . "\n";
+
+// echo($location['nom']);
+// var_dump($location);
+// var_dump($event);
+
+
+ echo '<td style="border:1px solid black;">' . "\n";
+ echo '<b>' . _MD_EXTCAL_ETABLISSEMENT . '</b>' . "\n";
+ if ($location['categorie'] != '') {
+ echo'<span style="font-weight:normal;"> (' . $location['categorie'] . ') <br />' . "\n";
+ }
+ if ($location['logo'] != '') {
+ echo'<img align=right style="border:1px solid #FFFFFF;margin-right:6px" src=' . XOOPS_URL
+ . '/uploads/extcal/etablissement/' . $location['logo'] . ' height="75px" />' . '' . "\n";
+ }
+
+ echo'<span style="font-weight:normal;">' . $location['nom'] . '<br />' . "\n";
+ echo $location['description'] . '<br />' . "\n";
+ echo $location['adresse'] . '</span> <br />' . "\n";
+ if ($location['adresse2'] != '') {
+ echo $location['adresse2'] . '</span> <br />' . "\n";
+ }
+ echo $location['ville'] . "\n";
+ echo $location['cp'] . '<br />' . "\n";
+
+
+ if ($location['horaires'] != '') {
+ echo $location['horaires'] . '</span> <br />' . "\n";
+ }
+
+ if ($location['divers'] != '') {
+ echo $location['divers'] . '</span> <br />' . "\n";
+ }
+
+ if ($location['tarifs'] != '') {
+ echo $location['tarifs'] . '</span> ' . _MD_EXTCAL_DEVISE2 . "\n";
+ }
+
+
+ echo '</td>' . "\n";
+ echo '<td style="border:1px solid black;">' . "\n";
+
+ if ($location['tel_fixe'] != '') {
+ echo '<b>' . _MD_EXTCAL_ETABLISSEMENT_TEL_FIXE . ' :</b>' . $location['tel_fixe'] . '<br />' . "\n";
+ }
+ if ($location['tel_portable'] != '') {
+ echo '<b>' . _MD_EXTCAL_ETABLISSEMENT_TEL_PORTABLE . ' :</b>' . $location['tel_portable'] . '<br />' . "\n";
+ }
+
+ echo'<b>' . _MD_EXTCAL_EMAIL . ' :</b> <a href="mailto:' . $location['mail'] . '">' . $location['mail']
+ . '</a><br />' . "\n";
+ echo'<b>' . _MD_EXTCAL_URL . ' :</b> <a href="' . $location['site'] . '">' . $location['site'] . '</a>' . '<br />'
+ . "\n";
+ echo'<b>' . _MD_EXTCAL_ETABLISSEMENT_MAP . ' :</b> <a href="' . $location['map'] . '">'
+ . _MD_EXTCAL_ETABLISSEMENT_MAP2 . '</a>' . "\n";
+
+ echo '</td>' . "\n";
+ echo '</tr>' . "\n";
+}
+//show images
+
+if (($event['event_picture1'] != '') || ($event['event_picture1'] != '')) {
+ echo '<tr>' . "\n";
+ if ($event['event_picture1'] != '') {
+ echo '<td style="border:1px solid black;">' . "\n";
+ echo'<img align=left style="border:1px solid #FFFFFF;margin-right:6px" src=' . XOOPS_URL . '/uploads/extcal/'
+ . $event['event_picture1'] . ' height="100px" />' . '' . "\n";
+ echo '</td>' . "\n";
+ }
+ if ($event['event_picture2'] != '') {
+ echo '<td style="border:1px solid black;">' . "\n";
+ echo'<img align=left style="border:1px solid #FFFFFF;margin-right:6px" src=' . XOOPS_URL . '/uploads/extcal/'
+ . $event['event_picture2'] . ' height="100px" />' . '' . "\n";
+ echo '</td>' . "\n";
+ }
+ echo '</tr>' . "\n";
+}
+//--------------------
+
echo '</table><br />' . "\n";
echo '<div style="text-align:center; width:640px;">';
echo $xoopsConfig['sitename'] . ' - ' . $xoopsConfig['slogan'] . '<br />';
-echo'<a href="' . XOOPS_URL . '/modules/extcal/event.php?event='
- . $event['event_id'] . '">' . XOOPS_URL . '/modules/extcal/event.php?event='
- . $event['event_id'] . '</a>';
+echo'<a href="' . XOOPS_URL . '/modules/extcal/event.php?event=' . $event['event_id'] . '">' . XOOPS_URL
+ . '/modules/extcal/event.php?event=' . $event['event_id'] . '</a>';
echo '</div>';
echo '</body>' . "\n";
echo '</html>' . "\n";
Modified: XoopsModules/extcal/trunk/modules/extcal/templates/extcal_view_search.html
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/templates/extcal_view_search.html 2013-01-01 14:16:08 UTC (rev 10618)
+++ XoopsModules/extcal/trunk/modules/extcal/templates/extcal_view_search.html 2013-01-01 18:19:34 UTC (rev 10619)
@@ -53,9 +53,10 @@
<tr class="even">
<td colspan='2' align='center'>
+ <input type="submit" style='width:150px;' value="<{$smarty.const._MD_EXTCAL_SEARCH}>" name="B1">
...
[truncated message content] |
