nextcloud / server

apps/theming/lib/Capabilities.php

Indentation +29 added lines, -29 removed lines

@@ -33,37 +33,37 @@
  */
 class Capabilities implements ICapability {
 
-	/** @var ThemingDefaults */
-	protected $theming;
+    /** @var ThemingDefaults */
+    protected $theming;
 
 
-	/** @var IURLGenerator */
-	protected $url;
+    /** @var IURLGenerator */
+    protected $url;
 
-	/**
-	 * @param ThemingDefaults $theming
-	 * @param IURLGenerator $url
-	 */
-	public function __construct(ThemingDefaults $theming, IURLGenerator $url) {
-		$this->theming = $theming;
-		$this->url = $url;
-	}
+    /**
+     * @param ThemingDefaults $theming
+     * @param IURLGenerator $url
+     */
+    public function __construct(ThemingDefaults $theming, IURLGenerator $url) {
+        $this->theming = $theming;
+        $this->url = $url;
+    }
 
-	/**
-	 * Return this classes capabilities
-	 *
-	 * @return array
-	 */
-	public function getCapabilities() {
-		return [
-			'theming' => [
-				'name' => $this->theming->getName(),
-				'url' => $this->theming->getBaseUrl(),
-				'slogan' => $this->theming->getSlogan(),
-				'color' => $this->theming->getColorPrimary(),
-				'logo' => $this->url->getAbsoluteURL($this->theming->getLogo()),
-				'background' => $this->url->getAbsoluteURL($this->theming->getBackground()),
-			],
-		];
-	}
+    /**
+     * Return this classes capabilities
+     *
+     * @return array
+     */
+    public function getCapabilities() {
+        return [
+            'theming' => [
+                'name' => $this->theming->getName(),
+                'url' => $this->theming->getBaseUrl(),
+                'slogan' => $this->theming->getSlogan(),
+                'color' => $this->theming->getColorPrimary(),
+                'logo' => $this->url->getAbsoluteURL($this->theming->getLogo()),
+                'background' => $this->url->getAbsoluteURL($this->theming->getBackground()),
+            ],
+        ];
+    }
 }

apps/theming/lib/IconBuilder.php

Indentation +157 added lines, -157 removed lines

