Switching to scss

apps/dav/lib/CalDAV/BirthdayService.php

@@ -62,28 +62,19 @@ public function __construct(CalDavBackend $calDavBackEnd, CardDavBackend $cardDa
 	 * @param string $cardData
 	 */
 	public function onCardChanged($addressBookId, $cardUri, $cardData) {
-
 		$targetPrincipals = $this->getAllAffectedPrincipals($addressBookId);
 
 		$book = $this->cardDavBackEnd->getAddressBookById($addressBookId);
 		$targetPrincipals[] = $book['principaluri'];
+		$datesToSync = [
+			['postfix' => '', 'field' => 'BDAY', 'symbol' => '*'],
+			['postfix' => '-death', 'field' => 'DEATHDATE', 'symbol' => "†"],
+			['postfix' => '-anniversary', 'field' => 'ANNIVERSARY', 'symbol' => "⚭"],
+		];
 		foreach ($targetPrincipals as $principalUri) {
 			$calendar = $this->ensureCalendarExists($principalUri);
-			$objectUri = $book['uri'] . '-' . $cardUri. '.ics';
-			$calendarData = $this->buildBirthdayFromContact($cardData);
-			$existing = $this->calDavBackEnd->getCalendarObject($calendar['id'], $objectUri);
-			if (is_null($calendarData)) {
-				if (!is_null($existing)) {
-					$this->calDavBackEnd->deleteCalendarObject($calendar['id'], $objectUri);
-				}
-			} else {
-				if (is_null($existing)) {
-					$this->calDavBackEnd->createCalendarObject($calendar['id'], $objectUri, $calendarData->serialize());
-				} else {
-					if ($this->birthdayEvenChanged($existing['calendardata'], $calendarData)) {
-						$this->calDavBackEnd->updateCalendarObject($calendar['id'], $objectUri, $calendarData->serialize());
-					}
-				}
+			foreach ($datesToSync as $type) {
+				$this->updateCalendar($cardUri, $cardData, $book, $calendar['id'], $type);
 			}
 		}
 	}
@@ -98,8 +89,10 @@ public function onCardDeleted($addressBookId, $cardUri) {
 		$targetPrincipals[] = $book['principaluri'];
 		foreach ($targetPrincipals as $principalUri) {
 			$calendar = $this->ensureCalendarExists($principalUri);
-			$objectUri = $book['uri'] . '-' . $cardUri . '.ics';
-			$this->calDavBackEnd->deleteCalendarObject($calendar['id'], $objectUri);
+			foreach (['', '-death', '-anniversary'] as $tag) {
+				$objectUri = $book['uri'] . '-' . $cardUri . $tag .'.ics';
+				$this->calDavBackEnd->deleteCalendarObject($calendar['id'], $objectUri);
+			}
 		}
 	}
 
@@ -124,9 +117,11 @@ public function ensureCalendarExists($principal) {
 
 	/**
 	 * @param string $cardData
+	 * @param string $dateField
+	 * @param string $summarySymbol
 	 * @return null|VCalendar
 	 */
-	public function buildBirthdayFromContact($cardData) {
+	public function buildDateFromContact($cardData, $dateField, $summarySymbol) {
 		if (empty($cardData)) {
 			return null;
 		}
@@ -136,10 +131,10 @@ public function buildBirthdayFromContact($cardData) {
 			return null;
 		}
 
-		if (!isset($doc->BDAY)) {
+		if (!isset($doc->{$dateField})) {
 			return null;
 		}
-		$birthday = $doc->BDAY;
+		$birthday = $doc->{$dateField};
 		if (!(string)$birthday) {
 			return null;
 		}
@@ -168,7 +163,7 @@ public function buildBirthdayFromContact($cardData) {
 		$vEvent->DTEND['VALUE'] = 'DATE';
 		$vEvent->{'UID'} = $doc->UID;
 		$vEvent->{'RRULE'} = 'FREQ=YEARLY';
-		$vEvent->{'SUMMARY'} = $title . ' (*' . $date->format('Y') . ')';
+		$vEvent->{'SUMMARY'} = $title . ' (' . $summarySymbol . $date->format('Y') . ')';
 		$vEvent->{'TRANSP'} = 'TRANSPARENT';
 		$alarm = $vCal->createComponent('VALARM');
 		$alarm->add($vCal->createProperty('TRIGGER', '-PT0M', ['VALUE' => 'DURATION']));
@@ -233,4 +228,30 @@ protected function getAllAffectedPrincipals($addressBookId) {
 		return array_values(array_unique($targetPrincipals, SORT_STRING));
 	}
 
+	/**
+	 * @param string $cardUri
+	 * @param string  $cardData
+	 * @param array $book
+	 * @param int $calendarId
+	 * @param string $type
+	 */
+	private function updateCalendar($cardUri, $cardData, $book, $calendarId, $type) {
+		$objectUri = $book['uri'] . '-' . $cardUri . $type['postfix'] . '.ics';
+		$calendarData = $this->buildDateFromContact($cardData, $type['field'], $type['symbol']);
+		$existing = $this->calDavBackEnd->getCalendarObject($calendarId, $objectUri);
+		if (is_null($calendarData)) {
+			if (!is_null($existing)) {
+				$this->calDavBackEnd->deleteCalendarObject($calendarId, $objectUri);
+			}
+		} else {
+			if (is_null($existing)) {
+				$this->calDavBackEnd->createCalendarObject($calendarId, $objectUri, $calendarData->serialize());
+			} else {
+				if ($this->birthdayEvenChanged($existing['calendardata'], $calendarData)) {
+					$this->calDavBackEnd->updateCalendarObject($calendarId, $objectUri, $calendarData->serialize());
+				}
+			}
+		}
+	}
+
 }

apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php

@@ -41,16 +41,16 @@ class BirthdayServiceTest extends TestCase {
 	/** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject */
 	private $cardDav;
 	/** @var GroupPrincipalBackend | \PHPUnit_Framework_MockObject_MockObject */
-	private $groupPrincialBackend;
+	private $groupPrincipalBackend;
 
 	public function setUp() {
 		parent::setUp();
 
-		$this->calDav = $this->getMockBuilder('OCA\DAV\CalDAV\CalDavBackend')->disableOriginalConstructor()->getMock();
-		$this->cardDav = $this->getMockBuilder('OCA\DAV\CardDAV\CardDavBackend')->disableOriginalConstructor()->getMock();
-		$this->groupPrincialBackend = $this->getMockBuilder('OCA\DAV\DAV\GroupPrincipalBackend')->disableOriginalConstructor()->getMock();
+		$this->calDav = $this->getMockBuilder(CalDavBackend::class)->disableOriginalConstructor()->getMock();
+		$this->cardDav = $this->getMockBuilder(CardDavBackend::class)->disableOriginalConstructor()->getMock();
+		$this->groupPrincipalBackend = $this->getMockBuilder(GroupPrincipalBackend::class)->disableOriginalConstructor()->getMock();
 
-		$this->service = new BirthdayService($this->calDav, $this->cardDav, $this->groupPrincialBackend);
+		$this->service = new BirthdayService($this->calDav, $this->cardDav, $this->groupPrincipalBackend);
 	}
 
 	/**
@@ -59,7 +59,7 @@ public function setUp() {
 	 * @param string | null $data
 	 */
 	public function testBuildBirthdayFromContact($nullExpected, $data) {
-		$cal = $this->service->buildBirthdayFromContact($data);
+		$cal = $this->service->buildDateFromContact($data, 'BDAY', '*');
 		if ($nullExpected) {
 			$this->assertNull($cal);
 		} else {
@@ -83,7 +83,9 @@ public function testOnCardDeleted() {
 			->willReturn([
 			'id' => 1234
 		]);
-		$this->calDav->expects($this->once())->method('deleteCalendarObject')->with(1234, 'default-gump.vcf.ics');
+		$this->calDav->expects($this->at(1))->method('deleteCalendarObject')->with(1234, 'default-gump.vcf.ics');
+		$this->calDav->expects($this->at(2))->method('deleteCalendarObject')->with(1234, 'default-gump.vcf-death.ics');
+		$this->calDav->expects($this->at(3))->method('deleteCalendarObject')->with(1234, 'default-gump.vcf-anniversary.ics');
 		$this->cardDav->expects($this->once())->method('getShares')->willReturn([]);
 
 		$this->service->onCardDeleted(666, 'gump.vcf');
@@ -107,26 +109,37 @@ public function testOnCardChanged($expectedOp) {
 		$this->cardDav->expects($this->once())->method('getShares')->willReturn([]);
 
 		/** @var BirthdayService | \PHPUnit_Framework_MockObject_MockObject $service */
-		$service = $this->getMockBuilder('\OCA\DAV\CalDAV\BirthdayService')
-			->setMethods(['buildBirthdayFromContact', 'birthdayEvenChanged'])
-			->setConstructorArgs([$this->calDav, $this->cardDav, $this->groupPrincialBackend])
+		$service = $this->getMockBuilder(BirthdayService::class)
+			->setMethods(['buildDateFromContact', 'birthdayEvenChanged'])
+			->setConstructorArgs([$this->calDav, $this->cardDav, $this->groupPrincipalBackend])
 			->getMock();
 
 		if ($expectedOp === 'delete') {
-			$this->calDav->expects($this->once())->method('getCalendarObject')->willReturn('');
-			$service->expects($this->once())->method('buildBirthdayFromContact')->willReturn(null);
-			$this->calDav->expects($this->once())->method('deleteCalendarObject')->with(1234, 'default-gump.vcf.ics');
+			$this->calDav->expects($this->exactly(3))->method('getCalendarObject')->willReturn('');
+			$service->expects($this->exactly(3))->method('buildDateFromContact')->willReturn(null);
+			$this->calDav->expects($this->exactly(3))->method('deleteCalendarObject')->withConsecutive(
+				[1234, 'default-gump.vcf.ics'],
+				[1234, 'default-gump.vcf-death.ics'],
+				[1234, 'default-gump.vcf-anniversary.ics']
+			);
 		}
 		if ($expectedOp === 'create') {
-			$service->expects($this->once())->method('buildBirthdayFromContact')->willReturn(new VCalendar());
-			$this->calDav->expects($this->once())->method('createCalendarObject')->with(1234, 'default-gump.vcf.ics', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 3.5.0//EN\r\nCALSCALE:GREGORIAN\r\nEND:VCALENDAR\r\n");
+			$service->expects($this->exactly(3))->method('buildDateFromContact')->willReturn(new VCalendar());
+			$this->calDav->expects($this->exactly(3))->method('createCalendarObject')->withConsecutive(
+				[1234, 'default-gump.vcf.ics', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 3.5.0//EN\r\nCALSCALE:GREGORIAN\r\nEND:VCALENDAR\r\n"],
+				[1234, 'default-gump.vcf-death.ics', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 3.5.0//EN\r\nCALSCALE:GREGORIAN\r\nEND:VCALENDAR\r\n"],
+				[1234, 'default-gump.vcf-anniversary.ics', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 3.5.0//EN\r\nCALSCALE:GREGORIAN\r\nEND:VCALENDAR\r\n"]
+				);
 		}
 		if ($expectedOp === 'update') {
-			$service->expects($this->once())->method('buildBirthdayFromContact')->willReturn(new VCalendar());
-			$service->expects($this->once())->method('birthdayEvenChanged')->willReturn(true);
-			$this->calDav->expects($this->once())->method('getCalendarObject')->willReturn([
-				'calendardata' => '']);
-			$this->calDav->expects($this->once())->method('updateCalendarObject')->with(1234, 'default-gump.vcf.ics', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 3.5.0//EN\r\nCALSCALE:GREGORIAN\r\nEND:VCALENDAR\r\n");
+			$service->expects($this->exactly(3))->method('buildDateFromContact')->willReturn(new VCalendar());
+			$service->expects($this->exactly(3))->method('birthdayEvenChanged')->willReturn(true);
+			$this->calDav->expects($this->exactly(3))->method('getCalendarObject')->willReturn(['calendardata' => '']);
+			$this->calDav->expects($this->exactly(3))->method('updateCalendarObject')->withConsecutive(
+				[1234, 'default-gump.vcf.ics', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 3.5.0//EN\r\nCALSCALE:GREGORIAN\r\nEND:VCALENDAR\r\n"],
+				[1234, 'default-gump.vcf-death.ics', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 3.5.0//EN\r\nCALSCALE:GREGORIAN\r\nEND:VCALENDAR\r\n"],
+				[1234, 'default-gump.vcf-anniversary.ics', "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Sabre//Sabre VObject 3.5.0//EN\r\nCALSCALE:GREGORIAN\r\nEND:VCALENDAR\r\n"]
+				);
 		}
 
 		$service->onCardChanged(666, 'gump.vcf', '');
@@ -162,7 +175,7 @@ public function testGetAllAffectedPrincipals() {
 				'{http://owncloud.org/ns}principal' => 'principals/groups/users'
 			],
 		]);
-		$this->groupPrincialBackend->expects($this->once())->method('getGroupMemberSet')
+		$this->groupPrincipalBackend->expects($this->once())->method('getGroupMemberSet')
 			->willReturn([
 				[
 					'uri' => 'principals/users/user01',

apps/encryption/tests/MigrationTest.php

@@ -343,6 +343,10 @@ private function prepareDB() {
 		unset($cache['files_encryption']);
 		$this->invokePrivate(\OC::$server->getAppConfig(), 'cache', [$cache]);
 
+		$cache = $this->invokePrivate($config, 'userCache');
+		unset($cache[self::TEST_ENCRYPTION_MIGRATION_USER1]);
+		$this->invokePrivate(\OC::$server->getAppConfig(), 'userCache', [$cache]);
+
 		// delete default values set by the encryption app during initialization
 
 		/** @var \OCP\IDBConnection $connection */

apps/files/css/mobile.css

@@ -61,6 +61,11 @@ table td.filename .nametext .innernametext {
 	max-width: 50%;
 }
 
+/* ellipsis on user names in share sidebar */
+#shareWithList .username {
+    max-width: 80px !important;
+}
+
 /* proper notification area for multi line messages */
 #notification-container {
 	display: -webkit-box;
@@ -82,4 +87,4 @@ table td.filename .nametext .innernametext {
 	display: block !important;
 }
 
-}
+}

apps/user_ldap/lib/Access.php

@@ -184,14 +184,14 @@ public function readAttribute($dn, $attr, $filter = 'objectClass=*') {
 		$dn = $this->helper->DNasBaseParameter($dn);
 		$rr = @$this->ldap->read($cr, $dn, $filter, array($attr));
 		if(!$this->ldap->isResource($rr)) {
-			if(!empty($attr)) {
+			if ($attr !== '') {
 				//do not throw this message on userExists check, irritates
 				\OCP\Util::writeLog('user_ldap', 'readAttribute failed for DN '.$dn, \OCP\Util::DEBUG);
 			}
 			//in case an error occurs , e.g. object does not exist
 			return false;
 		}
-		if (empty($attr) && ($filter === 'objectclass=*' || $this->ldap->countEntries($cr, $rr) === 1)) {
+		if ($attr === '' && ($filter === 'objectclass=*' || $this->ldap->countEntries($cr, $rr) === 1)) {
 			\OCP\Util::writeLog('user_ldap', 'readAttribute: '.$dn.' found', \OCP\Util::DEBUG);
 			return array();
 		}
@@ -422,8 +422,8 @@ public function dn2ocname($fdn, $ldapName = null, $isUser = true) {
 		}
 
 		if($isUser) {
-			$usernameAttribute = $this->connection->ldapExpertUsernameAttr;
-			if(!empty($usernameAttribute)) {
+			$usernameAttribute = strval($this->connection->ldapExpertUsernameAttr);
+			if ($usernameAttribute !== '') {
 				$username = $this->readAttribute($fdn, $usernameAttribute);
 				$username = $username[0];
 			} else {
@@ -1128,7 +1128,7 @@ public function combineFilterWithOr($filters) {
 	private function combineFilter($filters, $operator) {
 		$combinedFilter = '('.$operator;
 		foreach($filters as $filter) {
-			if(!empty($filter) && $filter[0] !== '(') {
+			if ($filter !== '' && $filter[0] !== '(') {
 				$filter = '('.$filter.')';
 			}
 			$combinedFilter.=$filter;
@@ -1211,7 +1211,7 @@ private function getFilterPartForSearch($search, $searchAttributes, $fallbackAtt
 
 		$search = $this->prepareSearchTerm($search);
 		if(!is_array($searchAttributes) || count($searchAttributes) === 0) {
-			if(empty($fallbackAttribute)) {
+			if ($fallbackAttribute === '') {
 				return '';
 			}
 			$filter[] = $fallbackAttribute . '=' . $search;
@@ -1237,8 +1237,12 @@ private function prepareSearchTerm($term) {
 
 		$allowEnum = $config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes');
 
-		$result = empty($term) ? '*' :
-			$allowEnum !== 'no' ? $term . '*' : $term;
+		$result = $term;
+		if ($term === '') {
+			$result = '*';
+		} else if ($allowEnum !== 'no') {
+			$result = $term . '*';
+		}
 		return $result;
 	}
 
@@ -1285,7 +1289,7 @@ public function getUserDnByUuid($uuid) {
 		$filter       = $this->connection->ldapUserFilter;
 		$base         = $this->connection->ldapBaseUsers;
 
-		if($this->connection->ldapUuidUserAttribute === 'auto' && empty($uuidOverride)) {
+		if ($this->connection->ldapUuidUserAttribute === 'auto' && $uuidOverride === '') {
 			// Sacrebleu! The UUID attribute is unknown :( We need first an
 			// existing DN to be able to reliably detect it.
 			$result = $this->search($filter, $base, ['dn'], 1);
@@ -1341,7 +1345,7 @@ private function detectUuidAttribute($dn, $isUser = true, $force = false) {
 			return true;
 		}
 
-		if(!empty($uuidOverride) && !$force) {
+		if ($uuidOverride !== '' && !$force) {
 			$this->connection->$uuidAttr = $uuidOverride;
 			return true;
 		}
@@ -1384,7 +1388,7 @@ public function getUUID($dn, $isUser = true) {
 		if($this->detectUuidAttribute($dn, $isUser)) {
 			$uuid = $this->readAttribute($dn, $this->connection->$uuidAttr);
 			if( !is_array($uuid)
-				&& !empty($uuidOverride)
+				&& $uuidOverride !== ''
 				&& $this->detectUuidAttribute($dn, $isUser, true)) {
 					$uuid = $this->readAttribute($dn,
 												 $this->connection->$uuidAttr);

apps/user_ldap/lib/Configuration.php

@@ -161,7 +161,7 @@ public function setConfiguration($config, &$applied = null) {
 					break;
 				case 'homeFolderNamingRule':
 					$trimmedVal = trim($val);
-					if(!empty($trimmedVal) && strpos($val, 'attr:') === false) {
+					if ($trimmedVal !== '' && strpos($val, 'attr:') === false) {
 						$val = 'attr:'.$trimmedVal;
 					}
 					break;
@@ -309,7 +309,7 @@ protected function setMultiLine($varName, $value) {
 			foreach($value as $key => $val) {
 				if(is_string($val)) {
 					$val = trim($val);
-					if(!empty($val)) {
+					if ($val !== '') {
 						//accidental line breaks are not wanted and can cause
 						// odd behaviour. Thus, away with them.
 						$finalValue[] = $val;

apps/user_ldap/lib/Connection.php

@@ -137,7 +137,7 @@ public function __set($name, $value) {
 		$this->configuration->$name = $value;
 		$after = $this->configuration->$name;
 		if($before !== $after) {
-			if(!empty($this->configID)) {
+			if ($this->configID !== '') {
 				$this->configuration->saveConfiguration();
 			}
 			$this->validateConfiguration();
@@ -358,8 +358,8 @@ private function doSoftValidation() {
 			}
 		}
 
-		$backupPort = $this->configuration->ldapBackupPort;
-		if(empty($backupPort)) {
+		$backupPort = intval($this->configuration->ldapBackupPort);
+		if ($backupPort <= 0) {
 			$this->configuration->backupPort = $this->configuration->ldapPort;
 		}
 
@@ -427,7 +427,10 @@ private function doCriticalValidation() {
 		//combinations
 		$agent = $this->configuration->ldapAgentName;
 		$pwd = $this->configuration->ldapAgentPassword;
-		if((empty($agent) && !empty($pwd)) || (!empty($agent) && empty($pwd))) {
+		if (
+			($agent === ''  && $pwd !== '')
+			|| ($agent !== '' && $pwd === '')
+		) {
 			\OCP\Util::writeLog('user_ldap',
 								$errorStr.'either no password is given for the'.
 								'user agent or a password is given, but not an'.
@@ -568,7 +571,7 @@ private function establishConnection() {
 	 * @throws \OC\ServerNotAvailableException
 	 */
 	private function doConnect($host, $port) {
-		if(empty($host)) {
+		if ($host === '') {
 			return false;
 		}
 		$this->ldapConnectionRes = $this->ldap->connect($host, $port);