Menu
▾
▴
xoops-svn
|
From: <be...@us...> - 2012-02-13 17:29:13
|
Revision: 8959
http://xoops.svn.sourceforge.net/xoops/?rev=8959&view=rev
Author: beckmi
Date: 2012-02-13 17:29:00 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------
- fix: no view for anonymous
- fix: visibility for past events set in Preferences
- fix: links to icons
- replacing hard-coded date format with _SHORTDATESTRING
Modified Paths:
--------------
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/cat.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/event.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/class/config.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/class/event.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/class/time.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/include/constantes.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/language/french/modinfo.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/language/french_iso/modinfo.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/language/spanish/modinfo.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/new_event.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/post.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/templates/extcal_event.html
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/view_calendar-month.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/view_new-event.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/view_search.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/view_year.php
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/cat.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/cat.php 2012-02-13 17:23:02 UTC (rev 8958)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/cat.php 2012-02-13 17:29:00 UTC (rev 8959)
@@ -3,47 +3,49 @@
include '../../../include/cp_header.php';
include '../../../class/xoopsformloader.php';
include 'admin_header.php';
-include_once(XOOPS_ROOT_PATH . '/modules/extcal/include/functions.php') ;
-include_once(XOOPS_ROOT_PATH . '/modules/extcal/include/constantes.php') ;
-
+include_once(XOOPS_ROOT_PATH . '/modules/extcal/include/functions.php');
+include_once(XOOPS_ROOT_PATH . '/modules/extcal/include/constantes.php');
+
$gepeto = array_merge($_GET, $_POST);
-while (list($k,$v) = each ($gepeto)){
- $$k = $v;
+while (list($k, $v) = each($gepeto)) {
+ $$k = $v;
}
-if (!isset($op)) $op = '';
+if (!isset($op)) {
+ $op = '';
+}
// $t=print_r($gepeto,true);
// echo "<pre>{$t}</pre>";
-switch($op) {
+switch ($op) {
case 'enreg':
// Modify cat
- if(isset($cat_id)) {
+ if (isset($cat_id)) {
$catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
- $varArr = array(
- 'cat_name'=>$cat_name,
- 'cat_desc'=>$cat_desc,
- 'cat_weight'=>$cat_weight,
- 'cat_color'=>substr($cat_color,1),
- 'cat_icone'=>$cat_icone
- );
+ $varArr = array(
+ 'cat_name' => $cat_name,
+ 'cat_desc' => $cat_desc,
+ 'cat_weight'=> $cat_weight,
+ 'cat_color' => substr($cat_color, 1),
+ 'cat_icone' => $cat_icone
+ );
$catHandler->modifyCat($cat_id, $varArr);
redirect_header("cat.php", 3, _AM_EXTCAL_CAT_EDITED, false);
- // Create new cat
+ // Create new cat
} else {
$catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
- $varArr = array(
- 'cat_name'=>$cat_name,
- 'cat_desc'=>$cat_desc,
- 'cat_weight'=>$cat_weight,
- 'cat_color'=>substr($cat_color,1),
- 'cat_icone'=>$cat_icone
- );
+ $varArr = array(
+ 'cat_name' => $cat_name,
+ 'cat_desc' => $cat_desc,
+ 'cat_weight'=> $cat_weight,
+ 'cat_color' => substr($cat_color, 1),
+ 'cat_icone' => $cat_icone
+ );
$catHandler->createCat($varArr);
redirect_header("cat.php", 3, _AM_EXTCAL_CAT_CREATED, false);
}
@@ -55,72 +57,72 @@
xoops_cp_header();
$catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
- $cat = $catHandler->getCat($cat_id, true);
+ //$cat = $catHandler->getCat($cat_id, true);
$form = new XoopsThemeForm(_AM_EXTCAL_ADD_CATEGORY, 'add_cat', 'cat.php?op=enreg', 'post', true);
$form->addElement(new XoopsFormText(_AM_EXTCAL_NAME, 'cat_name', 30, 255), true);
$form->addElement(new XoopsFormDhtmlTextArea(_AM_EXTCAL_DESCRIPTION, 'cat_desc', ''), false);
$form->addElement(new XoopsFormText(_AM_EXTCAL_WEIGHT, 'cat_weight', 30, 5, 0), false);
- $form->addElement(new XoopsFormColorPicker(_AM_EXTCAL_COLOR, 'cat_color',"#FF0000"));
+ $form->addElement(new XoopsFormColorPicker(_AM_EXTCAL_COLOR, 'cat_color', "#FF0000"));
$file_path = XOOPS_ROOT_PATH . '/modules/extcal/css/images';
- $tf= XoopsLists::getImgListAsArray($file_path);
- array_unshift ($tf,"--- aucun ---");
- $xfIcones = new XoopsFormSelect(_AM_EXTCAL_ICONE, "cat_icone", $cat->getVar('cat_icone'), '') ;
+ $tf = XoopsLists::getImgListAsArray($file_path);
+ array_unshift($tf, _MD_EXTCAL_NONE);
+ //$xfIcones = new XoopsFormSelect(_AM_EXTCAL_ICONE, "cat_icone", $cat->getVar('cat_icone'), '');
+ $xfIcones = new XoopsFormSelect(_AM_EXTCAL_ICONE, "cat_icone", '', '');
$xfIcones->addOptionArray($tf);
- $form->addElement($xfIcones, false);
+ $form->addElement($xfIcones, false);
$form->addElement(new XoopsFormButton("", "form_submit", _SEND, "submit"), false);
+
$form->display();
-
-
-
include 'admin_footer.php';
break;
case 'edit':
- xoops_cp_header();
+ xoops_cp_header();
- $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
- if ($cat_id <> 0){
- $cat = $catHandler->getCat($cat_id, true);
- }else{
- $cat = $catHandler->getCat($cat_id, true);
- }
+ $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
+ if ($cat_id <> 0) {
+ $cat = $catHandler->getCat($cat_id, true);
+ } else {
+ $cat = $catHandler->getCat($cat_id, true);
+ }
- echo'<fieldset><legend style="font-weight:bold; color:#990000;">'
- . _AM_EXTCAL_EDIT_CATEGORY . '</legend>';
+ echo'<fieldset><legend style="font-weight:bold; color:#990000;">' . _AM_EXTCAL_EDIT_CATEGORY . '</legend>';
- $form = new XoopsThemeForm(_AM_EXTCAL_ADD_CATEGORY, 'add_cat', 'cat.php?op=enreg', 'post', true);
- $form->addElement(new XoopsFormText(_AM_EXTCAL_NAME, 'cat_name', 30, 255, $cat->getVar('cat_name')), true);
- $form->addElement(new XoopsFormDhtmlTextArea(_AM_EXTCAL_DESCRIPTION, 'cat_desc', $cat->getVar('cat_desc')), false);
- $form->addElement(new XoopsFormText(_AM_EXTCAL_WEIGHT, 'cat_weight', 30, 5, $cat->getVar('cat_weight')), false);
- $form->addElement(
- new XoopsFormColorPicker(_AM_EXTCAL_COLOR, 'cat_color',
- '#' . $cat->getVar('cat_color'))
- );
-
- $file_path = XOOPS_ROOT_PATH . '/modules/extcal/css/images';
- $tf = XoopsLists::getImgListAsArray($file_path);
- array_unshift ($tf,"--- aucun ---");
- $xfIcones = new XoopsFormSelect(_AM_EXTCAL_ICONE, "cat_icone", $cat->getVar('cat_icone'), '') ;
- $xfIcones->addOptionArray($tf);
- $form->addElement($xfIcones, false);
-
- $form->addElement(new XoopsFormHidden('cat_id', $cat->getVar('cat_id')), false);
- $form->addElement(new XoopsFormButton("", "form_submit", _SEND, "submit"), false);
- $form->display();
+ $form = new XoopsThemeForm(_AM_EXTCAL_ADD_CATEGORY, 'add_cat', 'cat.php?op=enreg', 'post', true);
+ $form->addElement(new XoopsFormText(_AM_EXTCAL_NAME, 'cat_name', 30, 255, $cat->getVar('cat_name')), true);
+ $form->addElement(new XoopsFormDhtmlTextArea(_AM_EXTCAL_DESCRIPTION, 'cat_desc', $cat->getVar('cat_desc')), false);
+ $form->addElement(new XoopsFormText(_AM_EXTCAL_WEIGHT, 'cat_weight', 30, 5, $cat->getVar('cat_weight')), false);
+ $form->addElement(
+ new XoopsFormColorPicker(_AM_EXTCAL_COLOR, 'cat_color', '#' . $cat->getVar('cat_color'))
+ );
- echo '</fieldset>';
+ $file_path = XOOPS_ROOT_PATH . '/modules/extcal/css/images';
+ $tf = XoopsLists::getImgListAsArray($file_path);
+ array_unshift($tf, _MD_EXTCAL_NONE);
+ $xfIcones = new XoopsFormSelect(_AM_EXTCAL_ICONE, "cat_icone", $cat->getVar('cat_icone'), '');
+ $xfIcones->addOptionArray($tf);
+ $form->addElement($xfIcones, false);
- xoops_cp_footer();
+ $form->addElement(new XoopsFormHidden('cat_id', $cat->getVar('cat_id')), false);
+ $form->addElement(new XoopsFormButton("", "form_submit", _SEND, "submit"), false);
+ $form->display();
+
+ echo '</fieldset>';
+
+ xoops_cp_footer();
break;
-
+
case 'delete':
if (!isset($confirm)) {
xoops_cp_header();
- $hiddens = array('cat_id' => $cat_id, 'form_delete' => '', 'confirm' => 1);
+ $hiddens = array('cat_id' => $cat_id,
+ 'form_delete' => '',
+ 'confirm' => 1
+ );
xoops_confirm($hiddens, 'cat.php?op=delete', _AM_EXTCAL_CONFIRM_DELETE_CAT, _DELETE, 'cat.php');
xoops_cp_footer();
@@ -236,23 +238,23 @@
// include 'admin_footer.php';
//
// break;
-
-
+
+
case 'list':
default:
xoops_cp_header();
$categoryAdmin = new ModuleAdmin();
echo $categoryAdmin->addNavigation('cat.php');
- $categoryAdmin->addItemButton('Add Category', 'cat.php?op=new&id=0', 'add' , '');
+ $categoryAdmin->addItemButton('Add Category', 'cat.php?op=new', 'add', '');
echo $categoryAdmin->renderButton('right', '');
-
+
$catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
- $cats =$catHandler->getAllCatById($xoopsUser);
+ $cats = $catHandler->getAllCatById($xoopsUser);
- $xoopsTpl->assign("cats", $cats);
+ $xoopsTpl->assign("cats", $cats);
//$xoopsTpl->assign("module_dirname", $xoopsModule->getVar("dirname") );
-
+
$xoopsTpl->display("db:admin/extcal_admin_cat_list.html");
include "admin_footer.php";
break;
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/event.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/event.php 2012-02-13 17:23:02 UTC (rev 8958)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/event.php 2012-02-13 17:29:00 UTC (rev 8959)
@@ -54,16 +54,16 @@
// echo "<pre>{$t}</pre><br>";
// exit;
// If the date format is wrong
- if (
- !preg_match(_EXTCAL_MOTIF_DATE, $_POST['event_start']['date'])
- || !preg_match(_EXTCAL_MOTIF_DATE, $_POST['event_end']['date'])
- ) {
- redirect_header(
- 'event.php', 3, _MD_EXTCAL_WRONG_DATE_FORMAT . "<br />"
- . implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())
- );
- exit;
- }
+// if (
+// !preg_match(_EXTCAL_MOTIF_DATE, $_POST['event_start']['date'])
+// || !preg_match(_EXTCAL_MOTIF_DATE, $_POST['event_end']['date'])
+// ) {
+// redirect_header(
+// 'event.php', 3, _MD_EXTCAL_WRONG_DATE_FORMAT . "<br />"
+// . implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())
+// );
+// exit;
+// }
//exit;
///////////////////////////////////////////////////////////////////////////////
@@ -306,7 +306,7 @@
$eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
$events = $eventHandler->objectToArray($eventHandler->getNewEvent($start, $nbEventsByPage, 0, true), array('cat_id'));
- $eventHandler->formatEventsDate($events, 'd/m/Y');
+ $eventHandler->formatEventsDate($events, _SHORTDATESTRING);
echo'<fieldset><legend style="font-weight:bold; color:#990000;">' . _AM_EXTCAL_APPROVED_EVENT . '</legend>';
echo'<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _AM_EXTCAL_INFORMATION . '</legend>';
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/class/config.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/class/config.php 2012-02-13 17:23:02 UTC (rev 8958)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/class/config.php 2012-02-13 17:29:00 UTC (rev 8959)
@@ -7,7 +7,7 @@
class ExtcalConfig
{
- function &getHandler()
+ static function &getHandler()
{
static $configHandler;
if (!isset($configHandler[0])) {
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/class/event.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/class/event.php 2012-02-13 17:23:02 UTC (rev 8958)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/class/event.php 2012-02-13 17:29:00 UTC (rev 8959)
@@ -19,13 +19,13 @@
var $externalKey = array();
- function ExtcalEvent()
+ function __construct()
{
$this->initVar('event_id', XOBJ_DTYPE_INT, null, false);
$this->initVar('cat_id', XOBJ_DTYPE_INT, null, true);
$this->initVar('event_title', XOBJ_DTYPE_TXTBOX, null, true, 255);
$this->initVar('event_desc', XOBJ_DTYPE_TXTAREA, '', false);
- $this->initVar('event_organisateur', XOBJ_DTYPE_TXTBOX, '', false);
+ $this->initVar('event_organisateur', XOBJ_DTYPE_TXTBOX, '', false);
$this->initVar('event_contact', XOBJ_DTYPE_TXTBOX, '', false);
$this->initVar('event_url', XOBJ_DTYPE_URL, '', false);
$this->initVar('event_email', XOBJ_DTYPE_TXTBOX, '', false);
@@ -41,15 +41,25 @@
$this->initVar('event_recur_start', XOBJ_DTYPE_INT, 0, false);
$this->initVar('event_recur_end', XOBJ_DTYPE_INT, 0, false);
$this->initVar('dohtml', XOBJ_DTYPE_INT, 0, false);
- $this->initVar('event_picture1', XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar('event_picture2', XOBJ_DTYPE_TXTBOX, null, false);
- //$this->initVar("event_price",XOBJ_DTYPE_OTHER,null,false,10);
- $this->initVar('event_price', XOBJ_DTYPE_TXTBOX, '', false);
- $this->initVar('event_etablissement', XOBJ_DTYPE_INT, 5, false);
- $this->initVar('event_icone', XOBJ_DTYPE_TXTBOX, '', false);
+ $this->initVar('event_picture1', XOBJ_DTYPE_TXTBOX, null, false);
+ $this->initVar('event_picture2', XOBJ_DTYPE_TXTBOX, null, false);
+ //$this->initVar("event_price",XOBJ_DTYPE_OTHER,null,false,10);
+ $this->initVar('event_price', XOBJ_DTYPE_TXTBOX, '', false);
+ $this->initVar('event_etablissement', XOBJ_DTYPE_INT, 5, false);
+ $this->initVar('event_icone', XOBJ_DTYPE_TXTBOX, '', false);
- $this->externalKey['cat_id'] = array('className' => 'cat', 'getMethodeName' => 'getCat', 'keyName' => 'cat', 'core' => false);
- $this->externalKey['event_submitter'] = array('className' => 'user', 'getMethodeName' => 'get', 'keyName' => 'user', 'core' => true);
+ $this->externalKey['cat_id'] = array(
+ 'className' => 'cat',
+ 'getMethodeName' => 'getCat',
+ 'keyName' => 'cat',
+ 'core' => false
+ );
+ $this->externalKey['event_submitter'] = array(
+ 'className' => 'user',
+ 'getMethodeName' => 'get',
+ 'keyName' => 'user',
+ 'core' => true
+ );
}
function getExternalKey($key)
@@ -66,12 +76,12 @@
private $_extcalTime;
private $_extcalConfig;
- function ExtcalEventHandler(&$db)
+ function __construct(&$db)
{
$this->_extcalPerm = ExtcalPerm::getHandler();
$this->_extcalTime = ExtcalTime::getHandler();
-// $extcalConfig = ExtcalConfig::getHandler();
-// $this->_extcalConfig = $extcalConfig->getModuleConfig();
+ // $extcalConfig = ExtcalConfig::getHandler();
+ // $this->_extcalConfig = $extcalConfig->getModuleConfig();
$this->ExtcalPersistableObjectHandler($db, 'extcal_event', _EXTCAL_CLN_EVENT, 'event_id');
}
@@ -115,7 +125,7 @@
*/
$this->delete($eventId, true);
}
-
+
function deleteAllEvents($criteria = null, $force = true, $asObject = false)
{
/* TODO :
@@ -132,10 +142,10 @@
$rst = $this->getObjects($criteria, $asObject);
- if ($asObject){
- return $rst;
- }else{
- return $this->objectToArray($rst);
+ if ($asObject) {
+ return $rst;
+ } else {
+ return $this->objectToArray($rst);
}
}
@@ -158,8 +168,8 @@
return false;
}
}
-
+
// Return one event selected by his id (approve or not)
function getEventWithNotApprove($eventId, $skipPerm = false)
{
@@ -182,11 +192,13 @@
function formatEventsDate(&$events, $pattern)
{
$max = count($events);
- for ($i = 0; $i < $max; $i++) {
+ for (
+ $i = 0; $i < $max; $i++
+ ) {
$this->formatEventDate($events[$i], $pattern);
}
}
-
+
// function getPicture1(&$event) {
// return $event['event_picture1'];
// }
@@ -201,10 +213,10 @@
{
if (!$event['event_isrecur']) {
$event['formated_event_start'] = $this->_extcalTime->getFormatedDate($pattern, $event['event_start']);
- $event['formated_event_end'] = $this->_extcalTime->getFormatedDate($pattern, $event['event_end']);
+ $event['formated_event_end'] = $this->_extcalTime->getFormatedDate($pattern, $event['event_end']);
} else {
$event['formated_event_start'] = $this->_extcalTime->getFormatedDate($pattern, $event['event_start']);
- $event['formated_event_end'] = $this->_extcalTime->getFormatedDate($pattern, $event['event_end']);
+ $event['formated_event_end'] = $this->_extcalTime->getFormatedDate($pattern, $event['event_end']);
$event['formated_reccur_rule'] = $this->_extcalTime->getFormatedReccurRule($event['event_recur_rules']);
}
$event['formated_event_submitdate'] = $this->_extcalTime->getFormatedDate($pattern, $event['event_submitdate']);
@@ -233,9 +245,9 @@
{
$data['event_start'] = strtotime($data['event_start']['date']) + $data['event_start']['time'];
- $data['event_end'] = strtotime($data['event_end']['date']) + $data['event_end']['time'];
-
+ $data['event_end'] = strtotime($data['event_end']['date']) + $data['event_end']['time'];
+
if ($data['have_end'] == 0 || $data['event_start'] > $data['event_end']
) {
$data['event_end'] = $data['event_start'];
@@ -249,7 +261,7 @@
$user = $GLOBALS['xoopsUser'];
$data['event_start'] = userTimeToServerTime($data['event_start'], $this->_extcalTime->_getUserTimeZone($user));
- $data['event_end'] = userTimeToServerTime($data['event_end'], $this->_extcalTime->_getUserTimeZone($user));
+ $data['event_end'] = userTimeToServerTime($data['event_end'], $this->_extcalTime->_getUserTimeZone($user));
}
@@ -258,8 +270,8 @@
$user = $GLOBALS['xoopsUser'];
- $data['event_start'] = xoops_getUserTimestamp($data['event_start'], $this->_extcalTime->_getUserTimeZone($user));
- $data['event_end'] = xoops_getUserTimestamp($data['event_end'], $this->_extcalTime->_getUserTimeZone($user));
+ $data['event_start'] = xoops_getUserTimestamp($data['event_start'], $this->_extcalTime->_getUserTimeZone($user));
+ $data['event_end'] = xoops_getUserTimestamp($data['event_end'], $this->_extcalTime->_getUserTimeZone($user));
$data['event_submitdate'] = xoops_getUserTimestamp($data['event_submitdate'], $this->_extcalTime->_getUserTimeZone($user));
}
@@ -267,6 +279,7 @@
function serverTimeToUserTimes(&$events)
{
$max = count($events);
+
for (
$i = 0; $i < $max; $i++
) {
@@ -276,235 +289,261 @@
function _addRecurValue(&$data)
{
- $data['event_isrecur'] = $this->getIsRecur($_POST);
+ $data['event_isrecur'] = $this->getIsRecur($_POST);
$data['event_recur_rules'] = $this->getRecurRules($_POST);
$data['event_recur_start'] = $this->getRecurStart($data, $_POST);
- $data['event_recur_end'] = $this->getRecurEnd($data, $_POST);
+ $data['event_recur_end'] = $this->getRecurEnd($data, $_POST);
}
/***************************************************************
- * Return events on perioe
- ***************************************************************/
- function getEventsOnPeriode($criteres){
- //ext_echoArray($criteres);
- global $extcalConfig;
-
- $eventsU = $this->getEventsUniques($criteres);
- $eventsR = $this->getEventsRecurents($criteres);
- $events = array_merge($eventsU, $eventsR);
-// $events = $eventsU;
-
- //ext_echoArray($events);
+ * Return events on perioe
+ ***************************************************************/
+ function getEventsOnPeriode($criteres)
+ {
+ //ext_echoArray($criteres);
+ global $extcalConfig;
- //Tri des evennement par date ascendante
- $ordre = array();
- $eventArray = array();
-
- while(list($k,$v)=each($events)){
- $ordre[] = intval($v['event_start']);
- $this->formatEventDate($v, $extcalConfig['event_date_week']);
- //$v['cat']['cat_light_color'] = $v['cat']['cat_color'];
- $v['cat']['cat_light_color'] = eclaircirCouleur($v['cat']['cat_color'],_EXTCAL_INFOBULLE_RGB_MIN,_EXTCAL_INFOBULLE_RGB_MAX);
-if ($v['event_icone'] == '') $v['event_icone'] = $v['cat']['cat_icone'];
- $eventArray[]= $v;
- }
- array_multisort($eventArray, SORT_ASC, SORT_NUMERIC, $ordre, SORT_ASC, SORT_NUMERIC);
-
- return $eventArray ;
+ $eventsU = $this->getEventsUniques($criteres);
+ $eventsR = $this->getEventsRecurents($criteres);
+ $events = array_merge($eventsU, $eventsR);
+
+ // $events = $eventsU;
+
+ //ext_echoArray($events);
+
+ //Tri des evennement par date ascendante
+ $ordre = array();
+ $eventArray = array();
+
+ while (list($k, $v) = each($events)) {
+ $ordre[] = intval($v['event_start']);
+ $this->formatEventDate($v, $extcalConfig['event_date_week']);
+ //$v['cat']['cat_light_color'] = $v['cat']['cat_color'];
+ $v['cat']['cat_light_color'] = eclaircirCouleur($v['cat']['cat_color'], _EXTCAL_INFOBULLE_RGB_MIN, _EXTCAL_INFOBULLE_RGB_MAX);
+ if ($v['event_icone'] == '') {
+ $v['event_icone'] = $v['cat']['cat_icone'];
+ }
+ $eventArray[] = $v;
+ }
+ array_multisort($eventArray, SORT_ASC, SORT_NUMERIC, $ordre, SORT_ASC, SORT_NUMERIC);
+
+ return $eventArray;
}
+
/*****************************************************************
*
- *****************************************************************/
- function getEventsUniques($criteres){
- while (list($k,$v) = each ($criteres) ){
- $$k = $v;
- }
- if (!isset($nbDays)) $nbDays = 7;
- if (!isset($sens)) $sens = 'ASC';
- if (!isset($externalKeys)) $externalKeys = array('cat_id');
- //------------------------------------------------------
- switch ($periode){
- case _EXTCAL_EVENTS_WEEK:
- case _EXTCAL_EVENTS_CALENDAR_WEEK:
- case _EXTCAL_EVENTS_AGENDA_WEEK:
- $criteriaCompo = $this->_getEventWeekCriteria($day, $month, $year, $cat, $nbDays);
- if (!$this->_extcalConfig['diplay_past_event_cal']) {
- $criteriaCompo->add(new Criteria('event_end', time(), '>'));
- }
- break;
-
-
-
-
-
- case _EXTCAL_EVENTS_MONTH:
- case _EXTCAL_EVENTS_CALENDAR_MONTH:
- $criteriaCompo = $this->_getEventMonthCriteria($month, $year, $cat);
- if (!$this->_extcalConfig['diplay_past_event_cal']) {
- $criteriaCompo->add(new Criteria('event_end', time(), '>'));
+ *****************************************************************/
+ function getEventsUniques($criteres)
+ {
+ global $extcalConfig;
+ while (list($k, $v) = each($criteres)) {
+ $$k = $v;
+
}
- break;
-
- case _EXTCAL_EVENTS_DAY:
- $criteriaCompo = $this->_getEventDayCriteria($day, $month, $year, $cat);
- break;
-
- case _EXTCAL_EVENTS_YEAR:
- $criteriaCompo = $this->_getEventYearCriteria($year, $cat);
- break;
- }
- //--------------------------------------------------------------------------
- $criteriaCompo->add(new Criteria('event_isrecur', 0, '='));
- $criteriaCompo->setOrder($sens);
-
- $result = $this->getObjects($criteriaCompo);
- $events = $this->objectToArray($result, $externalKeys);
- $this->serverTimeToUserTimes($events);
-
- return $events;
-
+ if (!isset($nbDays)) {
+ $nbDays = 7;
+ }
+ if (!isset($sens)) {
+ $sens = 'ASC';
+ }
+ if (!isset($externalKeys)) {
+ $externalKeys = array('cat_id');
+ }
+ //------------------------------------------------------
+ switch ($periode) {
+ case _EXTCAL_EVENTS_WEEK:
+ case _EXTCAL_EVENTS_CALENDAR_WEEK:
+ case _EXTCAL_EVENTS_AGENDA_WEEK:
+ $criteriaCompo = $this->_getEventWeekCriteria($day, $month, $year, $cat, $nbDays);
+ if (!$extcalConfig['diplay_past_event_cal']) {
+ $criteriaCompo->add(new Criteria('event_end', time(), '>'));
+ }
+ break;
+
+ case _EXTCAL_EVENTS_MONTH:
+ case _EXTCAL_EVENTS_CALENDAR_MONTH:
+ $criteriaCompo = $this->_getEventMonthCriteria($month, $year, $cat);
+
+ if (!$extcalConfig['diplay_past_event_cal']) {
+ $criteriaCompo->add(new Criteria('event_end', time(), '>'));
+ }
+ break;
+
+ case _EXTCAL_EVENTS_DAY:
+ $criteriaCompo = $this->_getEventDayCriteria($day, $month, $year, $cat);
+ break;
+
+ case _EXTCAL_EVENTS_YEAR:
+ $criteriaCompo = $this->_getEventYearCriteria($year, $cat);
+ break;
+ }
+ //--------------------------------------------------------------------------
+ $criteriaCompo->add(new Criteria('event_isrecur', 0, '='));
+ $criteriaCompo->setOrder($sens);
+
+ $result = $this->getObjects($criteriaCompo);
+ $events = $this->objectToArray($result, $externalKeys);
+ $this->serverTimeToUserTimes($events);
+ return $events;
+
}
-
+
/*****************************************************************
* evennement r\xE9curents
- *****************************************************************/
+ *****************************************************************/
- function getEventsRecurents($criteres){
- global $extcalConfig;
-
- while (list($k,$v) = each ($criteres) ){
- $$k = $v;
- }
- if (!isset($nbDays)) $nbDays = 7;
- if (!isset($sens)) $sens = 'ASC';
- if (!isset($externalKeys)) $externalKeys = array('cat_id');
+ function getEventsRecurents($criteres)
+ {
+ global $extcalConfig;
+
+ while (list($k, $v) = each($criteres)) {
+ $$k = $v;
+ }
+ if (!isset($nbDays)) {
+ $nbDays = 7;
+ }
+ if (!isset($sens)) {
+ $sens = 'ASC';
+ }
+ if (!isset($externalKeys)) {
+ $externalKeys = array('cat_id');
+ }
$user = $GLOBALS['xoopsUser'];
- //------------------------------------------------------
-
+ //------------------------------------------------------
-
+
$criteriaCompo = new CriteriaCompo();
-
- switch ($periode){
- case _EXTCAL_EVENTS_WEEK:
- case _EXTCAL_EVENTS_CALENDAR_WEEK:
- case _EXTCAL_EVENTS_AGENDA_WEEK:
- $start = userTimeToServerTime(mktime(0, 0, 0, $month, $day, $year), $this->_extcalTime->_getUserTimeZone($user));
- $end = userTimeToServerTime(mktime(0, 0, 0, $month, $day + $nbDays + 1, $year), $this->_extcalTime->_getUserTimeZone($user));
- //$end = $start + (($nbDays + 1 )* _EXTCAL_TS_DAY);
- //$end = userTimeToServerTime(mktime(0, 0, 0, $month, $day+(($nbJours)+1 * _EXTCAL_TS_DAY), $year), $this->_extcalTime->_getUserTimeZone($user));;
- break;
-
-
-
-
- case _EXTCAL_EVENTS_MONTH:
- case _EXTCAL_EVENTS_CALENDAR_MONTH:
- $start = userTimeToServerTime(mktime(0, 0, 0, $month, 1, $year), $this->_extcalTime->_getUserTimeZone($user));
- $end = userTimeToServerTime(mktime(23, 59, 59, $month+1, 1, $year)-_EXTCAL_TS_DAY, $this->_extcalTime->_getUserTimeZone($user));
- $criteriaCompo->add(new Criteria('event_start', $end, '<='));
- //$criteriaCompo->add(new Criteria('event_end', $start, '>='));
-
-
+ switch ($periode) {
+ case _EXTCAL_EVENTS_WEEK:
+ case _EXTCAL_EVENTS_CALENDAR_WEEK:
+ case _EXTCAL_EVENTS_AGENDA_WEEK:
+ $start = userTimeToServerTime(mktime(0, 0, 0, $month, $day, $year), $this->_extcalTime->_getUserTimeZone($user));
+ $end = userTimeToServerTime(
+ mktime(
+ 0, 0, 0, $month, $day + $nbDays + 1, $year
+ ), $this->_extcalTime->_getUserTimeZone($user)
+ );
+ //$end = $start + (($nbDays + 1 )* _EXTCAL_TS_DAY);
+ //$end = userTimeToServerTime(mktime(0, 0, 0, $month, $day+(($nbJours)+1 * _EXTCAL_TS_DAY), $year), $this->_extcalTime->_getUserTimeZone($user));;
+ break;
- break;
-
- case _EXTCAL_EVENTS_DAY:
- $start = userTimeToServerTime(mktime(0, 0, 0, $month, $day, $year), $this->_extcalTime->_getUserTimeZone($user));
- $end = userTimeToServerTime(mktime(0, 0, 0, $month, $day+1, $year), $this->_extcalTime->_getUserTimeZone($user));;
- //$criteriaCompo->add(new Criteria('event_start', $end, '<='));
-
- break;
-
- case _EXTCAL_EVENTS_YEAR:
- $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'];
- //--------------------------------------------------------------------------
- $criteriaCompo->add(new Criteria('event_isrecur', 1, '='));
- $criteriaCompo->setOrder($sens);
-
- $result = $this->getObjects($criteriaCompo);
- $events = $this->objectToArray($result, $externalKeys);
- $this->serverTimeToUserTimes($events);
-
- //Balyage de tous les evennements r\xE9currents et creation de toutes le events
- $eventsR = array();
- while (list($k,$event) = each($events)){
- //$te = $this->GetInterval($event, $start, $end);
- //$eventsR = array_merge($eventsR, $te);
- //echo 'event : ' . $event['event_id'] . '<br>';
- //ext_echoArray($event);
- $recurEvents = $this->getRecurEventToDisplay($event, $start, $end);
- if (count($recurEvents)>0){
- $eventsR = array_merge($eventsR, $recurEvents);
+ case _EXTCAL_EVENTS_MONTH:
+ case _EXTCAL_EVENTS_CALENDAR_MONTH:
+ $start = userTimeToServerTime(mktime(0, 0, 0, $month, 1, $year), $this->_extcalTime->_getUserTimeZone($user));
+ $end = userTimeToServerTime(
+ mktime(23, 59, 59, $month + 1, 1, $year)
+ - _EXTCAL_TS_DAY, $this->_extcalTime->_getUserTimeZone($user)
+ );
+
+ $criteriaCompo->add(new Criteria('event_start', $end, '<='));
+ //$criteriaCompo->add(new Criteria('event_end', $start, '>='));
+
+
+ break;
+
+ case _EXTCAL_EVENTS_DAY:
+ $start = userTimeToServerTime(mktime(0, 0, 0, $month, $day, $year), $this->_extcalTime->_getUserTimeZone($user));
+ $end = userTimeToServerTime(
+ mktime(
+ 0, 0, 0, $month, $day + 1, $year
+ ), $this->_extcalTime->_getUserTimeZone($user)
+ );
+ ;
+ //$criteriaCompo->add(new Criteria('event_start', $end, '<='));
+
+ break;
+
+ case _EXTCAL_EVENTS_YEAR:
+ $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;
}
-
- // Formating date
- //$eventsR = array_merge($eventsArray, $recurEvents);
-
- }
-
-
-
- return $eventsR;
-
+ $formatDate = $extcalConfig['event_date_week'];
+ //--------------------------------------------------------------------------
+ $criteriaCompo->add(new Criteria('event_isrecur', 1, '='));
+ $criteriaCompo->setOrder($sens);
+
+ $result = $this->getObjects($criteriaCompo);
+ $events = $this->objectToArray($result, $externalKeys);
+ $this->serverTimeToUserTimes($events);
+
+ //Balyage de tous les evennements r\xE9currents et creation de toutes le events
+ $eventsR = array();
+ while (list($k, $event) = each($events)) {
+ //$te = $this->GetInterval($event, $start, $end);
+ //$eventsR = array_merge($eventsR, $te);
+ //echo 'event : ' . $event['event_id'] . '<br>';
+ //ext_echoArray($event);
+ $recurEvents = $this->getRecurEventToDisplay($event, $start, $end);
+ if (count($recurEvents) > 0) {
+ $eventsR = array_merge($eventsR, $recurEvents);
+ }
+
+ // Formating date
+ //$eventsR = array_merge($eventsArray, $recurEvents);
+
+ }
+
+
+ return $eventsR;
+
}
/*****************************************************************
- *
- *****************************************************************/
- function echoDateArray($period, $caption=''){
- if ($caption!=''){
- echo "<hr>echoDateArray -> {$caption}<br>";
- }else{
- echo "<hr>echoDateArray<br>";
- }
-
- reset($period);
- foreach ( $period as $dt ) {
- echo $dt->format( "l d-m-Y H:i:s\n" ).'<br>';
- }
-
+ *
+ *****************************************************************/
+ function echoDateArray($period, $caption = '')
+ {
+ if ($caption != '') {
+ echo "<hr>echoDateArray -> {$caption}<br>";
+ } else {
+ echo "<hr>echoDateArray<br>";
+ }
+
+ reset($period);
+ foreach (
+ $period as $dt
+ ) {
+ echo $dt->format("l d-m-Y H:i:s\n") . '<br>';
+ }
+
}
-
-
-
+
+
/*****************************************************************
* Criteria
- *****************************************************************/
+ *****************************************************************/
// Return the criteria compo object for a day
function _getEventDayCriteria($day, $month, $year, $cat = 0)
- {
-
+ {
+
$user = $GLOBALS['xoopsUser'];
- $dayStart = userTimeToServerTime(mktime(0, 0, 0, $month, $day, $year), $this->_extcalTime->_getUserTimeZone($user));
- $dayEnd = userTimeToServerTime(mktime(23, 59, 59, $month, $day, $year), $this->_extcalTime->_getUserTimeZone($user));
+ $dayStart = userTimeToServerTime(mktime(0, 0, 0, $month, $day, $year), $this->_extcalTime->_getUserTimeZone($user));
+ $dayEnd = userTimeToServerTime(mktime(23, 59, 59, $month, $day, $year), $this->_extcalTime->_getUserTimeZone($user));
$criteriaCompo = $this->_getListCriteriaCompo($dayStart, $dayEnd, $cat, $user);
return $criteriaCompo;
}
+
// Return the criteria compo object for a week
function _getEventWeekCriteria($day, $month, $year, $cat, $nbDays = 7)
- {
-
+ {
+
$user = $GLOBALS['xoopsUser'];
$userStartTime = mktime(0, 0, 0, $month, $day, $year);
- $userEndTime = $userStartTime + (_EXTCAL_TS_DAY * $nbDays);
- $weekStart = userTimeToServerTime($userStartTime, $this->_extcalTime->_getUserTimeZone($user));
- $weekEnd = userTimeToServerTime($userEndTime, $this->_extcalTime->_getUserTimeZone($user));
+ $userEndTime = $userStartTime + (_EXTCAL_TS_DAY * $nbDays);
+ $weekStart = userTimeToServerTime($userStartTime, $this->_extcalTime->_getUserTimeZone($user));
+ $weekEnd = userTimeToServerTime($userEndTime, $this->_extcalTime->_getUserTimeZone($user));
$criteriaCompo = $this->_getCriteriaCompo($weekStart, $weekEnd, $cat, $user);
return $criteriaCompo;
}
-
+
// Return the criteria compo object for a month
function _getEventMonthCriteria($month, $year, $cat)
{
@@ -512,9 +551,9 @@
$user = $GLOBALS['xoopsUser'];
$userStartTime = mktime(0, 0, 0, $month, 1, $year);
- $userEndTime = mktime(23, 59, 59, $month + 1, 0, $year);
- $monthStart = userTimeToServerTime($userStartTime, $this->_extcalTime->_getUserTimeZone($user));
- $monthEnd = userTimeToServerTime($userEndTime, $this->_extcalTime->_getUserTimeZone($user));
+ $userEndTime = mktime(23, 59, 59, $month + 1, 0, $year);
+ $monthStart = userTimeToServerTime($userStartTime, $this->_extcalTime->_getUserTimeZone($user));
+ $monthEnd = userTimeToServerTime($userEndTime, $this->_extcalTime->_getUserTimeZone($user));
$criteriaCompo = $this->_getCriteriaCompo($monthStart, $monthEnd, $cat, $user);
return $criteriaCompo;
}
@@ -522,35 +561,31 @@
// Return event occuring on a given year
function _getEventYearCriteria($year, $cat = 0)
{
-
$user = $GLOBALS['xoopsUser'];
$userStartTime = mktime(0, 0, 0, 1, 1, $year);
- $userEndTime = mktime(23, 59, 59, 12, 31, $year);
- $yearStart = userTimeToServerTime($userStartTime, $this->_extcalTime->_getUserTimeZone($user));
- $yearEnd = userTimeToServerTime($userEndTime, $this->_extcalTime->_getUserTimeZone($user));
+ $userEndTime = mktime(23, 59, 59, 12, 31, $year);
+ $yearStart = userTimeToServerTime($userStartTime, $this->_extcalTime->_getUserTimeZone($user));
+ $yearEnd = userTimeToServerTime($userEndTime, $this->_extcalTime->_getUserTimeZone($user));
$criteriaCompo = $this->_getListCriteriaCompo($yearStart, $yearEnd, $cat, $user);
return $criteriaCompo;
}
-
-
- /**********************************************************************
- * Debut de - A virer in fine
- **********************************************************************/
+ /**********************************************************************
+ * Debut de - A virer in fine
+ **********************************************************************/
- /**********************************************************************
- * FIN de - A virer in fine
- **********************************************************************/
+ /**********************************************************************
+ * FIN de - A virer in fine
+ **********************************************************************/
+ /**********************************************************************
+ * Construction des criteres en fonction de la p\xE9riode
+ **********************************************************************/
- /**********************************************************************
- * Construction des criteres en fonction de la p\xE9riode
- **********************************************************************/
-
function _getCriteriaCompo($start, $end, $cat, &$user)
{
@@ -581,9 +616,10 @@
function _getCalendarCriteriaCompo($start, $end, $cat, &$user)
{
-
+ global $extcalConfig;
$criteriaCompo = $this->_getCriteriaCompo($start, $end, $cat, $user);
- if (!$this->_extcalConfig['diplay_past_event_cal']) {
+ //if (!$this->_extcalConfig['diplay_past_event_cal']) {
+ if (!$extcalConfig['diplay_past_event_cal']) {
$criteriaCompo->add(new Criteria('event_end', time(), '>'));
}
return $criteriaCompo;
@@ -591,9 +627,10 @@
function _getListCriteriaCompo($start, $end, $cat, &$user)
{
-
+ global $extcalConfig;
$criteriaCompo = $this->_getCriteriaCompo($start, $end, $cat, $user);
- if (!$this->_extcalConfig['diplay_past_event_list']) {
+ // if (!$this->_extcalConfig['diplay_past_event_list']) {
+ if (!$extcalConfig['diplay_past_event_list']) {
$criteriaCompo->add(new Criteria('event_end', time(), '>'));
}
return $criteriaCompo;
@@ -629,17 +666,17 @@
$criteriaCompo->setLimit($nbEvent);
return $this->getObjects($criteriaCompo);
}
-
+
// Return event occuring this day
function getThisDayEvent($nbEvent, $cat = 0)
{
- $day = date("j");
+ $day = date("j");
$month = date("n");
- $year = date("Y");
+ $year = date("Y");
$dayStart = mktime(0, 0, 0, $month, $day, $year);
- $dayEnd = mktime(0, 0, 0, $month, $day + 1, $year);
+ $dayEnd = mktime(0, 0, 0, $month, $day + 1, $year);
$criteriaCompo = new CriteriaCompo();
$this->_addCatSelectCriteria($criteriaCompo, $cat);
@@ -701,7 +738,7 @@
function _addCatPermCriteria(&$criteria, &$user)
{
$authorizedAccessCats = $this->_extcalPerm->getAuthorizedCat($user, 'extcal_cat_view');
- $count = count($authorizedAccessCats);
+ $count = count($authorizedAccessCats);
if ($count > 0) {
$in = '(' . $authorizedAccessCats[0];
array_shift($authorizedAccessCats);
@@ -736,24 +773,24 @@
}
}
}
+
/**********************************************************************
- formulaire d'edition des evennements*
- **********************************************************************/
+ formulaire d'edition des evennements*
+ **********************************************************************/
function getEventForm($siteSide = 'user', $mode = 'new', $data = null)
{
-
- $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
+ $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
$fileHandler = xoops_getmodulehandler(_EXTCAL_CLS_FILE, _EXTCAL_MODULE);
- /***************************************************/
- include_once XOOPS_ROOT_PATH."/modules/extcal/class/etablissement.php";
+ /***************************************************/
+ include_once XOOPS_ROOT_PATH . "/modules/extcal/class/etablissement.php";
if ($siteSide == 'admin') {
$action = 'event.php?op=enreg';
- $cats = $catHandler->getAllCat($GLOBALS['xoopsUser'], 'all');
+ $cats = $catHandler->getAllCat($GLOBALS['xoopsUser'], 'all');
} else {
$action = 'post.php';
- $cats = $catHandler->getAllCat($GLOBALS['xoopsUser']);
+ $cats = $catHandler->getAllCat($GLOBALS['xoopsUser']);
}
- /***************************************************/
+ /***************************************************/
$reccurOptions = array();
if ($mode == 'edit' OR $mode == 'clone') {
@@ -761,47 +798,47 @@
return false;
}
if ($mode == 'clone') {
- $data['event_id'] = 0;
- $event->setVar('event_id', 0);
- $newTitle = $event->getVar('event_title') . ' (' . _AM_EXTCAL_CLONE_OF. $data['event_id'] . ')';
- $event->setVar('event_title', $newTitle);
+ $data['event_id'] = 0;
+ $event->setVar('event_id', 0);
+ $newTitle = $event->getVar('event_title') . ' (' . _AM_EXTCAL_CLONE_OF . $data['event_id'] . ')';
+ $event->setVar('event_title', $newTitle);
}
-
- $formTitle = _MD_EXTCAL_EDIT_EVENT;
- $formName = 'modify_event';
- $title = $event->getVar('event_title', 'e');
- $cat = $event->getVar('cat_id');
- $desc = $event->getVar('event_desc', 'e');
- $nbMember = $event->getVar('event_nbmember', 'e');
- $organisateur = $event->getVar('event_organisateur');
- $contact = $event->getVar('event_contact', 'e');
- $url = $event->getVar('event_url', 'e');
- $email = $event->getVar('event_email', 'e');
- $event_address = $event->getVar('event_address', 'e');
- $startDateValue = xoops_getUserTimestamp($event->getVar('event_start'), $this->_extcalTime->_getUserTimeZone($GLOBALS['xoopsUser']));
- $endDateValue = xoops_getUserTimestamp($event->getVar('event_end'), $this->_extcalTime->_getUserTimeZone($GLOBALS['xoopsUser']));
- $event_picture1 = $event->getVar('event_picture1');
- $event_picture2 = $event->getVar('event_picture2');
- $event_price = $event->getVar('event_price');
- $event_etablissement = $event->getVar('event_etablissement');
- $event_icone = $event->getVar('event_icone');
+ $formTitle = _MD_EXTCAL_EDIT_EVENT;
+ $formName = 'modify_event';
+ $title = $event->getVar('event_title', 'e');
+ $cat = $event->getVar('cat_id');
+ $desc = $event->getVar('event_desc', 'e');
+ $nbMember = $event->getVar('event_nbmember', 'e');
+ $organisateur = $event->getVar('event_organisateur');
+ $contact = $event->getVar('event_contact', 'e');
+ $url = $event->getVar('event_url', 'e');
+ $email = $event->getVar('event_email', 'e');
+ $event_address = $event->getVar('event_address', 'e');
+ $startDateValue = xoops_getUserTimestamp($event->getVar('event_start'), $this->_extcalTime->_getUserTimeZone($GLOBALS['xoopsUser']));
+ $endDateValue = xoops_getUserTimestamp($event->getVar('event_end'), $this->_extcalTime->_getUserTimeZone($GLOBALS['xoopsUser']));
+ $event_picture1 = $event->getVar('event_picture1');
+ $event_picture2 = $event->getVar('event_picture2');
+ $event_price = $event->getVar('event_price');
+ $event_etablissement = $event->getVar('event_etablissement');
+ $event_icone = $event->getVar('event_icone');
+
// Configuring recurring form
$eventOptions = explode('|', $event->getVar('event_recur_rules'));
- $reccurMode = $eventOptions[0];
+ $reccurMode = $eventOptions[0];
array_shift($eventOptions);
switch ($reccurMode) {
case 'daily':
- $reccurOptions['rrule_freq'] = 'daily';
+ $reccurOptions['rrule_freq'] = 'daily';
$reccurOptions['rrule_daily_interval'] = $eventOptions[0];
break;
case 'weekly':
- $reccurOptions['rrule_freq'] = 'weekly';
+ $reccurOptions['rrule_freq'] = 'weekly';
$reccurOptions['rrule_weekly_interval'] = $eventOptions[0];
array_shift($eventOptions);
$reccurOptions['rrule_weekly_bydays'] = $eventOptions;
@@ -810,7 +847,7 @@
case 'monthly':
- $reccurOptions['rrule_freq'] = 'monthly';
+ $reccurOptions['rrule_freq'] = 'monthly';
$reccurOptions['rrule_monthly_interval'] = $eventOptions[0];
array_shift($eventOptions);
if (substr($eventOptions[0], 0, 2) != "MD") {
@@ -823,7 +860,7 @@
case 'yearly':
- $reccurOptions['rrule_freq'] = 'yearly';
+ $reccurOptions['rrule_freq'] = 'yearly';
$reccurOptions['rrule_yearly_interval'] = $eventOptions[0];
array_shift($eventOptions);
$reccurOptions['rrule_yearly_byday'] = $eventOptions[0];
@@ -839,42 +876,42 @@
} elseif ($mode == 'preview') {
- $formTitle = _MD_EXTCAL_SUBMIT_EVENT;
- $formName = 'submit_event';
- $title = $data['event_title'];
- $cat = $data['cat_id'];
- $desc = $data['event_desc'];
- $nbMember = $data['event_nbmember'];
- $organisateur = $data['event_organisateur'];
- $contact = $data['event_contact'];
- $url = $data['event_url'];
- $email = $data['event_email'];
- $event_address = $data['event_address'];
- $startDateValue = $data['event_start'];
- $endDateValue = $data['event_end'];
- $eventEndOk = $data['have_end'];
- $event_picture1 = $data['event_picture1'];
- $event_picture2 = $data['event_picture2'];
- $event_price = $data['event_price'];
- $event_etablissement = $data['event_etablissement'];
- $event_icone = $data['event_icone'];
+ $formTitle = _MD_EXTCAL_SUBMIT_EVENT;
+ $formName = 'submit_event';
+ $title = $data['event_title'];
+ $cat = $data['cat_id'];
+ $desc = $data['event_desc'];
+ $nbMember = $data['event_nbmember'];
+ $organisateur = $data['event_organisateur'];
+ $contact = $data['event_contact'];
+ $url = $data['event_url'];
+ $email = $data['event_email'];
+ $event_address = $data['event_address'];
+ $startDateValue = $data['event_start'];
+ $endDateValue = $data['event_end'];
+ $eventEndOk = $data['have_end'];
+ $event_picture1 = $data['event_picture1'];
+ $event_picture2 = $data['event_picture2'];
+ $event_price = $data['event_price'];
+ $event_etablissement = $data['event_etablissement'];
+ $event_icone = $data['event_icone'];
// Configuring recurring form
$eventOptions = explode('|', $this->getRecurRules($_POST));
- $reccurMode = $eventOptions[0];
+ $reccurMode = $eventOptions[0];
array_shift($eventOptions);
switch ($reccurMode) {
case 'daily':
- $reccurOptions['rrule_freq'] = 'daily';
+ $reccurOptions['rrule_freq'] = 'daily';
$reccurOptions['rrule_daily_interval'] = $eventOptions[0];
break;
case 'weekly':
- $reccurOptions['rrule_freq'] = 'weekly';
+ $reccurOptions['rrule_freq'] = 'weekly';
$reccurOptions['rrule_weekly_interval'] = $eventOptions[0];
array_shift($eventOptions);
$reccurOptions['rrule_weekly_bydays'] = $eventOptions;
@@ -883,7 +920,7 @@
case 'monthly':
- $reccurOptions['rrule_freq'] = 'monthly';
+ $reccurOptions['rrule_freq'] = 'monthly';
$reccurOptions['rrule_monthly_interval'] = $eventOptions[0];
array_shift($eventOptions);
if (substr($eventOptions[0], 0, 2) != "MD") {
@@ -896,7 +933,7 @@
case 'yearly':
- $reccurOptions['rrule_freq'] = 'yearly';
+ $reccurOptions['rrule_freq'] = 'yearly';
$reccurOptions['rrule_yearly_interval'] = $eventOptions[0];
array_shift($eventOptions);
$reccurOptions['rrule_yearly_byday'] = $eventOptions[0];
@@ -911,26 +948,26 @@
$fileHandler->formatFilesSize($files);
} else {
- $formTitle = _MD_EXTCAL_SUBMIT_EVENT;
- $formName = 'submit_event';
- $title = '';
- $cat = '';
- $desc = '';
- $nbMember = 0;
- $organisateur = '';
- $contact = '';
- $url = '';
- $email = '';
- $event_address = '';
- $startDateValue = 0;
- $endDateValue = 0;
- $eventEndOk = 0;
- $event_picture1 = '';
- $event_picture2 = '';
- $event_price = '';
- $event_etablissement = '';
- $files = array();
- $event_icone = '';
+ $formTitle = _MD_EXTCAL_SUBMIT_EVENT;
+ $formName = 'submit_event';
+ $title = '';
+ $cat = '';
+ $desc = '';
+ $nbMember = 0;
+ $organisateur = '';
+ $contact = '';
+ $url = '';
+ $email = '';
+ $event_address = '';
+ $startDateValue = 0;
+ $endDateValue = 0;
+ $eventEndOk = 0;
+ $event_picture1 = '';
+ $event_picture2 = '';
+ $event_price = '';
+ $event_etablissement = '';
+ $files = array();
+ $event_icone = '';
}
@@ -938,8 +975,8 @@
$form = new ExtcalThemeForm($formTitle, 'event_form', $action, 'post', true);
// Add this extra to allow file upload
$form->setExtra('enctype="multipart/form-data"');
-
-
+
+
//-----------------------------------------------
// Title
$form->addElement(new XoopsFormText(_MD_EXTCAL_TITLE, 'event_title', 80, 255, $title), true);
@@ -952,42 +989,43 @@
$catSelect->addOption($cat->getVar('cat_id'), $cat->getVar('cat_name'));
}
$form->addElement($catSelect, true);
- //-----------------------------------------------------------
-
- $file_path = XOOPS_ROOT_PATH . '/modules/extcal/css/images';
- $tf = XoopsLists::getImgListAsArray($file_path);
- array_unshift ($tf,"--- aucun ---");
- $xfIcones = new XoopsFormSelect(_AM_EXTCAL_ICONE, "event_icone", $event_icone, '') ;
- $xfIcones->addOptionArray($tf);
- $form->addElement($xfIcones, false);
- //-----------------------------------------------------------
- //etablissement
- $etablissementHandler = xoops_getmodulehandler(_EXTCAL_CLS_ETABLISSEMENT, _EXTCAL_MODULE);
- $etablissement_select = new XoopsFormSelect(_MD_EXTCAL_ETABLISSEMENT, 'event_etablissement', $event_etablissement);
- $criteria = new CriteriaCompo();
- $criteria->setSort('nom');
- $criteria->setOrder('ASC');
-
-
- //$lstEtablissement = $etablissementHandler->getList($criteria);
- $etablissement_arr= $etablissementHandler->getAll($criteria);
- $tEts = array();
- $tEts[0] = _MD_EXTCAL_NONE;
- foreach (array_keys($etablissement_arr) as $i)
- {
- //$tEts[$etablissement_arr[$i]->getVar('id')] = $etablissement_arr[$i]->getVar('nom');
- $tEts[$etablissement_arr[$i]['id']] = $etablissement_arr[$i]['nom'];
- }
- //array_unshift($tEts, _MD_EXTCAL_NONE);
-
- $etablissement_select->addOptionArray($tEts);
- $form->addElement($etablissement_select, true);
+ //-----------------------------------------------------------
- //-----------------------------------------------------------
+ $file_path = XOOPS_ROOT_PATH . '/modules/extcal/css/images';
+ $tf = XoopsLists::getImgListAsArray($file_path);
+ array_unshift($tf, _MD_EXTCAL_NONE);
+ $xfIcones = new XoopsFormSelect(_MD_EXTCAL_ICONE, "event_icone", $event_icone, '');
+ $xfIcones->addOptionArray($tf);
+ $form->addElement($xfIcones, false);
+ //-----------------------------------------------------------
+ //etablissement
+ $etablissementHandler = xoops_getmodulehandler(_EXTCAL_CLS_ETABLISSEMENT, _EXTCAL_MODULE);
+ $etablissement_select = new XoopsFormSelect(_MD_EXTCAL_ETABLISSEMENT, 'event_etablissement', $event_etablissement);
+ $criteria = new CriteriaCompo();
+ $criteria->setSort('nom');
+ $criteria->setOrder('ASC');
-
+
+ //$lstEtablissement = $etablissementHandler->getList($criteria);
+ $etablissement_arr = $etablissementHandler->getAll($criteria);
+ $tEts = array();
+ $tEts[0] = _MD_EXTCAL_NONE;
+ foreach (
+ array_keys($etablissement_arr) as $i
+ ) {
+ //$tEts[$etablissement_arr[$i]->getVar('id')] = $etablissement_arr[$i]->getVar('nom');
+ $tEts[$etablissement_arr[$i]['id']] = $etablissement_arr[$i]['nom'];
+ }
+ //array_unshift($tEts, _MD_EXTCAL_NONE);
+
+ $etablissement_select->addOptionArray($tEts);
+ $form->addElement($etablissement_select, true);
+
+ //-----------------------------------------------------------
+
+
// Start and end
- new ExtcalFormDateTime($form, $startDateValue, $endDateValue);
+ new ExtcalFormDateTime($form, $startDateValue, $endDateValue); //mb
// Description
$form->addElement(new XoopsFormDhtmlTextArea(_MD_EXTCAL_DESCRIPTION, 'event_desc', $desc, 10), false);
// Max registered member for this event
@@ -995,16 +1033,16 @@
$nbMemberElement->setDescription(_MD_EXTCAL_NBMEMBER_DESC);
$form->addElement($nbMemberElement, false);
-//Price and monnaie
- $monnaie_price = new XoopsFormElementTray(_MD_EXTCAL_PRICE ,'');
- //price
- $monnaie_price->addElement(new XoopsFormText('' , 'event_price',...
[truncated message content] |
|
From: <be...@us...> - 2012-04-03 07:02:52
|
Revision: 9261
http://xoops.svn.sourceforge.net/xoops/?rev=9261&view=rev
Author: beckmi
Date: 2012-04-03 07:02:40 +0000 (Tue, 03 Apr 2012)
Log Message:
-----------
Updating to Beta 3
Modified Paths:
--------------
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/admin_footer.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/admin_header.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/etablissement.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/event.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/index.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/menu.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/docs/changelog.txt
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/include/constantes.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/language/english/main.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/view_calendar-month.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/view_year.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/xoops_version.php
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/admin_footer.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/admin_footer.php 2012-04-03 06:10:56 UTC (rev 9260)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/admin_footer.php 2012-04-03 07:02:40 UTC (rev 9261)
@@ -19,8 +19,11 @@
**/
-echo "<div align=\"center\"><a href=\"http://www.xoops.org\" target=\"_blank\"><img src=" . XOOPS_URL ."/". $moduleInfo->getInfo("icons32")."/xoopsmicrobutton.gif"." alt=\"XOOPS\" title=\"XOOPS\"></a></div>";
-echo "<div class='center smallsmall italic pad5'><strong>" . $xoopsModule->getVar("name") . "</strong> is maintained by the <a class='tooltip' rel='external' href='http://www.xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>";
+echo "<div class='adminfooter'>\n"
+ ." <div style='text-align: center;'>\n"
+ ." <a href='http://www.xoops.org' target='_blank'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
+ ." </div>\n"
+ ." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
+ ."</div>";
xoops_cp_footer();
-?>
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/admin_header.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/admin_header.php 2012-04-03 06:10:56 UTC (rev 9260)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/admin_header.php 2012-04-03 07:02:40 UTC (rev 9261)
@@ -25,46 +25,27 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
-include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
-include_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
-//include("../../../include/cp_header.php");
-if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
- include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
- //return true;
- }else{
- echo xoops_error("Error: You don't use the Frameworks \"admin module\". Please install this Frameworks");
- //return false;
- }
+$path = dirname(dirname(dirname(dirname(__FILE__))));
+include_once $path . '/mainfile.php';
+include_once $path . '/include/cp_functions.php';
+require_once $path . '/include/cp_header.php';
-$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
-$pathImageIcon = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16');
-$pathImageAdmin = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32');
+global $xoopsModule;
-$myts =& MyTextSanitizer::getInstance();
+$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
-if ($xoopsUser) {
- $moduleperm_handler =& xoops_gethandler('groupperm');
- if (!$moduleperm_handler->checkRight('module_admin', $xoopsModule->getVar( 'mid' ), $xoopsUser->getGroups())) {
- redirect_header(XOOPS_URL, 1, _NOPERM);
- exit();
- }
-} else {
-// redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM);
-// exit();
-}
+// Load language files
+xoops_loadLanguage('admin', $thisModuleDir);
+xoops_loadLanguage('modinfo', $thisModuleDir);
+xoops_loadLanguage('main', $thisModuleDir);
-if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
- include_once(XOOPS_ROOT_PATH."/class/template.php");
- $xoopsTpl = new XoopsTpl();
-}
+$pathIcon16 = '../' . $xoopsModule->getInfo('icons16');
+$pathIcon32 = '../' . $xoopsModule->getInfo('icons32');
+$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
-$xoopsTpl->assign('pathImageIcon', $pathImageIcon);
-
-//xoops_cp_header();
-
-//Load languages
-xoops_loadLanguage('admin', $xoopsModule->getVar("dirname"));
-xoops_loadLanguage('modinfo', $xoopsModule->getVar("dirname"));
-xoops_loadLanguage('main', $xoopsModule->getVar("dirname"));
-?>
+if (file_exists($GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php'))) {
+ include_once $GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php');
+} else {
+ redirect_header("../../../admin.php", 5, _AM_EXTCAL_MODULEADMIN_MISSING, false);
+}
\ No newline at end of file
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/etablissement.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/etablissement.php 2012-04-03 06:10:56 UTC (rev 9260)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/etablissement.php 2012-04-03 07:02:40 UTC (rev 9261)
@@ -134,8 +134,8 @@
echo '<td align="center"><b>' . $etablissement_adresse . '</td>';
echo '<td align="center"><b>' . $etablissement_telephone . '</td>';
echo '<td align="center" width="15%">';
- echo '<a href="etablissement.php?op=edit_etablissement&etablissement_id=' . $etablissement_id . '"><img src='. $pathImageIcon .'/edit.png alt="' . _AM_EXTCAL_ETABLISSEMENT_FORM_EDIT . '" title="' . _AM_EXTCAL_ETABLISSEMENT_FORM_EDIT . '"></a> ';
- echo '<a href="etablissement.php?op=delete_etablissement&etablissement_id=' . $etablissement_id . '"><img src='. $pathImageIcon .'/delete.png alt="' . _AM_EXTCAL_ETABLISSEMENT_FORM_DELETE . '" title="' . _AM_EXTCAL_ETABLISSEMENT_FORM_DELETE . '"></a> ';
+ echo '<a href="etablissement.php?op=edit_etablissement&etablissement_id=' . $etablissement_id . '"><img src='. $pathIcon16 .'/edit.png alt="' . _AM_EXTCAL_ETABLISSEMENT_FORM_EDIT . '" title="' . _AM_EXTCAL_ETABLISSEMENT_FORM_EDIT . '"></a> ';
+ echo '<a href="etablissement.php?op=delete_etablissement&etablissement_id=' . $etablissement_id . '"><img src='. $pathIcon16 .'/delete.png alt="' . _AM_EXTCAL_ETABLISSEMENT_FORM_DELETE . '" title="' . _AM_EXTCAL_ETABLISSEMENT_FORM_DELETE . '"></a> ';
echo '</td>';
}
echo '</table><br />';
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/event.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/event.php 2012-04-03 06:10:56 UTC (rev 9260)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/event.php 2012-04-03 07:02:40 UTC (rev 9261)
@@ -18,7 +18,7 @@
$eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
$criteria = new Criteria('event_id', "($ids)", 'IN');
-
+
//Supression des images
$rst = $eventHandler->getAllEvents($criteria);
@@ -293,6 +293,9 @@
case 'default':
default:
+ global $extcalConfig;
+ //TODO nbEventsByPage is Null, while it should be 10
+
$start = (isset($_GET['start'])) ? $_GET['start'] : 0;
$nbEventsByPage = $extcalConfig['nbEventsByPage'];
@@ -313,8 +316,8 @@
//echo'<img src='. XOOPS_URL .'/'. $moduleInfo->getInfo('dirmoduleadmin').'/images/action/edit.png' .' '.'style=vertical-align:middle;/> ' . _AM_EXTCAL_INFO_EDIT . '<br />';
//echo'<img src='. XOOPS_URL .'/'. $moduleInfo->getInfo('dirmoduleadmin').'/images/action/delete.png'. ' '."style=vertical-align:middle;/> ". _AM_EXTCAL_INFO_DELETE;
- echo'<img src='. $pathImageIcon.'/edit.png' .' '.'style=vertical-align:middle;/> ' . _AM_EXTCAL_INFO_EDIT . '<br />';
- echo'<img src='. $pathImageIcon.'/delete.png' .' '.'style=vertical-align:middle;/> ' . _AM_EXTCAL_INFO_DELETE . '<br />';
+ echo'<img src='. $pathIcon16.'/edit.png' .' '.'style=vertical-align:middle;/> ' . _AM_EXTCAL_INFO_EDIT . '<br />';
+ echo'<img src='. $pathIcon16.'/delete.png' .' '.'style=vertical-align:middle;/> ' . _AM_EXTCAL_INFO_DELETE . '<br />';
echo '</fieldset><br />';
@@ -373,9 +376,9 @@
echo '<td style="width:10%; text-align:center;">';
- echo '<a href=event.php?op=modify&event_id='. $event['event_id']. "><img src='". $pathImageIcon."/edit.png' title='"._AM_EXTCAL_ICONE_EDIT."' /></a> ";
- echo '<a href=event.php?op=delete&event_id='. $event['event_id']. "><img src='". $pathImageIcon."/delete.png' title='"._AM_EXTCAL_ICONE_DELETE."' /></a> ";
- echo '<a href=event.php?op=clone&event_id='. $event['event_id']. "><img src='". $pathImageIcon."/editcopy.png' title='"._AM_EXTCAL_ICONE_CLONE."' /></a>";
+ echo '<a href=event.php?op=modify&event_id='. $event['event_id']. "><img src='". $pathIcon16."/edit.png' title='"._AM_EXTCAL_ICONE_EDIT."' /></a> ";
+ echo '<a href=event.php?op=delete&event_id='. $event['event_id']. "><img src='". $pathIcon16."/delete.png' title='"._AM_EXTCAL_ICONE_DELETE."' /></a> ";
+ 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'>";
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/index.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/index.php 2012-04-03 06:10:56 UTC (rev 9260)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/index.php 2012-04-03 07:02:40 UTC (rev 9261)
@@ -54,7 +54,7 @@
$eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
$eventMemberHandler = xoops_getmodulehandler(_EXTCAL_CLS_MEMBER, _EXTCAL_MODULE);
$extcalTime = ExtcalTime::getHandler();
- $extcalConfig = ExtcalConfig::getHandler();
+ $extcalConfig =& ExtcalConfig::getHandler();
$xoopsModuleConfig = $extcalConfig->getModuleConfig();
$event = $eventHandler->getEvent($_POST['event_id'], $xoopsUser, true);
@@ -181,8 +181,8 @@
echo'<fieldset><legend style="font-weight:bold; color:#0A3760;">'
. _AM_EXTCAL_INFORMATION . '</legend>';
// echo '<img src="../images/icons/on.png" /> '._AM_EXTCAL_INFO_APPROVE_PENDING_EVENT.'<br />';
- echo'<img src='. $pathImageIcon.'/edit.png /> '. _AM_EXTCAL_INFO_EDIT_PENDING_EVENT . '<br />';
- echo'<img src='. $pathImageIcon.'/delete.png /> ' . _AM_EXTCAL_INFO_DELETE_PENDING_EVENT . '<br />';
+ echo'<img src='. $pathIcon16.'/edit.png /> '. _AM_EXTCAL_INFO_EDIT_PENDING_EVENT . '<br />';
+ echo'<img src='. $pathIcon16.'/delete.png /> ' . _AM_EXTCAL_INFO_DELETE_PENDING_EVENT . '<br />';
echo '</fieldset><br />';
echo '<table class="outer" style="width:100%;">';
@@ -204,8 +204,8 @@
echo '<td>' . $event['event_title'] . '</td>';
echo '<td>' . $event['formated_event_start'] . '</td>';
echo '<td style="width:10%; text-align:center;">';
- echo'<a href="event.php?op=modify&event_id='. $event['event_id'] . '"><img src='. $pathImageIcon.'/edit.png /></a> ';
- echo'<a href="event.php?op=delete&event_id='. $event['event_id'] . '"><img src='. $pathImageIcon.'/delete.png /></a>';
+ echo'<a href="event.php?op=modify&event_id='. $event['event_id'] . '"><img src='. $pathIcon16.'/edit.png /></a> ';
+ echo'<a href="event.php?op=delete&event_id='. $event['event_id'] . '"><img src='. $pathIcon16.'/delete.png /></a>';
echo '</td>';
echo '</tr>';
}
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/menu.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/menu.php 2012-04-03 06:10:56 UTC (rev 9260)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/menu.php 2012-04-03 07:02:40 UTC (rev 9261)
@@ -1,23 +1,26 @@
<?php
-$module_handler =& xoops_gethandler('module');
-$xoopsModule =& XoopsModule::getByDirname('extcal');
-$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
-$pathImageAdmin = $moduleInfo->getInfo('icons32');
+defined('XOOPS_ROOT_PATH') or die("XOOPS root path not defined");
+
+$dirname = basename(dirname(dirname(__FILE__)));
+$module_handler = xoops_gethandler('module');
+$module = $module_handler->getByDirname($dirname);
+$pathIcon32 = $module->getInfo('icons32');
+
$adminmenu = array();
$i = 1;
$adminmenu[$i]['title'] = _MI_EXTCAL_INDEX;
$adminmenu[$i]['link'] = "admin/index.php";
-$adminmenu[$i]["icon"] = '../../'.$pathImageAdmin.'/home.png';
+$adminmenu[$i]["icon"] = $pathIcon32.'/home.png';
$i++;
$adminmenu[$i]['title'] = _MI_EXTCAL_CATEGORY;
$adminmenu[$i]['link'] = "admin/cat.php";
-$adminmenu[$i]["icon"] = '../../'.$pathImageAdmin.'/category.png';
+$adminmenu[$i]["icon"] = $pathIcon32.'/category.png';
$i++;
$adminmenu[$i]['title'] = _MI_EXTCAL_EVENT;
$adminmenu[$i]['link'] = "admin/event.php";
-$adminmenu[$i]["icon"] = '../../'.$pathImageAdmin.'/event.png';
+$adminmenu[$i]["icon"] = $pathIcon32.'/event.png';
$i++;
$adminmenu[$i]['title'] = _MI_EXTCAL_ETABLISSEMENTS;
$adminmenu[$i]['link'] = "admin/etablissement.php";
@@ -28,7 +31,7 @@
$i++;
$adminmenu[$i]['title'] = _MI_EXTCAL_PERMISSIONS;
$adminmenu[$i]['link'] = "admin/perm.php";
-$adminmenu[$i]["icon"] = '../../'.$pathImageAdmin.'/permissions.png';
+$adminmenu[$i]["icon"] = $pathIcon32.'/permissions.png';
//$i++;
//$adminmenu[$i]['title'] = _MI_EXTCAL_PRUNING;
//$adminmenu[$i]['link'] = "admin/prune.php";
@@ -36,5 +39,5 @@
$i++;
$adminmenu[$i]["title"] = _MI_EXTCAL_ABOUT;
$adminmenu[$i]["link"] = "admin/about.php";
-$adminmenu[$i]["icon"] = '../../'.$pathImageAdmin.'/about.png';
+$adminmenu[$i]["icon"] = $pathIcon32.'/about.png';
?>
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/docs/changelog.txt
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/docs/changelog.txt 2012-04-03 06:10:56 UTC (rev 9260)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/docs/changelog.txt 2012-04-03 07:02:40 UTC (rev 9261)
@@ -1,3 +1,7 @@
+2012/04/02: Version 2.37 Beta 3
+===================================
+- small code cleanups
+
2012/02/02: Version 2.37 (JJD.fr)
===================================
- Ajout du champ icone dans la table event_event
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/include/constantes.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/include/constantes.php 2012-04-03 06:10:56 UTC (rev 9260)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/include/constantes.php 2012-04-03 07:02:40 UTC (rev 9261)
@@ -10,11 +10,11 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
+ *
*
- *
- * L'utilisation de ce formulaire d'adminitration suppose
- * que la classe correspondante de la table a été générées avec classGenerator
- **/
+ * L'utilisation de ce formulaire d'adminitration suppose
+ * que la classe correspondante de la table a été générées avec classGenerator
+**/
//modif JJD
define('_EXTCAL_MODULE', 'extcal');
@@ -35,52 +35,53 @@
define('_EXTCAL_CLN_EVENT', 'ExtcalEvent');
+
+
//-------------------------------------------------------------------
-define('_EXTCAL_PEAR_ROOT_DEFAUT', XOOPS_ROOT_PATH . '/modules/extcal/class/pear');
+define('_EXTCAL_PEAR_ROOT_DEFAUT', XOOPS_ROOT_PATH . '/modules/extcal/class/pear' );
//define('_EXTCAL_PEAR_ROOT', 'F:/wamp/www/xfr254b/xoops_lib/Frameworks/pear' );
$pear_path = _EXTCAL_PEAR_ROOT_DEFAUT;
global $xoopsModule, $xoopsModuleConfig;
-if (is_object($xoopsModule)) {
- $name = $xoopsModule->getVar('name');
-} else {
- $name = '';
+if (is_object($xoopsModule)){
+ $name = $xoopsModule->getVar('name');
+}else{
+ $name = '';
}
$moduleHandler =& xoops_gethandler('module');
-$module = $moduleHandler->getByDirname('extcal');
+$module = $moduleHandler->getByDirname('extcal');
-if ($name == 'extcal' || !is_object($module)) {
- if (is_object($xoopsModuleConfig)) {
- $extcalConfig = $xoopsModuleConfig;
- }
-} else {
- // $module = XoopsModule::getByDirname('extcal');
- // $mid = $module->vars['mid']['value'];
- // $config_handler =& xoops_gethandler('config');
- // $extcalConfig = $config_handler->getConfigsByCat(0, $mid);
+if ($name == 'extcal' || !is_object($module)){
+ if (is_object($xoopsModuleConfig))
+ $extcalConfig = $xoopsModuleConfig;
+}else{
+// $module = XoopsModule::getByDirname('extcal');
+// $mid = $module->vars['mid']['value'];
+// $config_handler =& xoops_gethandler('config');
+// $extcalConfig = $config_handler->getConfigsByCat(0, $mid);
-
+
$configHandler =& xoops_gethandler('config');
- $extcalConfig = $configHandler->getConfigList($module->getVar("mid"));
+ $extcalConfig = $configHandler->getConfigList($module->getVar("mid"));
- // $t = print_r($extcalConfig, true);
- // echo "<pre>{$t}</pre>";
+// $t = print_r($extcalConfig, true);
+// echo "<pre>{$t}</pre>";
}
+
//////////////////////////////////
+
$newPP = trim($extcalConfig['pear_path']);
-if (substr($newPP, -1, 1) == '/') {
- $newPP = substr($newPP, 0, -1);
+if (substr($newPP,-1,1) == '/' ) $newPP = substr($newPP,0,-1);
+if ($newPP <> '' && is_dir ($newPP)){
+ $pear_path = $newPP;
}
-if ($newPP <> '' && is_dir($newPP)) {
- $pear_path = $newPP;
-}
define('_EXTCAL_PEAR_ROOT', $pear_path);
define('_EXTCAL_PEAR_CALENDAR_ROOT', _EXTCAL_PEAR_ROOT . '/Calendar');
@@ -94,48 +95,55 @@
define('_EXTCAL_PATH_HORLOGES', '/modules/extcal/images/horloges/');
define('_EXTCAL_PATH_ICONS16', XOOPS_URL . '/Frameworks/moduleclasses/icons/16/');
define('_EXTCAL_PATH_ICONS32', XOOPS_URL . '/Frameworks/moduleclasses/icons/32/');
-define('_EXTCAL_PATH_FO', XOOPS_URL . '/modules/extcal/');
-define('_EXTCAL_PATH_BO', _EXTCAL_PATH_FO . 'admin/');
-define('_EXTCAL_PATH_LG', XOOPS_URL . '/modules/extcal/languages/');
-
-define('_EXTCAL_IMG_INTERVAL', 'interval04.png');
+define('_EXTCAL_PATH_FO', XOOPS_URL . '/modules/extcal/');
+define('_EXTCAL_PATH_BO', _EXTCAL_PATH_FO . 'admin/');
+define('_EXTCAL_PATH_LG', XOOPS_URL . '/modules/extcal/languages/');
+
+define('_EXTCAL_IMG_INTERVAL', 'interval04.png');
define('_EXTCAL_IMG_INTERVAL16', _EXTCAL_PATH_ICONS16 . _EXTCAL_IMG_INTERVAL);
define('_EXTCAL_IMG_INTERVAL32', _EXTCAL_PATH_ICONS32 . _EXTCAL_IMG_INTERVAL);
-
+
//define('_EXTCAL_DIRNAME', $xoopsModule->getVar('dirname'));
-define('_EXTCAL_NAV_CALMONTH', 'calendar-month');
-define('_EXTCAL_NAV_CALWEEK', 'calendar-week');
-define('_EXTCAL_NAV_YEAR', 'year');
-define('_EXTCAL_NAV_MONTH', 'month');
-define('_EXTCAL_NAV_WEEK', 'week');
-define('_EXTCAL_NAV_DAY', 'day');
-define('_EXTCAL_NAV_AGENDA_WEEK', 'agenda-week');
-define('_EXTCAL_NAV_AGENDA_DAY', 'agenda-day');
-define('_EXTCAL_NAV_SEARCH', 'search');
-define('_EXTCAL_NAV_NEW_EVENT', 'new-event');
+define('_EXTCAL_NAV_CALMONTH', 'calendar-month');
+define('_EXTCAL_NAV_CALWEEK', 'calendar-week');
+define('_EXTCAL_NAV_YEAR', 'year');
+define('_EXTCAL_NAV_MONTH', 'month');
+define('_EXTCAL_NAV_WEEK', 'week');
+define('_EXTCAL_NAV_DAY', 'day');
+define('_EXTCAL_NAV_AGENDA_WEEK', 'agenda-week');
+define('_EXTCAL_NAV_AGENDA_DAY', 'agenda-day');
+define('_EXTCAL_NAV_SEARCH', 'search');
+define('_EXTCAL_NAV_NEW_EVENT', 'new-event');
-define('_EXTCAL_NAV_LIST',
- _EXTCAL_NAV_CALMONTH . "\n" . _EXTCAL_NAV_CALWEEK . "\n" . _EXTCAL_NAV_YEAR . "\n" . _EXTCAL_NAV_MONTH . "\n"
- . _EXTCAL_NAV_WEEK . "\n" . _EXTCAL_NAV_DAY . "\n" . _EXTCAL_NAV_AGENDA_WEEK . "\n" . _EXTCAL_NAV_AGENDA_DAY
- . "\n" . _EXTCAL_NAV_SEARCH . "\n" . _EXTCAL_NAV_NEW_EVENT);
+define('_EXTCAL_NAV_LIST', _EXTCAL_NAV_CALMONTH
+ . "\n" . _EXTCAL_NAV_CALWEEK
+ . "\n" . _EXTCAL_NAV_YEAR
+ . "\n" . _EXTCAL_NAV_MONTH
+ . "\n" . _EXTCAL_NAV_WEEK
+ . "\n" . _EXTCAL_NAV_DAY
+ . "\n" . _EXTCAL_NAV_AGENDA_WEEK
+ . "\n" . _EXTCAL_NAV_AGENDA_DAY
+ . "\n" . _EXTCAL_NAV_SEARCH
+ . "\n" . _EXTCAL_NAV_NEW_EVENT);
+
define('_EXTCAL_PREFIX_VIEW', 'view_');
define('_EXTCAL_SUFFIX_VIEW', '.php');
+
+define('_EXTCAL_FILE_CALMONTH', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_CALMONTH . _EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_CALWEEK', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_CALWEEK . _EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_YEAR', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_YEAR . _EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_MONTH', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_MONTH . _EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_WEEK', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_WEEK . _EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_DAY', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_DAY . _EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_AGENDA_WEEK', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_AGENDA_WEEK . _EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_AGENDA_DAY', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_AGENDA_DAY . _EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_SEARCH', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_SEARCH . _EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_NEW_EVENT', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_NEW_EVENT . _EXTCAL_SUFFIX_VIEW);
-define('_EXTCAL_FILE_CALMONTH', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_CALMONTH . _EXTCAL_SUFFIX_VIEW);
-define('_EXTCAL_FILE_CALWEEK', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_CALWEEK . _EXTCAL_SUFFIX_VIEW);
-define('_EXTCAL_FILE_YEAR', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_YEAR . _EXTCAL_SUFFIX_VIEW);
-define('_EXTCAL_FILE_MONTH', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_MONTH . _EXTCAL_SUFFIX_VIEW);
-define('_EXTCAL_FILE_WEEK', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_WEEK . _EXTCAL_SUFFIX_VIEW);
-define('_EXTCAL_FILE_DAY', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_DAY . _EXTCAL_SUFFIX_VIEW);
-define('_EXTCAL_FILE_AGENDA_WEEK', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_AGENDA_WEEK . _EXTCAL_SUFFIX_VIEW);
-define('_EXTCAL_FILE_AGENDA_DAY', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_AGENDA_DAY . _EXTCAL_SUFFIX_VIEW);
-define('_EXTCAL_FILE_SEARCH', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_SEARCH . _EXTCAL_SUFFIX_VIEW);
-define('_EXTCAL_FILE_NEW_EVENT', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_NEW_EVENT . _EXTCAL_SUFFIX_VIEW);
-
define ("_EXTCAL_MULTILOADER", "/class/xoopsform/multiuploads/formmultiuploads.php");
@@ -164,10 +172,10 @@
define ("_EXTCAL_EVENTS_YEAR", 6);
//---------------------------------------------------
-define ('_EXTCAL_TS_SECOND', 1);
-define ('_EXTCAL_TS_MINUTE', 60);
-define ('_EXTCAL_TS_HOUR', 3600);
-define ('_EXTCAL_TS_DAY', 86400);
+define ('_EXTCAL_TS_SECOND', 1);
+define ('_EXTCAL_TS_MINUTE', 60);
+define ('_EXTCAL_TS_HOUR', 3600);
+define ('_EXTCAL_TS_DAY', 86400);
define ('_EXTCAL_TS_WEEK', 604800);
//---------------------------------------------------
define ("_EXTCAL_TS_YEARLY", 32140800);
@@ -177,6 +185,6 @@
define ("_EXTCAL_INFOBULLE_RGB_MIN", 220);
define ("_EXTCAL_INFOBULLE_RGB_MAX", 250);
+
-
?>
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/language/english/main.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/language/english/main.php 2012-04-03 06:10:56 UTC (rev 9260)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/language/english/main.php 2012-04-03 07:02:40 UTC (rev 9261)
@@ -225,4 +225,7 @@
define('_MD_EXTCAL_DAY_FRIDAY', 'Friday');
define('_MD_EXTCAL_DAY_SATURDAY', 'Saturday');
define('_MD_EXTCAL_DAY_SUNDAY', 'Sunday');
-define('_MD_EXTCAL_ICONE', 'Icon');
\ No newline at end of file
+define('_MD_EXTCAL_ICONE', 'Icon');
+
+define('_MD_EXTCAL_SITE', "Website");
+define('_MD_EXTCAL_VISIT_SITE', "Visit the Website");
\ No newline at end of file
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/view_calendar-month.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/view_calendar-month.php 2012-04-03 06:10:56 UTC (rev 9260)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/view_calendar-month.php 2012-04-03 07:02:40 UTC (rev 9261)
@@ -6,13 +6,14 @@
$GLOBALS['xoopsOption']['template_main'] = "extcal_view_{$params['view']}.html";
include_once ('header.php');
-
/* ========================================================================== */
$year = isset($_GET['year']) ? intval($_GET['year']) : date('Y');
$month = isset($_GET['month']) ? intval($_GET['month']) : date('n');
$cat = isset($_GET['cat']) ? intval($_GET['cat']) : 0;
/* ========================================================================== */
+
+
$form = new XoopsSimpleForm('', 'navigSelectBox', $params['file'], 'get');
$form->addElement(getListYears($year,$xoopsModuleConfig['agenda_nb_years_before'],$xoopsModuleConfig['agenda_nb_years_after']));
$form->addElement(getListMonths($month));
@@ -38,6 +39,10 @@
+
+
+
+
// Calculating timestamp for the begin and the end of the month
$startMonth = mktime(0, 0, 0, $month, 1, $year);
$endMonth = mktime(23, 59, 59, $month + 1, 0, $year);
@@ -46,7 +51,6 @@
* Adding all event occuring during this month to an array indexed by day number
*/
$eventsArray = array();
-
foreach ($events as $event) {
$eventHandler->formatEventDate($event, $xoopsModuleConfig['event_date_month']);
$eventHandler->addEventToCalArray($event, $eventsArray, $startMonth, $endMonth);
@@ -86,27 +90,20 @@
$tableRows[$rowId]['weekInfo'] = array(
'week' => $weekCalObj->thisWeek('n_in_year'), 'day' => $weekCalObj->thisDay(), 'month' => $weekCalObj->thisMonth(), 'year' => $weekCalObj->thisYear()
);
-
while ($dayCalObj = $weekCalObj->fetch()) {
$tableRows[$rowId]['week'][$cellId] = array('isEmpty' => $dayCalObj->isEmpty(), 'number' => $dayCalObj->thisDay(), 'isSelected' => $dayCalObj->isSelected());
-
-
-
if (@count($eventsArray[$dayCalObj->thisDay()]) > 0
&& !$dayCalObj->isEmpty()) {
$tableRows[$rowId]['week'][$cellId]['events'] = $eventsArray[$dayCalObj->thisDay()];
} else {
$tableRows[$rowId]['week'][$cellId]['events'] = '';
}
-
$cellId++;
-
}
$cellId = 0;
$rowId++;
}
-
// Assigning events to the template
$xoopsTpl->assign('tableRows', $tableRows);
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/view_year.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/view_year.php 2012-04-03 06:10:56 UTC (rev 9260)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/view_year.php 2012-04-03 07:02:40 UTC (rev 9261)
@@ -34,14 +34,9 @@
'year' => $year,
'cat' => $cat,
'externalKeys' => 'cat_id');
-
$events = $eventHandler->getEventsOnPeriode($criteres);
-
-
/**********************************************************************/
$eventsArray = $events;
-
-
// Formating date
// $eventHandler->formatEventsDate($events, $xoopsModuleConfig['event_date_year']);
//
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/xoops_version.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/xoops_version.php 2012-04-03 06:10:56 UTC (rev 9260)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/xoops_version.php 2012-04-03 07:02:40 UTC (rev 9261)
@@ -13,7 +13,6 @@
//echo "local :" . setlocale(LC_TIME, $xoopsConfig['language'])."</ br>";
setlocale(LC_TIME, $xoopsConfig['language']);
-// @author Gregory Mage (Aka Mage)
//***************************************************************************************
$modversion['name'] = _MI_EXTCAL_NAME;
$modversion['version'] = '2.37';
@@ -27,24 +26,24 @@
$modversion['official'] = 0;
$modversion['image'] = 'images/extcal_logo.png';
$modversion['dirname'] = $moduleDirName;
-$modversion['status_version'] = 'Beta';
+$modversion['status_version'] = 'Beta 3';
$modversion['sqlfile']['mysql'] = 'sql/mysql.sql';
$modversion['onInstall'] = 'include/install_function.php';
$modversion['onUpdate'] = 'include/update_function.php';
$modversion['system_menu'] = 1;
$modversion['help'] = 'page=help';
-$modversion['dirmoduleadmin'] = 'Frameworks/moduleclasses';
-$modversion['icons16'] = 'Frameworks/moduleclasses/icons/16';
-$modversion['icons32'] = 'Frameworks/moduleclasses/icons/32';
+$modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin';
+$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16';
+$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
//***************************************************************************************
//about
$modversion["module_website_url"] = "http://www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
-$modversion["release_date"] = "2012/02/12";
-$modversion['module_status'] = "Beta 2";
+$modversion["release_date"] = "2012/03/27";
+$modversion['module_status'] = "Beta 3";
$modversion['min_php'] = '5.2';
-$modversion['min_xoops'] = "2.5.4";
+$modversion['min_xoops'] = "2.5.0";
// Admin things
$modversion['hasAdmin'] = 1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-07-07 16:09:30
|
Revision: 9796
http://xoops.svn.sourceforge.net/xoops/?rev=9796&view=rev
Author: beckmi
Date: 2012-07-07 16:09:22 +0000 (Sat, 07 Jul 2012)
Log Message:
-----------
Small bug fixes reported by Cesag, hugo1207
Modified Paths:
--------------
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/admin_footer.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/cat.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/menu.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/class/file.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/docs/changelog.txt
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/docs/credits.txt
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/docs/lang_diff.txt
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/event.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/include/constantes.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/language/english/modinfo.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/rss.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/view_week.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/xoops_version.php
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/admin_footer.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/admin_footer.php 2012-07-07 14:21:53 UTC (rev 9795)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/admin_footer.php 2012-07-07 16:09:22 UTC (rev 9796)
@@ -21,7 +21,7 @@
echo "<div class='adminfooter'>\n"
." <div style='text-align: center;'>\n"
- ." <a href='http://www.xoops.org' target='_blank'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
+ ." <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
." </div>\n"
." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
."</div>";
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/cat.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/cat.php 2012-07-07 14:21:53 UTC (rev 9795)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/cat.php 2012-07-07 16:09:22 UTC (rev 9796)
@@ -246,7 +246,7 @@
$categoryAdmin = new ModuleAdmin();
echo $categoryAdmin->addNavigation('cat.php');
- $categoryAdmin->addItemButton(_AM_EXTCAL_ADD_CATEGORY, 'cat.php?op=new', 'add', '');
+ $categoryAdmin->addItemButton('Add Category', 'cat.php?op=new', 'add', '');
echo $categoryAdmin->renderButton('right', '');
$catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/menu.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/menu.php 2012-07-07 14:21:53 UTC (rev 9795)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/admin/menu.php 2012-07-07 16:09:22 UTC (rev 9796)
@@ -1,12 +1,24 @@
<?php
-defined('XOOPS_ROOT_PATH') or die("XOOPS root path not defined");
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
-$dirname = basename(dirname(dirname(__FILE__)));
-$module_handler = xoops_gethandler('module');
-$module = $module_handler->getByDirname($dirname);
-$pathIcon32 = $module->getInfo('icons32');
+$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;
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/class/file.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/class/file.php 2012-07-07 14:21:53 UTC (rev 9795)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/class/file.php 2012-07-07 16:09:22 UTC (rev 9796)
@@ -43,7 +43,7 @@
: 0;
$allowedMimeType = array();
- $mimeType = include(XOOPS_ROOT_PATH . '/class/mimetypes.inc.php');
+ $mimeType = include(XOOPS_ROOT_PATH . '/include/mimetypes.inc.php');
foreach (
$GLOBALS['xoopsModuleConfig']['allowed_file_extention'] as $fileExt
) {
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/docs/changelog.txt
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/docs/changelog.txt 2012-07-07 14:21:53 UTC (rev 9795)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/docs/changelog.txt 2012-07-07 16:09:22 UTC (rev 9796)
@@ -1,6 +1,7 @@
-2012/04/02: Version 2.37 Beta 3
+2012/04/02: Version 2.37 Beta 4
===================================
-- small code cleanups
+- small code cleanups (mamba)
+-
2012/02/02: Version 2.37 (JJD.fr)
===================================
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/docs/credits.txt
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/docs/credits.txt 2012-07-07 14:21:53 UTC (rev 9795)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/docs/credits.txt 2012-07-07 16:09:22 UTC (rev 9796)
@@ -1,5 +1,9 @@
Credits
===============
-Originally developed by Zoullou http://www.zoullou.net
+Originally developed by Zoullou http://www.zoullou.net, updated by JJD.fr
-Updated to XOOPS 2.5.0 Standard GUI by Michael Beck (Mamba), with contributions by Gregory Mage (Mage)
\ No newline at end of file
+Updated to XOOPS 2.5.0 Standard GUI by Michael Beck (Mamba)
+
+Contributors:
+
+Testing: Cesag, hugo1207
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/docs/lang_diff.txt
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/docs/lang_diff.txt 2012-07-07 14:21:53 UTC (rev 9795)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/docs/lang_diff.txt 2012-07-07 16:09:22 UTC (rev 9796)
@@ -1,4 +1,8 @@
LANGUAGE DIFFERENCES
=====================
-Below are language differences from a version to next version.
\ No newline at end of file
+Below are language differences from a version to next version.
+
+modinfo.php:
+---------------------
+define('_MI_EXTCAL_EMAIL_MODE_DESC', 'Select Email Format that you want to use');
\ No newline at end of file
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/event.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/event.php 2012-07-07 14:21:53 UTC (rev 9795)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/event.php 2012-07-07 16:09:22 UTC (rev 9796)
@@ -40,6 +40,9 @@
$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']);
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/include/constantes.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/include/constantes.php 2012-07-07 14:21:53 UTC (rev 9795)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/include/constantes.php 2012-07-07 16:09:22 UTC (rev 9796)
@@ -10,12 +10,16 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
- *
*
- * L'utilisation de ce formulaire d'adminitration suppose
- * que la classe correspondante de la table a été générées avec classGenerator
-**/
+ *
+ * L'utilisation de ce formulaire d'adminitration suppose
+ * que la classe correspondante de la table a été générées avec classGenerator
+ **/
+if (!defined("XOOPS_ROOT_PATH")) {
+ die("XOOPS root path not defined");
+}
+
//modif JJD
define('_EXTCAL_MODULE', 'extcal');
@@ -35,53 +39,50 @@
define('_EXTCAL_CLN_EVENT', 'ExtcalEvent');
-
-
//-------------------------------------------------------------------
-define('_EXTCAL_PEAR_ROOT_DEFAUT', XOOPS_ROOT_PATH . '/modules/extcal/class/pear' );
+define('_EXTCAL_PEAR_ROOT_DEFAULT', XOOPS_ROOT_PATH . '/modules/extcal/class/pear');
//define('_EXTCAL_PEAR_ROOT', 'F:/wamp/www/xfr254b/xoops_lib/Frameworks/pear' );
-$pear_path = _EXTCAL_PEAR_ROOT_DEFAUT;
+$pear_path = _EXTCAL_PEAR_ROOT_DEFAULT;
global $xoopsModule, $xoopsModuleConfig;
-if (is_object($xoopsModule)){
- $name = $xoopsModule->getVar('name');
-}else{
- $name = '';
+if (is_object($xoopsModule)) {
+ $name = $xoopsModule->getVar('name');
+} else {
+ $name = '';
}
$moduleHandler =& xoops_gethandler('module');
-$module = $moduleHandler->getByDirname('extcal');
+$module = $moduleHandler->getByDirname('extcal');
-if ($name == 'extcal' || !is_object($module)){
- if (is_object($xoopsModuleConfig))
- $extcalConfig = $xoopsModuleConfig;
-}else{
-// $module = XoopsModule::getByDirname('extcal');
+if ($name == 'extcal' || !is_object($module)) {
+ if (is_object($xoopsModuleConfig)) {
+ $extcalConfig = $xoopsModuleConfig;
+
+ } else {
+ $module = $xoopsModule->getByDirname('extcal');
// $mid = $module->vars['mid']['value'];
// $config_handler =& xoops_gethandler('config');
// $extcalConfig = $config_handler->getConfigsByCat(0, $mid);
+ }
-
- $configHandler =& xoops_gethandler('config');
- $extcalConfig = $configHandler->getConfigList($module->getVar("mid"));
+// $configHandler =& xoops_gethandler('config');
+// $extcalConfig = $configHandler->getConfigList($module->getVar("mid"));
-
// $t = print_r($extcalConfig, true);
// echo "<pre>{$t}</pre>";
}
-
-
//////////////////////////////////
-
-$newPP = trim($extcalConfig['pear_path']);
-if (substr($newPP,-1,1) == '/' ) $newPP = substr($newPP,0,-1);
-if ($newPP <> '' && is_dir ($newPP)){
- $pear_path = $newPP;
-}
+//$newPP = trim($extcalConfig['pear_path']);
+//if (substr($newPP, -1, 1) == '/') {
+// $newPP = substr($newPP, 0, -1);
+//}
+//if ($newPP <> '' && is_dir($newPP)) {
+// $pear_path = $newPP;
+//}
define('_EXTCAL_PEAR_ROOT', $pear_path);
define('_EXTCAL_PEAR_CALENDAR_ROOT', _EXTCAL_PEAR_ROOT . '/Calendar');
@@ -89,61 +90,54 @@
//-------------------------------------------------------------------
-define('_EXTCAL_SHOW_NO_PICTURE', false);
+define('_EXTCAL_SHOW_NO_PICTURE', FALSE);
define('_EXTCAL_PATH_HORLOGES', '/modules/extcal/images/horloges/');
define('_EXTCAL_PATH_ICONS16', XOOPS_URL . '/Frameworks/moduleclasses/icons/16/');
define('_EXTCAL_PATH_ICONS32', XOOPS_URL . '/Frameworks/moduleclasses/icons/32/');
-define('_EXTCAL_PATH_FO', XOOPS_URL . '/modules/extcal/');
-define('_EXTCAL_PATH_BO', _EXTCAL_PATH_FO . 'admin/');
-define('_EXTCAL_PATH_LG', XOOPS_URL . '/modules/extcal/languages/');
-
-define('_EXTCAL_IMG_INTERVAL', 'interval04.png');
+define('_EXTCAL_PATH_FO', XOOPS_URL . '/modules/extcal/');
+define('_EXTCAL_PATH_BO', _EXTCAL_PATH_FO . 'admin/');
+define('_EXTCAL_PATH_LG', XOOPS_URL . '/modules/extcal/languages/');
+
+define('_EXTCAL_IMG_INTERVAL', 'interval04.png');
define('_EXTCAL_IMG_INTERVAL16', _EXTCAL_PATH_ICONS16 . _EXTCAL_IMG_INTERVAL);
define('_EXTCAL_IMG_INTERVAL32', _EXTCAL_PATH_ICONS32 . _EXTCAL_IMG_INTERVAL);
-
+
//define('_EXTCAL_DIRNAME', $xoopsModule->getVar('dirname'));
-define('_EXTCAL_NAV_CALMONTH', 'calendar-month');
-define('_EXTCAL_NAV_CALWEEK', 'calendar-week');
-define('_EXTCAL_NAV_YEAR', 'year');
-define('_EXTCAL_NAV_MONTH', 'month');
-define('_EXTCAL_NAV_WEEK', 'week');
-define('_EXTCAL_NAV_DAY', 'day');
-define('_EXTCAL_NAV_AGENDA_WEEK', 'agenda-week');
-define('_EXTCAL_NAV_AGENDA_DAY', 'agenda-day');
-define('_EXTCAL_NAV_SEARCH', 'search');
-define('_EXTCAL_NAV_NEW_EVENT', 'new-event');
+define('_EXTCAL_NAV_CALMONTH', 'calendar-month');
+define('_EXTCAL_NAV_CALWEEK', 'calendar-week');
+define('_EXTCAL_NAV_YEAR', 'year');
+define('_EXTCAL_NAV_MONTH', 'month');
+define('_EXTCAL_NAV_WEEK', 'week');
+define('_EXTCAL_NAV_DAY', 'day');
+define('_EXTCAL_NAV_AGENDA_WEEK', 'agenda-week');
+define('_EXTCAL_NAV_AGENDA_DAY', 'agenda-day');
+define('_EXTCAL_NAV_SEARCH', 'search');
+define('_EXTCAL_NAV_NEW_EVENT', 'new-event');
-define('_EXTCAL_NAV_LIST', _EXTCAL_NAV_CALMONTH
- . "\n" . _EXTCAL_NAV_CALWEEK
- . "\n" . _EXTCAL_NAV_YEAR
- . "\n" . _EXTCAL_NAV_MONTH
- . "\n" . _EXTCAL_NAV_WEEK
- . "\n" . _EXTCAL_NAV_DAY
- . "\n" . _EXTCAL_NAV_AGENDA_WEEK
- . "\n" . _EXTCAL_NAV_AGENDA_DAY
- . "\n" . _EXTCAL_NAV_SEARCH
- . "\n" . _EXTCAL_NAV_NEW_EVENT);
+define('_EXTCAL_NAV_LIST',
+ _EXTCAL_NAV_CALMONTH . "\n" . _EXTCAL_NAV_CALWEEK . "\n" . _EXTCAL_NAV_YEAR . "\n" . _EXTCAL_NAV_MONTH . "\n"
+ . _EXTCAL_NAV_WEEK . "\n" . _EXTCAL_NAV_DAY . "\n" . _EXTCAL_NAV_AGENDA_WEEK . "\n" . _EXTCAL_NAV_AGENDA_DAY . "\n"
+ . _EXTCAL_NAV_SEARCH . "\n" . _EXTCAL_NAV_NEW_EVENT);
-
define('_EXTCAL_PREFIX_VIEW', 'view_');
define('_EXTCAL_SUFFIX_VIEW', '.php');
-
-define('_EXTCAL_FILE_CALMONTH', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_CALMONTH . _EXTCAL_SUFFIX_VIEW);
-define('_EXTCAL_FILE_CALWEEK', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_CALWEEK . _EXTCAL_SUFFIX_VIEW);
-define('_EXTCAL_FILE_YEAR', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_YEAR . _EXTCAL_SUFFIX_VIEW);
-define('_EXTCAL_FILE_MONTH', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_MONTH . _EXTCAL_SUFFIX_VIEW);
-define('_EXTCAL_FILE_WEEK', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_WEEK . _EXTCAL_SUFFIX_VIEW);
-define('_EXTCAL_FILE_DAY', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_DAY . _EXTCAL_SUFFIX_VIEW);
-define('_EXTCAL_FILE_AGENDA_WEEK', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_AGENDA_WEEK . _EXTCAL_SUFFIX_VIEW);
-define('_EXTCAL_FILE_AGENDA_DAY', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_AGENDA_DAY . _EXTCAL_SUFFIX_VIEW);
-define('_EXTCAL_FILE_SEARCH', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_SEARCH . _EXTCAL_SUFFIX_VIEW);
-define('_EXTCAL_FILE_NEW_EVENT', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_NEW_EVENT . _EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_CALMONTH', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_CALMONTH . _EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_CALWEEK', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_CALWEEK . _EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_YEAR', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_YEAR . _EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_MONTH', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_MONTH . _EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_WEEK', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_WEEK . _EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_DAY', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_DAY . _EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_AGENDA_WEEK', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_AGENDA_WEEK . _EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_AGENDA_DAY', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_AGENDA_DAY . _EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_SEARCH', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_SEARCH . _EXTCAL_SUFFIX_VIEW);
+define('_EXTCAL_FILE_NEW_EVENT', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_NEW_EVENT . _EXTCAL_SUFFIX_VIEW);
+
define ("_EXTCAL_MULTILOADER", "/class/xoopsform/multiuploads/formmultiuploads.php");
@@ -172,10 +166,10 @@
define ("_EXTCAL_EVENTS_YEAR", 6);
//---------------------------------------------------
-define ('_EXTCAL_TS_SECOND', 1);
-define ('_EXTCAL_TS_MINUTE', 60);
-define ('_EXTCAL_TS_HOUR', 3600);
-define ('_EXTCAL_TS_DAY', 86400);
+define ('_EXTCAL_TS_SECOND', 1);
+define ('_EXTCAL_TS_MINUTE', 60);
+define ('_EXTCAL_TS_HOUR', 3600);
+define ('_EXTCAL_TS_DAY', 86400);
define ('_EXTCAL_TS_WEEK', 604800);
//---------------------------------------------------
define ("_EXTCAL_TS_YEARLY", 32140800);
@@ -185,6 +179,6 @@
define ("_EXTCAL_INFOBULLE_RGB_MIN", 220);
define ("_EXTCAL_INFOBULLE_RGB_MAX", 250);
-
+
?>
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/language/english/modinfo.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/language/english/modinfo.php 2012-07-07 14:21:53 UTC (rev 9795)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/language/english/modinfo.php 2012-07-07 16:09:22 UTC (rev 9796)
@@ -53,6 +53,7 @@
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);
define('_MI_EXTCAL_EMAIL_MODE', 'Email Format');
+define('_MI_EXTCAL_EMAIL_MODE_DESC', 'Select Email Format that you want to use');
define('_MI_EXTCAL_EMAIL_MODE_HTML', 'HTML Format');
define('_MI_EXTCAL_EMAIL_MODE_NONE', 'No email');
define('_MI_EXTCAL_EMAIL_MODE_TEXT', 'Plain text');
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/rss.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/rss.php 2012-07-07 14:21:53 UTC (rev 9795)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/rss.php 2012-07-07 16:09:22 UTC (rev 9796)
@@ -19,7 +19,7 @@
}
header('Content-Type:text/xml; charset=utf-8');
$tpl = new XoopsTpl();
-$tpl->xoops_setCaching(0);
+$tpl->caching=0;
$tpl->xoops_setCacheTime($xoopsModuleConfig['rss_cache_time'] * _EXTCAL_TS_MINUTE);
if (!$tpl->is_cached('db:extcal_rss.html', $cat)) {
$events = $eventHandler->getUpcommingEvent($xoopsModuleConfig['rss_nb_event'], $cat);
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/view_week.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/view_week.php 2012-07-07 14:21:53 UTC (rev 9795)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/view_week.php 2012-07-07 16:09:22 UTC (rev 9796)
@@ -16,14 +16,14 @@
// Validate the date (day, month and year)
$dayTS = mktime(0, 0, 0, $month, $day, $year);
-$offset = date('w', $dayTS) - $extcalConfig['week_start_day'];
+$offset = date('w', $dayTS) - $xoopsModuleConfig['week_start_day'];
$dayTS = $dayTS - ($offset * _EXTCAL_TS_DAY);
$year = date('Y', $dayTS);
$month = date('n', $dayTS);
$day = date('j', $dayTS);
$form = new XoopsSimpleForm('', 'navigSelectBox', $params['file'], 'get');
-$form->addElement(getListYears($year,$extcalConfig['agenda_nb_years_before'],$extcalConfig['agenda_nb_years_after']));
+$form->addElement(getListYears($year,$xoopsModuleConfig['agenda_nb_years_before'],$xoopsModuleConfig['agenda_nb_years_after']));
$form->addElement(getListMonths($month));
$form->addElement(getListDays($day));
$form->addElement(getListCategories($cat));
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/xoops_version.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/xoops_version.php 2012-07-07 14:21:53 UTC (rev 9795)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/xoops_version.php 2012-07-07 16:09:22 UTC (rev 9796)
@@ -14,64 +14,64 @@
setlocale(LC_TIME, $xoopsConfig['language']);
//***************************************************************************************
-$modversion['name'] = _MI_EXTCAL_NAME;
-$modversion['version'] = '2.37';
-$modversion['description'] = _MI_EXTCAL_DESC;
-$modversion['credits'] = 'Zoullou';
-$modversion['author'] = 'Zoullou, Mage, Mamba, JJ Delalandre(JJDai)';
-$modversion['nickname'] = 'JJDai';
-$modversion['website'] = '';
-$modversion['license'] = 'GPL see LICENSE';
-$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/";
-$modversion['official'] = 0;
-$modversion['image'] = 'images/extcal_logo.png';
-$modversion['dirname'] = $moduleDirName;
-$modversion['status_version'] = 'Beta 3';
+$modversion['name'] = _MI_EXTCAL_NAME;
+$modversion['version'] = '2.37';
+$modversion['description'] = _MI_EXTCAL_DESC;
+$modversion['credits'] = 'Zoullou';
+$modversion['author'] = 'Zoullou, Mage, Mamba, JJ Delalandre(JJDai)';
+$modversion['nickname'] = 'JJDai';
+$modversion['website'] = '';
+$modversion['license'] = 'GPL see LICENSE';
+$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/";
+$modversion['official'] = 0;
+$modversion['image'] = 'images/extcal_logo.png';
+$modversion['dirname'] = $moduleDirName;
+$modversion['status_version'] = 'Beta 4';
$modversion['sqlfile']['mysql'] = 'sql/mysql.sql';
-$modversion['onInstall'] = 'include/install_function.php';
-$modversion['onUpdate'] = 'include/update_function.php';
-$modversion['system_menu'] = 1;
-$modversion['help'] = 'page=help';
-$modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin';
-$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16';
-$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
+$modversion['onInstall'] = 'include/install_function.php';
+$modversion['onUpdate'] = 'include/update_function.php';
+$modversion['system_menu'] = 1;
+$modversion['help'] = 'page=help';
+$modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin';
+$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16';
+$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
//***************************************************************************************
//about
-$modversion["module_website_url"] = "http://www.xoops.org/";
+$modversion["module_website_url"] = "www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
-$modversion["release_date"] = "2012/03/27";
-$modversion['module_status'] = "Beta 3";
-$modversion['min_php'] = '5.2';
-$modversion['min_xoops'] = "2.5.0";
+$modversion["release_date"] = "2012/07/07";
+$modversion['module_status'] = "Beta 4";
+$modversion['min_php'] = '5.2';
+$modversion['min_xoops'] = "2.5.5";
// Admin things
-$modversion['hasAdmin'] = 1;
+$modversion['hasAdmin'] = 1;
$modversion['adminindex'] = "admin/index.php";
-$modversion['adminmenu'] = "admin/menu.php";
+$modversion['adminmenu'] = "admin/menu.php";
// Menu
// definitioin des menus
$modversion['hasMain'] = 1;
-$i = 0;
+$i = 0;
if (isset($GLOBALS['xoopsModule'])
&& $GLOBALS['xoopsModule']->getVar('dirname') == "extcal"
) {
-/*
- $user = isset($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser'] : null;
- $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
- if ($catHandler->haveSubmitRight($user)) {
- $modversion['sub'][0]['name'] = _MI_EXTCAL_SUBMIT_EVENT;
- $modversion['sub'][0]['url'] = _EXTCAL_FILE_NEW_EVENT;
- }
-*/
+ /*
+ $user = isset($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser'] : null;
+ $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
+ if ($catHandler->haveSubmitRight($user)) {
+ $modversion['sub'][0]['name'] = _MI_EXTCAL_SUBMIT_EVENT;
+ $modversion['sub'][0]['url'] = _EXTCAL_FILE_NEW_EVENT;
+ }
+ */
$tTabs = getNavBarTabs();
- while(list($k,$v)=each($tTabs)){
- $i++;
- $modversion['sub'][$i]['name'] = $v['name'];
- $modversion['sub'][$i]['url'] = $v['href'];
+ while (list($k, $v) = each($tTabs)) {
+ $i++;
+ $modversion['sub'][$i]['name'] = $v['name'];
+ $modversion['sub'][$i]['url'] = $v['href'];
}
}
@@ -83,462 +83,435 @@
$modversion['tables'][2] = "extcal_event";
$modversion['tables'][3] = "extcal_eventmember";
$modversion['tables'][4] = "extcal_eventnotmember";
-$modversion['tables'][5] = "extcal_file";
+$modversion['tables'][5] = "extcal_file";
$modversion['tables'][6] = "extcal_etablissement";
// Comments
-$modversion['hasComments'] = 1;
+$modversion['hasComments'] = 1;
$modversion['comments']['itemName'] = 'event';
$modversion['comments']['pageName'] = 'event.php';
// Search
-$modversion['hasSearch'] = 1;
+$modversion['hasSearch'] = 1;
$modversion['search']['file'] = "include/search.inc.php";
$modversion['search']['func'] = "extcal_search";
// Config items
$i = 0;
-
-$modversion['config'][$i]['name'] = 'visible_tabs';
-$modversion['config'][$i]['title'] = '_MI_EXTCAL_VISIBLE_TABS';
+
+$modversion['config'][$i]['name'] = 'visible_tabs';
+$modversion['config'][$i]['title'] = '_MI_EXTCAL_VISIBLE_TABS';
$modversion['config'][$i]['description'] = '_MI_EXTCAL_VISIBLE_TABS_DESC';
-$modversion['config'][$i]['formtype'] = 'select_multi';
-$modversion['config'][$i]['valuetype'] = 'array';
-$modversion['config'][$i]['default'] = array(_EXTCAL_NAV_CALMONTH,
- _EXTCAL_NAV_CALWEEK,
- _EXTCAL_NAV_YEAR,
- _EXTCAL_NAV_MONTH,
- _EXTCAL_NAV_WEEK,
- _EXTCAL_NAV_DAY,
- _EXTCAL_NAV_AGENDA_WEEK,
- _EXTCAL_NAV_AGENDA_DAY ,
- _EXTCAL_NAV_SEARCH,
- _EXTCAL_NAV_NEW_EVENT);
+$modversion['config'][$i]['formtype'] = 'select_multi';
+$modversion['config'][$i]['valuetype'] = 'array';
+$modversion['config'][$i]['default'] = array(
+ _EXTCAL_NAV_CALMONTH, _EXTCAL_NAV_CALWEEK, _EXTCAL_NAV_YEAR, _EXTCAL_NAV_MONTH, _EXTCAL_NAV_WEEK, _EXTCAL_NAV_DAY, _EXTCAL_NAV_AGENDA_WEEK, _EXTCAL_NAV_AGENDA_DAY, _EXTCAL_NAV_SEARCH, _EXTCAL_NAV_NEW_EVENT
+);
// $t = print_r($modversion['config'][$i]['default'],true);
// echo _EXTCAL_NAV_CALMONTH . "<br /><pre>{$t}</pre>";
-$modversion['config'][$i]['options'] = array('_MI_EXTCAL_NAV_CALMONTH' => _EXTCAL_NAV_CALMONTH,
- '_MI_EXTCAL_NAV_CALWEEK' => _EXTCAL_NAV_CALWEEK,
- '_MI_EXTCAL_NAV_YEAR' => _EXTCAL_NAV_YEAR,
- '_MI_EXTCAL_NAV_MONTH' => _EXTCAL_NAV_MONTH,
- '_MI_EXTCAL_NAV_WEEK' => _EXTCAL_NAV_WEEK,
- '_MI_EXTCAL_NAV_DAY' => _EXTCAL_NAV_DAY,
- '_MI_EXTCAL_NAV_AGENDA_WEEK' => _EXTCAL_NAV_AGENDA_WEEK,
- '_MI_EXTCAL_NAV_AGENDA_DAY' => _EXTCAL_NAV_AGENDA_DAY,
- '_MI_EXTCAL_NAV_SEARCH' => _EXTCAL_NAV_SEARCH,
- '_MI_EXTCAL_NAV_NEW_EVENT' => _EXTCAL_NAV_NEW_EVENT
- );
+$modversion['config'][$i]['options'] = array(
+ '_MI_EXTCAL_NAV_CALMONTH' => _EXTCAL_NAV_CALMONTH, '_MI_EXTCAL_NAV_CALWEEK' => _EXTCAL_NAV_CALWEEK, '_MI_EXTCAL_NAV_YEAR' => _EXTCAL_NAV_YEAR, '_MI_EXTCAL_NAV_MONTH' => _EXTCAL_NAV_MONTH, '_MI_EXTCAL_NAV_WEEK' => _EXTCAL_NAV_WEEK, '_MI_EXTCAL_NAV_DAY' => _EXTCAL_NAV_DAY, '_MI_EXTCAL_NAV_AGENDA_WEEK' => _EXTCAL_NAV_AGENDA_WEEK, '_MI_EXTCAL_NAV_AGENDA_DAY' => _EXTCAL_NAV_AGENDA_DAY, '_MI_EXTCAL_NAV_SEARCH' => _EXTCAL_NAV_SEARCH, '_MI_EXTCAL_NAV_NEW_EVENT' => _EXTCAL_NAV_NEW_EVENT
+);
//-----------------------------------------------------------------------------
$i++;
-$modversion['config'][$i]['name'] = 'weight_tabs';
-$modversion['config'][$i]['title'] = '_MI_EXTCAL_TABS_WEIGHT';
+$modversion['config'][$i]['name'] = 'weight_tabs';
+$modversion['config'][$i]['title'] = '_MI_EXTCAL_TABS_WEIGHT';
$modversion['config'][$i]['description'] = '_MI_EXTCAL_TABS_WEIGHT_DESC';
-$modversion['config'][$i]['formtype'] = 'textarea';
-$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['formtype'] = 'textarea';
+$modversion['config'][$i]['valuetype'] = 'text';
//$modversion['config'][$i]['default'] = "10,20,30,40,50,_EXTCAL_TS_MINUTE,70,80,90,100,0";
$modversion['config'][$i]['default'] = _EXTCAL_NAV_LIST;
//-----------------------------------------------------------------------------
$i++;
-$modversion['config'][$i]['name'] = 'start_page';
-$modversion['config'][$i]['title'] = '_MI_EXTCAL_START_PAGE';
+$modversion['config'][$i]['name'] = 'start_page';
+$modversion['config'][$i]['title'] = '_MI_EXTCAL_START_PAGE';
$modversion['config'][$i]['description'] = '';
-$modversion['config'][$i]['formtype'] = 'select';
-$modversion['config'][$i]['valuetype'] = 'text';
-$modversion['config'][$i]['default'] = _EXTCAL_FILE_CALMONTH;
-$modversion['config'][$i]['options'] = array('_MI_EXTCAL_NAV_CALMONTH' => _EXTCAL_FILE_CALMONTH,
- '_MI_EXTCAL_NAV_CALWEEK' => _EXTCAL_FILE_CALWEEK,
- '_MI_EXTCAL_NAV_YEAR' => _EXTCAL_FILE_YEAR,
- '_MI_EXTCAL_NAV_MONTH' => _EXTCAL_FILE_MONTH,
- '_MI_EXTCAL_NAV_WEEK' => _EXTCAL_FILE_WEEK,
- '_MI_EXTCAL_NAV_DAY' => _EXTCAL_FILE_DAY,
- '_MI_EXTCAL_NAV_AGENDA_WEEK' => _EXTCAL_FILE_AGENDA_WEEK,
- '_MI_EXTCAL_NAV_AGENDA_DAY' => _EXTCAL_FILE_AGENDA_DAY,
- '_MI_EXTCAL_NAV_SEARCH' => _EXTCAL_FILE_SEARCH,
- '_MI_EXTCAL_NAV_NEW_EVENT' => _EXTCAL_FILE_NEW_EVENT
- );
-
+$modversion['config'][$i]['formtype'] = 'select';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = _EXTCAL_FILE_CALMONTH;
+$modversion['config'][$i]['options'] = array(
+ '_MI_EXTCAL_NAV_CALMONTH' => _EXTCAL_FILE_CALMONTH, '_MI_EXTCAL_NAV_CALWEEK' => _EXTCAL_FILE_CALWEEK, '_MI_EXTCAL_NAV_YEAR' => _EXTCAL_FILE_YEAR, '_MI_EXTCAL_NAV_MONTH' => _EXTCAL_FILE_MONTH, '_MI_EXTCAL_NAV_WEEK' => _EXTCAL_FILE_WEEK, '_MI_EXTCAL_NAV_DAY' => _EXTCAL_FILE_DAY, '_MI_EXTCAL_NAV_AGENDA_WEEK' => _EXTCAL_FILE_AGENDA_WEEK, '_MI_EXTCAL_NAV_AGENDA_DAY' => _EXTCAL_FILE_AGENDA_DAY, '_MI_EXTCAL_NAV_SEARCH' => _EXTCAL_FILE_SEARCH, '_MI_EXTCAL_NAV_NEW_EVENT' => _EXTCAL_FILE_NEW_EVENT
+);
+
$i++;
-$modversion['config'][$i]['name'] = 'week_start_day';
-$modversion['config'][$i]['title'] = '_MI_EXTCAL_WEEK_START_DAY';
+$modversion['config'][$i]['name'] = 'week_start_day';
+$modversion['config'][$i]['title'] = '_MI_EXTCAL_WEEK_START_DAY';
$modversion['config'][$i]['description'] = '_MI_EXTCAL_WEEK_START_DAY_DESC';
-$modversion['config'][$i]['formtype'] = 'select';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 1;
-$modversion['config'][$i]['options'] = array('_MI_EXTCAL_DAY_SUNDAY' => 0,
- '_MI_EXTCAL_DAY_MONDAY' => 1,
- '_MI_EXTCAL_DAY_TUESDAY' => 2,
- '_MI_EXTCAL_DAY_WEDNESDAY' => 3,
- '_MI_EXTCAL_DAY_THURSDAY' => 4,
- '_MI_EXTCAL_DAY_FRIDAY' => 5,
- '_MI_EXTCAL_DAY_SATURDAY' => 6);
+$modversion['config'][$i]['formtype'] = 'select';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 1;
+$modversion['config'][$i]['options'] = array(
+ '_MI_EXTCAL_DAY_SUNDAY' => 0, '_MI_EXTCAL_DAY_MONDAY' => 1, '_MI_EXTCAL_DAY_TUESDAY' => 2, '_MI_EXTCAL_DAY_WEDNESDAY' => 3, '_MI_EXTCAL_DAY_THURSDAY' => 4, '_MI_EXTCAL_DAY_FRIDAY' => 5, '_MI_EXTCAL_DAY_SATURDAY' => 6
+);
$i++;
-$modversion['config'][$i]['name'] = 'list_position';
-$modversion['config'][$i]['title'] = '_MI_EXTCAL_LIST_POS';
+$modversion['config'][$i]['name'] = 'list_position';
+$modversion['config'][$i]['title'] = '_MI_EXTCAL_LIST_POS';
$modversion['config'][$i]['description'] = '_MI_EXTCAL_LIST_POS_DESC';
-$modversion['config'][$i]['formtype'] = 'select';
-$modversion['config'][$i]['valuetype'] = 'text';
-$modversion['config'][$i]['default'] = 1;
-$modversion['config'][$i]['options'] = array('_MI_EXTCAL_BEFORE' => 0,
- '_MI_EXTCAL_AFTER' => 1);
+$modversion['config'][$i]['formtype'] = 'select';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = 1;
+$modversion['config'][$i]['options'] = array(
+ '_MI_EXTCAL_BEFORE' => 0, '_MI_EXTCAL_AFTER' => 1
+);
$i++;
-$modversion['config'][$i]['name'] = 'rss_cache_time';
-$modversion['config'][$i]['title'] = '_MI_EXTCAL_RSS_CACHE_TIME';
+$modversion['config'][$i]['name'] = 'rss_cache_time';
+$modversion['config'][$i]['title'] = '_MI_EXTCAL_RSS_CACHE_TIME';
$modversion['config'][$i]['description'] = '_MI_EXTCAL_RSS_CACHE_TIME_DESC';
-$modversion['config'][$i]['formtype'] = 'textbox';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = _EXTCAL_TS_MINUTE;
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = _EXTCAL_TS_MINUTE;
$i++;
-$modversion['config'][$i]['name'] = 'rss_nb_event';
-$modversion['config'][$i]['title'] = '_MI_EXTCAL_RSS_NB_EVENT';
+$modversion['config'][$i]['name'] = 'rss_nb_event';
+$modversion['config'][$i]['title'] = '_MI_EXTCAL_RSS_NB_EVENT';
$modversion['config'][$i]['description'] = '_MI_EXTCAL_RSS_NB_EVENT_DESC';
-$modversion['config'][$i]['formtype'] = 'textbox';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 10;
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 10;
$i++;
-$modversion['config'][$i]['name'] = 'whos_going';
-$modversion['config'][$i]['title'] = '_MI_EXTCAL_WHOS_GOING';
+$modversion['config'][$i]['name'] = 'whos_going';
+$modversion['config'][$i]['title'] = '_MI_EXTCAL_WHOS_GOING';
$modversion['config'][$i]['description'] = '_MI_EXTCAL_WHOS_GOING_DESC';
-$modversion['config'][$i]['formtype'] = 'yesno';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 1;
+$modversion['config'][$i]['formtype'] = 'yesno';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 1;
$i++;
-$modversion['config'][$i]['name'] = 'whosnot_going';
-$modversion['config'][$i]['title'] = '_MI_EXTCAL_WHOSNOT_GOING';
+$modversion['config'][$i]['name'] = 'whosnot_going';
+$modversion['config'][$i]['title'] = '_MI_EXTCAL_WHOSNOT_GOING';
$modversion['config'][$i]['description'] = '_MI_EXTCAL_WHOSNOT_GOING_DESC';
-$modversion['config'][$i]['formtype'] = 'yesno';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 1;
+$modversion['config'][$i]['formtype'] = 'yesno';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 1;
$i++;
-$modversion['config'][$i]['name'] = 'sort_order';
-$modversion['config'][$i]['title'] = '_MI_EXTCAL_SORT_ORDER';
+$modversion['config'][$i]['name'] = 'sort_order';
+$modversion['config'][$i]['title'] = '_MI_EXTCAL_SORT_ORDER';
$modversion['config'][$i]['description'] = '_MI_EXTCAL_SORT_ORDER_DESC';
-$modversion['config'][$i]['formtype'] = 'select';
-$modversion['config'][$i]['valuetype'] = 'text';
-$modversion['config'][$i]['default'] = 1;
-$modversion['config'][$i]['options'] = array('_MI_EXTCAL_ASCENDING' => 'ASC',
- '_MI_EXTCAL_DESCENDING' => 'DESC');
+$modversion['config'][$i]['formtype'] = 'select';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = 1;
+$modversion['config'][$i]['options'] = array(
+ '_MI_EXTCAL_ASCENDING' => 'ASC', '_MI_EXTCAL_DESCENDING' => 'DESC'
+);
$i++;
-$modversion['config'][$i]['name'] = 'event_date_year';
-$modversion['config'][$i]['title'] = '_MI_EXTCAL_EY_DATE_PATTERN';
+$modversion['config'][$i]['name'] = 'event_date_year';
+$modversion['config'][$i]['title'] = '_MI_EXTCAL_EY_DATE_PATTERN';
$modversion['config'][$i]['description'] = '_MI_EXTCAL_EY_DATE_PATTERN_DESC';
-$modversion['config'][$i]['formtype'] = 'textbox';
-$modversion['config'][$i]['valuetype'] = 'text';
-$modversion['config'][$i]['default'] = _MI_EXTCAL_EY_DATE_PATTERN_VALUE;
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = _MI_EXTCAL_EY_DATE_PATTERN_VALUE;
$i++;
-$modversion['config'][$i]['name'] = 'nav_date_month';
-$modversion['config'][$i]['title'] = '_MI_EXTCAL_NM_DATE_PATTERN';
+$modversion['config'][$i]['name'] = 'nav_date_month';
+$modversion['config'][$i]['title'] = '_MI_EXTCAL_NM_DATE_PATTERN';
$modversion['config'][$i]['description'] = '_MI_EXTCAL_NM_DATE_PATTERN_DESC';
-$modversion['config'][$i]['formtype'] = 'textbox';
-$modversion['config'][$i]['valuetype'] = 'text';
-$modversion['config'][$i]['default'] = _MI_EXTCAL_NM_DATE_PATTERN_VALUE;
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = _MI_EXTCAL_NM_DATE_PATTERN_VALUE;
$i++;
-$modversion['config'][$i]['name'] = 'event_date_month';
-$modversion['config'][$i]['title'] = '_MI_EXTCAL_EM_DATE_PATTERN';
+$modversion['config'][$i]['name'] = 'event_date_month';
+$modversion['config'][$i]['title'] = '_MI_EXTCAL_EM_DATE_PATTERN';
$modversion['config'][$i]['description'] = '_MI_EXTCAL_EM_DATE_PATTERN_DESC';
-$modversion['config'][$i]['formtype'] = 'textbox';
-$modversion['config'][$i]['valuetype'] = 'text';
-$modversion['config'][$i]['default'] = _MI_EXTCAL_EM_DATE_PATTERN_VALUE;
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = _MI_EXTCAL_EM_DATE_PATTERN_VALUE;
$i++;
-$modversion['config'][$i]['name'] = 'nav_date_week';
-$modversion['config'][$i]['title'] = '_MI_EXTCAL_NW_DATE_PATTERN';
+$modversion['config'][$i]['name'] = 'nav_date_week';
+$modversion['config'][$i]['title'] = '_MI_EXTCAL_NW_DATE_PATTERN';
$modversion['config'][$i]['description'] = '_MI_EXTCAL_NW_DATE_PATTERN_DESC';
-$modversion['config'][$i]['formtype'] = 'textbox';
-$modversion['config'][$i]['valuetype'] = 'text';
-$modversion['config'][$i]['default'] = _MI_EXTCAL_NW_DATE_PATTERN_VALUE;
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = _MI_EXTCAL_NW_DATE_PATTERN_VALUE;
$i++;
-$modversion['config'][$i]['name'] = 'event_date_week';
-$modversion['config'][$i]['title'] = '_MI_EXTCAL_EW_DATE_PATTERN';
+$modversion['config'][$i]['name'] = 'event_date_week';
+$modversion['config'][$i]['title'] = '_MI_EXTCAL_EW_DATE_PATTERN';
$modversion['config'][$i]['description'] = '_MI_EXTCAL_EW_DATE_PATTERN_DESC';
-$modversion['config'][$i]['formtype'] = 'textbox';
-$modversion['config'][$i]['valuetype'] = 'text';
-$modversion['config'][$i]['default'] = _MI_EXTCAL_EW_DATE_PATTERN_VALUE;
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = _MI_EXTCAL_EW_DATE_PATTERN_VALUE;
$i++;
-$modversion['config'][$i]['name'] = 'nav_date_day';
-$modversion['config'][$i]['title'] = '_MI_EXTCAL_ND_DATE_PATTERN';
+$modversion['config'][$i]['name'] = 'nav_date_day';
+$modversion['config'][$i]['title'] = '_MI_EXTCAL_ND_DATE_PATTERN';
$modversion['config'][$i]['description'] = '_MI_EXTCAL_ND_DATE_PATTERN_DESC';
-$modversion['config'][$i]['formtype'] = 'textbox';
-$modversion['config'][$i]['valuetype'] = 'text';
-$modversion['config'][$i]['default'] = _MI_EXTCAL_ND_DATE_PATTERN_VALUE;
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = _MI_EXTCAL_ND_DATE_PATTERN_VALUE;
$i++;
-$modversion['config'][$i]['name'] = 'event_date_day';
-$modversion['config'][$i]['title'] = '_MI_EXTCAL_ED_DATE_PATTERN';
+$modversion['config'][$i]['name'] = 'event_date_day';
+$modversion['config'][$i]['title'] = '_MI_EXTCAL_ED_DATE_PATTERN';
$modversion['config'][$i]['description'] = '_MI_EXTCAL_ED_DATE_PATTERN_DESC';
-$modversion['config'][$i]['formtype'] = 'textbox';
-$modversion['config'][$i]['valuetype'] = 'text';
-$modversion['config'][$i]['default'] = _MI_EXTCAL_ED_DATE_PATTERN_VALUE;
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = _MI_EXTCAL_ED_DATE_PATTERN_VALUE;
$i++;
-$modversion['config'][$i]['name'] = 'event_date_event';
-$modversion['config'][$i]['title'] = '_MI_EXTCAL_EE_DATE_PATTERN';
+$modversion['config'][$i]['name'] = 'event_date_event';
+$modversion['config'][$i]['title'] = '_MI_EXTCAL_EE_DATE_PATTERN';
$modversion['config'][$i]['description'] = '_MI_EXTCAL_EE_DATE_PATTERN_DESC';
-$modversion['config'][$i]['formtype'] = 'textbox';
-$modversion['config'][$i]['valuetype'] = 'text';
-$modversion['config'][$i]['default'] = _MI_EXTCAL_EE_DATE_PATTERN_VALUE;
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = _MI_EXTCAL_EE_DATE_PATTERN_VALUE;
$i++;
-$modversion['config'][$i]['name'] = 'event_date_block';
-$modversion['config'][$i]['title'] = '_MI_EXTCAL_EB_DATE_PATTERN';
+$modversion['config'][$i]['name'] = 'event_date_block';
+$modversion['config'][$i]['title'] = '_MI_EXTCAL_EB_DATE_PATTERN';
$modversion['config'][$i]['description'] = '_MI_EXTCAL_EB_DATE_PATTERN_DESC';
-$modversion['config'][$i]['formtype'] = 'textbox';
-$modversion['config'][$i]['valuetype'] = 'text';
-$modversion['config'][$i]['default'] = _MI_EXTCAL_EB_DATE_PATTERN_VALUE;
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = _MI_EXTCAL_EB_DATE_PATTERN_VALUE;
$i++;
-$modversion['config'][$i]['name'] = 'diplay_past_event_list';
-$modversion['config'][$i]['title'] = '_MI_EXTCAL_DISP_PAST_E_LIST';
+$modversion['config'][$i]['name'] = 'diplay_past_event_list';
+$modversion['config'][$i]['title'] = '_MI_EXTCAL_DISP_PAST_E_LIST';
$modversion['config'][$i]['description'] = '_MI_EXTCAL_DISP_PAST_E_LIST_DESC';
-$modversion['config'][$i]['formtype'] = 'yesno';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 1;
+$modversion['config'][$i]['formtype'] = 'yesno';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 1;
$i++;
-$modversion['config'][$i]['name'] = 'diplay_past_event_cal';
-$modversion['config'][$i]['title'] = '_MI_EXTCAL_DISP_PAST_E_CAL';
+$modversion['config'][$i]['name'] = 'diplay_past_event_cal';
+$modversion['config'][$i]['title'] = '_MI_EXTCAL_DISP_PAST_E_CAL';
$modversion['config'][$i]['description'] = '_MI_EXTCAL_DISP_PAST_E_CAL_DESC';
-$modversion['config'][$i]['formtype'] = 'yesno';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 1;
+$modversion['config'][$i]['formtype'] = 'yesno';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 1;
$i++;
-$modversion['config'][$i]['name'] = 'allowed_file_extention';
-$modversion['config'][$i]['title'] = '_MI_EXTCAL_FILE_EXTENTION';
+$modversion['config'][$i]['name'] = 'allowed_file_extention';
+$modversion['config'][$i]['title'] = '_MI_EXTCAL_FILE_EXTENTION';
$modversion['config'][$i]['description'] = '_MI_EXTCAL_FILE_EXTENTION_DESC';
-$modversion['config'][$i]['formtype'] = 'select_multi';
-$modversion['config'][$i]['valuetype'] = 'array';
-$modversion['config'][$i]['default'] = array('doc', 'jpg', 'jpeg', 'gif', 'png', 'pdf', 'txt');
-$modversion['config'][$i]['options'] = array('ai' => 'ai', 'aif' => 'aif', 'aiff' => 'aiff', 'asc' => 'asc', 'au' => 'au', 'avi' => 'avi', 'bin' => 'bin', 'bmp' => 'bmp', 'class' => 'class', 'csh' => 'csh', 'css' => 'css', 'dcr' => 'dcr', 'dir' => 'dir', 'dll' => 'dll', 'doc' => 'doc', 'dot' => 'dot', 'dtd' => 'dtd', 'dxr' => 'dxr', 'ent' => 'ent', 'eps' => 'eps', 'exe' => 'exe', 'gif' => 'gif', 'gtar' => 'gtar', 'gz' => 'gz', 'hqx' => 'hqx', 'htm' => 'htm', 'html' => 'html', 'ics' => 'ics', 'ifb' => 'ifb', 'jpe' => 'jpe', 'jpeg' => 'jpeg', 'jpg' => 'jpg', 'js' => 'js', 'kar' => 'kar', 'lha' => 'lha', 'lzh' => 'lzh', 'm3u' => 'm3u', 'mid' => 'mid', 'midi' => 'midi', 'mod' => 'mod', 'mov' => 'mov', 'mp1' => 'mp1', 'mp2' => 'mp2', 'mp3' => 'mp3', 'mpe' => 'mpe', 'mpeg' => 'mpeg', 'mpg' => 'mpg', 'pbm' => 'pbm', 'pdf' => 'pdf', 'pgm' => 'pgm', 'php' => 'php', 'php3' => 'php3', 'php5' => 'php5', 'phtml' => 'phtml', 'png' => 'png', 'pnm' => 'pnm', 'ppm' => 'ppm', 'ppt' => 'ppt', 'ps' => 'ps', 'qt' => 'qt', 'ra' => 'ra', 'ram' => 'ram', 'rm' => 'rm', 'rpm' => 'rpm', 'rtf' => 'rtf', 'sgm' => 'sgm', 'sgml' => 'sgml', 'sh' => 'sh', 'sit' => 'sit', 'smi' => 'smi', 'smil' => 'smil', 'snd' => 'snd', 'so' => 'so', 'spl' => 'spl', 'swf' => 'swf', 'tar' => 'tar', 'tcl' => 'tcl', 'tif' => 'tif', 'tiff' => 'tiff', 'tsv' => 'tsv', 'txt' => 'txt', 'wav' => 'wav', 'wbmp' => 'wbmp', 'wbxml' => 'wbxml', 'wml' => 'wml', 'wmlc' => 'wmlc', 'wmls' => 'wmls', 'wmlsc' => 'wmlsc', 'xbm' => 'xbm', 'xht' => 'xht', 'xhtml' => 'xhtml', 'xla' => 'xla', 'xls' => 'xls', 'xlt' => 'xlt', 'xpm' => 'xpm', 'xsl' => 'xsl', 'zip' => 'zip');
+$modversion['config'][$i]['formtype'] = 'select_multi';
+$modversion['config'][$i]['valuetype'] = 'array';
+$modversion['config'][$i]['default'] = array('doc', 'jpg', 'jpeg', 'gif', 'png', 'pdf', 'txt');
+$modversion['config'][$i]['options'] = array('ai' => 'ai', 'aif' => 'aif', 'aiff' => 'aiff', 'asc' => 'asc', 'au' => 'au', 'avi' => 'avi', 'bin' => 'bin', 'bmp' => 'bmp', 'class' => 'class', 'csh' => 'csh', 'css' => 'css', 'dcr' => 'dcr', 'dir' => 'dir', 'dll' => 'dll', 'doc' => 'doc', 'dot' => 'dot', 'dtd' => 'dtd', 'dxr' => 'dxr', 'ent' => 'ent', 'eps' => 'eps', 'exe' => 'exe', 'gif' => 'gif', 'gtar' => 'gtar', 'gz' => 'gz', 'hqx' => 'hqx', 'htm' => 'htm', 'html' => 'html', 'ics' => 'ics', 'ifb' => 'ifb', 'jpe' => 'jpe', 'jpeg' => 'jpeg', 'jpg' => 'jpg', 'js' => 'js', 'kar' => 'kar', 'lha' => 'lha', 'lzh' => 'lzh', 'm3u' => 'm3u', 'mid' => 'mid', 'midi' => 'midi', 'mod' => 'mod', 'mov' => 'mov', 'mp1' => 'mp1', 'mp2' => 'mp2', 'mp3' => 'mp3', 'mpe' => 'mpe', 'mpeg' => 'mpeg', 'mpg' => 'mpg', 'pbm' => 'pbm', 'pdf' => 'pdf', 'pgm' => 'pgm', 'php' => 'php', 'php3' => 'php3', 'php5' => 'php5', 'phtml' => 'phtml', 'png' => 'png', 'pnm' => 'pnm', 'ppm' => 'ppm', 'ppt' => 'ppt', 'ps' => 'ps', 'qt' => 'qt', 'ra' => 'ra', 'ram' => 'ram', 'rm' => 'rm', 'rpm' => 'rpm', 'rtf' => 'rtf', 'sgm' => 'sgm', 'sgml' => 'sgml', 'sh' => 'sh', 'sit' => 'sit', 'smi' => 'smi', 'smil' => 'smil', 'snd' => 'snd', 'so' => 'so', 'spl' => 'spl', 'swf' => 'swf', 'tar' => 'tar', 'tcl' => 'tcl', 'tif' => 'tif', 'tiff' => 'tiff', 'tsv' => 'tsv', 'txt' => 'txt', 'wav' => 'wav', 'wbmp' => 'wbmp', 'wbxml' => 'wbxml', 'wml' => 'wml', 'wmlc' => 'wmlc', 'wmls' => 'wmls', 'wmlsc' => 'wmlsc', 'xbm' => 'xbm', 'xht' => 'xht', 'xhtml' => 'xhtml', 'xla' => 'xla', 'xls' => 'xls', 'xlt' => 'xlt', 'xpm' => 'xpm', 'xsl' => 'xsl', 'zip' => 'zip');
$i++;
-$modversion['config'][$i]['name'] = 'allow_html';
-$modversion['config'][$i]['title'] = '_MI_EXTCAL_HTML';
+$modversion['config'][$i]['name'] = 'allow_html';
+$modversion['config'][$i]['title'] = '_MI_EXTCAL_HTML';
$modversion['config'][$i]['description'] = '_MI_EXTCAL_HTML_DESC';
-$modversion['config'][$i]['formtype'] = 'yesno';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 0;
+$modversion['config'][$i]['formtype'] = 'yesno';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 0;
//modif JJD ------------------------------------------------------------
$i++;
-$modversion['config'][$i]['name'] = 'agenda_tranche_minutes';
-$modversion['config'][$i]['title'] = '_MI_EXTCAL_AGENDA_SLICE_MINUTES';
+$modversion['config'][$i]['name'] = 'agenda_tranche_minutes';
+$modversion['config'][$i]['title'] = '_MI_EXTCAL_AGENDA_SLICE_MINUTES';
$modversion['config'][$i]['description'] = '_MI_EXTCAL_AGENDA_SLICE_MINUTES_DESC';
-$modversion['config'][$i]['formtype'] = 'int';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 15;
+$modversion['config'][$i]['formtype'] = 'int';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 15;
$i++;
-$modversion['config'][$i]['name'] = 'agenda_start_hour';
-$modversion['config'][$i]['title'] = '_MI_EXTCAL_AGENDA_START_HOUR';
+$modversion['config'][$i]['name'] = 'agenda_start_hour';
+$modversion['config'][$i]['title'] = '_MI_EXTCAL_AGENDA_START_HOUR';
$modversion['config'][$i]['description'] = '_MI_EXTCAL_AGENDA_START_HOUR_DESC';
-$modversion['config'][$i]['formtype'] = 'int';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 8;
+$modversion['config'][$i]['formtype'] = 'int';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 8;
$i++;
-$modversion['config'][$i]['name'] = 'agenda_end_hour';
-$modversion['config'][$i]['title'] = '_MI_EXTCAL_AGENDA_END_HOUR';
+$modversion['config'][$i]['name'] = 'agenda_end_hour';
+$modversion['config'][$i]['title'] = '_MI_EXTCAL_AGENDA_END_HOUR';
$modversion['config'][$i]['description'] = '_MI_EXTCAL_AGENDA_END_HOUR_DESC';
-$modversion['config'][$i]['formtype'] = 'int';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 20;
+$modversion['config'][$i]['formtype'] = 'int';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 20;
$i++;
-$modversion['config'][$i]['name'] = 'agenda_nb_days_week';
-$modversion['config'][$i]['title'] = '_MI_EXTCAL_AGENDA_NB_DAYS_WEEK';
+$modversion['config'][$i]['name'] = 'agenda_nb_days_week';
+$modversion['config'][$i]['title'] = '_MI_EXTCAL_AGENDA_NB_DAYS_WEEK';
$modversion['config'][$i]['description'] = '_MI_EXTCAL_AGENDA_NB_DAYS_WEEK_DESC';
-$modversion['config'][$i]['formtype'] = 'int';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 10;
+$modversion['config'][$i]['formtype'] = 'int';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 10;
$i++;
-$modversion['config'][$i]['name'] = 'agenda_nb_days_day';
-$modversion['config'][$i]['title'] = '_MI_EXTCAL_AGENDA_NB_DAYS_DAY';
+$modversion['config'][$i]['name'] = 'agenda_nb_days_day';
+$modversion['config'][$i]['title'] = '_MI_EXTCAL_AGENDA_NB_DAYS_DAY';
$modversion['config'][$i]['description'] = '_MI_EXTCAL_AGENDA_NB_DAYS_DAY_DESC';
-$modversion['config'][$i]['formtype'] = 'int';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 1;
+$modversion['config'][$i]['formtype'] = 'int';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 1;
$i++;
-$modversion['config'][$i]['name'] = 'agenda_nb_years_before';
-$modversion['config'][$i]['title'] = '_MI_EXTCAL_NB_YEARS_BEFORE';
+$modversion['config'][$i]['name'] = 'agenda_nb_years_before';
+$modversion['config'][$i]['title'] = '_MI_EXTCAL_NB_YEARS_BEFORE';
$modversion['config'][$i]['description'] = '_MI_EXTCAL_NB_YEARS_BEFORE_DESC';
-$modversion['config'][$i]['formtype'] = 'int';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 0;
+$modversion['config'][$i]['formtype'] = 'int';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 0;
$i++;
-$modversion['config'][$i]['name'] = 'agenda_nb_years_after';
-$modversion['config'][$i]['title'] = '_MI_EXTCAL_NB_YEARS_AFTER';
+$modversion['config'][$i]['name'] = 'agenda_nb_years_after';
+$modversion['config'][$i]['title'] = '_MI_EXTCAL_NB_YEARS_AFTER';
$modversion['config'][$i]['description'] = '_MI_EXTCAL_NB_YEARS_AFTER_DESC';
-$modversion['config'][$i]['formtype'] = 'int';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 5;
-
+$modversion['config'][$i]['formtype'] = 'int';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 5;
+
$i++;
-$modversion['config'][$i]['name'] = 'break5';
-$modversion['config'][$i]['title'] = '';
+$modversion['config'][$i]['name'] = 'break5';
+$modversion['config'][$i]['title'] = '';
$modversion['config'][$i]['description'] = '';
-$modversion['config'][$i]['formtype'] = 'line_break';
-$modversion['config'][$i]['valuetype'] = 'textbox';
-$modversion['config'][$i]['default'] = 'head';
+$modversion['config'][$i]['formtype'] = 'line_break';
+$modversion['config'][$i]['valuetype'] = 'textbox';
+$modversion['config'][$i]['default'] = 'head';
//----------------------------------------------------------
$i++;
-$modversion['config'][$i]['name'] = 'showInfoBulle';
-$modversion['config'][$i]['title'] = '_MI_EXTCAL_SHOW_INFOBULLE';
+$modversion['config'][$i]['name'] = 'showInfoBulle';
+$modversion['config'][$i]['title'] = '_MI_EXTCAL_SHOW_INFOBULLE';
$modversion['config'][$i]['description'] = '_MI_EXTCAL_SHOW_INFOBULLE_DESC';
-$modversion['config'][$i]['formtype'] = 'yesno';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 1;
+$modversion['config'][$i]['formtype'] = 'yesno';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 1;
$i++;
-$modversion['config'][$i]['name'] = 'showId';
-$modversion['config'][$i]['title'] = '_MI_EXTCAL_SHOW_ID';
+$modversion['config'][$i]['name'] = 'showId';
+$modversion['config'][$i]['title'] = '_MI_EXTCAL_SHOW_ID';
$modversion['config'][$i]['description'] = '_MI_EXTCAL_SHOW_ID_DESC';
-$modversion['config'][$i]['formtype'] = 'yesno';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 0;
+$modversion['config'][$i]['formtype'] = 'yesno';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 0;
/*
inutilise pour le moment, prevu pour ajout navigation dans minical
*/
$i++;
-$modversion['config'][$i]['name'] = 'offsetMinical';
-$modversion['config'][$i]['title'] = '_MI_EXTCAL_OFFSET_MINICAL';
+$modversion['config'][$i]['name'] = 'offsetMinical';
+$modversion['config'][$i]['title'] = '_MI_EXTCAL_OFFSET_MINICAL';
$modversion['config'][$i]['description'] = '_MI_EXTCAL_OFFSET_MINICAL_DESC';
-$modversion['config'][$i]['formtype'] = 'hidden';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 0;
+$modversion['config'][$i]['formtype'] = 'hidden';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 0;
$i++;
-$modversion['config'][$i]['name'] = 'nbEventsByPage';
-$modversion['config'][$i]['title'] = '_MI_EXTCAL_NB_EVENTS_BY_PAGE';
+$modversion['config'][$i]['name'] = 'nbEventsByPage';
+$modversion['config'][$i]['title'] = '_MI_EXTCAL_NB_EVENTS_BY_PAGE';
$modversion['config'][$i]['description'] = '_MI_EXTCAL_NB_EVENTS_BY_PAGE_DESC';
-$modversion['config'][$i]['formtype'] = 'int';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 10;
-
+$modversion['config'][$i]['formtype'] = 'int';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 10;
+
// utilisation de security image
$i++;
-$modversion['config'][$i]['name'] = 'email_Mode';
-$modversion['config'][$i]['title'] = '_MI_EXTCAL_EMAIL_MODE';
-$modversion['config'][$i]['formtype'] = 'select';
+$modversion['config'][$i]['name'] = 'email_Mode';
+$modversion['config'][$i]['title'] = '_MI_EXTCAL_EMAIL_MODE';
+$modversion['config'][$i]['description'] = '_MI_EXTCAL_EMAIL_MODE_DESC';
+$modversion['config'][$i]['formtype'] = 'select';
$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 0;
-$modversion['config'][$i]['options'] = array('_MI_EXTCAL_EMAIL_MODE_NONE' => 0,
- '_MI_EXTCAL_EMAIL_MODE_TEXT' => 1,
- '_MI_EXTCAL_EMAIL_MODE_HTML' => 2);
+$modversion['config'][$i]['default'] = 0;
+$modversion['config'][$i]['options'] = array(
+ '_MI_EXTCAL_EMAIL_MODE_NONE' => 0, '_MI_EXTCAL_EMAIL_MODE_TEXT' => 1, '_MI_EXTCAL_EMAIL_MODE_HTML' => 2
+);
$i++;
-$modversion['config'][$i]['name'] = 'pear_path';
-$modversion['config'][$i]['title'] = '_MI_EXTCAL_PEAR_PATH';
+$modversion['config'][$i]['name'] = 'pear_path';
+$modversion['config'][$i]['title'] = '_MI_EXTCAL_PEAR_PATH';
$modversion['config'][$i]['description'] = '_MI_EXTCAL_PEAR_PATH_DESC';
-$modversion['config'][$i]['formtype'] = 'textbox';
-$modversion['config'][$i]['valuetype'] = 'text';
-$modversion['config'][$i]['size'] = 80;
-$modversion['config'][$i]['default'] = '';
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['size'] = 80;
+$modversion['config'][$i]['default'] = '';
-
-
-
//modif JJD ------------------------------------------------------------
// Templates
-$i = 1;
-$modversion['templates'][$i]['file'] = 'extcal_view_year.html';
+$i = 1;
+$modversion['templates'][$i]['file'] = 'extcal_view_year.html';
$modversion['templates'][$i]['description'] = '';
$i++;
-$modversion['templates'][$i]['file'] = 'extcal_view_month.html';
+$modversion['templates'][$i]['file'] = 'extcal_view_month.html';
$modversion['templates'][$i]['description'] = '';
$i++;
-$modversion['templates'][$i]['file'] = 'extcal_view_week.html';
+$modversion['templates'][$i]['file'] = 'extcal_view_week.html';
$modversion['templates'][$i]['description'] = '';
$i++;
-$modversion['templates'][$i]['file'] = 'extcal_view_day.html';
+$modversion['templates'][$i]['file'] = 'extcal_view_day.html';
$modversion['templates'][$i]['description'] = '';
$i++;
-$modversion['templates'][$i]['file'] = 'extcal_view_calendar-month.html';
+$modversion['templates'][$i]['file'] = 'extcal_view_calendar-month.html';
$modversion['templates'][$i]['description'] = '';
$i++;
-$modversion['tem...
[truncated message content] |
|
From: <be...@us...> - 2012-07-07 19:07:28
|
Revision: 9799
http://xoops.svn.sourceforge.net/xoops/?rev=9799&view=rev
Author: beckmi
Date: 2012-07-07 19:07:20 +0000 (Sat, 07 Jul 2012)
Log Message:
-----------
fixing bug in Preferences (missing title)
Modified Paths:
--------------
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/docs/lang_diff.txt
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/language/english/modinfo.php
XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/xoops_version.php
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/docs/lang_diff.txt
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/docs/lang_diff.txt 2012-07-07 17:50:40 UTC (rev 9798)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/docs/lang_diff.txt 2012-07-07 19:07:20 UTC (rev 9799)
@@ -5,4 +5,5 @@
modinfo.php:
---------------------
-define('_MI_EXTCAL_EMAIL_MODE_DESC', 'Select Email Format that you want to use');
\ No newline at end of file
+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
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/language/english/modinfo.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/language/english/modinfo.php 2012-07-07 17:50:40 UTC (rev 9798)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/language/english/modinfo.php 2012-07-07 19:07:20 UTC (rev 9799)
@@ -154,4 +154,6 @@
define('_MI_EXTCAL_DAY_THURSDAY', 'Thursday');
define('_MI_EXTCAL_DAY_FRIDAY', 'Friday');
define('_MI_EXTCAL_DAY_SATURDAY', 'Saturday');
-define('_MI_EXTCAL_DAY_SUNDAY', 'Sunday');
\ No newline at end of file
+define('_MI_EXTCAL_DAY_SUNDAY', 'Sunday');
+define('_MI_EXTCAL_SHOW_OTHEROPTIONS', 'Other Options');
+
Modified: XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/xoops_version.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/xoops_version.php 2012-07-07 17:50:40 UTC (rev 9798)
+++ XoopsModules/extcal/branches/jjdai/htdocs/modules/extcal/xoops_version.php 2012-07-07 19:07:20 UTC (rev 9799)
@@ -339,12 +339,13 @@
$modversion['config'][$i]['default'] = 5;
$i++;
-$modversion['config'][$i]['name'] = 'break5';
-$modversion['config'][$i]['title'] = '';
+$modversion['config'][$i]['name'] = 'break' . $i;
+$modversion['config'][$i]['title'] = '_MI_EXTCAL_SHOW_OTHEROPTIONS';
$modversion['config'][$i]['description'] = '';
$modversion['config'][$i]['formtype'] = 'line_break';
$modversion['config'][$i]['valuetype'] = 'textbox';
$modversion['config'][$i]['default'] = 'head';
+
//----------------------------------------------------------
$i++;
$modversion['config'][$i]['name'] = 'showInfoBulle';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X