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

Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup

This commit is contained in:
Thomas Tanghus 2011-12-11 16:29:53 +01:00
parent c7b7758816 1746cba249
commit 39430c837f
5 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/calendar/js/calendar.js
View File

@ -7,7 +7,6 @@
*/
Calendar={
space:' ',
UI:{
startEventDialog:function(){
$('.tipsy').remove();
@ -271,9 +270,9 @@ Calendar={
var url;
if (calendarid == 'new'){
url = "ajax/createcalendar.php";
url = OC.filePath('calendar', 'ajax', 'createcalendar.php');
}else{
url = "ajax/updatecalendar.php";
url = OC.filePath('calendar', 'ajax', 'updatecalendar.php');
}
$.post(url, { id: calendarid, name: displayname, active: active, description: description, color: calendarcolor },
function(data){

17
apps/calendar/lib/object.php
View File

@ -460,7 +460,7 @@ class OC_Calendar_Object{
{
$title = $request["title"];
$location = $request["location"];
$categories = isset($request["categories"]) ? $request["categories"] : null;
$categories = isset($request["categories"]) ? $request["categories"] : array();
$allday = isset($request["allday"]);
$from = $request["from"];
$to = $request["to"];
@ -511,20 +511,9 @@ class OC_Calendar_Object{
}
unset($vevent->DURATION);
$vevent->setString('LOCATION', $location);
if($description != ""){
$vevent->DESCRIPTION = $description;
}else{
unset($vevent->DESCRIPTION);
}
if(!empty($categories)){
$vevent->CATEGORIES = join(',', $categories);
}else{
unset($vevent->CATEGORIES);
}
$vevent->setString('DESCRIPTION', $description);
$vevent->setString('CATEGORIES', join(',', $categories));
/*if($repeat == "true"){
$vevent->RRULE = $repeat;

1
apps/gallery/css/styles.css
View File

@ -13,6 +13,7 @@ div#gallery_album_box {
border: 0;
display: inline-block;
margin: 5pt;
vertical-align: top;
}
.leftcontent div#gallery_album_box {
margin: 5px;

10
lib/updater.php
View File

@ -52,13 +52,9 @@ class OC_Updater{
$tmp['url'] = $data->url;
$tmp['web'] = $data->web;
return $tmp;
}
public static function ShowUpdatingHint(){
$data=OC_Updater::check();
if(isset($data['version']) and $data['version']<>'') {
@ -67,10 +63,8 @@ class OC_Updater{
$txt='Your ownCloud is up to date';
}
return($txt);
}
/**
* do ownCloud update
*/
@ -83,9 +77,5 @@ class OC_Updater{
//update version in config
}
}
?>

6
lib/vobject.php
View File

@ -48,6 +48,7 @@ class OC_VObject{
}
return $vobject;
} catch (Exception $e) {
OC_Log::write('vobject', $e->getMessage(), OC_Log::ERROR);
return null;
}
}
@ -132,6 +133,7 @@ class OC_VObject{
public function setString($name, $string){
if ($string != ''){
$string = strtr($string, array("\r\n"=>"\n"));
$this->vobject->__set($name, $string);
}else{
$this->vobject->__unset($name);
@ -195,6 +197,10 @@ class OC_VObject{
return $this->vobject->__unset($name);
}
public function __isset($name){
return $this->vobject->__isset($name);
}
public function __call($function,$arguments){
return call_user_func_array(array($this->vobject, $function), $arguments);
}