Index: branches/5.1.x/core/admin_templates/import/import_start.tpl
===================================================================
diff -u -N -r12657 -r13664
--- branches/5.1.x/core/admin_templates/import/import_start.tpl	(.../import_start.tpl)	(revision 12657)
+++ branches/5.1.x/core/admin_templates/import/import_start.tpl	(.../import_start.tpl)	(revision 13664)
@@ -27,7 +27,7 @@
 			</script>
 
 			<script src="js/swfobject.js" type="text/javascript"></script>
-			<script type="text/javascript" src="js/uploader.js"></script>
+			<script type="text/javascript" src="<inp2:m_Compress files='js/uploader/upload_manager.js|js/uploader/uploader.js'/>"></script>
 		</td>
 	</tr>
 </tbody>
Index: branches/5.1.x/core/admin_templates/skins/skin_edit.tpl
===================================================================
diff -u -N -r12657 -r13664
--- branches/5.1.x/core/admin_templates/skins/skin_edit.tpl	(.../skin_edit.tpl)	(revision 12657)
+++ branches/5.1.x/core/admin_templates/skins/skin_edit.tpl	(.../skin_edit.tpl)	(revision 13664)
@@ -53,7 +53,7 @@
 
 
 			<script src="js/swfobject.js" type="text/javascript"></script>
-			<script type="text/javascript" src="js/uploader.js"></script>
+			<script type="text/javascript" src="<inp2:m_Compress files='js/uploader/upload_manager.js|js/uploader/uploader.js'/>"></script>
 		</td>
 	</tr>
 </tbody>
Index: branches/5.1.x/core/admin_templates/js/uploader.js
===================================================================
diff -u -N
--- branches/5.1.x/core/admin_templates/js/uploader.js	(revision 12127)
+++ branches/5.1.x/core/admin_templates/js/uploader.js	(revision 0)
@@ -1,6 +0,0 @@
-var $uploader_scripts = [
-	'<script type="text/javascript" src="js/uploader/upload_manager.js"></script>',
-	'<script type="text/javascript" src="js/uploader/uploader.js"></script>'
-];
-
-document.write($uploader_scripts.join(''));
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/mailing_lists/mailing_list_edit.tpl
===================================================================
diff -u -N -r12657 -r13664
--- branches/5.1.x/core/admin_templates/mailing_lists/mailing_list_edit.tpl	(.../mailing_list_edit.tpl)	(revision 12657)
+++ branches/5.1.x/core/admin_templates/mailing_lists/mailing_list_edit.tpl	(.../mailing_list_edit.tpl)	(revision 13664)
@@ -72,7 +72,7 @@
 			</script>
 
 			<script type="text/javascript" src="js/swfobject.js"></script>
-			<script type="text/javascript" src="js/uploader.js"></script>
+			<script type="text/javascript" src="<inp2:m_Compress files='js/uploader/upload_manager.js|js/uploader/uploader.js'/>"></script>
 		</td>
 	</tr>
 </tbody>
Index: branches/5.1.x/core/units/admin/admin_events_handler.php
===================================================================
diff -u -N -r13582 -r13664
--- branches/5.1.x/core/units/admin/admin_events_handler.php	(.../admin_events_handler.php)	(revision 13582)
+++ branches/5.1.x/core/units/admin/admin_events_handler.php	(.../admin_events_handler.php)	(revision 13664)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: admin_events_handler.php 13582 2010-05-19 07:35:49Z alex $
+* @version	$Id: admin_events_handler.php 13664 2010-06-01 07:01:56Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -596,54 +596,6 @@
 		$event->status = erSTOP;
 	}
 
-	function OnUploadFile(&$event)
-	{
-		// Flash uploader does NOT send correct cookies, so we need to make our own check
-		$cookie_name = 'adm_'.$this->Application->ConfigValue('SessionCookieName');
-		$this->Application->HttpQuery->Cookie['cookies_on'] = 1;
-		$this->Application->HttpQuery->Cookie[$cookie_name] = $this->Application->GetVar('flashsid');
-
-		$admin_ses =& $this->Application->recallObject('Session.admin');
-		/* @var $admin_ses Session */
-		$user = $admin_ses->RecallVar('user_id');
-		$perm_helper =& $this->Application->recallObject('PermissionsHelper');
-		/* @var $perm_helper kPermissionsHelper */
-
-		/*if() {
-			$prefix_special = $this->Application->GetVar('PrefixSpecial');
-			$prefix_elems = split('\.|_', $prefix_special, 2);
-			$perm_sections = $this->Application->getUnitOption($prefix_elems[0], 'PermSection');
-			$section = $perm_sections['main'];
-		}
-		else {*/
-			$section = $event->getSection();
-		/*}*/
-
-		if ($this->Application->GetVar('t') != 'import/import_start' && !$perm_helper->CheckUserPermission($user, $section.'.add') && !$perm_helper->CheckUserPermission($user, $section.'.edit')) {
-			$event->status = erPERM_FAIL;
-			header('HTTP/1.0 403 You don\'t have permissions to upload');
-			exit;
-			return;
-		}
-
-		if (!$cookie_name) $cookie_name = 'sid';
-
-		$value = $this->Application->GetVar('Filedata');
-		if (!$value) return ;
-		$tmp_path = WRITEABLE . '/tmp/';
-		$fname = $value['name'];
-		$id = $this->Application->GetVar('id');
-		if ($id) $fname = $id.'_'.$fname;
-
-		if (!is_writable($tmp_path)) {
-			header('HTTP/1.0 500 Write permissions not set on the server');
-			exit;
-		}
-
-		move_uploaded_file($value['tmp_name'], $tmp_path.$fname);
-		exit;
-	}
-
 	function OnDropTempTablesByWID(&$event)
 	{
 		$sid = $this->Application->GetSID();
Index: branches/5.1.x/core/admin_templates/submissions/submission_log_edit.tpl
===================================================================
diff -u -N -r13390 -r13664
--- branches/5.1.x/core/admin_templates/submissions/submission_log_edit.tpl	(.../submission_log_edit.tpl)	(revision 13390)
+++ branches/5.1.x/core/admin_templates/submissions/submission_log_edit.tpl	(.../submission_log_edit.tpl)	(revision 13664)
@@ -62,7 +62,7 @@
 			</script>
 
 			<script type="text/javascript" src="js/swfobject.js"></script>
-			<script type="text/javascript" src="js/uploader.js"></script>
+			<script type="text/javascript" src="<inp2:m_Compress files='js/uploader/upload_manager.js|js/uploader/uploader.js'/>"></script>
 		</td>
 	</tr>
 </table>