mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

change some function names in OC_Calendar_Repeat

This commit is contained in:
Georg Ehrke 2012-06-15 11:34:21 +02:00
parent 5c10683432
commit e4529301ff
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/calendar/appinfo/app.php
View File

@ -13,7 +13,7 @@ OCP\Util::connectHook('OC_Calendar', 'addEvent', 'OC_Calendar_Repeat', 'generate
OCP\Util::connectHook('OC_Calendar', 'editEvent', 'OC_Calendar_Repeat', 'update'); OCP\Util::connectHook('OC_Calendar', 'editEvent', 'OC_Calendar_Repeat', 'update');
OCP\Util::connectHook('OC_Calendar', 'deleteEvent', 'OC_Calendar_Repeat', 'clean'); OCP\Util::connectHook('OC_Calendar', 'deleteEvent', 'OC_Calendar_Repeat', 'clean');
OCP\Util::connectHook('OC_Calendar', 'moveEvent', 'OC_Calendar_Repeat', 'update'); OCP\Util::connectHook('OC_Calendar', 'moveEvent', 'OC_Calendar_Repeat', 'update');
OCP\Util::connectHook('OC_Calendar', 'deleteCalendar', 'OC_Calendar_Repeat', 'cleancalendar'); OCP\Util::connectHook('OC_Calendar', 'deleteCalendar', 'OC_Calendar_Repeat', 'cleanCalendar');
OCP\Util::addscript('calendar','loader'); OCP\Util::addscript('calendar','loader');
OCP\Util::addscript("3rdparty", "chosen/chosen.jquery.min"); OCP\Util::addscript("3rdparty", "chosen/chosen.jquery.min");
OCP\Util::addStyle("3rdparty", "chosen/chosen"); OCP\Util::addStyle("3rdparty", "chosen/chosen");

4
apps/calendar/appinfo/update.php
View File

@ -18,7 +18,7 @@ if (version_compare($installedVersion, '0.2.1', '<')) {
if (version_compare($installedVersion, '0.5', '<')) { if (version_compare($installedVersion, '0.5', '<')) {
$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser()); $calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
foreach($calendars as $calendar){ foreach($calendars as $calendar){
OC_Calendar_Repeat::cleancalendar($calendar['id']); OC_Calendar_Repeat::cleanCalendar($calendar['id']);
OC_Calendar_Repeat::generatecalendar($calendar['id']); OC_Calendar_Repeat::generateCalendar($calendar['id']);
} }
} }

16
apps/calendar/lib/repeat.php
View File

@ -49,7 +49,7 @@ class OC_Calendar_Repeat{
* @param (int) $id - id of the calendar * @param (int) $id - id of the calendar
* @return (array) * @return (array)
*/ */
public static function getcalendar($id){ public static function getCalendar($id){
$stmt = OCP\DB::prepare('SELECT * FROM *PREFIX*calendar_repeat WHERE calid = ?'); $stmt = OCP\DB::prepare('SELECT * FROM *PREFIX*calendar_repeat WHERE calid = ?');
$result = $stmt->execute(array($id)); $result = $stmt->execute(array($id));
$return = array(); $return = array();
@ -65,7 +65,7 @@ class OC_Calendar_Repeat{
* @param (string) $until - end for period in UTC * @param (string) $until - end for period in UTC
* @return (array) * @return (array)
*/ */
public static function getcalendar_inperiod($id, $from, $until){ public static function getCalendar_inperiod($id, $from, $until){
$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*calendar_repeat WHERE calid = ?' $stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*calendar_repeat WHERE calid = ?'
.' AND ((startdate >= ? AND startdate <= ?)' .' AND ((startdate >= ? AND startdate <= ?)'
.' OR (enddate >= ? AND enddate <= ?))'); .' OR (enddate >= ? AND enddate <= ?))');
@ -122,7 +122,7 @@ class OC_Calendar_Repeat{
* @param (int) id - id of the calendar * @param (int) id - id of the calendar
* @return (bool) * @return (bool)
*/ */
public static function generatecalendar($id){ public static function generateCalendar($id){
$allobjects = OC_Calendar_Object::all($id); $allobjects = OC_Calendar_Object::all($id);
foreach($allobjects['id'] as $eventid){ foreach($allobjects['id'] as $eventid){
self::generate($eventid); self::generate($eventid);
@ -144,9 +144,9 @@ class OC_Calendar_Repeat{
* @param (int) id - id of the calendar * @param (int) id - id of the calendar
* @return (bool) * @return (bool)
*/ */
public static function updatecalendar($id){ public static function updateCalendar($id){
self::cleancalendar($id); self::cleanCalendar($id);
self::generatecalendar($id); self::generateCalendar($id);
return true; return true;
} }
/* /*
@ -182,7 +182,7 @@ class OC_Calendar_Repeat{
* @return (bool) * @return (bool)
*/ */
public static function is_calendar_cached($id){ public static function is_calendar_cached($id){
$cachedevents = count(self::getcalendar($id)); $cachedevents = count(self::getCalendar($id));
$repeatingevents = 0; $repeatingevents = 0;
$allevents = OC_Calendar_Object::all($id); $allevents = OC_Calendar_Object::all($id);
foreach($allevents as $event){ foreach($allevents as $event){
@ -210,7 +210,7 @@ class OC_Calendar_Repeat{
* @param (int) id - id of the calendar * @param (int) id - id of the calendar
* @return (bool) * @return (bool)
*/ */
public static function cleancalendar($id){ public static function cleanCalendar($id){
$stmt = OCP\DB::prepare('DELETE FROM *PREFIX*calendar_repeat WHERE calid = ?'); $stmt = OCP\DB::prepare('DELETE FROM *PREFIX*calendar_repeat WHERE calid = ?');
$stmt->execute(array($id)); $stmt->execute(array($id));
} }