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

removed description field for calendar

This commit is contained in:
Marvin Thomas Rabe 2011-10-08 13:28:01 +02:00
parent 39e7db7db4
commit f3f5d775b5
9 changed files with 15 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/calendar/ajax/createcalendar.php
View File

@ -15,7 +15,7 @@ OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('calendar'); OC_JSON::checkAppEnabled('calendar');
$userid = OC_User::getUser(); $userid = OC_User::getUser();
$calendarid = OC_Calendar_Calendar::addCalendar($userid, $_POST['name'], $_POST['description'], 'VEVENT,VTODO,VJOURNAL', null, 0, $_POST['color']); $calendarid = OC_Calendar_Calendar::addCalendar($userid, $_POST['name'], 'VEVENT,VTODO,VJOURNAL', null, 0, $_POST['color']);
OC_Calendar_Calendar::setCalendarActive($calendarid, 1); OC_Calendar_Calendar::setCalendarActive($calendarid, 1);
$calendar = OC_Calendar_Calendar::findCalendar($calendarid); $calendar = OC_Calendar_Calendar::findCalendar($calendarid);
$tmpl = new OC_Template('calendar', 'part.choosecalendar.rowfields'); $tmpl = new OC_Template('calendar', 'part.choosecalendar.rowfields');

1
apps/calendar/ajax/newcalendar.php
View File

@ -15,7 +15,6 @@ OC_JSON::checkAppEnabled('calendar');
$calendar = array( $calendar = array(
'id' => 'new', 'id' => 'new',
'displayname' => '', 'displayname' => '',
'description' => '',
'calendarcolor' => '', 'calendarcolor' => '',
); );
$tmpl = new OC_Template('calendar', 'part.editcalendar'); $tmpl = new OC_Template('calendar', 'part.editcalendar');

2
apps/calendar/ajax/updatecalendar.php
View File

@ -15,7 +15,7 @@ OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('calendar'); OC_JSON::checkAppEnabled('calendar');
$calendarid = $_POST['id']; $calendarid = $_POST['id'];
OC_Calendar_Calendar::editCalendar($calendarid, $_POST['name'], $_POST['description'], null, null, null, $_POST['color']); OC_Calendar_Calendar::editCalendar($calendarid, $_POST['name'], null, null, null, $_POST['color']);
OC_Calendar_Calendar::setCalendarActive($calendarid, $_POST['active']); OC_Calendar_Calendar::setCalendarActive($calendarid, $_POST['active']);
$calendar = OC_Calendar_Calendar::findCalendar($calendarid); $calendar = OC_Calendar_Calendar::findCalendar($calendarid);
$tmpl = new OC_Template('calendar', 'part.choosecalendar.rowfields'); $tmpl = new OC_Template('calendar', 'part.choosecalendar.rowfields');

6
apps/calendar/appinfo/database.xml
View File

@ -153,12 +153,6 @@
<length>4</length> <length>4</length>
</field> </field>
<field>
<name>description</name>
<type>clob</type>
<notnull>false</notnull>
</field>
<field> <field>
<name>calendarorder</name> <name>calendarorder</name>
<type>integer</type> <type>integer</type>

2
apps/calendar/import.php
View File

