Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[10604] XoopsModules/extcal/trunk/modules/extcal
|
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";
|