@@ -28,162 +28,162 @@
 use OCP\App\AppPathNotFoundException;
 
 class IconBuilder {
-	/** @var ThemingDefaults */
-	private $themingDefaults;
-	/** @var Util */
-	private $util;
-
-	/**
-	 * IconBuilder constructor.
-	 *
-	 * @param ThemingDefaults $themingDefaults
-	 * @param Util $util
-	 */
-	public function __construct(
-		ThemingDefaults $themingDefaults,
-		Util $util
-	) {
-		$this->themingDefaults = $themingDefaults;
-		$this->util = $util;
-	}
-
-	/**
-	 * @param $app string app name
-	 * @return string|false image blob
-	 */
-	public function getFavicon($app) {
-		$icon = $this->renderAppIcon($app, 32);
-		if($icon === false) {
-			return false;
-		}
-		$icon->setImageFormat("png24");
-		$data = $icon->getImageBlob();
-		$icon->destroy();
-		return $data;
-	}
-
-	/**
-	 * @param $app string app name
-	 * @return string|false image blob
-	 */
-	public function getTouchIcon($app) {
-		$icon = $this->renderAppIcon($app, 512);
-		if($icon === false) {
-			return false;
-		}
-		$icon->setImageFormat("png24");
-		$data = $icon->getImageBlob();
-		$icon->destroy();
-		return $data;
-	}
-
-	/**
-	 * Render app icon on themed background color
-	 * fallback to logo
-	 *
-	 * @param $app string app name
-	 * @param $size int size of the icon in px
-	 * @return Imagick|false
-	 */
-	public function renderAppIcon($app, $size) {
-		try {
-			$appIcon = $this->util->getAppIcon($app);
-			$appIconContent = file_get_contents($appIcon);
-		} catch (AppPathNotFoundException $e) {
-			return false;
-		}
-
-		if($appIconContent === false) {
-			return false;
-		}
-
-		$color = $this->themingDefaults->getColorPrimary();
-		$mime = mime_content_type($appIcon);
-
-		// generate background image with rounded corners
-		$background = '<?xml version="1.0" encoding="UTF-8"?>' .
-			'<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" width="512" height="512" xmlns:xlink="http://www.w3.org/1999/xlink">' .
-			'<rect x="0" y="0" rx="100" ry="100" width="512" height="512" style="fill:' . $color . ';" />' .
-			'</svg>';
-		// resize svg magic as this seems broken in Imagemagick
-		if($mime === "image/svg+xml" || substr($appIconContent, 0, 4) === "<svg") {
-			if(substr($appIconContent, 0, 5) !== "<?xml") {
-				$svg = "<?xml version=\"1.0\"?>".$appIconContent;
-			} else {
-				$svg = $appIconContent;
-			}
-			$tmp = new Imagick();
-			$tmp->readImageBlob($svg);
-			$x = $tmp->getImageWidth();
-			$y = $tmp->getImageHeight();
-			$res = $tmp->getImageResolution();
-			$tmp->destroy();
-
-			if($x>$y) {
-				$max = $x;
-			} else {
-				$max = $y;
-			}
-
-			// convert svg to resized image
-			$appIconFile = new Imagick();
-			$resX = (int)(512 * $res['x'] / $max * 2.53);
-			$resY = (int)(512 * $res['y'] / $max * 2.53);
-			$appIconFile->setResolution($resX, $resY);
-			$appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
-			$appIconFile->readImageBlob($svg);
-			$appIconFile->scaleImage(512, 512, true);
-		} else {
-			$appIconFile = new Imagick();
-			$appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
-			$appIconFile->readImageBlob(file_get_contents($appIcon));
-			$appIconFile->scaleImage(512, 512, true);
-		}
-
-		// offset for icon positioning
-		$border_w = (int)($appIconFile->getImageWidth() * 0.05);
-		$border_h = (int)($appIconFile->getImageHeight() * 0.05);
-		$innerWidth = (int)($appIconFile->getImageWidth() - $border_w * 2);
-		$innerHeight = (int)($appIconFile->getImageHeight() - $border_h * 2);
-		$appIconFile->adaptiveResizeImage($innerWidth, $innerHeight);
-		// center icon
-		$offset_w = 512 / 2 - $innerWidth / 2;
-		$offset_h = 512 / 2 - $innerHeight / 2;
-
-		$appIconFile->setImageFormat("png24");
-
-		$finalIconFile = new Imagick();
-		$finalIconFile->setBackgroundColor(new ImagickPixel('transparent'));
-		$finalIconFile->readImageBlob($background);
-		$finalIconFile->setImageVirtualPixelMethod(Imagick::VIRTUALPIXELMETHOD_TRANSPARENT);
-		$finalIconFile->setImageArtifact('compose:args', "1,0,-0.5,0.5");
-		$finalIconFile->compositeImage($appIconFile, Imagick::COMPOSITE_ATOP, $offset_w, $offset_h);
-		$finalIconFile->setImageFormat('png24');
-		if (defined("Imagick::INTERPOLATE_BICUBIC") === true) {
-			$filter = Imagick::INTERPOLATE_BICUBIC;
-		} else {
-			$filter = Imagick::FILTER_LANCZOS;
-		}
-		$finalIconFile->resizeImage($size, $size, $filter, 1, false);
-
-		$appIconFile->destroy();
-		return $finalIconFile;
-	}
-
-	public function colorSvg($app, $image) {
-		try {
-			$imageFile = $this->util->getAppImage($app, $image);
-		} catch (AppPathNotFoundException $e) {
-			return false;
-		}
-		$svg = file_get_contents($imageFile);
-		if ($svg !== false && $svg !== "") {
-			$color = $this->util->elementColor($this->themingDefaults->getColorPrimary());
-			$svg = $this->util->colorizeSvg($svg, $color);
-			return $svg;
-		} else {
-			return false;
-		}
-	}
+    /** @var ThemingDefaults */
+    private $themingDefaults;
+    /** @var Util */
+    private $util;
+
+    /**
+     * IconBuilder constructor.
+     *
+     * @param ThemingDefaults $themingDefaults
+     * @param Util $util
+     */
+    public function __construct(
+        ThemingDefaults $themingDefaults,
+        Util $util
+    ) {
+        $this->themingDefaults = $themingDefaults;
+        $this->util = $util;
+    }
+
+    /**
+     * @param $app string app name
+     * @return string|false image blob
+     */
+    public function getFavicon($app) {
+        $icon = $this->renderAppIcon($app, 32);
+        if($icon === false) {
+            return false;
+        }
+        $icon->setImageFormat("png24");
+        $data = $icon->getImageBlob();
+        $icon->destroy();
+        return $data;
+    }
+
+    /**
+     * @param $app string app name
+     * @return string|false image blob
+     */
+    public function getTouchIcon($app) {
+        $icon = $this->renderAppIcon($app, 512);
+        if($icon === false) {
+            return false;
+        }
+        $icon->setImageFormat("png24");
+        $data = $icon->getImageBlob();
+        $icon->destroy();
+        return $data;
+    }
+
+    /**
+     * Render app icon on themed background color
+     * fallback to logo
+     *
+     * @param $app string app name
+     * @param $size int size of the icon in px
+     * @return Imagick|false
+     */
+    public function renderAppIcon($app, $size) {
+        try {
+            $appIcon = $this->util->getAppIcon($app);
+            $appIconContent = file_get_contents($appIcon);
+        } catch (AppPathNotFoundException $e) {
+            return false;
+        }
+
+        if($appIconContent === false) {
+            return false;
+        }
+
+        $color = $this->themingDefaults->getColorPrimary();
+        $mime = mime_content_type($appIcon);
+
+        // generate background image with rounded corners
+        $background = '<?xml version="1.0" encoding="UTF-8"?>' .
+            '<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" width="512" height="512" xmlns:xlink="http://www.w3.org/1999/xlink">' .
+            '<rect x="0" y="0" rx="100" ry="100" width="512" height="512" style="fill:' . $color . ';" />' .
+            '</svg>';
+        // resize svg magic as this seems broken in Imagemagick
+        if($mime === "image/svg+xml" || substr($appIconContent, 0, 4) === "<svg") {
+            if(substr($appIconContent, 0, 5) !== "<?xml") {
+                $svg = "<?xml version=\"1.0\"?>".$appIconContent;
+            } else {
+                $svg = $appIconContent;
+            }
+            $tmp = new Imagick();
+            $tmp->readImageBlob($svg);
+            $x = $tmp->getImageWidth();
+            $y = $tmp->getImageHeight();
+            $res = $tmp->getImageResolution();
+            $tmp->destroy();
+
+            if($x>$y) {
+                $max = $x;
+            } else {
+                $max = $y;
+            }
+
+            // convert svg to resized image
+            $appIconFile = new Imagick();
+            $resX = (int)(512 * $res['x'] / $max * 2.53);
+            $resY = (int)(512 * $res['y'] / $max * 2.53);
+            $appIconFile->setResolution($resX, $resY);
+            $appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
+            $appIconFile->readImageBlob($svg);
+            $appIconFile->scaleImage(512, 512, true);
+        } else {
+            $appIconFile = new Imagick();
+            $appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
+            $appIconFile->readImageBlob(file_get_contents($appIcon));
+            $appIconFile->scaleImage(512, 512, true);
+        }
+
+        // offset for icon positioning
+        $border_w = (int)($appIconFile->getImageWidth() * 0.05);
+        $border_h = (int)($appIconFile->getImageHeight() * 0.05);
+        $innerWidth = (int)($appIconFile->getImageWidth() - $border_w * 2);
+        $innerHeight = (int)($appIconFile->getImageHeight() - $border_h * 2);
+        $appIconFile->adaptiveResizeImage($innerWidth, $innerHeight);
+        // center icon
+        $offset_w = 512 / 2 - $innerWidth / 2;
+        $offset_h = 512 / 2 - $innerHeight / 2;
+
+        $appIconFile->setImageFormat("png24");
+
+        $finalIconFile = new Imagick();
+        $finalIconFile->setBackgroundColor(new ImagickPixel('transparent'));
+        $finalIconFile->readImageBlob($background);
+        $finalIconFile->setImageVirtualPixelMethod(Imagick::VIRTUALPIXELMETHOD_TRANSPARENT);
+        $finalIconFile->setImageArtifact('compose:args', "1,0,-0.5,0.5");
+        $finalIconFile->compositeImage($appIconFile, Imagick::COMPOSITE_ATOP, $offset_w, $offset_h);
+        $finalIconFile->setImageFormat('png24');
+        if (defined("Imagick::INTERPOLATE_BICUBIC") === true) {
+            $filter = Imagick::INTERPOLATE_BICUBIC;
+        } else {
+            $filter = Imagick::FILTER_LANCZOS;
+        }
+        $finalIconFile->resizeImage($size, $size, $filter, 1, false);
+
+        $appIconFile->destroy();
+        return $finalIconFile;
+    }
+
+    public function colorSvg($app, $image) {
+        try {
+            $imageFile = $this->util->getAppImage($app, $image);
+        } catch (AppPathNotFoundException $e) {
+            return false;
+        }
+        $svg = file_get_contents($imageFile);
+        if ($svg !== false && $svg !== "") {
+            $color = $this->util->elementColor($this->themingDefaults->getColorPrimary());
+            $svg = $this->util->colorizeSvg($svg, $color);
+            return $svg;
+        } else {
+            return false;
+        }
+    }
 
 }

