Whitespace fixes

diff --git a/apps/gallery/js/album_cover.js b/apps/gallery/js/album_cover.js
index d1809462f2f513307dabe697fbb43f208e9d2948..905034f6fd17e0d195c19d9d84c895516af03369 100644 (file)
--- a/apps/gallery/js/album_cover.js
+++ b/apps/gallery/js/album_cover.js
@@ -78,14 +78,14 @@ function albumClickHandler(r) {
                for (var i in r.photos) {
                        Albums.photos.push(r.photos[i]);
                }
-    Albums.shared = r.shared;
-    if (Albums.shared) {
-      Albums.recursive = r.recursive;
-      Albums.token = r.token;
-    } else {
-      Albums.recursive = false;
-      Albums.token = '';
-    }
+               Albums.shared = r.shared;
+               if (Albums.shared) {
+                       Albums.recursive = r.recursive;
+                       Albums.token = r.token;
+               } else {
+                       Albums.recursive = false;
+                       Albums.token = '';
+               }
                $(document).ready(function(){
                        var targetDiv = $('#gallery_list');
                        targetDiv.html('');

diff --git a/apps/gallery/lib/album.php b/apps/gallery/lib/album.php
index 27d40cdb91f8519351810d3e279d221198e4ea09..ac6cacbe01f509e99c1aaa3f9b608e7deb3cd455 100755 (executable)
--- a/apps/gallery/lib/album.php
+++ b/apps/gallery/lib/album.php
@@ -79,7 +79,7 @@ class OC_Gallery_Album {
                        $sql .= ' AND parent_path = ?';
                        $args[] = $parent;
                }
-    $order = OCP\Config::getUserValue($owner, 'gallery', 'order', 'ASC');
+               $order = OCP\Config::getUserValue($owner, 'gallery', 'order', 'ASC');
                $sql .= ' ORDER BY album_name ' . $order;
 
                $stmt = OCP\DB::prepare($sql);
@@ -98,19 +98,17 @@ class OC_Gallery_Album {
        }
 
        public static function getAlbumSize($id){
-    $sql = 'SELECT COUNT(*) as size FROM *PREFIX*gallery_photos WHERE album_id = ?';
-    $stmt = OCP\DB::prepare($sql);
-    $result=$stmt->execute(array($id))->fetchRow();
-    return $result['size'];
+               $sql = 'SELECT COUNT(*) as size FROM *PREFIX*gallery_photos WHERE album_id = ?';
+               $stmt = OCP\DB::prepare($sql);
+               $result=$stmt->execute(array($id))->fetchRow();
+               return $result['size'];
        }
 
-  public static function getIntermediateGallerySize($path) {
-    $path .= '%';
-    $sql = 'SELECT COUNT(*) as size FROM *PREFIX*gallery_photos photos, *PREFIX*gallery_albums albums WHERE photos.album_id = albums.album_id AND uid_owner = ? AND file_path LIKE ?';
-    $stmt = OCP\DB::prepare($sql);
-    $result = $stmt->execute(array(OCP\USER::getUser(), $path))->fetchRow();
-    return $result['size'];
-  }
+       public static function getIntermediateGallerySize($path) {
+               $path .= '%';
+               $sql = 'SELECT COUNT(*) as size FROM *PREFIX*gallery_photos photos, *PREFIX*gallery_albums albums WHERE photos.album_id = albums.album_id AND uid_owner = ? AND file_path LIKE ?';
+               $stmt = OCP\DB::prepare($sql);
+               $result = $stmt->execute(array(OCP\USER::getUser(), $path))->fetchRow();
+               return $result['size'];
+       }
 }
-
-?>

diff --git a/lib/files.php b/lib/files.php
index 5d4d73630eb8d016af7ff33ad9cc50017c87b9e5..d837bf7aa2c79926b461022cdcaed794d622aa39 100644 (file)
--- a/lib/files.php
+++ b/lib/files.php
@@ -32,11 +32,11 @@ class OC_Files {
        * get the content of a directory
        * @param dir $directory
        */
-  public static function getDirectoryContent($directory, $mimetype_filter = ''){
+       public static function getDirectoryContent($directory, $mimetype_filter = ''){
                if(strpos($directory,OC::$CONFIG_DATADIRECTORY)===0){
                        $directory=substr($directory,strlen(OC::$CONFIG_DATADIRECTORY));
                }
-    $files=OC_FileCache::getFolderContent($directory, '', $mimetype_filter);
+               $files=OC_FileCache::getFolderContent($directory, '', $mimetype_filter);
                foreach($files as &$file){
                        $file['directory']=$directory;
                        $file['type']=($file['mimetype']=='httpd/unix-directory')?'dir':'file';

diff --git a/lib/util.php b/lib/util.php
index e4546d6ac3db5adbd0c392293900d5b66f00ea2b..ff117998713cac6ecab8cee8391b668f413a2c04 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -31,7 +31,7 @@ class OC_Util {
                // Create root dir.
                if(!is_dir($CONFIG_DATADIRECTORY_ROOT)){
                        $success=@mkdir($CONFIG_DATADIRECTORY_ROOT);
-            if(!$success) {
+                       if(!$success) {
                                $tmpl = new OC_Template( '', 'error', 'guest' );
                                $tmpl->assign('errors',array(1=>array('error'=>"Can't create data directory (".$CONFIG_DATADIRECTORY_ROOT.")",'hint'=>"You can usually fix this by giving the webserver write access to the ownCloud directory '".OC::$SERVERROOT."' (in a terminal, use the command 'chown -R www-data:www-data /path/to/your/owncloud/install/data' ")));
                                $tmpl->printPage();
@@ -50,7 +50,6 @@ class OC_Util {
                        self::$rootMounted=true;
                }
                if( $user != "" ){ //if we aren't logged in, there is no use to set up the filesystem
-
                        OC::$CONFIG_DATADIRECTORY = $CONFIG_DATADIRECTORY_ROOT."/$user/$root";
                        if( !is_dir( OC::$CONFIG_DATADIRECTORY )){
                                mkdir( OC::$CONFIG_DATADIRECTORY, 0755, true );