Menu
▾
▴
xoops-svn
|
From: <be...@us...> - 2012-12-29 13:32:15
|
Revision: 10604
http://sourceforge.net/p/xoops/svn/10604
Author: beckmi
Date: 2012-12-29 13:32:09 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------
Fixed bug with attachment downloads, updated version to RC2
Modified Paths:
--------------
XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt
XoopsModules/extcal/trunk/modules/extcal/download_attachement.php
XoopsModules/extcal/trunk/modules/extcal/edit_event.php
XoopsModules/extcal/trunk/modules/extcal/include/update_function.php
XoopsModules/extcal/trunk/modules/extcal/versions/extcal_2_15.php
XoopsModules/extcal/trunk/modules/extcal/xoops_version.php
Modified: XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt 2012-12-29 12:06:13 UTC (rev 10603)
+++ XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt 2012-12-29 13:32:09 UTC (rev 10604)
@@ -1,3 +1,7 @@
+2012/04/02: Version 2.37 RC2
+===================================
+- fixed attachment bug (mamba)
+
2012/04/02: Version 2.37 Beta 4
===================================
- small code cleanups (mamba)
Modified: XoopsModules/extcal/trunk/modules/extcal/download_attachement.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/download_attachement.php 2012-12-29 12:06:13 UTC (rev 10603)
+++ XoopsModules/extcal/trunk/modules/extcal/download_attachement.php 2012-12-29 13:32:09 UTC (rev 10604)
@@ -1,6 +1,7 @@
<?php
include '../../mainfile.php';
+include_once ('include/constantes.php');
if (!isset($_GET['file'])) {
$fileId = 0;
Modified: XoopsModules/extcal/trunk/modules/extcal/edit_event.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/edit_event.php 2012-12-29 12:06:13 UTC (rev 10603)
+++ XoopsModules/extcal/trunk/modules/extcal/edit_event.php 2012-12-29 13:32:09 UTC (rev 10604)
@@ -1,60 +1,61 @@
-<?php
-
-include '../../mainfile.php';
-
-include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-include 'class/form/extcalform.php';
-include 'class/perm.php';
-
-$permHandler = ExtcalPerm::getHandler();
-$xoopsUser = $xoopsUser ? $xoopsUser : null;
-
-if (count($permHandler->getAuthorizedCat($xoopsUser, 'extcal_cat_submit')) == 0
- && count($permHandler->getAuthorizedCat($xoopsUser, 'extcal_cat_edit')) == 0
-) {
- redirect_header("index.php", 3);
- exit;
-}
-
-
-$params = array('view' => _EXTCAL_NAV_NEW_EVENT, 'file' => _EXTCAL_FILE_NEW_EVENT);
-$GLOBALS['xoopsOption']['template_main'] = "extcal_view_{$params['view']}.html";
-include XOOPS_ROOT_PATH . '/header.php';
-/* ========================================================================== */
-
-// Tooltips include
-$xoTheme->addScript('modules/extcal/include/ToolTips.js');
-$xoTheme->addStylesheet('modules/extcal/css/infobulle.css');
-
-
-
-
-if (!isset($_GET['event'])) {
- $eventId = 0;
-} else {
- $eventId = intval($_GET['event']);
-}
-if (!isset($_GET['action'])) {
- $action = 'edit';
-} else {
- $action = $_GET['action'];
-}
-
-
-
-
-
-// Getting eXtCal object's handler
-$eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
-
-include XOOPS_ROOT_PATH . '/header.php';
-
-// Title of the page
-$xoopsTpl->assign('xoops_pagetitle', _MI_EXTCAL_SUBMIT_EVENT);
-
-// Display the submit form
-$form = $eventHandler->getEventForm('user', $action, array('event_id' => $eventId));
-$form->display();
-
-include XOOPS_ROOT_PATH . '/footer.php';
-?>
+<?php
+
+include '../../mainfile.php';
+
+include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+include 'class/form/extcalform.php';
+include 'class/perm.php';
+include_once ('include/constantes.php');
+
+$permHandler = ExtcalPerm::getHandler();
+$xoopsUser = $xoopsUser ? $xoopsUser : null;
+
+if (count($permHandler->getAuthorizedCat($xoopsUser, 'extcal_cat_submit')) == 0
+ && count($permHandler->getAuthorizedCat($xoopsUser, 'extcal_cat_edit')) == 0
+) {
+ redirect_header("index.php", 3);
+ exit;
+}
+
+
+$params = array('view' => _EXTCAL_NAV_NEW_EVENT, 'file' => _EXTCAL_FILE_NEW_EVENT);
+$GLOBALS['xoopsOption']['template_main'] = "extcal_view_{$params['view']}.html";
+include XOOPS_ROOT_PATH . '/header.php';
+/* ========================================================================== */
+
+// Tooltips include
+$xoTheme->addScript('modules/extcal/include/ToolTips.js');
+$xoTheme->addStylesheet('modules/extcal/css/infobulle.css');
+
+
+
+
+if (!isset($_GET['event'])) {
+ $eventId = 0;
+} else {
+ $eventId = intval($_GET['event']);
+}
+if (!isset($_GET['action'])) {
+ $action = 'edit';
+} else {
+ $action = $_GET['action'];
+}
+
+
+
+
+
+// Getting eXtCal object's handler
+$eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
+
+include XOOPS_ROOT_PATH . '/header.php';
+
+// Title of the page
+$xoopsTpl->assign('xoops_pagetitle', _MI_EXTCAL_SUBMIT_EVENT);
+
+// Display the submit form
+$form = $eventHandler->getEventForm('user', $action, array('event_id' => $eventId));
+$form->display();
+
+include XOOPS_ROOT_PATH . '/footer.php';
+?>
Modified: XoopsModules/extcal/trunk/modules/extcal/include/update_function.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/include/update_function.php 2012-12-29 12:06:13 UTC (rev 10603)
+++ XoopsModules/extcal/trunk/modules/extcal/include/update_function.php 2012-12-29 13:32:09 UTC (rev 10604)
@@ -1,77 +1,77 @@
-<?php
-
-function xoops_module_update_extcal(&$xoopsModule, $oldVersion = null) {
-
- $newVersion = $xoopsModule->getVar('version') * 100;
- if ($newVersion == $oldVersion) return true;
-
- //----------------------------------------------------------
- // Create eXtCal upload directory
- $indexFile = XOOPS_ROOT_PATH . "/modules/extcal/include/index.html";
-
- $dir = XOOPS_ROOT_PATH . "/uploads/extcal";
- if (!is_dir($dir)) {
- mkdir($dir, 0777);
- copy($indexFile, $dir . "/index.html");
- }
-
- $dir = XOOPS_ROOT_PATH . "/uploads/extcal/etablissement";
- if (!is_dir($dir)) {
- mkdir($dir, 0777);
- copy($indexFile, $dir . "/index.html");
- }
- //------------------------------------------------------------
-
-
- $fld = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . "/versions/";
- $cls = "extcal_%1\$s";
-
-
- $version = array('2_04' => 204,
- '2_15' => 215,
- '2_21' => 221,
- '2_28' => 228,
- '2_29' => 229,
- '2_33' => 233,
- '2_34' => 234,
- '2_35' => 235,
- '2_37' => 237
- );
-
- while(list($key,$val) = each($version)){
- if($oldVersion < $val) {
- $name = sprintf($cls, $key);
- $f = $fld . $name . '.php';
- //ext_echo ("<hr>{$f}<hr>");
- if (is_readable($f)){
- echo "mise \xE0 jour version : {$key} = {$val}<br />";
- include_once($f);
- $cl = new $name($xoopsModule, array('oldVersion' =>$oldVersion));
- }
- }
- }
-
-
- /*
- //$db =& Database::getInstance();
- $xoopsDB =& Database::getDatabaseConnection();
-
- $sql = "ALTER TABLE `".$db->prefix('extcal_event')."` ADD `event_organisateur` varchar( 255 ) NOT NULL AFTER `event_desc` ;";
- $db->query($sql);
- ///////////
- // Create eXtcal upload directory
- $dir = XOOPS_ROOT_PATH."/uploads/extcal/etablissement";
- if(!is_dir($dir))
- mkdir($dir, 0777);
- chmod($dir, 0777);
-
- // Copy index.html files on uploads folders
- $indexFile = XOOPS_ROOT_PATH."/modules/extcal/include/index.html";
- copy($indexFile, XOOPS_ROOT_PATH."/uploads/extcal/etablissement/index.html");
-
- */
- return true;
-}
-
-
-?>
+<?php
+
+function xoops_module_update_extcal(&$xoopsModule, $oldVersion = null) {
+
+ $newVersion = $xoopsModule->getVar('version') * 100;
+ if ($newVersion == $oldVersion) return true;
+
+ //----------------------------------------------------------
+ // Create eXtCal upload directory
+ $indexFile = XOOPS_ROOT_PATH . "/modules/extcal/include/index.html";
+
+ $dir = XOOPS_ROOT_PATH . "/uploads/extcal";
+ if (!is_dir($dir)) {
+ mkdir($dir, 0777);
+ copy($indexFile, $dir . "/index.html");
+ }
+
+ $dir = XOOPS_ROOT_PATH . "/uploads/extcal/etablissement";
+ if (!is_dir($dir)) {
+ mkdir($dir, 0777);
+ copy($indexFile, $dir . "/index.html");
+ }
+ //------------------------------------------------------------
+
+
+ $fld = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . "/versions/";
+ $cls = "extcal_%1\$s";
+
+
+ $version = array('2_04' => 204,
+ '2_15' => 215,
+ '2_21' => 221,
+ '2_28' => 228,
+ '2_29' => 229,
+ '2_33' => 233,
+ '2_34' => 234,
+ '2_35' => 235,
+ '2_37' => 237
+ );
+
+ while(list($key,$val) = each($version)){
+ if($oldVersion < $val) {
+ $name = sprintf($cls, $key);
+ $f = $fld . $name . '.php';
+ //ext_echo ("<hr>{$f}<hr>");
+ if (is_readable($f)){
+ echo "mise \xE0 jour version : {$key} = {$val}<br />";
+ include_once($f);
+ $cl = new $name($xoopsModule, array('oldVersion' =>$oldVersion));
+ }
+ }
+ }
+
+
+ /*
+ //$db =& Database::getInstance();
+ $xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
+
+ $sql = "ALTER TABLE `".$db->prefix('extcal_event')."` ADD `event_organisateur` varchar( 255 ) NOT NULL AFTER `event_desc` ;";
+ $db->query($sql);
+ ///////////
+ // Create eXtcal upload directory
+ $dir = XOOPS_ROOT_PATH."/uploads/extcal/etablissement";
+ if(!is_dir($dir))
+ mkdir($dir, 0777);
+ chmod($dir, 0777);
+
+ // Copy index.html files on uploads folders
+ $indexFile = XOOPS_ROOT_PATH."/modules/extcal/include/index.html";
+ copy($indexFile, XOOPS_ROOT_PATH."/uploads/extcal/etablissement/index.html");
+
+ */
+ return true;
+}
+
+
+?>
Modified: XoopsModules/extcal/trunk/modules/extcal/versions/extcal_2_15.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/versions/extcal_2_15.php 2012-12-29 12:06:13 UTC (rev 10603)
+++ XoopsModules/extcal/trunk/modules/extcal/versions/extcal_2_15.php 2012-12-29 13:32:09 UTC (rev 10604)
@@ -1,55 +1,55 @@
-<?php
-/**
- * extcal module
- *
- * You may not change or alter any portion of this comment or credits
- * of supporting developers from this source code or any supporting source code
- * which is considered copyrighted (c) material of the original comment or credit authors.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package extcal
- * @since 2.2
- * @author JJDai <http://xoops.kiolo.com>
- * @version $Id$
-**/
-
-//----------------------------------------------------
-class extcal_2_15{
-//----------------------------------------------------
-
-function extcal_2_15(& $module, $options){
-global $xoopsDB;
-
- //$xoopsDB =& Database::getInstance();
- $xoopsDB =& Database::getDatabaseConnection();
-
- $sql = "ALTER TABLE `".$xoopsDB->prefix('extcal_event')."` CHANGE `event_approved` `event_approved` TINYINT( 1 ) NOT NULL DEFAULT '0' ;";
- $xoopsDB->query($sql);
-
- $sql = "ALTER TABLE `".$xoopsDB->prefix('extcal_event')."` ADD `event_isrecur` TINYINT( 1 ) NOT NULL AFTER `event_nbmember` ;";
- $xoopsDB->query($sql);
-
- $sql = "ALTER TABLE `".$xoopsDB->prefix('extcal_event')."` ADD `event_recur_rules` VARCHAR( 255 ) NOT NULL AFTER `event_isrecur` ";
- $xoopsDB->query($sql);
-
- $sql = "ALTER TABLE `".$xoopsDB->prefix('extcal_event')."` ADD `event_recur_start` INT( 11 ) NOT NULL AFTER `event_recur_rules` ;";
- $xoopsDB->query($sql);
-
- $sql = "ALTER TABLE `".$xoopsDB->prefix('extcal_event')."` ADD `event_recur_end` INT( 11 ) NOT NULL AFTER `event_recur_start` ;";
- $xoopsDB->query($sql);
-
- $sql = "CREATE TABLE `".$xoopsDB->prefix('extcal_event')."` (`eventnotmember_id` int(11) NOT NULL auto_increment,`event_id` int(11) NOT NULL default '0',`uid` int(11) NOT NULL default '0',PRIMARY KEY (`eventnotmember_id`),UNIQUE KEY `eventnotmember` (`event_id`,`uid`)) COMMENT='eXtcal By Zoullou' ;";
- $xoopsDB->query($sql);
-
- $sql = "CREATE TABLE `".$xoopsDB->prefix('extcal_file')."` (`file_id` int(11) NOT NULL auto_increment,`file_name` varchar(255) NOT NULL,`file_nicename` varchar(255) NOT NULL,`file_mimetype` varchar(255) NOT NULL,`file_size` int(11) NOT NULL,`file_download` int(11) NOT NULL,`file_date` int(11) NOT NULL,`file_approved` tinyint(1) NOT NULL,`event_id` int(11) NOT NULL,`uid` int(11) NOT NULL,PRIMARY KEY (`file_id`)) COMMENT='eXtcal By Zoullou' ;";
- $xoopsDB->query($sql);
-
-}
-
-//-----------------------------------------------------------------
-} // fin de la classe
+<?php
+/**
+ * extcal module
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package extcal
+ * @since 2.2
+ * @author JJDai <http://xoops.kiolo.com>
+ * @version $Id$
+**/
+
+//----------------------------------------------------
+class extcal_2_15{
+//----------------------------------------------------
+
+function extcal_2_15(& $module, $options){
+global $xoopsDB;
+
+ //$xoopsDB =& Database::getInstance();
+ $xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
+
+ $sql = "ALTER TABLE `".$xoopsDB->prefix('extcal_event')."` CHANGE `event_approved` `event_approved` TINYINT( 1 ) NOT NULL DEFAULT '0' ;";
+ $xoopsDB->query($sql);
+
+ $sql = "ALTER TABLE `".$xoopsDB->prefix('extcal_event')."` ADD `event_isrecur` TINYINT( 1 ) NOT NULL AFTER `event_nbmember` ;";
+ $xoopsDB->query($sql);
+
+ $sql = "ALTER TABLE `".$xoopsDB->prefix('extcal_event')."` ADD `event_recur_rules` VARCHAR( 255 ) NOT NULL AFTER `event_isrecur` ";
+ $xoopsDB->query($sql);
+
+ $sql = "ALTER TABLE `".$xoopsDB->prefix('extcal_event')."` ADD `event_recur_start` INT( 11 ) NOT NULL AFTER `event_recur_rules` ;";
+ $xoopsDB->query($sql);
+
+ $sql = "ALTER TABLE `".$xoopsDB->prefix('extcal_event')."` ADD `event_recur_end` INT( 11 ) NOT NULL AFTER `event_recur_start` ;";
+ $xoopsDB->query($sql);
+
+ $sql = "CREATE TABLE `".$xoopsDB->prefix('extcal_event')."` (`eventnotmember_id` int(11) NOT NULL auto_increment,`event_id` int(11) NOT NULL default '0',`uid` int(11) NOT NULL default '0',PRIMARY KEY (`eventnotmember_id`),UNIQUE KEY `eventnotmember` (`event_id`,`uid`)) COMMENT='eXtcal By Zoullou' ;";
+ $xoopsDB->query($sql);
+
+ $sql = "CREATE TABLE `".$xoopsDB->prefix('extcal_file')."` (`file_id` int(11) NOT NULL auto_increment,`file_name` varchar(255) NOT NULL,`file_nicename` varchar(255) NOT NULL,`file_mimetype` varchar(255) NOT NULL,`file_size` int(11) NOT NULL,`file_download` int(11) NOT NULL,`file_date` int(11) NOT NULL,`file_approved` tinyint(1) NOT NULL,`event_id` int(11) NOT NULL,`uid` int(11) NOT NULL,PRIMARY KEY (`file_id`)) COMMENT='eXtcal By Zoullou' ;";
+ $xoopsDB->query($sql);
+
+}
+
+//-----------------------------------------------------------------
+} // fin de la classe
?>
\ No newline at end of file
Modified: XoopsModules/extcal/trunk/modules/extcal/xoops_version.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/xoops_version.php 2012-12-29 12:06:13 UTC (rev 10603)
+++ XoopsModules/extcal/trunk/modules/extcal/xoops_version.php 2012-12-29 13:32:09 UTC (rev 10604)
@@ -26,7 +26,7 @@
$modversion['official'] = 0;
$modversion['image'] = 'images/extcal_logo.png';
$modversion['dirname'] = $moduleDirName;
-$modversion['status_version'] = 'Beta 4';
+//$modversion['status_version'] = 'Beta 4';
$modversion['sqlfile']['mysql'] = 'sql/mysql.sql';
$modversion['onInstall'] = 'include/install_function.php';
$modversion['onUpdate'] = 'include/update_function.php';
@@ -41,7 +41,7 @@
$modversion["module_website_url"] = "www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
$modversion["release_date"] = "2012/07/07";
-$modversion['module_status'] = "RC 1";
+$modversion['module_status'] = "RC 2";
$modversion['min_php'] = '5.2';
$modversion['min_xoops'] = "2.5.5";
|
|
From: <be...@us...> - 2012-12-29 15:42:22
|
Revision: 10606
http://sourceforge.net/p/xoops/svn/10606
Author: beckmi
Date: 2012-12-29 15:42:19 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------
fixed: past events not being visible (mamba)
Modified Paths:
--------------
XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt
XoopsModules/extcal/trunk/modules/extcal/include/constantes.php
Modified: XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt 2012-12-29 14:19:09 UTC (rev 10605)
+++ XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt 2012-12-29 15:42:19 UTC (rev 10606)
@@ -1,6 +1,7 @@
2012/04/02: Version 2.37 RC2
===================================
- fixed attachment bug (mamba)
+- fixed past events not being visible (mamba)
2012/04/02: Version 2.37 Beta 4
===================================
Modified: XoopsModules/extcal/trunk/modules/extcal/include/constantes.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/include/constantes.php 2012-12-29 14:19:09 UTC (rev 10605)
+++ XoopsModules/extcal/trunk/modules/extcal/include/constantes.php 2012-12-29 15:42:19 UTC (rev 10606)
@@ -55,12 +55,17 @@
$moduleHandler =& xoops_gethandler('module');
$module = $moduleHandler->getByDirname('extcal');
-if ($name == 'extcal' || !is_object($module)) {
+if ($name == 'extcal' || is_object($module)) {
if (is_object($xoopsModuleConfig)) {
$extcalConfig = $xoopsModuleConfig;
} else {
$module = $xoopsModule->getByDirname('extcal');
+
+ $configHandler =& xoops_gethandler('config');
+ $extcalConfig = $configHandler->getConfigList($module->getVar("mid"));
+
+
// $mid = $module->vars['mid']['value'];
// $config_handler =& xoops_gethandler('config');
// $extcalConfig = $config_handler->getConfigsByCat(0, $mid);
|
|
From: <be...@us...> - 2012-12-30 09:49:17
|
Revision: 10609
http://sourceforge.net/p/xoops/svn/10609
Author: beckmi
Date: 2012-12-30 09:49:12 +0000 (Sun, 30 Dec 2012)
Log Message:
-----------
- fixed: past events not being visible (mamba)
- fixed: displaying the correct week in Week view, when the first day of the week is Monday
- updated Highslide JS from version 4.1.8 to 4.1.13
Modified Paths:
--------------
XoopsModules/extcal/trunk/modules/extcal/class/event.php
XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt
XoopsModules/extcal/trunk/modules/extcal/include/constantes.php
XoopsModules/extcal/trunk/modules/extcal/js/graphics/controlbar-white.gif
XoopsModules/extcal/trunk/modules/extcal/js/highslide-full.js
XoopsModules/extcal/trunk/modules/extcal/js/highslide-full.min.js
XoopsModules/extcal/trunk/modules/extcal/js/highslide-full.packed.js
XoopsModules/extcal/trunk/modules/extcal/js/highslide-ie6.css
XoopsModules/extcal/trunk/modules/extcal/js/highslide-with-gallery.js
XoopsModules/extcal/trunk/modules/extcal/js/highslide-with-gallery.min.js
XoopsModules/extcal/trunk/modules/extcal/js/highslide-with-gallery.packed.js
XoopsModules/extcal/trunk/modules/extcal/js/highslide-with-html.js
XoopsModules/extcal/trunk/modules/extcal/js/highslide-with-html.min.js
XoopsModules/extcal/trunk/modules/extcal/js/highslide-with-html.packed.js
XoopsModules/extcal/trunk/modules/extcal/js/highslide.css
XoopsModules/extcal/trunk/modules/extcal/js/highslide.js
XoopsModules/extcal/trunk/modules/extcal/js/highslide.min.js
XoopsModules/extcal/trunk/modules/extcal/js/highslide.packed.js
XoopsModules/extcal/trunk/modules/extcal/language/english/modinfo.php
XoopsModules/extcal/trunk/modules/extcal/view_agenda-week.php
XoopsModules/extcal/trunk/modules/extcal/view_calendar-week.php
XoopsModules/extcal/trunk/modules/extcal/view_week.php
Modified: XoopsModules/extcal/trunk/modules/extcal/class/event.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/event.php 2012-12-30 05:26:01 UTC (rev 10608)
+++ XoopsModules/extcal/trunk/modules/extcal/class/event.php 2012-12-30 09:49:12 UTC (rev 10609)
@@ -1,2388 +1,2403 @@
-<?php
-
-
-if (!defined("XOOPS_ROOT_PATH")) {
- die("XOOPS root path not defined");
-}
-
-include_once XOOPS_ROOT_PATH . '/modules/extcal/class/ExtcalPersistableObjectHandler.php';
-include_once XOOPS_ROOT_PATH . '/modules/extcal/class/perm.php';
-include_once XOOPS_ROOT_PATH . '/modules/extcal/class/time.php';
-include_once XOOPS_ROOT_PATH . '/modules/extcal/class/config.php';
-include_once XOOPS_ROOT_PATH . '/modules/extcal/class/extDateTime.php';
-
-include_once XOOPS_ROOT_PATH . '/modules/extcal/include/constantes.php';
-
-
-class ExtcalEvent extends XoopsObject
-{
-
- var $externalKey = array();
-
- 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_contact', XOBJ_DTYPE_TXTBOX, '', false);
- $this->initVar('event_url', XOBJ_DTYPE_URL, '', false);
- $this->initVar('event_email', XOBJ_DTYPE_TXTBOX, '', false);
- $this->initVar('event_address', XOBJ_DTYPE_TXTAREA, '', false);
- $this->initVar('event_approved', XOBJ_DTYPE_INT, 0, false);
- $this->initVar('event_start', XOBJ_DTYPE_INT, null, true);
- $this->initVar('event_end', XOBJ_DTYPE_INT, 0, false);
- $this->initVar('event_submitter', XOBJ_DTYPE_INT, 0, false);
- $this->initVar('event_submitdate', XOBJ_DTYPE_INT, 0, false);
- $this->initVar('event_nbmember', XOBJ_DTYPE_INT, 0, false);
- $this->initVar('event_isrecur', XOBJ_DTYPE_INT, 0, false);
- $this->initVar('event_recur_rules', XOBJ_DTYPE_TXTBOX, null, false);
- $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->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)
- {
- return $this->externalKey[$key];
- }
-
-}
-
-class ExtcalEventHandler extends ExtcalPersistableObjectHandler
-{
-
- private $_extcalPerm;
- private $_extcalTime;
- private $_extcalConfig;
-
- function __construct(&$db)
- {
- $this->_extcalPerm = ExtcalPerm::getHandler();
- $this->_extcalTime = ExtcalTime::getHandler();
- // $extcalConfig = ExtcalConfig::getHandler();
- // $this->_extcalConfig = $extcalConfig->getModuleConfig();
- $this->ExtcalPersistableObjectHandler($db, 'extcal_event', _EXTCAL_CLN_EVENT, 'event_id');
- }
-
- function createEvent($data)
- {
- $event = $this->create();
- $this->_checkDate($data);
- $this->_userTimeToServerTime($data);
- $this->_addRecurValue($data);
- $event->setVars($data);
- return $this->insert($event, true);
- }
-
- function createEventForPreview($data)
- {
- $event = $this->create();
- $this->_checkDate($data);
- $this->_addRecurValue($data);
- $event->setVars($data);
-
- return $event;
- }
-
- function modifyEvent($eventId, $data)
- {
- $event = $this->get($eventId);
- $this->_checkDate($data);
- $this->_userTimeToServerTime($data);
- $this->_addRecurValue($data);
- $event->setVars($data);
- return $this->insert($event);
- }
-
- function deleteEvent($eventId)
- {
- /* TODO :
- - Delete who's going
- - Delete who's not going
- - Delete comment
- - Delete notifications
- */
- $this->delete($eventId, true);
- }
-
- function deleteAllEvents($criteria = null, $force = true, $asObject = false)
- {
- /* TODO :
- - Delete who's going
- - Delete who's not going
- - Delete comment
- - Delete notifications
- */
- $this->deleteAll($criteria, $force, $asObject);
- }
-
- function getAllEvents($criteria = null, $asObject = false)
- {
-
-
- $rst = $this->getObjects($criteria, $asObject);
- if ($asObject) {
- return $rst;
- } else {
- return $this->objectToArray($rst);
- }
- }
-
- // Return one approved event selected by his id
- function getEvent($eventId, $skipPerm = false)
- {
-
- $user = $GLOBALS['xoopsUser'];
-
- $criteriaCompo = new CriteriaCompo();
- $criteriaCompo->add(new Criteria('event_id', $eventId));
- $criteriaCompo->add(new Criteria('event_approved', 1));
- if (!$skipPerm) {
- $this->_addCatPermCriteria($criteriaCompo, $user);
- }
- $ret = $this->getObjects($criteriaCompo);
- if (isset($ret[0])) {
- return $ret[0];
- } else {
- return false;
- }
- }
-
-
- // Return one event selected by his id (approve or not)
- function getEventWithNotApprove($eventId, $skipPerm = false)
- {
-
- $user = $GLOBALS['xoopsUser'];
-
- $criteriaCompo = new CriteriaCompo();
- $criteriaCompo->add(new Criteria('event_id', $eventId));
- if (!$skipPerm) {
- $this->_addCatPermCriteria($criteriaCompo, $user);
- }
- $ret = $this->getObjects($criteriaCompo);
- if (isset($ret[0])) {
- return $ret[0];
- } else {
- return false;
- }
- }
-
- function formatEventsDate(&$events, $pattern)
- {
- $max = count($events);
- for (
- $i = 0; $i < $max; $i++
- ) {
- $this->formatEventDate($events[$i], $pattern);
- }
- }
-
-// function getPicture1(&$event) {
-// return $event['event_picture1'];
-// }
-// function getPicture2(&$event) {
-// return $event['event_picture2'];
-// }
-// function getDesc(&$event) {
-// return $event['event_desc'];
-// }
-
- function formatEventDate(&$event, $pattern)
- {
- 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']);
- } 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_reccur_rule'] = $this->_extcalTime->getFormatedReccurRule($event['event_recur_rules']);
- }
- $event['formated_event_submitdate'] = $this->_extcalTime->getFormatedDate($pattern, $event['event_submitdate']);
- }
-
-//JJD - to valid modif
-// function _checkDate(&$data)
-// {
-//
-// list($year, $month, $day) = explode("-", $data['event_start']['date']);
-// $data['event_start']
-// =
-// mktime(0, 0, 0, $month, $day, $year) + $data['event_start']['time'];
-// list($year, $month, $day) = explode("-", $data['event_end']['date']);
-// $data['event_end']
-// = mktime(0, 0, 0, $month, $day, $year) + $data['event_end']['time'];
-//
-// if ($data['have_end'] == 0 || $data['event_start'] > $data['event_end']
-// ) {
-// $data['event_end'] = $data['event_start'];
-// }
-//
-// }
-
- function _checkDate(&$data)
- {
-
- $data['event_start'] = strtotime($data['event_start']['date']) + $data['event_start']['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'];
- }
-
- }
-
- function _userTimeToServerTime(&$data)
- {
-
- $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));
-
- }
-
- function serverTimeToUserTime(&$data)
- {
-
- $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_submitdate'] = xoops_getUserTimestamp($data['event_submitdate'], $this->_extcalTime->_getUserTimeZone($user));
-
- }
-
- function serverTimeToUserTimes(&$events)
- {
- $max = count($events);
-
- for (
- $i = 0; $i < $max; $i++
- ) {
- $this->serverTimeToUserTime($events[$i]);
- }
- }
-
- function _addRecurValue(&$data)
- {
- $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);
- }
-
-
- /***************************************************************
- * 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);
-
- //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)
- {
- 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');
- }
- //------------------------------------------------------
- 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');
- }
- $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, '>='));
-
-
- 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);
- }
-
- // 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>';
- }
-
- }
-
-
- /*****************************************************************
- * 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));
- $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));
- $criteriaCompo = $this->_getCriteriaCompo($weekStart, $weekEnd, $cat, $user);
- return $criteriaCompo;
- }
-
- // Return the criteria compo object for a month
- function _getEventMonthCriteria($month, $year, $cat)
- {
-
- $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));
- $criteriaCompo = $this->_getCriteriaCompo($monthStart, $monthEnd, $cat, $user);
- return $criteriaCompo;
- }
-
- // 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));
- $criteriaCompo = $this->_getListCriteriaCompo($yearStart, $yearEnd, $cat, $user);
-
- return $criteriaCompo;
- }
-
-
- /**********************************************************************
- * Debut de - A virer in fine
- **********************************************************************/
-
- /**********************************************************************
- * FIN de - A virer in fine
- **********************************************************************/
-
-
- /**********************************************************************
- * Construction des criteres en fonction de la p\xE9riode
- **********************************************************************/
-
- function _getCriteriaCompo($start, $end, $cat, &$user)
- {
-
- $criteriaNoRecur = new CriteriaCompo();
- $criteriaNoRecur->add(new Criteria('event_start', $end, '<='));
- $criteriaNoRecur->add(new Criteria('event_end', $start, '>='));
- $criteriaNoRecur->add(new Criteria('event_isrecur', 0));
-
- $criteriaRecur = new CriteriaCompo();
- $criteriaRecur->add(new Criteria('event_recur_start', $end, '<='));
- $criteriaRecur->add(new Criteria('event_recur_end', $start, '>='));
- $criteriaRecur->add(new Criteria('event_isrecur', 1));
-
- $criteriaCompoDate = new CriteriaCompo();
- $criteriaCompoDate->add($criteriaNoRecur, 'OR');
- $criteriaCompoDate->add($criteriaRecur, 'OR');
-
- $criteriaCompo = new CriteriaCompo();
- $criteriaCompo->add($criteriaCompoDate);
-
- $criteriaCompo->add(new Criteria('event_approved', 1));
- $this->_addCatSelectCriteria($criteriaCompo, $cat);
- $this->_addCatPermCriteria($criteriaCompo, $user);
- $criteriaCompo->setSort('event_start');
-
- return $criteriaCompo;
- }
-
- function _getCalendarCriteriaCompo($start, $end, $cat, &$user)
- {
- global $extcalConfig;
- $criteriaCompo = $this->_getCriteriaCompo($start, $end, $cat, $user);
- //if (!$this->_extcalConfig['diplay_past_event_cal']) {
- if (!$extcalConfig['diplay_past_event_cal']) {
- $criteriaCompo->add(new Criteria('event_end', time(), '>'));
- }
- return $criteriaCompo;
- }
-
- function _getListCriteriaCompo($start, $end, $cat, &$user)
- {
- global $extcalConfig;
- $criteriaCompo = $this->_getCriteriaCompo($start, $end, $cat, $user);
- // if (!$this->_extcalConfig['diplay_past_event_list']) {
- if (!$extcalConfig['diplay_past_event_list']) {
- $criteriaCompo->add(new Criteria('event_end', time(), '>'));
- }
- return $criteriaCompo;
- }
-
- // Return upcomming event
- function getUpcommingEvent($nbEvent, $cat = 0)
- {
-
- $now = time();
-
- $criteriaNoRecur = new CriteriaCompo();
- $criteriaNoRecur->add(new Criteria('event_start', $now, '>='));
- $criteriaNoRecur->add(new Criteria('event_isrecur', 0));
-
- $criteriaRecur = new CriteriaCompo();
- $criteriaRecur->add(new Criteria('event_recur_start', $now, '>='));
- $criteriaRecur->add(new Criteria('event_isrecur', 1));
-
- $criteriaCompoDate = new CriteriaCompo();
- $criteriaCompoDate->add($criteriaNoRecur, 'OR');
- $criteriaCompoDate->add($criteriaRecur, 'OR');
-
- $criteriaCompo = new CriteriaCompo();
- $criteriaCompo->add($criteriaCompoDate);
-
- $criteriaCompo->add(new Criteria('event_approved', 1));
- $this->_addCatSelectCriteria($criteriaCompo, $cat);
- $this->_addCatPermCriteria($criteriaCompo, $GLOBALS['xoopsUser']);
-
-
- $criteriaCompo->setSort('event_start');
- $criteriaCompo->setLimit($nbEvent);
- return $this->getObjects($criteriaCompo);
- }
-
-
- // Return event occuring this day
- function getThisDayEvent($nbEvent, $cat = 0)
- {
- $day = date("j");
- $month = date("n");
- $year = date("Y");
-
- $dayStart = mktime(0, 0, 0, $month, $day, $year);
- $dayEnd = mktime(0, 0, 0, $month, $day + 1, $year);
-
- $criteriaCompo = new CriteriaCompo();
- $this->_addCatSelectCriteria($criteriaCompo, $cat);
- $this->_addCatPermCriteria($criteriaCompo, $GLOBALS['xoopsUser']);
- $criteriaCompo->add(new Criteria('event_end', $dayStart, '>='));
- $criteriaCompo->add(new Criteria('event_start', $dayEnd, '<'));
- $criteriaCompo->add(new Criteria('event_approved', 1));
- $criteriaCompo->setSort('event_start');
- $criteriaCompo->setLimit($nbEvent);
- return $this->getObjects($criteriaCompo);
- }
-
- // Return last added event
- function getNewEvent($start, $limit, $cat = 0, $skipPerm = false)
- {
- $criteriaCompo = new CriteriaCompo();
- $this->_addCatSelectCriteria($criteriaCompo, $cat);
- if (!$skipPerm) {
- $this->_addCatPermCriteria($criteriaCompo, $GLOBALS['xoopsUser']);
- }
- $criteriaCompo->add(new Criteria('event_approved', 1));
- $criteriaCompo->setSort('event_id');
- $criteriaCompo->setOrder('DESC');
- $criteriaCompo->setStart($start);
- $criteriaCompo->setLimit($limit);
- return $this->getObjects($criteriaCompo);
- }
-
- function getCountNewEvent()
- {
- $criteriaCompo = new CriteriaCompo();
- $this->_addCatSelectCriteria($criteriaCompo, 0);
- $criteriaCompo->add(new Criteria('event_approved', 1));
- $criteriaCompo->setSort('event_id');
- return $this->getCount($criteriaCompo);
- }
-
- // Return random upcomming event
- function getRandomEvent($nbEvent, $cat = 0)
- {
- $criteriaCompo = new CriteriaCompo();
- $this->_addCatSelectCriteria($criteriaCompo, $cat);
- $this->_addCatPermCriteria($criteriaCompo, $GLOBALS['xoopsUser']);
- $criteriaCompo->add(new Criteria('event_start', time(), '>='));
- $criteriaCompo->add(new Criteria('event_approved', 1));
- $criteriaCompo->setSort('RAND()');
- $criteriaCompo->setLimit($nbEvent);
- return $this->getObjects($criteriaCompo);
- }
-
- function getPendingEvent()
- {
- $criteriaCompo = new CriteriaCompo();
- $criteriaCompo->add(new Criteria('event_approved', 0));
- $criteriaCompo->setSort('event_start');
- return $this->getObjects($criteriaCompo);
- }
-
- function _addCatPermCriteria(&$criteria, &$user)
- {
- $authorizedAccessCats = $this->_extcalPerm->getAuthorizedCat($user, 'extcal_cat_view');
- $count = count($authorizedAccessCats);
- if ($count > 0) {
- $in = '(' . $authorizedAccessCats[0];
- array_shift($authorizedAccessCats);
- foreach (
- $authorizedAccessCats as $authorizedAccessCat
- ) {
- $in .= ',' . $authorizedAccessCat;
- }
- $in .= ')';
- $criteria->add(new Criteria('cat_id', $in, 'IN'));
- } else {
...
[truncated message content] |
|
From: <be...@us...> - 2012-12-30 12:11:57
|
Revision: 10610
http://sourceforge.net/p/xoops/svn/10610
Author: beckmi
Date: 2012-12-30 12:11:53 +0000 (Sun, 30 Dec 2012)
Log Message:
-----------
- added: end date to blocks
- fixed: pagination for events in Admin
Modified Paths:
--------------
XoopsModules/extcal/trunk/modules/extcal/admin/event.php
XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt
XoopsModules/extcal/trunk/modules/extcal/include/constantes.php
XoopsModules/extcal/trunk/modules/extcal/templates/blocks/extcal_block_new.html
XoopsModules/extcal/trunk/modules/extcal/templates/blocks/extcal_block_random.html
XoopsModules/extcal/trunk/modules/extcal/templates/blocks/extcal_block_upcoming.html
XoopsModules/extcal/trunk/modules/extcal/templates/blocks/extcal_block_upcomingByCategory.html
Modified: XoopsModules/extcal/trunk/modules/extcal/admin/event.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/admin/event.php 2012-12-30 09:49:12 UTC (rev 10609)
+++ XoopsModules/extcal/trunk/modules/extcal/admin/event.php 2012-12-30 12:11:53 UTC (rev 10610)
@@ -1,426 +1,427 @@
-<?php
-
-include '../../../include/cp_header.php';
-include '../../../class/xoopsformloader.php';
-include '../../../class/pagenav.php';
-include '../class/form/extcalform.php';
-include 'admin_header.php';
-
-include_once XOOPS_ROOT_PATH . '/modules/extcal/include/functions.php';
-
-$gepeto = array_merge($_GET, $_POST);
-while (list($k,$v) = each ($gepeto)){
- $$k = $v;
-}
-if (!isset($op)) $op='';
-//--------------------------------------------------------------------
-function deleteEvents($ids){
-
- $eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
- $criteria = new Criteria('event_id', "($ids)", 'IN');
-
- //Supression des images
- $rst = $eventHandler->getAllEvents($criteria);
-
- while (list($k,$t) = each($rst)){
- if ($t['event_picture1'] !=''){
- $f = XOOPS_ROOT_PATH . '/uploads/extcal/' . $t['event_picture1'];
- unlink ($f);
- echo $f.'<br>';
- }
-
- if ($t['event_picture2'] !=''){
- $f = XOOPS_ROOT_PATH . '/uploads/extcal/' . $t['event_picture1'];
- unlink ($f);
- echo $f.'<br>';
- }
- }
-
- //Supression des enregistrements
- $eventHandler->deleteAllEvents($criteria);
-
- return true;
-}
-
-
-
-switch ($op) {
-
- case 'enreg':
-
- $eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
- $fileHandler = xoops_getmodulehandler(_EXTCAL_CLS_FILE, _EXTCAL_MODULE);
-// $t = print_r($_POST,true);
-// 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;
-// }
-
-//exit;
- ///////////////////////////////////////////////////////////////////////////////
- extcal_loadImg($_REQUEST, $event_picture1, $event_picture2);
- ///////////////////////////////////////////////////////////////////////////////
- $data = array(
- 'event_title' => $_POST['event_title'],
- 'cat_id' => $_POST['cat_id'],
- 'event_desc' => $_POST['event_desc'],
- 'event_nbmember' => $_POST['event_nbmember'],
- 'event_organisateur'=>$_POST['event_organisateur'],
- 'event_contact' => $_POST['event_contact'],
- 'event_url' => $_POST['event_url'],
- 'event_email' => $_POST['event_email'],
- 'event_address' => $_POST['event_address'],
- 'event_approved' => 1,
- 'event_start' => $_POST['event_start'],
- 'have_end' => $_POST['have_end'],
- 'event_end' => $_POST['event_end'],
- 'event_picture1'=>@$event_picture1,
- 'event_picture2'=>@$event_picture2,
- 'event_price'=>@$_POST['event_price'],
- 'event_etablissement'=>$_POST['event_etablissement'],
- 'dohtml' => $extcalConfig['allow_html'],
- 'event_icone'=>$_POST['event_icone']
- );
-
- // Event edited
- if (isset($_POST['event_id'])) {
-
- $eventHandler->modifyEvent($_POST['event_id'], $data);
- $fileHandler->createFile(intval($_POST['event_id']));
- redirect_header("event.php", 3, _AM_EXTCAL_EVENT_EDITED, false);
-
- // New event
- } else {
- $notificationHandler =& xoops_gethandler('notification');
- $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
-
- $data['event_submitter'] = ($xoopsUser) ? $xoopsUser->getVar('uid')
- : 0;
- $data['event_submitdate'] = time();
-
- $eventHandler->createEvent($data, $_POST);
- $fileHandler->createFile($eventHandler->getInsertId());
- $cat = $catHandler->getCat($_POST['cat_id'], $xoopsUser, 'all');
- $notificationHandler->triggerEvent('global', 0, 'new_event', array('EVENT_TITLE' => $_POST['event_title']));
- $notificationHandler->triggerEvent('cat', $_POST['cat_id'], 'new_event_cat', array('EVENT_TITLE' => $_POST['event_title'], 'CAT_NAME' => $cat->getVar('cat_name')));
- redirect_header("event.php", 3, _AM_EXTCAL_EVENT_CREATED, false);
- }
- break;
-
- case 'clone': /* sur validation du formulaire */
- case 'modify':
- $action = (($op == 'clone') ? 'clone' : 'edit');
- xoops_cp_header();
-//================================================
-// include_once (XOOPS_ROOT_PATH . '/class/xoopsform/tc_calendar/formtccalendar.php');
-//
-// // Call the calendar constructor - use the desired form and format, according to the instructions/samples provided on triconsole.com
-// $dateBirthday = new XoopsTcCalendar("datez1", true, false);
-// //$dateBirthday->setIcon("images/iconCalendar.gif");
-// $dateBirthday->setIcon("/class/xoopsform/tc_calendar/images/iconCalendar.gif");
-// //$dateBirthday->rtl=false;
-// $dateBirthday->setAutoHide(false);
-//
-// //$myCalendar->setDate(date('d'), date('m'), date('Y'));
-// //$dateBirthday->setDate($p['date1_day'], $p['date1_month'], $p['date1_year']);
-// $dateBirthday->setDate(date('d'), date('m'), date('Y'));
-//
-// $dateBirthday->setPath(XOOPS_URL . "/class/xoopsform/tc_calendar/");
-// $dateBirthday->zindex = 150; //default 1
-// $dateBirthday->setYearInterval(1995, date('Y'));
-// $dateBirthday->dateAllow('1960-03-01', date('Y-m-d'));
-// //$dateBirthday->autoSubmit(true, "calendar");
-// $dateBirthday->disabledDay("sat");
-// $dateBirthday->disabledDay("sun");
-// $dateBirthday->setSpecificDate(array("2011-04-14", "2010-12-25"), 0, 'month');
-// $dateBirthday->setSpecificDate(array("2011-04-01"), 0, 'year');
-// $dateBirthday->setAlignment('right', 'bottom'); //optional
-// echo "<table><tr><td>zzzzz</td><td></td><td>";
-// echo $dateBirthday->render();
-// echo "</td></tr></table>";
-//echo $dateBirthday->render();
-//================================================
- // @author Gregory Mage (Aka Mage)
- //***************************************************************************************
-// include_once XOOPS_ROOT_PATH . "/modules/extcal/class/admin.php";
- $eventAdmin = new ModuleAdmin();
- echo $eventAdmin->addNavigation('event.php');
- //***************************************************************************************
-
- $eventId = $_GET['event_id'];
- $eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
-
- echo'<fieldset><legend style="font-weight:bold; color:#990000;">'
- . _MD_EXTCAL_EDIT_EVENT . '</legend>';
-
- if ($form = $eventHandler->getEventForm('admin', $action, array('event_id' => $eventId))) {
- $form->display();
- }
-
- echo '</fieldset><br />';
-
- xoops_cp_footer();
-
- break;
-
-
- case 'clone2': /* sur clique de l'icone du formulaire*/
-
- //$newEventId = 1;
- $eventId = $_GET['event_id'];
- $eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
- $event = $eventHandler->getEvent($eventId);
- $t= $event->getVars();
- $data=array();
- while (list($key,$val) =each($t)){
- $data[$key] = $val['value'];
- }
-
- $data['event_id'] = 0;
- $data['event_title'] .= ' (' . _AM_EXTCAL_CLONE_OF. $eventId . ')';
-
- $newEvent = $eventHandler->create();
- $newEvent->setVars($data);
- $t = $eventHandler->insert($newEvent, true);
-
- $newEventId = $newEvent->getVar('event_id');
- $ts = print_r($newEventId, true);
-
- redirect_header("event.php?op=modify&event_id={$newEventId}", 3, _AM_EXTCAL_EVENT_DELETED, false);
- break;
-
- case 'delete':
-
- if (isset($_POST['confirm'])) {
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header(
- 'index.php', 3, _NOPERM . "<br />"
- . implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())
- );
- exit;
- }
-// $eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
-// $eventHandler->deleteEvent($_POST['event_id']);
- deleteEvents ($_POST['event_id']);
- redirect_header("event.php", 3, _AM_EXTCAL_EVENT_DELETED, false);
-
- } else {
- xoops_cp_header();
- // @author Gregory Mage (Aka Mage)
- //***************************************************************************************
- //include_once XOOPS_ROOT_PATH . "/modules/extcal/class/admin.php";
- $eventAdmin = new ModuleAdmin();
- echo $eventAdmin->addNavigation('event.php');
- //***************************************************************************************
-
- $hiddens = array('event_id' => $_GET['event_id'], 'form_delete' => '', 'confirm' => 1);
- xoops_confirm($hiddens, 'event.php?op=delete', _AM_EXTCAL_CONFIRM_DELETE_EVENT, _DELETE, 'event.php');
-
- xoops_cp_footer();
- }
-
- break;
-
- case 'deleteSelection':
-
- xoops_cp_header();
- // @author Gregory Mage (Aka Mage)
- //***************************************************************************************
- //include_once XOOPS_ROOT_PATH . "/modules/extcal/class/admin.php";
- $eventAdmin = new ModuleAdmin();
- echo $eventAdmin->addNavigation('event.php');
- //***************************************************************************************
- if (isset($_POST['deleteSelection'][0])){
- $msg = _AM_EXTCAL_CONFIRM_DELETE_ALL ;
- $ids = array_keys($_POST['deleteAllEvents']);
-
- }else{
- $msg = _AM_EXTCAL_CONFIRM_DELETE_SELECTION;
- $ids = array_keys($_POST['deleteEvents']);
-
- }
-
-// $msg = ((isset($_POST['deleteSelection'][0])) ? _AM_EXTCAL_CONFIRM_DELETE_ALL : _AM_EXTCAL_CONFIRM_DELETE_SELECTION);
-// $ids = array_keys($_POST['deleteEvents']);
- $ids = implode(',', $ids);
- //echo $ids.'<br>';
- $hiddens = array('event_ids' => $ids, 'form_delete' => '', 'confirm' => 1);
- //$hiddens = array('event_ids' => $_POST['deleteEvents'], 'form_delete' => '', 'confirm' => 1);
- xoops_confirm($hiddens, 'event.php?op=deleteSelectionOK', $msg, _DELETE, 'event.php');
-
- xoops_cp_footer();
-
- break;
-
- case 'deleteSelectionOK':
-//-----------------------------------------
-// $t = print_r($_GET,true);
-// echo "<hr><pre>{$t}</pre><hr>";
-//
-// $t = print_r($_POST,true);
-// echo "<hr><pre>{$t}</pre><hr>";
-// exit;
-//-----------------------------------------
-
- if (isset($_POST['deleteSelection'][0])){
-
- }else{
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header(
- 'index.php', 3, _NOPERM . "<br />"
- . implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())
- );
- exit;
- }
-
- deleteEvents ($_POST['event_ids']);
-
- redirect_header("event.php", 3, _AM_EXTCAL_EVENTS_DELETED, false);
-
- }
-
- break;
-
- case 'default':
- default:
-
- global $extcalConfig;
- //TODO nbEventsByPage is Null, while it should be 10
-
- $start = (isset($_GET['start'])) ? $_GET['start'] : 0;
- $nbEventsByPage = $extcalConfig['nbEventsByPage'];
-
- xoops_cp_header();
- // @author Gregory Mage (Aka Mage)
- //***************************************************************************************
-
- $eventAdmin = new ModuleAdmin();
- echo $eventAdmin->addNavigation('event.php');
- //***************************************************************************************
-
- $eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
- $events = $eventHandler->objectToArray($eventHandler->getNewEvent($start, $nbEventsByPage, 0, true), array('cat_id'));
- $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>';
- //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='. $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 />';
-
- echo'<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _MD_EXTCAL_SUBMITED_EVENT . '</legend>';
-
- echo '<form method="POST" action="event.php">';
- echo '<input type="hidden" name="op" value="deleteSelection" />';
-
- echo '<table class="outer" style="width:100%;">';
- echo '<tr style="text-align:center;">';
- echo '<th>#</th>';
- echo '<th>' . _AM_EXTCAL_CATEGORY . '</th>';
- echo '<th>' . _AM_EXTCAL_TITLE . '</th>';
- echo '<th>' . _AM_EXTCAL_START_DATE . '</th>';
- echo '<th>' . _AM_EXTCAL_RECURRENT . '</th>';
- echo '<th>' . _AM_EXTCAL_START_RULES . '</th>';
- echo '<th>' . _AM_EXTCAL_ACTION . '</th>';
- echo '<th>' . _AM_EXTCAL_DELETE. '</th>';
- echo '</tr>';
-
- if (count($events) > 0) {
- $i = 0;
- foreach (
- $events as $event
- ) {
- $class = ($i++ % 2 == 0) ? 'even' : 'odd';
- echo '<tr style="text-align:left;" class="' . $class . '">';
- echo '<td>' . $event['event_id'] . '</td>';
- echo '<td>'
- . '<a href=cat.php?op=modify&cat_id='. $event['cat']['cat_id'] . '&form_modify' . '>'
- . $event['cat']['cat_name']
- . '</a>'
- . '</td>';
-
- echo '<td>'
- . '<a href=event.php?op=modify&event_id='. $event['event_id']. '>'
- . $event['event_title']
- . '</a>'
- . '</td>';
-
-
-// if ($event['event_isrecur']) {
-// echo '<td>' . $event['formated_reccur_rule'] . '</td>';
-// } else {
-// echo '<td>' . $event['formated_event_start'] . '</td>';
-// }
-
-
- echo '<td>' . $event['formated_event_start'] . '</td>';
- echo '<td align="center">' . (($event['event_isrecur']==1)?_YES:_NO) . '</td>';
- if(!isset($event['formated_reccur_rule'])){
- $event['formated_reccur_rule'] = '';
- }
- echo '<td>' . $event['formated_reccur_rule'] . '</td>';
-
-
- echo '<td style="width:10%; text-align:center;">';
- echo '<a href=event.php?op=modify&event_id='. $event['event_id']. "><img src='". $pathIcon16."/edit.png' 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'>";
- echo "<input type='checkbox' name='deleteEvents[{$event['event_id']}]' value='1' >";
- echo "<input type='hidden' name='deleteAllEvents[{$event['event_id']}]' value='1' />";
- echo "</td>";
-
- echo '</tr>';
- }
- //---------------------------------------------------------
- $pageNav = new XoopsPageNav($eventHandler->getCountNewEvent(), $nbEventsByPage, $start);
-
- echo '<tr><td colspan="3" style="text-align: right;">';
- echo $pageNav->renderNav(3);
- echo '</td>';
-
- echo '<td colspan="2" style="text-align: right;">';
-
- echo '<input type="submit" value="'._AM_EXTCAL_DELETE_ALL.'" name="deleteSelection[0]">';
- echo '<input type="submit" value="'._AM_EXTCAL_DELETE_SELECTION.'" name="deleteSelection[1]">';
-
- echo '</td>';
- echo '</tr>';
- } else {
- echo '<tr><td colspan="5">' . _AM_EXTCAL_NO_PENDING_EVENT . '</td></tr>';
- }
- echo '</table>';
- echo '</form>';
-
- echo '</fieldset>';
- echo '</fieldset><br /><br />';
- //Fin de la liste des evennement -------------------------------------
- echo'<fieldset><legend style="font-weight:bold; color:#990000;">'
- . _MD_EXTCAL_SUBMIT_EVENT . '</legend>';
-
- $form = $eventHandler->getEventForm('admin');
- $form->display();
-
- echo '</fieldset>';
-
- include 'admin_footer.php';
-
- break;
-}
-?>
+<?php
+
+include '../../../include/cp_header.php';
+include '../../../class/xoopsformloader.php';
+include '../../../class/pagenav.php';
+include '../class/form/extcalform.php';
+include 'admin_header.php';
+
+include_once XOOPS_ROOT_PATH . '/modules/extcal/include/functions.php';
+
+$gepeto = array_merge($_GET, $_POST);
+while (list($k,$v) = each ($gepeto)){
+ $$k = $v;
+}
+if (!isset($op)) $op='';
+//--------------------------------------------------------------------
+function deleteEvents($ids){
+
+ $eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
+ $criteria = new Criteria('event_id', "($ids)", 'IN');
+
+ //Supression des images
+ $rst = $eventHandler->getAllEvents($criteria);
+
+ while (list($k,$t) = each($rst)){
+ if ($t['event_picture1'] !=''){
+ $f = XOOPS_ROOT_PATH . '/uploads/extcal/' . $t['event_picture1'];
+ unlink ($f);
+ echo $f.'<br>';
+ }
+
+ if ($t['event_picture2'] !=''){
+ $f = XOOPS_ROOT_PATH . '/uploads/extcal/' . $t['event_picture1'];
+ unlink ($f);
+ echo $f.'<br>';
+ }
+ }
+
+ //Supression des enregistrements
+ $eventHandler->deleteAllEvents($criteria);
+
+ return true;
+}
+
+
+
+switch ($op) {
+
+ case 'enreg':
+
+ $eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
+ $fileHandler = xoops_getmodulehandler(_EXTCAL_CLS_FILE, _EXTCAL_MODULE);
+// $t = print_r($_POST,true);
+// 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;
+// }
+
+//exit;
+ ///////////////////////////////////////////////////////////////////////////////
+ extcal_loadImg($_REQUEST, $event_picture1, $event_picture2);
+ ///////////////////////////////////////////////////////////////////////////////
+ $data = array(
+ 'event_title' => $_POST['event_title'],
+ 'cat_id' => $_POST['cat_id'],
+ 'event_desc' => $_POST['event_desc'],
+ 'event_nbmember' => $_POST['event_nbmember'],
+ 'event_organisateur'=>$_POST['event_organisateur'],
+ 'event_contact' => $_POST['event_contact'],
+ 'event_url' => $_POST['event_url'],
+ 'event_email' => $_POST['event_email'],
+ 'event_address' => $_POST['event_address'],
+ 'event_approved' => 1,
+ 'event_start' => $_POST['event_start'],
+ 'have_end' => $_POST['have_end'],
+ 'event_end' => $_POST['event_end'],
+ 'event_picture1'=>@$event_picture1,
+ 'event_picture2'=>@$event_picture2,
+ 'event_price'=>@$_POST['event_price'],
+ 'event_etablissement'=>$_POST['event_etablissement'],
+ 'dohtml' => $extcalConfig['allow_html'],
+ 'event_icone'=>$_POST['event_icone']
+ );
+
+ // Event edited
+ if (isset($_POST['event_id'])) {
+
+ $eventHandler->modifyEvent($_POST['event_id'], $data);
+ $fileHandler->createFile(intval($_POST['event_id']));
+ redirect_header("event.php", 3, _AM_EXTCAL_EVENT_EDITED, false);
+
+ // New event
+ } else {
+ $notificationHandler =& xoops_gethandler('notification');
+ $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
+
+ $data['event_submitter'] = ($xoopsUser) ? $xoopsUser->getVar('uid')
+ : 0;
+ $data['event_submitdate'] = time();
+
+ $eventHandler->createEvent($data, $_POST);
+ $fileHandler->createFile($eventHandler->getInsertId());
+ $cat = $catHandler->getCat($_POST['cat_id'], $xoopsUser, 'all');
+ $notificationHandler->triggerEvent('global', 0, 'new_event', array('EVENT_TITLE' => $_POST['event_title']));
+ $notificationHandler->triggerEvent('cat', $_POST['cat_id'], 'new_event_cat', array('EVENT_TITLE' => $_POST['event_title'], 'CAT_NAME' => $cat->getVar('cat_name')));
+ redirect_header("event.php", 3, _AM_EXTCAL_EVENT_CREATED, false);
+ }
+ break;
+
+ case 'clone': /* sur validation du formulaire */
+ case 'modify':
+ $action = (($op == 'clone') ? 'clone' : 'edit');
+ xoops_cp_header();
+//================================================
+// include_once (XOOPS_ROOT_PATH . '/class/xoopsform/tc_calendar/formtccalendar.php');
+//
+// // Call the calendar constructor - use the desired form and format, according to the instructions/samples provided on triconsole.com
+// $dateBirthday = new XoopsTcCalendar("datez1", true, false);
+// //$dateBirthday->setIcon("images/iconCalendar.gif");
+// $dateBirthday->setIcon("/class/xoopsform/tc_calendar/images/iconCalendar.gif");
+// //$dateBirthday->rtl=false;
+// $dateBirthday->setAutoHide(false);
+//
+// //$myCalendar->setDate(date('d'), date('m'), date('Y'));
+// //$dateBirthday->setDate($p['date1_day'], $p['date1_month'], $p['date1_year']);
+// $dateBirthday->setDate(date('d'), date('m'), date('Y'));
+//
+// $dateBirthday->setPath(XOOPS_URL . "/class/xoopsform/tc_calendar/");
+// $dateBirthday->zindex = 150; //default 1
+// $dateBirthday->setYearInterval(1995, date('Y'));
+// $dateBirthday->dateAllow('1960-03-01', date('Y-m-d'));
+// //$dateBirthday->autoSubmit(true, "calendar");
+// $dateBirthday->disabledDay("sat");
+// $dateBirthday->disabledDay("sun");
+// $dateBirthday->setSpecificDate(array("2011-04-14", "2010-12-25"), 0, 'month');
+// $dateBirthday->setSpecificDate(array("2011-04-01"), 0, 'year');
+// $dateBirthday->setAlignment('right', 'bottom'); //optional
+// echo "<table><tr><td>zzzzz</td><td></td><td>";
+// echo $dateBirthday->render();
+// echo "</td></tr></table>";
+//echo $dateBirthday->render();
+//================================================
+ // @author Gregory Mage (Aka Mage)
+ //***************************************************************************************
+// include_once XOOPS_ROOT_PATH . "/modules/extcal/class/admin.php";
+ $eventAdmin = new ModuleAdmin();
+ echo $eventAdmin->addNavigation('event.php');
+ //***************************************************************************************
+
+ $eventId = $_GET['event_id'];
+ $eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
+
+ echo'<fieldset><legend style="font-weight:bold; color:#990000;">'
+ . _MD_EXTCAL_EDIT_EVENT . '</legend>';
+
+ if ($form = $eventHandler->getEventForm('admin', $action, array('event_id' => $eventId))) {
+ $form->display();
+ }
+
+ echo '</fieldset><br />';
+
+ xoops_cp_footer();
+
+ break;
+
+
+ case 'clone2': /* sur clique de l'icone du formulaire*/
+
+ //$newEventId = 1;
+ $eventId = $_GET['event_id'];
+ $eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
+ $event = $eventHandler->getEvent($eventId);
+ $t= $event->getVars();
+ $data=array();
+ while (list($key,$val) =each($t)){
+ $data[$key] = $val['value'];
+ }
+
+ $data['event_id'] = 0;
+ $data['event_title'] .= ' (' . _AM_EXTCAL_CLONE_OF. $eventId . ')';
+
+ $newEvent = $eventHandler->create();
+ $newEvent->setVars($data);
+ $t = $eventHandler->insert($newEvent, true);
+
+ $newEventId = $newEvent->getVar('event_id');
+ $ts = print_r($newEventId, true);
+
+ redirect_header("event.php?op=modify&event_id={$newEventId}", 3, _AM_EXTCAL_EVENT_DELETED, false);
+ break;
+
+ case 'delete':
+
+ if (isset($_POST['confirm'])) {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header(
+ 'index.php', 3, _NOPERM . "<br />"
+ . implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())
+ );
+ exit;
+ }
+// $eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
+// $eventHandler->deleteEvent($_POST['event_id']);
+ deleteEvents ($_POST['event_id']);
+ redirect_header("event.php", 3, _AM_EXTCAL_EVENT_DELETED, false);
+
+ } else {
+ xoops_cp_header();
+ // @author Gregory Mage (Aka Mage)
+ //***************************************************************************************
+ //include_once XOOPS_ROOT_PATH . "/modules/extcal/class/admin.php";
+ $eventAdmin = new ModuleAdmin();
+ echo $eventAdmin->addNavigation('event.php');
+ //***************************************************************************************
+
+ $hiddens = array('event_id' => $_GET['event_id'], 'form_delete' => '', 'confirm' => 1);
+ xoops_confirm($hiddens, 'event.php?op=delete', _AM_EXTCAL_CONFIRM_DELETE_EVENT, _DELETE, 'event.php');
+
+ xoops_cp_footer();
+ }
+
+ break;
+
+ case 'deleteSelection':
+
+ xoops_cp_header();
+ // @author Gregory Mage (Aka Mage)
+ //***************************************************************************************
+ //include_once XOOPS_ROOT_PATH . "/modules/extcal/class/admin.php";
+ $eventAdmin = new ModuleAdmin();
+ echo $eventAdmin->addNavigation('event.php');
+ //***************************************************************************************
+ if (isset($_POST['deleteSelection'][0])){
+ $msg = _AM_EXTCAL_CONFIRM_DELETE_ALL ;
+ $ids = array_keys($_POST['deleteAllEvents']);
+
+ }else{
+ $msg = _AM_EXTCAL_CONFIRM_DELETE_SELECTION;
+ $ids = array_keys($_POST['deleteEvents']);
+
+ }
+
+// $msg = ((isset($_POST['deleteSelection'][0])) ? _AM_EXTCAL_CONFIRM_DELETE_ALL : _AM_EXTCAL_CONFIRM_DELETE_SELECTION);
+// $ids = array_keys($_POST['deleteEvents']);
+ $ids = implode(',', $ids);
+ //echo $ids.'<br>';
+ $hiddens = array('event_ids' => $ids, 'form_delete' => '', 'confirm' => 1);
+ //$hiddens = array('event_ids' => $_POST['deleteEvent...
[truncated message content] |
|
From: <be...@us...> - 2012-12-30 14:38:50
|
Revision: 10611
http://sourceforge.net/p/xoops/svn/10611
Author: beckmi
Date: 2012-12-30 14:38:47 +0000 (Sun, 30 Dec 2012)
Log Message:
-----------
- fixed: Recent Activities showing all events, instead of only the particular user (sabahan/mamba)
- fixed: don't show empty Price and Organizer fields (sabahan/mamba)
- fixed: removed double edit icons (sabahan/mamba)
Modified Paths:
--------------
XoopsModules/extcal/trunk/modules/extcal/admin/event.php
XoopsModules/extcal/trunk/modules/extcal/class/event.php
XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt
XoopsModules/extcal/trunk/modules/extcal/include/search.inc.php
XoopsModules/extcal/trunk/modules/extcal/language/english/admin.php
XoopsModules/extcal/trunk/modules/extcal/templates/blocks/extcal_block_day.html
XoopsModules/extcal/trunk/modules/extcal/templates/blocks/extcal_block_new.html
XoopsModules/extcal/trunk/modules/extcal/templates/extcal_event.html
Modified: XoopsModules/extcal/trunk/modules/extcal/admin/event.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/admin/event.php 2012-12-30 12:11:53 UTC (rev 10610)
+++ XoopsModules/extcal/trunk/modules/extcal/admin/event.php 2012-12-30 14:38:47 UTC (rev 10611)
@@ -334,6 +334,7 @@
echo '<th>' . _AM_EXTCAL_CATEGORY . '</th>';
echo '<th>' . _AM_EXTCAL_TITLE . '</th>';
echo '<th>' . _AM_EXTCAL_START_DATE . '</th>';
+ echo '<th>' . _AM_EXTCAL_END_DATE . '</th>';
echo '<th>' . _AM_EXTCAL_RECURRENT . '</th>';
echo '<th>' . _AM_EXTCAL_START_RULES . '</th>';
echo '<th>' . _AM_EXTCAL_ACTION . '</th>';
@@ -369,6 +370,7 @@
echo '<td>' . $event['formated_event_start'] . '</td>';
+ echo '<td>' . $event['formated_event_end'] . '</td>';
echo '<td align="center">' . (($event['event_isrecur']==1)?_YES:_NO) . '</td>';
if(!isset($event['formated_reccur_rule'])){
$event['formated_reccur_rule'] = '';
Modified: XoopsModules/extcal/trunk/modules/extcal/class/event.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/event.php 2012-12-30 12:11:53 UTC (rev 10610)
+++ XoopsModules/extcal/trunk/modules/extcal/class/event.php 2012-12-30 14:38:47 UTC (rev 10611)
@@ -2227,7 +2227,7 @@
}
- function getSearchEventzzz(
+ function getSearchEvent3(
$queryarray, $andor, $limit, $offset, $userId, $user, $criteresPlus = '', $xoopsSearch = true
)
{
Modified: XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt 2012-12-30 12:11:53 UTC (rev 10610)
+++ XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt 2012-12-30 14:38:47 UTC (rev 10611)
@@ -1,11 +1,14 @@
2012/04/02: Version 2.37 RC2
===================================
-- fixed: attachment bug (mamba)
-- fixed: past events not being visible (mamba)
-- fixed: displaying the correct week in Week view when the first day of the week is Monday
-- updated: Highslide JS from version 4.1.8 to 4.1.13
-- added: end date to blocks
-- fixed: pagination for events in Admin
+- fixed: attachment bug (JammerPro/mamba)
+- fixed: past events not being visible consistently, when selected by user in Preferences (mamba)
+- fixed: displaying the correct week in Week view when the first day of the week is Monday (mamba)
+- updated: Highslide JS from version 4.1.8 to 4.1.13 (mamba)
+- added: end date to blocks (sabahan/mamba)
+- fixed: pagination for events in Admin (sabahan/mamba)
+- fixed: Recent Activities showing all events, instead of only the particular user (sabahan/mamba)
+- fixed: don't show empty Price and Organizer fields (sabahan/mamba)
+- fixed: removed double edit icons (sabahan/mamba)
2012/04/02: Version 2.37 Beta 4
===================================
Modified: XoopsModules/extcal/trunk/modules/extcal/include/search.inc.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/include/search.inc.php 2012-12-30 12:11:53 UTC (rev 10610)
+++ XoopsModules/extcal/trunk/modules/extcal/include/search.inc.php 2012-12-30 14:38:47 UTC (rev 10611)
@@ -10,7 +10,6 @@
$eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
- return $eventHandler->getSearchEvent($queryarray, $andor, $limit, $offset, $userid, $xoopsUser);
+ return $eventHandler->getSearchEvent3($queryarray, $andor, $limit, $offset, $userid, $xoopsUser);
-}
-?>
+}
\ No newline at end of file
Modified: XoopsModules/extcal/trunk/modules/extcal/language/english/admin.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/language/english/admin.php 2012-12-30 12:11:53 UTC (rev 10610)
+++ XoopsModules/extcal/trunk/modules/extcal/language/english/admin.php 2012-12-30 14:38:47 UTC (rev 10611)
@@ -118,4 +118,8 @@
define('_AM_EXTCAL_NO_PENDING_EVENT','No pending Event');
define('_AM_EXTCAL_ICONE','Icon');
//ModuleAdmin
-define('_AM_EXTCAL_MODULEADMIN_MISSING','Error: The ModuleAdmin class is missing. Please install the ModuleAdmin Class into /Frameworks (see /docs/readme.txt)');
\ No newline at end of file
+define('_AM_EXTCAL_MODULEADMIN_MISSING','Error: The ModuleAdmin class is missing. Please install the ModuleAdmin Class into /Frameworks (see /docs/readme.txt)');
+
+//2.37
+
+define('_AM_EXTCAL_END_DATE','End Date');
\ No newline at end of file
Modified: XoopsModules/extcal/trunk/modules/extcal/templates/blocks/extcal_block_day.html
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/templates/blocks/extcal_block_day.html 2012-12-30 12:11:53 UTC (rev 10610)
+++ XoopsModules/extcal/trunk/modules/extcal/templates/blocks/extcal_block_day.html 2012-12-30 14:38:47 UTC (rev 10611)
@@ -5,7 +5,11 @@
<td>
<a href="<{$xoops_url}>/modules/extcal/event.php?event=<{$event.event_id}>"
title="<{$event.event_title}>"><{$event.event_title}></a></td>
- <td><{$event.formated_event_start}></td>
+ <td><{$event.formated_event_start}>
+ <{if $event.formated_event_start != $event.formated_event_end}>
+ - <{$event.formated_event_end}>
+ <{/if}>
+ </td>
</tr>
<{/foreach}>
</table>
Modified: XoopsModules/extcal/trunk/modules/extcal/templates/blocks/extcal_block_new.html
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/templates/blocks/extcal_block_new.html 2012-12-30 12:11:53 UTC (rev 10610)
+++ XoopsModules/extcal/trunk/modules/extcal/templates/blocks/extcal_block_new.html 2012-12-30 14:38:47 UTC (rev 10611)
@@ -5,7 +5,8 @@
<td>
<a href="<{$xoops_url}>/modules/extcal/event.php?event=<{$event.event_id}>"
title="<{$event.event_title}>"><{$event.event_title}></a></td>
- <td><{$event.formated_event_start}> <{if $event.formated_event_start != $event.formated_event_end}>
+ <td><{$event.formated_event_start}>
+ <{if $event.formated_event_start != $event.formated_event_end}>
- <{$event.formated_event_end}>
<{/if}>
</td>
Modified: XoopsModules/extcal/trunk/modules/extcal/templates/extcal_event.html
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/templates/extcal_event.html 2012-12-30 12:11:53 UTC (rev 10610)
+++ XoopsModules/extcal/trunk/modules/extcal/templates/extcal_event.html 2012-12-30 14:38:47 UTC (rev 10611)
@@ -1,34 +1,33 @@
-
<script src='<{$smarty.const.XOOPS_URL}>/modules/extcal/js/extcal_highslide.js' type="text/javascript"></script>
<table class="outer">
+ <tr>
+ <th colspan="3" style="font-size:1.2em;">
+ <div style="float:left;">
+ <table>
+ <tr>
+ <td class="head" style="background-color:#<{$event.cat.cat_color}>; width:5px;"></td>
+ <td style="width:200px;"><{$event.cat.cat_name}></td>
+ </tr>
+ </table>
+ </div>
+ <!--<div style="text-align:right;">-->
+ <!--<a href="<{$xoops_url}>/modules/extcal/print.php?event=<{$event.event_id}>">-->
+ <!--<img src="<{$smarty.const._EXTCAL_PATH_ICONS16}>/printer.png"/>-->
+ <!--</a>-->
+ <!--<{if $isAdmin || $canEdit}>-->
+ <!--<a href="edit_event.php?event=<{$event.event_id}>">-->
+ <!--<img src="<{$smarty.const._EXTCAL_PATH_ICONS16}>/edit.png"/>-->
+ <!--</a><{/if}>-->
+ <!--<{if $isAdmin}>-->
+ <!--<a href="admin/event.php?op=delete&event_id=<{$event.event_id}>">-->
+ <!--<img src="<{$smarty.const._EXTCAL_PATH_ICONS16}>/delete.png"/>-->
+ <!--</a>-->
+ <!--<{/if}>-->
+ <!--</div>-->
+ </th>
+ </tr>
<tr>
- <th colspan="3" style="font-size:1.2em;">
- <div style="float:left;">
- <table>
- <tr>
- <td class="head" style="background-color:#<{$event.cat.cat_color}>; width:5px;"></td>
- <td style="width:200px;"><{$event.cat.cat_name}></td>
- </tr>
- </table>
- </div>
- <div style="text-align:right;">
- <a href="<{$xoops_url}>/modules/extcal/print.php?event=<{$event.event_id}>">
- <img src="<{$smarty.const._EXTCAL_PATH_ICONS16}>/printer.png" />
- </a>
- <{if $isAdmin || $canEdit}>
- <a href="edit_event.php?event=<{$event.event_id}>">
- <img src="<{$smarty.const._EXTCAL_PATH_ICONS16}>/edit.png" />
- </a><{/if}>
- <{if $isAdmin}>
- <a href="admin/event.php?op=delete&event_id=<{$event.event_id}>">
- <img src="<{$smarty.const._EXTCAL_PATH_ICONS16}>/delete.png" />
- </a>
- <{/if}>
- </div>
- </th>
- </tr>
- <tr>
<td colspan="3" class="odd">
<{if $event.event_picture1}>
@@ -117,8 +116,10 @@
<tr>
<td width="50%" class="odd" colspan='2'>
- <u><strong><{$smarty.const._MD_EXTCAL_ORGANISATEUR}></strong></u><br />
- <{if $event.event_organisateur}><{$event.event_organisateur}><br /><{/if}>
+
+ <{if $event.event_organisateur}>
+ <u><strong><{$smarty.const._MD_EXTCAL_ORGANISATEUR}></strong></u><br />
+ <{$event.event_organisateur}><br /><{/if}>
<{if $event.event_contact}><{$event.event_contact}><br /><{/if}>
<{if $event.event_email}><A href="mailto:<{$event.event_email}>"><{$event.event_email}></A><br /><{/if}>
<{if $event.event_url}><a href="<{$event.event_url}>" target="_blank"><{$event.event_url}></a><br /><{/if}>
@@ -127,9 +128,15 @@
</tr>
<tr>
- <td width="50%" class="odd"><br />
- <u><strong><{$smarty.const._MD_EXTCAL_ETABLISSEMENT_TARIFS}> :</strong></u><br /><{$event.event_price}> <{$smarty.const._MD_EXTCAL_DEVISE2}>
- </td>
+
+ <{if $event.event_price}>
+ <td width="50%" class="odd"><br />
+ <u><strong><{$smarty.const._MD_EXTCAL_ETABLISSEMENT_TARIFS}> :</strong></u><br />
+ <{$event.event_price}>
+ <{$smarty.const._MD_EXTCAL_DEVISE2}>
+ </td>
+ <{/if}>
+
<td class="odd"><br />
<u><strong><{$smarty.const._MD_EXTCAL_START}></strong></u> <{$event.formated_event_start}><br />
<u><strong><{$smarty.const._MD_EXTCAL_END}></strong></u> <{$event.formated_event_end}><br />
|
|
From: <be...@us...> - 2012-12-30 15:57:03
|
Revision: 10612
http://sourceforge.net/p/xoops/svn/10612
Author: beckmi
Date: 2012-12-30 15:57:00 +0000 (Sun, 30 Dec 2012)
Log Message:
-----------
fixed: removed Contact info from Print, if empty (sabahan/mamba)
Modified Paths:
--------------
XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt
XoopsModules/extcal/trunk/modules/extcal/print.php
Modified: XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt 2012-12-30 14:38:47 UTC (rev 10611)
+++ XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt 2012-12-30 15:57:00 UTC (rev 10612)
@@ -9,6 +9,7 @@
- fixed: Recent Activities showing all events, instead of only the particular user (sabahan/mamba)
- fixed: don't show empty Price and Organizer fields (sabahan/mamba)
- fixed: removed double edit icons (sabahan/mamba)
+- fixed: removed Contact info from Print, if empty (sabahan/mamba)
2012/04/02: Version 2.37 Beta 4
===================================
Modified: XoopsModules/extcal/trunk/modules/extcal/print.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/print.php 2012-12-30 14:38:47 UTC (rev 10611)
+++ XoopsModules/extcal/trunk/modules/extcal/print.php 2012-12-30 15:57:00 UTC (rev 10612)
@@ -54,6 +54,8 @@
}
echo '</td>' . "\n";
echo '</tr>' . "\n";
+
+if ($event['event_contact'] != ''){
echo '<tr>' . "\n";
echo '<td style="border:1px solid black;">' . "\n";
echo '<b>' . _MD_EXTCAL_CONTACT_INFO . '</b><br />' . "\n";
@@ -68,6 +70,9 @@
. $event['event_url'] . '</a>' . "\n";
echo '</td>' . "\n";
echo '</tr>' . "\n";
+}
+
+
echo '<tr>' . "\n";
echo'<td colspan="2" style="border:1px solid black;">' . $event['event_desc']
. '</td>' . "\n";
|
|
From: <be...@us...> - 2013-01-01 18:19:39
|
Revision: 10619
http://sourceforge.net/p/xoops/svn/10619
Author: beckmi
Date: 2013-01-01 18:19:34 +0000 (Tue, 01 Jan 2013)
Log Message:
-----------
Updating to RC3 (see changelog.txt)
Modified Paths:
--------------
XoopsModules/extcal/trunk/modules/extcal/admin/index.php
XoopsModules/extcal/trunk/modules/extcal/class/event.php
XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt
XoopsModules/extcal/trunk/modules/extcal/language/english/admin.php
XoopsModules/extcal/trunk/modules/extcal/language/english/main.php
XoopsModules/extcal/trunk/modules/extcal/post.php
XoopsModules/extcal/trunk/modules/extcal/print.php
XoopsModules/extcal/trunk/modules/extcal/templates/extcal_view_search.html
XoopsModules/extcal/trunk/modules/extcal/xoops_version.php
Modified: XoopsModules/extcal/trunk/modules/extcal/admin/index.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/admin/index.php 2013-01-01 14:16:08 UTC (rev 10618)
+++ XoopsModules/extcal/trunk/modules/extcal/admin/index.php 2013-01-01 18:19:34 UTC (rev 10619)
@@ -1,222 +1,222 @@
-<?php
-
-include '../../../include/cp_header.php';
-include '../../../class/xoopsformloader.php';
-include 'admin_header.php';
-
-function extgalleryLastVersion()
-{
- //return @file_get_contents("http://www.zoullou.net/extcal.version"); //the Website is not longer working
-}
-
-function isUpToDate()
-{
- $version = extgalleryLastVersion();
- return $GLOBALS['xoopsModule']->getVar('version') >= $version;
-}
-
-if (isset($_GET['op'])) {
- $op = $_GET['op'];
-} else {
- if (isset($_POST['op'])) {
- $op = $_POST['op'];
- } else {
- $op = 'default';
- }
-}
-if (isset($_GET['fct'])) {
- $fct = $_GET['fct'];
-} else {
- $fct = 'default';
-}
-
-switch ($op) {
-
- case 'notification':
-
- switch ($fct) {
-
- case 'send':
-
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header(
- 'index.php', 3, _NOPERM . "<br />"
- . implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())
- );
- exit;
- }
- xoops_cp_header();
- adminMenu(1);
-
- $myts =& MyTextSanitizer::getInstance();
- $xoopsMailer =& getMailer();
- $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
- $eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
- $eventMemberHandler = xoops_getmodulehandler(_EXTCAL_CLS_MEMBER, _EXTCAL_MODULE);
- $extcalTime = ExtcalTime::getHandler();
- $extcalConfig =& ExtcalConfig::getHandler();
- $xoopsModuleConfig = $extcalConfig->getModuleConfig();
-
- $event = $eventHandler->getEvent($_POST['event_id'], $xoopsUser, true);
- $cat = $catHandler->getCat($event->getVar('cat_id'), $xoopsUser, 'all');
-
- $xoopsMailer->setToUsers($eventMemberHandler->getMembers($_POST['event_id']));
- $xoopsMailer->setFromName($myts->oopsStripSlashesGPC($_POST['mail_fromname']));
- $xoopsMailer->setFromEmail($myts->oopsStripSlashesGPC($_POST['mail_fromemail']));
- $xoopsMailer->setSubject($myts->oopsStripSlashesGPC($_POST['mail_subject']));
- $xoopsMailer->setBody($myts->oopsStripSlashesGPC($_POST['mail_body']));
- if (in_array("mail", $_POST['mail_send_to'])) {
- $xoopsMailer->useMail();
- }
- if (in_array("pm", $_POST['mail_send_to'])
- && empty($_POST['mail_inactive'])
- ) {
- $xoopsMailer->usePM();
- }
- $tag = array(
- 'EV_CAT' => $cat->getVar('cat_name'), 'EV_TITLE' => $event->getVar('event_title'), 'EV_START' => $extcalTime->getFormatedDate($xoopsModuleConfig['date_long'], $event->getVar('event_start')), 'EV_END' => $extcalTime->getFormatedDate($xoopsModuleConfig['date_long'], $event->getVar('event_end')), 'EV_LINK'
- => XOOPS_URL . '/modules/extcal/event.php?event='
- . $event->getVar('event_id')
- );
- $xoopsMailer->assign($tag);
- $xoopsMailer->send(true);
- echo $xoopsMailer->getSuccess();
- echo $xoopsMailer->getErrors();
-
- xoops_cp_footer();
-
- break;
-
- case 'default':
- default:
-
- xoops_cp_header();
-
- $fromemail = !empty($xoopsConfig['adminmail'])
- ? $xoopsConfig['adminmail']
- : $xoopsUser->getVar("email", "E");
- $subjectCaption = _AM_EXTCAL_SUBJECT
- . "<br /><br /><span style='font-size:x-small;font-weight:bold;'>"
- . _AM_EXTCAL_USEFUL_TAGS
- . "</span><br /><span style='font-size:x-small;font-weight:normal;'>"
- . _AM_EXTCAL_MAILTAGS6 . "<br />" . _AM_EXTCAL_MAILTAGS2
- . "</span> ";
- $bodyCaption = _AM_EXTCAL_BODY
- . "<br /><br /><span style='font-size:x-small;font-weight:bold;'>"
- . _AM_EXTCAL_USEFUL_TAGS
- . "</span><br /><span style='font-size:x-small;font-weight:normal;'>"
- . _AM_EXTCAL_MAILTAGS1 . "<br />" . _AM_EXTCAL_MAILTAGS2
- . "<br />" . _AM_EXTCAL_MAILTAGS3 . "<br />"
- . _AM_EXTCAL_MAILTAGS4 . "<br />" . _AM_EXTCAL_MAILTAGS5
- . "<br />" . _AM_EXTCAL_MAILTAGS6 . "<br />"
- . _AM_EXTCAL_MAILTAGS7 . "<br />" . _AM_EXTCAL_MAILTAGS8
- . "<br />" . _AM_EXTCAL_MAILTAGS9
- . "</span> ";
- $toCheckBbox = new XoopsFormCheckBox(_AM_EXTCAL_SEND_TO, "mail_send_to", "mail");
- $toCheckBox->addOption("mail", _AM_EXTCAL_EMAIL);
- $toCheckBox->addOption("pm", _AM_EXTCAL_PM);
-
- echo
- '<fieldset><legend style="font-weight:bold; color:#990000;">'
- . _AM_EXTCAL_APPROVED_EVENT . '</legend>';
- echo
- '<fieldset><legend style="font-weight:bold; color:#0A3760;">'
- . _AM_EXTCAL_INFORMATION . '</legend>';
- echo _AM_EXTCAL_INFO_SEND_NOTIF;
- echo '</fieldset><br />';
- $form = new XoopsThemeForm(_AM_EXTCAL_SEND_NOTIFICATION, "mailusers", "index.php?op=notification&fct=send", 'post', true);
- $form->addElement(new XoopsFormText(_AM_EXTCAL_FROM_NAME, "mail_fromname", 30, 255, $xoopsConfig['sitename']), true);
- $form->addElement(new XoopsFormText(_AM_EXTCAL_FROM_EMAIL, "mail_fromemail", 30, 255, $fromemail), true);
- $form->addElement(new XoopsFormText($subjectCaption, "mail_subject", 50, 255, _AM_EXTCAL_SEND_NOTIFICATION_SUBJECT), true);
- $form->addElement(new XoopsFormTextArea($bodyCaption, "mail_body", _AM_EXTCAL_SEND_NOTIFICATION_BODY, 10), true);
- $form->addElement($toCheckBox, true);
- $form->addElement(new XoopsFormHidden('event_id', $_GET['event_id']), false);
- $form->addElement(new XoopsFormButton("", "mail_submit", _SEND, "submit"));
- $form->display();
- echo '</fieldset>';
-
- xoops_cp_footer();
-
- break;
-
- }
-
- break;
-
- default:
- case 'default':
- // @author Gregory Mage (Aka Mage)
- //***************************************************************************************
- xoops_cp_header();
-// include_once XOOPS_ROOT_PATH . "/modules/extcal/class/admin.php";
- $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
- $eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
- $indexAdmin = new ModuleAdmin();
- $indexAdmin->addInfoBox(_MI_EXTCAL_DASHBOARD);
- $indexAdmin->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, "<infolabel>" ._AM_EXTCAL_INDEX_CATEGORIES. "</infolabel>", $catHandler->getCount(), 'Green');
- $indexAdmin->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, "<infolabel>" ._AM_EXTCAL_INDEX_EVENT. "</infolabel>", $eventHandler->getCount(new Criteria('event_approved', 1)), 'Green');
- $indexAdmin->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, "<infolabel>" ._AM_EXTCAL_INDEX_PENDING. "</infolabel>", $eventHandler->getCount(new Criteria('event_approved', 0)),'Red');
- $criteriaCompo = new CriteriaCompo();
- $criteriaCompo->add(new Criteria('event_approved', 1));
- $criteriaCompo->add(new Criteria('event_start', time(), '>='));
- $indexAdmin->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, "<infolabel>" ._AM_EXTCAL_INDEX_APPROVED."</infolabel><infotext>", $eventHandler->getCount($criteriaCompo)."</infotext>",'Red');
-
- $indexAdmin->addConfigBoxLine();
- $indexAdmin->addConfigBoxLine(_AM_EXTCAL_PEAR_PATH);
- $indexAdmin->addConfigBoxLine(_EXTCAL_PEAR_ROOT,'folder');
-
-//JJD
-// $indexAdmin->addConfigBoxLine(XOOPS_ROOT_PATH,'folder');
-
-// $indexAdmin->addLineConfigLabel(_AM_EXTCAL_CONFIG_PHP, $xoopsModule->getInfo("min_php"), 'php');
-// $indexAdmin->addLineConfigLabel(_AM_EXTCAL_CONFIG_XOOPS, $xoopsModule->getInfo("min_xoops"), 'xoops');
- echo $indexAdmin->addNavigation('index.php');
- echo $indexAdmin->renderIndex();
- //***************************************************************************************
- $pendingEvent = $eventHandler->objectToArray($eventHandler->getPendingEvent(), array('cat_id'));
- $eventHandler->formatEventsDate($pendingEvent, 'd/m/Y');
-
- echo'<fieldset><legend style="font-weight:bold; color:#990000;">'
- . _AM_EXTCAL_PENDING_EVENT . '</legend>';
- echo'<fieldset><legend style="font-weight:bold; color:#0A3760;">'
- . _AM_EXTCAL_INFORMATION . '</legend>';
-// echo '<img src="../images/icons/on.png" /> '._AM_EXTCAL_INFO_APPROVE_PENDING_EVENT.'<br />';
- echo'<img src='. $pathIcon16.'/edit.png /> '. _AM_EXTCAL_INFO_EDIT_PENDING_EVENT . '<br />';
- echo'<img src='. $pathIcon16.'/delete.png /> ' . _AM_EXTCAL_INFO_DELETE_PENDING_EVENT . '<br />';
- echo '</fieldset><br />';
-
- echo '<table class="outer" style="width:100%;">';
- echo '<tr style="text-align:center;">';
- echo '<th>' . _AM_EXTCAL_CATEGORY . '</th>';
- echo '<th>' . _AM_EXTCAL_TITLE . '</th>';
- echo '<th>' . _AM_EXTCAL_START_DATE . '</th>';
- echo '<th>' . _AM_EXTCAL_ACTION . '</th>';
- echo '</tr>';
-
- if (count($pendingEvent) > 0) {
- $i = 0;
- foreach (
- $pendingEvent as $event
- ) {
- $class = ($i++ % 2 == 0) ? 'even' : 'odd';
- echo '<tr style="text-align:center;" class="' . $class . '">';
- echo '<td>' . $event['cat']['cat_name'] . '</td>';
- echo '<td>' . $event['event_title'] . '</td>';
- echo '<td>' . $event['formated_event_start'] . '</td>';
- echo '<td style="width:10%; text-align:center;">';
- echo'<a href="event.php?op=modify&event_id='. $event['event_id'] . '"><img src='. $pathIcon16.'/edit.png /></a> ';
- echo'<a href="event.php?op=delete&event_id='. $event['event_id'] . '"><img src='. $pathIcon16.'/delete.png /></a>';
- echo '</td>';
- echo '</tr>';
- }
- } else {
- echo '<tr><td colspan="4">' . _AM_EXTCAL_NO_PENDING_EVENT . '</td></tr>';
- }
-
- echo '</table></fieldset><br />';
-
- include 'admin_footer.php';
-
- break;
-}
-
+<?php
+
+include '../../../include/cp_header.php';
+include '../../../class/xoopsformloader.php';
+include 'admin_header.php';
+
+function extgalleryLastVersion()
+{
+ //return @file_get_contents("http://www.zoullou.net/extcal.version"); //the Website is not longer working
+}
+
+function isUpToDate()
+{
+ $version = extgalleryLastVersion();
+ return $GLOBALS['xoopsModule']->getVar('version') >= $version;
+}
+
+if (isset($_GET['op'])) {
+ $op = $_GET['op'];
+} else {
+ if (isset($_POST['op'])) {
+ $op = $_POST['op'];
+ } else {
+ $op = 'default';
+ }
+}
+if (isset($_GET['fct'])) {
+ $fct = $_GET['fct'];
+} else {
+ $fct = 'default';
+}
+
+switch ($op) {
+
+ case 'notification':
+
+ switch ($fct) {
+
+ case 'send':
+
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header(
+ 'index.php', 3, _NOPERM . "<br />"
+ . implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())
+ );
+ exit;
+ }
+ xoops_cp_header();
+ adminMenu(1);
+
+ $myts =& MyTextSanitizer::getInstance();
+ $xoopsMailer =& getMailer();
+ $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
+ $eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
+ $eventMemberHandler = xoops_getmodulehandler(_EXTCAL_CLS_MEMBER, _EXTCAL_MODULE);
+ $extcalTime = ExtcalTime::getHandler();
+ $extcalConfig =& ExtcalConfig::getHandler();
+ $xoopsModuleConfig = $extcalConfig->getModuleConfig();
+
+ $event = $eventHandler->getEvent($_POST['event_id'], $xoopsUser, true);
+ $cat = $catHandler->getCat($event->getVar('cat_id'), $xoopsUser, 'all');
+
+ $xoopsMailer->setToUsers($eventMemberHandler->getMembers($_POST['event_id']));
+ $xoopsMailer->setFromName($myts->oopsStripSlashesGPC($_POST['mail_fromname']));
+ $xoopsMailer->setFromEmail($myts->oopsStripSlashesGPC($_POST['mail_fromemail']));
+ $xoopsMailer->setSubject($myts->oopsStripSlashesGPC($_POST['mail_subject']));
+ $xoopsMailer->setBody($myts->oopsStripSlashesGPC($_POST['mail_body']));
+ if (in_array("mail", $_POST['mail_send_to'])) {
+ $xoopsMailer->useMail();
+ }
+ if (in_array("pm", $_POST['mail_send_to'])
+ && empty($_POST['mail_inactive'])
+ ) {
+ $xoopsMailer->usePM();
+ }
+ $tag = array(
+ 'EV_CAT' => $cat->getVar('cat_name'), 'EV_TITLE' => $event->getVar('event_title'), 'EV_START' => $extcalTime->getFormatedDate($xoopsModuleConfig['date_long'], $event->getVar('event_start')), 'EV_END' => $extcalTime->getFormatedDate($xoopsModuleConfig['date_long'], $event->getVar('event_end')), 'EV_LINK'
+ => XOOPS_URL . '/modules/extcal/event.php?event='
+ . $event->getVar('event_id')
+ );
+ $xoopsMailer->assign($tag);
+ $xoopsMailer->send(true);
+ echo $xoopsMailer->getSuccess();
+ echo $xoopsMailer->getErrors();
+
+ xoops_cp_footer();
+
+ break;
+
+ case 'default':
+ default:
+
+ xoops_cp_header();
+
+ $fromemail = !empty($xoopsConfig['adminmail'])
+ ? $xoopsConfig['adminmail']
+ : $xoopsUser->getVar("email", "E");
+ $subjectCaption = _AM_EXTCAL_SUBJECT
+ . "<br /><br /><span style='font-size:x-small;font-weight:bold;'>"
+ . _AM_EXTCAL_USEFUL_TAGS
+ . "</span><br /><span style='font-size:x-small;font-weight:normal;'>"
+ . _AM_EXTCAL_MAILTAGS6 . "<br />" . _AM_EXTCAL_MAILTAGS2
+ . "</span> ";
+ $bodyCaption = _AM_EXTCAL_BODY
+ . "<br /><br /><span style='font-size:x-small;font-weight:bold;'>"
+ . _AM_EXTCAL_USEFUL_TAGS
+ . "</span><br /><span style='font-size:x-small;font-weight:normal;'>"
+ . _AM_EXTCAL_MAILTAGS1 . "<br />" . _AM_EXTCAL_MAILTAGS2
+ . "<br />" . _AM_EXTCAL_MAILTAGS3 . "<br />"
+ . _AM_EXTCAL_MAILTAGS4 . "<br />" . _AM_EXTCAL_MAILTAGS5
+ . "<br />" . _AM_EXTCAL_MAILTAGS6 . "<br />"
+ . _AM_EXTCAL_MAILTAGS7 . "<br />" . _AM_EXTCAL_MAILTAGS8
+ . "<br />" . _AM_EXTCAL_MAILTAGS9
+ . "</span> ";
+ $toCheckBbox = new XoopsFormCheckBox(_AM_EXTCAL_SEND_TO, "mail_send_to", "mail");
+ $toCheckBox->addOption("mail", _AM_EXTCAL_EMAIL);
+ $toCheckBox->addOption("pm", _AM_EXTCAL_PM);
+
+ echo
+ '<fieldset><legend style="font-weight:bold; color:#990000;">'
+ . _AM_EXTCAL_APPROVED_EVENT . '</legend>';
+ echo
+ '<fieldset><legend style="font-weight:bold; color:#0A3760;">'
+ . _AM_EXTCAL_INFORMATION . '</legend>';
+ echo _AM_EXTCAL_INFO_SEND_NOTIF;
+ echo '</fieldset><br />';
+ $form = new XoopsThemeForm(_AM_EXTCAL_SEND_NOTIFICATION, "mailusers", "index.php?op=notification&fct=send", 'post', true);
+ $form->addElement(new XoopsFormText(_AM_EXTCAL_FROM_NAME, "mail_fromname", 30, 255, $xoopsConfig['sitename']), true);
+ $form->addElement(new XoopsFormText(_AM_EXTCAL_FROM_EMAIL, "mail_fromemail", 30, 255, $fromemail), true);
+ $form->addElement(new XoopsFormText($subjectCaption, "mail_subject", 50, 255, _AM_EXTCAL_SEND_NOTIFICATION_SUBJECT), true);
+ $form->addElement(new XoopsFormTextArea($bodyCaption, "mail_body", _AM_EXTCAL_SEND_NOTIFICATION_BODY, 10), true);
+ $form->addElement($toCheckBox, true);
+ $form->addElement(new XoopsFormHidden('event_id', $_GET['event_id']), false);
+ $form->addElement(new XoopsFormButton("", "mail_submit", _SEND, "submit"));
+ $form->display();
+ echo '</fieldset>';
+
+ xoops_cp_footer();
+
+ break;
+
+ }
+
+ break;
+
+ default:
+ case 'default':
+ // @author Gregory Mage (Aka Mage)
+ //***************************************************************************************
+ xoops_cp_header();
+// include_once XOOPS_ROOT_PATH . "/modules/extcal/class/admin.php";
+ $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
+ $eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
+ $indexAdmin = new ModuleAdmin();
+ $indexAdmin->addInfoBox(_MI_EXTCAL_DASHBOARD);
+ $indexAdmin->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, "<infolabel>" ._AM_EXTCAL_INDEX_CATEGORIES. "</infolabel>", $catHandler->getCount(), 'Green');
+ $indexAdmin->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, "<infolabel>" ._AM_EXTCAL_INDEX_EVENT. "</infolabel>", $eventHandler->getCount(new Criteria('event_approved', 1)), 'Green');
+ $indexAdmin->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, "<infolabel>" ._AM_EXTCAL_INDEX_PENDING. "</infolabel>", $eventHandler->getCount(new Criteria('event_approved', 0)),'Red');
+ $criteriaCompo = new CriteriaCompo();
+ $criteriaCompo->add(new Criteria('event_approved', 1));
+ $criteriaCompo->add(new Criteria('event_start', time(), '>='));
+ $indexAdmin->addInfoBoxLine(_MI_EXTCAL_DASHBOARD, "<infolabel>" ._AM_EXTCAL_INDEX_APPROVED."</infolabel><infotext>", $eventHandler->getCount($criteriaCompo)."</infotext>",'Green');
+
+ $indexAdmin->addConfigBoxLine();
+ $indexAdmin->addConfigBoxLine(_AM_EXTCAL_PEAR_PATH);
+ $indexAdmin->addConfigBoxLine(_EXTCAL_PEAR_ROOT,'folder');
+
+//JJD
+// $indexAdmin->addConfigBoxLine(XOOPS_ROOT_PATH,'folder');
+
+// $indexAdmin->addLineConfigLabel(_AM_EXTCAL_CONFIG_PHP, $xoopsModule->getInfo("min_php"), 'php');
+// $indexAdmin->addLineConfigLabel(_AM_EXTCAL_CONFIG_XOOPS, $xoopsModule->getInfo("min_xoops"), 'xoops');
+ echo $indexAdmin->addNavigation('index.php');
+ echo $indexAdmin->renderIndex();
+ //***************************************************************************************
+ $pendingEvent = $eventHandler->objectToArray($eventHandler->getPendingEvent(), array('cat_id'));
+ $eventHandler->formatEventsDate($pendingEvent, 'd/m/Y');
+
+ echo'<fieldset><legend style="font-weight:bold; color:#990000;">'
+ . _AM_EXTCAL_PENDING_EVENT . '</legend>';
+ echo'<fieldset><legend style="font-weight:bold; color:#0A3760;">'
+ . _AM_EXTCAL_INFORMATION . '</legend>';
+// echo '<img src="../images/icons/on.png" /> '._AM_EXTCAL_INFO_APPROVE_PENDING_EVENT.'<br />';
+ echo'<img src='. $pathIcon16.'/edit.png /> '. _AM_EXTCAL_INFO_EDIT_PENDING_EVENT . '<br />';
+ echo'<img src='. $pathIcon16.'/delete.png /> ' . _AM_EXTCAL_INFO_DELETE_PENDING_EVENT . '<br />';
+ echo '</fieldset><br />';
+
+ echo '<table class="outer" style="width:100%;">';
+ echo '<tr style="text-align:center;">';
+ echo '<th>' . _AM_EXTCAL_CATEGORY . '</th>';
+ echo '<th>' . _AM_EXTCAL_TITLE . '</th>';
+ echo '<th>' . _AM_EXTCAL_START_DATE . '</th>';
+ echo '<th>' . _AM_EXTCAL_ACTION . '</th>';
+ echo '</tr>';
+
+ if (count($pendingEvent) > 0) {
+ $i = 0;
+ foreach (
+ $pendingEvent as $event
+ ) {
+ $class = ($i++ % 2 == 0) ? 'even' : 'odd';
+ echo '<tr style="text-align:center;" class="' . $class . '">';
+ echo '<td>' . $event['cat']['cat_name'] . '</td>';
+ echo '<td>' . $event['event_title'] . '</td>';
+ echo '<td>' . $event['formated_event_start'] . '</td>';
+ echo '<td style="width:10%; text-align:center;">';
+ echo'<a href="event.php?op=modify&event_id='. $event['event_id'] . '"><img src='. $pathIcon16.'/edit.png /></a> ';
+ echo'<a href="event.php?op=delete&event_id='. $event['event_id'] . '"><img src='. $pathIcon16.'/delete.png /></a>';
+ echo '</td>';
+ echo '</tr>';
+ }
+ } else {
+ echo '<tr><td colspan="4">' . _AM_EXTCAL_NO_PENDING_EVENT . '</td></tr>';
+ }
+
+ echo '</table></fieldset><br />';
+
+ include 'admin_footer.php';
+
+ break;
+}
+
Modified: XoopsModules/extcal/trunk/modules/extcal/class/event.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/event.php 2013-01-01 14:16:08 UTC (rev 10618)
+++ XoopsModules/extcal/trunk/modules/extcal/class/event.php 2013-01-01 18:19:34 UTC (rev 10619)
@@ -796,6 +796,7 @@
{
$catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
$fileHandler = xoops_getmodulehandler(_EXTCAL_CLS_FILE, _EXTCAL_MODULE);
+
/***************************************************/
include_once XOOPS_ROOT_PATH . "/modules/extcal/class/etablissement.php";
if ($siteSide == 'admin') {
@@ -1574,6 +1575,7 @@
$ts = mktime(0, 0, 0, $month, 1, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==0) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 0) {
$dayOfWeek++;
@@ -1587,6 +1589,7 @@
$ts = mktime(0, 0, 0, $month, 1, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==1) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 1) {
$dayOfWeek++;
@@ -1600,6 +1603,7 @@
$ts = mktime(0, 0, 0, $month, 1, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==2) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 2) {
$dayOfWeek++;
@@ -1613,6 +1617,7 @@
$ts = mktime(0, 0, 0, $month, 1, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==3) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 3) {
$dayOfWeek++;
@@ -1626,6 +1631,7 @@
$ts = mktime(0, 0, 0, $month, 1, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==4) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 4) {
$dayOfWeek++;
@@ -1639,6 +1645,7 @@
$ts = mktime(0, 0, 0, $month, 1, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==5) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 5) {
$dayOfWeek++;
@@ -1652,6 +1659,7 @@
$ts = mktime(0, 0, 0, $month, 1, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==6) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 6) {
$dayOfWeek++;
@@ -1665,6 +1673,7 @@
$ts = mktime(0, 0, 0, $month, 7, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==0) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 0) {
$dayOfWeek++;
@@ -1678,6 +1687,7 @@
$ts = mktime(0, 0, 0, $month, 7, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==1) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 1) {
$dayOfWeek++;
@@ -1691,6 +1701,7 @@
$ts = mktime(0, 0, 0, $month, 7, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==2) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 2) {
$dayOfWeek++;
@@ -1704,6 +1715,7 @@
$ts = mktime(0, 0, 0, $month, 7, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==3) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 3) {
$dayOfWeek++;
@@ -1717,6 +1729,7 @@
$ts = mktime(0, 0, 0, $month, 7, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==4) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 4) {
$dayOfWeek++;
@@ -1730,6 +1743,7 @@
$ts = mktime(0, 0, 0, $month, 7, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==5) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 5) {
$dayOfWeek++;
@@ -1743,6 +1757,7 @@
$ts = mktime(0, 0, 0, $month, 7, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==6) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 6) {
$dayOfWeek++;
@@ -1756,6 +1771,7 @@
$ts = mktime(0, 0, 0, $month, 14, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==0) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 0) {
$dayOfWeek++;
@@ -1769,6 +1785,7 @@
$ts = mktime(0, 0, 0, $month, 14, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==1) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 1) {
$dayOfWeek++;
@@ -1782,6 +1799,7 @@
$ts = mktime(0, 0, 0, $month, 14, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==2) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 != 2) {
$dayOfWeek++;
@@ -1795,6 +1813,7 @@
$ts = mktime(0, 0, 0, $month, 14, $year);
$dayOfWeek = date('w', $ts);
+ $ts = ((date('w', $ts))==3) ? $ts +(_EXTCAL_TS_DAY *7) : $ts;
$i = 0;
while ($dayOfWeek % 7 ...
[truncated message content] |
|
From: <be...@us...> - 2013-01-02 18:07:45
|
Revision: 10632
http://sourceforge.net/p/xoops/svn/10632
Author: beckmi
Date: 2013-01-02 18:07:42 +0000 (Wed, 02 Jan 2013)
Log Message:
-----------
- fixed: removed list of events when showing first time the Search form (sabahan/mamba)
- fixed: if we disable tooltips , event title will be missing in from the calendar (sabahan/mamba)
- fixed: changed notice text when user/guest submit an event (sabahan/mamba)
- fixed: removed Price info from Print, if empty (sabahan/mamba)
Modified Paths:
--------------
XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt
XoopsModules/extcal/trunk/modules/extcal/event.php
XoopsModules/extcal/trunk/modules/extcal/language/english/admin.php
XoopsModules/extcal/trunk/modules/extcal/language/english/main.php
XoopsModules/extcal/trunk/modules/extcal/post.php
XoopsModules/extcal/trunk/modules/extcal/print.php
XoopsModules/extcal/trunk/modules/extcal/templates/extcal_event.html
XoopsModules/extcal/trunk/modules/extcal/templates/extcal_info_bulle.html
XoopsModules/extcal/trunk/modules/extcal/templates/extcal_view_search.html
XoopsModules/extcal/trunk/modules/extcal/view_calendar-week.php
XoopsModules/extcal/trunk/modules/extcal/view_search.php
XoopsModules/extcal/trunk/modules/extcal/xoops_version.php
Modified: XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt 2013-01-02 17:40:48 UTC (rev 10631)
+++ XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt 2013-01-02 18:07:42 UTC (rev 10632)
@@ -1,3 +1,10 @@
+2013/01/02: Version 2.37 RC4
+===================================
+- fixed: removed list of events when showing first time the Search form (sabahan/mamba)
+- fixed: if we disable tooltips , event title will be missing in from the calendar (sabahan/mamba)
+- fixed: changed notice text when user/guest submit an event (sabahan/mamba)
+- fixed: removed Price info from Print, if empty (sabahan/mamba)
+
2013/01/01: Version 2.37 RC3
===================================
- fixed: bug in setting recurring events for a x-day of the month, when 1st of the month is on the following day of the week.
Modified: XoopsModules/extcal/trunk/modules/extcal/event.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/event.php 2013-01-02 17:40:48 UTC (rev 10631)
+++ XoopsModules/extcal/trunk/modules/extcal/event.php 2013-01-02 18:07:42 UTC (rev 10632)
@@ -1,214 +1,219 @@
-<?php
-
-
-include_once ('../../mainfile.php');
-include_once ('include/constantes.php');
-$params = array('view' => _EXTCAL_NAV_NEW_EVENT, 'file' => _EXTCAL_FILE_NEW_EVENT);
-$GLOBALS['xoopsOption']['template_main'] = 'extcal_event.html';
-include_once ('header.php');
-
-
-
-
-//exit;
-
-include XOOPS_ROOT_PATH . '/include/comment_view.php';
-
-if (!isset($_GET['event'])) {
- $eventId = 0;
-} else {
- $eventId = intval($_GET['event']);
-}
-$eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
-$fileHandler = xoops_getmodulehandler(_EXTCAL_CLS_FILE, _EXTCAL_MODULE);
-$eventMemberHandler = xoops_getmodulehandler(_EXTCAL_CLS_MEMBER, _EXTCAL_MODULE);
-$eventNotMemberHandler = xoops_getmodulehandler(_EXTCAL_CLS_NOT_MEMBER, _EXTCAL_MODULE);
-$permHandler = ExtcalPerm::getHandler();
-include_once XOOPS_ROOT_PATH."/modules/extcal/class/etablissement.php";
-include_once XOOPS_ROOT_PATH."/modules/extcal/include/functions.php";
-
-
-
-
-// Retriving event
-$eventObj = $eventHandler->getEvent($eventId);
-
-if (!$eventObj) {
- redirect_header('index.php', 3, '');
-}
-
-$event = $eventHandler->objectToArray($eventObj, array('cat_id', 'event_submitter'));
-$eventHandler->serverTimeToUserTime($event);
-
- $configHandler =& xoops_gethandler('config');
- $extcalConfig = $configHandler->getConfigList($module->getVar("mid"));
-
-// Adding formated date for start and end event
-$eventHandler->formatEventDate($event, $extcalConfig['event_date_event']);
-
-// Assigning event to the template
-$xoopsTpl->assign('event', $event);
-
-// Title of the page
-$xoopsTpl->assign('xoops_pagetitle', $event['event_title']);
-
-// $lang = array(
-// 'start' => _MD_EXTCAL_START, 'end' => _MD_EXTCAL_END, 'contact_info' => _MD_EXTCAL_CONTACT_INFO, 'email' => _MD_EXTCAL_EMAIL, 'url' => _MD_EXTCAL_URL, 'whos_going' => _MD_EXTCAL_WHOS_GOING, 'whosnot_going' => _MD_EXTCAL_WHOSNOT_GOING, 'reccur_rule' => _MD_EXTCAL_RECCUR_RULE, 'posted_by' => _MD_EXTCAL_POSTED_BY, 'on' => _MD_EXTCAL_ON
-// );
-// // Assigning language data to the template
-// $xoopsTpl->assign('lang', $lang);
-
-// Getting event attachement
-$eventFiles = $fileHandler->objectToArray($fileHandler->getEventFiles($eventId));
-$fileHandler->formatFilesSize($eventFiles);
-$xoopsTpl->assign('event_attachement', $eventFiles);
-
-// Token to disallow direct posting on membre/nonmember page
-$xoopsTpl->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML());
-
-// Etablissement
-$etablissementHandler = xoops_getmodulehandler(_EXTCAL_CLS_ETABLISSEMENT, _EXTCAL_MODULE);
-$etablissementObj = $etablissementHandler->get($event['event_etablissement']);
-//$etablissement = $etablissementHandler->objectToArray($etablissementObj);
-$etablissement = $etablissementObj->vars;
-$xoopsTpl->assign('etablissement', $etablissement);
-
-// $t =print_r($etablissementObj->vars,true);
-// echo "<hr>etablissement {$event['event_etablissement']}<hr><pre>{$t}</pre><hr>";
-
-
-// ### For Who's Going function ###
-
-// If the who's goging function is enabled
-if ($extcalConfig['whos_going']) {
-
- // Retriving member's for this event
- $members = $eventMemberHandler->getMembers($eventId);
-
- // Initializing variable
- $eventmember['member']['show_button'] = false;
-
- $nbUser = 0;
- // Making a list with members and counting regitered user's
- foreach (
- $members as $k
- => $v
- ) {
- $nbUser++;
- $eventmember['member']['userList'][] = array('uid' => $k, 'uname' => $v->getVar('uname'));
- }
- $eventmember['member']['nbUser'] = $nbUser;
-
- // If the user is logged
- if ($xoopsUser) {
-
- // Initializing variable
- $eventmember['member']['show_button'] = true;
- $eventmember['member']['button_disabled'] = '';
-
- // If the user is already restired to this event
- if (array_key_exists($xoopsUser->getVar('uid'), $members)) {
- $eventmember['member']['button_text'] = _MD_EXTCAL_REMOVE_ME;
- $eventmember['member']['joinevent_mode'] = 'remove';
- } else {
- $eventmember['member']['button_text'] = _MD_EXTCAL_ADD_ME;
- $eventmember['member']['joinevent_mode'] = 'add';
-
- // If this event is full
- if ($event['event_nbmember'] != 0
- && $eventMemberHandler->getNbMember($eventId)
- >= $event['event_nbmember']
- ) {
- $eventmember['member']['disabled'] = ' disabled="disabled"';
- }
- }
-
- }
-
-}
-
-// ### For Who's not Going function ###
-
-// If the who's not goging function is enabled
-if ($extcalConfig['whosnot_going']) {
-
- // Retriving not member's for this event
- $notmembers = $eventNotMemberHandler->getMembers($eventId);
-
- // Initializing variable
- $eventmember['notmember']['show_button'] = false;
-
- $nbUser = 0;
- // Making a list with not members
- foreach (
- $notmembers as $k
- => $v
- ) {
- $nbUser++;
- $eventmember['notmember']['userList'][] = array('uid' => $k, 'uname' => $v->getVar('uname'));
- }
- $eventmember['notmember']['nbUser'] = $nbUser;
-
- // If the user is logged
- if ($xoopsUser) {
-
- // Initializing variable
- $eventmember['notmember']['show_button'] = true;
- $eventmember['notmember']['button_disabled'] = '';
-
- // If the user is already restired to this event
- if (array_key_exists($xoopsUser->getVar('uid'), $notmembers)) {
- $eventmember['notmember']['button_text'] = _MD_EXTCAL_REMOVE_ME;
- $eventmember['notmember']['joinevent_mode'] = 'remove';
- } else {
- $eventmember['notmember']['button_text'] = _MD_EXTCAL_ADD_ME;
- $eventmember['notmember']['joinevent_mode'] = 'add';
- }
- }
-
-}
-
-// If who's going or not going function is enabled
-if ($extcalConfig['whos_going'] || $extcalConfig['whosnot_going']) {
- $xoopsTpl->assign('eventmember', $eventmember);
-}
-
-// Checking user perm
-if ($xoopsUser) {
- $xoopsTpl->assign('isAdmin', $xoopsUser->isAdmin());
- $canEdit
- =
- $permHandler->isAllowed($xoopsUser, 'extcal_cat_edit', $event['cat']['cat_id'])
- && $xoopsUser->getVar('uid') == $event['user']['uid'];
- $xoopsTpl->assign('canEdit', $canEdit);
-} else {
- $xoopsTpl->assign('isAdmin', false);
- $xoopsTpl->assign('canEdit', false);
-}
-
-$xoopsTpl->assign('whosGoing', $extcalConfig['whos_going']);
-$xoopsTpl->assign('whosNotGoing', $extcalConfig['whosnot_going']);
-
-
-/* test modofication status JJD
- $k = 'status';
- $isStatus = _EXTCAL_STATUS_DESINSCRIPTION;
- $xfStatus = new XoopsFormSelect('', $k, $isStatus, 1, false) ;
- $tStatus = array(_EXTCAL_STATUS_NONE => _MD_EXTCAL_LIB_NONE,
- _EXTCAL_STATUS_COME => _MD_EXTCAL_LIB_COME,
- _EXTCAL_STATUS_NOTCOME => _MD_EXTCAL_LIB_NOTCOME);
-
-
- $xfStatus->addOptionArray($tStatus);
- $xoopsTpl->assign('status', $xfStatus->render());
-*/
-
-$xoTheme->addScript('browse.php?modules/extcal/js/highslide.js');
-$xoTheme->addStylesheet('browse.php?modules/extcal/js/highslide.css');
-
-
- //function XoopsFormDhtmlTextArea($caption, $name, $value = "", $rows = 5, $cols = 50, $hiddentext = "xoopsHiddenText", $options = array());
-
-
-include(XOOPS_ROOT_PATH . "/footer.php");
-?>
+<?php
+
+
+include_once ('../../mainfile.php');
+include_once ('include/constantes.php');
+$params = array('view' => _EXTCAL_NAV_NEW_EVENT, 'file' => _EXTCAL_FILE_NEW_EVENT);
+$GLOBALS['xoopsOption']['template_main'] = 'extcal_event.html';
+include_once ('header.php');
+
+
+
+
+//exit;
+
+include XOOPS_ROOT_PATH . '/include/comment_view.php';
+
+if (!isset($_GET['event'])) {
+ $eventId = 0;
+} else {
+ $eventId = intval($_GET['event']);
+}
+$eventHandler = xoops_getmodulehandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
+$fileHandler = xoops_getmodulehandler(_EXTCAL_CLS_FILE, _EXTCAL_MODULE);
+$eventMemberHandler = xoops_getmodulehandler(_EXTCAL_CLS_MEMBER, _EXTCAL_MODULE);
+$eventNotMemberHandler = xoops_getmodulehandler(_EXTCAL_CLS_NOT_MEMBER, _EXTCAL_MODULE);
+$permHandler = ExtcalPerm::getHandler();
+include_once XOOPS_ROOT_PATH."/modules/extcal/class/etablissement.php";
+include_once XOOPS_ROOT_PATH."/modules/extcal/include/functions.php";
+
+
+
+
+// Retriving event
+$eventObj = $eventHandler->getEvent($eventId);
+
+if (!$eventObj) {
+ redirect_header('index.php', 3, '');
+}
+
+$event = $eventHandler->objectToArray($eventObj, array('cat_id', 'event_submitter'));
+$eventHandler->serverTimeToUserTime($event);
+
+ $configHandler =& xoops_gethandler('config');
+ $extcalConfig = $configHandler->getConfigList($module->getVar("mid"));
+
+// Adding formated date for start and end event
+$eventHandler->formatEventDate($event, $extcalConfig['event_date_event']);
+
+// Assigning event to the template
+$xoopsTpl->assign('event', $event);
+
+// Title of the page
+$xoopsTpl->assign('xoops_pagetitle', $event['event_title']);
+
+// $lang = array(
+// 'start' => _MD_EXTCAL_START, 'end' => _MD_EXTCAL_END, 'contact_info' => _MD_EXTCAL_CONTACT_INFO, 'email' => _MD_EXTCAL_EMAIL, 'url' => _MD_EXTCAL_URL, 'whos_going' => _MD_EXTCAL_WHOS_GOING, 'whosnot_going' => _MD_EXTCAL_WHOSNOT_GOING, 'reccur_rule' => _MD_EXTCAL_RECCUR_RULE, 'posted_by' => _MD_EXTCAL_POSTED_BY, 'on' => _MD_EXTCAL_ON
+// );
+// // Assigning language data to the template
+// $xoopsTpl->assign('lang', $lang);
+
+// Getting event attachement
+$eventFiles = $fileHandler->objectToArray($fileHandler->getEventFiles($eventId));
+$fileHandler->formatFilesSize($eventFiles);
+$xoopsTpl->assign('event_attachement', $eventFiles);
+
+// Token to disallow direct posting on membre/nonmember page
+$xoopsTpl->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML());
+
+// Etablissement
+$etablissementHandler = xoops_getmodulehandler(_EXTCAL_CLS_ETABLISSEMENT, _EXTCAL_MODULE);
+$etablissementObj = $etablissementHandler->get($event['event_etablissement']);
+//$etablissement = $etablissementHandler->objectToArray($etablissementObj);
+$etablissement = $etablissementObj->vars;
+$xoopsTpl->assign('etablissement', $etablissement);
+
+// $t =print_r($etablissementObj->vars,true);
+// echo "<hr>etablissement {$event['event_etablissement']}<hr><pre>{$t}</pre><hr>";
+
+
+// ### For Who's Going function ###
+
+// If the who's goging function is enabled
+if ($extcalConfig['whos_going']) {
+
+ // Retriving member's for this event
+ $members = $eventMemberHandler->getMembers($eventId);
+
+ // Initializing variable
+ $eventmember['member']['show_button'] = false;
+
+ $nbUser = 0;
+ // Making a list with members and counting regitered user's
+ foreach (
+ $members as $k
+ => $v
+ ) {
+ $nbUser++;
+ $eventmember['member']['userList'][] = array('uid' => $k, 'uname' => $v->getVar('uname'));
+ }
+ $eventmember['member']['nbUser'] = $nbUser;
+
+ // If the user is logged
+ if ($xoopsUser) {
+
+ // Initializing variable
+ $eventmember['member']['show_button'] = true;
+ $eventmember['member']['button_disabled'] = '';
+
+ // If the user is already restired to this event
+ if (array_key_exists($xoopsUser->getVar('uid'), $members)) {
+ $eventmember['member']['button_text'] = _MD_EXTCAL_REMOVE_ME;
+ $eventmember['member']['joinevent_mode'] = 'remove';
+ } else {
+ $eventmember['member']['button_text'] = _MD_EXTCAL_ADD_ME;
+ $eventmember['member']['joinevent_mode'] = 'add';
+
+ // If this event is full
+ if ($event['event_nbmember'] != 0
+ && $eventMemberHandler->getNbMember($eventId)
+ >= $event['event_nbmember']
+ ) {
+ $eventmember['member']['disabled'] = ' disabled="disabled"';
+ }
+ }
+
+ }
+
+}
+
+// ### For Who's not Going function ###
+
+// If the who's not goging function is enabled
+if ($extcalConfig['whosnot_going']) {
+
+ // Retriving not member's for this event
+ $notmembers = $eventNotMemberHandler->getMembers($eventId);
+
+ // Initializing variable
+ $eventmember['notmember']['show_button'] = false;
+
+ $nbUser = 0;
+ // Making a list with not members
+ foreach (
+ $notmembers as $k
+ => $v
+ ) {
+ $nbUser++;
+ $eventmember['notmember']['userList'][] = array('uid' => $k, 'uname' => $v->getVar('uname'));
+ }
+ $eventmember['notmember']['nbUser'] = $nbUser;
+
+ // If the user is logged
+ if ($xoopsUser) {
+
+ // Initializing variable
+ $eventmember['notmember']['show_button'] = true;
+ $eventmember['notmember']['button_disabled'] = '';
+
+ // If the user is already restired to this event
+ if (array_key_exists($xoopsUser->getVar('uid'), $notmembers)) {
+ $eventmember['notmember']['button_text'] = _MD_EXTCAL_REMOVE_ME;
+ $eventmember['notmember']['joinevent_mode'] = 'remove';
+ } else {
+ $eventmember['notmember']['button_text'] = _MD_EXTCAL_ADD_ME;
+ $eventmember['notmember']['joinevent_mode'] = 'add';
+ }
+ }
+
+}
+
+// If who's going or not going function is enabled
+if ($extcalConfig['whos_going'] || $extcalConfig['whosnot_going']) {
+ $xoopsTpl->assign('eventmember', $eventmember);
+}
+
+// Checking user perm
+if ($xoopsUser) {
+ $xoopsTpl->assign('isAdmin', $xoopsUser->isAdmin());
+ $canEdit
+ =
+ $permHandler->isAllowed($xoopsUser, 'extcal_cat_edit', $event['cat']['cat_id'])
+ && $xoopsUser->getVar('uid') == $event['user']['uid'];
+ $xoopsTpl->assign('canEdit', $canEdit);
+} else {
+ $xoopsTpl->assign('isAdmin', false);
+ $xoopsTpl->assign('canEdit', false);
+}
+
+$xoopsTpl->assign('whosGoing', $extcalConfig['whos_going']);
+$xoopsTpl->assign('whosNotGoing', $extcalConfig['whosnot_going']);
+
+//-------------
+$xoopsTpl->assign('params', $params);
+$tNavBar = getNavBarTabs($params['view']);
+$xoopsTpl->assign('tNavBar', $tNavBar);
+//---------------------
+
+/* test modofication status JJD
+ $k = 'status';
+ $isStatus = _EXTCAL_STATUS_DESINSCRIPTION;
+ $xfStatus = new XoopsFormSelect('', $k, $isStatus, 1, false) ;
+ $tStatus = array(_EXTCAL_STATUS_NONE => _MD_EXTCAL_LIB_NONE,
+ _EXTCAL_STATUS_COME => _MD_EXTCAL_LIB_COME,
+ _EXTCAL_STATUS_NOTCOME => _MD_EXTCAL_LIB_NOTCOME);
+
+
+ $xfStatus->addOptionArray($tStatus);
+ $xoopsTpl->assign('status', $xfStatus->render());
+*/
+
+$xoTheme->addScript('browse.php?modules/extcal/js/highslide.js');
+$xoTheme->addStylesheet('browse.php?modules/extcal/js/highslide.css');
+
+
+ //function XoopsFormDhtmlTextArea($caption, $name, $value = "", $rows = 5, $cols = 50, $hiddentext = "xoopsHiddenText", $options = array());
+
+
+include(XOOPS_ROOT_PATH . "/footer.php");
+?>
Modified: XoopsModules/extcal/trunk/modules/extcal/language/english/admin.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/language/english/admin.php 2013-01-02 17:40:48 UTC (rev 10631)
+++ XoopsModules/extcal/trunk/modules/extcal/language/english/admin.php 2013-01-02 18:07:42 UTC (rev 10632)
@@ -122,4 +122,5 @@
//2.37
-define('_AM_EXTCAL_END_DATE','End Date');
\ No newline at end of file
+define('_AM_EXTCAL_END_DATE','End Date');
+define('_AM_EXTCAL_EVENT_CLONED','Event successfully cloned.');
\ No newline at end of file
Modified: XoopsModules/extcal/trunk/modules/extcal/language/english/main.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/language/english/main.php 2013-01-02 17:40:48 UTC (rev 10631)
+++ XoopsModules/extcal/trunk/modules/extcal/language/english/main.php 2013-01-02 18:07:42 UTC (rev 10632)
@@ -94,7 +94,7 @@
define('_MD_EXTCAL_ETABLISSEMENT_TEL_PORTABLE','Mobile Phone');
define('_MD_EXTCAL_ETABLISSEMENT_VILLE','City');
define('_MD_EXTCAL_EVENT',"Event");
-define('_MD_EXTCAL_EVENT_CREATED','Event Created');
+define('_MD_EXTCAL_EVENT_CREATED',"Thank-you for your submission.<br />Your event has been approved and will now appear in our calendar.");
define('_MD_EXTCAL_EVENT_END','Have end ?');
define('_MD_EXTCAL_EVENTS_FOUND',"%1\$s events found");
define('_MD_EXTCAL_EXPRESSION','Expression (list)');
@@ -230,4 +230,6 @@
define('_MD_EXTCAL_SITE',"Website");
define('_MD_EXTCAL_VISIT_SITE',"Visit the Website");
-define('_MD_EXTCAL_EVENT_UPDATED','Event Updated');
\ No newline at end of file
+define('_MD_EXTCAL_EVENT_UPDATED','Event Updated');
+//2.37 RC4
+define('_MD_EXTCAL_EVENT_PENDING',"Thank-you for your submission.<br />You will be notified once your event has be approved by the webmaster.");
\ No newline at end of file
Modified: XoopsModules/extcal/trunk/modules/extcal/post.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/post.php 2013-01-02 17:40:48 UTC (rev 10631)
+++ XoopsModules/extcal/trunk/modules/extcal/post.php 2013-01-02 18:07:42 UTC (rev 10632)
@@ -158,9 +158,15 @@
$notificationHandler->triggerEvent('cat', intval($_POST['cat_id']), 'new_event_cat', array('EVENT_TITLE' => $_POST['event_title'], 'CAT_NAME' => $cat->getVar('cat_name')));
}
+
+
}
+ if ($approve) {
redirect_header(_EXTCAL_FILE_CALMONTH, 3, _MD_EXTCAL_EVENT_CREATED, false);
+} else {
+ redirect_header(_EXTCAL_FILE_CALMONTH, 3, _MD_EXTCAL_EVENT_PENDING, false);
+ }
}
?>
Modified: XoopsModules/extcal/trunk/modules/extcal/print.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/print.php 2013-01-02 17:40:48 UTC (rev 10631)
+++ XoopsModules/extcal/trunk/modules/extcal/print.php 2013-01-02 18:07:42 UTC (rev 10632)
@@ -59,9 +59,12 @@
echo '<tr>' . "\n";
+if ($event['event_desc'] != '') {
echo'<td style="border:1px solid black;">' . $event['event_desc'] . '</td>' . "\n";
-echo'<td style="border:1px solid black;">' . _MD_EXTCAL_ETABLISSEMENT_PRICE . $event['event_price'] . ' '
- . _MD_EXTCAL_DEVISE2 . '</td>' . "\n";
+}
+if ($event['event_price'] != '') {
+echo'<td style="border:1px solid black;">' . _MD_EXTCAL_ETABLISSEMENT_PRICE . $event['event_price'] . ' ' . _MD_EXTCAL_DEVISE2 . '</td>' . "\n";
+}
echo '</tr>' . "\n";
//show contact info
Modified: XoopsModules/extcal/trunk/modules/extcal/templates/extcal_event.html
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/templates/extcal_event.html 2013-01-02 17:40:48 UTC (rev 10631)
+++ XoopsModules/extcal/trunk/modules/extcal/templates/extcal_event.html 2013-01-02 18:07:42 UTC (rev 10632)
@@ -1,5 +1,7 @@
<script src='<{$smarty.const.XOOPS_URL}>/modules/extcal/js/extcal_highslide.js' type="text/javascript"></script>
+<{include file="db:extcal_navbar.html"}>
+
<table class="outer">
<tr>
<th colspan="3" style="font-size:1.2em;">
Modified: XoopsModules/extcal/trunk/modules/extcal/templates/extcal_info_bulle.html
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/templates/extcal_info_bulle.html 2013-01-02 17:40:48 UTC (rev 10631)
+++ XoopsModules/extcal/trunk/modules/extcal/templates/extcal_info_bulle.html 2013-01-02 18:07:42 UTC (rev 10632)
@@ -6,12 +6,11 @@
<a class="tooltip54" href="<{$xoops_url}>/modules/extcal/event.php?event=<{$event.event_id}>">
<{if $showId}>(#<{$event.event_id}>)<{/if}> <{$event.event_title}><br />
<span class="custom info" width350 style="background: #<{$event.cat.cat_light_color}>;">
- <img src="css/images/<{$event.event_icone}>" alt="" iconinfo/>
+ <{if $event.event_icone}><img src="css/images/<{$event.event_icone}>" alt="" iconinfo/><{/if}>
<em><{if $showId}>(#<{$event.event_id}>)<{/if}> <{$event.event_title}></em>
<{if $event.event_picture1!=""}>
<img src="<{$xoops_url}>/uploads/extcal/<{$event.event_picture1}>" alinea/>
<{/if}>
- <{if $showId}>(#<{$event.event_id}>)<{/if}> <{$event.event_title}><br />
<b><{$smarty.const._MD_EXTCAL_START}></b> <{$event.formated_event_start}><br />
<b><{$smarty.const._MD_EXTCAL_END}></b> <{$event.formated_event_end}><br />
@@ -21,8 +20,12 @@
<{else}>
- <div style="height:12px; width:12px; background-color:#<{$event.cat.cat_color}>; border:1px solid black; float:left; margin-right:5px;"
+<a href="<{$xoops_url}>/modules/extcal/event.php?event=<{$event.event_id}>">
+ <{if $showId}>(#<{$event.event_id}>)<{/if}> <{$event.event_title}>
+</a>
+
+ <div style="height:12px; width:12px; background-color:#<{$event.cat.cat_color}>; border:1px solid black; float:left; margin-right:5px;"
+
title='<{if $showId}>(#<{$event.event_id}>)<{/if}> <{$event.formated_event_start}> - <{$event.formated_event_end}> : <{$event.event_title}>'>
</div>
-<{/if}>
-
+<{/if}>
\ No newline at end of file
Modified: XoopsModules/extcal/trunk/modules/extcal/templates/extcal_view_search.html
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/templates/extcal_view_search.html 2013-01-02 17:40:48 UTC (rev 10631)
+++ XoopsModules/extcal/trunk/modules/extcal/templates/extcal_view_search.html 2013-01-02 18:07:42 UTC (rev 10632)
@@ -2,6 +2,7 @@
<{include file="db:extcal_navbar.html"}>
<form action="<{$navigSelectBox.action}>" method="post">
+
<table class="outer" style="border-top: none;">
<tr>
<th align='center' colspan='2'>
@@ -50,7 +51,9 @@
<{$search.orderby1}><{$search.orderby2}><{$search.orderby3}>
</td>
</tr>
-
+
+ <input type="hidden" name="num_tries" value="<{$num_tries}>">
+
<tr class="even">
<td colspan='2' align='center'>
<input type="submit" style='width:150px;' value="<{$smarty.const._MD_EXTCAL_SEARCH}>" name="B1">
@@ -69,12 +72,16 @@
</tr>
</table>
-
</form>
+<{if $num_tries > 0}>
<{include file="db:extcal_event_list1.html"}>
+<{/if}>
+
+
+
<{include file="db:extcal_categorie.html"}>
<div style="text-align:right;"><a
Modified: XoopsModules/extcal/trunk/modules/extcal/view_calendar-week.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/view_calendar-week.php 2013-01-02 17:40:48 UTC (rev 10631)
+++ XoopsModules/extcal/trunk/modules/extcal/view_calendar-week.php 2013-01-02 18:07:42 UTC (rev 10632)
@@ -23,8 +23,8 @@
$month = date('n', $dayTS);
$day = date('j', $dayTS);
-echo $dayTS . ' dayTS-2 <br />';
-echo gmdate("Y-m-d\TH:i:s\Z", $dayTS). ' dayTS-2 <br />';
+//echo $dayTS . ' dayTS-2 <br />';
+//echo gmdate("Y-m-d\TH:i:s\Z", $dayTS). ' dayTS-2 <br />';
$form = new XoopsSimpleForm('', 'navigSelectBox', $params['file'], 'get');
@@ -59,10 +59,10 @@
$startWeek = mktime(0, 0, 0, $month, $day, $year);
$endWeek = $startWeek + _EXTCAL_TS_WEEK - 1;
-echo $startWeek . ' startWeek <br />';
-echo gmdate("Y-m-d\TH:i:s\Z", $startWeek). ' startWeek <br />';
-echo $endWeek . ' endWeek <br />';
-echo gmdate("Y-m-d\TH:i:s\Z", $endWeek). ' endWeek <br />';
+//echo $startWeek . ' startWeek <br />';
+//echo gmdate("Y-m-d\TH:i:s\Z", $startWeek). ' startWeek <br />';
+//echo $endWeek . ' endWeek <br />';
+//echo gmdate("Y-m-d\TH:i:s\Z", $endWeek). ' endWeek <br />';
/*
* Adding all event occuring during this week to an array indexed by day number
Modified: XoopsModules/extcal/trunk/modules/extcal/view_search.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/view_search.php 2013-01-02 17:40:48 UTC (rev 10631)
+++ XoopsModules/extcal/trunk/modules/extcal/view_search.php 2013-01-02 18:07:42 UTC (rev 10632)
@@ -1,188 +1,196 @@
-<?php
-
-include_once ('../../mainfile.php');
-include_once ('include/constantes.php');
-$params = array(
- 'view' => _EXTCAL_NAV_SEARCH,
- 'file' => _EXTCAL_FILE_SEARCH
-);
-$GLOBALS['xoopsOption']['template_main'] = "extcal_view_{$params['view']}.html";
-include_once ('header.php');
-
-/* ========================================================================== */
-/***************************************************************/
-/* ajout des elements de recherche */
-/***************************************************************/
-$searchExp = isset($_POST['searchExp']) ? $_POST['searchExp'] : '';
-$andor = isset($_POST['andor']) ? $_POST['andor'] : '';
-$year = isset($_POST['year']) ? intval($_POST['year']) : date('Y');
-$month = isset($_POST['month']) ? intval($_POST['month']) : date('n');
-$day = isset($_POST['day']) ? intval($_POST['day']) : 0;
-$cat = isset($_POST['cat']) ? intval($_POST['cat']) : 0;
-$orderby1 = isset($_POST['orderby1']) ? $_POST['orderby1'] : 'cat_name ASC';
-$orderby2 = isset($_POST['orderby2']) ? $_POST['orderby2'] : 'event_title ASC';
-$orderby3 = isset($_POST['orderby3']) ? $_POST['orderby3'] : '';
-/* ========================================================================== */
-
-
-//$orderby = isset($_GET['orderby']) ? intval($_GET['orderby']) : 0;
-
-//---------------------------------------------------------------
-$search = array();
-$exp = new XoopsFormText(_MD_EXTCAL_EXPRESSION, 'searchExp', 80, 80, $searchExp);
-$search['searchExp'] = $exp->render();
-$search['andor'] = getListAndOr('andor', '', $andor)->render();
-//$search['year'] = getListYears($year,$xoopsModuleConfig['agenda_nb_years_before'],$xoopsModuleConfig['agenda_nb_years_after'], true)->render();
-$search['year'] = getListYears($year, 2, 5, true)->render();
-$search['month'] = getListMonths($month, true)->render();
-$search['day'] = getListDays($day, true)->render();
-
-//$search['cat'] = implode('', getCheckeCategories());
-$search['cat'] = getListCategories($cat, true, 'cat')->render();
-
-$search['orderby1'] = getListOrderBy('orderby1', '', $orderby1, false)->render();
-$search['orderby2'] = getListOrderBy('orderby2', '', $orderby2, true)->render();
-$search['orderby3'] = getListOrderBy('orderby3', '', $orderby3, true)->render();
-
-
-//echoArray($search,true);
-$xoopsTpl->assign('search', $search);
-/***************************************************************/
-
-
-// $form = new XoopsSimpleForm('', 'navigSelectBox', $params['file'], 'get');
-// // $form->addElement(getListYears($year,$xoopsModuleConfig['agenda_nb_years_before'],$xoopsModuleConfig['agenda_nb_years_after'], true));
-// // $form->addElement(getListMonths($month, rtue));
-// $form->addElement(getListCategories($cat));
-// $form->addElement(getListOrderBy($orderby));
-//
-// $form->addElement(new XoopsFormText(_MD_EXTCAL_SEARCH_EXP, 'searchExp', 80, 80, $searchExp));
-//
-// $form->addElement(new XoopsFormButton("", "", _SEND, "submit"));
-//
-// // Assigning the form to the template
-// $form->assign($xoopsTpl);
-
-// Retriving events
-//echoArray($_GET, false);
-$orderBy = array($orderby1, $orderby2, $orderby3);
-$userId = 0;
-$user = '';
-$events = $eventHandler->getSearchEvent2($year, $month, $day, $cat, $searchExp, $andor, $orderBy, $userId, $user);
-
-$eventHandler->serverTimeToUserTimes($events);
-
-
-// Formating date
-$eventHandler->formatEventsDate($events, $xoopsModuleConfig['event_date_year']);
-
-// Treatment for recurring event
-$startMo...
[truncated message content] |
|
From: <be...@us...> - 2013-01-03 12:34:20
|
Revision: 10642
http://sourceforge.net/p/xoops/svn/10642
Author: beckmi
Date: 2013-01-03 12:34:16 +0000 (Thu, 03 Jan 2013)
Log Message:
-----------
- fixed: removed list of events when showing first time the Search form (sabahan/mamba)
- fixed: extCal didn't correctly count recurring events in Search (mamba)
- fixed: Agenda view reflects now start and end time set in Preferences (jcweb/mamba)
Modified Paths:
--------------
XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt
XoopsModules/extcal/trunk/modules/extcal/include/agenda_fnc.php
XoopsModules/extcal/trunk/modules/extcal/language/english/main.php
XoopsModules/extcal/trunk/modules/extcal/templates/extcal_view_search.html
XoopsModules/extcal/trunk/modules/extcal/view_search.php
Modified: XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt 2013-01-03 12:18:29 UTC (rev 10641)
+++ XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt 2013-01-03 12:34:16 UTC (rev 10642)
@@ -4,7 +4,10 @@
- fixed: if we disable tooltips , event title will be missing in from the calendar (sabahan/mamba)
- fixed: changed notice text when user/guest submit an event (sabahan/mamba)
- fixed: removed Price info from Print, if empty (sabahan/mamba)
+- fixed: extCal didn't correctly count recurring events in Search (mamba)
+- fixed: Agenda view reflects now start and end time set in Preferences (jcweb/mamba)
+
2013/01/01: Version 2.37 RC3
===================================
- fixed: bug in setting recurring events for a x-day of the month, when 1st of the month is on the following day of the week.
Modified: XoopsModules/extcal/trunk/modules/extcal/include/agenda_fnc.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/include/agenda_fnc.php 2013-01-03 12:18:29 UTC (rev 10641)
+++ XoopsModules/extcal/trunk/modules/extcal/include/agenda_fnc.php 2013-01-03 12:34:16 UTC (rev 10642)
@@ -104,7 +104,8 @@
$formatDate = 'd-m-Y',
$formatJour = 'H:i'){
- $tAgenda = agenda_getCanevas($ts, 8, 20, $mPlage, $nbJours);
+// $tAgenda = agenda_getCanevas($ts, 8, 20, $mPlage, $nbJours);
+ $tAgenda = agenda_getCanevas($ts, $hStart, $hEnd-1, $mPlage, $nbJours);
$tk = array_keys($tAgenda);
$tk0 = $tk[0];
$tk1 = $tk[count($tk)-1];
Modified: XoopsModules/extcal/trunk/modules/extcal/language/english/main.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/language/english/main.php 2013-01-03 12:18:29 UTC (rev 10641)
+++ XoopsModules/extcal/trunk/modules/extcal/language/english/main.php 2013-01-03 12:34:16 UTC (rev 10642)
@@ -232,4 +232,4 @@
define('_MD_EXTCAL_EVENT_UPDATED','Event Updated');
//2.37 RC4
-define('_MD_EXTCAL_EVENT_PENDING',"Thank-you for your submission.<br />You will be notified once your event has be approved by the webmaster.");
\ No newline at end of file
+define('_MD_EXTCAL_EVENT_PENDING',"Thank-you for your submission.<br />The event will be visible once it is approved by the webmaster.");
\ No newline at end of file
Modified: XoopsModules/extcal/trunk/modules/extcal/templates/extcal_view_search.html
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/templates/extcal_view_search.html 2013-01-03 12:18:29 UTC (rev 10641)
+++ XoopsModules/extcal/trunk/modules/extcal/templates/extcal_view_search.html 2013-01-03 12:34:16 UTC (rev 10642)
@@ -63,26 +63,24 @@
</td>
</tr>
</table>
-
+ <{if $num_tries > 0}>
<table class="outer" style="border-top: none;">
<tr>
<th align='center'>
- <{$evenements_trouves}>
+ <{$evenements_trouves}>
</th>
</tr>
</table>
-
+ <{/if}>
</form>
<{if $num_tries > 0}>
<{include file="db:extcal_event_list1.html"}>
-<{/if}>
-
-
<{include file="db:extcal_categorie.html"}>
+<{/if}>
<div style="text-align:right;"><a
href="<{$xoops_url}>/modules/extcal/rss.php?cat=<{$selectedCat}>"><img
Modified: XoopsModules/extcal/trunk/modules/extcal/view_search.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/view_search.php 2013-01-03 12:18:29 UTC (rev 10641)
+++ XoopsModules/extcal/trunk/modules/extcal/view_search.php 2013-01-03 12:34:16 UTC (rev 10642)
@@ -116,9 +116,10 @@
$recurEvents = $eventHandler->getRecurEventToDisplay($event, $startMonth, $endMonth);
// Formating date
$eventHandler->formatEventsDate($recurEvents, $xoopsModuleConfig['event_date_week']);
- $eventsArray = array_merge($eventsArray, $recurEvents);
+
}
+$eventsArray = array_merge($eventsArray, $recurEvents);
// Sort event array by event start
//usort($eventsArray, "orderEvents");
|
|
From: <be...@us...> - 2013-01-30 05:43:07
|
Revision: 10951
http://sourceforge.net/p/xoops/svn/10951
Author: beckmi
Date: 2013-01-30 05:43:02 +0000 (Wed, 30 Jan 2013)
Log Message:
-----------
Updating to RC5 (see changelog.txt)
Modified Paths:
--------------
XoopsModules/extcal/trunk/modules/extcal/admin/event.php
XoopsModules/extcal/trunk/modules/extcal/admin/menu.php
XoopsModules/extcal/trunk/modules/extcal/blocks/minical.php
XoopsModules/extcal/trunk/modules/extcal/blocks/upcoming.php
XoopsModules/extcal/trunk/modules/extcal/class/event.php
XoopsModules/extcal/trunk/modules/extcal/class/form/formdatetime.php
XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt
XoopsModules/extcal/trunk/modules/extcal/docs/lang_diff.txt
XoopsModules/extcal/trunk/modules/extcal/include/agenda_fnc.php
XoopsModules/extcal/trunk/modules/extcal/include/constantes.php
XoopsModules/extcal/trunk/modules/extcal/include/functions.php
XoopsModules/extcal/trunk/modules/extcal/language/english/blocks.php
XoopsModules/extcal/trunk/modules/extcal/language/english/modinfo.php
XoopsModules/extcal/trunk/modules/extcal/language/french/blocks.php
XoopsModules/extcal/trunk/modules/extcal/language/french/changelog.txt
XoopsModules/extcal/trunk/modules/extcal/language/french_iso/blocks.php
XoopsModules/extcal/trunk/modules/extcal/language/french_iso/changelog.txt
XoopsModules/extcal/trunk/modules/extcal/language/spanish/blocks.php
XoopsModules/extcal/trunk/modules/extcal/language/spanish/modinfo.php
XoopsModules/extcal/trunk/modules/extcal/templates/extcal_buttons_event.html
XoopsModules/extcal/trunk/modules/extcal/templates/extcal_view_agenda-day.html
XoopsModules/extcal/trunk/modules/extcal/templates/extcal_view_agenda-week.html
XoopsModules/extcal/trunk/modules/extcal/templates/extcal_view_day.html
XoopsModules/extcal/trunk/modules/extcal/templates/extcal_view_search.html
XoopsModules/extcal/trunk/modules/extcal/templates/extcal_view_week.html
XoopsModules/extcal/trunk/modules/extcal/view_day.php
XoopsModules/extcal/trunk/modules/extcal/view_month.php
XoopsModules/extcal/trunk/modules/extcal/view_search.php
XoopsModules/extcal/trunk/modules/extcal/view_week.php
XoopsModules/extcal/trunk/modules/extcal/view_year.php
XoopsModules/extcal/trunk/modules/extcal/xoops_version.php
Added Paths:
-----------
XoopsModules/extcal/trunk/modules/extcal/admin/permissions.php
XoopsModules/extcal/trunk/modules/extcal/blocks/category_events.php
XoopsModules/extcal/trunk/modules/extcal/docs/upgrade.txt
Removed Paths:
-------------
XoopsModules/extcal/trunk/modules/extcal/admin/perm.php
XoopsModules/extcal/trunk/modules/extcal/blocks/catetogy_events.php
XoopsModules/extcal/trunk/modules/extcal/upgrade.txt
Modified: XoopsModules/extcal/trunk/modules/extcal/admin/event.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/admin/event.php 2013-01-30 02:46:51 UTC (rev 10950)
+++ XoopsModules/extcal/trunk/modules/extcal/admin/event.php 2013-01-30 05:43:02 UTC (rev 10951)
@@ -168,8 +168,9 @@
echo '</fieldset><br />';
- xoops_cp_footer();
+ //xoops_cp_footer();
+
break;
@@ -330,6 +331,7 @@
echo '<table class="outer" style="width:100%;">';
echo '<tr style="text-align:center;">';
+ echo '<th>' . _AM_EXTCAL_DELETE. '</th>';
echo '<th>#</th>';
echo '<th>' . _AM_EXTCAL_CATEGORY . '</th>';
echo '<th>' . _AM_EXTCAL_TITLE . '</th>';
@@ -338,7 +340,7 @@
echo '<th>' . _AM_EXTCAL_RECURRENT . '</th>';
echo '<th>' . _AM_EXTCAL_START_RULES . '</th>';
echo '<th>' . _AM_EXTCAL_ACTION . '</th>';
- echo '<th>' . _AM_EXTCAL_DELETE. '</th>';
+
echo '</tr>';
if (count($events) > 0) {
@@ -348,8 +350,12 @@
) {
$class = ($i++ % 2 == 0) ? 'even' : 'odd';
echo '<tr style="text-align:left;" class="' . $class . '">';
- echo '<td>' . $event['event_id'] . '</td>';
- echo '<td>'
+ echo "<td width='10%' align='center'>";
+ echo "<input type='checkbox' name='deleteEvents[{$event['event_id']}]' value='1' >";
+ echo "<input type='hidden' name='deleteAllEvents[{$event['event_id']}]' value='1' />";
+ echo "</td>";
+ echo "<td align = 'center' width='5%'>" . $event['event_id'] . '</td>';
+ echo "<td width='10%'>"
. '<a href=cat.php?op=modify&cat_id='. $event['cat']['cat_id'] . '&form_modify' . '>'
. $event['cat']['cat_name']
. '</a>'
@@ -369,8 +375,8 @@
// }
- echo '<td>' . $event['formated_event_start'] . '</td>';
- echo '<td>' . $event['formated_event_end'] . '</td>';
+ echo "<td align = 'center' width='10%'>" . $event['formated_event_start'] . '</td>';
+ echo "<td align = 'center' width='10%'>" . $event['formated_event_end'] . '</td>';
echo '<td align="center">' . (($event['event_isrecur']==1)?_YES:_NO) . '</td>';
if(!isset($event['formated_reccur_rule'])){
$event['formated_reccur_rule'] = '';
@@ -384,11 +390,7 @@
echo '<a href=event.php?op=clone&event_id='. $event['event_id']. "><img src='". $pathIcon16."/editcopy.png' title='"._AM_EXTCAL_ICONE_CLONE."' /></a>";
echo '</td>';
- echo "<td align='center'>";
- echo "<input type='checkbox' name='deleteEvents[{$event['event_id']}]' value='1' >";
- echo "<input type='hidden' name='deleteAllEvents[{$event['event_id']}]' value='1' />";
- echo "</td>";
-
+
echo '</tr>';
}
//---------------------------------------------------------
Modified: XoopsModules/extcal/trunk/modules/extcal/admin/menu.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/admin/menu.php 2013-01-30 02:46:51 UTC (rev 10950)
+++ XoopsModules/extcal/trunk/modules/extcal/admin/menu.php 2013-01-30 05:43:02 UTC (rev 10951)
@@ -1,55 +1,55 @@
-<?php
-
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
-
-$path = dirname(dirname(dirname(dirname(__FILE__))));
-include_once $path . '/mainfile.php';
-
-$dirname = basename(dirname(dirname(__FILE__)));
-$module_handler = xoops_gethandler('module');
-$module = $module_handler->getByDirname($dirname);
-$pathIcon32 = $module->getInfo('icons32');
-$pathModuleAdmin = $module->getInfo('dirmoduleadmin');
-$pathLanguage = $path . $pathModuleAdmin;
-
-
-if (!file_exists($fileinc = $pathLanguage . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) {
- $fileinc = $pathLanguage . '/language/english/main.php';
-}
-
-include_once $fileinc;
-
-$adminmenu = array();
-
-$i = 1;
-$adminmenu[$i]['title'] = _MI_EXTCAL_INDEX;
-$adminmenu[$i]['link'] = "admin/index.php";
-$adminmenu[$i]["icon"] = $pathIcon32.'/home.png';
-$i++;
-$adminmenu[$i]['title'] = _MI_EXTCAL_CATEGORY;
-$adminmenu[$i]['link'] = "admin/cat.php";
-$adminmenu[$i]["icon"] = $pathIcon32.'/category.png';
-$i++;
-$adminmenu[$i]['title'] = _MI_EXTCAL_EVENT;
-$adminmenu[$i]['link'] = "admin/event.php";
-$adminmenu[$i]["icon"] = $pathIcon32.'/event.png';
-$i++;
-$adminmenu[$i]['title'] = _MI_EXTCAL_ETABLISSEMENTS;
-$adminmenu[$i]['link'] = "admin/etablissement.php";
-//$adminmenu[$i]["icon"] = '../../'.$pathImageAdmin.'/etablissement.png';
-$adminmenu[$i]["icon"] = 'images/icons/32/etablissement.png';
-//echo $adminmenu[$i]["icon"]."<br>";
-
-$i++;
-$adminmenu[$i]['title'] = _MI_EXTCAL_PERMISSIONS;
-$adminmenu[$i]['link'] = "admin/perm.php";
-$adminmenu[$i]["icon"] = $pathIcon32.'/permissions.png';
-//$i++;
-//$adminmenu[$i]['title'] = _MI_EXTCAL_PRUNING;
-//$adminmenu[$i]['link'] = "admin/prune.php";
-//$adminmenu[$i]["icon"] = "images/admin/about.png";
-$i++;
-$adminmenu[$i]["title"] = _MI_EXTCAL_ABOUT;
-$adminmenu[$i]["link"] = "admin/about.php";
-$adminmenu[$i]["icon"] = $pathIcon32.'/about.png';
-?>
+<?php
+
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+
+$path = dirname(dirname(dirname(dirname(__FILE__))));
+include_once $path . '/mainfile.php';
+
+$dirname = basename(dirname(dirname(__FILE__)));
+$module_handler = xoops_gethandler('module');
+$module = $module_handler->getByDirname($dirname);
+$pathIcon32 = $module->getInfo('icons32');
+$pathModuleAdmin = $module->getInfo('dirmoduleadmin');
+$pathLanguage = $path . $pathModuleAdmin;
+
+
+if (!file_exists($fileinc = $pathLanguage . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) {
+ $fileinc = $pathLanguage . '/language/english/main.php';
+}
+
+include_once $fileinc;
+
+$adminmenu = array();
+
+$i = 1;
+$adminmenu[$i]['title'] = _MI_EXTCAL_INDEX;
+$adminmenu[$i]['link'] = "admin/index.php";
+$adminmenu[$i]["icon"] = $pathIcon32.'/home.png';
+$i++;
+$adminmenu[$i]['title'] = _MI_EXTCAL_CATEGORY;
+$adminmenu[$i]['link'] = "admin/cat.php";
+$adminmenu[$i]["icon"] = $pathIcon32.'/category.png';
+$i++;
+$adminmenu[$i]['title'] = _MI_EXTCAL_EVENT;
+$adminmenu[$i]['link'] = "admin/event.php";
+$adminmenu[$i]["icon"] = $pathIcon32.'/event.png';
+$i++;
+$adminmenu[$i]['title'] = _MI_EXTCAL_ETABLISSEMENTS;
+$adminmenu[$i]['link'] = "admin/etablissement.php";
+//$adminmenu[$i]["icon"] = '../../'.$pathImageAdmin.'/etablissement.png';
+$adminmenu[$i]["icon"] = 'images/icons/32/etablissement.png';
+//echo $adminmenu[$i]["icon"]."<br>";
+
+$i++;
+$adminmenu[$i]['title'] = _MI_EXTCAL_PERMISSIONS;
+$adminmenu[$i]['link'] = "admin/permissions.php";
+$adminmenu[$i]["icon"] = $pathIcon32.'/permissions.png';
+//$i++;
+//$adminmenu[$i]['title'] = _MI_EXTCAL_PRUNING;
+//$adminmenu[$i]['link'] = "admin/prune.php";
+//$adminmenu[$i]["icon"] = "images/admin/about.png";
+$i++;
+$adminmenu[$i]["title"] = _MI_EXTCAL_ABOUT;
+$adminmenu[$i]["link"] = "admin/about.php";
+$adminmenu[$i]["icon"] = $pathIcon32.'/about.png';
+?>
Deleted: XoopsModules/extcal/trunk/modules/extcal/admin/perm.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/admin/perm.php 2013-01-30 02:46:51 UTC (rev 10950)
+++ XoopsModules/extcal/trunk/modules/extcal/admin/perm.php 2013-01-30 05:43:02 UTC (rev 10951)
@@ -1,291 +0,0 @@
-<?php
-
-include '../../../include/cp_header.php';
-include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
-include 'admin_header.php';
-
-if (isset($_POST['step'])) {
- $step = $_POST['step'];
-} else {
- $step = 'default';
-}
-
-$moduleId = $xoopsModule->getVar('mid');
-
-switch ($step) {
-
- case 'enreg':
-
- $groupPermissionHandler = xoops_gethandler('groupperm');
-
- // Delete old public mask
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('gperm_name', 'extcal_perm_mask'));
- $criteria->add(new Criteria('gperm_modid', $moduleId));
- $groupPermissionHandler->deleteAll($criteria);
-
- foreach (
- $_POST['perms']['extcal_perm_mask']['group'] as $groupId
- => $perms
- ) {
- foreach (
- array_keys($perms) as $perm
- ) {
- $groupPermissionHandler->addRight('extcal_perm_mask', $perm, $groupId, $moduleId);
- }
- }
-
- redirect_header("perm.php", 3, _AM_EXTCAL_PERM_MASK_UPDATED);
-
- break;
-
- case 'default':
- default:
-
- xoops_cp_header();
- // @author Gregory Mage (Aka Mage)
- //***************************************************************************************
- $permAdmin = new ModuleAdmin();
- echo $permAdmin->addNavigation('perm.php');
- //***************************************************************************************
-
- $memberHandler =& xoops_gethandler('member');
- $groupPermissionHandler =& xoops_gethandler('groupperm');
-
- // Retriving the group list
- $glist =& $memberHandler->getGroupList();
-
- // Retriving Public category permission mask
- $viewGroup = $groupPermissionHandler->getGroupIds('extcal_perm_mask', 1, $moduleId);
- $submitGroup = $groupPermissionHandler->getGroupIds('extcal_perm_mask', 2, $moduleId);
- $autoApproveGroup = $groupPermissionHandler->getGroupIds('extcal_perm_mask', 4, $moduleId);
- $editGroup = $groupPermissionHandler->getGroupIds('extcal_perm_mask', 8, $moduleId);
-
- function getChecked($array, $v)
- {
- if (in_array($v, $array)) {
- return ' checked="checked"';
- } else {
- return '';
- }
- }
-
- echo '<script type="text/javascript" src="../include/admin.js"></script>';
-
- /**
- * Public category permission mask
- */
- echo
- '<fieldset id="defaultBookmark"><legend><a href="#defaultBookmark" style="font-weight:bold; color:#990000;" onClick="toggle(\'default\'); toggleIcon(\'defaultIcon\');"><img id="defaultIcon" src="../images/icons/minus.gif" /> '
- . _AM_EXTCAL_PUBLIC_PERM_MASK
- . '</a></legend><div id="default">';
- echo'<fieldset><legend style="font-weight:bold; color:#0A3760;">'
- . _AM_EXTCAL_INFORMATION . '</legend>';
- echo _AM_EXTCAL_PUBLIC_PERM_MASK_INFO;
- echo '</fieldset><br />';
- echo '<table class="outer" style="width:100%;">';
- echo '<form method="post" action="perm.php">';
- echo '<tr>';
- echo'<th colspan="8" style="text-align:center;">'
- . _AM_EXTCAL_PUBLIC_PERM_MASK . '</th>';
- echo '</tr>';
- echo '<tr>';
- echo'<td class="head" style="text-align:center;">'
- . _AM_EXTCAL_GROUP_NAME . '</td>';
- echo'<td class="head" style="text-align:center;">' . _AM_EXTCAL_CAN_VIEW
- . '</td>';
- echo'<td class="head" style="text-align:center;">'
- . _AM_EXTCAL_CAN_SUBMIT . '</td>';
- echo'<td class="head" style="text-align:center;">'
- . _AM_EXTCAL_AUTO_APPROVE . '</td>';
- echo'<td class="head" style="text-align:center;">' . _AM_EXTCAL_CAN_EDIT
- . '</td>';
- echo '</tr>';
- $i = 0;
- foreach (
- $glist as $k
- => $v
- ) {
- $style = ($i++ % 2 == 0) ? "odd" : "even";
- echo '<tr>';
- echo '<td class="' . $style . '">' . $v . '</td>';
- echo'<td class="' . $style
- . '" style="text-align:center;"><input name="perms[extcal_perm_mask][group]['
- . $k . '][1]" type="checkbox"' . getChecked($viewGroup, $k)
- . ' /></td>';
- echo'<td class="' . $style
- . '" style="text-align:center;"><input name="perms[extcal_perm_mask][group]['
- . $k . '][2]" type="checkbox"' . getChecked($submitGroup, $k)
- . ' /></td>';
- echo'<td class="' . $style
- . '" style="text-align:center;"><input name="perms[extcal_perm_mask][group]['
- . $k . '][4]" type="checkbox"'
- . getChecked($autoApproveGroup, $k) . ' /></td>';
- echo'<td class="' . $style
- . '" style="text-align:center;"><input name="perms[extcal_perm_mask][group]['
- . $k . '][8]" type="checkbox"' . getChecked($editGroup, $k)
- . ' /></td>';
- echo '</tr>';
- }
- echo '<input type="hidden" name="type" value="public" />';
- echo '<input type="hidden" name="step" value="enreg" />';
- echo
- '<tr><td colspan="8" style="text-align:center;" class="head"><input type="submit" value="'
- . _SUBMIT . '" /></td></tr></form>';
- echo '</table><br />';
-
- echo '</div></fieldset><br />';
-
- // Retriving category list for Group perm form
- $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
- $cats = $catHandler->getAllCat($xoopsUser, 'all');
-
- /**
- * Access Form
- */
- $titleOfForm = _AM_EXTCAL_VIEW_PERMISSION;
- $permName = 'extcal_cat_view';
- $permDesc = _AM_EXTCAL_VIEW_PERMISSION_DESC;
- $form = new XoopsGroupPermForm($titleOfForm, $moduleId, $permName, $permDesc, 'admin/perm.php');
- foreach (
- $cats as $cat
- ) {
- $form->addItem($cat->getVar('cat_id'), $cat->getVar('cat_name'));
- }
-
- echo'<fieldset id="' . $permName . 'Bookmark"><legend><a href="#'
- . $permName
- . 'Bookmark" style="font-weight:bold; color:#990000;" onClick="toggle(\''
- . $permName . '\'); toggleIcon(\'' . $permName
- . 'Icon\');"><img id="' . $permName
- . 'Icon" src="../images/icons/minus.gif" /> ' . $titleOfForm
- . '</a></legend><div id="' . $permName . '">';
- echo'<fieldset><legend style="font-weight:bold; color:#0A3760;">'
- . _AM_EXTCAL_INFORMATION . '</legend>';
- echo $permDesc;
- echo '</fieldset>';
-
- if ($catHandler->getCount()) {
- echo $form->render() . '<br />';
- } else {
- redirect_header("cat.php", 2, _AM_EXTCAL_NOPERMSSET, false);
- }
-
- echo '</div></fieldset><br />';
-
-
- /**
- * Submit form
- */
- $titleOfForm = _AM_EXTCAL_SUBMIT_PERMISSION;
- $permName = 'extcal_cat_submit';
- $permDesc = _AM_EXTCAL_SUBMIT_PERMISSION_DESC;
- $form = new XoopsGroupPermForm($titleOfForm, $moduleId, $permName, $permDesc, 'admin/perm.php');
- foreach (
- $cats as $cat
- ) {
- $form->addItem($cat->getVar('cat_id'), $cat->getVar('cat_name'));
- }
-
- echo'<fieldset id="' . $permName . 'Bookmark"><legend><a href="#'
- . $permName
- . 'Bookmark" style="font-weight:bold; color:#990000;" onClick="toggle(\''
- . $permName . '\'); toggleIcon(\'' . $permName
- . 'Icon\');"><img id="' . $permName
- . 'Icon" src="../images/icons/minus.gif" /> ' . $titleOfForm
- . '</a></legend><div id="' . $permName . '">';
- echo'<fieldset><legend style="font-weight:bold; color:#0A3760;">'
- . _AM_EXTCAL_INFORMATION . '</legend>';
- echo $permDesc;
- echo '</fieldset>';
- if ($catHandler->getCount()) {
- echo $form->render() . '<br />';
- } else {
- redirect_header("cat.php", 2, _AM_EXTCAL_NOPERMSSET, false);
- }
-
- echo '</div></fieldset><br />';
-
-
- /**
- * Auto Approve form
- */
- $titleOfForm = _AM_EXTCAL_AUTOAPPROVE_PERMISSION;
- $permName = 'extcal_cat_autoapprove';
- $permDesc = _AM_EXTCAL_AUTOAPPROVE_PERMISSION_DESC;
- $form = new XoopsGroupPermForm($titleOfForm, $moduleId, $permName, $permDesc, 'admin/perm.php');
- foreach (
- $cats as $cat
- ) {
- $form->addItem($cat->getVar('cat_id'), $cat->getVar('cat_name'));
- }
-
- echo'<fieldset id="' . $permName . 'Bookmark"><legend><a href="#'
- . $permName
- . 'Bookmark" style="font-weight:bold; color:#990000;" onClick="toggle(\''
- . $permName . '\'); toggleIcon(\'' . $permName
- . 'Icon\');"><img id="' . $permName
- . 'Icon" src="../images/icons/minus.gif" /> ' . $titleOfForm
- . '</a></legend><div id="' . $permName . '">';
- echo'<fieldset><legend style="font-weight:bold; color:#0A3760;">'
- . _AM_EXTCAL_INFORMATION . '</legend>';
- echo $permDesc;
- echo '</fieldset>';
- if ($catHandler->getCount()) {
- echo $form->render() . '<br />';
- } else {
- redirect_header("cat.php", 2, _AM_EXTCAL_NOPERMSSET, false);
- }
-
- echo '</div></fieldset><br />';
-
- /**
- * Can edit form
- */
- $titleOfForm = _AM_EXTCAL_EDIT_PERMISSION;
- $permName = 'extcal_cat_edit';
- $permDesc = _AM_EXTCAL_EDIT_PERMISSION_DESC;
- $form = new XoopsGroupPermForm($titleOfForm, $moduleId, $permName, $permDesc, 'admin/perm.php');
- foreach (
- $cats as $cat
- ) {
- $form->addItem($cat->getVar('cat_id'), $cat->getVar('cat_name'));
- }
-
- echo'<fieldset id="' . $permName . 'Bookmark"><legend><a href="#'
- . $permName
- . 'Bookmark" style="font-weight:bold; color:#990000;" onClick="toggle(\''
- . $permName . '\'); toggleIcon(\'' . $permName
- . 'Icon\');"><img id="' . $permName
- . 'Icon" src="../images/icons/minus.gif" /> ' . $titleOfForm
- . '</a></legend><div id="' . $permName . '">';
- echo'<fieldset><legend style="font-weight:bold; color:#0A3760;">'
- . _AM_EXTCAL_INFORMATION . '</legend>';
- echo $permDesc;
- echo '</fieldset>';
- if ($catHandler->getCount()) {
- echo $form->render() . '<br />';
- } else {
- redirect_header("cat.php", 2, _AM_EXTCAL_NOPERMSSET, false);
- }
-
- echo '</div></fieldset><br />';
-
-
- /**
- * Script to auto colapse form at page load
- */
- echo '<script type="text/javascript">';
- echo 'toggle(\'extcal_cat_view\'); toggleIcon (\'extcal_cat_viewIcon\');';
- echo 'toggle(\'extcal_cat_submit\'); toggleIcon (\'extcal_cat_submitIcon\');';
- echo 'toggle(\'extcal_cat_autoapprove\'); toggleIcon (\'extcal_cat_autoapproveIcon\');';
- echo 'toggle(\'extcal_cat_edit\'); toggleIcon (\'extcal_cat_editIcon\');';
- echo '</script>';
-
- include 'admin_footer.php';
-
-
- break;
-
-}
-?>
Added: XoopsModules/extcal/trunk/modules/extcal/admin/permissions.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/admin/permissions.php (rev 0)
+++ XoopsModules/extcal/trunk/modules/extcal/admin/permissions.php 2013-01-30 05:43:02 UTC (rev 10951)
@@ -0,0 +1,291 @@
+<?php
+
+include '../../../include/cp_header.php';
+include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
+include 'admin_header.php';
+
+if (isset($_POST['step'])) {
+ $step = $_POST['step'];
+} else {
+ $step = 'default';
+}
+
+$moduleId = $xoopsModule->getVar('mid');
+
+switch ($step) {
+
+ case 'enreg':
+
+ $groupPermissionHandler = xoops_gethandler('groupperm');
+
+ // Delete old public mask
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('gperm_name', 'extcal_perm_mask'));
+ $criteria->add(new Criteria('gperm_modid', $moduleId));
+ $groupPermissionHandler->deleteAll($criteria);
+
+ foreach (
+ $_POST['perms']['extcal_perm_mask']['group'] as $groupId
+ => $perms
+ ) {
+ foreach (
+ array_keys($perms) as $perm
+ ) {
+ $groupPermissionHandler->addRight('extcal_perm_mask', $perm, $groupId, $moduleId);
+ }
+ }
+
+ redirect_header("permissions.php", 3, _AM_EXTCAL_PERM_MASK_UPDATED);
+
+ break;
+
+ case 'default':
+ default:
+
+ xoops_cp_header();
+ // @author Gregory Mage (Aka Mage)
+ //***************************************************************************************
+ $permAdmin = new ModuleAdmin();
+ echo $permAdmin->addNavigation('permissions.php');
+ //***************************************************************************************
+
+ $memberHandler =& xoops_gethandler('member');
+ $groupPermissionHandler =& xoops_gethandler('groupperm');
+
+ // Retriving the group list
+ $glist =& $memberHandler->getGroupList();
+
+ // Retriving Public category permission mask
+ $viewGroup = $groupPermissionHandler->getGroupIds('extcal_perm_mask', 1, $moduleId);
+ $submitGroup = $groupPermissionHandler->getGroupIds('extcal_perm_mask', 2, $moduleId);
+ $autoApproveGroup = $groupPermissionHandler->getGroupIds('extcal_perm_mask', 4, $moduleId);
+ $editGroup = $groupPermissionHandler->getGroupIds('extcal_perm_mask', 8, $moduleId);
+
+ function getChecked($array, $v)
+ {
+ if (in_array($v, $array)) {
+ return ' checked="checked"';
+ } else {
+ return '';
+ }
+ }
+
+ echo '<script type="text/javascript" src="../include/admin.js"></script>';
+
+ /**
+ * Public category permission mask
+ */
+ echo
+ '<fieldset id="defaultBookmark"><legend><a href="#defaultBookmark" style="font-weight:bold; color:#990000;" onClick="toggle(\'default\'); toggleIcon(\'defaultIcon\');"><img id="defaultIcon" src="../images/icons/minus.gif" /> '
+ . _AM_EXTCAL_PUBLIC_PERM_MASK
+ . '</a></legend><div id="default">';
+ echo'<fieldset><legend style="font-weight:bold; color:#0A3760;">'
+ . _AM_EXTCAL_INFORMATION . '</legend>';
+ echo _AM_EXTCAL_PUBLIC_PERM_MASK_INFO;
+ echo '</fieldset><br />';
+ echo '<table class="outer" style="width:100%;">';
+ echo '<form method="post" action="permissions.php">';
+ echo '<tr>';
+ echo'<th colspan="8" style="text-align:center;">'
+ . _AM_EXTCAL_PUBLIC_PERM_MASK . '</th>';
+ echo '</tr>';
+ echo '<tr>';
+ echo'<td class="head" style="text-align:center;">'
+ . _AM_EXTCAL_GROUP_NAME . '</td>';
+ echo'<td class="head" style="text-align:center;">' . _AM_EXTCAL_CAN_VIEW
+ . '</td>';
+ echo'<td class="head" style="text-align:center;">'
+ . _AM_EXTCAL_CAN_SUBMIT . '</td>';
+ echo'<td class="head" style="text-align:center;">'
+ . _AM_EXTCAL_AUTO_APPROVE . '</td>';
+ echo'<td class="head" style="text-align:center;">' . _AM_EXTCAL_CAN_EDIT
+ . '</td>';
+ echo '</tr>';
+ $i = 0;
+ foreach (
+ $glist as $k
+ => $v
+ ) {
+ $style = ($i++ % 2 == 0) ? "odd" : "even";
+ echo '<tr>';
+ echo '<td class="' . $style . '">' . $v . '</td>';
+ echo'<td class="' . $style
+ . '" style="text-align:center;"><input name="perms[extcal_perm_mask][group]['
+ . $k . '][1]" type="checkbox"' . getChecked($viewGroup, $k)
+ . ' /></td>';
+ echo'<td class="' . $style
+ . '" style="text-align:center;"><input name="perms[extcal_perm_mask][group]['
+ . $k . '][2]" type="checkbox"' . getChecked($submitGroup, $k)
+ . ' /></td>';
+ echo'<td class="' . $style
+ . '" style="text-align:center;"><input name="perms[extcal_perm_mask][group]['
+ . $k . '][4]" type="checkbox"'
+ . getChecked($autoApproveGroup, $k) . ' /></td>';
+ echo'<td class="' . $style
+ . '" style="text-align:center;"><input name="perms[extcal_perm_mask][group]['
+ . $k . '][8]" type="checkbox"' . getChecked($editGroup, $k)
+ . ' /></td>';
+ echo '</tr>';
+ }
+ echo '<input type="hidden" name="type" value="public" />';
+ echo '<input type="hidden" name="step" value="enreg" />';
+ echo
+ '<tr><td colspan="8" style="text-align:center;" class="head"><input type="submit" value="'
+ . _SUBMIT . '" /></td></tr></form>';
+ echo '</table><br />';
+
+ echo '</div></fieldset><br />';
+
+ // Retriving category list for Group perm form
+ $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
+ $cats = $catHandler->getAllCat($xoopsUser, 'all');
+
+ /**
+ * Access Form
+ */
+ $titleOfForm = _AM_EXTCAL_VIEW_PERMISSION;
+ $permName = 'extcal_cat_view';
+ $permDesc = _AM_EXTCAL_VIEW_PERMISSION_DESC;
+ $form = new XoopsGroupPermForm($titleOfForm, $moduleId, $permName, $permDesc, 'admin/permissions.php');
+ foreach (
+ $cats as $cat
+ ) {
+ $form->addItem($cat->getVar('cat_id'), $cat->getVar('cat_name'));
+ }
+
+ echo'<fieldset id="' . $permName . 'Bookmark"><legend><a href="#'
+ . $permName
+ . 'Bookmark" style="font-weight:bold; color:#990000;" onClick="toggle(\''
+ . $permName . '\'); toggleIcon(\'' . $permName
+ . 'Icon\');"><img id="' . $permName
+ . 'Icon" src="../images/icons/minus.gif" /> ' . $titleOfForm
+ . '</a></legend><div id="' . $permName . '">';
+ echo'<fieldset><legend style="font-weight:bold; color:#0A3760;">'
+ . _AM_EXTCAL_INFORMATION . '</legend>';
+ echo $permDesc;
+ echo '</fieldset>';
+
+ if ($catHandler->getCount()) {
+ echo $form->render() . '<br />';
+ } else {
+ redirect_header("cat.php", 2, _AM_EXTCAL_NOPERMSSET, false);
+ }
+
+ echo '</div></fieldset><br />';
+
+
+ /**
+ * Submit form
+ */
+ $titleOfForm = _AM_EXTCAL_SUBMIT_PERMISSION;
+ $permName = 'extcal_cat_submit';
+ $permDesc = _AM_EXTCAL_SUBMIT_PERMISSION_DESC;
+ $form = new XoopsGroupPermForm($titleOfForm, $moduleId, $permName, $permDesc, 'admin/permissions.php');
+ foreach (
+ $cats as $cat
+ ) {
+ $form->addItem($cat->ge...
[truncated message content] |
|
From: <be...@us...> - 2013-01-30 15:27:31
|
Revision: 10957
http://sourceforge.net/p/xoops/svn/10957
Author: beckmi
Date: 2013-01-30 15:27:17 +0000 (Wed, 30 Jan 2013)
Log Message:
-----------
Fixing missing phone column (Sabahan/Mamba)
Modified Paths:
--------------
XoopsModules/extcal/trunk/modules/extcal/admin/etablissement.php
XoopsModules/extcal/trunk/modules/extcal/language/english/admin.php
XoopsModules/extcal/trunk/modules/extcal/language/french/admin.php
XoopsModules/extcal/trunk/modules/extcal/language/french_iso/admin.php
XoopsModules/extcal/trunk/modules/extcal/language/spanish/admin.php
Modified: XoopsModules/extcal/trunk/modules/extcal/admin/etablissement.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/admin/etablissement.php 2013-01-30 13:59:50 UTC (rev 10956)
+++ XoopsModules/extcal/trunk/modules/extcal/admin/etablissement.php 2013-01-30 15:27:17 UTC (rev 10957)
@@ -1,251 +1,254 @@
-<?php
-/**
- * ****************************************************************************
- * - TDMAds By TDM - TEAM DEV MODULE FOR XOOPS
- * - Licence PRO Copyright (c) (http://www.tdmxoops.net)
- *
- * Cette licence, contient des limitations!!!
- *
- * 1. Vous devez posséder une permission d'exécuter le logiciel, pour n'importe quel usage.
- * 2. Vous ne devez pas l' étudier,
- * 3. Vous ne devez pas le redistribuer ni en faire des copies,
- * 4. Vous n'avez pas la liberté de l'améliorer et de rendre publiques les modifications
- *
- * @license TDMFR PRO license
- * @author TDMFR ; TEAM DEV MODULE
- *
- * ****************************************************************************
- */
-
-// Include xoops admin header
-include_once '../../../include/cp_header.php';
-include_once XOOPS_ROOT_PATH.'/modules/extcal/class/ExtcalPersistableObjectHandler.php';
-include_once(XOOPS_ROOT_PATH."/kernel/module.php");
-include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php";
-include_once XOOPS_ROOT_PATH."/class/tree.php";
-include_once XOOPS_ROOT_PATH."/class/xoopslists.php";
-include_once XOOPS_ROOT_PATH."/modules/extcal/class/etablissement.php";
-include_once XOOPS_ROOT_PATH."/modules/extcal/include/constantes.php";
-include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
-include_once XOOPS_ROOT_PATH.'/class/xoopsform/grouppermform.php';
-include_once(XOOPS_ROOT_PATH."/class/uploader.php");
-include 'admin_header.php';
-
-//include_once("functions.php");
-//include_once("../include/functions.php");
-
-if ( $xoopsUser ) {
- $xoopsModule = XoopsModule::getByDirname("extcal");
- if ( !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
- redirect_header(XOOPS_URL."/",3,_NOPERM);
- exit();
- }
-} else {
- redirect_header(XOOPS_URL."/",3,_NOPERM);
- exit();
-}
-
-// Include language file
-xoops_loadLanguage('admin', 'system');
-xoops_loadLanguage('admin', $xoopsModule->getVar('dirname', 'e'));
-xoops_loadLanguage('modinfo', $xoopsModule->getVar('dirname', 'e'));
-$myts =& MyTextSanitizer::getInstance();
-
-//appel des class
-$etablissementHandler = xoops_getmodulehandler(_EXTCAL_CLS_ETABLISSEMENT, _EXTCAL_MODULE);
-
-xoops_cp_header();
-
-if (isset($_REQUEST['op'])) {
- $op = $_REQUEST['op'];
-} else {
- $op = 'liste';
-}
-
-//appel du menu admin
-// if ( !is_readable(XOOPS_ROOT_PATH . "/Frameworks/art/functions.admin.php")) {
- // adminmenu(4, _MI_EXTCAL_ETABLISSEMENT);
-// } else {
- // include_once XOOPS_ROOT_PATH.'/Frameworks/art/functions.admin.php';
- // loadModuleAdminMenu (4, _MI_EXTCAL_ETABLISSEMENT);
-// }
-
-//Les valeurs de op qui vont permettre d'aller dans les differentes parties de la page
-switch ($op)
-{
- // Vue liste
- case "liste":
-
- // @author JJDAI
- //***************************************************************************************
- $etablissementAdmin = new ModuleAdmin();
- echo $etablissementAdmin->addNavigation('etablissement.php');
- //***************************************************************************************
-
- $criteria = new CriteriaCompo();
- if (isset($_REQUEST['limit'])) {
- $criteria->setLimit($_REQUEST['limit']);
- $limit = $_REQUEST['limit'];
- } else {
- $criteria->setLimit(10);
- $limit = 10;
- }
- if (isset($_REQUEST['start'])) {
- $criteria->setStart($_REQUEST['start']);
- $start = $_REQUEST['start'];
- } else {
- $criteria->setStart(0);
- $start = 0;
- }
- $criteria->setSort('nom');
- $criteria->setOrder('ASC');
- $etablissement_arr = $etablissementHandler->getObjects($criteria);
- $numrows = $etablissementHandler->getCount($criteria);
- if ( $numrows > $limit ) {
- $pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=liste&limit=' . $limit);
- $pagenav = $pagenav->renderNav(4);
- } else {
- $pagenav = '';
- }
- //Affichage du tableau des téléchargements brisés
- if ($numrows > 0) {
- echo '<table width="100%" cellspacing="1" class="outer">';
- echo '<tr>';
- echo '<th align="center">' . _AM_EXTCAL_ETABLISSEMENT_FORM_NOM . '</th>';
- echo '<th align="center" width="20%">' . _AM_EXTCAL_ETABLISSEMENT_FORM_ADRESSE . '</th>';
- echo '<th align="center" width="15%">'._AM_EXTCAL_ETABLISSEMENT_FORM_TELEPHONE.'</th>';
- echo '<th align="center" width="15%">'._AM_EXTCAL_ETABLISSEMENT_FORM_ACTION.'</th>';
- echo '</tr>';
- $class = 'odd';
- foreach (array_keys($etablissement_arr) as $i)
- {
- $class = ($class == 'even') ? 'odd' : 'even';
- $etablissement_id = $etablissement_arr[$i]->getVar('id');
- $etablissement_nom = $etablissement_arr[$i]->getVar('nom');
- $etablissement_adresse = $etablissement_arr[$i]->getVar('adresse');
- $etablissement_telephone = $etablissement_arr[$i]->getVar('telephone');
- echo '<tr class="'.$class.'">';
- echo '<td align="left">'
- . '<a href="etablissement.php?op=edit_etablissement&etablissement_id=' . $etablissement_id . '">'
- . $etablissement_nom
- . '</a>'
- . '</td>';
-
- 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='. $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 />';
- echo '<br /><div align=right>' . $pagenav . '</div><br />';
- }else{
- echo '<div class="errorMsg" style="text-align: center;">' . _AM_EXTCAL_ERREUR_NO_ETABLISSEMENT . '</div>';
- }
-
- // Affichage du formulaire
- $obj =& $etablissementHandler->create();
- $form = $obj->getForm(false);
- break;
-
- // permet de suprimmer le rapport de téléchargment brisé
- case "delete_etablissement":
- $obj =& $etablissementHandler->get($_REQUEST['etablissement_id']);
- if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) {
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header('etablissement.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
- }
- if ($etablissementHandler->delete($obj)) {
- redirect_header('etablissement.php', 1, _AM_EXTCAL_REDIRECT_DELOK);
- }
- } else {
- xoops_confirm(array('ok' => 1, 'etablissement_id' => $_REQUEST['etablissement_id'], 'op' => 'delete_etablissement'), $_SERVER['REQUEST_URI'], _AM_EXTCAL_ETABLISSEMENT_SURDEL . '<br>');
- }
- break;
-
-
- case "edit_etablissement":
- // @author JJDAI
- //***************************************************************************************
- $etablissementAdmin = new ModuleAdmin();
- echo $etablissementAdmin->addNavigation('etablissement.php');
- //***************************************************************************************
- //Affichage du formulaire de création des téléchargements
- $obj = $etablissementHandler->get($_REQUEST['etablissement_id']);
- $form = $obj->getForm (false);
- break;
-
- case "save_etablissement":
- if ( !$GLOBALS["xoopsSecurity"]->check() ) {
- redirect_header("etablissement.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
- }
- if (isset($_REQUEST["etablissement_id"])) {
- $obj =& $etablissementHandler->get($_REQUEST["etablissement_id"]);
- } else {
- $obj =& $etablissementHandler->create();
- }
-
- $obj->setVar("nom", $_REQUEST["nom"]);
- $obj->setVar("description", $_REQUEST["description"]);
- $obj->setVar("categorie", $_REQUEST["categorie"]);
- $obj->setVar("adresse", $_REQUEST["adresse"]);
- $obj->setVar("adresse2", $_REQUEST["adresse2"]);
- $obj->setVar("cp", $_REQUEST["cp"]);
- $obj->setVar("ville", $_REQUEST["ville"]);
- $obj->setVar("tel_fixe", $_REQUEST["tel_fixe"]);
- $obj->setVar("tel_portable", $_REQUEST["tel_portable"]);
- $obj->setVar("mail", $_REQUEST["mail"]);
- $obj->setVar("site", $_REQUEST["site"]);
- $obj->setVar("horaires", $_REQUEST["horaires"]);
- $obj->setVar("divers", $_REQUEST["divers"]);
- $obj->setVar("tarifs", $_REQUEST["tarifs"]);
- $obj->setVar("map", $_REQUEST["map"]);
-
- //Logo
- $uploaddir_etablissement = XOOPS_ROOT_PATH . '/uploads/extcal/etablissement/';
- $uploadurl_etablissement = XOOPS_URL . '/uploads/extcal/etablissement/';
-
- $delimg = @$_REQUEST['delimg'];
- $delimg = isset($delimg) ? intval($delimg) : 0;
- if (!empty($_REQUEST['xoops_upload_file'][0]) && $delimg == 0)
- {
- $upload = new XoopsMediaUploader($uploaddir_etablissement, array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png'), 3145728, null, null);
- if ($upload->fetchMedia($_REQUEST['xoops_upload_file'][0]))
- {
- $upload->setPrefix('etablissement_') ;
- $upload->fetchMedia($_REQUEST['xoops_upload_file'][0]);
- if (!$upload->upload()) {
- $errors = $upload->getErrors();
- redirect_header("javascript:history.go(-1)",3, $errors);
- } else {
- $logo = $upload->getSavedFileName();
- }
- } else if (!empty($_REQUEST['file'])) {
- $logo = $_REQUEST['file'];
- }
- } else {
- $logo = '';
- $url_etablissement = XOOPS_ROOT_PATH . "/uploads/extcal/etablissement/". $_REQUEST['file'];
- if (is_file($url_etablissement)){
- chmod($url_etablissement, 0777);
- unlink($url_etablissement);
- }
- }
- $obj->setVar("logo", $logo);
-
-
- if ($etablissementHandler->insert($obj)) {
- }
-
- //include_once("../include/forms.php");
- echo $obj->getHtmlErrors();
- $form =& $obj->getForm(false, 0);
-//echo "<hr>exit <<<<<<<<<<<<<<<<<<<<";exit;
- redirect_header("etablissement.php", 2, _AM_EXTCAL_FORMOK);
-
- break;
-}
-
-include 'admin_footer.php';
+<?php
+/**
+ * ****************************************************************************
+ * - TDMAds By TDM - TEAM DEV MODULE FOR XOOPS
+ * - Licence PRO Copyright (c) (http://www.tdmxoops.net)
+ *
+ * Cette licence, contient des limitations!!!
+ *
+ * 1. Vous devez posséder une permission d'exécuter le logiciel, pour n'importe quel usage.
+ * 2. Vous ne devez pas l' étudier,
+ * 3. Vous ne devez pas le redistribuer ni en faire des copies,
+ * 4. Vous n'avez pas la liberté de l'améliorer et de rendre publiques les modifications
+ *
+ * @license TDMFR PRO license
+ * @author TDMFR ; TEAM DEV MODULE
+ *
+ * ****************************************************************************
+ */
+
+// Include xoops admin header
+include_once '../../../include/cp_header.php';
+include_once XOOPS_ROOT_PATH.'/modules/extcal/class/ExtcalPersistableObjectHandler.php';
+include_once(XOOPS_ROOT_PATH."/kernel/module.php");
+include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php";
+include_once XOOPS_ROOT_PATH."/class/tree.php";
+include_once XOOPS_ROOT_PATH."/class/xoopslists.php";
+include_once XOOPS_ROOT_PATH."/modules/extcal/class/etablissement.php";
+include_once XOOPS_ROOT_PATH."/modules/extcal/include/constantes.php";
+include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopsform/grouppermform.php';
+include_once(XOOPS_ROOT_PATH."/class/uploader.php");
+include 'admin_header.php';
+
+//include_once("functions.php");
+//include_once("../include/functions.php");
+
+if ( $xoopsUser ) {
+ $xoopsModule = XoopsModule::getByDirname("extcal");
+ if ( !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
+ redirect_header(XOOPS_URL."/",3,_NOPERM);
+ exit();
+ }
+} else {
+ redirect_header(XOOPS_URL."/",3,_NOPERM);
+ exit();
+}
+
+// Include language file
+xoops_loadLanguage('admin', 'system');
+xoops_loadLanguage('admin', $xoopsModule->getVar('dirname', 'e'));
+xoops_loadLanguage('modinfo', $xoopsModule->getVar('dirname', 'e'));
+$myts =& MyTextSanitizer::getInstance();
+
+//appel des class
+$etablissementHandler = xoops_getmodulehandler(_EXTCAL_CLS_ETABLISSEMENT, _EXTCAL_MODULE);
+
+xoops_cp_header();
+
+if (isset($_REQUEST['op'])) {
+ $op = $_REQUEST['op'];
+} else {
+ $op = 'liste';
+}
+
+//appel du menu admin
+// if ( !is_readable(XOOPS_ROOT_PATH . "/Frameworks/art/functions.admin.php")) {
+ // adminmenu(4, _MI_EXTCAL_ETABLISSEMENT);
+// } else {
+ // include_once XOOPS_ROOT_PATH.'/Frameworks/art/functions.admin.php';
+ // loadModuleAdminMenu (4, _MI_EXTCAL_ETABLISSEMENT);
+// }
+
+//Les valeurs de op qui vont permettre d'aller dans les differentes parties de la page
+switch ($op)
+{
+ // Vue liste
+ case "liste":
+
+ // @author JJDAI
+ //***************************************************************************************
+ $etablissementAdmin = new ModuleAdmin();
+ echo $etablissementAdmin->addNavigation('etablissement.php');
+ //***************************************************************************************
+
+ $criteria = new CriteriaCompo();
+ if (isset($_REQUEST['limit'])) {
+ $criteria->setLimit($_REQUEST['limit']);
+ $limit = $_REQUEST['limit'];
+ } else {
+ $criteria->setLimit(10);
+ $limit = 10;
+ }
+ if (isset($_REQUEST['start'])) {
+ $criteria->setStart($_REQUEST['start']);
+ $start = $_REQUEST['start'];
+ } else {
+ $criteria->setStart(0);
+ $start = 0;
+ }
+ $criteria->setSort('nom');
+ $criteria->setOrder('ASC');
+ $etablissement_arr = $etablissementHandler->getObjects($criteria);
+ $numrows = $etablissementHandler->getCount($criteria);
+ if ( $numrows > $limit ) {
+ $pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=liste&limit=' . $limit);
+ $pagenav = $pagenav->renderNav(4);
+ } else {
+ $pagenav = '';
+ }
+ //Affichage du tableau des téléchargements brisés
+ if ($numrows > 0) {
+ echo '<table width="100%" cellspacing="1" class="outer">';
+ echo '<tr>';
+ echo '<th align="center">' . _AM_EXTCAL_ETABLISSEMENT_FORM_NOM . '</th>';
+ echo '<th align="center" width="20%">' . _AM_EXTCAL_ETABLISSEMENT_FORM_ADRESSE . '</th>';
+ echo '<th align="center" width="20%">' . _AM_EXTCAL_ETABLISSEMENT_FORM_CITY . '</th>';
+ echo '<th align="center" width="15%">'._AM_EXTCAL_ETABLISSEMENT_FORM_TELEPHONE.'</th>';
+ echo '<th align="center" width="15%">'._AM_EXTCAL_ETABLISSEMENT_FORM_ACTION.'</th>';
+ echo '</tr>';
+ $class = 'odd';
+ foreach (array_keys($etablissement_arr) as $i)
+ {
+ $class = ($class == 'even') ? 'odd' : 'even';
+ $etablissement_id = $etablissement_arr[$i]->getVar('id');
+ $etablissement_nom = $etablissement_arr[$i]->getVar('nom');
+ $etablissement_adresse = $etablissement_arr[$i]->getVar('adresse');
+ $etablissement_city = $etablissement_arr[$i]->getVar('ville');
+ $etablissement_telephone = $etablissement_arr[$i]->getVar('tel_fixe');
+ echo '<tr class="'.$class.'">';
+ echo '<td align="left">'
+ . '<a href="etablissement.php?op=edit_etablissement&etablissement_id=' . $etablissement_id . '">'
+ . $etablissement_nom
+ . '</a>'
+ . '</td>';
+
+ echo '<td align="center"><b>' . $etablissement_adresse . '</td>';
+ echo '<td align="center"><b>' . $etablissement_city . '</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='. $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 />';
+ echo '<br /><div align=right>' . $pagenav . '</div><br />';
+ }else{
+ echo '<div class="errorMsg" style="text-align: center;">' . _AM_EXTCAL_ERREUR_NO_ETABLISSEMENT . '</div>';
+ }
+
+ // Affichage du formulaire
+ $obj =& $etablissementHandler->create();
+ $form = $obj->getForm(false);
+ break;
+
+ // permet de suprimmer le rapport de téléchargment brisé
+ case "delete_etablissement":
+ $obj =& $etablissementHandler->get($_REQUEST['etablissement_id']);
+ if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header('etablissement.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+ if ($etablissementHandler->delete($obj)) {
+ redirect_header('etablissement.php', 1, _AM_EXTCAL_REDIRECT_DELOK);
+ }
+ } else {
+ xoops_confirm(array('ok' => 1, 'etablissement_id' => $_REQUEST['etablissement_id'], 'op' => 'delete_etablissement'), $_SERVER['REQUEST_URI'], _AM_EXTCAL_ETABLISSEMENT_SURDEL . '<br>');
+ }
+ break;
+
+
+ case "edit_etablissement":
+ // @author JJDAI
+ //***************************************************************************************
+ $etablissementAdmin = new ModuleAdmin();
+ echo $etablissementAdmin->addNavigation('etablissement.php');
+ //***************************************************************************************
+ //Affichage du formulaire de création des téléchargements
+ $obj = $etablissementHandler->get($_REQUEST['etablissement_id']);
+ $form = $obj->getForm (false);
+ break;
+
+ case "save_etablissement":
+ if ( !$GLOBALS["xoopsSecurity"]->check() ) {
+ redirect_header("etablissement.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
+ }
+ if (isset($_REQUEST["etablissement_id"])) {
+ $obj =& $etablissementHandler->get($_REQUEST["etablissement_id"]);
+ } else {
+ $obj =& $etablissementHandler->create();
+ }
+
+ $obj->setVar("nom", $_REQUEST["nom"]);
+ $obj->setVar("description", $_REQUEST["description"]);
+ $obj->setVar("categorie", $_REQUEST["categorie"]);
+ $obj->setVar("adresse", $_REQUEST["adresse"]);
+ $obj->setVar("adresse2", $_REQUEST["adresse2"]);
+ $obj->setVar("cp", $_REQUEST["cp"]);
+ $obj->setVar("ville", $_REQUEST["ville"]);
+ $obj->setVar("tel_fixe", $_REQUEST["tel_fixe"]);
+ $obj->setVar("tel_portable", $_REQUEST["tel_portable"]);
+ $obj->setVar("mail", $_REQUEST["mail"]);
+ $obj->setVar("site", $_REQUEST["site"]);
+ $obj->setVar("horaires", $_REQUEST["horaires"]);
+ $obj->setVar("divers", $_REQUEST["divers"]);
+ $obj->setVar("tarifs", $_REQUEST["tarifs"]);
+ $obj->setVar("map", $_REQUEST["map"]);
+
+ //Logo
+ $uploaddir_etablissement = XOOPS_ROOT_PATH . '/uploads/extcal/etablissement/';
+ $uploadurl_etablissement = XOOPS_URL . '/uploads/extcal/etablissement/';
+
+ $delimg = @$_REQUEST['delimg'];
+ $delimg = isset($delimg) ? intval($delimg) : 0;
+ if (!empty($_REQUEST['xoops_upload_file'][0]) && $delimg == 0)
+ {
+ $upload = new XoopsMediaUploader($uploaddir_etablissement, array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png'), 3145728, null, null);
+ if ($upload->fetchMedia($_REQUEST['xoops_upload_file'][0]))
+ {
+ $upload->setPrefix('etablissement_') ;
+ $upload->fetchMedia($_REQUEST['xoops_upload_file'][0]);
+ if (!$upload->upload()) {
+ $errors = $upload->getErrors();
+ redirect_header("javascript:history.go(-1)",3, $errors);
+ } else {
+ $logo = $upload->getSavedFileName();
+ }
+ } else if (!empty($_REQUEST['file'])) {
+ $logo = $_REQUEST['file'];
+ }
+ } else {
+ $logo = '';
+ $url_etablissement = XOOPS_ROOT_PATH . "/uploads/extcal/etablissement/". $_REQUEST['file'];
+ if (is_file($url_etablissement)){
+ chmod($url_etablissement, 0777);
+ unlink($url_etablissement);
+ }
+ }
+ $obj->setVar("logo", $logo);
+
+
+ if ($etablissementHandler->insert($obj)) {
+ }
+
+ //include_once("../include/forms.php");
+ echo $obj->getHtmlErrors();
+ $form =& $obj->getForm(false, 0);
+//echo "<hr>exit <<<<<<<<<<<<<<<<<<<<";exit;
+ redirect_header("etablissement.php", 2, _AM_EXTCAL_FORMOK);
+
+ break;
+}
+
+include 'admin_footer.php';
?>
\ No newline at end of file
Modified: XoopsModules/extcal/trunk/modules/extcal/language/english/admin.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/language/english/admin.php 2013-01-30 13:59:50 UTC (rev 10956)
+++ XoopsModules/extcal/trunk/modules/extcal/language/english/admin.php 2013-01-30 15:27:17 UTC (rev 10957)
@@ -123,4 +123,5 @@
//2.37
define('_AM_EXTCAL_END_DATE','End Date');
-define('_AM_EXTCAL_EVENT_CLONED','Event successfully cloned.');
\ No newline at end of file
+define('_AM_EXTCAL_EVENT_CLONED','Event successfully cloned.');
+define('_AM_EXTCAL_ETABLISSEMENT_FORM_CITY','City');
\ No newline at end of file
Modified: XoopsModules/extcal/trunk/modules/extcal/language/french/admin.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/language/french/admin.php 2013-01-30 13:59:50 UTC (rev 10956)
+++ XoopsModules/extcal/trunk/modules/extcal/language/french/admin.php 2013-01-30 15:27:17 UTC (rev 10957)
@@ -118,4 +118,5 @@
define('_AM_EXTCAL_REDIRECT_DELOK','Supprimé avec succes');
define('_AM_EXTCAL_ICONE','Icône');
//ModuleAdmin
-define('_AM_EXTCAL_MODULEADMIN_MISSING','Error: The ModuleAdmin class is missing. Please install the ModuleAdmin Class into /Frameworks (see /docs/readme.txt)');
\ No newline at end of file
+define('_AM_EXTCAL_MODULEADMIN_MISSING','Error: The ModuleAdmin class is missing. Please install the ModuleAdmin Class into /Frameworks (see /docs/readme.txt)');
+define('_AM_EXTCAL_ETABLISSEMENT_FORM_CITY','Ville');
\ No newline at end of file
Modified: XoopsModules/extcal/trunk/modules/extcal/language/french_iso/admin.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/language/french_iso/admin.php 2013-01-30 13:59:50 UTC (rev 10956)
+++ XoopsModules/extcal/trunk/modules/extcal/language/french_iso/admin.php 2013-01-30 15:27:17 UTC (rev 10957)
@@ -119,4 +119,5 @@
//ModuleAdmin
-define('_AM_EXTCAL_MODULEADMIN_MISSING','Error: The ModuleAdmin class is missing. Please install the ModuleAdmin Class into /Frameworks (see /docs/readme.txt)');
\ No newline at end of file
+define('_AM_EXTCAL_MODULEADMIN_MISSING','Error: The ModuleAdmin class is missing. Please install the ModuleAdmin Class into /Frameworks (see /docs/readme.txt)');
+define('_AM_EXTCAL_ETABLISSEMENT_FORM_CITY','Ville');
\ No newline at end of file
Modified: XoopsModules/extcal/trunk/modules/extcal/language/spanish/admin.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/language/spanish/admin.php 2013-01-30 13:59:50 UTC (rev 10956)
+++ XoopsModules/extcal/trunk/modules/extcal/language/spanish/admin.php 2013-01-30 15:27:17 UTC (rev 10957)
@@ -119,4 +119,5 @@
define('_AM_EXTCAL_ICONE','Icone');
//ModuleAdmin
-define('_AM_EXTCAL_MODULEADMIN_MISSING','Error: The ModuleAdmin class is missing. Please install the ModuleAdmin Class into /Frameworks (see /docs/readme.txt)');
\ No newline at end of file
+define('_AM_EXTCAL_MODULEADMIN_MISSING','Error: The ModuleAdmin class is missing. Please install the ModuleAdmin Class into /Frameworks (see /docs/readme.txt)');
+define('_AM_EXTCAL_ETABLISSEMENT_FORM_CITY','Ciudad');
\ No newline at end of file
|
|
From: <ce...@us...> - 2013-04-20 18:15:51
|
Revision: 11414
http://sourceforge.net/p/xoops/svn/11414
Author: cesag
Date: 2013-04-20 18:15:43 +0000 (Sat, 20 Apr 2013)
Log Message:
-----------
eXtCal : fixing missing argument 6 for agenda_getCanevas() (cesag), language files corrections and updating to RC6
Modified Paths:
--------------
XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt
XoopsModules/extcal/trunk/modules/extcal/docs/credits.txt
XoopsModules/extcal/trunk/modules/extcal/include/agenda_fnc.php
XoopsModules/extcal/trunk/modules/extcal/language/english/admin.php
XoopsModules/extcal/trunk/modules/extcal/language/english/blocks.php
XoopsModules/extcal/trunk/modules/extcal/language/english/main.php
XoopsModules/extcal/trunk/modules/extcal/language/english/modinfo.php
XoopsModules/extcal/trunk/modules/extcal/language/french/admin.php
XoopsModules/extcal/trunk/modules/extcal/language/french/blocks.php
XoopsModules/extcal/trunk/modules/extcal/language/french/help/extcal_help.html
XoopsModules/extcal/trunk/modules/extcal/language/french/help/help.html
XoopsModules/extcal/trunk/modules/extcal/language/french/main.php
XoopsModules/extcal/trunk/modules/extcal/language/french/modinfo.php
XoopsModules/extcal/trunk/modules/extcal/language/spanish/admin.php
XoopsModules/extcal/trunk/modules/extcal/language/spanish/blocks.php
XoopsModules/extcal/trunk/modules/extcal/language/spanish/help/extcal_help.html
XoopsModules/extcal/trunk/modules/extcal/language/spanish/help/help.html
XoopsModules/extcal/trunk/modules/extcal/language/spanish/main.php
XoopsModules/extcal/trunk/modules/extcal/language/spanish/modinfo.php
XoopsModules/extcal/trunk/modules/extcal/xoops_version.php
Added Paths:
-----------
XoopsModules/extcal/trunk/modules/extcal/language/english/mail_template/index.html
XoopsModules/extcal/trunk/modules/extcal/language/french/mail_template/index.html
Removed Paths:
-------------
XoopsModules/extcal/trunk/modules/extcal/language/french_iso/
Modified: XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt 2013-04-20 09:35:37 UTC (rev 11413)
+++ XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt 2013-04-20 18:15:43 UTC (rev 11414)
@@ -1,3 +1,9 @@
+2013/04/20: Version 2.37 RC6
+===================================
+- modification of the English language files for Transifex (cesag)
+- fixed: missing argument 6 for agenda_getCanevas() (cesag)
+- fixed: missing phone column (Sabahan/Mamba)
+
2013/01/29: Version 2.37 RC5
===================================
- fixed: missing edit/delete icons for Admin in year/month/week/day view (mamba)
@@ -437,5 +443,4 @@
- Little display improvement
- Fix an error on pruning page
- Add property to event to set a maximum member limit per event
-- Change the month template to display all event's infos
-
+- Change the month template to display all event's infos
\ No newline at end of file
Modified: XoopsModules/extcal/trunk/modules/extcal/docs/credits.txt
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/docs/credits.txt 2013-04-20 09:35:37 UTC (rev 11413)
+++ XoopsModules/extcal/trunk/modules/extcal/docs/credits.txt 2013-04-20 18:15:43 UTC (rev 11414)
@@ -6,4 +6,4 @@
Contributors:
-Testing: Cesag, hugo1207
+Testing: Cesag, hugo1207, jcweb, sabahan, playsome
Modified: XoopsModules/extcal/trunk/modules/extcal/include/agenda_fnc.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/include/agenda_fnc.php 2013-04-20 09:35:37 UTC (rev 11413)
+++ XoopsModules/extcal/trunk/modules/extcal/include/agenda_fnc.php 2013-04-20 18:15:43 UTC (rev 11414)
@@ -112,7 +112,7 @@
$formatJour = 'H:i'){
// $tAgenda = agenda_getCanevas($ts, 8, 20, $mPlage, $nbJours);
- $tAgenda = agenda_getCanevas($ts, $hStart, $hEnd-1, $mPlage, $nbJours);
+ $tAgenda = agenda_getCanevas($ts, $hStart, $hEnd-1, $mPlage, $nbJours, $formatDate, $formatJour);
$tk = array_keys($tAgenda);
$tk0 = $tk[0];
$tk1 = $tk[count($tk)-1];
Modified: XoopsModules/extcal/trunk/modules/extcal/language/english/admin.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/language/english/admin.php 2013-04-20 09:35:37 UTC (rev 11413)
+++ XoopsModules/extcal/trunk/modules/extcal/language/english/admin.php 2013-04-20 18:15:43 UTC (rev 11414)
@@ -10,69 +10,69 @@
define('_AM_EXTCAL_MANAGER_CATS',"Category manager");
define('_AM_EXTCAL_CLONE_OF',"Clone the event #");
define('_AM_EXTCAL_EDIT_EVENT',"Edit even");
-define('_AM_EXTCAL_ABOUT_AUTHOR','Author: ');
-define('_AM_EXTCAL_ABOUT_AUTHOR_INFO','Author Info');
-define('_AM_EXTCAL_ABOUT_AUTHOR_NAME','Author name: ');
-define('_AM_EXTCAL_ABOUT_CHANGELOG','Change Log');
-define('_AM_EXTCAL_ABOUT_CREDITS','Credits: ');
-define('_AM_EXTCAL_ABOUT_DESCRIPTION','Description: ');
-define('_AM_EXTCAL_ABOUT_LICENSE','License: ');
-define('_AM_EXTCAL_ABOUT_MODULE_INFO','Module Info');
-define('_AM_EXTCAL_ABOUT_MODULE_STATUS','Status: ');
-define('_AM_EXTCAL_ABOUT_RELEASEDATE','Released: ');
-define('_AM_EXTCAL_ABOUT_UPDATEDATE','Updated: ');
-define('_AM_EXTCAL_ABOUT_WEBSITE','Website: ');
-define('_AM_EXTCAL_ACTION','Action');
-define('_AM_EXTCAL_ADD_CATEGORY','Add category');
-define('_AM_EXTCAL_ADMINISTRATION','Administration');
-define('_AM_EXTCAL_APPROVED','Approved');
-define('_AM_EXTCAL_APPROVED_EVENT','Approve event');
-define('_AM_EXTCAL_AUTO_APPROVE','Auto-approve submitted event');
-define('_AM_EXTCAL_AUTOAPPROVE_PERMISSION','Auto-approve permission');
-define('_AM_EXTCAL_AUTOAPPROVE_PERMISSION_DESC','Select categories that each group needn\'t approve for submitted event');
-define('_AM_EXTCAL_CAN_EDIT','Can edit');
-define('_AM_EXTCAL_CAN_SUBMIT','Can submit');
-define('_AM_EXTCAL_CAN_VIEW','Can view');
-define('_AM_EXTCAL_CAT_CREATED','Category created');
-define('_AM_EXTCAL_CAT_DELETED','Category successfully deleted.');
-define('_AM_EXTCAL_CAT_EDITED','Category edited');
-define('_AM_EXTCAL_CATEGORY','Category');
-define('_AM_EXTCAL_CHECK_UPDATE_ERROR','Can\'t retrieve the last version of eXtCal.');
-define('_AM_EXTCAL_COLOR','Color');
-define('_AM_EXTCAL_CONFIG_CHECK','Configurations');
+define('_AM_EXTCAL_ABOUT_AUTHOR',"Author: ");
+define('_AM_EXTCAL_ABOUT_AUTHOR_INFO',"Author Info");
+define('_AM_EXTCAL_ABOUT_AUTHOR_NAME',"Author name: ");
+define('_AM_EXTCAL_ABOUT_CHANGELOG',"Change Log");
+define('_AM_EXTCAL_ABOUT_CREDITS',"Credits: ");
+define('_AM_EXTCAL_ABOUT_DESCRIPTION',"Description: ");
+define('_AM_EXTCAL_ABOUT_LICENSE',"License: ");
+define('_AM_EXTCAL_ABOUT_MODULE_INFO',"Module Info");
+define('_AM_EXTCAL_ABOUT_MODULE_STATUS',"Status: ");
+define('_AM_EXTCAL_ABOUT_RELEASEDATE',"Released: ");
+define('_AM_EXTCAL_ABOUT_UPDATEDATE',"Updated: ");
+define('_AM_EXTCAL_ABOUT_WEBSITE',"Website: ");
+define('_AM_EXTCAL_ACTION',"Action");
+define('_AM_EXTCAL_ADD_CATEGORY',"Add category");
+define('_AM_EXTCAL_ADMINISTRATION',"Administration");
+define('_AM_EXTCAL_APPROVED',"Approved");
+define('_AM_EXTCAL_APPROVED_EVENT',"Approve event");
+define('_AM_EXTCAL_AUTO_APPROVE',"Auto-approve submitted event");
+define('_AM_EXTCAL_AUTOAPPROVE_PERMISSION',"Auto-approve permission");
+define('_AM_EXTCAL_AUTOAPPROVE_PERMISSION_DESC',"Select categories that each group needn\'t approve for submitted event");
+define('_AM_EXTCAL_CAN_EDIT',"Can edit");
+define('_AM_EXTCAL_CAN_SUBMIT',"Can submit");
+define('_AM_EXTCAL_CAN_VIEW',"Can view");
+define('_AM_EXTCAL_CAT_CREATED',"Category created");
+define('_AM_EXTCAL_CAT_DELETED',"Category successfully deleted.");
+define('_AM_EXTCAL_CAT_EDITED',"Category edited");
+define('_AM_EXTCAL_CATEGORY',"Category");
+define('_AM_EXTCAL_CHECK_UPDATE_ERROR',"Can\'t retrieve the last version of eXtCal.");
+define('_AM_EXTCAL_COLOR',"Color");
+define('_AM_EXTCAL_CONFIG_CHECK',"Configurations");
define('_AM_EXTCAL_CONFIG_PHP',"You must have at least %s as a php version (your current version is %s)");
define('_AM_EXTCAL_CONFIG_XOOPS',"You must have at least the version %s (your current version is %s)");
define('_AM_EXTCAL_CONFIRM_DELETE_ALL',"Delete all");
-define('_AM_EXTCAL_CONFIRM_DELETE_CAT','Confirm to delete category');
-define('_AM_EXTCAL_CONFIRM_DELETE_EVENT','Confirm to delete event.');
+define('_AM_EXTCAL_CONFIRM_DELETE_CAT',"Confirm to delete category");
+define('_AM_EXTCAL_CONFIRM_DELETE_EVENT',"Confirm to delete event.");
define('_AM_EXTCAL_CONFIRM_DELETE_SELECTION',"Delete seleted");
define('_AM_EXTCAL_DELETE',"Select to Delete");
define('_AM_EXTCAL_DELETE_ALL',"Delete All");
define('_AM_EXTCAL_DELETE_SELECTION',"Delete selected");
-define('_AM_EXTCAL_DESCRIPTION','Description');
-define('_AM_EXTCAL_DOWN_DONE','Downloading done. Click here to install files');
-define('_AM_EXTCAL_EDIT_CATEGORY','Edit category');
-define('_AM_EXTCAL_EDIT_OR_DELETE_CATEGORY','Edit or Delete category');
-define('_AM_EXTCAL_EDIT_PERMISSION','Edit permission');
-define('_AM_EXTCAL_EDIT_PERMISSION_DESC','Select categories where each group is allowed to edit there own event');
-define('_AM_EXTCAL_ERREUR_NO_ETABLISSEMENT','There is no location in the database');
-define('_AM_EXTCAL_ETABLISSEMENT','Venue');
-define('_AM_EXTCAL_ETABLISSEMENT_FORM_ACTION','Action');
-define('_AM_EXTCAL_ETABLISSEMENT_FORM_ADRESSE','Address');
-define('_AM_EXTCAL_ETABLISSEMENT_FORM_DELETE','Delete Location');
-define('_AM_EXTCAL_ETABLISSEMENT_FORM_EDIT','Edit settings');
-define('_AM_EXTCAL_ETABLISSEMENT_FORM_NOM','Name');
-define('_AM_EXTCAL_ETABLISSEMENT_FORM_TELEPHONE','Phone');
-define('_AM_EXTCAL_ETABLISSEMENT_SURDEL','Are you sure you want to delete');
-define('_AM_EXTCAL_ETABLISSEMENTS','Venues');
-define('_AM_EXTCAL_EVENT','Event');
-define('_AM_EXTCAL_EVENT_CREATED','Event created');
-define('_AM_EXTCAL_EVENT_DELETED','Event successfully deleted.');
-define('_AM_EXTCAL_EVENT_EDITED','Event edited');
-define('_AM_EXTCAL_FORMOK','Saved successfully');
-define('_AM_EXTCAL_GO_TO_MODULE','Go to module');
+define('_AM_EXTCAL_DESCRIPTION',"Description");
+define('_AM_EXTCAL_DOWN_DONE',"Downloading done. Click here to install files");
+define('_AM_EXTCAL_EDIT_CATEGORY',"Edit category");
+define('_AM_EXTCAL_EDIT_OR_DELETE_CATEGORY',"Edit or Delete category");
+define('_AM_EXTCAL_EDIT_PERMISSION',"Edit permission");
+define('_AM_EXTCAL_EDIT_PERMISSION_DESC',"Select categories where each group is allowed to edit there own event");
+define('_AM_EXTCAL_ERREUR_NO_ETABLISSEMENT',"There is no location in the database");
+define('_AM_EXTCAL_ETABLISSEMENT',"Venue");
+define('_AM_EXTCAL_ETABLISSEMENT_FORM_ACTION',"Action");
+define('_AM_EXTCAL_ETABLISSEMENT_FORM_ADRESSE',"Address");
+define('_AM_EXTCAL_ETABLISSEMENT_FORM_DELETE',"Delete Location");
+define('_AM_EXTCAL_ETABLISSEMENT_FORM_EDIT',"Edit settings");
+define('_AM_EXTCAL_ETABLISSEMENT_FORM_NOM',"Name");
+define('_AM_EXTCAL_ETABLISSEMENT_FORM_TELEPHONE',"Phone");
+define('_AM_EXTCAL_ETABLISSEMENT_SURDEL',"Are you sure you want to delete");
+define('_AM_EXTCAL_ETABLISSEMENTS',"Venues");
+define('_AM_EXTCAL_EVENT',"Event");
+define('_AM_EXTCAL_EVENT_CREATED',"Event created");
+define('_AM_EXTCAL_EVENT_DELETED',"Event successfully deleted.");
+define('_AM_EXTCAL_EVENT_EDITED',"Event edited");
+define('_AM_EXTCAL_FORMOK',"Saved successfully");
+define('_AM_EXTCAL_GO_TO_MODULE',"Go to module");
define('_AM_EXTCAL_GOTO_EVENTS',"Return to events");
-define('_AM_EXTCAL_GROUP_NAME','Group name');
+define('_AM_EXTCAL_GROUP_NAME',"Group name");
define('_AM_EXTCAL_ICONE_CLONE',"Clone");
define('_AM_EXTCAL_ICONE_DELETE',"Delete");
define('_AM_EXTCAL_ICONE_EDIT',"Edit");
@@ -80,48 +80,46 @@
define('_AM_EXTCAL_INDEX_CATEGORIES',"Number of categories: %s");
define('_AM_EXTCAL_INDEX_EVENT',"Number of Events in DB: %s");
define('_AM_EXTCAL_INDEX_PENDING',"Pending events: %s");
-define('_AM_EXTCAL_INFO_APPROVE_PENDING_EVENT','<b>Approve</b> new event without read information.');
-define('_AM_EXTCAL_INFO_DELETE','<b>Delete</b> event.');
-define('_AM_EXTCAL_INFO_DELETE_PENDING_EVENT','<b>Delete</b> the new event.');
-define('_AM_EXTCAL_INFO_EDIT','<b>Edit</b> event.');
-define('_AM_EXTCAL_INFO_EDIT_PENDING_EVENT','<b>Edit</b> new event before approving it.');
-define('_AM_EXTCAL_INFORMATION','Information');
-define('_AM_EXTCAL_INSTALL','Install files');
-define('_AM_EXTCAL_INSTALL_DONE','Installing done. Click here to update your module');
-define('_AM_EXTCAL_LG_FILE_DONT_EXIST','Language files don\'t exist in repository: <br /><b>Server : </b>%s<br /><b>File : </b>%s');
-define('_AM_EXTCAL_MD_FILE_DONT_EXIST','Module files don\'t exist on repository :<br /><b>Server : </b>%s<br /><b>File : </b>%s');
-define('_AM_EXTCAL_MD_FILE_DONT_EXIST_SHORT','Module files don\'t exist');
-define('_AM_EXTCAL_MODULE_ADMIN_SUMMARY','eXtCal Administration Summary');
+define('_AM_EXTCAL_INFO_APPROVE_PENDING_EVENT',"<b>Approve</b> new event without read information.");
+define('_AM_EXTCAL_INFO_DELETE',"<b>Delete</b> event.");
+define('_AM_EXTCAL_INFO_DELETE_PENDING_EVENT',"<b>Delete</b> the new event.");
+define('_AM_EXTCAL_INFO_EDIT',"<b>Edit</b> event.");
+define('_AM_EXTCAL_INFO_EDIT_PENDING_EVENT',"<b>Edit</b> new event before approving it.");
+define('_AM_EXTCAL_INFORMATION',"Information");
+define('_AM_EXTCAL_INSTALL',"Install files");
+define('_AM_EXTCAL_INSTALL_DONE',"Installing done. Click here to update your module");
+define('_AM_EXTCAL_LG_FILE_DONT_EXIST',"Language files don\'t exist in repository: <br /><b>Server : </b>%s<br /><b>File : </b>%s");
+define('_AM_EXTCAL_MD_FILE_DONT_EXIST',"Module files don\'t exist on repository :<br /><b>Server : </b>%s<br /><b>File : </b>%s");
+define('_AM_EXTCAL_MD_FILE_DONT_EXIST_SHORT',"Module files don\'t exist");
+define('_AM_EXTCAL_MODULE_ADMIN_SUMMARY',"eXtCal Administration Summary");
define('_AM_EXTCAL_MULTIUPLOADS_NOT_OK',"The multiuploads component is not installed.<br /><br /><a href='http://xoops.kiolo.com/modules/mydownloads/'>Download here the multiuploads component</a><br /><br />and install it in the folder 'class/xoopsform/'");
-define('_AM_EXTCAL_NAME','Name');
-define('_AM_EXTCAL_NOPERMSSET','Permission cannot be set: There are no Categories created yet! Please create a Category first.');
-define('_AM_EXTCAL_PENDING','Pending');
-define('_AM_EXTCAL_PENDING_EVENT','Pending Event');
-define('_AM_EXTCAL_PERM_MASK_UPDATED','Permission mask updated');
-define('_AM_EXTCAL_PERM_NO_CATEGORY','You must create category first');
-define('_AM_EXTCAL_PREFERENCES','Preferences');
-define('_AM_EXTCAL_PUBLIC_PERM_MASK','Public permissions mask');
-define('_AM_EXTCAL_PUBLIC_PERM_MASK_INFO','You can set here the default mask permission who will be apply to new category. Be careful to don\'t give excessive permissions here because all new category will give them.');
-define('_AM_EXTCAL_REDIRECT_DELOK','successfully deleted');
-define('_AM_EXTCAL_START_DATE','Start Date');
-define('_AM_EXTCAL_SUBMIT_PERMISSION','Submit permission');
-define('_AM_EXTCAL_SUBMIT_PERMISSION_DESC','Select categories that each group is allowed to submit');
-define('_AM_EXTCAL_SUBMITTED_EVENT','Submitted Event');
-define('_AM_EXTCAL_TITLE','Title');
-define('_AM_EXTCAL_UPDATE','Update module');
-define('_AM_EXTCAL_UPDATE_INFO','Update Information');
-define('_AM_EXTCAL_UPDATE_KO','Your eXtCal version is obsolete. We recommand to check out new eXtCal version on <a href=\"http://www.zoullou.net/\">Zoullou.net</a>.');
-define('_AM_EXTCAL_UPDATE_OK','You are running eXtCal with the latest updates for stability and security.');
-define('_AM_EXTCAL_UPDATE_UPGRADE','Click here to upgrade module to the newer version');
-define('_AM_EXTCAL_VIEW_PERMISSION','View permission');
-define('_AM_EXTCAL_VIEW_PERMISSION_DESC','Select categories that each group is allowed to view');
-define('_AM_EXTCAL_NO_PENDING_EVENT','No pending Event');
-define('_AM_EXTCAL_ICONE','Icon');
+define('_AM_EXTCAL_NAME',"Name");
+define('_AM_EXTCAL_NOPERMSSET',"Permission cannot be set: There are no Categories created yet! Please create a Category first.");
+define('_AM_EXTCAL_PENDING',"Pending");
+define('_AM_EXTCAL_PENDING_EVENT',"Pending Event");
+define('_AM_EXTCAL_PERM_MASK_UPDATED',"Permission mask updated");
+define('_AM_EXTCAL_PERM_NO_CATEGORY',"You must create category first");
+define('_AM_EXTCAL_PREFERENCES',"Preferences");
+define('_AM_EXTCAL_PUBLIC_PERM_MASK',"Public permissions mask");
+define('_AM_EXTCAL_PUBLIC_PERM_MASK_INFO',"You can set here the default mask permission who will be apply to new category. Be careful to don\'t give excessive permissions here because all new category will give them.");
+define('_AM_EXTCAL_REDIRECT_DELOK',"successfully deleted");
+define('_AM_EXTCAL_START_DATE',"Start Date");
+define('_AM_EXTCAL_SUBMIT_PERMISSION',"Submit permission");
+define('_AM_EXTCAL_SUBMIT_PERMISSION_DESC',"Select categories that each group is allowed to submit");
+define('_AM_EXTCAL_SUBMITTED_EVENT',"Submitted Event");
+define('_AM_EXTCAL_TITLE',"Title");
+define('_AM_EXTCAL_UPDATE',"Update module");
+define('_AM_EXTCAL_UPDATE_INFO',"Update Information");
+define('_AM_EXTCAL_UPDATE_KO',"Your eXtCal version is obsolete. We recommand to check out new eXtCal version.");
+define('_AM_EXTCAL_UPDATE_OK',"You are running eXtCal with the latest updates for stability and security.");
+define('_AM_EXTCAL_UPDATE_UPGRADE',"Click here to upgrade module to the newer version");
+define('_AM_EXTCAL_VIEW_PERMISSION',"View permission");
+define('_AM_EXTCAL_VIEW_PERMISSION_DESC',"Select categories that each group is allowed to view");
+define('_AM_EXTCAL_NO_PENDING_EVENT',"No pending Event");
+define('_AM_EXTCAL_ICONE',"Icon");
//ModuleAdmin
-define('_AM_EXTCAL_MODULEADMIN_MISSING','Error: The ModuleAdmin class is missing. Please install the ModuleAdmin Class into /Frameworks (see /docs/readme.txt)');
-
+define('_AM_EXTCAL_MODULEADMIN_MISSING',"Error: The ModuleAdmin class is missing. Please install the ModuleAdmin Class into /Frameworks (see /docs/readme.txt)");
//2.37
-
-define('_AM_EXTCAL_END_DATE','End Date');
-define('_AM_EXTCAL_EVENT_CLONED','Event successfully cloned.');
-define('_AM_EXTCAL_ETABLISSEMENT_FORM_CITY','City');
\ No newline at end of file
+define('_AM_EXTCAL_END_DATE',"End Date");
+define('_AM_EXTCAL_EVENT_CLONED',"Event successfully cloned.");
+define('_AM_EXTCAL_ETABLISSEMENT_FORM_CITY',"City");
\ No newline at end of file
Modified: XoopsModules/extcal/trunk/modules/extcal/language/english/blocks.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/language/english/blocks.php 2013-04-20 09:35:37 UTC (rev 11413)
+++ XoopsModules/extcal/trunk/modules/extcal/language/english/blocks.php 2013-04-20 18:15:43 UTC (rev 11414)
@@ -1,32 +1,31 @@
<?php
-
-define("_MB_EXTCAL_BGCOLOR", "Background color");
-define("_MB_EXTCAL_CAT_TO_USE", "Category");
-define("_MB_EXTCAL_HEIGHT", "Height");
-define("_MB_EXTCAL_HORLOGE", "Clock");
-define("_MB_EXTCAL_HORLOGE_OPT", "Clocks options");
-define("_MB_EXTCAL_OPT_SHOW", "Show options");
-define("_MB_EXTCAL_OPT_SLIDE_SHOW", "Slide show");
-define("_MB_EXTCAL_WIDTH", "Width");
-define('_MB_EXTCAL_ALL_CAT','All categories');
-define('_MB_EXTCAL_CAT_TO_USE_DESC','Select category where event are picked');
-define('_MB_EXTCAL_CURRENT','Current');
-define('_MB_EXTCAL_DISPLAY','Display');
-define('_MB_EXTCAL_DISPLAY_IMG','Display Image');
-define('_MB_EXTCAL_DISPLAY_MONTH','Month to be displayed');
-define('_MB_EXTCAL_DISPLAY_SUBMIT_LINK','Display submit link');
-define('_MB_EXTCAL_EVENT','events');
-define('_MB_EXTCAL_IMG_CAT','Image category');
-define('_MB_EXTCAL_NEXT','Next');
-define('_MB_EXTCAL_PREVIEW','Preview');
-define('_MB_EXTCAL_PX','px');
-define('_MB_EXTCAL_SECONDES','seconds');
-define('_MB_EXTCAL_SS_HEIGHT','Slideshow height');
-define('_MB_EXTCAL_SS_NB_PHOTOS','Slideshow # of photos');
-define('_MB_EXTCAL_SS_PAUSE_TIME','Slideshow pause time');
-define('_MB_EXTCAL_SS_TRANS_TIME','Slideshow transition time');
-define('_MB_EXTCAL_SS_WIDTH','Slideshow width');
-define('_MB_EXTCAL_SUBMIT_LINK_TEXT','Submit event');
-define('_MB_EXTCAL_TITLE_LENGTH','Title length');
+define('_MB_EXTCAL_BGCOLOR',"Background color");
+define('_MB_EXTCAL_CAT_TO_USE',"Category");
+define('_MB_EXTCAL_HEIGHT',"Height");
+define('_MB_EXTCAL_HORLOGE',"Clock");
+define('_MB_EXTCAL_HORLOGE_OPT',"Clocks options");
+define('_MB_EXTCAL_OPT_SHOW',"Show options");
+define('_MB_EXTCAL_OPT_SLIDE_SHOW',"Slide show");
+define('_MB_EXTCAL_WIDTH',"Width");
+define('_MB_EXTCAL_ALL_CAT',"All categories");
+define('_MB_EXTCAL_CAT_TO_USE_DESC',"Select category where event are picked");
+define('_MB_EXTCAL_CURRENT',"Current");
+define('_MB_EXTCAL_DISPLAY',"Display");
+define('_MB_EXTCAL_DISPLAY_IMG',"Display Image");
+define('_MB_EXTCAL_DISPLAY_MONTH',"Month to be displayed");
+define('_MB_EXTCAL_DISPLAY_SUBMIT_LINK',"Display submit link");
+define('_MB_EXTCAL_EVENT',"events");
+define('_MB_EXTCAL_IMG_CAT',"Image category");
+define('_MB_EXTCAL_NEXT',"Next");
+define('_MB_EXTCAL_PREVIEW',"Preview");
+define('_MB_EXTCAL_PX',"px");
+define('_MB_EXTCAL_SECONDES',"seconds");
+define('_MB_EXTCAL_SS_HEIGHT',"Slideshow height");
+define('_MB_EXTCAL_SS_NB_PHOTOS',"Slideshow # of photos");
+define('_MB_EXTCAL_SS_PAUSE_TIME',"Slideshow pause time");
+define('_MB_EXTCAL_SS_TRANS_TIME',"Slideshow transition time");
+define('_MB_EXTCAL_SS_WIDTH',"Slideshow width");
+define('_MB_EXTCAL_SUBMIT_LINK_TEXT',"Submit event");
+define('_MB_EXTCAL_TITLE_LENGTH',"Title length");
//2.37
-define('_MB_EXTCAL_UPCOMING_DAYS','# of Days to Include in Search');
\ No newline at end of file
+define('_MB_EXTCAL_UPCOMING_DAYS',"# of Days to Include in Search");
\ No newline at end of file
Added: XoopsModules/extcal/trunk/modules/extcal/language/english/mail_template/index.html
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/language/english/mail_template/index.html (rev 0)
+++ XoopsModules/extcal/trunk/modules/extcal/language/english/mail_template/index.html 2013-04-20 18:15:43 UTC (rev 11414)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Modified: XoopsModules/extcal/trunk/modules/extcal/language/english/main.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/language/english/main.php 2013-04-20 09:35:37 UTC (rev 11413)
+++ XoopsModules/extcal/trunk/modules/extcal/language/english/main.php 2013-04-20 18:15:43 UTC (rev 11414)
@@ -1,9 +1,7 @@
<?php
-
include_once XOOPS_ROOT_PATH . '/language/' . $GLOBALS['xoopsConfig']['language']
. '/calendar.php';
-
-define('_MD_CLEAR_CRITERIA',"clear criteria");
+define('_MD_CLEAR_CRITERIA','clear criteria');
define('_MD_EXTCAL_1_FR','1st ' . _CAL_FRIDAY);
define('_MD_EXTCAL_1_MO','1st ' . _CAL_MONDAY);
define('_MD_EXTCAL_1_SA','1st ' . _CAL_SATURDAY);
@@ -40,78 +38,78 @@
define('_MD_EXTCAL_ACTION_MESSAGE',"Message: ");
define('_MD_EXTCAL_ACTION_NONE',"No decision");
define('_MD_EXTCAL_ACTION_NOTCOME',"Not coming");
-define('_MD_EXTCAL_ADD_ME','Add Me');
-define('_MD_EXTCAL_ADDRESS','Address');
-define('_MD_EXTCAL_ALPHA','Alphabetical');
-define('_MD_EXTCAL_AND','And');
-define('_MD_EXTCAL_APR','Apr');
-define('_MD_EXTCAL_AUG','Aug');
-define('_MD_EXTCAL_CATEGORY','Category');
+define('_MD_EXTCAL_ADD_ME',"Add Me");
+define('_MD_EXTCAL_ADDRESS',"Address");
+define('_MD_EXTCAL_ALPHA',"Alphabetical");
+define('_MD_EXTCAL_AND',"And");
+define('_MD_EXTCAL_APR',"Apr");
+define('_MD_EXTCAL_AUG',"Aug");
+define('_MD_EXTCAL_CATEGORY',"Category");
define('_MD_EXTCAL_CITATION',"Quote");
-define('_MD_EXTCAL_CONTACT','Contact');
-define('_MD_EXTCAL_CONTACT_INFO','Contact info');
-define('_MD_EXTCAL_DAILY','Daily');
-define('_MD_EXTCAL_DAY','day');
-define('_MD_EXTCAL_DAY_NUM_MONTH','(Day number on month)');
-define('_MD_EXTCAL_DAYS','day(s)');
-define('_MD_EXTCAL_DEC','Dec');
-define('_MD_EXTCAL_DEL_IMG','Delete the image');
-define('_MD_EXTCAL_DESCRIPTION','Description');
+define('_MD_EXTCAL_CONTACT',"Contact");
+define('_MD_EXTCAL_CONTACT_INFO',"Contact info");
+define('_MD_EXTCAL_DAILY',"Daily");
+define('_MD_EXTCAL_DAY',"day");
+define('_MD_EXTCAL_DAY_NUM_MONTH',"(Day number on month)");
+define('_MD_EXTCAL_DAYS',"day(s)");
+define('_MD_EXTCAL_DEC',"Dec");
+define('_MD_EXTCAL_DEL_IMG',"Delete the image");
+define('_MD_EXTCAL_DESCRIPTION',"Description");
define('_MD_EXTCAL_DEVISE1',"£");
define('_MD_EXTCAL_DEVISE2',"US$");
define('_MD_EXTCAL_DEVISE3',"AUS$");
-define('_MD_EXTCAL_DURING','During');
-define('_MD_EXTCAL_EDIT_EVENT','Edit event');
-define('_MD_EXTCAL_EMAIL','Email');
-define('_MD_EXTCAL_END','End');
-define('_MD_EXTCAL_END_DATE','End date');
-define('_MD_EXTCAL_ETABLISSEMENT','Location');
-define('_MD_EXTCAL_ETABLISSEMENT_ADD','Add Location');
-define('_MD_EXTCAL_ETABLISSEMENT_ADRESSE','Address');
-define('_MD_EXTCAL_ETABLISSEMENT_ADRESSE2','Address 2');
-define('_MD_EXTCAL_ETABLISSEMENT_CATEGORIE','Category');
-define('_MD_EXTCAL_ETABLISSEMENT_CP','Zip Code');
-define('_MD_EXTCAL_ETABLISSEMENT_DATE','Date');
-define('_MD_EXTCAL_ETABLISSEMENT_DEBUT','Start');
-define('_MD_EXTCAL_ETABLISSEMENT_DELETE','Delete Location');
-define('_MD_EXTCAL_ETABLISSEMENT_DESCRIPTION','Description');
-define('_MD_EXTCAL_ETABLISSEMENT_DIVERS','Miscellaneous');
-define('_MD_EXTCAL_ETABLISSEMENT_EDIT','Edit Location');
-define('_MD_EXTCAL_ETABLISSEMENT_EVENTS_VENIR','Upcoming events');
-define('_MD_EXTCAL_ETABLISSEMENT_FIN','End');
-define('_MD_EXTCAL_ETABLISSEMENT_HORAIRES','Hours');
-define('_MD_EXTCAL_ETABLISSEMENT_INFO_COMPL','Extra Info:');
-define('_MD_EXTCAL_ETABLISSEMENT_LIEU','Location');
-define('_MD_EXTCAL_ETABLISSEMENT_MAIL','Email');
-define('_MD_EXTCAL_ETABLISSEMENT_MAP','Map URL link');
-define('_MD_EXTCAL_ETABLISSEMENT_MAP2','View Map');
-define('_MD_EXTCAL_ETABLISSEMENT_NOM','Name');
-define('_MD_EXTCAL_ETABLISSEMENT_ORGANISATEUR','Organizer');
-define('_MD_EXTCAL_ETABLISSEMENT_PRICE','Price: ');
-define('_MD_EXTCAL_ETABLISSEMENT_SITE','Website');
-define('_MD_EXTCAL_ETABLISSEMENT_TARIFS','Price:');
-define('_MD_EXTCAL_ETABLISSEMENT_TEL_FIXE','Phone number');
-define('_MD_EXTCAL_ETABLISSEMENT_TEL_PORTABLE','Mobile Phone');
-define('_MD_EXTCAL_ETABLISSEMENT_VILLE','City');
+define('_MD_EXTCAL_DURING',"During");
+define('_MD_EXTCAL_EDIT_EVENT',"Edit event");
+define('_MD_EXTCAL_EMAIL',"Email");
+define('_MD_EXTCAL_END',"End");
+define('_MD_EXTCAL_END_DATE',"End date");
+define('_MD_EXTCAL_ETABLISSEMENT',"Location");
+define('_MD_EXTCAL_ETABLISSEMENT_ADD',"Add Location");
+define('_MD_EXTCAL_ETABLISSEMENT_ADRESSE',"Address");
+define('_MD_EXTCAL_ETABLISSEMENT_ADRESSE2',"Address 2");
+define('_MD_EXTCAL_ETABLISSEMENT_CATEGORIE',"Category");
+define('_MD_EXTCAL_ETABLISSEMENT_CP',"Zip Code");
+define('_MD_EXTCAL_ETABLISSEMENT_DATE',"Date");
+define('_MD_EXTCAL_ETABLISSEMENT_DEBUT',"Start");
+define('_MD_EXTCAL_ETABLISSEMENT_DELETE',"Delete Location");
+define('_MD_EXTCAL_ETABLISSEMENT_DESCRIPTION',"Description");
+define('_MD_EXTCAL_ETABLISSEMENT_DIVERS',"Miscellaneous");
+define('_MD_EXTCAL_ETABLISSEMENT_EDIT',"Edit Location");
+define('_MD_EXTCAL_ETABLISSEMENT_EVENTS_VENIR',"Upcoming events");
+define('_MD_EXTCAL_ETABLISSEMENT_FIN',"End");
+define('_MD_EXTCAL_ETABLISSEMENT_HORAIRES',"Hours");
+define('_MD_EXTCAL_ETABLISSEMENT_INFO_COMPL',"Extra Info:");
+define('_MD_EXTCAL_ETABLISSEMENT_LIEU',"Location");
+define('_MD_EXTCAL_ETABLISSEMENT_MAIL',"Email");
+define('_MD_EXTCAL_ETABLISSEMENT_MAP',"Map URL link");
+define('_MD_EXTCAL_ETABLISSEMENT_MAP2',"View Map");
+define('_MD_EXTCAL_ETABLISSEMENT_NOM',"Name");
+define('_MD_EXTCAL_ETABLISSEMENT_ORGANISATEUR',"Organizer");
+define('_MD_EXTCAL_ETABLISSEMENT_PRICE',"Price: ");
+define('_MD_EXTCAL_ETABLISSEMENT_SITE',"Website");
+define('_MD_EXTCAL_ETABLISSEMENT_TARIFS',"Price:");
+define('_MD_EXTCAL_ETABLISSEMENT_TEL_FIXE',"Phone number");
+define('_MD_EXTCAL_ETABLISSEMENT_TEL_PORTABLE',"Mobile Phone");
+define('_MD_EXTCAL_ETABLISSEMENT_VILLE',"City");
define('_MD_EXTCAL_EVENT',"Event");
-define('_MD_EXTCAL_EVENT_CREATED',"Thank-you for your submission.<br />Your event has been approved and will now appear in our calendar.");
-define('_MD_EXTCAL_EVENT_END','Have end ?');
+define('_MD_EXTCAL_EVENT_CREATED',"Thank you for your submission.<br />Your event has been approved and will now appear in our calendar.");
+define('_MD_EXTCAL_EVENT_END',"Have end?");
define('_MD_EXTCAL_EVENTS_FOUND',"%1\$s events found");
-define('_MD_EXTCAL_EXPRESSION','Expression (list)');
-define('_MD_EXTCAL_FEB','Feb');
-define('_MD_EXTCAL_FILE_ATTACHEMENT','Attach a file');
-define('_MD_EXTCAL_FORM_IMG','Image (%s)');
+define('_MD_EXTCAL_EXPRESSION',"Expression (list)");
+define('_MD_EXTCAL_FEB',"Feb");
+define('_MD_EXTCAL_FILE_ATTACHEMENT',"Attach a file");
+define('_MD_EXTCAL_FORM_IMG',"Image (%s)");
define('_MD_EXTCAL_FORMAT_DATE',"l dS of F Y h:i:s A");
-define('_MD_EXTCAL_FR2','Fr');
+define('_MD_EXTCAL_FR2',"Fr");
define('_MD_EXTCAL_ICONE_CLONE',"Clone");
define('_MD_EXTCAL_ICONE_DELETE',"Delete");
define('_MD_EXTCAL_ICONE_EDIT',"Edit");
define('_MD_EXTCAL_ICONE_PRINT',"Print");
-define('_MD_EXTCAL_IMG','Image (%s)');
-define('_MD_EXTCAL_IMG_CONFIG','%s KB max file size, %s pixels width and/or height');
-define('_MD_EXTCAL_JAN','Jan');
-define('_MD_EXTCAL_JUL','Jul');
-define('_MD_EXTCAL_JUN','Jun');
+define('_MD_EXTCAL_IMG',"Image (%s)");
+define('_MD_EXTCAL_IMG_CONFIG',"%s KB max file size, %s pixels width and/or height");
+define('_MD_EXTCAL_JAN',"Jan");
+define('_MD_EXTCAL_JUL',"Jul");
+define('_MD_EXTCAL_JUN',"Jun");
define('_MD_EXTCAL_LAST_FR','Last ' . _CAL_FRIDAY);
define('_MD_EXTCAL_LAST_MO','Last ' . _CAL_MONDAY);
define('_MD_EXTCAL_LAST_SA','Last ' . _CAL_SATURDAY);
@@ -122,69 +120,69 @@
define('_MD_EXTCAL_LIB_COME',"Register");
define('_MD_EXTCAL_LIB_NONE',"None");
define('_MD_EXTCAL_LIB_NOTCOME',"Unsubscribe");
-define('_MD_EXTCAL_LOCALISATION','Location');
-define('_MD_...
[truncated message content] |
|
From: <be...@us...> - 2013-07-10 19:53:53
|
Revision: 11825
http://sourceforge.net/p/xoops/svn/11825
Author: beckmi
Date: 2013-07-10 19:53:48 +0000 (Wed, 10 Jul 2013)
Log Message:
-----------
Updating to 2.37 Final (fixed: removed today's events from "upcoming" block)
Modified Paths:
--------------
XoopsModules/extcal/trunk/modules/extcal/blocks/upcoming.php
XoopsModules/extcal/trunk/modules/extcal/class/etablissement.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/Year.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/11.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/11.phps
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/16.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/16.phps
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/17.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/17.phps
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/18.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/18.phps
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/19.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/19.phps
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/20.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/20.phps
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/22.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/22.phps
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/4.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/4.phps
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/5.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/5.phps
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/6.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/6.phps
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/7.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/7.phps
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/9.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/9.phps
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/all_tests.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/calendar_engine_tests.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/calendar_tabular_tests.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/calendar_tests.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/day_test.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/decorator_test.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/decorator_tests.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/decorator_textual_test.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/decorator_uri_test.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/helper_test.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/hour_test.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/minute_test.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/month_test.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/month_weekdays_test.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/month_weeks_test.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/peardate_engine_test.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/second_test.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/table_helper_tests.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/unixts_engine_test.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/util_tests.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/util_textual_test.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/util_uri_test.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/validator_error_test.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/validator_tests.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/validator_unit_test.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/week_firstday_0_test.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/week_test.php
XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/year_test.php
XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt
XoopsModules/extcal/trunk/modules/extcal/templates/blocks/extcal_block_day.html
XoopsModules/extcal/trunk/modules/extcal/templates/blocks/extcal_block_upcomingByCategory.html
XoopsModules/extcal/trunk/modules/extcal/templates/extcal_view_agenda-day.html
XoopsModules/extcal/trunk/modules/extcal/view_agenda-day.php
XoopsModules/extcal/trunk/modules/extcal/view_agenda-week.php
XoopsModules/extcal/trunk/modules/extcal/view_calendar-month.php
XoopsModules/extcal/trunk/modules/extcal/view_calendar-week.php
XoopsModules/extcal/trunk/modules/extcal/view_day.php
XoopsModules/extcal/trunk/modules/extcal/view_month.php
XoopsModules/extcal/trunk/modules/extcal/view_search.php
XoopsModules/extcal/trunk/modules/extcal/view_week.php
XoopsModules/extcal/trunk/modules/extcal/view_year.php
XoopsModules/extcal/trunk/modules/extcal/xoops_version.php
Modified: XoopsModules/extcal/trunk/modules/extcal/blocks/upcoming.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/blocks/upcoming.php 2013-07-10 11:23:00 UTC (rev 11824)
+++ XoopsModules/extcal/trunk/modules/extcal/blocks/upcoming.php 2013-07-10 19:53:48 UTC (rev 11825)
@@ -41,9 +41,15 @@
$dayTS = mktime(0, 0, 0, $month, $day, $year);
//$offset = $xoopsModuleConfig['week_start_day'] - date('w', $dayTS);
- $offset = date('w', $dayTS) + 7-$xoopsModuleConfig['week_start_day']<7 ? date('w', $dayTS) + 7-$xoopsModuleConfig['week_start_day'] : 0;
- $dayTS = $dayTS - ($offset * _EXTCAL_TS_DAY);
+//------- mb --------------
+// let's make sure that the upcoming events start tomorrow
+// $offset = date('w', $dayTS) + 7-$xoopsModuleConfig['week_start_day']<7 ? date('w', $dayTS) + 7-$xoopsModuleConfig['week_start_day'] : 0;
+// $dayTS = $dayTS - ($offset * _EXTCAL_TS_DAY);
+
+ $dayTS = $dayTS + _EXTCAL_TS_DAY;
+//------- mb -----------------
+
$year = date('Y', $dayTS);
$month = date('n', $dayTS);
$day = date('j', $dayTS);
Modified: XoopsModules/extcal/trunk/modules/extcal/class/etablissement.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/etablissement.php 2013-07-10 11:23:00 UTC (rev 11824)
+++ XoopsModules/extcal/trunk/modules/extcal/class/etablissement.php 2013-07-10 19:53:48 UTC (rev 11825)
@@ -4,7 +4,6 @@
die("XOOPS root path not defined");
}
-//include_once XOOPS_ROOT_PATH.'/class/xoopsobject.php';
include_once XOOPS_ROOT_PATH.'/kernel/object.php';
//class ExtcalEvent extends XoopsObject
Modified: XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/Year.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/Year.php 2013-07-10 11:23:00 UTC (rev 11824)
+++ XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/Year.php 2013-07-10 19:53:48 UTC (rev 11825)
@@ -53,7 +53,7 @@
* Represents a Year and builds Months<br>
* <code>
* require_once 'Calendar'.DIRECTORY_SEPARATOR.'Year.php';
- * $Year = & new Calendar_Year(2003, 10, 21); // 21st Oct 2003
+ * $Year = new Calendar_Year(2003, 10, 21); // 21st Oct 2003
* $Year->build(); // Build Calendar_Month objects
* while ($Month = & $Year->fetch()) {
* echo $Month->thisMonth().'<br />';
Modified: XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/11.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/11.php 2013-07-10 11:23:00 UTC (rev 11824)
+++ XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/11.php 2013-07-10 19:53:48 UTC (rev 11825)
@@ -25,7 +25,7 @@
}
// Create a day to view the hours for
-$Day = & new Calendar_Day(2003,10,24);
+$Day = new Calendar_Day(2003,10,24);
// A sample query to get the data for today (NOT ACTUALLY USED HERE)
$sql = "
Modified: XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/11.phps
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/11.phps 2013-07-10 11:23:00 UTC (rev 11824)
+++ XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/11.phps 2013-07-10 19:53:48 UTC (rev 11825)
@@ -25,7 +25,7 @@
}
// Create a day to view the hours for
-$Day = & new Calendar_Day(2003,10,24);
+$Day = new Calendar_Day(2003,10,24);
// A sample query to get the data for today (NOT ACTUALLY USED HERE)
$sql = "
Modified: XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/16.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/16.php 2013-07-10 11:23:00 UTC (rev 11824)
+++ XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/16.php 2013-07-10 19:53:48 UTC (rev 11825)
@@ -17,7 +17,7 @@
echo ( '<p>The current month is '
.$Calendar->thisMonth().' of year '.$Calendar->thisYear().'</p>');
-$Uri = & new Calendar_Decorator_Uri($Calendar);
+$Uri = new Calendar_Decorator_Uri($Calendar);
$Uri->setFragments('jahr','monat');
// $Uri->setSeperator('/'); // Default is &
// $Uri->setScalar(); // Omit variable names
Modified: XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/16.phps
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/16.phps 2013-07-10 11:23:00 UTC (rev 11824)
+++ XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/16.phps 2013-07-10 19:53:48 UTC (rev 11825)
@@ -17,7 +17,7 @@
echo ( '<p>The current month is '
.$Calendar->thisMonth().' of year '.$Calendar->thisYear().'</p>');
-$Uri = & new Calendar_Decorator_Uri($Calendar);
+$Uri = new Calendar_Decorator_Uri($Calendar);
$Uri->setFragments('jahr','monat');
// $Uri->setSeperator('/'); // Default is &
// $Uri->setScalar(); // Omit variable names
Modified: XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/17.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/17.php 2013-07-10 11:23:00 UTC (rev 11824)
+++ XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/17.php 2013-07-10 19:53:48 UTC (rev 11825)
@@ -26,7 +26,7 @@
$Calendar = new Calendar_Day(date('Y'), date('n'), date('d'));
// Decorate
-$Textual = & new Calendar_Decorator_Textual($Calendar);
+$Textual = new Calendar_Decorator_Textual($Calendar);
echo '<hr>Previous month is: '.$Textual->prevMonthName('two').'<br />';
echo 'This month is: '.$Textual->thisMonthName('short').'<br />';
@@ -39,7 +39,7 @@
$Calendar = new Calendar_Month_Weekdays(date('Y'), date('n'), 6);
// Decorate
-$Textual = & new Calendar_Decorator_Textual($Calendar);
+$Textual = new Calendar_Decorator_Textual($Calendar);
?>
<p>Rendering calendar....</p>
<table>
Modified: XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/17.phps
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/17.phps 2013-07-10 11:23:00 UTC (rev 11824)
+++ XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/17.phps 2013-07-10 19:53:48 UTC (rev 11825)
@@ -26,7 +26,7 @@
$Calendar = new Calendar_Day(date('Y'), date('n'), date('d'));
// Decorate
-$Textual = & new Calendar_Decorator_Textual($Calendar);
+$Textual = new Calendar_Decorator_Textual($Calendar);
echo '<hr>Previous month is: '.$Textual->prevMonthName('two').'<br />';
echo 'This month is: '.$Textual->thisMonthName('short').'<br />';
@@ -39,7 +39,7 @@
$Calendar = new Calendar_Month_Weekdays(date('Y'), date('n'), 6);
// Decorate
-$Textual = & new Calendar_Decorator_Textual($Calendar);
+$Textual = new Calendar_Decorator_Textual($Calendar);
?>
<p>Rendering calendar....</p>
<table>
Modified: XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/18.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/18.php 2013-07-10 11:23:00 UTC (rev 11824)
+++ XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/18.php 2013-07-10 19:53:48 UTC (rev 11825)
@@ -25,7 +25,7 @@
$Month = new Calendar_Month(date('Y'), date('n'));
-$Wrapper = & new Calendar_Decorator_Wrapper($Month);
+$Wrapper = new Calendar_Decorator_Wrapper($Month);
$Wrapper->build();
echo '<h2>The Wrapper decorator</h2>';
Modified: XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/18.phps
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/18.phps 2013-07-10 11:23:00 UTC (rev 11824)
+++ XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/18.phps 2013-07-10 19:53:48 UTC (rev 11825)
@@ -25,7 +25,7 @@
$Month = new Calendar_Month(date('Y'), date('n'));
-$Wrapper = & new Calendar_Decorator_Wrapper($Month);
+$Wrapper = new Calendar_Decorator_Wrapper($Month);
$Wrapper->build();
echo '<h2>The Wrapper decorator</h2>';
Modified: XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/19.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/19.php 2013-07-10 11:23:00 UTC (rev 11824)
+++ XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/19.php 2013-07-10 19:53:48 UTC (rev 11825)
@@ -9,7 +9,7 @@
require_once CALENDAR_ROOT.'Decorator/Weekday.php';
$Day = new Calendar_Day(date('Y'), date('n'),date('d'));
-$WeekDay = & new Calendar_Decorator_Weekday($Day);
+$WeekDay = new Calendar_Decorator_Weekday($Day);
// $WeekDay->setFirstDay(0); // Make Sunday first Day
echo 'Yesterday: '.$WeekDay->prevWeekDay().'<br>';
Modified: XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/19.phps
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/19.phps 2013-07-10 11:23:00 UTC (rev 11824)
+++ XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/19.phps 2013-07-10 19:53:48 UTC (rev 11825)
@@ -9,7 +9,7 @@
require_once CALENDAR_ROOT.'Decorator/Weekday.php';
$Day = new Calendar_Day(date('Y'), date('n'),date('d'));
-$WeekDay = & new Calendar_Decorator_Weekday($Day);
+$WeekDay = new Calendar_Decorator_Weekday($Day);
// $WeekDay->setFirstDay(0); // Make Sunday first Day
echo 'Yesterday: '.$WeekDay->prevWeekDay().'<br>';
Modified: XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/20.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/20.php 2013-07-10 11:23:00 UTC (rev 11824)
+++ XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/20.php 2013-07-10 19:53:48 UTC (rev 11825)
@@ -54,7 +54,7 @@
require_once CALENDAR_ROOT . 'Day.php';
require_once CALENDAR_ROOT . 'Table/Helper.php';
- $this->tableHelper = & new Calendar_Table_Helper($this, $this->firstDay);
+ $this->tableHelper = new Calendar_Table_Helper($this, $this->firstDay);
$this->cE = & $this->getEngine();
$this->year = $this->thisYear();
$this->month = $this->thisMonth();
@@ -129,7 +129,7 @@
-$Month = & new Calendar_Month_Weekdays(2004, 6);
+$Month = new Calendar_Month_Weekdays(2004, 6);
$MonthDecorator = new MonthPayload_Decorator($Month);
$MonthDecorator->build($events);
Modified: XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/20.phps
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/20.phps 2013-07-10 11:23:00 UTC (rev 11824)
+++ XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/20.phps 2013-07-10 19:53:48 UTC (rev 11825)
@@ -54,7 +54,7 @@
require_once CALENDAR_ROOT . 'Day.php';
require_once CALENDAR_ROOT . 'Table/Helper.php';
- $this->tableHelper = & new Calendar_Table_Helper($this, $this->firstDay);
+ $this->tableHelper = new Calendar_Table_Helper($this, $this->firstDay);
$this->cE = & $this->getEngine();
$this->year = $this->thisYear();
$this->month = $this->thisMonth();
@@ -129,7 +129,7 @@
-$Month = & new Calendar_Month_Weekdays(2004, 6);
+$Month = new Calendar_Month_Weekdays(2004, 6);
$MonthDecorator = new MonthPayload_Decorator($Month);
$MonthDecorator->build($events);
Modified: XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/22.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/22.php 2013-07-10 11:23:00 UTC (rev 11824)
+++ XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/22.php 2013-07-10 19:53:48 UTC (rev 11825)
@@ -17,7 +17,7 @@
echo ( '<p>The current month is '
.$Calendar->thisMonth().' of year '.$Calendar->thisYear().'</p>');
-$Uri = & new Calendar_Util_Uri('jahr','monat');
+$Uri = new Calendar_Util_Uri('jahr','monat');
$Uri->setFragments('jahr','monat');
echo "\"Vector\" URIs<pre>";
Modified: XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/22.phps
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/22.phps 2013-07-10 11:23:00 UTC (rev 11824)
+++ XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/22.phps 2013-07-10 19:53:48 UTC (rev 11825)
@@ -17,7 +17,7 @@
echo ( '<p>The current month is '
.$Calendar->thisMonth().' of year '.$Calendar->thisYear().'</p>');
-$Uri = & new Calendar_Util_Uri('jahr','monat');
+$Uri = new Calendar_Util_Uri('jahr','monat');
$Uri->setFragments('jahr','monat');
echo "\"Vector\" URIs<pre>";
Modified: XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/4.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/4.php 2013-07-10 11:23:00 UTC (rev 11824)
+++ XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/4.php 2013-07-10 19:53:48 UTC (rev 11825)
@@ -20,7 +20,7 @@
if (!isset($_GET['i'])) $_GET['i'] = date('i');
if (!isset($_GET['s'])) $_GET['s'] = date('s');
-$Unit = & new Calendar_Second($_GET['y'], $_GET['m'], $_GET['d'], $_GET['h'], $_GET['i'], $_GET['s']);
+$Unit = new Calendar_Second($_GET['y'], $_GET['m'], $_GET['d'], $_GET['h'], $_GET['i'], $_GET['s']);
echo '<p><b>Result:</b> '.$Unit->thisYear().'-'.$Unit->thisMonth().'-'.$Unit->thisDay().
' '.$Unit->thisHour().':'.$Unit->thisMinute().':'.$Unit->thisSecond();
Modified: XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/4.phps
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/4.phps 2013-07-10 11:23:00 UTC (rev 11824)
+++ XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/4.phps 2013-07-10 19:53:48 UTC (rev 11825)
@@ -20,7 +20,7 @@
if (!isset($_GET['i'])) $_GET['i'] = date('i');
if (!isset($_GET['s'])) $_GET['s'] = date('s');
-$Unit = & new Calendar_Second($_GET['y'], $_GET['m'], $_GET['d'], $_GET['h'], $_GET['i'], $_GET['s']);
+$Unit = new Calendar_Second($_GET['y'], $_GET['m'], $_GET['d'], $_GET['h'], $_GET['i'], $_GET['s']);
echo '<p><b>Result:</b> '.$Unit->thisYear().'-'.$Unit->thisMonth().'-'.$Unit->thisDay().
' '.$Unit->thisHour().':'.$Unit->thisMinute().':'.$Unit->thisSecond();
Modified: XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/5.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/5.php 2013-07-10 11:23:00 UTC (rev 11824)
+++ XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/5.php 2013-07-10 19:53:48 UTC (rev 11825)
@@ -36,7 +36,7 @@
<h1>Select and Update</h1>
<?php
if ( isset($_POST['update']) ) {
- $Second = & new Calendar_Second($_POST['y'],$_POST['m'],$_POST['d'],$_POST['h'],$_POST['i'],$_POST['s']);
+ $Second = new Calendar_Second($_POST['y'],$_POST['m'],$_POST['d'],$_POST['h'],$_POST['i'],$_POST['s']);
if ( !$Second->isValid() ) {
$V= & $Second->getValidator();
echo ('<p>Validation failed:</p>' );
Modified: XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/5.phps
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/5.phps 2013-07-10 11:23:00 UTC (rev 11824)
+++ XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/5.phps 2013-07-10 19:53:48 UTC (rev 11825)
@@ -36,7 +36,7 @@
<h1>Select and Update</h1>
<?php
if ( isset($_POST['update']) ) {
- $Second = & new Calendar_Second($_POST['y'],$_POST['m'],$_POST['d'],$_POST['h'],$_POST['i'],$_POST['s']);
+ $Second = new Calendar_Second($_POST['y'],$_POST['m'],$_POST['d'],$_POST['h'],$_POST['i'],$_POST['s']);
if ( !$Second->isValid() ) {
$V= & $Second->getValidator();
echo ('<p>Validation failed:</p>' );
Modified: XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/6.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/6.php 2013-07-10 11:23:00 UTC (rev 11824)
+++ XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/6.php 2013-07-10 19:53:48 UTC (rev 11825)
@@ -20,8 +20,8 @@
if (!isset($_GET['m'])) $_GET['m'] = date('n');
if (!isset($_GET['d'])) $_GET['d'] = date('j');
-$Month = & new Calendar_Month_Weekdays($_GET['y'],$_GET['m']);
-$Day = & new Calendar_Day($_GET['y'],$_GET['m'],$_GET['d']);
+$Month = new Calendar_Month_Weekdays($_GET['y'],$_GET['m']);
+$Day = new Calendar_Day($_GET['y'],$_GET['m'],$_GET['d']);
$selection = array($Day);
#-----------------------------------------------------------------------------#
Modified: XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/6.phps
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/6.phps 2013-07-10 11:23:00 UTC (rev 11824)
+++ XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/6.phps 2013-07-10 19:53:48 UTC (rev 11825)
@@ -20,8 +20,8 @@
if (!isset($_GET['m'])) $_GET['m'] = date('n');
if (!isset($_GET['d'])) $_GET['d'] = date('j');
-$Month = & new Calendar_Month_Weekdays($_GET['y'],$_GET['m']);
-$Day = & new Calendar_Day($_GET['y'],$_GET['m'],$_GET['d']);
+$Month = new Calendar_Month_Weekdays($_GET['y'],$_GET['m']);
+$Day = new Calendar_Day($_GET['y'],$_GET['m'],$_GET['d']);
$selection = array($Day);
#-----------------------------------------------------------------------------#
Modified: XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/7.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/7.php 2013-07-10 11:23:00 UTC (rev 11824)
+++ XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/7.php 2013-07-10 19:53:48 UTC (rev 11825)
@@ -43,7 +43,7 @@
function getMonth($year, $month)
{
require_once(CALENDAR_ROOT.'Month'.DIRECTORY_SEPARATOR.'Weekdays.php');
- $Month = & new Calendar_Month_Weekdays($year,$month);
+ $Month = new Calendar_Month_Weekdays($year,$month);
if (!$Month->isValid()) {
$V = & $Month->getValidator();
$errorMsg = '';
Modified: XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/7.phps
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/7.phps 2013-07-10 11:23:00 UTC (rev 11824)
+++ XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/7.phps 2013-07-10 19:53:48 UTC (rev 11825)
@@ -43,7 +43,7 @@
function getMonth($year, $month)
{
require_once(CALENDAR_ROOT.'Month'.DIRECTORY_SEPARATOR.'Weekdays.php');
- $Month = & new Calendar_Month_Weekdays($year,$month);
+ $Month = new Calendar_Month_Weekdays($year,$month);
if (!$Month->isValid()) {
$V = & $Month->getValidator();
$errorMsg = '';
Modified: XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/9.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/9.php 2013-07-10 11:23:00 UTC (rev 11824)
+++ XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/9.php 2013-07-10 19:53:48 UTC (rev 11825)
@@ -7,7 +7,7 @@
}
require_once CALENDAR_ROOT.'Day.php';
-$Day = & new Calendar_Day(2003,10,23);
+$Day = new Calendar_Day(2003,10,23);
setlocale (LC_TIME, "de_DE"); // Unix based (probably)
// setlocale (LC_TIME, "ge"); // Windows
Modified: XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/9.phps
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/9.phps 2013-07-10 11:23:00 UTC (rev 11824)
+++ XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/docs/examples/9.phps 2013-07-10 19:53:48 UTC (rev 11825)
@@ -7,7 +7,7 @@
}
require_once CALENDAR_ROOT.'Day.php';
-$Day = & new Calendar_Day(2003,10,23);
+$Day = new Calendar_Day(2003,10,23);
setlocale (LC_TIME, "de_DE"); // Unix based (probably)
// setlocale (LC_TIME, "ge"); // Windows
Modified: XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/all_tests.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/all_tests.php 2013-07-10 11:23:00 UTC (rev 11824)
+++ XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/all_tests.php 2013-07-10 19:53:48 UTC (rev 11825)
@@ -29,6 +29,6 @@
}
}
-$test = &new AllTests();
+$test = new AllTests();
$test->run(new HtmlReporter());
?>
\ No newline at end of file
Modified: XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/calendar_engine_tests.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/calendar_engine_tests.php 2013-07-10 11:23:00 UTC (rev 11824)
+++ XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/calendar_engine_tests.php 2013-07-10 19:53:48 UTC (rev 11825)
@@ -14,7 +14,7 @@
if (!defined('TEST_RUNNING')) {
define('TEST_RUNNING', true);
- $test = &new CalendarEngineTests();
+ $test = new CalendarEngineTests();
$test->run(new HtmlReporter());
}
?>
\ No newline at end of file
Modified: XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/calendar_tabular_tests.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/calendar_tabular_tests.php 2013-07-10 11:23:00 UTC (rev 11824)
+++ XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/calendar_tabular_tests.php 2013-07-10 19:53:48 UTC (rev 11825)
@@ -16,7 +16,7 @@
if (!defined('TEST_RUNNING')) {
define('TEST_RUNNING', true);
- $test = &new CalendarTabularTests();
+ $test = new CalendarTabularTests();
$test->run(new HtmlReporter());
}
?>
\ No newline at end of file
Modified: XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/calendar_tests.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/calendar_tests.php 2013-07-10 11:23:00 UTC (rev 11824)
+++ XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/calendar_tests.php 2013-07-10 19:53:48 UTC (rev 11825)
@@ -19,7 +19,7 @@
if (!defined('TEST_RUNNING')) {
define('TEST_RUNNING', true);
- $test = &new CalendarTests();
+ $test = new CalendarTests();
$test->run(new HtmlReporter());
}
?>
\ No newline at end of file
Modified: XoopsModules/extcal/trunk/modules/extcal/class/pear/Calendar/tests/day_test.php
==================================...
[truncated message content] |
|
From: <be...@us...> - 2013-08-22 00:08:46
|
Revision: 11962
http://sourceforge.net/p/xoops/svn/11962
Author: beckmi
Date: 2013-08-22 00:08:41 +0000 (Thu, 22 Aug 2013)
Log Message:
-----------
Adding WYSIWYG Editor selection to preferences
Modified Paths:
--------------
XoopsModules/extcal/trunk/modules/extcal/admin/event.php
XoopsModules/extcal/trunk/modules/extcal/class/event.php
XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt
XoopsModules/extcal/trunk/modules/extcal/event.php
XoopsModules/extcal/trunk/modules/extcal/language/english/admin.php
XoopsModules/extcal/trunk/modules/extcal/language/english/modinfo.php
XoopsModules/extcal/trunk/modules/extcal/templates/extcal_event.html
XoopsModules/extcal/trunk/modules/extcal/versions/extcal_2_28.php
XoopsModules/extcal/trunk/modules/extcal/xoops_version.php
Modified: XoopsModules/extcal/trunk/modules/extcal/admin/event.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/admin/event.php 2013-08-21 17:11:58 UTC (rev 11961)
+++ XoopsModules/extcal/trunk/modules/extcal/admin/event.php 2013-08-22 00:08:41 UTC (rev 11962)
@@ -94,9 +94,12 @@
// Event edited
if (isset($_POST['event_id'])) {
- $eventHandler->modifyEvent($_POST['event_id'], $data);
- $fileHandler->createFile(intval($_POST['event_id']));
- redirect_header("event.php", 3, _AM_EXTCAL_EVENT_EDITED, false);
+ if (!$eventHandler->modifyEvent($_POST['event_id'], $data)) {
+ redirect_header("event.php", 3, _AM_EXTCAL_EVENT_EDIT_FAILED, false);
+ } else {
+ $fileHandler->createFile(intval($_POST['event_id']));
+ redirect_header("event.php", 3, _AM_EXTCAL_EVENT_EDITED, false);
+ }
// New event
} else {
@@ -107,12 +110,18 @@
: 0;
$data['event_submitdate'] = time();
- $eventHandler->createEvent($data, $_POST);
+ if ($eventHandler->createEvent($data, $_POST)) {
+
$fileHandler->createFile($eventHandler->getInsertId());
$cat = $catHandler->getCat($_POST['cat_id'], $xoopsUser, 'all');
$notificationHandler->triggerEvent('global', 0, 'new_event', array('EVENT_TITLE' => $_POST['event_title']));
$notificationHandler->triggerEvent('cat', $_POST['cat_id'], 'new_event_cat', array('EVENT_TITLE' => $_POST['event_title'], 'CAT_NAME' => $cat->getVar('cat_name')));
redirect_header("event.php", 3, _AM_EXTCAL_EVENT_CREATED, false);
+ }
+ else {
+ redirect_header("event.php", 3, _AM_EXTCAL_EVENT_CREATE_FAILED, false);
+ }
+
}
break;
Modified: XoopsModules/extcal/trunk/modules/extcal/class/event.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/class/event.php 2013-08-21 17:11:58 UTC (rev 11961)
+++ XoopsModules/extcal/trunk/modules/extcal/class/event.php 2013-08-22 00:08:41 UTC (rev 11962)
@@ -303,6 +303,7 @@
{
//ext_echoArray($criteres);
global $extcalConfig;
+ $myts =& MyTextSanitizer::getInstance();// MyTextSanitizer object
$eventsU = $this->getEventsUniques($criteres);
$eventsR = $this->getEventsRecurents($criteres);
@@ -324,6 +325,7 @@
if ($v['event_icone'] == '') {
$v['event_icone'] = $v['cat']['cat_icone'];
}
+ $v['event_desc'] = html_entity_decode($v['event_desc']);
$eventArray[] = $v;
}
array_multisort($eventArray, SORT_ASC, SORT_NUMERIC, $ordre, SORT_ASC, SORT_NUMERIC);
@@ -410,7 +412,7 @@
}
/*****************************************************************
- * evennement r\xE9curents
+ * evennement récurents
*****************************************************************/
function getEventsRecurents($criteres)
@@ -494,7 +496,7 @@
$events = $this->objectToArray($result, $externalKeys);
$this->serverTimeToUserTimes($events);
- //Balyage de tous les evennements r\xE9currents et creation de toutes le events
+ //Balyage de tous les evennements récurrents et creation de toutes le events
$eventsR = array();
while (list($k, $event) = each($events)) {
//$te = $this->GetInterval($event, $start, $end);
@@ -606,7 +608,7 @@
/**********************************************************************
- * Construction des criteres en fonction de la p\xE9riode
+ * Construction des criteres en fonction de la période
**********************************************************************/
function _getCriteriaCompo($start, $end, $cat, &$user)
@@ -811,6 +813,7 @@
**********************************************************************/
function getEventForm($siteSide = 'user', $mode = 'new', $data = null)
{
+ global $xoopsModuleConfig;
$catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE);
$fileHandler = xoops_getmodulehandler(_EXTCAL_CLS_FILE, _EXTCAL_MODULE);
@@ -1056,11 +1059,33 @@
//-----------------------------------------------------------
-
// Start and end
new ExtcalFormDateTime($form, $startDateValue, $endDateValue); //mb
+
+ global $xoopsUser, $xoopsModule;
+ $isAdmin = false;
+ if (is_object($xoopsUser)) {
+ $isAdmin = $xoopsUser->isAdmin($xoopsModule->getVar('mid'));
+ }
+
// Description
- $form->addElement(new XoopsFormDhtmlTextArea(_MD_EXTCAL_DESCRIPTION, 'event_desc', $desc, 10), false);
+ if (class_exists('XoopsFormEditor')) {
+ $options['name'] = 'event_desc';
+ $options['value'] = $desc;
+ $options['rows'] = 5;
+ $options['cols'] = '100%';
+ $options['width'] = '100%';
+ $options['height'] = '200px';
+ if ($isAdmin) {
+ $descEditor = new XoopsFormEditor(_MD_EXTCAL_DESCRIPTION, $xoopsModuleConfig['editorAdmin'], $options, $nohtml = false, $onfailure = 'textarea');
+ } else {
+ $descEditor = new XoopsFormEditor(_MD_EXTCAL_DESCRIPTION, $xoopsModuleConfig['editorUser'], $options, $nohtml = false, $onfailure = 'textarea');
+ }
+ } else {
+ $descEditor = new XoopsFormDhtmlTextArea(_MD_EXTCAL_DESCRIPTION, 'event_desc', $desc, '100%', '100%');
+ }
+ $form->addElement($descEditor);
+
// Max registered member for this event
$nbMemberElement = new XoopsFormText(_MD_EXTCAL_NBMEMBER, 'event_nbmember', 4, 4, $nbMember);
$nbMemberElement->setDescription(_MD_EXTCAL_NBMEMBER_DESC);
@@ -1082,8 +1107,27 @@
$form->addElement(new XoopsFormText(_MD_EXTCAL_URL, 'event_url', 80, 255, $url), false);
// Email
$form->addElement(new XoopsFormText(_MD_EXTCAL_EMAIL, 'event_email', 80, 255, $email), false);
+
// Address
- $form->addElement(new XoopsFormDhtmlTextArea(_MD_EXTCAL_ADDRESS, 'event_address', $event_address), false);
+ if (class_exists('XoopsFormEditor')) {
+ $options['name'] = 'event_address';
+ $options['value'] = $event_address;
+ $options['rows'] = 5;
+ $options['cols'] = '100%';
+ $options['width'] = '100%';
+ $options['height'] = '200px';
+ if ($isAdmin) {
+ $addressEditor
+ = new XoopsFormEditor(_MD_EXTCAL_DESCRIPTION, $xoopsModuleConfig['editorAdmin'], $options, $nohtml = false, $onfailure = 'textarea');
+ } else {
+ $addressEditor = new XoopsFormEditor(_MD_EXTCAL_DESCRIPTION, $xoopsModuleConfig['editorUser'], $options, $nohtml = false, $onfailure = 'textarea');
+ }
+ } else {
+ $addressEditor = new XoopsFormDhtmlTextArea(_MD_EXTCAL_DESCRIPTION, 'event_address', $event_address, '100%', '100%');
+ }
+ $form->addElement($addressEditor);
+
+
// Recurence form
$form->addElement(new ExtcalFormRecurRules($reccurOptions));
// File attachement
@@ -2446,4 +2490,3 @@
//-------------------------------------------------
} // -------- Fin e la classe ---------------------
-?>
Modified: XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt 2013-08-21 17:11:58 UTC (rev 11961)
+++ XoopsModules/extcal/trunk/modules/extcal/docs/changelog.txt 2013-08-22 00:08:41 UTC (rev 11962)
@@ -1,3 +1,8 @@
+2013/08/21: Version 2.38 Beta 1
+===================================
+- added editor selection in Preferences for Admin and User (mamba)
+- added checks if event was added/modified successfully (mamba)
+
2013/07/10: Version 2.37 Final
===================================
- small changes for PHP 5.4
Modified: XoopsModules/extcal/trunk/modules/extcal/event.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/event.php 2013-08-21 17:11:58 UTC (rev 11961)
+++ XoopsModules/extcal/trunk/modules/extcal/event.php 2013-08-22 00:08:41 UTC (rev 11962)
@@ -26,10 +26,18 @@
$permHandler = ExtcalPerm::getHandler();
include_once XOOPS_ROOT_PATH."/modules/extcal/class/etablissement.php";
include_once XOOPS_ROOT_PATH."/modules/extcal/include/functions.php";
+$myts =& MyTextSanitizer::getInstance();// MyTextSanitizer object
+if (!function_exists('clear_unicodeslashes')){
+ function clear_unicodeslashes($text) {
+ $text = str_replace(array("\\'"), "'", $text);
+ $text = str_replace(array("\\\\\\'"), "'", $text);
+ $text = str_replace(array('\\"'), '"', $text);
+ return $text;
+ }
+}
-
// Retriving event
$eventObj = $eventHandler->getEvent($eventId);
@@ -48,6 +56,8 @@
// Assigning event to the template
$xoopsTpl->assign('event', $event);
+$xoopsTpl->assign('event_desc', html_entity_decode($myts->displayTarea(clear_unicodeslashes($event['event_desc']), 1, 1, 1, 1, 1)));
+$xoopsTpl->assign('event_address', html_entity_decode($myts->displayTarea(clear_unicodeslashes($event['event_address']), 1, 1, 1, 1, 1)));
// Title of the page
$xoopsTpl->assign('xoops_pagetitle', $event['event_title']);
Modified: XoopsModules/extcal/trunk/modules/extcal/language/english/admin.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/language/english/admin.php 2013-08-21 17:11:58 UTC (rev 11961)
+++ XoopsModules/extcal/trunk/modules/extcal/language/english/admin.php 2013-08-22 00:08:41 UTC (rev 11962)
@@ -37,7 +37,7 @@
define('_AM_EXTCAL_CAT_DELETED',"Category successfully deleted.");
define('_AM_EXTCAL_CAT_EDITED',"Category edited");
define('_AM_EXTCAL_CATEGORY',"Category");
-define('_AM_EXTCAL_CHECK_UPDATE_ERROR',"Can\'t retrieve the last version of eXtCal.");
+define('_AM_EXTCAL_CHECK_UPDATE_ERROR',"Can't retrieve the last version of eXtCal.");
define('_AM_EXTCAL_COLOR',"Color");
define('_AM_EXTCAL_CONFIG_CHECK',"Configurations");
define('_AM_EXTCAL_CONFIG_PHP',"You must have at least %s as a php version (your current version is %s)");
@@ -48,7 +48,7 @@
define('_AM_EXTCAL_CONFIRM_DELETE_SELECTION',"Delete seleted");
define('_AM_EXTCAL_DELETE',"Select to Delete");
define('_AM_EXTCAL_DELETE_ALL',"Delete All");
-define('_AM_EXTCAL_DELETE_SELECTION',"Delete selected");
+define('_AM_EXTCAL_DELETE_SELECTION', "Delete selected");
define('_AM_EXTCAL_DESCRIPTION',"Description");
define('_AM_EXTCAL_DOWN_DONE',"Downloading done. Click here to install files");
define('_AM_EXTCAL_EDIT_CATEGORY',"Edit category");
@@ -90,7 +90,7 @@
define('_AM_EXTCAL_INSTALL_DONE',"Installing done. Click here to update your module");
define('_AM_EXTCAL_LG_FILE_DONT_EXIST',"Language files don\'t exist in repository: <br /><b>Server : </b>%s<br /><b>File : </b>%s");
define('_AM_EXTCAL_MD_FILE_DONT_EXIST',"Module files don\'t exist on repository :<br /><b>Server : </b>%s<br /><b>File : </b>%s");
-define('_AM_EXTCAL_MD_FILE_DONT_EXIST_SHORT',"Module files don\'t exist");
+define('_AM_EXTCAL_MD_FILE_DONT_EXIST_SHORT',"Module files don't exist");
define('_AM_EXTCAL_MODULE_ADMIN_SUMMARY',"eXtCal Administration Summary");
define('_AM_EXTCAL_MULTIUPLOADS_NOT_OK',"The multiuploads component is not installed.<br /><br /><a href='http://xoops.kiolo.com/modules/mydownloads/'>Download here the multiuploads component</a><br /><br />and install it in the folder 'class/xoopsform/'");
define('_AM_EXTCAL_NAME',"Name");
@@ -101,7 +101,7 @@
define('_AM_EXTCAL_PERM_NO_CATEGORY',"You must create category first");
define('_AM_EXTCAL_PREFERENCES',"Preferences");
define('_AM_EXTCAL_PUBLIC_PERM_MASK',"Public permissions mask");
-define('_AM_EXTCAL_PUBLIC_PERM_MASK_INFO',"You can set here the default mask permission who will be apply to new category. Be careful to don\'t give excessive permissions here because all new category will give them.");
+define('_AM_EXTCAL_PUBLIC_PERM_MASK_INFO',"You can set here the default mask permission who will be apply to new category. Be careful to don't give excessive permissions here because all new category will give them.");
define('_AM_EXTCAL_REDIRECT_DELOK',"successfully deleted");
define('_AM_EXTCAL_START_DATE',"Start Date");
define('_AM_EXTCAL_SUBMIT_PERMISSION',"Submit permission");
@@ -122,4 +122,7 @@
//2.37
define('_AM_EXTCAL_END_DATE',"End Date");
define('_AM_EXTCAL_EVENT_CLONED',"Event successfully cloned.");
-define('_AM_EXTCAL_ETABLISSEMENT_FORM_CITY',"City");
\ No newline at end of file
+define('_AM_EXTCAL_ETABLISSEMENT_FORM_CITY',"City");
+// 2.38
+define('_AM_EXTCAL_EVENT_EDIT_FAILED',"Event Editing failed");
+define('_AM_EXTCAL_EVENT_CREATE_FAILED',"Couldn't create event");
Modified: XoopsModules/extcal/trunk/modules/extcal/language/english/modinfo.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/language/english/modinfo.php 2013-08-21 17:11:58 UTC (rev 11961)
+++ XoopsModules/extcal/trunk/modules/extcal/language/english/modinfo.php 2013-08-22 00:08:41 UTC (rev 11962)
@@ -152,4 +152,12 @@
define('_MI_EXTCAL_DAY_FRIDAY',"Friday");
define('_MI_EXTCAL_DAY_SATURDAY',"Saturday");
define('_MI_EXTCAL_DAY_SUNDAY',"Sunday");
-define('_MI_EXTCAL_SHOW_OTHEROPTIONS',"Other Options");
\ No newline at end of file
+define('_MI_EXTCAL_SHOW_OTHEROPTIONS',"Other Options");
+
+// 2.38
+
+define('_MI_EXTCAL_EDITOR_ADMIN', "Editor to use (admin):");
+define('_MI_EXTCAL_EDITOR_ADMIN_DESC', "Select the editor to use for admin side. If you have a 'simple' install (e.g you use only XOOPS core editor class, provided in the standard xoops core package), then you can just select DHTML and Compact");
+define('_MI_EXTCAL_EDITOR_USER', "Editor to use (user):");
+define('_MI_EXTCAL_EDITOR_USER_DESC', "Select the editor to use for user side. If you have a 'simple' install (e.g you use only XOOPS core editor class, provided in the standard xoops core package), then you can just select DHTML and Compact");
+
Modified: XoopsModules/extcal/trunk/modules/extcal/templates/extcal_event.html
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/templates/extcal_event.html 2013-08-21 17:11:58 UTC (rev 11961)
+++ XoopsModules/extcal/trunk/modules/extcal/templates/extcal_event.html 2013-08-22 00:08:41 UTC (rev 11962)
@@ -61,12 +61,12 @@
<{if $event.event_desc != ''}>
<u><strong><{$smarty.const._MD_EXTCAL_ETABLISSEMENT_DESCRIPTION}> :</strong></u><br />
- <{$event.event_desc}><br /><br />
+ <{$event_desc}><br /><br />
<{/if}>
<{if $event.event_address != ''}>
<u><strong><{$smarty.const._MD_EXTCAL_ETABLISSEMENT_ADRESSE}> :</strong></u><br />
- <{$event.event_address}><br /><br />
+<{$event_address}><br /><br />
<{/if}>
<!--<span style="font-size:0.8em;"><{$smarty.const._MD_EXTCAL_POSTED_BY}> <a href="<{$xoops_url}>/userinfo.php?uid=<{$event.user.uid}>"><{$event.user.uname}></a> <{$smarty.const._MD_EXTCAL_ON}> <{$event.formated_event_submitdate}></span>
<p>
Modified: XoopsModules/extcal/trunk/modules/extcal/versions/extcal_2_28.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/versions/extcal_2_28.php 2013-08-21 17:11:58 UTC (rev 11961)
+++ XoopsModules/extcal/trunk/modules/extcal/versions/extcal_2_28.php 2013-08-22 00:08:41 UTC (rev 11962)
@@ -40,7 +40,7 @@
add `event_picture1` varchar(255) NOT NULL,
add `event_picture2` varchar(255) NOT NULL,
add `event_price` varchar(255) NOT NULL default '',
- add `event_etablissement` int(5) NOT NULL DEFAULT '0';
+ add `event_etablissement` int(5) NOT NULL DEFAULT '1';
__sql__;
$xoopsDB->queryF($sql);
Modified: XoopsModules/extcal/trunk/modules/extcal/xoops_version.php
===================================================================
--- XoopsModules/extcal/trunk/modules/extcal/xoops_version.php 2013-08-21 17:11:58 UTC (rev 11961)
+++ XoopsModules/extcal/trunk/modules/extcal/xoops_version.php 2013-08-22 00:08:41 UTC (rev 11962)
@@ -3,7 +3,6 @@
if (!defined('XOOPS_ROOT_PATH')) {
die('XOOPS root path not defined');
}
-$moduleDirName = basename(dirname(__FILE__));
//include_once('include/constantes.php');
include_once(XOOPS_ROOT_PATH . '/modules/extcal/include/constantes.php');
include_once(XOOPS_ROOT_PATH . '/modules/extcal/include/agenda_fnc.php');
@@ -15,7 +14,7 @@
//***************************************************************************************
$modversion['name'] = _MI_EXTCAL_NAME;
-$modversion['version'] = '2.37';
+$modversion['version'] = '2.38';
$modversion['description'] = _MI_EXTCAL_DESC;
$modversion['credits'] = 'Zoullou';
$modversion['author'] = 'Zoullou, Mage, Mamba, JJ Delalandre (JJDai)';
@@ -25,7 +24,7 @@
$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/";
$modversion['official'] = 0;
$modversion['image'] = 'images/extcal_logo.png';
-$modversion['dirname'] = $moduleDirName;
+$modversion['dirname'] = basename(dirname(__FILE__));
//$modversion['status_version'] = 'Beta 4';
$modversion['sqlfile']['mysql'] = 'sql/mysql.sql';
$modversion['onInstall'] = 'include/install_function.php';
@@ -41,7 +40,7 @@
$modversion["module_website_url"] = "www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
$modversion["release_date"] = "2013/04/20";
-$modversion['module_status'] = "Final";
+$modversion['module_status'] = "Beta 1";
$modversion['min_php'] = '5.2';
$modversion['min_xoops'] = "2.5.6";
@@ -156,7 +155,29 @@
'_MI_EXTCAL_BEFORE' => 0, '_MI_EXTCAL_AFTER' => 1
);
+xoops_load('XoopsEditorHandler');
+$editor_handler = XoopsEditorHandler::getInstance();
+$editorList = array_flip($editor_handler->getList());
+
$i++;
+$modversion['config'][$i]['name'] = 'editorAdmin';
+$modversion['config'][$i]['title'] = "_MI_EXTCAL_EDITOR_ADMIN";
+$modversion['config'][$i]['description'] = "_MI_EXTCAL_EDITOR_ADMIN_DESC";
+$modversion['config'][$i]['formtype'] = 'select';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['options'] = $editorList;
+$modversion['config'][$i]['default'] = 'dhtml';
+
+$i++;
+$modversion['config'][$i]['name'] = 'editorUser';
+$modversion['config'][$i]['title'] = "_MI_EXTCAL_EDITOR_USER";
+$modversion['config'][$i]['description'] = "_MI_EXTCAL_EDITOR_USER_DESC";
+$modversion['config'][$i]['formtype'] = 'select';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['options'] = $editorList;
+$modversion['config'][$i]['default'] = 'dhtml';
+
+$i++;
$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';
|
Thanks for helping keep SourceForge clean.
X