Copy all not disabled files to the mirrored directory

5 files changed, 6 insertions, 6 deletions

diff --git a/bin/maintenance.php b/bin/maintenance.php
index 72ad712..39ae95b 100755
--- a/bin/maintenance.php
+++ b/bin/maintenance.php
@@ -339,8 +339,8 @@ switch ($action) {
                 files.filename as filename
             FROM
                 versions
-            INNER JOIN addons ON versions.addon_id = addons.id AND addons.status = 4 AND addons.inactive = 0
-            INNER JOIN files ON files.version_id = versions.id AND files.status = 4
+            INNER JOIN addons ON versions.addon_id = addons.id AND addons.status != 5 AND addons.inactive = 0
+            INNER JOIN files ON files.version_id = versions.id AND files.status != 5
             ORDER BY
                 addons.id DESC
         ";
diff --git a/site/app/controllers/admin_controller.php b/site/app/controllers/admin_controller.php
index 3bdddc8..c9aa465 100644
--- a/site/app/controllers/admin_controller.php
+++ b/site/app/controllers/admin_controller.php
@@ -253,7 +253,7 @@ class AdminController extends AppController
                             ));
                     
                         // If public, move to public rsync area
-                        if ($this->data['File']['status'][$k] == STATUS_PUBLIC) {
+                        if ($this->data['File']['status'][$k] != STATUS_DISABLED) {
                             $this->Amo->copyFileToPublic($id, $file['File']['filename']);
                         }
                     }
diff --git a/site/app/controllers/components/developers.php b/site/app/controllers/components/developers.php
index 0d07007..162132c 100644
--- a/site/app/controllers/components/developers.php
+++ b/site/app/controllers/components/developers.php
@@ -589,7 +589,7 @@ class DevelopersComponent extends Object {
         }
 
         // Copy file to rsync area if public
-        if ($data['File']['db']['status'] == STATUS_PUBLIC) {
+        if ($data['File']['db']['status'] != STATUS_DISABLED) {
             $this->controller->Amo->copyFileToPublic($data['Addon']['id'], $filename);
         }
 
diff --git a/site/app/controllers/components/editors.php b/site/app/controllers/components/editors.php
index a6ba460..dd826f5 100644
--- a/site/app/controllers/components/editors.php
+++ b/site/app/controllers/components/editors.php
@@ -278,7 +278,7 @@ class EditorsComponent extends Object {
                     }
                     
                     // Move to public rsync repo
-                    if ($fileData['status'] == STATUS_PUBLIC) {
+                    if ($fileData['status'] != STATUS_DISABLED) {
                         $this->controller->Amo->copyFileToPublic($approvalData['addon_id'], $file['File']['filename']);
                     }
                     
diff --git a/site/app/webroot/services/micro-format.php b/site/app/webroot/services/micro-format.php
index 1f600e6..197d680 100644
--- a/site/app/webroot/services/micro-format.php
+++ b/site/app/webroot/services/micro-format.php
@@ -139,7 +139,7 @@ if (!empty($errors)) {
             ";
         $files = mysql_fetch_array(mysql_query($sql_query));
 
-        if (defined(FILES_HOST))
+        if (defined('FILES_HOST'))
             $url = FILES_HOST . '/' . $row['id'] . '/' . $files['filename'];
         else
             $url = SITE_URL . '/downloads/file/' . $files['file_id'] . '/' . $files['filename'];