Merge branch 'master' into calendar_sharing
This commit is contained in:
commit
96dd008f5e
|
@ -1,3 +1,4 @@
|
||||||
|
ErrorDocument 403 /core/templates/403.php
|
||||||
ErrorDocument 404 /core/templates/404.php
|
ErrorDocument 404 /core/templates/404.php
|
||||||
<IfModule mod_php5.c>
|
<IfModule mod_php5.c>
|
||||||
php_value upload_max_filesize 512M
|
php_value upload_max_filesize 512M
|
||||||
|
|
|
@ -228,7 +228,7 @@ class OC_Contacts_VCard{
|
||||||
* @param string $uri the uri of the card, default based on the UID
|
* @param string $uri the uri of the card, default based on the UID
|
||||||
* @return insertid on success or null if no card.
|
* @return insertid on success or null if no card.
|
||||||
*/
|
*/
|
||||||
public static function add($aid, $card, $uri=null){
|
public static function add($aid, OC_VObject $card, $uri=null){
|
||||||
if(is_null($card)){
|
if(is_null($card)){
|
||||||
OC_Log::write('contacts','OC_Contacts_VCard::add. No vCard supplied', OC_Log::ERROR);
|
OC_Log::write('contacts','OC_Contacts_VCard::add. No vCard supplied', OC_Log::ERROR);
|
||||||
return null;
|
return null;
|
||||||
|
@ -267,7 +267,7 @@ class OC_Contacts_VCard{
|
||||||
*/
|
*/
|
||||||
public static function addFromDAVData($id,$uri,$data){
|
public static function addFromDAVData($id,$uri,$data){
|
||||||
$card = OC_VObject::parse($data);
|
$card = OC_VObject::parse($data);
|
||||||
return self::add($id, $data, $uri);
|
return self::add($id, $card, $uri);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -0,0 +1,15 @@
|
||||||
|
<?php
|
||||||
|
if(!isset($_)){//also provide standalone error page
|
||||||
|
require_once '../../lib/base.php';
|
||||||
|
|
||||||
|
$tmpl = new OC_Template( '', '403', 'guest' );
|
||||||
|
$tmpl->printPage();
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
<ul>
|
||||||
|
<li class='error'>
|
||||||
|
<?php echo $l->t( 'Access forbidden' ); ?><br/>
|
||||||
|
<p class='hint'><?php if(isset($_['file'])) echo $_['file']?></p>
|
||||||
|
</li>
|
||||||
|
</ul>
|
Loading…
Reference in New Issue