Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[9681] XoopsModules/fullcalendar/releases/1.01/modules/ fullcalendar
|
From: <txm...@us...> - 2012-06-19 23:24:30
|
Revision: 9681
http://xoops.svn.sourceforge.net/xoops/?rev=9681&view=rev
Author: txmodxoops
Date: 2012-06-19 23:24:23 +0000 (Tue, 19 Jun 2012)
Log Message:
-----------
Updated
Added mysql static variables
Modified Paths:
--------------
XoopsModules/fullcalendar/releases/1.01/modules/fullcalendar/admin/delete_events.php
XoopsModules/fullcalendar/releases/1.01/modules/fullcalendar/class/fullcalendar_events.php
XoopsModules/fullcalendar/releases/1.01/modules/fullcalendar/events.php
XoopsModules/fullcalendar/releases/1.01/modules/fullcalendar/include/functions.php
XoopsModules/fullcalendar/releases/1.01/modules/fullcalendar/index.php
XoopsModules/fullcalendar/releases/1.01/modules/fullcalendar/language/english/admin.php
XoopsModules/fullcalendar/releases/1.01/modules/fullcalendar/language/italian/admin.php
XoopsModules/fullcalendar/releases/1.01/modules/fullcalendar/sql/mysql.sql
Modified: XoopsModules/fullcalendar/releases/1.01/modules/fullcalendar/admin/delete_events.php
===================================================================
--- XoopsModules/fullcalendar/releases/1.01/modules/fullcalendar/admin/delete_events.php 2012-06-19 23:21:37 UTC (rev 9680)
+++ XoopsModules/fullcalendar/releases/1.01/modules/fullcalendar/admin/delete_events.php 2012-06-19 23:24:23 UTC (rev 9681)
@@ -50,8 +50,8 @@
$criteria->setOrder("ASC");
$events_arr = $eventsHandler->getAll($criteria);
if(count($events_arr)) {
- foreach ($events_arr as $oneevent) {
- $eventslist->addOption($oneevent->getVar('event_id'),$oneevent->getVar('event_title'));
+ foreach ($events_arr as $evnt) {
+ $eventslist->addOption($evnt->getVar('event_id'), $evnt->getVar('event_title'));
}
}
$eventslist->setDescription(_AM_FULLCALENDAR_EXPORT_PRUNE_DSC);
@@ -64,7 +64,7 @@
break;
case "confirmbeforetoprune":
- $events = $eventsHandler->get($_GET['event_id']);
+ $events = $eventsHandler->get($_GET['event_id']);
$eventlist = '';
if(isset($_POST['pruned_events'])) {
$eventlist = implode(',',$_POST['pruned_events']);
@@ -82,13 +82,37 @@
if($count) {
$displaydate = formatTimestamp($timestamp);
$msg = sprintf(_AM_FULLCALENDAR_PRUNE_CONFIRM, $displaydate, $count);
- xoops_confirm(array( 'op' => 'delete_allevents', "event_id" => $_REQUEST["event_id"], 'expired' => $expired, 'pruned_events' => $eventlist, 'prune_date' => $timestamp, 'ok' => 1), 'delete_events.php', $msg);
+ xoops_confirm(array( 'op' => 'delete_allevents', "event_id" => $_REQUEST["event_id"], 'onlyexpired' => $expired, 'pruned_events' => $eventlist, 'prune_date' => $timestamp, 'ok' => 1), 'delete_events.php', $msg);
}
- unset($events);
+ unset($events);
+
+ /* $date = '';
+ $timestamp = 0;
+ $eventslist = '';
+ $criteria = new CriteriaCompo();
+ if(isset($_POST['prune_date']) && xoops_trim($_POST['prune_date'])!='') {
+ $date = $_POST['prune_date'];
+ $timestamp = mktime(0,0,0,intval(substr($date,5,2)), intval(substr($date,8,2)), intval(substr($date,0,4)));
+ $date = date(_MEDIUMDATESTRING, $timestamp);
+ $criteria->add(new Criteria("date_format(event_end, "._MYSQLDBDATESTRING.")", $date, '<='));
+ }
+ $expired = 0;
+ if(isset($_POST['onlyexpired']) && xoops_trim($_POST['onlyexpired']) != 0) {
+ $criteria->add(new Criteria('onlyexpired', $_POST['onlyexpired'], '='));
+ }
+
+ $count=0;
+ $count = $eventsHandler->getCount($criteria);
+ if($count>0) {
+ $msg=sprintf(_AM_MYSEARCH_PRUNE_CONFIRM,$count);
+ xoops_confirm(array( 'op' => 'delete_allevents', 'onlyexpired' => $onlyexpired, 'prune_date' => $timestamp, 'ok' => 1), 'delete_events.php', $msg);
+ } else {
+ printf(_AM_MYSEARCH_NOTHING_PRUNE);
+ } */
break;
case "delete_allevents":
- $events = $eventsHandler->get($_GET['event_id']);
+ /*$events = $eventsHandler->get($_GET['event_id']);
$timestamp = intval($_POST['prune_date']);
$expired = intval($_POST['expired']);
$criteria = new CriteriaCompo(new Criteria("event_id", $_GET['event_id']));
@@ -114,7 +138,25 @@
}
}
unset($events);
- }
+ }*/
+
+ $timestamp = 0;
+ $criteria = new CriteriaCompo();
+
+ if(isset($_POST['prune_date']) && intval($_POST['prune_date']) != 0) {
+ $timestamp = $_POST['prune_date'];
+ $date = date(_MEDIUMDATESTRING, $timestamp);
+ $criteria->add(new Criteria("date_format(event_end, "._MYSQLDBDATESTRING.")", $date,'<='));
+ }
+
+ if(isset($_POST['onlyexpired']) && xoops_trim($_POST['onlyexpired']) != 0) {
+ $criteria->add(new Criteria('onlyexpired', $_POST['onlyexpired'], '='));
+ }
+
+ if(intval($_POST['ok']) == 1) {
+ $eventsHandler->deleteAll($criteria);
+ redirect_header('delete_events.php?op=prune_events', 3, _AM_FULLCALENDAR_PRUNE_DELETED);
+ }
break;
}
include "admin_footer.php";
Modified: XoopsModules/fullcalendar/releases/1.01/modules/fullcalendar/class/fullcalendar_events.php
===================================================================
--- XoopsModules/fullcalendar/releases/1.01/modules/fullcalendar/class/fullcalendar_events.php 2012-06-19 23:21:37 UTC (rev 9680)
+++ XoopsModules/fullcalendar/releases/1.01/modules/fullcalendar/class/fullcalendar_events.php 2012-06-19 23:24:23 UTC (rev 9681)
@@ -79,9 +79,9 @@
$editor_configs["editor"] = $GLOBALS["xoopsModuleConfig"]["fullcalendar_editor"];
$form->addElement( new XoopsFormEditor(_AM_FULLCALENDAR_EVENT_DESCRIPTION, "event_description", $editor_configs), false );
// event_start
- $form->addElement(new XoopsFormDateTime(_AM_FULLCALENDAR_EVENT_START, "event_start", 15, $this->getVar("event_start")), true);
+ $form->addElement(new XoopsFormTextDatePicker(_AM_FULLCALENDAR_EVENT_START, "event_start", 15, $this->getVar("event_start")), true);
// event_end
- $form->addElement(new XoopsFormDateTime(_AM_FULLCALENDAR_EVENT_END, "event_end", 15, $this->getVar("event_end")), true);
+ $form->addElement(new XoopsFormTextDatePicker(_AM_FULLCALENDAR_EVENT_END, "event_end", 15, $this->getVar("event_end")), true);
// event_url
$form->addElement(new XoopsFormText(_AM_FULLCALENDAR_EVENT_URL, "event_url", 50, 255, $this->getVar("event_url")), false);
// event_weight
@@ -104,30 +104,7 @@
$form->addElement(new XoopsFormHidden("op", "save_event"));
$form->addElement(new XoopsFormButton("", "submit", _SUBMIT, "submit"));
return $form;
- }
-
- /**
- * Delete events that were published before a given date
- */
- function DeleteBeforeDate($timestamp, $expired, $eventslist='')
- {
- global $xoopsModule;
- $mid= $xoopsModule->getVar('mid');
- $db =& XoopsDatabaseFactory::getDatabaseConnection();
- $prefix = $db->prefix('fullcalendar_events');
- $sql = 'SELECT event_id FROM '.$prefix.' WHERE event_start <=' . $timestamp;
- if($expired) {
- $sql .=' (AND event_end > 0 AND event_end <= '.time().')';
- }
- if(strlen(trim($eventslist))>0) {
- $sql .=' AND event_id IN ('.$eventslist.')';
- }
- $result = $db->query($sql);
- while ($myrow = $db->fetchArray($result)) {
- $db->queryF('DELETE FROM '.$prefix.' WHERE event_id='.$myrow['event_id']); // Delete the event
- }
- return true;
- }
+ }
}
class fullcalendarfullcalendar_eventsHandler extends XoopsPersistableObjectHandler
{
@@ -135,5 +112,17 @@
{
parent::__construct($db, "fullcalendar_events", "fullcalendar_events", "event_id", "event_title");
}
+
+ function deleteAll($criteria = null)
+ {
+ $sql = 'DELETE FROM '.$this->db->prefix('fullcalendar_events');
+ if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+ $sql .= ' '.$criteria->renderWhere();
+ }
+ if (!$result = $this->db->queryF($sql)) {
+ return false;
+ }
+ return true;
+ }
}
?>
\ No newline at end of file
Modified: XoopsModules/fullcalendar/releases/1.01/modules/fullcalendar/events.php
===================================================================
--- XoopsModules/fullcalendar/releases/1.01/modules/fullcalendar/events.php 2012-06-19 23:21:37 UTC (rev 9680)
+++ XoopsModules/fullcalendar/releases/1.01/modules/fullcalendar/events.php 2012-06-19 23:24:23 UTC (rev 9681)
@@ -27,11 +27,11 @@
* Version : 1.01 Mon 2012/06/11 19:23:28 : Timgno Exp $
* ****************************************************************************
*/
-
-include_once("./header.php");
+include "header.php";
+$event_id = fullcalendar_CleanVars($_REQUEST, 'event_id', 0, 'int');
$xoopsOption['template_main'] = 'fullcalendar_events.html';
include_once XOOPS_ROOT_PATH."/header.php";
-
+fullcalendar_Events( FULLCALENDAR_URL, $event_id );
//
$xoopsTpl->assign('xoops_mpageurl', FULLCALENDAR_URL."/events.php");
$xoopsTpl->assign('fullcalendar_url', FULLCALENDAR_URL);
@@ -39,6 +39,5 @@
//
$xoopsTpl->assign('barsocials', $GLOBALS['xoopsModuleConfig']['barsocials']);
$xoopsTpl->assign('fbcomments', $GLOBALS['xoopsModuleConfig']['fbcomments']);
-
include_once XOOPS_ROOT_PATH."/footer.php";
?>
\ No newline at end of file
Modified: XoopsModules/fullcalendar/releases/1.01/modules/fullcalendar/include/functions.php
===================================================================
--- XoopsModules/fullcalendar/releases/1.01/modules/fullcalendar/include/functions.php 2012-06-19 23:21:37 UTC (rev 9680)
+++ XoopsModules/fullcalendar/releases/1.01/modules/fullcalendar/include/functions.php 2012-06-19 23:24:23 UTC (rev 9681)
@@ -57,29 +57,42 @@
return $ret;
}
-function fullcalendar_Events( $editable = false )
+/**
+ * Create Events in Jquery file
+ *
+ * @param string $path
+ * @param boolean $editable
+ * @return
+ */
+function fullcalendar_Events($path, $event_id )
{
- $events_type = $eventsHandler->get($_GET['event_id']);
- $criteria = new Criteria("event_id", $_GET['event_id']);
+ $file = "jqinit.js";
+ $path_file = $path."/js/".$file;
+ //
+ $eventsHandler =& xoops_getModuleHandler('fullcalendar_events');
+ $event_type = $eventsHandler->get($event_id);
+ $criteria = new Criteria("event_id", $event_id);
$criteria->setSort("event_start");
$criteria->setOrder("ASC");
$events = $eventsHandler->getAll($criteria);
+ unset($criteria);
// With JSON for external events
- $ret = "$(document).ready(function() {
+ $ret = "// Fullcalendar for Xoops (timgno)
+ $(document).ready(function() {
$('#calendar').fullCalendar({
header: {
left: 'prev,next today',
center: 'title',
right: 'month,agendaWeek,agendaDay'
},
- editable: ".$editable.",
+ editable: false,
events: [";
$ret = "";
$c = 0;
- foreach($events as $event) {
- if($events[$event]->getVar('event_display') == 1){
- $event_start = formatTimeStamp($events[$event]->getVar('event_start'));
- $event_end = formatTimeStamp($events[$event]->getVar('event_end'));
+ foreach($events as $e) {
+ if($events[$e]->getVar('event_display') == 1){
+ $event_start = formatTimeStamp($events[$e]->getVar('event_start'));
+ $event_end = formatTimeStamp($events[$e]->getVar('event_end'));
// Start Time
$sy = substr($event_start, 0, 4); // start year
$sm = substr($event_start, 5, 2); // start mounth
@@ -93,25 +106,27 @@
$eh = substr($event_end, 11, 2); // end hours
$ei = substr($event_end, 14, 2); // end minutes
$ret .= " {
- id: ".$events[$event]->getVar('event_id').",
- title: '".$events[$event]->getVar('event_title')."',
+ id: ".$events[$e]->getVar('event_id').",
+ title: '".$events[$e]->getVar('event_title')."',
start: new Date(".$sy.", ".$sm.", ".$sd."+1, ".$sh.", ".$si."),
- end: new Date(".$ey.", ".$em.", ".$ed."+1, ".$eh.", ".$ei."),";
- if($events[$event]->getVar('event_allday') != 1){
- $ret .= " allDay: false";
+ end: new Date(".$ey.", ".$em.", ".$ed."+1, ".$eh.", ".$ei."),
+ ";
+ if($events[$e]->getVar('event_allday') != 1){
+ $ret .= "allDay: false
+ ";
} else {
$ret .= "";
}
- if($events[$event]->getVar('event_url') != ''){
- $ret .= " url: '".$events[$event]->getVar('event_url')."'";
+ if($events[$e]->getVar('event_url') != ''){
+ $ret .= "url: '".$events[$e]->getVar('event_url')."'";
} else {
$ret .= "";
}
$comma[$c] = "}";
- }
+ }/**/
$c++;
}
-
+
for ($i = 0; $i < $c; $i++) {
if ( $i != $c - 1 ) {
$ret .= $comma[$i].',
@@ -120,14 +135,42 @@
$ret .= $comma[$i].'
';
}
- }
+ }
+ unset($e);
+ unset($c);
$ret .= "]
});
});";
- return $ret;
+createJqueryFile($path_file, $ret);
+
}
+/**
+ * Create a new Jquery file
+ *
+ * @param string $path_file
+ * @return
+ */
+function createJqueryFile($path_file, $content)
+{
+ // Create and put the content of file
+ if (file_exists($path_file) && isset($content)) {
+ $handle = fopen($path_file , "w");
+ }
+ if (is_writable($path_file))
+ {
+ if (fwrite($handle, $content) === FALSE) {
+ redirect_header( 'index.php', 3, "Non si riesce a scrivere nel file ($path_file)");
+ exit;
+ } else {
+ redirect_header( 'index.php', 3, "Riuscito, scritto ($content) nel file ($path_file)");
+ }
+ fclose($handle);
+ }
+
+}
+
function xoops_meta_keywords($content)
{
$myts =& MyTextSanitizer::getInstance();
Modified: XoopsModules/fullcalendar/releases/1.01/modules/fullcalendar/index.php
===================================================================
--- XoopsModules/fullcalendar/releases/1.01/modules/fullcalendar/index.php 2012-06-19 23:21:37 UTC (rev 9680)
+++ XoopsModules/fullcalendar/releases/1.01/modules/fullcalendar/index.php 2012-06-19 23:24:23 UTC (rev 9681)
@@ -28,18 +28,22 @@
* ****************************************************************************
*/
include "header.php";
+$event_id = fullcalendar_CleanVars($_REQUEST, 'event_id', 0, 'int');
$xoopsOption['template_main'] = 'fullcalendar_index.html';
include_once XOOPS_ROOT_PATH."/header.php";
//keywords
xoops_meta_keywords($GLOBALS['xoopsModuleConfig']['keywords']);
//description
xoops_meta_description(_MD_FULLCALENDAR_DESC);
+$dirname = $GLOBALS['xoopsModule']->getVar('dirname');
//
+fullcalendar_Events( FULLCALENDAR_URL, $event_id );
+//
$GLOBALS['xoTheme']->addStylesheet( '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
-$GLOBALS['xoTheme']->addStylesheet( "modules/".$GLOBALS['xoopsModule']->getVar('dirname')."/css/fullcalendar.css", null );
-$GLOBALS['xoTheme']->addStylesheet( "modules/".$GLOBALS['xoopsModule']->getVar('dirname')."/css/style.css", null );
-$GLOBALS['xoTheme']->addScript( "modules/".$GLOBALS['xoopsModule']->getVar('dirname')."/js/fullcalendar.min.js", null );
-$GLOBALS['xoTheme']->addScript( "modules/".$GLOBALS['xoopsModule']->getVar('dirname')."/js/jqinit.js", null );
+$GLOBALS['xoTheme']->addStylesheet( "modules/".$dirname."/css/fullcalendar.css", null );
+$GLOBALS['xoTheme']->addStylesheet( "modules/".$dirname."/css/style.css", null );
+$GLOBALS['xoTheme']->addScript( "modules/".$dirname."/js/fullcalendar.min.js", null );
+$GLOBALS['xoTheme']->addScript( "modules/".$dirname."/js/jqinit.js", null );
//
$GLOBALS['xoopsTpl']->assign('xoops_mpageurl', FULLCALENDAR_URL."/index.php");
$GLOBALS['xoopsTpl']->assign('fbcomments_width', $GLOBALS['xoopsConfig']['fbcomments_width']);
Modified: XoopsModules/fullcalendar/releases/1.01/modules/fullcalendar/language/english/admin.php
===================================================================
--- XoopsModules/fullcalendar/releases/1.01/modules/fullcalendar/language/english/admin.php 2012-06-19 23:21:37 UTC (rev 9680)
+++ XoopsModules/fullcalendar/releases/1.01/modules/fullcalendar/language/english/admin.php 2012-06-19 23:24:23 UTC (rev 9681)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* ****************************************************************************
* - A Project by Developers TEAM For Xoops - ( http://www.xoops.org )
@@ -81,4 +81,6 @@
//Error NoFrameworks
define("_AM_ERROR_NOFRAMEWORKS","Error: You don't use the Frameworks 'admin module'. Please install this Frameworks");
define("_AM_FULLCALENDAR_MAINTAINEDBY", "is maintained by the");
+// Datetime mysql format
+define('_MYSQLDBDATESTRING', '%d/%m/%X %H:%i');
?>
\ No newline at end of file
Modified: XoopsModules/fullcalendar/releases/1.01/modules/fullcalendar/language/italian/admin.php
===================================================================
--- XoopsModules/fullcalendar/releases/1.01/modules/fullcalendar/language/italian/admin.php 2012-06-19 23:21:37 UTC (rev 9680)
+++ XoopsModules/fullcalendar/releases/1.01/modules/fullcalendar/language/italian/admin.php 2012-06-19 23:24:23 UTC (rev 9681)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* ****************************************************************************
* - A Project by Developers TEAM For Xoops - ( http://www.xoops.org )
@@ -81,4 +81,6 @@
//Error NoFrameworks
define("_AM_ERROR_NOFRAMEWORKS","Error: You don't use the Frameworks 'admin module'. Please install this Frameworks");
define("_AM_FULLCALENDAR_MAINTAINEDBY", "is maintained by the");
+// Datetime mysql format
+define('_MYSQLDBDATESTRING', '%d/%m/%X %H:%i');
?>
\ No newline at end of file
Modified: XoopsModules/fullcalendar/releases/1.01/modules/fullcalendar/sql/mysql.sql
===================================================================
--- XoopsModules/fullcalendar/releases/1.01/modules/fullcalendar/sql/mysql.sql 2012-06-19 23:21:37 UTC (rev 9680)
+++ XoopsModules/fullcalendar/releases/1.01/modules/fullcalendar/sql/mysql.sql 2012-06-19 23:24:23 UTC (rev 9681)
@@ -7,8 +7,8 @@
`event_id` int (8) unsigned NOT NULL auto_increment,
`event_title` varchar (255) NOT NULL default '',
`event_description` tinytext NOT NULL,
-`event_start` int(10) NOT NULL default '0',
-`event_end` int(10) NOT NULL default '0',
+`event_start` datetime NOT NULL default '0000-00-00 00:00',
+`event_end` datetime NOT NULL default '0000-00-00 00:00',
`event_url` varchar (255) NOT NULL default '',
`event_allday` tinyint (1) unsigned NOT NULL default '0',
`event_weight` int (11) unsigned NOT NULL default '0',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
