[xoops-svn] SF.net SVN: xoops-svn:[10642] XoopsModules/extcal/trunk/modules/extcal

[<be...@us...>]

Revision: 10642
          http://sourceforge.net/p/xoops/svn/10642
Author:   beckmi
Date:     2013-01-03 12:34:16 +0000 (Thu, 03 Jan 2013)
Log Message:
-----------
- fixed: removed list of events when showing first time the Search form (sabahan/mamba)
- fixed: extCal didn't correctly count recurring events in Search (mamba)
- fixed: Agenda view reflects now start and end time set in Preferences (jcweb/mamba)

Modified Paths:
--------------
    XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt
    XoopsModules/extcal/trunk/modules/extcal/include/agenda_fnc.php
    XoopsModules/extcal/trunk/modules/extcal/language/english/main.php
    XoopsModules/extcal/trunk/modules/extcal/templates/extcal_view_search.html
    XoopsModules/extcal/trunk/modules/extcal/view_search.php

Modified: XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt	2013-01-03 12:18:29 UTC (rev 10641)
+++ XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt	2013-01-03 12:34:16 UTC (rev 10642)
@@ -4,7 +4,10 @@
 - 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)
+- fixed: extCal didn't correctly count recurring events in Search (mamba)
+- fixed: Agenda view reflects now start and end time set in Preferences (jcweb/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/include/agenda_fnc.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/include/agenda_fnc.php	2013-01-03 12:18:29 UTC (rev 10641)
+++ XoopsModules/extcal/trunk/modules/extcal/include/agenda_fnc.php	2013-01-03 12:34:16 UTC (rev 10642)
@@ -104,7 +104,8 @@
                    $formatDate = 'd-m-Y',
                    $formatJour = 'H:i'){
 
-    $tAgenda = agenda_getCanevas($ts, 8, 20, $mPlage, $nbJours); 
+//    $tAgenda = agenda_getCanevas($ts, 8, 20, $mPlage, $nbJours);
+    $tAgenda = agenda_getCanevas($ts, $hStart, $hEnd-1, $mPlage, $nbJours);
     $tk = array_keys($tAgenda);
     $tk0 = $tk[0];
     $tk1 = $tk[count($tk)-1];

Modified: XoopsModules/extcal/trunk/modules/extcal/language/english/main.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/language/english/main.php	2013-01-03 12:18:29 UTC (rev 10641)
+++ XoopsModules/extcal/trunk/modules/extcal/language/english/main.php	2013-01-03 12:34:16 UTC (rev 10642)
@@ -232,4 +232,4 @@
 
 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
+define('_MD_EXTCAL_EVENT_PENDING',"Thank-you for your submission.<br />The event will be visible once it is approved by the webmaster.");
\ 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-03 12:18:29 UTC (rev 10641)
+++ XoopsModules/extcal/trunk/modules/extcal/templates/extcal_view_search.html	2013-01-03 12:34:16 UTC (rev 10642)
@@ -63,26 +63,24 @@
     </td>
   </tr>
 </table>
-
+    <{if $num_tries > 0}>
 <table class="outer" style="border-top: none;">
   <tr>
     <th align='center'>
-      <{$evenements_trouves}>  
+      <{$evenements_trouves}>
     </th>
   </tr>
 </table>
-
+    <{/if}>
 </form>
 
 <{if $num_tries > 0}>
 
 <{include file="db:extcal_event_list1.html"}>
 
-<{/if}>
 
-
-
 <{include file="db:extcal_categorie.html"}>
+<{/if}>
 
 <div style="text-align:right;"><a
         href="<{$xoops_url}>/modules/extcal/rss.php?cat=<{$selectedCat}>"><img

Modified: XoopsModules/extcal/trunk/modules/extcal/view_search.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/view_search.php	2013-01-03 12:18:29 UTC (rev 10641)
+++ XoopsModules/extcal/trunk/modules/extcal/view_search.php	2013-01-03 12:34:16 UTC (rev 10642)
@@ -116,9 +116,10 @@
     $recurEvents = $eventHandler->getRecurEventToDisplay($event, $startMonth, $endMonth);
     // Formating date
     $eventHandler->formatEventsDate($recurEvents, $xoopsModuleConfig['event_date_week']);
-    $eventsArray = array_merge($eventsArray, $recurEvents);
+
 }
 
+$eventsArray = array_merge($eventsArray, $recurEvents);
 
 // Sort event array by event start
 //usort($eventsArray, "orderEvents");