Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[10632] XoopsModules/extcal/trunk/modules/extcal
|
From: <be...@us...> - 2013-01-02 18:07:45
|
Revision: 10632
http://sourceforge.net/p/xoops/svn/10632
Author: beckmi
Date: 2013-01-02 18:07:42 +0000 (Wed, 02 Jan 2013)
Log Message:
-----------
- fixed: removed list of events when showing first time the Search form (sabahan/mamba)
- fixed: if we disable tooltips , event title will be missing in from the calendar (sabahan/mamba)
- fixed: changed notice text when user/guest submit an event (sabahan/mamba)
- fixed: removed Price info from Print, if empty (sabahan/mamba)
Modified Paths:
--------------
XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt
XoopsModules/extcal/trunk/modules/extcal/event.php
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_event.html
XoopsModules/extcal/trunk/modules/extcal/templates/extcal_info_bulle.html
XoopsModules/extcal/trunk/modules/extcal/templates/extcal_view_search.html
XoopsModules/extcal/trunk/modules/extcal/view_calendar-week.php
XoopsModules/extcal/trunk/modules/extcal/view_search.php
XoopsModules/extcal/trunk/modules/extcal/xoops_version.php
Modified: XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt 2013-01-02 17:40:48 UTC (rev 10631)
+++ XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt 2013-01-02 18:07:42 UTC (rev 10632)
@@ -1,3 +1,10 @@
+2013/01/02: Version 2.37 RC4
+===================================
+- fixed: removed list of events when showing first time the Search form (sabahan/mamba)
+- fixed: if we disable tooltips , event title will be missing in from the calendar (sabahan/mamba)
+- fixed: changed notice text when user/guest submit an event (sabahan/mamba)
+- fixed: removed Price info from Print, if empty (sabahan/mamba)
+
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.
Modified: XoopsModules/extcal/trunk/modules/extcal/event.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/event.php 2013-01-02 17:40:48 UTC (rev 10631)
+++ XoopsModules/extcal/trunk/modules/extcal/event.php 2013-01-02 18:07:42 UTC (rev 10632)
@@ -1,214 +1,219 @@
-<?php
-
-
-include_once ('../../mainfile.php');
-include_once ('include/constantes.php');
-$params = array('view' => _EXTCAL_NAV_NEW_EVENT, 'file' => _EXTCAL_FILE_NEW_EVENT);
-$GLOBALS['xoopsOption']['template_main'] = 'extcal_event.html';
-include_once ('header.php');
-
-
-
-
-//exit;
-
-include XOOPS_ROOT_PATH . '/include/comment_view.php';
-
-if (!isset($_GET['event'])) {
- $eventId = 0;
-} else {
- $eventId = intval($_GET['event']);
-}
-$eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
-$fileHandler = xoops_getmodulehandler(_EXTCAL_CLS_FILE, _EXTCAL_MODULE);
-$eventMemberHandler = xoops_getmodulehandler(_EXTCAL_CLS_MEMBER, _EXTCAL_MODULE);
-$eventNotMemberHandler = xoops_getmodulehandler(_EXTCAL_CLS_NOT_MEMBER, _EXTCAL_MODULE);
-$permHandler = ExtcalPerm::getHandler();
-include_once XOOPS_ROOT_PATH."/modules/extcal/class/etablissement.php";
-include_once XOOPS_ROOT_PATH."/modules/extcal/include/functions.php";
-
-
-
-
-// Retriving event
-$eventObj = $eventHandler->getEvent($eventId);
-
-if (!$eventObj) {
- redirect_header('index.php', 3, '');
-}
-
-$event = $eventHandler->objectToArray($eventObj, array('cat_id', 'event_submitter'));
-$eventHandler->serverTimeToUserTime($event);
-
- $configHandler =& xoops_gethandler('config');
- $extcalConfig = $configHandler->getConfigList($module->getVar("mid"));
-
-// Adding formated date for start and end event
-$eventHandler->formatEventDate($event, $extcalConfig['event_date_event']);
-
-// Assigning event to the template
-$xoopsTpl->assign('event', $event);
-
-// Title of the page
-$xoopsTpl->assign('xoops_pagetitle', $event['event_title']);
-
-// $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, 'reccur_rule' => _MD_EXTCAL_RECCUR_RULE, 'posted_by' => _MD_EXTCAL_POSTED_BY, 'on' => _MD_EXTCAL_ON
-// );
-// // Assigning language data to the template
-// $xoopsTpl->assign('lang', $lang);
-
-// Getting event attachement
-$eventFiles = $fileHandler->objectToArray($fileHandler->getEventFiles($eventId));
-$fileHandler->formatFilesSize($eventFiles);
-$xoopsTpl->assign('event_attachement', $eventFiles);
-
-// Token to disallow direct posting on membre/nonmember page
-$xoopsTpl->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML());
-
-// Etablissement
-$etablissementHandler = xoops_getmodulehandler(_EXTCAL_CLS_ETABLISSEMENT, _EXTCAL_MODULE);
-$etablissementObj = $etablissementHandler->get($event['event_etablissement']);
-//$etablissement = $etablissementHandler->objectToArray($etablissementObj);
-$etablissement = $etablissementObj->vars;
-$xoopsTpl->assign('etablissement', $etablissement);
-
-// $t =print_r($etablissementObj->vars,true);
-// echo "<hr>etablissement {$event['event_etablissement']}<hr><pre>{$t}</pre><hr>";
-
-
-// ### For Who's Going function ###
-
-// If the who's goging function is enabled
-if ($extcalConfig['whos_going']) {
-
- // Retriving member's for this event
- $members = $eventMemberHandler->getMembers($eventId);
-
- // Initializing variable
- $eventmember['member']['show_button'] = false;
-
- $nbUser = 0;
- // Making a list with members and counting regitered user's
- foreach (
- $members as $k
- => $v
- ) {
- $nbUser++;
- $eventmember['member']['userList'][] = array('uid' => $k, 'uname' => $v->getVar('uname'));
- }
- $eventmember['member']['nbUser'] = $nbUser;
-
- // If the user is logged
- if ($xoopsUser) {
-
- // Initializing variable
- $eventmember['member']['show_button'] = true;
- $eventmember['member']['button_disabled'] = '';
-
- // If the user is already restired to this event
- if (array_key_exists($xoopsUser->getVar('uid'), $members)) {
- $eventmember['member']['button_text'] = _MD_EXTCAL_REMOVE_ME;
- $eventmember['member']['joinevent_mode'] = 'remove';
- } else {
- $eventmember['member']['button_text'] = _MD_EXTCAL_ADD_ME;
- $eventmember['member']['joinevent_mode'] = 'add';
-
- // If this event is full
- if ($event['event_nbmember'] != 0
- && $eventMemberHandler->getNbMember($eventId)
- >= $event['event_nbmember']
- ) {
- $eventmember['member']['disabled'] = ' disabled="disabled"';
- }
- }
-
- }
-
-}
-
-// ### For Who's not Going function ###
-
-// If the who's not goging function is enabled
-if ($extcalConfig['whosnot_going']) {
-
- // Retriving not member's for this event
- $notmembers = $eventNotMemberHandler->getMembers($eventId);
-
- // Initializing variable
- $eventmember['notmember']['show_button'] = false;
-
- $nbUser = 0;
- // Making a list with not members
- foreach (
- $notmembers as $k
- => $v
- ) {
- $nbUser++;
- $eventmember['notmember']['userList'][] = array('uid' => $k, 'uname' => $v->getVar('uname'));
- }
- $eventmember['notmember']['nbUser'] = $nbUser;
-
- // If the user is logged
- if ($xoopsUser) {
-
- // Initializing variable
- $eventmember['notmember']['show_button'] = true;
- $eventmember['notmember']['button_disabled'] = '';
-
- // If the user is already restired to this event
- if (array_key_exists($xoopsUser->getVar('uid'), $notmembers)) {
- $eventmember['notmember']['button_text'] = _MD_EXTCAL_REMOVE_ME;
- $eventmember['notmember']['joinevent_mode'] = 'remove';
- } else {
- $eventmember['notmember']['button_text'] = _MD_EXTCAL_ADD_ME;
- $eventmember['notmember']['joinevent_mode'] = 'add';
- }
- }
-
-}
-
-// If who's going or not going function is enabled
-if ($extcalConfig['whos_going'] || $extcalConfig['whosnot_going']) {
- $xoopsTpl->assign('eventmember', $eventmember);
-}
-
-// Checking user perm
-if ($xoopsUser) {
- $xoopsTpl->assign('isAdmin', $xoopsUser->isAdmin());
- $canEdit
- =
- $permHandler->isAllowed($xoopsUser, 'extcal_cat_edit', $event['cat']['cat_id'])
- && $xoopsUser->getVar('uid') == $event['user']['uid'];
- $xoopsTpl->assign('canEdit', $canEdit);
-} else {
- $xoopsTpl->assign('isAdmin', false);
- $xoopsTpl->assign('canEdit', false);
-}
-
-$xoopsTpl->assign('whosGoing', $extcalConfig['whos_going']);
-$xoopsTpl->assign('whosNotGoing', $extcalConfig['whosnot_going']);
-
-
-/* test modofication status JJD
- $k = 'status';
- $isStatus = _EXTCAL_STATUS_DESINSCRIPTION;
- $xfStatus = new XoopsFormSelect('', $k, $isStatus, 1, false) ;
- $tStatus = array(_EXTCAL_STATUS_NONE => _MD_EXTCAL_LIB_NONE,
- _EXTCAL_STATUS_COME => _MD_EXTCAL_LIB_COME,
- _EXTCAL_STATUS_NOTCOME => _MD_EXTCAL_LIB_NOTCOME);
-
-
- $xfStatus->addOptionArray($tStatus);
- $xoopsTpl->assign('status', $xfStatus->render());
-*/
-
-$xoTheme->addScript('browse.php?modules/extcal/js/highslide.js');
-$xoTheme->addStylesheet('browse.php?modules/extcal/js/highslide.css');
-
-
- //function XoopsFormDhtmlTextArea($caption, $name, $value = "", $rows = 5, $cols = 50, $hiddentext = "xoopsHiddenText", $options = array());
-
-
-include(XOOPS_ROOT_PATH . "/footer.php");
-?>
+<?php
+
+
+include_once ('../../mainfile.php');
+include_once ('include/constantes.php');
+$params = array('view' => _EXTCAL_NAV_NEW_EVENT, 'file' => _EXTCAL_FILE_NEW_EVENT);
+$GLOBALS['xoopsOption']['template_main'] = 'extcal_event.html';
+include_once ('header.php');
+
+
+
+
+//exit;
+
+include XOOPS_ROOT_PATH . '/include/comment_view.php';
+
+if (!isset($_GET['event'])) {
+ $eventId = 0;
+} else {
+ $eventId = intval($_GET['event']);
+}
+$eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
+$fileHandler = xoops_getmodulehandler(_EXTCAL_CLS_FILE, _EXTCAL_MODULE);
+$eventMemberHandler = xoops_getmodulehandler(_EXTCAL_CLS_MEMBER, _EXTCAL_MODULE);
+$eventNotMemberHandler = xoops_getmodulehandler(_EXTCAL_CLS_NOT_MEMBER, _EXTCAL_MODULE);
+$permHandler = ExtcalPerm::getHandler();
+include_once XOOPS_ROOT_PATH."/modules/extcal/class/etablissement.php";
+include_once XOOPS_ROOT_PATH."/modules/extcal/include/functions.php";
+
+
+
+
+// Retriving event
+$eventObj = $eventHandler->getEvent($eventId);
+
+if (!$eventObj) {
+ redirect_header('index.php', 3, '');
+}
+
+$event = $eventHandler->objectToArray($eventObj, array('cat_id', 'event_submitter'));
+$eventHandler->serverTimeToUserTime($event);
+
+ $configHandler =& xoops_gethandler('config');
+ $extcalConfig = $configHandler->getConfigList($module->getVar("mid"));
+
+// Adding formated date for start and end event
+$eventHandler->formatEventDate($event, $extcalConfig['event_date_event']);
+
+// Assigning event to the template
+$xoopsTpl->assign('event', $event);
+
+// Title of the page
+$xoopsTpl->assign('xoops_pagetitle', $event['event_title']);
+
+// $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, 'reccur_rule' => _MD_EXTCAL_RECCUR_RULE, 'posted_by' => _MD_EXTCAL_POSTED_BY, 'on' => _MD_EXTCAL_ON
+// );
+// // Assigning language data to the template
+// $xoopsTpl->assign('lang', $lang);
+
+// Getting event attachement
+$eventFiles = $fileHandler->objectToArray($fileHandler->getEventFiles($eventId));
+$fileHandler->formatFilesSize($eventFiles);
+$xoopsTpl->assign('event_attachement', $eventFiles);
+
+// Token to disallow direct posting on membre/nonmember page
+$xoopsTpl->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML());
+
+// Etablissement
+$etablissementHandler = xoops_getmodulehandler(_EXTCAL_CLS_ETABLISSEMENT, _EXTCAL_MODULE);
+$etablissementObj = $etablissementHandler->get($event['event_etablissement']);
+//$etablissement = $etablissementHandler->objectToArray($etablissementObj);
+$etablissement = $etablissementObj->vars;
+$xoopsTpl->assign('etablissement', $etablissement);
+
+// $t =print_r($etablissementObj->vars,true);
+// echo "<hr>etablissement {$event['event_etablissement']}<hr><pre>{$t}</pre><hr>";
+
+
+// ### For Who's Going function ###
+
+// If the who's goging function is enabled
+if ($extcalConfig['whos_going']) {
+
+ // Retriving member's for this event
+ $members = $eventMemberHandler->getMembers($eventId);
+
+ // Initializing variable
+ $eventmember['member']['show_button'] = false;
+
+ $nbUser = 0;
+ // Making a list with members and counting regitered user's
+ foreach (
+ $members as $k
+ => $v
+ ) {
+ $nbUser++;
+ $eventmember['member']['userList'][] = array('uid' => $k, 'uname' => $v->getVar('uname'));
+ }
+ $eventmember['member']['nbUser'] = $nbUser;
+
+ // If the user is logged
+ if ($xoopsUser) {
+
+ // Initializing variable
+ $eventmember['member']['show_button'] = true;
+ $eventmember['member']['button_disabled'] = '';
+
+ // If the user is already restired to this event
+ if (array_key_exists($xoopsUser->getVar('uid'), $members)) {
+ $eventmember['member']['button_text'] = _MD_EXTCAL_REMOVE_ME;
+ $eventmember['member']['joinevent_mode'] = 'remove';
+ } else {
+ $eventmember['member']['button_text'] = _MD_EXTCAL_ADD_ME;
+ $eventmember['member']['joinevent_mode'] = 'add';
+
+ // If this event is full
+ if ($event['event_nbmember'] != 0
+ && $eventMemberHandler->getNbMember($eventId)
+ >= $event['event_nbmember']
+ ) {
+ $eventmember['member']['disabled'] = ' disabled="disabled"';
+ }
+ }
+
+ }
+
+}
+
+// ### For Who's not Going function ###
+
+// If the who's not goging function is enabled
+if ($extcalConfig['whosnot_going']) {
+
+ // Retriving not member's for this event
+ $notmembers = $eventNotMemberHandler->getMembers($eventId);
+
+ // Initializing variable
+ $eventmember['notmember']['show_button'] = false;
+
+ $nbUser = 0;
+ // Making a list with not members
+ foreach (
+ $notmembers as $k
+ => $v
+ ) {
+ $nbUser++;
+ $eventmember['notmember']['userList'][] = array('uid' => $k, 'uname' => $v->getVar('uname'));
+ }
+ $eventmember['notmember']['nbUser'] = $nbUser;
+
+ // If the user is logged
+ if ($xoopsUser) {
+
+ // Initializing variable
+ $eventmember['notmember']['show_button'] = true;
+ $eventmember['notmember']['button_disabled'] = '';
+
+ // If the user is already restired to this event
+ if (array_key_exists($xoopsUser->getVar('uid'), $notmembers)) {
+ $eventmember['notmember']['button_text'] = _MD_EXTCAL_REMOVE_ME;
+ $eventmember['notmember']['joinevent_mode'] = 'remove';
+ } else {
+ $eventmember['notmember']['button_text'] = _MD_EXTCAL_ADD_ME;
+ $eventmember['notmember']['joinevent_mode'] = 'add';
+ }
+ }
+
+}
+
+// If who's going or not going function is enabled
+if ($extcalConfig['whos_going'] || $extcalConfig['whosnot_going']) {
+ $xoopsTpl->assign('eventmember', $eventmember);
+}
+
+// Checking user perm
+if ($xoopsUser) {
+ $xoopsTpl->assign('isAdmin', $xoopsUser->isAdmin());
+ $canEdit
+ =
+ $permHandler->isAllowed($xoopsUser, 'extcal_cat_edit', $event['cat']['cat_id'])
+ && $xoopsUser->getVar('uid') == $event['user']['uid'];
+ $xoopsTpl->assign('canEdit', $canEdit);
+} else {
+ $xoopsTpl->assign('isAdmin', false);
+ $xoopsTpl->assign('canEdit', false);
+}
+
+$xoopsTpl->assign('whosGoing', $extcalConfig['whos_going']);
+$xoopsTpl->assign('whosNotGoing', $extcalConfig['whosnot_going']);
+
+//-------------
+$xoopsTpl->assign('params', $params);
+$tNavBar = getNavBarTabs($params['view']);
+$xoopsTpl->assign('tNavBar', $tNavBar);
+//---------------------
+
+/* test modofication status JJD
+ $k = 'status';
+ $isStatus = _EXTCAL_STATUS_DESINSCRIPTION;
+ $xfStatus = new XoopsFormSelect('', $k, $isStatus, 1, false) ;
+ $tStatus = array(_EXTCAL_STATUS_NONE => _MD_EXTCAL_LIB_NONE,
+ _EXTCAL_STATUS_COME => _MD_EXTCAL_LIB_COME,
+ _EXTCAL_STATUS_NOTCOME => _MD_EXTCAL_LIB_NOTCOME);
+
+
+ $xfStatus->addOptionArray($tStatus);
+ $xoopsTpl->assign('status', $xfStatus->render());
+*/
+
+$xoTheme->addScript('browse.php?modules/extcal/js/highslide.js');
+$xoTheme->addStylesheet('browse.php?modules/extcal/js/highslide.css');
+
+
+ //function XoopsFormDhtmlTextArea($caption, $name, $value = "", $rows = 5, $cols = 50, $hiddentext = "xoopsHiddenText", $options = array());
+
+
+include(XOOPS_ROOT_PATH . "/footer.php");
+?>
Modified: XoopsModules/extcal/trunk/modules/extcal/language/english/admin.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/language/english/admin.php 2013-01-02 17:40:48 UTC (rev 10631)
+++ XoopsModules/extcal/trunk/modules/extcal/language/english/admin.php 2013-01-02 18:07:42 UTC (rev 10632)
@@ -122,4 +122,5 @@
//2.37
-define('_AM_EXTCAL_END_DATE','End Date');
\ No newline at end of file
+define('_AM_EXTCAL_END_DATE','End Date');
+define('_AM_EXTCAL_EVENT_CLONED','Event successfully cloned.');
\ No newline at end of file
Modified: XoopsModules/extcal/trunk/modules/extcal/language/english/main.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/language/english/main.php 2013-01-02 17:40:48 UTC (rev 10631)
+++ XoopsModules/extcal/trunk/modules/extcal/language/english/main.php 2013-01-02 18:07:42 UTC (rev 10632)
@@ -94,7 +94,7 @@
define('_MD_EXTCAL_ETABLISSEMENT_TEL_PORTABLE','Mobile Phone');
define('_MD_EXTCAL_ETABLISSEMENT_VILLE','City');
define('_MD_EXTCAL_EVENT',"Event");
-define('_MD_EXTCAL_EVENT_CREATED','Event Created');
+define('_MD_EXTCAL_EVENT_CREATED',"Thank-you for your submission.<br />Your event has been approved and will now appear in our calendar.");
define('_MD_EXTCAL_EVENT_END','Have end ?');
define('_MD_EXTCAL_EVENTS_FOUND',"%1\$s events found");
define('_MD_EXTCAL_EXPRESSION','Expression (list)');
@@ -230,4 +230,6 @@
define('_MD_EXTCAL_SITE',"Website");
define('_MD_EXTCAL_VISIT_SITE',"Visit the Website");
-define('_MD_EXTCAL_EVENT_UPDATED','Event Updated');
\ No newline at end of file
+define('_MD_EXTCAL_EVENT_UPDATED','Event Updated');
+//2.37 RC4
+define('_MD_EXTCAL_EVENT_PENDING',"Thank-you for your submission.<br />You will be notified once your event has be approved by the webmaster.");
\ No newline at end of file
Modified: XoopsModules/extcal/trunk/modules/extcal/post.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/post.php 2013-01-02 17:40:48 UTC (rev 10631)
+++ XoopsModules/extcal/trunk/modules/extcal/post.php 2013-01-02 18:07:42 UTC (rev 10632)
@@ -158,9 +158,15 @@
$notificationHandler->triggerEvent('cat', intval($_POST['cat_id']), 'new_event_cat', array('EVENT_TITLE' => $_POST['event_title'], 'CAT_NAME' => $cat->getVar('cat_name')));
}
+
+
}
+ if ($approve) {
redirect_header(_EXTCAL_FILE_CALMONTH, 3, _MD_EXTCAL_EVENT_CREATED, false);
+} else {
+ redirect_header(_EXTCAL_FILE_CALMONTH, 3, _MD_EXTCAL_EVENT_PENDING, false);
+ }
}
?>
Modified: XoopsModules/extcal/trunk/modules/extcal/print.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/print.php 2013-01-02 17:40:48 UTC (rev 10631)
+++ XoopsModules/extcal/trunk/modules/extcal/print.php 2013-01-02 18:07:42 UTC (rev 10632)
@@ -59,9 +59,12 @@
echo '<tr>' . "\n";
+if ($event['event_desc'] != '') {
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";
+}
+if ($event['event_price'] != '') {
+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
Modified: XoopsModules/extcal/trunk/modules/extcal/templates/extcal_event.html
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/templates/extcal_event.html 2013-01-02 17:40:48 UTC (rev 10631)
+++ XoopsModules/extcal/trunk/modules/extcal/templates/extcal_event.html 2013-01-02 18:07:42 UTC (rev 10632)
@@ -1,5 +1,7 @@
<script src='<{$smarty.const.XOOPS_URL}>/modules/extcal/js/extcal_highslide.js' type="text/javascript"></script>
+<{include file="db:extcal_navbar.html"}>
+
<table class="outer">
<tr>
<th colspan="3" style="font-size:1.2em;">
Modified: XoopsModules/extcal/trunk/modules/extcal/templates/extcal_info_bulle.html
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/templates/extcal_info_bulle.html 2013-01-02 17:40:48 UTC (rev 10631)
+++ XoopsModules/extcal/trunk/modules/extcal/templates/extcal_info_bulle.html 2013-01-02 18:07:42 UTC (rev 10632)
@@ -6,12 +6,11 @@
<a class="tooltip54" href="<{$xoops_url}>/modules/extcal/event.php?event=<{$event.event_id}>">
<{if $showId}>(#<{$event.event_id}>)<{/if}> <{$event.event_title}><br />
<span class="custom info" width350 style="background: #<{$event.cat.cat_light_color}>;">
- <img src="css/images/<{$event.event_icone}>" alt="" iconinfo/>
+ <{if $event.event_icone}><img src="css/images/<{$event.event_icone}>" alt="" iconinfo/><{/if}>
<em><{if $showId}>(#<{$event.event_id}>)<{/if}> <{$event.event_title}></em>
<{if $event.event_picture1!=""}>
<img src="<{$xoops_url}>/uploads/extcal/<{$event.event_picture1}>" alinea/>
<{/if}>
- <{if $showId}>(#<{$event.event_id}>)<{/if}> <{$event.event_title}><br />
<b><{$smarty.const._MD_EXTCAL_START}></b> <{$event.formated_event_start}><br />
<b><{$smarty.const._MD_EXTCAL_END}></b> <{$event.formated_event_end}><br />
@@ -21,8 +20,12 @@
<{else}>
- <div style="height:12px; width:12px; background-color:#<{$event.cat.cat_color}>; border:1px solid black; float:left; margin-right:5px;"
+<a href="<{$xoops_url}>/modules/extcal/event.php?event=<{$event.event_id}>">
+ <{if $showId}>(#<{$event.event_id}>)<{/if}> <{$event.event_title}>
+</a>
+
+ <div style="height:12px; width:12px; background-color:#<{$event.cat.cat_color}>; border:1px solid black; float:left; margin-right:5px;"
+
title='<{if $showId}>(#<{$event.event_id}>)<{/if}> <{$event.formated_event_start}> - <{$event.formated_event_end}> : <{$event.event_title}>'>
</div>
-<{/if}>
-
+<{/if}>
\ No newline at end of file
Modified: XoopsModules/extcal/trunk/modules/extcal/templates/extcal_view_search.html
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/templates/extcal_view_search.html 2013-01-02 17:40:48 UTC (rev 10631)
+++ XoopsModules/extcal/trunk/modules/extcal/templates/extcal_view_search.html 2013-01-02 18:07:42 UTC (rev 10632)
@@ -2,6 +2,7 @@
<{include file="db:extcal_navbar.html"}>
<form action="<{$navigSelectBox.action}>" method="post">
+
<table class="outer" style="border-top: none;">
<tr>
<th align='center' colspan='2'>
@@ -50,7 +51,9 @@
<{$search.orderby1}><{$search.orderby2}><{$search.orderby3}>
</td>
</tr>
-
+
+ <input type="hidden" name="num_tries" value="<{$num_tries}>">
+
<tr class="even">
<td colspan='2' align='center'>
<input type="submit" style='width:150px;' value="<{$smarty.const._MD_EXTCAL_SEARCH}>" name="B1">
@@ -69,12 +72,16 @@
</tr>
</table>
-
</form>
+<{if $num_tries > 0}>
<{include file="db:extcal_event_list1.html"}>
+<{/if}>
+
+
+
<{include file="db:extcal_categorie.html"}>
<div style="text-align:right;"><a
Modified: XoopsModules/extcal/trunk/modules/extcal/view_calendar-week.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/view_calendar-week.php 2013-01-02 17:40:48 UTC (rev 10631)
+++ XoopsModules/extcal/trunk/modules/extcal/view_calendar-week.php 2013-01-02 18:07:42 UTC (rev 10632)
@@ -23,8 +23,8 @@
$month = date('n', $dayTS);
$day = date('j', $dayTS);
-echo $dayTS . ' dayTS-2 <br />';
-echo gmdate("Y-m-d\TH:i:s\Z", $dayTS). ' dayTS-2 <br />';
+//echo $dayTS . ' dayTS-2 <br />';
+//echo gmdate("Y-m-d\TH:i:s\Z", $dayTS). ' dayTS-2 <br />';
$form = new XoopsSimpleForm('', 'navigSelectBox', $params['file'], 'get');
@@ -59,10 +59,10 @@
$startWeek = mktime(0, 0, 0, $month, $day, $year);
$endWeek = $startWeek + _EXTCAL_TS_WEEK - 1;
-echo $startWeek . ' startWeek <br />';
-echo gmdate("Y-m-d\TH:i:s\Z", $startWeek). ' startWeek <br />';
-echo $endWeek . ' endWeek <br />';
-echo gmdate("Y-m-d\TH:i:s\Z", $endWeek). ' endWeek <br />';
+//echo $startWeek . ' startWeek <br />';
+//echo gmdate("Y-m-d\TH:i:s\Z", $startWeek). ' startWeek <br />';
+//echo $endWeek . ' endWeek <br />';
+//echo gmdate("Y-m-d\TH:i:s\Z", $endWeek). ' endWeek <br />';
/*
* Adding all event occuring during this week to an array indexed by day number
Modified: XoopsModules/extcal/trunk/modules/extcal/view_search.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/view_search.php 2013-01-02 17:40:48 UTC (rev 10631)
+++ XoopsModules/extcal/trunk/modules/extcal/view_search.php 2013-01-02 18:07:42 UTC (rev 10632)
@@ -1,188 +1,196 @@
-<?php
-
-include_once ('../../mainfile.php');
-include_once ('include/constantes.php');
-$params = array(
- 'view' => _EXTCAL_NAV_SEARCH,
- 'file' => _EXTCAL_FILE_SEARCH
-);
-$GLOBALS['xoopsOption']['template_main'] = "extcal_view_{$params['view']}.html";
-include_once ('header.php');
-
-/* ========================================================================== */
-/***************************************************************/
-/* ajout des elements de recherche */
-/***************************************************************/
-$searchExp = isset($_POST['searchExp']) ? $_POST['searchExp'] : '';
-$andor = isset($_POST['andor']) ? $_POST['andor'] : '';
-$year = isset($_POST['year']) ? intval($_POST['year']) : date('Y');
-$month = isset($_POST['month']) ? intval($_POST['month']) : date('n');
-$day = isset($_POST['day']) ? intval($_POST['day']) : 0;
-$cat = isset($_POST['cat']) ? intval($_POST['cat']) : 0;
-$orderby1 = isset($_POST['orderby1']) ? $_POST['orderby1'] : 'cat_name ASC';
-$orderby2 = isset($_POST['orderby2']) ? $_POST['orderby2'] : 'event_title ASC';
-$orderby3 = isset($_POST['orderby3']) ? $_POST['orderby3'] : '';
-/* ========================================================================== */
-
-
-//$orderby = isset($_GET['orderby']) ? intval($_GET['orderby']) : 0;
-
-//---------------------------------------------------------------
-$search = array();
-$exp = new XoopsFormText(_MD_EXTCAL_EXPRESSION, 'searchExp', 80, 80, $searchExp);
-$search['searchExp'] = $exp->render();
-$search['andor'] = getListAndOr('andor', '', $andor)->render();
-//$search['year'] = getListYears($year,$xoopsModuleConfig['agenda_nb_years_before'],$xoopsModuleConfig['agenda_nb_years_after'], true)->render();
-$search['year'] = getListYears($year, 2, 5, true)->render();
-$search['month'] = getListMonths($month, true)->render();
-$search['day'] = getListDays($day, true)->render();
-
-//$search['cat'] = implode('', getCheckeCategories());
-$search['cat'] = getListCategories($cat, true, 'cat')->render();
-
-$search['orderby1'] = getListOrderBy('orderby1', '', $orderby1, false)->render();
-$search['orderby2'] = getListOrderBy('orderby2', '', $orderby2, true)->render();
-$search['orderby3'] = getListOrderBy('orderby3', '', $orderby3, true)->render();
-
-
-//echoArray($search,true);
-$xoopsTpl->assign('search', $search);
-/***************************************************************/
-
-
-// $form = new XoopsSimpleForm('', 'navigSelectBox', $params['file'], 'get');
-// // $form->addElement(getListYears($year,$xoopsModuleConfig['agenda_nb_years_before'],$xoopsModuleConfig['agenda_nb_years_after'], true));
-// // $form->addElement(getListMonths($month, rtue));
-// $form->addElement(getListCategories($cat));
-// $form->addElement(getListOrderBy($orderby));
-//
-// $form->addElement(new XoopsFormText(_MD_EXTCAL_SEARCH_EXP, 'searchExp', 80, 80, $searchExp));
-//
-// $form->addElement(new XoopsFormButton("", "", _SEND, "submit"));
-//
-// // Assigning the form to the template
-// $form->assign($xoopsTpl);
-
-// Retriving events
-//echoArray($_GET, false);
-$orderBy = array($orderby1, $orderby2, $orderby3);
-$userId = 0;
-$user = '';
-$events = $eventHandler->getSearchEvent2($year, $month, $day, $cat, $searchExp, $andor, $orderBy, $userId, $user);
-
-$eventHandler->serverTimeToUserTimes($events);
-
-
-// Formating date
-$eventHandler->formatEventsDate($events, $xoopsModuleConfig['event_date_year']);
-
-// Treatment for recurring event
-$startMonth = mktime(0, 0, 0, $month, 1, $year);
-$endMonth = mktime(23, 59, 59, $month, 31, $year);
-
-//$startMonth = mktime(0, 0, 0, 1, 1, 2011);
-//$endMonth = mktime(23, 59, 59, 12, 31, 2011);
-
-//echo "===>{$startMonth}<br>{$endMonth}";
-
-$eventsArray = array();
-foreach ($events as $event) {
- if (!$event['event_isrecur']) {
- // Formating date
- $eventHandler->formatEventDate($event, $xoopsModuleConfig['event_date_week']);
- $eventsArray[] = $event;
- } else {
- //echo "zzzzz<hr>";
- $recurEvents = $eventHandler->getRecurEventToDisplay($event, $startMonth, $endMonth);
- //echoArray($recurEvents);
-
-
- // Formating date
- $eventHandler->formatEventsDate($recurEvents, $xoopsModuleConfig['event_date_week']);
- //$eventsArray = array_merge($eventsArray, $recurEvents);
- }
-}
-
-$criteria = new criteria('event_isrecur', 1);
-$recurrents = $eventHandler->getAllEvents($criteria, false);
-
-//echoArray($recurrents,false,'Evennements reccurents');
-for ($h = 0, $count = count($recurrents); $h < $count; $h++) {
- $recurEvents = $eventHandler->getRecurEventToDisplay($event, $startMonth, $endMonth);
- // Formating date
- $eventHandler->formatEventsDate($recurEvents, $xoopsModuleConfig['event_date_week']);
- $eventsArray = array_merge($eventsArray, $recurEvents);
-}
-
-
-// Sort event array by event start
-//usort($eventsArray, "orderEvents");
-//echoArray($eventsArray,false);
-
-// Assigning events to the template
-$xoopsTpl->assign('evenements_trouves', sprintf(_MD_EXTCAL_EVENTS_FOUND, count($eventsArray)));
-$xoopsTpl->assign('events', $eventsArray);
-
-// Retriving categories and Assigning categories to the template
-$cats = $catHandler->objectToArray($catHandler->getAllCat($xoopsUser));
-$xoopsTpl->assign('cats', $cats);
-
-// Making navig data
-// $monthCalObj = new Calendar_Month_Weekdays($year, $month);
-// $pMonthCalObj = $monthCalObj->prevMonth('object');
-// $nMonthCalObj = $monthCalObj->nextMonth('object');
-// $navig = array('prev' => array('uri' => 'year=' . $pMonthCalObj->thisYear()
-// . '&month=' . $pMonthCalObj->thisMonth(),
-// 'name' => $extcalTimeHandler->getFormatedDate($xoopsModuleConfig['nav_date_month'], $pMonthCalObj->getTimestamp())),
-// 'this' => array( 'uri' => 'year=' . $monthCalObj->thisYear()
-// . '&month=' . $monthCalObj->thisMonth(),
-// 'name' => $extcalTimeHandler->getFormatedDate($xoopsModuleConfig['nav_date_month'], $monthCalObj->getTimestamp()) ),
-// 'next' => array('uri' => 'year=' . $nMonthCalObj->thisYear()
-// . '&month=' . $nMonthCalObj->thisMonth(),
-// 'name' => $extcalTimeHandler->getFormatedDate($xoopsModuleConfig['nav_date_month'], $nMonthCalObj->getTimestamp()) )
-// );
-//
-// // Title of the page
-// $xoopsTpl->assign('xoops_pagetitle', $xoopsModule->getVar('name') . ' ' .
-// $navig['this']['name']
-// );
-//
-// // Assigning navig data to the template
-// $xoopsTpl->assign('navig', $navig);
-
-//Affichage des infobulle
-$xoopsTpl->assign('showInfoBulle', $xoopsModuleConfig['showInfoBulle']);
-$xoopsTpl->assign('showId', $xoopsModuleConfig['showId']);
-
-// Assigning current form navig data to the template
-$xoopsTpl->assign('selectedCat', $cat);
-$xoopsTpl->assign('year', $year);
-$xoopsTpl->assign('month', $month);
-
-//---------------------------------------------------------------
-if ($xoopsUser) {
- $xoopsTpl->assign('isAdmin', $xoopsUser->isAdmin());
- $canEdit = false;
- /* todo
- $canEdit
- =
- $permHandler->isAllowed($xoopsUser, 'extcal_cat_edit', $event['cat']['cat_id'])
- && $xoopsUser->getVar('uid') == $event['user']['uid'];
- $xoopsTpl->assign('canEdit', $canEdit);
- */
-} else {
- $xoopsTpl->assign('isAdmin', false);
- $xoopsTpl->assign('canEdit', false);
-}
-
-//---------------------------------------------------------------
-$xoopsTpl->assign('params', $params);
-$tNavBar = getNavBarTabs($params['view']);
-$xoopsTpl->assign('tNavBar', $tNavBar);
-$xoopsTpl->assign('list_position', -1);
-// echoArray($tNavBar,true);
-//---------------------------------------------------------------
-
-
-include XOOPS_ROOT_PATH . '/footer.php';
-?>
+<?php
+
+include_once ('../../mainfile.php');
+include_once ('include/constantes.php');
+$params = array(
+ 'view' => _EXTCAL_NAV_SEARCH,
+ 'file' => _EXTCAL_FILE_SEARCH
+);
+$GLOBALS['xoopsOption']['template_main'] = "extcal_view_{$params['view']}.html";
+include_once ('header.php');
+
+//needed to save the state of the form, so we don't show on the first time the list of available events
+$num_tries = (isset($_POST["num_tries"])) ? $_POST["num_tries"]+ 1 : 0;
+
+
+
+/* ========================================================================== */
+/***************************************************************/
+/* ajout des elements de recherche */
+/***************************************************************/
+$searchExp = isset($_POST['searchExp']) ? $_POST['searchExp'] : '';
+$andor = isset($_POST['andor']) ? $_POST['andor'] : '';
+$year = isset($_POST['year']) ? intval($_POST['year']) : date('Y');
+$month = isset($_POST['month']) ? intval($_POST['month']) : date('n');
+$day = isset($_POST['day']) ? intval($_POST['day']) : 0;
+$cat = isset($_POST['cat']) ? intval($_POST['cat']) : 0;
+$orderby1 = isset($_POST['orderby1']) ? $_POST['orderby1'] : 'cat_name ASC';
+$orderby2 = isset($_POST['orderby2']) ? $_POST['orderby2'] : 'event_title ASC';
+$orderby3 = isset($_POST['orderby3']) ? $_POST['orderby3'] : '';
+/* ========================================================================== */
+
+
+//$orderby = isset($_GET['orderby']) ? intval($_GET['orderby']) : 0;
+
+//---------------------------------------------------------------
+$search = array();
+$exp = new XoopsFormText(_MD_EXTCAL_EXPRESSION, 'searchExp', 80, 80, $searchExp);
+$search['searchExp'] = $exp->render();
+$search['andor'] = getListAndOr('andor', '', $andor)->render();
+//$search['year'] = getListYears($year,$xoopsModuleConfig['agenda_nb_years_before'],$xoopsModuleConfig['agenda_nb_years_after'], true)->render();
+$search['year'] = getListYears($year, 2, 5, true)->render();
+$search['month'] = getListMonths($month, true)->render();
+$search['day'] = getListDays($day, true)->render();
+
+//$search['cat'] = implode('', getCheckeCategories());
+$search['cat'] = getListCategories($cat, true, 'cat')->render();
+
+$search['orderby1'] = getListOrderBy('orderby1', '', $orderby1, false)->render();
+$search['orderby2'] = getListOrderBy('orderby2', '', $orderby2, true)->render();
+$search['orderby3'] = getListOrderBy('orderby3', '', $orderby3, true)->render();
+
+
+//echoArray($search,true);
+$xoopsTpl->assign('search', $search);
+/***************************************************************/
+
+
+// $form = new XoopsSimpleForm('', 'navigSelectBox', $params['file'], 'get');
+// // $form->addElement(getListYears($year,$xoopsModuleConfig['agenda_nb_years_before'],$xoopsModuleConfig['agenda_nb_years_after'], true));
+// // $form->addElement(getListMonths($month, rtue));
+// $form->addElement(getListCategories($cat));
+// $form->addElement(getListOrderBy($orderby));
+//
+// $form->addElement(new XoopsFormText(_MD_EXTCAL_SEARCH_EXP, 'searchExp', 80, 80, $searchExp));
+//
+// $form->addElement(new XoopsFormButton("", "", _SEND, "submit"));
+//
+// // Assigning the form to the template
+// $form->assign($xoopsTpl);
+
+// Retriving events
+//echoArray($_GET, false);
+$orderBy = array($orderby1, $orderby2, $orderby3);
+$userId = 0;
+$user = '';
+$events = $eventHandler->getSearchEvent2($year, $month, $day, $cat, $searchExp, $andor, $orderBy, $userId, $user);
+
+$eventHandler->serverTimeToUserTimes($events);
+
+
+// Formating date
+$eventHandler->formatEventsDate($events, $xoopsModuleConfig['event_date_year']);
+
+// Treatment for recurring event
+$startMonth = mktime(0, 0, 0, $month, 1, $year);
+$endMonth = mktime(23, 59, 59, $month, 31, $year);
+
+//$startMonth = mktime(0, 0, 0, 1, 1, 2011);
+//$endMonth = mktime(23, 59, 59, 12, 31, 2011);
+
+//echo "===>{$startMonth}<br>{$endMonth}";
+
+$eventsArray = array();
+foreach ($events as $event) {
+ if (!$event['event_isrecur']) {
+ // Formating date
+ $eventHandler->formatEventDate($event, $xoopsModuleConfig['event_date_week']);
+ $eventsArray[] = $event;
+ } else {
+ //echo "zzzzz<hr>";
+ $recurEvents = $eventHandler->getRecurEventToDisplay($event, $startMonth, $endMonth);
+ //echoArray($recurEvents);
+
+
+ // Formating date
+ $eventHandler->formatEventsDate($recurEvents, $xoopsModuleConfig['event_date_week']);
+ //$eventsArray = array_merge($eventsArray, $recurEvents);
+ }
+}
+
+$criteria = new criteria('event_isrecur', 1);
+$recurrents = $eventHandler->getAllEvents($criteria, false);
+
+//echoArray($recurrents,false,'Evennements reccurents');
+for ($h = 0, $count = count($recurrents); $h < $count; $h++) {
+ $recurEvents = $eventHandler->getRecurEventToDisplay($event, $startMonth, $endMonth);
+ // Formating date
+ $eventHandler->formatEventsDate($recurEvents, $xoopsModuleConfig['event_date_week']);
+ $eventsArray = array_merge($eventsArray, $recurEvents);
+}
+
+
+// Sort event array by event start
+//usort($eventsArray, "orderEvents");
+//echoArray($eventsArray,false);
+
+// Assigning events to the template
+$xoopsTpl->assign('evenements_trouves', sprintf(_MD_EXTCAL_EVENTS_FOUND, count($eventsArray)));
+$xoopsTpl->assign('events', $eventsArray);
+
+// Retriving categories and Assigning categories to the template
+$cats = $catHandler->objectToArray($catHandler->getAllCat($xoopsUser));
+$xoopsTpl->assign('cats', $cats);
+
+// Making navig data
+// $monthCalObj = new Calendar_Month_Weekdays($year, $month);
+// $pMonthCalObj = $monthCalObj->prevMonth('object');
+// $nMonthCalObj = $monthCalObj->nextMonth('object');
+// $navig = array('prev' => array('uri' => 'year=' . $pMonthCalObj->thisYear()
+// . '&month=' . $pMonthCalObj->thisMonth(),
+// 'name' => $extcalTimeHandler->getFormatedDate($xoopsModuleConfig['nav_date_month'], $pMonthCalObj->getTimestamp())),
+// 'this' => array( 'uri' => 'year=' . $monthCalObj->thisYear()
+// . '&month=' . $monthCalObj->thisMonth(),
+// 'name' => $extcalTimeHandler->getFormatedDate($xoopsModuleConfig['nav_date_month'], $monthCalObj->getTimestamp()) ),
+// 'next' => array('uri' => 'year=' . $nMonthCalObj->thisYear()
+// . '&month=' . $nMonthCalObj->thisMonth(),
+// 'name' => $extcalTimeHandler->getFormatedDate($xoopsModuleConfig['nav_date_month'], $nMonthCalObj->getTimestamp()) )
+// );
+//
+// // Title of the page
+// $xoopsTpl->assign('xoops_pagetitle', $xoopsModule->getVar('name') . ' ' .
+// $navig['this']['name']
+// );
+//
+// // Assigning navig data to the template
+// $xoopsTpl->assign('navig', $navig);
+
+//Affichage des infobulle
+$xoopsTpl->assign('showInfoBulle', $xoopsModuleConfig['showInfoBulle']);
+$xoopsTpl->assign('showId', $xoopsModuleConfig['showId']);
+
+// Assigning current form navig data to the template
+$xoopsTpl->assign('selectedCat', $cat);
+$xoopsTpl->assign('year', $year);
+$xoopsTpl->assign('month', $month);
+
+$xoopsTpl->assign('num_tries', $num_tries);
+
+
+//---------------------------------------------------------------
+if ($xoopsUser) {
+ $xoopsTpl->assign('isAdmin', $xoopsUser->isAdmin());
+ $canEdit = false;
+ /* todo
+ $canEdit
+ =
+ $permHandler->isAllowed($xoopsUser, 'extcal_cat_edit', $event['cat']['cat_id'])
+ && $xoopsUser->getVar('uid') == $event['user']['uid'];
+ $xoopsTpl->assign('canEdit', $canEdit);
+ */
+} else {
+ $xoopsTpl->assign('isAdmin', false);
+ $xoopsTpl->assign('canEdit', false);
+}
+
+//---------------------------------------------------------------
+$xoopsTpl->assign('params', $params);
+$tNavBar = getNavBarTabs($params['view']);
+$xoopsTpl->assign('tNavBar', $tNavBar);
+$xoopsTpl->assign('list_position', -1);
+// echoArray($tNavBar,true);
+//---------------------------------------------------------------
+
+
+include XOOPS_ROOT_PATH . '/footer.php';
+?>
Modified: XoopsModules/extcal/trunk/modules/extcal/xoops_version.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/xoops_version.php 2013-01-02 17:40:48 UTC (rev 10631)
+++ XoopsModules/extcal/trunk/modules/extcal/xoops_version.php 2013-01-02 18:07:42 UTC (rev 10632)
@@ -41,7 +41,7 @@
$modversion["module_website_url"] = "www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
$modversion["release_date"] = "2013/01/01";
-$modversion['module_status'] = "RC 3";
+$modversion['module_status'] = "RC 4";
$modversion['min_php'] = '5.2';
$modversion['min_xoops'] = "2.5.5";
@@ -623,6 +623,4 @@
$modversion['support_site_url'] = "http://www.zoullou.net/";
$modversion['support_site_name'] = "eXtCal and eXtGallery module for XOOPS : Zoullou.net";
$modversion['submit_bug'] = "http://sourceforge.net/tracker/?func=add&group_id=177145&atid=880070";
-$modversion['submit_feature'] = "http://sourceforge.net/tracker/?func=add&group_id=177145&atid=880073";
-
-?>
+$modversion['submit_feature'] = "http://sourceforge.net/tracker/?func=add&group_id=177145&atid=880073";
\ No newline at end of file
|
