Sync with upstream.

horde · Nov 4, 2014 · 385e2ec · 385e2ec
2 parents 6af8b12 + 18e6add
commit 385e2ec
Show file tree

Hide file tree

Showing 2,269 changed files with 173,186 additions and 27,816 deletions.
diff --git a/ansel/lib/Api.php b/ansel/lib/Api.php
@@ -55,19 +55,6 @@ public function browse($path = '', array $properties = array())
                 if (in_array('browseable', $properties)) {
                     $results['ansel/' . $owner]['browseable'] = true;
                 }
-                if (in_array('contenttype', $properties)) {
-                    $results['ansel/' . $owner]['contenttype'] =
-                        'httpd/unix-directory';
-                }
-                if (in_array('contentlength', $properties)) {
-                    $results['ansel/' . $owner]['contentlength'] = 0;
-                }
-                if (in_array('modified', $properties)) {
-                    $results['ansel/' . $owner]['modified'] = time();
-                }
-                if (in_array('created', $properties)) {
-                    $results['ansel/' . $owner]['created'] = 0;
-                }
             }
             return $results;
         } else {
@@ -121,18 +108,6 @@ public function browse($path = '', array $properties = array())
                     $results[$retpath]['browseable'] = $gallery->hasPermission(
                         $GLOBALS['registry']->getAuth(), Horde_Perms::READ);
                 }
-                if (in_array('contenttype', $properties)) {
-                    $results[$retpath]['contenttype'] = 'httpd/unix-directory';
-                }
-                if (in_array('contentlength', $properties)) {
-                    $results[$retpath]['contentlength'] = 0;
-                }
-                if (in_array('modified', $properties)) {
-                    $results[$retpath]['modified'] = time();
-                }
-                if (in_array('created', $properties)) {
-                    $results[$retpath]['created'] = 0;
-                }
             }
 
             foreach ($images as $imageId => $image) {
@@ -152,9 +127,6 @@ public function browse($path = '', array $properties = array())
                 if (in_array('contenttype', $properties)) {
                     $results[$retpath]['contenttype'] = $image['type'];
                 }
-                if (in_array('contentlength', $properties)) {
-                    $results[$retpath]['contentlength'] = 1;
-                }
                 if (in_array('modified', $properties)) {
                     $results[$retpath]['modified'] = $image['uploaded'];
                 }

diff --git a/ansel/test/Ansel/phpunit.xml b/ansel/test/Ansel/phpunit.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="bootstrap">
+<phpunit bootstrap="bootstrap.php">
   <filter>
     <whitelist>
       <directory suffix=".php">../../lib</directory>

diff --git a/chora/locale/cs/LC_MESSAGES/chora.mo b/chora/locale/cs/LC_MESSAGES/chora.mo
diff --git a/components/bundle/composer.json b/components/bundle/composer.json
@@ -0,0 +1,8 @@
+{
+    "require-dev": {
+        "phploc/phploc": "*",
+        "phpmd/phpmd" : "@stable",
+        "sebastian/phpcpd": "*",
+        "sebastian/phpdcd": "*"
+    }
+}