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

Contacts: small fixes and cleanups

This commit is contained in:
Bart Visscher 2012-03-07 21:29:23 +01:00
parent 9599548203
commit d8cfe77ba5
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,8 +96,7 @@ class OC_Calendar_Object{
list($type,$startdate,$enddate,$summary,$repeating,$uid) = self::extractData($object);
if(is_null($uid)){
$uid = self::createUID();
$object->add('UID',$uid);
$object->setUID();
$data = $object->serialize();
}
@ -208,14 +207,6 @@ class OC_Calendar_Object{
return true;
}
/**
* @brief Creates a UID
* @return string
*/
protected static function createUID(){
return substr(md5(rand().time()),0,10);
}
/**
* @brief Extracts data from a vObject-Object
* @param Sabre_VObject $object

6
apps/contacts/ajax/loadphoto.php
View File

@ -18,8 +18,6 @@
* You should have received a copy of the GNU Affero General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*
* TODO: Translatable strings.
* Remember to delete tmp file at some point.
*/
// Init owncloud
require_once('../../../lib/base.php');
@ -33,7 +31,7 @@ OC_JSON::checkAppEnabled('contacts');
function bailOut($msg) {
OC_JSON::error(array('data' => array('message' => $msg)));
OC_Log::write('contacts','ajax/savecrop.php: '.$msg, OC_Log::DEBUG);
OC_Log::write('contacts','ajax/loadphoto.php: '.$msg, OC_Log::DEBUG);
exit();
}
@ -42,7 +40,7 @@ $image = null;
$id = isset($_GET['id']) ? $_GET['id'] : '';
if($id == '') {
bailOut('Missing contact id.');
bailOut(OC_Contacts_App::$l10n->t('Missing contact id.'));
}
$tmpl = new OC_TEMPLATE("contacts", "part.contactphoto");

5
apps/contacts/lib/vcard.php
View File

@ -174,6 +174,9 @@ class OC_Contacts_VCard{
if($property->name == 'UID'){
$uid = $property->value;
}
if($property->name == 'ORG'){
$org = $property->value;
}
if($property->name == 'EMAIL' && is_null($email)){ // only use the first email as substitute for missing N or FN.
$email = $property->value;
}
@ -184,6 +187,8 @@ class OC_Contacts_VCard{
$fn = join(' ', array_reverse(array_slice(explode(';', $n), 0, 2)));
} elseif($email) {
$fn = $email;
} elseif($org) {
$fn = $org;
} else {
$fn = 'Unknown Name';
}