From f3e0c5b654734d812d062cc5ed4b927913319e00 Mon Sep 17 00:00:00 2001
From: emkael <emkael@tlen.pl>
Date: Wed, 6 Apr 2016 13:54:40 +0200
Subject:  * Safe*FileUpload components moved back to components namespace

---
 app/php/components/SafeActiveFileUpload.php | 12 ++++++++++
 app/php/components/SafeFileUpload.php       | 34 +++++++++++++++++++++++++++++
 app/php/controls/CalendarScaffold.php       |  1 +
 app/php/controls/SafeActiveFileUpload.php   | 12 ----------
 app/php/controls/SafeFileUpload.php         | 34 -----------------------------
 5 files changed, 47 insertions(+), 46 deletions(-)
 create mode 100644 app/php/components/SafeActiveFileUpload.php
 create mode 100644 app/php/components/SafeFileUpload.php
 delete mode 100644 app/php/controls/SafeActiveFileUpload.php
 delete mode 100644 app/php/controls/SafeFileUpload.php

(limited to 'app/php')

diff --git a/app/php/components/SafeActiveFileUpload.php b/app/php/components/SafeActiveFileUpload.php
new file mode 100644
index 0000000..9b8e2a8
--- /dev/null
+++ b/app/php/components/SafeActiveFileUpload.php
@@ -0,0 +1,12 @@
+<?php
+
+Prado::using('System.Web.UI.ActiveControls.TActiveFileUpload');
+Prado::using('Application.components.SafeFileUpload');
+
+class SafeActiveFileUpload extends TActiveFileUpload {
+
+    use MimeTypeCheckForFileUpload;
+
+}
+
+?>
diff --git a/app/php/components/SafeFileUpload.php b/app/php/components/SafeFileUpload.php
new file mode 100644
index 0000000..98e120a
--- /dev/null
+++ b/app/php/components/SafeFileUpload.php
@@ -0,0 +1,34 @@
+<?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;
+        }
+    }
+
+}
+
+?>
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;
-        }
-    }
-
-}
-
-?>
-- 
cgit v1.2.3