rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2025-02-07 01:54:16 +01:00
Code Issues Releases Activity

Fix variable name.

Browse Source
This commit is contained in:
Thomas Tanghus 2013-02-23 00:30:06 +01:00
parent 2fecf91483
commit 4aa894d0aa
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/vcard.php
View File

@ -195,13 +195,13 @@ class VCard {
/** /**
* @brief Adds a card * @brief Adds a card
* @param $aid integer Addressbook id * @param $aid integer Addressbook id
* @param $card Sabre\VObject\Component vCard file * @param $vcard \Sabre\VObject\Component vCard object
* @param $uri string the uri of the card, default based on the UID * @param $uri string the uri of the card, default based on the UID
* @param $isChecked boolean If the vCard should be checked for validity and version. * @param $isChecked boolean If the vCard should be checked for validity and version.
* @return insertid on success or false. * @return insertid on success or false.
*/ */
public static function add($aid, VObject\Component $card, $uri=null, $isChecked=false) { public static function add($aid, VObject\Component $vcard, $uri=null, $isChecked=false) {
if(is_null($card)) { if(is_null($vcard)) {
\OCP\Util::writeLog('contacts', __METHOD__ . ', No vCard supplied', \OCP\Util::ERROR); \OCP\Util::writeLog('contacts', __METHOD__ . ', No vCard supplied', \OCP\Util::ERROR);
return null; return null;
}; };
@ -223,20 +223,20 @@ class VCard {
$now = new \DateTime; $now = new \DateTime;
$vcard->REV = $now->format(\DateTime::W3C); $vcard->REV = $now->format(\DateTime::W3C);
// Add product ID is missing. // Add product ID is missing.
//$prodid = trim($card->getAsString('PRODID')); //$prodid = trim($vcard->getAsString('PRODID'));
//if(!$prodid) { //if(!$prodid) {
if(!isset($card->PRODID)) { if(!isset($vcard->PRODID)) {
$appinfo = \OCP\App::getAppInfo('contacts'); $appinfo = \OCP\App::getAppInfo('contacts');
$appversion = \OCP\App::getAppVersion('contacts'); $appversion = \OCP\App::getAppVersion('contacts');
$prodid = '-//ownCloud//NONSGML '.$appinfo['name'].' '.$appversion.'//EN'; $prodid = '-//ownCloud//NONSGML '.$appinfo['name'].' '.$appversion.'//EN';
$card->add('PRODID', $prodid); $vcard->add('PRODID', $prodid);
} }
$fn = isset($card->FN) ? $card->FN : ''; $fn = isset($vcard->FN) ? $vcard->FN : '';
$uri = isset($uri) ? $uri : $card->UID . '.vcf'; $uri = isset($uri) ? $uri : $vcard->UID . '.vcf';
$data = $card->serialize(); $data = $vcard->serialize();
$stmt = \OCP\DB::prepare( 'INSERT INTO `*PREFIX*contacts_cards` (`addressbookid`,`fullname`,`carddata`,`uri`,`lastmodified`) VALUES(?,?,?,?,?)' ); $stmt = \OCP\DB::prepare( 'INSERT INTO `*PREFIX*contacts_cards` (`addressbookid`,`fullname`,`carddata`,`uri`,`lastmodified`) VALUES(?,?,?,?,?)' );
try { try {
$result = $stmt->execute(array($aid, $fn, $data, $uri, time())); $result = $stmt->execute(array($aid, $fn, $data, $uri, time()));
@ -250,8 +250,8 @@ class VCard {
return false; return false;
} }
$newid = \OCP\DB::insertid('*PREFIX*contacts_cards'); $newid = \OCP\DB::insertid('*PREFIX*contacts_cards');
App::loadCategoriesFromVCard($newid, $card); App::loadCategoriesFromVCard($newid, $vcard);
App::updateDBProperties($newid, $card); App::updateDBProperties($newid, $vcard);
App::cacheThumbnail($newid); App::cacheThumbnail($newid);
Addressbook::touch($aid); Addressbook::touch($aid);