[stable10] Allow non hardcoded icons for apps

This change helps users to provide their own
custom icons for the apps which work with
ownCloud.

Signed-off-by: Sujith H <sharidasan@owncloud.com>

Author: sharidas

lib/private/Settings/SettingsManager.php

@@ -205,7 +205,6 @@ private function getBuiltInSections($type) {
 				new Section('workflow', $this->l->t('Workflows & Tags'), 85, 'workflows'),
 				new Section('sharing', $this->l->t('Sharing'), 80, 'share'),
 				new Section('search', $this->l->t('Search'), 75, 'search'),
-				new Section('updates', $this->l->t('Updates'), 20, 'update'),
 				new Section('help', $this->l->t('Help & Tips'), -5, 'info'),
 				new Section('additional', $this->l->t('Additional'), -10, 'more'),
 			];

settings/Controller/SettingsPageController.php

@@ -106,6 +106,30 @@ public function getAdmin($sectionid='general') {
 		return $response;
 	}
 
+	/**
+	 * Gets the icon for the settings panel. The idea is
+	 * to get either URL or the icon name ( for backward
+	 * compatibility ). The icons returned will be svg
+	 * format and no other formats are supported.
+	 *
+	 * @param \OCP\Settings\ISection $section
+	 * @return string
+	 */
+
+	protected function getIconForSettingsPanel($section) {
+
+		$icon = $section->getIconName() . '.svg';
+		$appPath = \OC_App::getAppPath($section->getID());
+
+		if (file_exists($appPath . '/img/' . $icon)) {
+			$icon = $this->urlGenerator->imagePath($section->getID(), $icon);
+		} else {
+			$icon = $section->getIconName();
+		}
+
+		return $icon;
+	}
+
 	/**
 	 * Gets an array used to generate the navigation in the UI
 	 * @param array $sections array of ISections
@@ -117,6 +141,9 @@ protected function getNavigation($sections, $currentSectionID, $type) {
 		$nav = [];
 		// Iterate through sections and get id, name and see if currently active
 		foreach($sections as $section) {
+
+			$icon = $this->getIconForSettingsPanel($section);
+
 			$nav[] = [
 				'id' => $section->getID(),
 				'link' => $this->urlGenerator->linkToRoute(
@@ -125,7 +152,7 @@ protected function getNavigation($sections, $currentSectionID, $type) {
 				),
 				'name' => ucfirst($section->getName()),
 				'active' => $section->getID() === $currentSectionID,
-				'icon' => $section->getIconName()
+				'icon' => $icon
 			];
 		}
 		return $nav;

settings/templates/settingsPage.php

@@ -21,37 +21,28 @@
 <div id="app-navigation">
 	<ul class="with-icon">
 		<li class="divider"><?php p($l->t('Personal')); ?></li>
-		<?php foreach($_['personalNav'] as $item) {
-			$active = $item['active'] ? ' active ' : '';
-			print_unescaped(
-				sprintf(
-					"<li><a class=\"svg %s %s\" href='%s'>%s</a></li>",
-					$active,
-					'icon-'.\OCP\Util::sanitizeHTML($item['icon']),
-					\OCP\Util::sanitizeHTML($item['link']),
-					\OCP\Util::sanitizeHTML($item['name'])
-				)
-			);
-		}
-		if(!empty($_['adminNav'])) { ?>
+		<?php foreach($_['personalNav'] as $item): ?>
+		<li>
+			<?php if (strpos($item['icon'], '/', 1) !== false): ?>
+				<a class="svg <?php $item['active'] ? p(' active ') : p('') ?>" style="background-image: url(<?php p($item['icon']) ?>)" href='<?php p($item['link']); ?>'><?php p($item['name']) ?></a>
+			<?php else: ?>
+				<a class="svg <?php $item['active'] ? p(' active ') : p('') ?> icon-<?php p($item['icon']) ?>" href='<?php p($item['link']); ?>'><?php p($item['name']) ?></a>
+			<?php endif; ?>
+		</li>
+		<?php endforeach; ?>
 
+		<?php if (!empty($_['adminNav'])): ?>
 			<li class="divider"><?php p($l->t('Admin')); ?></li>
-			<?php
-
-			foreach ($_['adminNav'] as $item) {
-				$active = $item['active'] ? ' active ' : '';
-				print_unescaped(
-					sprintf(
-						"<li><a class=\"svg %s %s\" href='%s'>%s</a></li>",
-						$active,
-						'icon-'.\OCP\Util::sanitizeHTML($item['icon']),
-						\OCP\Util::sanitizeHTML($item['link']),
-						\OCP\Util::sanitizeHTML($item['name'])
-					)
-				);
-			}
-		}
-		?>
+			<?php foreach($_['adminNav'] as $item): ?>
+				<li>
+					<?php if (strpos($item['icon'], '/', 1) !== false): ?>
+						<a class="svg <?php $item['active'] ? p(' active ') : p('') ?>" style="background-image: url(<?php p($item['icon']) ?>)" href='<?php p($item['link']); ?>'><?php p($item['name']) ?></a>
+					<?php else: ?>
+						<a class="svg <?php $item['active'] ? p(' active ') : p('') ?> icon-<?php p($item['icon']) ?>" href='<?php p($item['link']); ?>'><?php p($item['name']) ?></a>
+					<?php endif; ?>
+				</li>
+			<?php endforeach; ?>
+		<?php endif; ?>
 	</ul>
 </div>
 <div id="app-content">