@ -23,7 +23,7 @@ if($_GET["import"] == "existing"){
$filename = "/" . $_GET["file"]; $filename = "/" . $_GET["file"];
} }
}else{ }else{
$id = OC_Calendar_Calendar::addCalendar(OC_User::getUser(), $_POST['calname'], $_POST['description']); $id = OC_Calendar_Calendar::addCalendar(OC_User::getUser(), $_POST['calname']);
OC_Calendar_Calendar::setCalendarActive($id, 1); OC_Calendar_Calendar::setCalendarActive($id, 1);
$calid = $id; $calid = $id;
if($_POST["path"] != ""){ if($_POST["path"] != ""){

23
apps/calendar/lib/calendar.php
View File

@ -30,7 +30,6 @@
* uri VARCHAR(100), * uri VARCHAR(100),
* active INTEGER UNSIGNED NOT NULL DEFAULT '0', * active INTEGER UNSIGNED NOT NULL DEFAULT '0',
* ctag INTEGER UNSIGNED NOT NULL DEFAULT '0', * ctag INTEGER UNSIGNED NOT NULL DEFAULT '0',
* description TEXT,
* calendarorder INTEGER UNSIGNED NOT NULL DEFAULT '0', * calendarorder INTEGER UNSIGNED NOT NULL DEFAULT '0',
* calendarcolor VARCHAR(10), * calendarcolor VARCHAR(10),
* timezone TEXT, * timezone TEXT,
@ -94,14 +93,13 @@ class OC_Calendar_Calendar{
* @brief Creates a new calendar * @brief Creates a new calendar
* @param string $userid * @param string $userid
* @param string $name * @param string $name
* @param string $description
* @param string $components Default: "VEVENT,VTODO,VJOURNAL" * @param string $components Default: "VEVENT,VTODO,VJOURNAL"
* @param string $timezone Default: null * @param string $timezone Default: null
* @param integer $order Default: 1 * @param integer $order Default: 1
* @param string $color Default: null * @param string $color Default: null
* @return insertid * @return insertid
*/ */
public static function addCalendar($userid,$name,$description,$components='VEVENT,VTODO,VJOURNAL',$timezone=null,$order=0,$color=null){ public static function addCalendar($userid,$name,$components='VEVENT,VTODO,VJOURNAL',$timezone=null,$order=0,$color=null){
$all = self::allCalendars($userid); $all = self::allCalendars($userid);
$uris = array(); $uris = array();
foreach($all as $i){ foreach($all as $i){
@ -110,8 +108,8 @@ class OC_Calendar_Calendar{
$uri = self::createURI($name, $uris ); $uri = self::createURI($name, $uris );
$stmt = OC_DB::prepare( 'INSERT INTO *PREFIX*calendar_calendars (userid,displayname,uri,ctag,description,calendarorder,calendarcolor,timezone,components) VALUES(?,?,?,?,?,?,?,?,?)' ); $stmt = OC_DB::prepare( 'INSERT INTO *PREFIX*calendar_calendars (userid,displayname,uri,ctag,calendarorder,calendarcolor,timezone,components) VALUES(?,?,?,?,?,?,?,?)' );
$result = $stmt->execute(array($userid,$name,$uri,1,$description,$order,$color,$timezone,$components)); $result = $stmt->execute(array($userid,$name,$uri,1,$order,$color,$timezone,$components));
return OC_DB::insertid(); return OC_DB::insertid();
} }
@ -121,18 +119,17 @@ class OC_Calendar_Calendar{
* @param string $principaluri * @param string $principaluri
* @param string $uri * @param string $uri
* @param string $name * @param string $name
* @param string $description
* @param string $components * @param string $components
* @param string $timezone * @param string $timezone
* @param integer $order * @param integer $order
* @param string $color * @param string $color
* @return insertid * @return insertid
*/ */
public static function addCalendarFromDAVData($principaluri,$uri,$name,$description,$components,$timezone,$order,$color){ public static function addCalendarFromDAVData($principaluri,$uri,$name,$components,$timezone,$order,$color){
$userid = self::extractUserID($principaluri); $userid = self::extractUserID($principaluri);
$stmt = OC_DB::prepare( 'INSERT INTO *PREFIX*calendar_calendars (userid,displayname,uri,ctag,description,calendarorder,calendarcolor,timezone,components) VALUES(?,?,?,?,?,?,?,?,?)' ); $stmt = OC_DB::prepare( 'INSERT INTO *PREFIX*calendar_calendars (userid,displayname,uri,ctag,calendarorder,calendarcolor,timezone,components) VALUES(?,?,?,?,?,?,?,?)' );
$result = $stmt->execute(array($userid,$name,$uri,1,$description,$order,$color,$timezone,$components)); $result = $stmt->execute(array($userid,$name,$uri,1,$order,$color,$timezone,$components));
return OC_DB::insertid(); return OC_DB::insertid();
} }
@ -141,7 +138,6 @@ class OC_Calendar_Calendar{
* @brief Edits a calendar * @brief Edits a calendar
* @param integer $id * @param integer $id
* @param string $name Default: null * @param string $name Default: null
* @param string $description Default: null
* @param string $components Default: null * @param string $components Default: null
* @param string $timezone Default: null * @param string $timezone Default: null
* @param integer $order Default: null * @param integer $order Default: null
@ -150,20 +146,19 @@ class OC_Calendar_Calendar{
* *
* Values not null will be set * Values not null will be set
*/ */
public static function editCalendar($id,$name=null,$description=null,$components=null,$timezone=null,$order=null,$color=null){ public static function editCalendar($id,$name=null,$components=null,$timezone=null,$order=null,$color=null){
// Need these ones for checking uri // Need these ones for checking uri
$calendar = self::findCalendar($id); $calendar = self::findCalendar($id);
// Keep old stuff // Keep old stuff
if(is_null($name)) $name = $calendar['name']; if(is_null($name)) $name = $calendar['name'];
if(is_null($description)) $description = $calendar['description'];
if(is_null($components)) $components = $calendar['components']; if(is_null($components)) $components = $calendar['components'];
if(is_null($timezone)) $timezone = $calendar['timezone']; if(is_null($timezone)) $timezone = $calendar['timezone'];
if(is_null($order)) $order = $calendar['calendarorder']; if(is_null($order)) $order = $calendar['calendarorder'];
if(is_null($color)) $color = $calendar['color']; if(is_null($color)) $color = $calendar['color'];
$stmt = OC_DB::prepare( 'UPDATE *PREFIX*calendar_calendars SET displayname=?,description=?,calendarorder=?,calendarcolor=?,timezone=?,components=?,ctag=ctag+1 WHERE id=?' ); $stmt = OC_DB::prepare( 'UPDATE *PREFIX*calendar_calendars SET displayname=?,calendarorder=?,calendarcolor=?,timezone=?,components=?,ctag=ctag+1 WHERE id=?' );
$result = $stmt->execute(array($name,$description,$order,$color,$timezone,$components,$id)); $result = $stmt->execute(array($name,$order,$color,$timezone,$components,$id));
return true; return true;
} }

6
apps/calendar/lib/connector_sabre.php
View File

@ -102,13 +102,12 @@ class OC_Connector_Sabre_CalDAV extends Sabre_CalDAV_Backend_Abstract {
} }
if(!isset($newValues['displayname'])) $newValues['displayname'] = 'unnamed'; if(!isset($newValues['displayname'])) $newValues['displayname'] = 'unnamed';
if(!isset($newValues['description'])) $newValues['description'] = '';
if(!isset($newValues['components'])) $newValues['components'] = 'VEVENT,VTODO'; if(!isset($newValues['components'])) $newValues['components'] = 'VEVENT,VTODO';
if(!isset($newValues['timezone'])) $newValues['timezone'] = null; if(!isset($newValues['timezone'])) $newValues['timezone'] = null;
if(!isset($newValues['calendarorder'])) $newValues['calendarorder'] = 0; if(!isset($newValues['calendarorder'])) $newValues['calendarorder'] = 0;
if(!isset($newValues['calendarcolor'])) $newValues['calendarcolor'] = null; if(!isset($newValues['calendarcolor'])) $newValues['calendarcolor'] = null;
return OC_Calendar_Calendar::addCalendarFromDAVData($principalUri,$calendarUri,$newValues['displayname'],$newValues['description'],$newValues['components'],$newValues['timezone'],$newValues['calendarorder'],$newValues['calendarcolor']); return OC_Calendar_Calendar::addCalendarFromDAVData($principalUri,$calendarUri,$newValues['displayname'],$newValues['components'],$newValues['timezone'],$newValues['calendarorder'],$newValues['calendarcolor']);
} }
/** /**
@ -191,12 +190,11 @@ class OC_Connector_Sabre_CalDAV extends Sabre_CalDAV_Backend_Abstract {
// Success // Success
if(!isset($newValues['displayname'])) $newValues['displayname'] = null; if(!isset($newValues['displayname'])) $newValues['displayname'] = null;
if(!isset($newValues['description'])) $newValues['description'] = null;
if(!isset($newValues['timezone'])) $newValues['timezone'] = null; if(!isset($newValues['timezone'])) $newValues['timezone'] = null;
if(!isset($newValues['calendarorder'])) $newValues['calendarorder'] = null; if(!isset($newValues['calendarorder'])) $newValues['calendarorder'] = null;
if(!isset($newValues['calendarcolor'])) $newValues['calendarcolor'] = null; if(!isset($newValues['calendarcolor'])) $newValues['calendarcolor'] = null;
OC_Calendar_Calendar::editCalendar($calendarId,$newValues['displayname'],$newValues['description'],null,$newValues['timezone'],$newValues['calendarorder'],$newValues['calendarcolor']); OC_Calendar_Calendar::editCalendar($calendarId,$newValues['displayname'],null,$newValues['timezone'],$newValues['calendarorder'],$newValues['calendarcolor']);
return true; return true;

6
apps/calendar/templates/part.editcalendar.php
View File

@ -25,12 +25,6 @@
</td> </td>
</tr> </tr>
<?php endif; ?> <?php endif; ?>
<tr>
<th><?php echo $l->t('Description') ?></th>
<td>
<textarea id="description_<?php echo $_['calendar']['id'] ?>"><?php echo $_['calendar']['description'] ?></textarea>
</td>
</tr>
<tr> <tr>
<th><?php echo $l->t('Calendar color') ?></th> <th><?php echo $l->t('Calendar color') ?></th>
<td> <td>

8
apps/calendar/templates/part.import.php
View File

@ -31,11 +31,6 @@ foreach($calendars as $calendar){
<input id="displayname" type="text" value=""> <input id="displayname" type="text" value="">
</td> </td>
</tr> </tr>
<th><?php echo $l->t('Description') ?></th>
<td>
<textarea id="description"></textarea>
</td>
</tr>
</table> </table>
<!-- end of modified part --> <!-- end of modified part -->
<br><br> <br><br>
@ -65,8 +60,7 @@ function importcal(importtype){
} }
if(importtype == "new"){ if(importtype == "new"){
var calname = $("#displayname").val(); var calname = $("#displayname").val();
var description = $("#description").val(); $.post(OC.filePath('calendar', '', 'import.php'), {'import':'new', 'calname':calname, 'path':path, 'file':file}, function(){
$.post(OC.filePath('calendar', '', 'import.php'), {'import':'new', 'calname':calname, 'description':description, 'path':path, 'file':file}, function(){
$("#importdialog").dialog('destroy').remove(); $("#importdialog").dialog('destroy').remove();
$("#importdialogholder").remove(); $("#importdialogholder").remove();
}); });