lib/private/Files/ObjectStore/Swift.php

Unused Use Statements -1 removed lines

@@ -28,7 +28,6 @@
 use OCP\Files\ObjectStore\IObjectStore;
 use OCP\Files\StorageAuthException;
 use OCP\Files\StorageNotAvailableException;
-use OpenCloud\Common\Exceptions\EndpointError;
 use OpenCloud\Common\Service\Catalog;
 use OpenCloud\Common\Service\CatalogItem;
 use OpenCloud\ObjectStore\Service;

Spacing +3 added lines, -3 removed lines

@@ -161,7 +161,7 @@ 
 			}
 		}
 
-		$availableRegions = implode(', ', array_map(function ($endpoint) {
+		$availableRegions = implode(', ', array_map(function($endpoint) {
 			return $endpoint->region;
 		}, $endPoints));
 
@@ -169,9 +169,9 @@ 
 	}
 
 	private function getAvailableServiceNames(Catalog $catalog) {
-		return array_map(function (CatalogItem $item) {
+		return array_map(function(CatalogItem $item) {
 			return $item->getName();
-		}, array_filter($catalog->getItems(), function (CatalogItem $item) {
+		}, array_filter($catalog->getItems(), function(CatalogItem $item) {
 			return $item->hasType(Service::DEFAULT_TYPE);
 		}));
 	}

Indentation +193 added lines, -193 removed lines

@@ -37,198 +37,198 @@
 
 class Swift implements IObjectStore {
 
-	/**
-	 * @var \OpenCloud\OpenStack
-	 */
-	private $client;
-
-	/**
-	 * @var array
-	 */
-	private $params;
-
-	/**
-	 * @var \OpenCloud\ObjectStore\Service
-	 */
-	private $objectStoreService;
-
-	/**
-	 * @var \OpenCloud\ObjectStore\Resource\Container
-	 */
-	private $container;
-
-	public function __construct($params) {
-		if (isset($params['bucket'])) {
-			$params['container'] = $params['bucket'];
-		}
-		if (!isset($params['container'])) {
-			$params['container'] = 'owncloud';
-		}
-		if (!isset($params['autocreate'])) {
-			// should only be true for tests
-			$params['autocreate'] = false;
-		}
-
-		if (isset($params['apiKey'])) {
-			$this->client = new Rackspace($params['url'], $params);
-		} else {
-			$this->client = new OpenStack($params['url'], $params);
-		}
-		$this->params = $params;
-	}
-
-	protected function init() {
-		if ($this->container) {
-			return;
-		}
-
-		try {
-			$this->client->authenticate();
-		} catch (ClientErrorResponseException $e) {
-			$statusCode = $e->getResponse()->getStatusCode();
-			if ($statusCode == 412) {
-				throw new StorageAuthException('Precondition failed, verify the keystone url', $e);
-			} else if ($statusCode === 401) {
-				throw new StorageAuthException('Authentication failed, verify the username, password and possibly tenant', $e);
-			} else {
-				throw new StorageAuthException('Unknown error', $e);
-			}
-		}
-
-		/** @var Catalog $catalog */
-		$catalog = $this->client->getCatalog();
-
-		if (isset($this->params['serviceName'])) {
-			$serviceName = $this->params['serviceName'];
-		} else {
-			$serviceName = Service::DEFAULT_NAME;
-		}
-
-		if (isset($this->params['urlType'])) {
-			$urlType = $this->params['urlType'];
-			if ($urlType !== 'internalURL' && $urlType !== 'publicURL') {
-				throw new StorageNotAvailableException('Invalid url type');
-			}
-		} else {
-			$urlType = Service::DEFAULT_URL_TYPE;
-		}
-
-		$catalogItem = $this->getCatalogForService($catalog, $serviceName);
-		if (!$catalogItem) {
-			$available = implode(', ', $this->getAvailableServiceNames($catalog));
-			throw new StorageNotAvailableException(
-				"Service $serviceName not found in service catalog, available services: $available"
-			);
-		} else if (isset($this->params['region'])) {
-			$this->validateRegion($catalogItem, $this->params['region']);
-		}
-
-		$this->objectStoreService = $this->client->objectStoreService($serviceName, $this->params['region'], $urlType);
-
-		try {
-			$this->container = $this->objectStoreService->getContainer($this->params['container']);
-		} catch (ClientErrorResponseException $ex) {
-			// if the container does not exist and autocreate is true try to create the container on the fly
-			if (isset($this->params['autocreate']) && $this->params['autocreate'] === true) {
-				$this->container = $this->objectStoreService->createContainer($this->params['container']);
-			} else {
-				throw $ex;
-			}
-		}
-	}
-
-	/**
-	 * @param Catalog $catalog
-	 * @param $name
-	 * @return null|CatalogItem
-	 */
-	private function getCatalogForService(Catalog $catalog, $name) {
-		foreach ($catalog->getItems() as $item) {
-			/** @var CatalogItem $item */
-			if ($item->hasType(Service::DEFAULT_TYPE) && $item->hasName($name)) {
-				return $item;
-			}
-		}
-
-		return null;
-	}
-
-	private function validateRegion(CatalogItem $item, $region) {
-		$endPoints = $item->getEndpoints();
-		foreach ($endPoints as $endPoint) {
-			if ($endPoint->region === $region) {
-				return;
-			}
-		}
-
-		$availableRegions = implode(', ', array_map(function ($endpoint) {
-			return $endpoint->region;
-		}, $endPoints));
-
-		throw new StorageNotAvailableException("Invalid region '$region', available regions: $availableRegions");
-	}
-
-	private function getAvailableServiceNames(Catalog $catalog) {
-		return array_map(function (CatalogItem $item) {
-			return $item->getName();
-		}, array_filter($catalog->getItems(), function (CatalogItem $item) {
-			return $item->hasType(Service::DEFAULT_TYPE);
-		}));
-	}
-
-	/**
-	 * @return string the container name where objects are stored
-	 */
-	public function getStorageId() {
-		return $this->params['container'];
-	}
-
-	/**
-	 * @param string $urn the unified resource name used to identify the object
-	 * @param resource $stream stream with the data to write
-	 * @throws Exception from openstack lib when something goes wrong
-	 */
-	public function writeObject($urn, $stream) {
-		$this->init();
-		$this->container->uploadObject($urn, $stream);
-	}
-
-	/**
-	 * @param string $urn the unified resource name used to identify the object
-	 * @return resource stream with the read data
-	 * @throws Exception from openstack lib when something goes wrong
-	 */
-	public function readObject($urn) {
-		$this->init();
-		$object = $this->container->getObject($urn);
-
-		// we need to keep a reference to objectContent or
-		// the stream will be closed before we can do anything with it
-		/** @var $objectContent \Guzzle\Http\EntityBody * */
-		$objectContent = $object->getContent();
-		$objectContent->rewind();
-
-		$stream = $objectContent->getStream();
-		// save the object content in the context of the stream to prevent it being gc'd until the stream is closed
-		stream_context_set_option($stream, 'swift', 'content', $objectContent);
-
-		return $stream;
-	}
-
-	/**
-	 * @param string $urn Unified Resource Name
-	 * @return void
-	 * @throws Exception from openstack lib when something goes wrong
-	 */
-	public function deleteObject($urn) {
-		$this->init();
-		// see https://github.com/rackspace/php-opencloud/issues/243#issuecomment-30032242
-		$this->container->dataObject()->setName($urn)->delete();
-	}
-
-	public function deleteContainer($recursive = false) {
-		$this->init();
-		$this->container->delete($recursive);
-	}
+    /**
+     * @var \OpenCloud\OpenStack
+     */
+    private $client;
+
+    /**
+     * @var array
+     */
+    private $params;
+
+    /**
+     * @var \OpenCloud\ObjectStore\Service
+     */
+    private $objectStoreService;
+
+    /**
+     * @var \OpenCloud\ObjectStore\Resource\Container
+     */
+    private $container;
+
+    public function __construct($params) {
+        if (isset($params['bucket'])) {
+            $params['container'] = $params['bucket'];
+        }
+        if (!isset($params['container'])) {
+            $params['container'] = 'owncloud';
+        }
+        if (!isset($params['autocreate'])) {
+            // should only be true for tests
+            $params['autocreate'] = false;
+        }
+
+        if (isset($params['apiKey'])) {
+            $this->client = new Rackspace($params['url'], $params);
+        } else {
+            $this->client = new OpenStack($params['url'], $params);
+        }
+        $this->params = $params;
+    }
+
+    protected function init() {
+        if ($this->container) {
+            return;
+        }
+
+        try {
+            $this->client->authenticate();
+        } catch (ClientErrorResponseException $e) {
+            $statusCode = $e->getResponse()->getStatusCode();
+            if ($statusCode == 412) {
+                throw new StorageAuthException('Precondition failed, verify the keystone url', $e);
+            } else if ($statusCode === 401) {
+                throw new StorageAuthException('Authentication failed, verify the username, password and possibly tenant', $e);
+            } else {
+                throw new StorageAuthException('Unknown error', $e);
+            }
+        }
+
+        /** @var Catalog $catalog */
+        $catalog = $this->client->getCatalog();
+
+        if (isset($this->params['serviceName'])) {
+            $serviceName = $this->params['serviceName'];
+        } else {
+            $serviceName = Service::DEFAULT_NAME;
+        }
+
+        if (isset($this->params['urlType'])) {
+            $urlType = $this->params['urlType'];
+            if ($urlType !== 'internalURL' && $urlType !== 'publicURL') {
+                throw new StorageNotAvailableException('Invalid url type');
+            }
+        } else {
+            $urlType = Service::DEFAULT_URL_TYPE;
+        }
+
+        $catalogItem = $this->getCatalogForService($catalog, $serviceName);
+        if (!$catalogItem) {
+            $available = implode(', ', $this->getAvailableServiceNames($catalog));
+            throw new StorageNotAvailableException(
+                "Service $serviceName not found in service catalog, available services: $available"
+            );
+        } else if (isset($this->params['region'])) {
+            $this->validateRegion($catalogItem, $this->params['region']);
+        }
+
+        $this->objectStoreService = $this->client->objectStoreService($serviceName, $this->params['region'], $urlType);
+
+        try {
+            $this->container = $this->objectStoreService->getContainer($this->params['container']);
+        } catch (ClientErrorResponseException $ex) {
+            // if the container does not exist and autocreate is true try to create the container on the fly
+            if (isset($this->params['autocreate']) && $this->params['autocreate'] === true) {
+                $this->container = $this->objectStoreService->createContainer($this->params['container']);
+            } else {
+                throw $ex;
+            }
+        }
+    }
+
+    /**
+     * @param Catalog $catalog
+     * @param $name
+     * @return null|CatalogItem
+     */
+    private function getCatalogForService(Catalog $catalog, $name) {
+        foreach ($catalog->getItems() as $item) {
+            /** @var CatalogItem $item */
+            if ($item->hasType(Service::DEFAULT_TYPE) && $item->hasName($name)) {
+                return $item;
+            }
+        }
+
+        return null;
+    }
+
+    private function validateRegion(CatalogItem $item, $region) {
+        $endPoints = $item->getEndpoints();
+        foreach ($endPoints as $endPoint) {
+            if ($endPoint->region === $region) {
+                return;
+            }
+        }
+
+        $availableRegions = implode(', ', array_map(function ($endpoint) {
+            return $endpoint->region;
+        }, $endPoints));
+
+        throw new StorageNotAvailableException("Invalid region '$region', available regions: $availableRegions");
+    }
+
+    private function getAvailableServiceNames(Catalog $catalog) {
+        return array_map(function (CatalogItem $item) {
+            return $item->getName();
+        }, array_filter($catalog->getItems(), function (CatalogItem $item) {
+            return $item->hasType(Service::DEFAULT_TYPE);
+        }));
+    }
+
+    /**
+     * @return string the container name where objects are stored
+     */
+    public function getStorageId() {
+        return $this->params['container'];
+    }
+
+    /**
+     * @param string $urn the unified resource name used to identify the object
+     * @param resource $stream stream with the data to write
+     * @throws Exception from openstack lib when something goes wrong
+     */
+    public function writeObject($urn, $stream) {
+        $this->init();
+        $this->container->uploadObject($urn, $stream);
+    }
+
+    /**
+     * @param string $urn the unified resource name used to identify the object
+     * @return resource stream with the read data
+     * @throws Exception from openstack lib when something goes wrong
+     */
+    public function readObject($urn) {
+        $this->init();
+        $object = $this->container->getObject($urn);
+
+        // we need to keep a reference to objectContent or
+        // the stream will be closed before we can do anything with it
+        /** @var $objectContent \Guzzle\Http\EntityBody * */
+        $objectContent = $object->getContent();
+        $objectContent->rewind();
+
+        $stream = $objectContent->getStream();
+        // save the object content in the context of the stream to prevent it being gc'd until the stream is closed
+        stream_context_set_option($stream, 'swift', 'content', $objectContent);
+
+        return $stream;
+    }
+
+    /**
+     * @param string $urn Unified Resource Name
+     * @return void
+     * @throws Exception from openstack lib when something goes wrong
+     */
+    public function deleteObject($urn) {
+        $this->init();
+        // see https://github.com/rackspace/php-opencloud/issues/243#issuecomment-30032242
+        $this->container->dataObject()->setName($urn)->delete();
+    }
+
+    public function deleteContainer($recursive = false) {
+        $this->init();
+        $this->container->delete($recursive);
+    }
 
 }

apps/encryption/templates/mail.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
 	<tr><td>
 			<table cellspacing="0" cellpadding="0" border="0" width="600px">
 				<tr>
-					<td colspan="2" bgcolor="<?php p($theme->getColorPrimary());?>">
+					<td colspan="2" bgcolor="<?php p($theme->getColorPrimary()); ?>">
 						<img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.png'))); ?>" alt="<?php p($theme->getName()); ?>"/>
 					</td>
 				</tr>
@@ -52,7 +52,7 @@ 
 					<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">--<br>
 						<?php p($theme->getName()); ?> -
 						<?php p($theme->getSlogan()); ?>
-						<br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl());?></a>
+						<br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl()); ?></a>
 					</td>
 				</tr>
 				<tr>

lib/private/legacy/defaults.php

Indentation +233 added lines, -233 removed lines

@@ -31,262 +31,262 @@
  */
 class OC_Defaults {
 
-	private $theme;
-	private $l;
+    private $theme;
+    private $l;
 
-	private $defaultEntity;
-	private $defaultName;
-	private $defaultTitle;
-	private $defaultBaseUrl;
-	private $defaultSyncClientUrl;
-	private $defaultiOSClientUrl;
-	private $defaultiTunesAppId;
-	private $defaultAndroidClientUrl;
-	private $defaultDocBaseUrl;
-	private $defaultDocVersion;
-	private $defaultSlogan;
-	private $defaultLogoClaim;
-	private $defaultColorPrimary;
+    private $defaultEntity;
+    private $defaultName;
+    private $defaultTitle;
+    private $defaultBaseUrl;
+    private $defaultSyncClientUrl;
+    private $defaultiOSClientUrl;
+    private $defaultiTunesAppId;
+    private $defaultAndroidClientUrl;
+    private $defaultDocBaseUrl;
+    private $defaultDocVersion;
+    private $defaultSlogan;
+    private $defaultLogoClaim;
+    private $defaultColorPrimary;
 
-	function __construct() {
-		$this->l = \OC::$server->getL10N('lib');
+    function __construct() {
+        $this->l = \OC::$server->getL10N('lib');
 
-		$this->defaultEntity = 'Nextcloud'; /* e.g. company name, used for footers and copyright notices */
-		$this->defaultName = 'Nextcloud'; /* short name, used when referring to the software */
-		$this->defaultTitle = 'Nextcloud'; /* can be a longer name, for titles */
-		$this->defaultBaseUrl = 'https://nextcloud.com';
-		$this->defaultSyncClientUrl = 'https://nextcloud.com/install/#install-clients';
-		$this->defaultiOSClientUrl = 'https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8';
-		$this->defaultiTunesAppId = '1125420102';
-		$this->defaultAndroidClientUrl = 'https://play.google.com/store/apps/details?id=com.nextcloud.client';
-		$this->defaultDocBaseUrl = 'https://docs.nextcloud.com';
-		$this->defaultDocVersion = '11'; // used to generate doc links
-		$this->defaultSlogan = $this->l->t('a safe home for all your data');
-		$this->defaultLogoClaim = '';
-		$this->defaultColorPrimary = '#0082c9';
+        $this->defaultEntity = 'Nextcloud'; /* e.g. company name, used for footers and copyright notices */
+        $this->defaultName = 'Nextcloud'; /* short name, used when referring to the software */
+        $this->defaultTitle = 'Nextcloud'; /* can be a longer name, for titles */
+        $this->defaultBaseUrl = 'https://nextcloud.com';
+        $this->defaultSyncClientUrl = 'https://nextcloud.com/install/#install-clients';
+        $this->defaultiOSClientUrl = 'https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8';
+        $this->defaultiTunesAppId = '1125420102';
+        $this->defaultAndroidClientUrl = 'https://play.google.com/store/apps/details?id=com.nextcloud.client';
+        $this->defaultDocBaseUrl = 'https://docs.nextcloud.com';
+        $this->defaultDocVersion = '11'; // used to generate doc links
+        $this->defaultSlogan = $this->l->t('a safe home for all your data');
+        $this->defaultLogoClaim = '';
+        $this->defaultColorPrimary = '#0082c9';
 
-		$themePath = OC::$SERVERROOT . '/themes/' . OC_Util::getTheme() . '/defaults.php';
-		if (file_exists($themePath)) {
-			// prevent defaults.php from printing output
-			ob_start();
-			require_once $themePath;
-			ob_end_clean();
-			if (class_exists('OC_Theme')) {
-				$this->theme = new OC_Theme();
-			}
-		}
-	}
+        $themePath = OC::$SERVERROOT . '/themes/' . OC_Util::getTheme() . '/defaults.php';
+        if (file_exists($themePath)) {
+            // prevent defaults.php from printing output
+            ob_start();
+            require_once $themePath;
+            ob_end_clean();
+            if (class_exists('OC_Theme')) {
+                $this->theme = new OC_Theme();
+            }
+        }
+    }
 
-	/**
-	 * @param string $method
-	 */
-	private function themeExist($method) {
-		if (isset($this->theme) && method_exists($this->theme, $method)) {
-			return true;
-		}
-		return false;
-	}
+    /**
+     * @param string $method
+     */
+    private function themeExist($method) {
+        if (isset($this->theme) && method_exists($this->theme, $method)) {
+            return true;
+        }
+        return false;
+    }
 
-	/**
-	 * Returns the base URL
-	 * @return string URL
-	 */
-	public function getBaseUrl() {
-		if ($this->themeExist('getBaseUrl')) {
-			return $this->theme->getBaseUrl();
-		} else {
-			return $this->defaultBaseUrl;
-		}
-	}
+    /**
+     * Returns the base URL
+     * @return string URL
+     */
+    public function getBaseUrl() {
+        if ($this->themeExist('getBaseUrl')) {
+            return $this->theme->getBaseUrl();
+        } else {
+            return $this->defaultBaseUrl;
+        }
+    }
 
-	/**
-	 * Returns the URL where the sync clients are listed
-	 * @return string URL
-	 */
-	public function getSyncClientUrl() {
-		if ($this->themeExist('getSyncClientUrl')) {
-			return $this->theme->getSyncClientUrl();
-		} else {
-			return $this->defaultSyncClientUrl;
-		}
-	}
+    /**
+     * Returns the URL where the sync clients are listed
+     * @return string URL
+     */
+    public function getSyncClientUrl() {
+        if ($this->themeExist('getSyncClientUrl')) {
+            return $this->theme->getSyncClientUrl();
+        } else {
+            return $this->defaultSyncClientUrl;
+        }
+    }
 
-	/**
-	 * Returns the URL to the App Store for the iOS Client
-	 * @return string URL
-	 */
-	public function getiOSClientUrl() {
-		if ($this->themeExist('getiOSClientUrl')) {
-			return $this->theme->getiOSClientUrl();
-		} else {
-			return $this->defaultiOSClientUrl;
-		}
-	}
+    /**
+     * Returns the URL to the App Store for the iOS Client
+     * @return string URL
+     */
+    public function getiOSClientUrl() {
+        if ($this->themeExist('getiOSClientUrl')) {
+            return $this->theme->getiOSClientUrl();
+        } else {
+            return $this->defaultiOSClientUrl;
+        }
+    }
 
-	/**
-	 * Returns the AppId for the App Store for the iOS Client
-	 * @return string AppId
-	 */
-	public function getiTunesAppId() {
-		if ($this->themeExist('getiTunesAppId')) {
-			return $this->theme->getiTunesAppId();
-		} else {
-			return $this->defaultiTunesAppId;
-		}
-	}
+    /**
+     * Returns the AppId for the App Store for the iOS Client
+     * @return string AppId
+     */
+    public function getiTunesAppId() {
+        if ($this->themeExist('getiTunesAppId')) {
+            return $this->theme->getiTunesAppId();
+        } else {
+            return $this->defaultiTunesAppId;
+        }
+    }
 
-	/**
-	 * Returns the URL to Google Play for the Android Client
-	 * @return string URL
-	 */
-	public function getAndroidClientUrl() {
-		if ($this->themeExist('getAndroidClientUrl')) {
-			return $this->theme->getAndroidClientUrl();
-		} else {
-			return $this->defaultAndroidClientUrl;
-		}
-	}
+    /**
+     * Returns the URL to Google Play for the Android Client
+     * @return string URL
+     */
+    public function getAndroidClientUrl() {
+        if ($this->themeExist('getAndroidClientUrl')) {
+            return $this->theme->getAndroidClientUrl();
+        } else {
+            return $this->defaultAndroidClientUrl;
+        }
+    }
 
-	/**
-	 * Returns the documentation URL
-	 * @return string URL
-	 */
-	public function getDocBaseUrl() {
-		if ($this->themeExist('getDocBaseUrl')) {
-			return $this->theme->getDocBaseUrl();
-		} else {
-			return $this->defaultDocBaseUrl;
-		}
-	}
+    /**
+     * Returns the documentation URL
+     * @return string URL
+     */
+    public function getDocBaseUrl() {
+        if ($this->themeExist('getDocBaseUrl')) {
+            return $this->theme->getDocBaseUrl();
+        } else {
+            return $this->defaultDocBaseUrl;
+        }
+    }
 
-	/**
-	 * Returns the title
-	 * @return string title
-	 */
-	public function getTitle() {
-		if ($this->themeExist('getTitle')) {
-			return $this->theme->getTitle();
-		} else {
-			return $this->defaultTitle;
-		}
-	}
+    /**
+     * Returns the title
+     * @return string title
+     */
+    public function getTitle() {
+        if ($this->themeExist('getTitle')) {
+            return $this->theme->getTitle();
+        } else {
+            return $this->defaultTitle;
+        }
+    }
 
-	/**
-	 * Returns the short name of the software
-	 * @return string title
-	 */
-	public function getName() {
-		if ($this->themeExist('getName')) {
-			return $this->theme->getName();
-		} else {
-			return $this->defaultName;
-		}
-	}
+    /**
+     * Returns the short name of the software
+     * @return string title
+     */
+    public function getName() {
+        if ($this->themeExist('getName')) {
+            return $this->theme->getName();
+        } else {
+            return $this->defaultName;
+        }
+    }
 
-	/**
-	 * Returns the short name of the software containing HTML strings
-	 * @return string title
-	 */
-	public function getHTMLName() {
-		if ($this->themeExist('getHTMLName')) {
-			return $this->theme->getHTMLName();
-		} else {
-			return $this->defaultName;
-		}
-	}
+    /**
+     * Returns the short name of the software containing HTML strings
+     * @return string title
+     */
+    public function getHTMLName() {
+        if ($this->themeExist('getHTMLName')) {
+            return $this->theme->getHTMLName();
+        } else {
+            return $this->defaultName;
+        }
+    }
 
-	/**
-	 * Returns entity (e.g. company name) - used for footer, copyright
-	 * @return string entity name
-	 */
-	public function getEntity() {
-		if ($this->themeExist('getEntity')) {
-			return $this->theme->getEntity();
-		} else {
-			return $this->defaultEntity;
-		}
-	}
+    /**
+     * Returns entity (e.g. company name) - used for footer, copyright
+     * @return string entity name
+     */
+    public function getEntity() {
+        if ($this->themeExist('getEntity')) {
+            return $this->theme->getEntity();
+        } else {
+            return $this->defaultEntity;
+        }
+    }
 
-	/**
-	 * Returns slogan
-	 * @return string slogan
-	 */
-	public function getSlogan() {
-		if ($this->themeExist('getSlogan')) {
-			return $this->theme->getSlogan();
-		} else {
-			return $this->defaultSlogan;
-		}
-	}
+    /**
+     * Returns slogan
+     * @return string slogan
+     */
+    public function getSlogan() {
+        if ($this->themeExist('getSlogan')) {
+            return $this->theme->getSlogan();
+        } else {
+            return $this->defaultSlogan;
+        }
+    }
 
-	/**
-	 * Returns logo claim
-	 * @return string logo claim
-	 */
-	public function getLogoClaim() {
-		if ($this->themeExist('getLogoClaim')) {
-			return $this->theme->getLogoClaim();
-		} else {
-			return $this->defaultLogoClaim;
-		}
-	}
+    /**
+     * Returns logo claim
+     * @return string logo claim
+     */
+    public function getLogoClaim() {
+        if ($this->themeExist('getLogoClaim')) {
+            return $this->theme->getLogoClaim();
+        } else {
+            return $this->defaultLogoClaim;
+        }
+    }
 
-	/**
-	 * Returns short version of the footer
-	 * @return string short footer
-	 */
-	public function getShortFooter() {
-		if ($this->themeExist('getShortFooter')) {
-			$footer = $this->theme->getShortFooter();
-		} else {
-			$footer = '<a href="'. $this->getBaseUrl() . '" target="_blank"' .
-				' rel="noreferrer">' .$this->getEntity() . '</a>'.
-				' – ' . $this->getSlogan();
-		}
+    /**
+     * Returns short version of the footer
+     * @return string short footer
+     */
+    public function getShortFooter() {
+        if ($this->themeExist('getShortFooter')) {
+            $footer = $this->theme->getShortFooter();
+        } else {
+            $footer = '<a href="'. $this->getBaseUrl() . '" target="_blank"' .
+                ' rel="noreferrer">' .$this->getEntity() . '</a>'.
+                ' – ' . $this->getSlogan();
+        }
 
-		return $footer;
-	}
+        return $footer;
+    }
 
-	/**
-	 * Returns long version of the footer
-	 * @return string long footer
-	 */
-	public function getLongFooter() {
-		if ($this->themeExist('getLongFooter')) {
-			$footer = $this->theme->getLongFooter();
-		} else {
-			$footer = $this->getShortFooter();
-		}
+    /**
+     * Returns long version of the footer
+     * @return string long footer
+     */
+    public function getLongFooter() {
+        if ($this->themeExist('getLongFooter')) {
+            $footer = $this->theme->getLongFooter();
+        } else {
+            $footer = $this->getShortFooter();
+        }
 
-		return $footer;
-	}
+        return $footer;
+    }
 
-	/**
-	 * @param string $key
-	 */
-	public function buildDocLinkToKey($key) {
-		if ($this->themeExist('buildDocLinkToKey')) {
-			return $this->theme->buildDocLinkToKey($key);
-		}
-		return $this->getDocBaseUrl() . '/server/' . $this->defaultDocVersion . '/go.php?to=' . $key;
-	}
+    /**
+     * @param string $key
+     */
+    public function buildDocLinkToKey($key) {
+        if ($this->themeExist('buildDocLinkToKey')) {
+            return $this->theme->buildDocLinkToKey($key);
+        }
+        return $this->getDocBaseUrl() . '/server/' . $this->defaultDocVersion . '/go.php?to=' . $key;
+    }
 
-	/**
-	 * Returns primary color
-	 * @return string
-	 */
-	public function getColorPrimary() {
+    /**
+     * Returns primary color
+     * @return string
+     */
+    public function getColorPrimary() {
 
-		if ($this->themeExist('getColorPrimary')) {
-			return $this->theme->getColorPrimary();
-		}
-		if ($this->themeExist('getMailHeaderColor')) {
-			return $this->theme->getMailHeaderColor();
-		}
-		return $this->defaultColorPrimary;
-	}
+        if ($this->themeExist('getColorPrimary')) {
+            return $this->theme->getColorPrimary();
+        }
+        if ($this->themeExist('getMailHeaderColor')) {
+            return $this->theme->getMailHeaderColor();
+        }
+        return $this->defaultColorPrimary;
+    }
 
-	public function shouldReplaceIcons() {
-		return false;
-	}
+    public function shouldReplaceIcons() {
+        return false;
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -65,7 +65,7 @@ 
 		$this->defaultLogoClaim = '';
 		$this->defaultColorPrimary = '#0082c9';
 
-		$themePath = OC::$SERVERROOT . '/themes/' . OC_Util::getTheme() . '/defaults.php';
+		$themePath = OC::$SERVERROOT.'/themes/'.OC_Util::getTheme().'/defaults.php';
 		if (file_exists($themePath)) {
 			// prevent defaults.php from printing output
 			ob_start();
@@ -239,9 +239,9 @@ 
 		if ($this->themeExist('getShortFooter')) {
 			$footer = $this->theme->getShortFooter();
 		} else {
-			$footer = '<a href="'. $this->getBaseUrl() . '" target="_blank"' .
-				' rel="noreferrer">' .$this->getEntity() . '</a>'.
-				' – ' . $this->getSlogan();
+			$footer = '<a href="'.$this->getBaseUrl().'" target="_blank"'.
+				' rel="noreferrer">'.$this->getEntity().'</a>'.
+				' – '.$this->getSlogan();
 		}
 
 		return $footer;
@@ -268,7 +268,7 @@ 
 		if ($this->themeExist('buildDocLinkToKey')) {
 			return $this->theme->buildDocLinkToKey($key);
 		}
-		return $this->getDocBaseUrl() . '/server/' . $this->defaultDocVersion . '/go.php?to=' . $key;
+		return $this->getDocBaseUrl().'/server/'.$this->defaultDocVersion.'/go.php?to='.$key;
 	}
 
 	/**