1.6.1 (fixed #8)

skjnldsv · Dec 15, 2015 · c335570 · c335570
1 parent 2a2d8f4
commit c335570
Show file tree

Hide file tree

Showing 23 changed files with 45 additions and 46 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+1.6.1:
+ - Big cleanup
+ - Unused vars removed (bug #8)
+ - Contact picture url rewriting fix (bug #8)
+
 1.6.0:
  - Added match from suggested friends
  - Fixed match page loading (No more waiting for page to load all the images)

diff --git a/app/contact.php b/app/contact.php
@@ -11,8 +11,6 @@
 
 namespace OCA\FbSync\App;
 
-use OCA\FbSync\Controller\ContactsController;
-use OCP\ICache;
 use OCP\Image;
 use OCA\FbSync\Controller\FacebookController;
 use Sabre\VObject;
@@ -25,14 +23,6 @@
  * @package OCA\FbSync\App
  */
 class Contact {
-	/**
-	 * @var ICache
-	 */
-	private $cache;
-	/**
-	 * @var IManager
-	 */
-	private $contactsManager;
 	/**
 	 * @var FacebookController
 	 */
@@ -56,24 +46,19 @@ class Contact {
 
 	/**
 	* Construct
-	* @var ICache 
+	* @var FacebookController The facebook controller instance
 	* @var integer The contact local id 
-	* @var integer|false The contact facebook id
 	* @var string The adressbook backend (usually "local")
-	* @var integer The adressbook id
-	* @var string The photo url
+	* @var intstringeger The last edit time
+	* @var VObject The vcard data
 	*/
 	public function __construct(
-		IManager $contactsManager,
-		ICache $cache,
 		FacebookController $fbController,
-		integer $id,
-		string $addressbook,
-		string $lastmodified,
+		$id,
+		$addressbook,
+		$lastmodified,
 		VObject $vcard
 	) {
-		$this->contactsManager = $contactsManager;
-		$this->cache = $cache;
 		$this->fbController = $fbController;
 		$this->id = $id;
 		$this->addressbook = $addressbook;
@@ -234,10 +219,10 @@ public function setFBID($fbid) {
 	 */
 	public function getPhotoUrl($size=false) {
 		if(App::$contactPlus) {
-			$photo = "index.php/apps/contactsplus/getcontactphoto/".$this->id;						 	
+			$photo = "/index.php/apps/contactsplus/getcontactphoto/".$this->id;						 	
 		} else {
 
-			$photo = "index.php/apps/contacts/addressbook/".
+			$photo = "/index.php/apps/contacts/addressbook/".
 				$this->backend."/".
 				$this->addressbook."/contact/".
 				$this->id."/photo";

diff --git a/app/contacts.php b/app/contacts.php
@@ -49,8 +49,6 @@ public function getList(){
 		foreach($activeAddressbooks as $activeAddressbook) {
 			foreach(VCard::all($activeAddressbook) as $contact) {
 				$contacts[$contact['id']] = new Contact(
-					$this->contactsManager,
-					$this->cache,
 					$this->fbController,
 					$contact['id'],
 					$contact['addressbookid'],
@@ -74,8 +72,6 @@ public function getContact($id){
 		// Do you have the right to get this contact?
 		if(in_array($contact['addressbookid'], $activeAddressbooks)) {
 			return new Contact(
-				$this->contactsManager,
-				$this->cache,
 				$this->fbController,
 				$contact['id'],
 				$contact['addressbookid'],
@@ -170,7 +166,7 @@ public function delFBID($id) {
 	 * Get profile picture url
 	 * @NoAdminRequired
 	 */
-	public function getPhoto($id, $size) {
+	public function getPhoto($id, $size=60) {
 		$contact = $this->getContact($id);
 		if(!$contact) {
 			return false;

diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -5,7 +5,7 @@
     <description>A Facebook info sync for owncloud contacts</description>
     <licence>AGPL</licence>
     <author>NOIJN</author>
-    <version>1.6.0</version>
+    <version>1.6.1</version>
     <namespace>FbSync</namespace>
     <category>other</category>
     <require>8</require>

diff --git a/appinfo/jobs.php b/appinfo/jobs.php
diff --git a/appinfo/routes.php b/appinfo/routes.php
@@ -25,6 +25,7 @@
 	   ['name' => 'contacts#setPhoto', 'url' => '/setphoto/{id}', 'verb' => 'GET'],
 	   ['name' => 'contacts#setBirthday', 'url' => '/setbday/{id}', 'verb' => 'GET'],
 	   ['name' => 'contacts#getFbContacts', 'url' => '/FBcontacts', 'verb' => 'GET'],
+	   ['name' => 'contacts#getPhoto', 'url' => '/getphoto/{id}', 'verb' => 'GET'],
 	   ['name' => 'contacts#getPhoto', 'url' => '/getphoto/{id}/{size}', 'verb' => 'GET'],
 	   ['name' => 'contacts#deletePhotos', 'url' => '/contacts/delphotos', 'verb' => 'GET'],
 	   ['name' => 'contacts#deleteBdays', 'url' => '/contacts/delbdays', 'verb' => 'GET'],

diff --git a/appinfo/update.php b/appinfo/update.php
diff --git a/controller/facebookcontroller.php b/controller/facebookcontroller.php
@@ -37,13 +37,13 @@ class FacebookController extends Controller {
 	 * @var Int Friends cache time (24h)
 	 * @var Int Friends cache key
 	 */
-	private $cacheKey = "FBfriends-";
+	private $cacheKey;
 
 	public function __construct($AppName, ICache $cache=null, $userHome){
 		parent::__construct($AppName);
 		$this->cache = $cache;
 		$this->userHome = $userHome;
-		$this->cacheKey = $cacheKey.substr(md5($this->userHome), 0, 8);
+		$this->cacheKey = "FBfriends-".substr(md5($this->userHome), 0, 8);
 	}
 
     /**

diff --git a/css/fbsync.css b/css/fbsync.css
@@ -276,6 +276,9 @@
 	border-radius: 0;
 	display: block;
 }
+#contacts-list-results {
+	padding: 20px;
+}
 .sync-contact {
 	display: inline-block;
 	margin: 10px;

diff --git a/fonts/FontAwesome.otf b/fonts/FontAwesome.otf
diff --git a/fonts/IndieFlower.woff2 b/fonts/IndieFlower.woff2
diff --git a/fonts/font-awesome.min.css b/fonts/font-awesome.min.css
diff --git a/fonts/fontawesome-webfont.eot b/fonts/fontawesome-webfont.eot
diff --git a/fonts/fontawesome-webfont.svg b/fonts/fontawesome-webfont.svg
diff --git a/fonts/fontawesome-webfont.ttf b/fonts/fontawesome-webfont.ttf
diff --git a/fonts/fontawesome-webfont.woff b/fonts/fontawesome-webfont.woff
diff --git a/fonts/fontawesome-webfont.woff2 b/fonts/fontawesome-webfont.woff2
diff --git a/img/loading.xcf b/img/loading.xcf
diff --git a/js/sync.js b/js/sync.js
@@ -16,11 +16,11 @@ function isDoneSyncing(synced, error, ignored, total, syncbutton) {
 	if(synced+error+ignored >= total) {
 		$(syncbutton).text('Done !').removeClass('loading');
 		$('#loader').fadeOut();
-		$('#contacts-list').fadeIn();
+		$('#contacts-list-results').fadeIn();
 		$(".syncbutton").removeProp('disabled');
 		$(syncbutton).text($(syncbutton).data('text')).removeData('text');
 		// Fixes the padding in case of low width screen resolution
-		$('#contacts-list').css({'padding-top':$('#controls').height()+'px'});	
+		$('#contacts-list-results').css({'padding-top':$('#controls').height()+'px'});	
 	}
 }
 
@@ -149,7 +149,7 @@ function syncBirthdays() {
 	$(document).ready(function () {
 
 		// Better visual
-		$('#contacts-list').fadeOut();
+		$('#contacts-list-results').fadeOut();
 		$('.tooltipped-top').tipsy({gravity: 's'});
 		$('.tooltipped-bottom').tipsy({gravity: 'n'});
 
@@ -214,9 +214,9 @@ function syncBirthdays() {
 
 //----------  RESIZE & SCREEN ADAPTATION ----------	
 		// Fixes the padding in case of low width screen resolution
-		$('#contacts-list').css({'padding-top':$('#controls').height()+'px'});
+		$('#contacts-list-results').css({'padding-top':$('#controls').height()+'px'});
 		$(window).resize(function() {
-			$('#contacts-list').css({'padding-top':$('#controls').height()+'px'});
+			$('#contacts-list-results').css({'padding-top':$('#controls').height()+'px'});
 
 		});
 

diff --git a/lib/jarowinkler.php b/lib/jarowinkler.php
@@ -40,7 +40,7 @@
 
 class JaroWinkler {
 
-	private function getCommonCharacters( $string1, $string2, $allowedDistance ){
+	private static function getCommonCharacters( $string1, $string2, $allowedDistance ){
 
 	  $str1_len = strlen($string1);
 	  $str2_len = strlen($string2);

diff --git a/lib/vcard.php b/lib/vcard.php
@@ -103,15 +103,24 @@ public static function all($id, $offset=null, $limit=null, $fields = array(),$bO
 		if(!is_null($result)) {
 			while( $row = $result->fetchRow()) {
 
-				if($row['bcompany']){
-					$row['sortFullname'] = mb_substr($row['fullname'],0,3,"UTF-8");
-				}else{
-				  	if($row['lastname'] !== ''){	
-				  		$row['sortFullname'] = mb_substr($row['lastname'],0,3,"UTF-8");
-					}else{
-						$row['sortFullname'] = mb_substr($row['surename'],0,3,"UTF-8");
+				// Prevent undefined indexes if using the default contacts app
+				if(isset($row['bcompany']) && isset($row['lastname'])) {
+
+					if($row['bcompany']){
+						$row['sortFullname'] = mb_substr($row['fullname'],0,3,"UTF-8");
+					} else {
+						if($row['lastname'] !== ''){	
+							$row['sortFullname'] = mb_substr($row['lastname'],0,3,"UTF-8");
+						} else {
+							$row['sortFullname'] = mb_substr($row['surename'],0,3,"UTF-8");
+						}
 					}
+
+				} else {
+					$row['lastname'] == '';
+					$row['bcompany'] == false;
 				}
+
 				if($row['fullname'] == '' && $row['lastname'] == ''){
 					$row['fullname'] = 'unknown';
 					$row['sortFullname'] = mb_substr($row['fullname'],0,3,"UTF-8");
@@ -286,7 +295,7 @@ public static function edit($id, VObject\Component $card) {
 		if($bCompany && $organization !== ''){
 			$card->FN = $organization;
 			$fn = $organization;
-		}else{
+		} else {
 			if($lastname !== '' || $surename !== ''){	
 				$fn = $surename.$lastname;
 				$card->FN = $fn;

diff --git a/templates/error.php b/templates/error.php
diff --git a/templates/sync.php b/templates/sync.php
@@ -61,7 +61,7 @@
 		<!-- Fake contact div to load the contact svg before the contacts pictures -->
 		<div class="sync-contact" style="display:none"></div>
 
-		<div id="contacts-list" class="hidden">
+		<div id="contacts-list-results" style="display:none">
 			<div id="sync-success" class="clear sync-results-container"><h2>Success</h2><div class="sync-results"></div></div>
 			<div id="sync-errors" class="clear sync-results-container"><h2>Errors</h2><div class="sync-results"></div></div>
 			<div id="sync-ignored" class="clear sync-results-container"><h2>Ignored</h2><div class="sync-results"></div></div>