Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[10951] XoopsModules/extcal/trunk/modules/extcal
|
From: <be...@us...> - 2013-01-30 05:43:07
|
Revision: 10951
http://sourceforge.net/p/xoops/svn/10951
Author: beckmi
Date: 2013-01-30 05:43:02 +0000 (Wed, 30 Jan 2013)
Log Message:
-----------
Updating to RC5 (see changelog.txt)
Modified Paths:
--------------
XoopsModules/extcal/trunk/modules/extcal/admin/event.php
XoopsModules/extcal/trunk/modules/extcal/admin/menu.php
XoopsModules/extcal/trunk/modules/extcal/blocks/minical.php
XoopsModules/extcal/trunk/modules/extcal/blocks/upcoming.php
XoopsModules/extcal/trunk/modules/extcal/class/event.php
XoopsModules/extcal/trunk/modules/extcal/class/form/formdatetime.php
XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt
XoopsModules/extcal/trunk/modules/extcal/docs/lang_diff.txt
XoopsModules/extcal/trunk/modules/extcal/include/agenda_fnc.php
XoopsModules/extcal/trunk/modules/extcal/include/constantes.php
XoopsModules/extcal/trunk/modules/extcal/include/functions.php
XoopsModules/extcal/trunk/modules/extcal/language/english/blocks.php
XoopsModules/extcal/trunk/modules/extcal/language/english/modinfo.php
XoopsModules/extcal/trunk/modules/extcal/language/french/blocks.php
XoopsModules/extcal/trunk/modules/extcal/language/french/changelog.txt
XoopsModules/extcal/trunk/modules/extcal/language/french_iso/blocks.php
XoopsModules/extcal/trunk/modules/extcal/language/french_iso/changelog.txt
XoopsModules/extcal/trunk/modules/extcal/language/spanish/blocks.php
XoopsModules/extcal/trunk/modules/extcal/language/spanish/modinfo.php
XoopsModules/extcal/trunk/modules/extcal/templates/extcal_buttons_event.html
XoopsModules/extcal/trunk/modules/extcal/templates/extcal_view_agenda-day.html
XoopsModules/extcal/trunk/modules/extcal/templates/extcal_view_agenda-week.html
XoopsModules/extcal/trunk/modules/extcal/templates/extcal_view_day.html
XoopsModules/extcal/trunk/modules/extcal/templates/extcal_view_search.html
XoopsModules/extcal/trunk/modules/extcal/templates/extcal_view_week.html
XoopsModules/extcal/trunk/modules/extcal/view_day.php
XoopsModules/extcal/trunk/modules/extcal/view_month.php
XoopsModules/extcal/trunk/modules/extcal/view_search.php
XoopsModules/extcal/trunk/modules/extcal/view_week.php
XoopsModules/extcal/trunk/modules/extcal/view_year.php
XoopsModules/extcal/trunk/modules/extcal/xoops_version.php
Added Paths:
-----------
XoopsModules/extcal/trunk/modules/extcal/admin/permissions.php
XoopsModules/extcal/trunk/modules/extcal/blocks/category_events.php
XoopsModules/extcal/trunk/modules/extcal/docs/upgrade.txt
Removed Paths:
-------------
XoopsModules/extcal/trunk/modules/extcal/admin/perm.php
XoopsModules/extcal/trunk/modules/extcal/blocks/catetogy_events.php
XoopsModules/extcal/trunk/modules/extcal/upgrade.txt
Modified: XoopsModules/extcal/trunk/modules/extcal/admin/event.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/admin/event.php 2013-01-30 02:46:51 UTC (rev 10950)
+++ XoopsModules/extcal/trunk/modules/extcal/admin/event.php 2013-01-30 05:43:02 UTC (rev 10951)
@@ -168,8 +168,9 @@
echo '</fieldset><br />';
- xoops_cp_footer();
+ //xoops_cp_footer();
+
break;
@@ -330,6 +331,7 @@
echo '<table class="outer" style="width:100%;">';
echo '<tr style="text-align:center;">';
+ echo '<th>' . _AM_EXTCAL_DELETE. '</th>';
echo '<th>#</th>';
echo '<th>' . _AM_EXTCAL_CATEGORY . '</th>';
echo '<th>' . _AM_EXTCAL_TITLE . '</th>';
@@ -338,7 +340,7 @@
echo '<th>' . _AM_EXTCAL_RECURRENT . '</th>';
echo '<th>' . _AM_EXTCAL_START_RULES . '</th>';
echo '<th>' . _AM_EXTCAL_ACTION . '</th>';
- echo '<th>' . _AM_EXTCAL_DELETE. '</th>';
+
echo '</tr>';
if (count($events) > 0) {
@@ -348,8 +350,12 @@
) {
$class = ($i++ % 2 == 0) ? 'even' : 'odd';
echo '<tr style="text-align:left;" class="' . $class . '">';
- echo '<td>' . $event['event_id'] . '</td>';
- echo '<td>'
+ echo "<td width='10%' align='center'>";
+ echo "<input type='checkbox' name='deleteEvents[{$event['event_id']}]' value='1' >";
+ echo "<input type='hidden' name='deleteAllEvents[{$event['event_id']}]' value='1' />";
+ echo "</td>";
+ echo "<td align = 'center' width='5%'>" . $event['event_id'] . '</td>';
+ echo "<td width='10%'>"
. '<a href=cat.php?op=modify&cat_id='. $event['cat']['cat_id'] . '&form_modify' . '>'
. $event['cat']['cat_name']
. '</a>'
@@ -369,8 +375,8 @@
// }
- echo '<td>' . $event['formated_event_start'] . '</td>';
- echo '<td>' . $event['formated_event_end'] . '</td>';
+ echo "<td align = 'center' width='10%'>" . $event['formated_event_start'] . '</td>';
+ echo "<td align = 'center' width='10%'>" . $event['formated_event_end'] . '</td>';
echo '<td align="center">' . (($event['event_isrecur']==1)?_YES:_NO) . '</td>';
if(!isset($event['formated_reccur_rule'])){
$event['formated_reccur_rule'] = '';
@@ -384,11 +390,7 @@
echo '<a href=event.php?op=clone&event_id='. $event['event_id']. "><img src='". $pathIcon16."/editcopy.png' title='"._AM_EXTCAL_ICONE_CLONE."' /></a>";
echo '</td>';
- echo "<td align='center'>";
- echo "<input type='checkbox' name='deleteEvents[{$event['event_id']}]' value='1' >";
- echo "<input type='hidden' name='deleteAllEvents[{$event['event_id']}]' value='1' />";
- echo "</td>";
-
+
echo '</tr>';
}
//---------------------------------------------------------
Modified: XoopsModules/extcal/trunk/modules/extcal/admin/menu.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/admin/menu.php 2013-01-30 02:46:51 UTC (rev 10950)
+++ XoopsModules/extcal/trunk/modules/extcal/admin/menu.php 2013-01-30 05:43:02 UTC (rev 10951)
@@ -1,55 +1,55 @@
-<?php
-
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
-
-$path = dirname(dirname(dirname(dirname(__FILE__))));
-include_once $path . '/mainfile.php';
-
-$dirname = basename(dirname(dirname(__FILE__)));
-$module_handler = xoops_gethandler('module');
-$module = $module_handler->getByDirname($dirname);
-$pathIcon32 = $module->getInfo('icons32');
-$pathModuleAdmin = $module->getInfo('dirmoduleadmin');
-$pathLanguage = $path . $pathModuleAdmin;
-
-
-if (!file_exists($fileinc = $pathLanguage . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) {
- $fileinc = $pathLanguage . '/language/english/main.php';
-}
-
-include_once $fileinc;
-
-$adminmenu = array();
-
-$i = 1;
-$adminmenu[$i]['title'] = _MI_EXTCAL_INDEX;
-$adminmenu[$i]['link'] = "admin/index.php";
-$adminmenu[$i]["icon"] = $pathIcon32.'/home.png';
-$i++;
-$adminmenu[$i]['title'] = _MI_EXTCAL_CATEGORY;
-$adminmenu[$i]['link'] = "admin/cat.php";
-$adminmenu[$i]["icon"] = $pathIcon32.'/category.png';
-$i++;
-$adminmenu[$i]['title'] = _MI_EXTCAL_EVENT;
-$adminmenu[$i]['link'] = "admin/event.php";
-$adminmenu[$i]["icon"] = $pathIcon32.'/event.png';
-$i++;
-$adminmenu[$i]['title'] = _MI_EXTCAL_ETABLISSEMENTS;
-$adminmenu[$i]['link'] = "admin/etablissement.php";
-//$adminmenu[$i]["icon"] = '../../'.$pathImageAdmin.'/etablissement.png';
-$adminmenu[$i]["icon"] = 'images/icons/32/etablissement.png';
-//echo $adminmenu[$i]["icon"]."<br>";
-
-$i++;
-$adminmenu[$i]['title'] = _MI_EXTCAL_PERMISSIONS;
-$adminmenu[$i]['link'] = "admin/perm.php";
-$adminmenu[$i]["icon"] = $pathIcon32.'/permissions.png';
-//$i++;
-//$adminmenu[$i]['title'] = _MI_EXTCAL_PRUNING;
-//$adminmenu[$i]['link'] = "admin/prune.php";
-//$adminmenu[$i]["icon"] = "images/admin/about.png";
-$i++;
-$adminmenu[$i]["title"] = _MI_EXTCAL_ABOUT;
-$adminmenu[$i]["link"] = "admin/about.php";
-$adminmenu[$i]["icon"] = $pathIcon32.'/about.png';
-?>
+<?php
+
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+
+$path = dirname(dirname(dirname(dirname(__FILE__))));
+include_once $path . '/mainfile.php';
+
+$dirname = basename(dirname(dirname(__FILE__)));
+$module_handler = xoops_gethandler('module');
+$module = $module_handler->getByDirname($dirname);
+$pathIcon32 = $module->getInfo('icons32');
+$pathModuleAdmin = $module->getInfo('dirmoduleadmin');
+$pathLanguage = $path . $pathModuleAdmin;
+
+
+if (!file_exists($fileinc = $pathLanguage . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) {
+ $fileinc = $pathLanguage . '/language/english/main.php';
+}
+
+include_once $fileinc;
+
+$adminmenu = array();
+
+$i = 1;
+$adminmenu[$i]['title'] = _MI_EXTCAL_INDEX;
+$adminmenu[$i]['link'] = "admin/index.php";
+$adminmenu[$i]["icon"] = $pathIcon32.'/home.png';
+$i++;
+$adminmenu[$i]['title'] = _MI_EXTCAL_CATEGORY;
+$adminmenu[$i]['link'] = "admin/cat.php";
+$adminmenu[$i]["icon"] = $pathIcon32.'/category.png';
+$i++;
+$adminmenu[$i]['title'] = _MI_EXTCAL_EVENT;
+$adminmenu[$i]['link'] = "admin/event.php";
+$adminmenu[$i]["icon"] = $pathIcon32.'/event.png';
+$i++;
+$adminmenu[$i]['title'] = _MI_EXTCAL_ETABLISSEMENTS;
+$adminmenu[$i]['link'] = "admin/etablissement.php";
+//$adminmenu[$i]["icon"] = '../../'.$pathImageAdmin.'/etablissement.png';
+$adminmenu[$i]["icon"] = 'images/icons/32/etablissement.png';
+//echo $adminmenu[$i]["icon"]."<br>";
+
+$i++;
+$adminmenu[$i]['title'] = _MI_EXTCAL_PERMISSIONS;
+$adminmenu[$i]['link'] = "admin/permissions.php";
+$adminmenu[$i]["icon"] = $pathIcon32.'/permissions.png';
+//$i++;
+//$adminmenu[$i]['title'] = _MI_EXTCAL_PRUNING;
+//$adminmenu[$i]['link'] = "admin/prune.php";
+//$adminmenu[$i]["icon"] = "images/admin/about.png";
+$i++;
+$adminmenu[$i]["title"] = _MI_EXTCAL_ABOUT;
+$adminmenu[$i]["link"] = "admin/about.php";
+$adminmenu[$i]["icon"] = $pathIcon32.'/about.png';
+?>
Deleted: XoopsModules/extcal/trunk/modules/extcal/admin/perm.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/admin/perm.php 2013-01-30 02:46:51 UTC (rev 10950)
+++ XoopsModules/extcal/trunk/modules/extcal/admin/perm.php 2013-01-30 05:43:02 UTC (rev 10951)
@@ -1,291 +0,0 @@
-<?php
-
-include '../../../include/cp_header.php';
-include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
-include 'admin_header.php';
-
-if (isset($_POST['step'])) {
- $step = $_POST['step'];
-} else {
- $step = 'default';
-}
-
-$moduleId = $xoopsModule->getVar('mid');
-
-switch ($step) {
-
- case 'enreg':
-
- $groupPermissionHandler = xoops_gethandler('groupperm');
-
- // Delete old public mask
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('gperm_name', 'extcal_perm_mask'));
- $criteria->add(new Criteria('gperm_modid', $moduleId));
- $groupPermissionHandler->deleteAll($criteria);
-
- foreach (
- $_POST['perms']['extcal_perm_mask']['group'] as $groupId
- => $perms
- ) {
- foreach (
- array_keys($perms) as $perm
- ) {
- $groupPermissionHandler->addRight('extcal_perm_mask', $perm, $groupId, $moduleId);
- }
- }
-
- redirect_header("perm.php", 3, _AM_EXTCAL_PERM_MASK_UPDATED);
-
- break;
-
- case 'default':
- default:
-
- xoops_cp_header();
- // @author Gregory Mage (Aka Mage)
- //***************************************************************************************
- $permAdmin = new ModuleAdmin();
- echo $permAdmin->addNavigation('perm.php');
- //***************************************************************************************
-
- $memberHandler =& xoops_gethandler('member');
- $groupPermissionHandler =& xoops_gethandler('groupperm');
-
- // Retriving the group list
- $glist =& $memberHandler->getGroupList();
-
- // Retriving Public category permission mask
- $viewGroup = $groupPermissionHandler->getGroupIds('extcal_perm_mask', 1, $moduleId);
- $submitGroup = $groupPermissionHandler->getGroupIds('extcal_perm_mask', 2, $moduleId);
- $autoApproveGroup = $groupPermissionHandler->getGroupIds('extcal_perm_mask', 4, $moduleId);
- $editGroup = $groupPermissionHandler->getGroupIds('extcal_perm_mask', 8, $moduleId);
-
- function getChecked($array, $v)
- {
- if (in_array($v, $array)) {
- return ' checked="checked"';
- } else {
- return '';
- }
- }
-
- echo '<script type="text/javascript" src="../include/admin.js"></script>';
-
- /**
- * Public category permission mask
- */
- echo
- '<fieldset id="defaultBookmark"><legend><a href="#defaultBookmark" style="font-weight:bold; color:#990000;" onClick="toggle(\'default\'); toggleIcon(\'defaultIcon\');"><img id="defaultIcon" src="../images/icons/minus.gif" /> '
- . _AM_EXTCAL_PUBLIC_PERM_MASK
- . '</a></legend><div id="default">';
- echo'<fieldset><legend style="font-weight:bold; color:#0A3760;">'
- . _AM_EXTCAL_INFORMATION . '</legend>';
- echo _AM_EXTCAL_PUBLIC_PERM_MASK_INFO;
- echo '</fieldset><br />';
- echo '<table class="outer" style="width:100%;">';
- echo '<form method="post" action="perm.php">';
- echo '<tr>';
- echo'<th colspan="8" style="text-align:center;">'
- . _AM_EXTCAL_PUBLIC_PERM_MASK . '</th>';
- echo '</tr>';
- echo '<tr>';
- echo'<td class="head" style="text-align:center;">'
- . _AM_EXTCAL_GROUP_NAME . '</td>';
- echo'<td class="head" style="text-align:center;">' . _AM_EXTCAL_CAN_VIEW
- . '</td>';
- echo'<td class="head" style="text-align:center;">'
- . _AM_EXTCAL_CAN_SUBMIT . '</td>';
- echo'<td class="head" style="text-align:center;">'
- . _AM_EXTCAL_AUTO_APPROVE . '</td>';
- echo'<td class="head" style="text-align:center;">' . _AM_EXTCAL_CAN_EDIT
- . '</td>';
- echo '</tr>';
- $i = 0;
- foreach (
- $glist as $k
- => $v
- ) {
- $style = ($i++ % 2 == 0) ? "odd" : "even";
- echo '<tr>';
- echo '<td class="' . $style . '">' . $v . '</td>';
- echo'<td class="' . $style
- . '" style="text-align:center;"><input name="perms[extcal_perm_mask][group]['
- . $k . '][1]" type="checkbox"' . getChecked($viewGroup, $k)
- . ' /></td>';
- echo'<td class="' . $style
- . '" style="text-align:center;"><input name="perms[extcal_perm_mask][group]['
- . $k . '][2]" type="checkbox"' . getChecked($submitGroup, $k)
- . ' /></td>';
- echo'<td class="' . $style
- . '" style="text-align:center;"><input name="perms[extcal_perm_mask][group]['
- . $k . '][4]" type="checkbox"'
- . getChecked($autoApproveGroup, $k) . ' /></td>';
- echo'<td class="' . $style
- . '" style="text-align:center;"><input name="perms[extcal_perm_mask][group]['
- . $k . '][8]" type="checkbox"' . getChecked($editGroup, $k)
- . ' /></td>';
- echo '</tr>';
- }
- echo '<input type="hidden" name="type" value="public" />';
- echo '<input type="hidden" name="step" value="enreg" />';
- echo
- '<tr><td colspan="8" style="text-align:center;" class="head"><input type="submit" value="'
- . _SUBMIT . '" /></td></tr></form>';
- echo '</table><br />';
-
- echo '</div></fieldset><br />';
-
- // Retriving category list for Group perm form
- $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
- $cats = $catHandler->getAllCat($xoopsUser, 'all');
-
- /**
- * Access Form
- */
- $titleOfForm = _AM_EXTCAL_VIEW_PERMISSION;
- $permName = 'extcal_cat_view';
- $permDesc = _AM_EXTCAL_VIEW_PERMISSION_DESC;
- $form = new XoopsGroupPermForm($titleOfForm, $moduleId, $permName, $permDesc, 'admin/perm.php');
- foreach (
- $cats as $cat
- ) {
- $form->addItem($cat->getVar('cat_id'), $cat->getVar('cat_name'));
- }
-
- echo'<fieldset id="' . $permName . 'Bookmark"><legend><a href="#'
- . $permName
- . 'Bookmark" style="font-weight:bold; color:#990000;" onClick="toggle(\''
- . $permName . '\'); toggleIcon(\'' . $permName
- . 'Icon\');"><img id="' . $permName
- . 'Icon" src="../images/icons/minus.gif" /> ' . $titleOfForm
- . '</a></legend><div id="' . $permName . '">';
- echo'<fieldset><legend style="font-weight:bold; color:#0A3760;">'
- . _AM_EXTCAL_INFORMATION . '</legend>';
- echo $permDesc;
- echo '</fieldset>';
-
- if ($catHandler->getCount()) {
- echo $form->render() . '<br />';
- } else {
- redirect_header("cat.php", 2, _AM_EXTCAL_NOPERMSSET, false);
- }
-
- echo '</div></fieldset><br />';
-
-
- /**
- * Submit form
- */
- $titleOfForm = _AM_EXTCAL_SUBMIT_PERMISSION;
- $permName = 'extcal_cat_submit';
- $permDesc = _AM_EXTCAL_SUBMIT_PERMISSION_DESC;
- $form = new XoopsGroupPermForm($titleOfForm, $moduleId, $permName, $permDesc, 'admin/perm.php');
- foreach (
- $cats as $cat
- ) {
- $form->addItem($cat->getVar('cat_id'), $cat->getVar('cat_name'));
- }
-
- echo'<fieldset id="' . $permName . 'Bookmark"><legend><a href="#'
- . $permName
- . 'Bookmark" style="font-weight:bold; color:#990000;" onClick="toggle(\''
- . $permName . '\'); toggleIcon(\'' . $permName
- . 'Icon\');"><img id="' . $permName
- . 'Icon" src="../images/icons/minus.gif" /> ' . $titleOfForm
- . '</a></legend><div id="' . $permName . '">';
- echo'<fieldset><legend style="font-weight:bold; color:#0A3760;">'
- . _AM_EXTCAL_INFORMATION . '</legend>';
- echo $permDesc;
- echo '</fieldset>';
- if ($catHandler->getCount()) {
- echo $form->render() . '<br />';
- } else {
- redirect_header("cat.php", 2, _AM_EXTCAL_NOPERMSSET, false);
- }
-
- echo '</div></fieldset><br />';
-
-
- /**
- * Auto Approve form
- */
- $titleOfForm = _AM_EXTCAL_AUTOAPPROVE_PERMISSION;
- $permName = 'extcal_cat_autoapprove';
- $permDesc = _AM_EXTCAL_AUTOAPPROVE_PERMISSION_DESC;
- $form = new XoopsGroupPermForm($titleOfForm, $moduleId, $permName, $permDesc, 'admin/perm.php');
- foreach (
- $cats as $cat
- ) {
- $form->addItem($cat->getVar('cat_id'), $cat->getVar('cat_name'));
- }
-
- echo'<fieldset id="' . $permName . 'Bookmark"><legend><a href="#'
- . $permName
- . 'Bookmark" style="font-weight:bold; color:#990000;" onClick="toggle(\''
- . $permName . '\'); toggleIcon(\'' . $permName
- . 'Icon\');"><img id="' . $permName
- . 'Icon" src="../images/icons/minus.gif" /> ' . $titleOfForm
- . '</a></legend><div id="' . $permName . '">';
- echo'<fieldset><legend style="font-weight:bold; color:#0A3760;">'
- . _AM_EXTCAL_INFORMATION . '</legend>';
- echo $permDesc;
- echo '</fieldset>';
- if ($catHandler->getCount()) {
- echo $form->render() . '<br />';
- } else {
- redirect_header("cat.php", 2, _AM_EXTCAL_NOPERMSSET, false);
- }
-
- echo '</div></fieldset><br />';
-
- /**
- * Can edit form
- */
- $titleOfForm = _AM_EXTCAL_EDIT_PERMISSION;
- $permName = 'extcal_cat_edit';
- $permDesc = _AM_EXTCAL_EDIT_PERMISSION_DESC;
- $form = new XoopsGroupPermForm($titleOfForm, $moduleId, $permName, $permDesc, 'admin/perm.php');
- foreach (
- $cats as $cat
- ) {
- $form->addItem($cat->getVar('cat_id'), $cat->getVar('cat_name'));
- }
-
- echo'<fieldset id="' . $permName . 'Bookmark"><legend><a href="#'
- . $permName
- . 'Bookmark" style="font-weight:bold; color:#990000;" onClick="toggle(\''
- . $permName . '\'); toggleIcon(\'' . $permName
- . 'Icon\');"><img id="' . $permName
- . 'Icon" src="../images/icons/minus.gif" /> ' . $titleOfForm
- . '</a></legend><div id="' . $permName . '">';
- echo'<fieldset><legend style="font-weight:bold; color:#0A3760;">'
- . _AM_EXTCAL_INFORMATION . '</legend>';
- echo $permDesc;
- echo '</fieldset>';
- if ($catHandler->getCount()) {
- echo $form->render() . '<br />';
- } else {
- redirect_header("cat.php", 2, _AM_EXTCAL_NOPERMSSET, false);
- }
-
- echo '</div></fieldset><br />';
-
-
- /**
- * Script to auto colapse form at page load
- */
- echo '<script type="text/javascript">';
- echo 'toggle(\'extcal_cat_view\'); toggleIcon (\'extcal_cat_viewIcon\');';
- echo 'toggle(\'extcal_cat_submit\'); toggleIcon (\'extcal_cat_submitIcon\');';
- echo 'toggle(\'extcal_cat_autoapprove\'); toggleIcon (\'extcal_cat_autoapproveIcon\');';
- echo 'toggle(\'extcal_cat_edit\'); toggleIcon (\'extcal_cat_editIcon\');';
- echo '</script>';
-
- include 'admin_footer.php';
-
-
- break;
-
-}
-?>
Added: XoopsModules/extcal/trunk/modules/extcal/admin/permissions.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/admin/permissions.php (rev 0)
+++ XoopsModules/extcal/trunk/modules/extcal/admin/permissions.php 2013-01-30 05:43:02 UTC (rev 10951)
@@ -0,0 +1,291 @@
+<?php
+
+include '../../../include/cp_header.php';
+include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
+include 'admin_header.php';
+
+if (isset($_POST['step'])) {
+ $step = $_POST['step'];
+} else {
+ $step = 'default';
+}
+
+$moduleId = $xoopsModule->getVar('mid');
+
+switch ($step) {
+
+ case 'enreg':
+
+ $groupPermissionHandler = xoops_gethandler('groupperm');
+
+ // Delete old public mask
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('gperm_name', 'extcal_perm_mask'));
+ $criteria->add(new Criteria('gperm_modid', $moduleId));
+ $groupPermissionHandler->deleteAll($criteria);
+
+ foreach (
+ $_POST['perms']['extcal_perm_mask']['group'] as $groupId
+ => $perms
+ ) {
+ foreach (
+ array_keys($perms) as $perm
+ ) {
+ $groupPermissionHandler->addRight('extcal_perm_mask', $perm, $groupId, $moduleId);
+ }
+ }
+
+ redirect_header("permissions.php", 3, _AM_EXTCAL_PERM_MASK_UPDATED);
+
+ break;
+
+ case 'default':
+ default:
+
+ xoops_cp_header();
+ // @author Gregory Mage (Aka Mage)
+ //***************************************************************************************
+ $permAdmin = new ModuleAdmin();
+ echo $permAdmin->addNavigation('permissions.php');
+ //***************************************************************************************
+
+ $memberHandler =& xoops_gethandler('member');
+ $groupPermissionHandler =& xoops_gethandler('groupperm');
+
+ // Retriving the group list
+ $glist =& $memberHandler->getGroupList();
+
+ // Retriving Public category permission mask
+ $viewGroup = $groupPermissionHandler->getGroupIds('extcal_perm_mask', 1, $moduleId);
+ $submitGroup = $groupPermissionHandler->getGroupIds('extcal_perm_mask', 2, $moduleId);
+ $autoApproveGroup = $groupPermissionHandler->getGroupIds('extcal_perm_mask', 4, $moduleId);
+ $editGroup = $groupPermissionHandler->getGroupIds('extcal_perm_mask', 8, $moduleId);
+
+ function getChecked($array, $v)
+ {
+ if (in_array($v, $array)) {
+ return ' checked="checked"';
+ } else {
+ return '';
+ }
+ }
+
+ echo '<script type="text/javascript" src="../include/admin.js"></script>';
+
+ /**
+ * Public category permission mask
+ */
+ echo
+ '<fieldset id="defaultBookmark"><legend><a href="#defaultBookmark" style="font-weight:bold; color:#990000;" onClick="toggle(\'default\'); toggleIcon(\'defaultIcon\');"><img id="defaultIcon" src="../images/icons/minus.gif" /> '
+ . _AM_EXTCAL_PUBLIC_PERM_MASK
+ . '</a></legend><div id="default">';
+ echo'<fieldset><legend style="font-weight:bold; color:#0A3760;">'
+ . _AM_EXTCAL_INFORMATION . '</legend>';
+ echo _AM_EXTCAL_PUBLIC_PERM_MASK_INFO;
+ echo '</fieldset><br />';
+ echo '<table class="outer" style="width:100%;">';
+ echo '<form method="post" action="permissions.php">';
+ echo '<tr>';
+ echo'<th colspan="8" style="text-align:center;">'
+ . _AM_EXTCAL_PUBLIC_PERM_MASK . '</th>';
+ echo '</tr>';
+ echo '<tr>';
+ echo'<td class="head" style="text-align:center;">'
+ . _AM_EXTCAL_GROUP_NAME . '</td>';
+ echo'<td class="head" style="text-align:center;">' . _AM_EXTCAL_CAN_VIEW
+ . '</td>';
+ echo'<td class="head" style="text-align:center;">'
+ . _AM_EXTCAL_CAN_SUBMIT . '</td>';
+ echo'<td class="head" style="text-align:center;">'
+ . _AM_EXTCAL_AUTO_APPROVE . '</td>';
+ echo'<td class="head" style="text-align:center;">' . _AM_EXTCAL_CAN_EDIT
+ . '</td>';
+ echo '</tr>';
+ $i = 0;
+ foreach (
+ $glist as $k
+ => $v
+ ) {
+ $style = ($i++ % 2 == 0) ? "odd" : "even";
+ echo '<tr>';
+ echo '<td class="' . $style . '">' . $v . '</td>';
+ echo'<td class="' . $style
+ . '" style="text-align:center;"><input name="perms[extcal_perm_mask][group]['
+ . $k . '][1]" type="checkbox"' . getChecked($viewGroup, $k)
+ . ' /></td>';
+ echo'<td class="' . $style
+ . '" style="text-align:center;"><input name="perms[extcal_perm_mask][group]['
+ . $k . '][2]" type="checkbox"' . getChecked($submitGroup, $k)
+ . ' /></td>';
+ echo'<td class="' . $style
+ . '" style="text-align:center;"><input name="perms[extcal_perm_mask][group]['
+ . $k . '][4]" type="checkbox"'
+ . getChecked($autoApproveGroup, $k) . ' /></td>';
+ echo'<td class="' . $style
+ . '" style="text-align:center;"><input name="perms[extcal_perm_mask][group]['
+ . $k . '][8]" type="checkbox"' . getChecked($editGroup, $k)
+ . ' /></td>';
+ echo '</tr>';
+ }
+ echo '<input type="hidden" name="type" value="public" />';
+ echo '<input type="hidden" name="step" value="enreg" />';
+ echo
+ '<tr><td colspan="8" style="text-align:center;" class="head"><input type="submit" value="'
+ . _SUBMIT . '" /></td></tr></form>';
+ echo '</table><br />';
+
+ echo '</div></fieldset><br />';
+
+ // Retriving category list for Group perm form
+ $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
+ $cats = $catHandler->getAllCat($xoopsUser, 'all');
+
+ /**
+ * Access Form
+ */
+ $titleOfForm = _AM_EXTCAL_VIEW_PERMISSION;
+ $permName = 'extcal_cat_view';
+ $permDesc = _AM_EXTCAL_VIEW_PERMISSION_DESC;
+ $form = new XoopsGroupPermForm($titleOfForm, $moduleId, $permName, $permDesc, 'admin/permissions.php');
+ foreach (
+ $cats as $cat
+ ) {
+ $form->addItem($cat->getVar('cat_id'), $cat->getVar('cat_name'));
+ }
+
+ echo'<fieldset id="' . $permName . 'Bookmark"><legend><a href="#'
+ . $permName
+ . 'Bookmark" style="font-weight:bold; color:#990000;" onClick="toggle(\''
+ . $permName . '\'); toggleIcon(\'' . $permName
+ . 'Icon\');"><img id="' . $permName
+ . 'Icon" src="../images/icons/minus.gif" /> ' . $titleOfForm
+ . '</a></legend><div id="' . $permName . '">';
+ echo'<fieldset><legend style="font-weight:bold; color:#0A3760;">'
+ . _AM_EXTCAL_INFORMATION . '</legend>';
+ echo $permDesc;
+ echo '</fieldset>';
+
+ if ($catHandler->getCount()) {
+ echo $form->render() . '<br />';
+ } else {
+ redirect_header("cat.php", 2, _AM_EXTCAL_NOPERMSSET, false);
+ }
+
+ echo '</div></fieldset><br />';
+
+
+ /**
+ * Submit form
+ */
+ $titleOfForm = _AM_EXTCAL_SUBMIT_PERMISSION;
+ $permName = 'extcal_cat_submit';
+ $permDesc = _AM_EXTCAL_SUBMIT_PERMISSION_DESC;
+ $form = new XoopsGroupPermForm($titleOfForm, $moduleId, $permName, $permDesc, 'admin/permissions.php');
+ foreach (
+ $cats as $cat
+ ) {
+ $form->addItem($cat->getVar('cat_id'), $cat->getVar('cat_name'));
+ }
+
+ echo'<fieldset id="' . $permName . 'Bookmark"><legend><a href="#'
+ . $permName
+ . 'Bookmark" style="font-weight:bold; color:#990000;" onClick="toggle(\''
+ . $permName . '\'); toggleIcon(\'' . $permName
+ . 'Icon\');"><img id="' . $permName
+ . 'Icon" src="../images/icons/minus.gif" /> ' . $titleOfForm
+ . '</a></legend><div id="' . $permName . '">';
+ echo'<fieldset><legend style="font-weight:bold; color:#0A3760;">'
+ . _AM_EXTCAL_INFORMATION . '</legend>';
+ echo $permDesc;
+ echo '</fieldset>';
+ if ($catHandler->getCount()) {
+ echo $form->render() . '<br />';
+ } else {
+ redirect_header("cat.php", 2, _AM_EXTCAL_NOPERMSSET, false);
+ }
+
+ echo '</div></fieldset><br />';
+
+
+ /**
+ * Auto Approve form
+ */
+ $titleOfForm = _AM_EXTCAL_AUTOAPPROVE_PERMISSION;
+ $permName = 'extcal_cat_autoapprove';
+ $permDesc = _AM_EXTCAL_AUTOAPPROVE_PERMISSION_DESC;
+ $form = new XoopsGroupPermForm($titleOfForm, $moduleId, $permName, $permDesc, 'admin/permissions.php');
+ foreach (
+ $cats as $cat
+ ) {
+ $form->addItem($cat->getVar('cat_id'), $cat->getVar('cat_name'));
+ }
+
+ echo'<fieldset id="' . $permName . 'Bookmark"><legend><a href="#'
+ . $permName
+ . 'Bookmark" style="font-weight:bold; color:#990000;" onClick="toggle(\''
+ . $permName . '\'); toggleIcon(\'' . $permName
+ . 'Icon\');"><img id="' . $permName
+ . 'Icon" src="../images/icons/minus.gif" /> ' . $titleOfForm
+ . '</a></legend><div id="' . $permName . '">';
+ echo'<fieldset><legend style="font-weight:bold; color:#0A3760;">'
+ . _AM_EXTCAL_INFORMATION . '</legend>';
+ echo $permDesc;
+ echo '</fieldset>';
+ if ($catHandler->getCount()) {
+ echo $form->render() . '<br />';
+ } else {
+ redirect_header("cat.php", 2, _AM_EXTCAL_NOPERMSSET, false);
+ }
+
+ echo '</div></fieldset><br />';
+
+ /**
+ * Can edit form
+ */
+ $titleOfForm = _AM_EXTCAL_EDIT_PERMISSION;
+ $permName = 'extcal_cat_edit';
+ $permDesc = _AM_EXTCAL_EDIT_PERMISSION_DESC;
+ $form = new XoopsGroupPermForm($titleOfForm, $moduleId, $permName, $permDesc, 'admin/permissions.php');
+ foreach (
+ $cats as $cat
+ ) {
+ $form->addItem($cat->getVar('cat_id'), $cat->getVar('cat_name'));
+ }
+
+ echo'<fieldset id="' . $permName . 'Bookmark"><legend><a href="#'
+ . $permName
+ . 'Bookmark" style="font-weight:bold; color:#990000;" onClick="toggle(\''
+ . $permName . '\'); toggleIcon(\'' . $permName
+ . 'Icon\');"><img id="' . $permName
+ . 'Icon" src="../images/icons/minus.gif" /> ' . $titleOfForm
+ . '</a></legend><div id="' . $permName . '">';
+ echo'<fieldset><legend style="font-weight:bold; color:#0A3760;">'
+ . _AM_EXTCAL_INFORMATION . '</legend>';
+ echo $permDesc;
+ echo '</fieldset>';
+ if ($catHandler->getCount()) {
+ echo $form->render() . '<br />';
+ } else {
+ redirect_header("cat.php", 2, _AM_EXTCAL_NOPERMSSET, false);
+ }
+
+ echo '</div></fieldset><br />';
+
+
+ /**
+ * Script to auto colapse form at page load
+ */
+ echo '<script type="text/javascript">';
+ echo 'toggle(\'extcal_cat_view\'); toggleIcon (\'extcal_cat_viewIcon\');';
+ echo 'toggle(\'extcal_cat_submit\'); toggleIcon (\'extcal_cat_submitIcon\');';
+ echo 'toggle(\'extcal_cat_autoapprove\'); toggleIcon (\'extcal_cat_autoapproveIcon\');';
+ echo 'toggle(\'extcal_cat_edit\'); toggleIcon (\'extcal_cat_editIcon\');';
+ echo '</script>';
+
+ include 'admin_footer.php';
+
+
+ break;
+
+}
+?>
Added: XoopsModules/extcal/trunk/modules/extcal/blocks/category_events.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/blocks/category_events.php (rev 0)
+++ XoopsModules/extcal/trunk/modules/extcal/blocks/category_events.php 2013-01-30 05:43:02 UTC (rev 10951)
@@ -0,0 +1,99 @@
+<?php
+include_once (XOOPS_ROOT_PATH . '/modules/extcal/include/constantes.php');
+
+/******************************************************/
+/* Ajour JJD - Evenements par categries */
+/******************************************************/
+function bExtcalUpcomingByCategoryShow($options)
+{
+global $xoopsUser, $extcalConfig;
+
+ include_once XOOPS_ROOT_PATH . '/modules/extcal/class/config.php';
+
+ // Retriving module config
+// $extcalConfig = ExtcalConfig::getHandler();
+// $xoopsModuleConfig = $extcalConfig->getModuleConfig();
+
+ $eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
+
+ $nbEvent = $options[0];
+ $titleLenght = $options[1];
+ array_shift($options);
+ array_shift($options);
+
+ // Checking if no cat is selected
+ if (count($options) == 1 && $options[0] == 0) {
+ $options = 0;
+ }
+
+ $events = $eventHandler->objectToArray($eventHandler->getUpcommingEvent($nbEvent, $options));
+ $eventHandler->serverTimeToUserTimes($events);
+ $eventHandler->formatEventsDate($events, $extcalConfig['event_date_month']);
+
+ /***********************************************************/
+ $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
+ $t =$catHandler->objectToArray($catHandler->getAllCat($xoopsUser, 'all')) ;
+ $tCats=array();
+ for ($h=0, $count=count($t); $h<$count; $h++){
+ $tCats[$t[$h]['cat_id']] = $t[$h];
+ }
+
+ $te=Array();
+
+ for ($h=0, $count=count($events); $h<$count; $h++){
+ $catId = $events[$h]['cat_id'];
+ if (!isset($te[$catId])){
+ $te[$catId] = $tCats[$catId];
+ $te[$catId]['events'] = array();
+ }
+ $te[$catId]['events'][] = $events[$h];
+ }
+
+
+ return $te;
+}
+
+function bExtcalUpcomingByCategoryEdit($options)
+{
+ global $xoopsUser;
+
+ $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
+
+ $cats = $catHandler->getAllCat($xoopsUser, 'extcal_cat_view');
+
+ $form = _MB_EXTCAL_DISPLAY . " \n";
+ $form .= "<input name=\"options[0]\" size=\"5\" maxlength=\"255\" value=\""
+ . $options[0] . "\" type=\"text\" /> " . _MB_EXTCAL_EVENT
+ . "<br />";
+ $form .= _MB_EXTCAL_TITLE_LENGTH
+ . " : <input name=\"options[1]\" size=\"5\" maxlength=\"255\" value=\""
+ . $options[1] . "\" type=\"text\" /><br />";
+ array_shift($options);
+ array_shift($options);
+ $form .= _MB_EXTCAL_CAT_TO_USE
+ . "<br /><select name=\"options[]\" multiple=\"multiple\" size=\"5\">";
+ if (array_search(0, $options) === false) {
+ $form .= "<option value=\"0\">" . _MB_EXTCAL_ALL_CAT . "</option>";
+ } else {
+ $form
+ .= "<option value=\"0\" selected=\"selected\">" . _MB_EXTCAL_ALL_CAT
+ . "</option>";
+ }
+ foreach (
+ $cats as $cat
+ ) {
+ if (array_search($cat->getVar('cat_id'), $options) === false) {
+ $form .= "<option value=\"" . $cat->getVar('cat_id') . "\">"
+ . $cat->getVar('cat_name') . "</option>";
+ } else {
+ $form .= "<option value=\"" . $cat->getVar('cat_id')
+ . "\" selected=\"selected\">" . $cat->getVar('cat_name')
+ . "</option>";
+ }
+ }
+ $form .= "</select>";
+ return $form;
+}
+
+
+?>
Deleted: XoopsModules/extcal/trunk/modules/extcal/blocks/catetogy_events.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/blocks/catetogy_events.php 2013-01-30 02:46:51 UTC (rev 10950)
+++ XoopsModules/extcal/trunk/modules/extcal/blocks/catetogy_events.php 2013-01-30 05:43:02 UTC (rev 10951)
@@ -1,99 +0,0 @@
-<?php
-include_once (XOOPS_ROOT_PATH . '/modules/extcal/include/constantes.php');
-
-/******************************************************/
-/* Ajour JJD - Evenements par categries */
-/******************************************************/
-function bExtcalUpcomingByCategoryShow($options)
-{
-global $xoopsUser, $extcalConfig;
-
- include_once XOOPS_ROOT_PATH . '/modules/extcal/class/config.php';
-
- // Retriving module config
-// $extcalConfig = ExtcalConfig::getHandler();
-// $xoopsModuleConfig = $extcalConfig->getModuleConfig();
-
- $eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
-
- $nbEvent = $options[0];
- $titleLenght = $options[1];
- array_shift($options);
- array_shift($options);
-
- // Checking if no cat is selected
- if (count($options) == 1 && $options[0] == 0) {
- $options = 0;
- }
-
- $events = $eventHandler->objectToArray($eventHandler->getUpcommingEvent($nbEvent, $options));
- $eventHandler->serverTimeToUserTimes($events);
- $eventHandler->formatEventsDate($events, $extcalConfig['event_date_month']);
-
- /***********************************************************/
- $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
- $t =$catHandler->objectToArray($catHandler->getAllCat($xoopsUser, 'all')) ;
- $tCats=array();
- for ($h=0, $count=count($t); $h<$count; $h++){
- $tCats[$t[$h]['cat_id']] = $t[$h];
- }
-
- $te=Array();
-
- for ($h=0, $count=count($events); $h<$count; $h++){
- $catId = $events[$h]['cat_id'];
- if (!isset($te[$catId])){
- $te[$catId] = $tCats[$catId];
- $te[$catId]['events'] = array();
- }
- $te[$catId]['events'][] = $events[$h];
- }
-
-
- return $te;
-}
-
-function bExtcalUpcomingByCategoryEdit($options)
-{
- global $xoopsUser;
-
- $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
-
- $cats = $catHandler->getAllCat($xoopsUser, 'extcal_cat_view');
-
- $form = _MB_EXTCAL_DISPLAY . " \n";
- $form .= "<input name=\"options[0]\" size=\"5\" maxlength=\"255\" value=\""
- . $options[0] . "\" type=\"text\" /> " . _MB_EXTCAL_EVENT
- . "<br />";
- $form .= _MB_EXTCAL_TITLE_LENGTH
- . " : <input name=\"options[1]\" size=\"5\" maxlength=\"255\" value=\""
- . $options[1] . "\" type=\"text\" /><br />";
- array_shift($options);
- array_shift($options);
- $form .= _MB_EXTCAL_CAT_TO_USE
- . "<br /><select name=\"options[]\" multiple=\"multiple\" size=\"5\">";
- if (array_search(0, $options) === false) {
- $form .= "<option value=\"0\">" . _MB_EXTCAL_ALL_CAT . "</option>";
- } else {
- $form
- .= "<option value=\"0\" selected=\"selected\">" . _MB_EXTCAL_ALL_CAT
- . "</option>";
- }
- foreach (
- $cats as $cat
- ) {
- if (array_search($cat->getVar('cat_id'), $options) === false) {
- $form .= "<option value=\"" . $cat->getVar('cat_id') . "\">"
- . $cat->getVar('cat_name') . "</option>";
- } else {
- $form .= "<option value=\"" . $cat->getVar('cat_id')
- . "\" selected=\"selected\">" . $cat->getVar('cat_name')
- . "</option>";
- }
- }
- $form .= "</select>";
- return $form;
-}
-
-
-?>
Modified: XoopsModules/extcal/trunk/modules/extcal/blocks/minical.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/blocks/minical.php 2013-01-30 02:46:51 UTC (rev 10950)
+++ XoopsModules/extcal/trunk/modules/extcal/blocks/minical.php 2013-01-30 05:43:02 UTC (rev 10951)
@@ -102,7 +102,7 @@
}
//ext_echoArray($events, 'minical');
/***************************************************************/
- //$eventHandler->formatEventDate($events, "l dS \of F Y h:i:s A");
+ //$eventHandler->formatEventDate($events, "l dS \of F Y h:i A");
// Calculating timestamp for the begin and the end of the month
$startMonth = mktime(0, 0, 0, $month, 1, $year);
Modified: XoopsModules/extcal/trunk/modules/extcal/blocks/upcoming.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/blocks/upcoming.php 2013-01-30 02:46:51 UTC (rev 10950)
+++ XoopsModules/extcal/trunk/modules/extcal/blocks/upcoming.php 2013-01-30 05:43:02 UTC (rev 10951)
@@ -15,18 +15,68 @@
$nbEvent = $options[0];
$titleLenght = $options[1];
+ $nbDays = $options[2];
+
array_shift($options);
array_shift($options);
+ array_shift($options);
// Checking if no cat is selected
if (count($options) == 1 && $options[0] == 0) {
$options = 0;
}
- $events = $eventHandler->objectToArray($eventHandler->getUpcommingEvent($nbEvent, $options));
- $eventHandler->serverTimeToUserTimes($events);
+
+ //-------------------
+ //mb $events = $eventHandler->objectToArray($eventHandler->getUpcommingEvent($nbEvent, $options));
+
+ /* ========================================================================== */
+ $year = isset($_GET['year']) ? intval($_GET['year']) : date('Y');
+ $month = isset($_GET['month']) ? intval($_GET['month']) : date('n');
+ $day = isset($_GET['day']) ? intval($_GET['day']) : date('j');
+ $cat = isset($_GET['cat']) ? intval($_GET['cat']) : 0;
+ /* ========================================================================== */
+
+ // Validate the date (day, month and year)
+ $dayTS = mktime(0, 0, 0, $month, $day, $year);
+
+ //$offset = $xoopsModuleConfig['week_start_day'] - date('w', $dayTS);
+ $offset = date('w', $dayTS) + 7-$xoopsModuleConfig['week_start_day']<7 ? date('w', $dayTS) + 7-$xoopsModuleConfig['week_start_day'] : 0;
+
+ $dayTS = $dayTS - ($offset * _EXTCAL_TS_DAY);
+ $year = date('Y', $dayTS);
+ $month = date('n', $dayTS);
+ $day = date('j', $dayTS);
+
+
+ // Retriving events and formatting them
+ //$events = $eventHandler->objectToArray($eventHandler->getEventWeek($day, $month, $year, $cat), array('cat_id'));
+ $criteres = array(
+ 'periode' => _EXTCAL_EVENTS_UPCOMING,
+// 'periode' => _EXTCAL_EVENTS_CALENDAR_WEEK,
+ 'day' => $day,
+ 'month' => $month,
+ 'year' => $year,
+ 'cat' => $cat,
+ 'externalKeys' => 'cat_id',
+ 'nbEvent' => $nbEvent,
+ 'nbDays' => $nbDays
+ );
+ $events = $eventHandler->getEventsOnPeriode($criteres);
+
+
+
+
+
+ //----------------------------
+
+ //$eventHandler->serverTimeToUserTimes($events);
$eventHandler->formatEventsDate($events, $xoopsModuleConfig['event_date_month']);
+ if (count($events)>$nbEvent) {
+ $events=array_slice($events, 0, $nbEvent);
+ }
+
return $events;
}
@@ -45,8 +95,16 @@
$form .= _MB_EXTCAL_TITLE_LENGTH
. " : <input name=\"options[1]\" size=\"5\" maxlength=\"255\" value=\""
. $options[1] . "\" type=\"text\" /><br />";
+
+ $form .= _MB_EXTCAL_UPCOMING_DAYS
+ . " : <input name=\"options[2]\" size=\"5\" maxlength=\"255\" value=\""
+ . $options[2] . "\" type=\"text\" /><br />";
+
+
array_shift($options);
array_shift($options);
+ array_shift($options);
+
$form .= _MB_EXTCAL_CAT_TO_USE
. "<br /><select name=\"options[]\" multiple=\"multiple\" size=\"5\">";
if (array_search(0, $options) === false) {
Modified: XoopsModules/extcal/trunk/modules/extcal/class/event.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/event.php 2013-01-30 02:46:51 UTC (rev 10950)
+++ XoopsModules/extcal/trunk/modules/extcal/class/event.php 2013-01-30 05:43:02 UTC (rev 10951)
@@ -392,6 +392,11 @@
case _EXTCAL_EVENTS_YEAR:
$criteriaCompo = $this->_getEventYearCriteria($year, $cat);
break;
+
+ case _EXTCAL_EVENTS_UPCOMING:
+ $criteriaCompo = $this->_getEventWeekCriteria($day, $month, $year, $cat, $nbDays);
+ break;
+
}
//--------------------------------------------------------------------------
$criteriaCompo->add(new Criteria('event_isrecur', 0, '='));
@@ -435,6 +440,7 @@
case _EXTCAL_EVENTS_WEEK:
case _EXTCAL_EVENTS_CALENDAR_WEEK:
case _EXTCAL_EVENTS_AGENDA_WEEK:
+ case _EXTCAL_EVENTS_UPCOMING:
$start = userTimeToServerTime(mktime(0, 0, 0, $month, $day, $year), $this->_extcalTime->_getUserTimeZone($user));
$end = userTimeToServerTime(
mktime(
@@ -476,6 +482,8 @@
$start = userTimeToServerTime(mktime(0, 0, 0, 1, 1, $year), $this->_extcalTime->_getUserTimeZone($user));
$end = userTimeToServerTime(mktime(0, 0, 0, 12, 31, $year), $this->_extcalTime->_getUserTimeZone($user));
break;
+
+
}
$formatDate = $extcalConfig['event_date_week'];
//--------------------------------------------------------------------------
@@ -573,7 +581,7 @@
return $criteriaCompo;
}
- // Return event occuring on a given year
+ // Return the criteria compo object for event occuring on a given year
function _getEventYearCriteria($year, $cat = 0)
{
$user = $GLOBALS['xoopsUser'];
@@ -676,9 +684,18 @@
$this->_addCatSelectCriteria($criteriaCompo, $cat);
$this->_addCatPermCriteria($criteriaCompo, $GLOBALS['xoopsUser']);
+//mb ---------- TESTING ---------------------------
+// $eventsU = $this->getEventsUniques($criteriaNoRecur);
+// $eventsR = $this->getEventsRecurents($criteriaRecur);
+// $events = array_merge($eventsU, $eventsR);
+ //var_dump($events);
+
$criteriaCompo->setSort('event_start');
$criteriaCompo->setLimit($nbEvent);
+
+ //var_dump($this->getObjects($criteriaCompo));
+//mb -------------------------------------
return $this->getObjects($criteriaCompo);
}
Modified: XoopsModules/extcal/trunk/modules/extcal/class/form/formdatetime.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/form/formdatetime.php 2013-01-30 02:46:51 UTC (rev 10950)
+++ XoopsModules/extcal/trunk/modules/extcal/class/form/formdatetime.php 2013-01-30 05:43:02 UTC (rev 10951)
@@ -23,7 +23,7 @@
$i = 0; $i < 24; $i++
) {
for (
- $j = 0; $j < _EXTCAL_TS_MINUTE; $j = $j + 10
+ $j = 0; $j < _EXTCAL_TS_MINUTE; $j = $j + 15
) {
$key = ($i * _EXTCAL_TS_HOUR) + ($j * _EXTCAL_TS_MINUTE);
$timearray[$key] = ($j != 0) ? $i . ':' . $j : $i . ':0' . $j;
Modified: XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt 2013-01-30 02:46:51 UTC (rev 10950)
+++ XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt 2013-01-30 05:43:02 UTC (rev 10951)
@@ -1,3 +1,12 @@
+2013/01/29: Version 2.37 RC5
+===================================
+- fixed: missing edit/delete icons for Admin in year/month/week/day view (mamba)
+- fixed: missing print icons in week/day views (jcweb/mamba)
+- fixed: date format in Agenda view (jcweb/mamba)
+- fixed: search provides correct results (sabahan/mamba)
+- added: recurring events in "Upcoming events" block (sabahan/mamba)
+- changed time interval in Admin from 10 minutes to 15 minutes (playsome)
+
2013/01/02: Version 2.37 RC4
===================================
- fixed: removed list of events when showing first time the Search form (sabahan/mamba)
@@ -103,7 +112,7 @@
"Day_events.php"
"New_events.php"
"Random_events.php"
- "Catetogy_events.php"
+ "Category_events.php"
- Adding tabs in the data editing an event
Modified: XoopsModules/extcal/trunk/modules/extcal/docs/lang_diff.txt
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/docs/lang_diff.txt 2013-01-30 02:46:51 UTC (rev 10950)
+++ XoopsModules/extcal/trunk/modules/extcal/docs/lang_diff.txt 2013-01-30 05:43:02 UTC (rev 10951)
@@ -6,4 +6,8 @@
modinfo.php:
---------------------
define('_MI_EXTCAL_EMAIL_MODE_DESC', 'Select Email Format that you want to use');
-define('_MI_EXTCAL_SHOW_OTHEROPTIONS', 'Other Options');
\ No newline at end of file
+define('_MI_EXTCAL_SHOW_OTHEROPTIONS', 'Other Options');
+
+blocks.php
+---------------------
+define('_MB_EXTCAL_UPCOMING_DAYS','# of Days to Include in Search');
\ No newline at end of file
Added: XoopsModules/extcal/trunk/modules/extcal/docs/upgrade.txt
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/docs/upgrade.txt (rev 0)
+++ XoopsModules/extcal/trunk/modules/extcal/docs/upgrade.txt 2013-01-30 05:43:02 UTC (rev 10951)
@@ -0,0 +1,3 @@
+How to upgrade :
+
+Overwrite all module files by new ones and update the module in the module admin panel.
\ No newline at end of file
Modified: XoopsModules/extcal/trunk/modules/extcal/include/agenda_fnc.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/include/agenda_fnc.php 2013-01-30 02:46:51 UTC (rev 10950)
+++ XoopsModules/extcal/trunk/modules/extcal/include/agenda_fnc.php 2013-01-30 05:43:02 UTC (rev 10951)
@@ -28,11 +28,16 @@
*******************************************************************/
function agenda_getCanevas($ts, $hStart,$hEnd, $mPlage = 15, $nbJours = 1,
- $formatDate = 'd-m',
- $formatJour = 'H:i'){
+ $formatDate, $formatJour = 'H:i'){
+
+global $xoopsModuleConfig;
$jour = date('d', $ts);
$mois = date('m', $ts);
-$an = date('Y', $ts);
+$an = date('Y', $ts);
+if (!isset($formatDate)) {
+ $formatDate= $xoopsModuleConfig['event_date_week'];
+}
+
//echo "agenda_getCanevas : {$jour}-{$mois}-{$an}-{$ts}<br />";
//$tsStart = mktime($heure, $minute, $seconde, $mois, $jour, $an);
$jName=array(_MD_EXTCAL_DAY_SUNDAY,_MD_EXTCAL_DAY_MONDAY,_MD_EXTCAL_DAY_TUESDAY,_MD_EXTCAL_DAY_WEDNESDAY,_MD_EXTCAL_DAY_THURSDAY,_MD_EXTCAL_DAY_FRIDAY,_MD_EXTCAL_DAY_SATURDAY);
@@ -42,6 +47,8 @@
$tsj = mktime(0, 0, 0, $mois, $jour + $j, $an);
$kj = date(_EXTCAL_FORMAT_AGENDA_KEYD, $tsj);
$tj[$kj]['caption'] = date($formatDate, $tsj);
+
+
$tj[$kj]['events'] = array();
$tj[$kj]['dayWeek'] = date('w', $tsj);
Modified: XoopsModules/extcal/trunk/modules/extcal/include/constantes.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/include/constantes.php 2013-01-30 02:46:51 UTC (rev 10950)
+++ XoopsModules/extcal/trunk/modules/extcal/include/constantes.php 2013-01-30 05:43:02 UTC (rev 10951)
@@ -172,5 +172,5 @@
define("_EXTCAL_INFOBULLE_RGB_MIN", 220);
define("_EXTCAL_INFOBULLE_RGB_MAX", 250);
-
-?>
+//2.37
+define("_EXTCAL_EVENTS_UPCOMING", 7);
\ No newline at end of file
Modified: XoopsModules/extcal/trunk/modules/extcal/include/functions.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/include/functions.php 2013-01-30 02:46:51 UTC (rev 10950)
+++ XoopsModules/extcal/trunk/modules/extcal/include/functions.php 2013-01-30 05:43:02 UTC (rev 10951)
@@ -253,7 +253,7 @@
}
$txt = print_r($t,true);
- echo "<pre>Nombre d'items : " . count($t)
+ echo "<pre>Number of items: " . count($t)
. "<br>{$txt}</pre>";
}
/*****************************************************************/
Modified: XoopsModules/extcal/trunk/modules/extcal/language/english/blocks.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/language/english/blocks.php 2013-01-30 02:46:51 UTC (rev 10950)
+++ XoopsModules/extcal/trunk/modules/extcal/language/english/blocks.php 2013-01-30 05:43:02 UTC (rev 10951)
@@ -28,5 +28,5 @@
define('_MB_EXTCAL_SS_WIDTH','Slideshow width');
define('_MB_EXTCAL_SUBMIT_LINK_TEXT','Submit event');
define('_MB_EXTCAL_TITLE_LENGTH','Title length');
-
-?>
+//2.37
+define('_MB_EXTCAL_UPCOMING_DAYS','# of Days to Include in Search');
\ No newline at end of file
Modified: XoopsModules/extcal/trunk/modules/extcal/language/english/modinfo.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/language/english/modinfo.php 2013-01-30 02:46:51 UTC (rev 10950)
+++ XoopsModules/extcal/trunk/modules/extcal/language/english/modinfo.php 2013-01-30 05:43:02 UTC (rev 10951)
@@ -21,7 +21,7 @@
define('_MI_EXTCAL_BNAME2','Spotlight event');
define('_MI_EXTCAL_BNAME2_DESC','Display spotlight event');
define('_MI_EXTCAL_BNAME3','Upcoming event');
-define('_MI_EXTCAL_BNAME3_DESC','Display X upcoming event');
+define('_MI_EXTCAL_BNAME3_DESC','Display X upcoming events');
define('_MI_EXTCAL_BNAME4',"Today's events");
define('_MI_EXTCAL_BNAME4_DESC','Display event occurring this day');
define('_MI_EXTCAL_BNAME5','New Event');
@@ -48,7 +48,7 @@
define('_MI_EXTCAL_ED_DATE_PATTERN_VALUE', _SHORTDATESTRING);
define('_MI_EXTCAL_EE_DATE_PATTERN','Event: Event view date pattern');
define('_MI_EXTCAL_EE_DATE_PATTERN_DESC','See the Date format on http://www.php.net/manual/en/function.date.php');
-define('_MI_EXTCAL_EE_DATE_PATTERN_VALUE','l dS \of F Y h:i:s A');
+define('_MI_EXTCAL_EE_DATE_PATTERN_VALUE','l dS \of F Y h:i A');
define('_MI_EXTCAL_EM_DATE_PATTERN','Event : Month view date pattern');
define('_MI_EXTCAL_EM_DATE_PATTERN_DESC','See the Date format on http://www.php.net/manual/en/function.date.php');
define('_MI_EXTCAL_EM_DATE_PATTERN_VALUE', _SHORTDATESTRING);
Modified: XoopsModules/extcal/trunk/modules/extcal/language/french/blocks.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/language/french/blocks.php 2013-01-30 02:46:51 UTC (rev 10950)
+++ XoopsModules/extcal/trunk/modules/extcal/language/french/blocks.php 2013-01-30 05:43:02 UTC (rev 10951)
@@ -29,6 +29,5 @@
define('_MB_EXTCAL_SS_TRANS_TIME','Slideshow temps de transition');
define('_MB_EXTCAL_SS_WIDTH','Slideshow largeur');
-
-
-?>
+//2.37
+define('_MB_EXTCAL_UPCOMING_DAYS','# of Days to Include in Search');
\ No newline at end of file
Modified: XoopsModules/extcal/trunk/modules/extcal/language/french/changelog.txt
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/language/french/changelog.txt 2013-01-30 02:46:51 UTC (rev 10950)
+++ XoopsModules/extcal/trunk/modules/extcal/language/french/changelog.txt 2013-01-30 05:43:02 UTC (rev 10951)
@@ -65,7 +65,7 @@
"day_events.php"
"new_events.php"
"random_events.php"
- "catetogy_events.php"
+ "category_events.php"
- Ajout des onglets dans la fiche d'édition d'un evennements
Modified: XoopsModules/extcal/trunk/modules/extcal/language/french_iso/blocks.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/language/french_iso/blocks.php 2013-01-30 02:46:51 UTC (rev 10950)
+++ XoopsModules/extcal/trunk/modules/extcal/language/french_iso/blocks.php 2013-01-30 05:43:02 UTC (rev 10951)
@@ -29,6 +29,5 @@
define('_MB_EXTCAL_SS_TRANS_TIME','Slideshow temps de transition');
define('_MB_EXTCAL_SS_WIDTH','Slideshow largeur');
-
-
-?>
+//2.37
+define('_MB_EXTCAL_UPCOMING_DAYS','# of Days to Include in Search');
\ No newline at end of file
Modified: XoopsModules/extcal/trunk/modules/extcal/language/french_iso/changelog.txt
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/language/french_iso/changelog.txt 2013-01-30 02:46:51 UTC (rev 10950)
+++ XoopsModules/extcal/trunk/modules/extcal/language/french_iso/changelog.txt 2013-01-30 05:43:02 UTC (rev 10951)
@@ -30,7 +30,7 @@
"day_events.php"
"new_events.php"
"random_events.php"
- "catetogy_events.php"
+ "category_events.php"
- Ajout des onglets dans la fiche d'édition d'un evennements
Modified: XoopsModules/extcal/trunk/modules/extcal/language/spanish/blocks.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/language/spanish/blocks.php 2013-01-30 02:46:51 UTC (rev 10950)
+++ XoopsModules/extcal/trunk/modules/extcal/language/spanish/blocks.php 2013-01-30 05:43:02 UTC (rev 10951)
@@ -29,5 +29,5 @@
define('_MB_EXTCAL_SUBMIT_LINK_TEXT','Envíar evento');
define('_MB_EXTCAL_TITLE_LENGTH','Longitud del Título ');
-
-?>
+//2.37
+define('_MB_EXTCAL_UPCOMING_DAYS','# of Days to Include in Search');
\ No newline at end of file
Modified: XoopsModules/extcal/trunk/modules/extcal/language/spanish/modinfo.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/language/spanish/modinfo.php 2013-01-30 02:46:51 UTC (rev 10950)
+++ XoopsModules/extcal/trunk/modules/extcal/language/spanish/modinfo.php 2013-01-30 05:43:02 UTC (rev 10951)
@@ -49,7 +49,7 @@
define('_MI_EXTCAL_ED_DATE_PATTERN_VALUE','_SHORTDATESTRING');
define('_MI_EXTCAL_EE_DATE_PATTERN','Evento: Patrón de fecha en la vista evento');
define('_MI_EXTCAL_EE_DATE_PATTERN_DESC','Ver el formato de fecha en http://www.php.net/manual/es/function.date.php');
-define('_MI_EXTCAL_EE_DATE_PATTERN_VALUE','l dS \de F Y h:i:s A');
+define('_MI_EXTCAL_EE_DATE_PATTERN_VALUE','l dS \de F Y h:i A');
define('_MI_EXTCAL_EM_DATE_PATTERN','Evento: Patrón de fecha en vista Mes');
define(...
[truncated message content] |
