* Safe*FileUpload components moved back to components namespace

3 files changed, 1 insertions, 46 deletions

diff --git a/app/php/controls/CalendarScaffold.php b/app/php/controls/CalendarScaffold.php
index f265d53..70efcaa 100644
--- a/app/php/controls/CalendarScaffold.php
+++ b/app/php/controls/CalendarScaffold.php
@@ -2,6 +2,7 @@
 
 Prado::using('System.Web.UI.ActiveControls.TActiveDataGrid');
 Prado::using('System.Web.UI.ActiveControls.TActiveTextBox');
+Prado::using('Application.components.SafeActiveFileUpload');
 Prado::using('Application.facades.CalendarFacade');
 
 class CalendarScaffold extends TTemplateControl {
diff --git a/app/php/controls/SafeActiveFileUpload.php b/app/php/controls/SafeActiveFileUpload.php
deleted file mode 100644
index ada1e34..0000000
--- a/app/php/controls/SafeActiveFileUpload.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-Prado::using('System.Web.UI.ActiveControls.TActiveFileUpload');
-Prado::using('Application.controls.SafeFileUpload');
-
-class SafeActiveFileUpload extends TActiveFileUpload {
-
-    use MimeTypeCheckForFileUpload;
-
-}
-
-?>
diff --git a/app/php/controls/SafeFileUpload.php b/app/php/controls/SafeFileUpload.php
deleted file mode 100644
index 98e120a..0000000
--- a/app/php/controls/SafeFileUpload.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-class SafeFileUpload extends TFileUpload {
-
-    use MimeTypeCheckForFileUpload;
-
-}
-
-trait MimeTypeCheckForFileUpload {
-
-    protected $_isSecure = TRUE;
-
-    public function getIsSecure() {
-        return $this->_isSecure;
-    }
-
-    public function setIsSecure($bool) {
-        $this->_isSecure = $bool;
-    }
-
-    public function getFileType() {
-        $type = parent::getFileType();
-        if ($this->getIsSecure()) {
-            $fileInfo = new finfo(FILEINFO_MIME_TYPE);
-            return $fileInfo->file($this->getLocalName());
-        }
-        else {
-            return $type;
-        }
-    }
-
-}
-
-?>