From beff1c3e76d5db6bb3cfcfcd98ce4db1582fa1c3 Mon Sep 17 00:00:00 2001
From: Andrea Zagli <azagli@libero.it>
Date: Sat, 12 Dec 2009 11:42:17 +0100
Subject: [PATCH] Some adjustments.

---
 ...{mnogosearch.php => admin.mnogosearch.php} |  0
 com_mnogosearch/admin/search.php              | 21 -------------------
 .../views/{search => mnogosearch}/index.html  |  0
 .../{search => mnogosearch}/tmpl/default.php  |  0
 .../{search => mnogosearch}/tmpl/index.html   |  0
 .../views/{search => mnogosearch}/view.php    |  0
 com_mnogosearch/mnogosearch.xml               | 21 +++++++++++++++++--
 mod_mnogosearch/mod_mnogosearch.xml           |  4 +++-
 8 files changed, 22 insertions(+), 24 deletions(-)
 rename com_mnogosearch/admin/{mnogosearch.php => admin.mnogosearch.php} (100%)
 delete mode 100644 com_mnogosearch/admin/search.php
 rename com_mnogosearch/admin/views/{search => mnogosearch}/index.html (100%)
 rename com_mnogosearch/admin/views/{search => mnogosearch}/tmpl/default.php (100%)
 rename com_mnogosearch/admin/views/{search => mnogosearch}/tmpl/index.html (100%)
 rename com_mnogosearch/admin/views/{search => mnogosearch}/view.php (100%)

diff --git a/com_mnogosearch/admin/mnogosearch.php b/com_mnogosearch/admin/admin.mnogosearch.php
similarity index 100%
rename from com_mnogosearch/admin/mnogosearch.php
rename to com_mnogosearch/admin/admin.mnogosearch.php
diff --git a/com_mnogosearch/admin/search.php b/com_mnogosearch/admin/search.php
deleted file mode 100644
index 4c507a4..0000000
--- a/com_mnogosearch/admin/search.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
-* @version		$Id: com_mnogosearch.php 1 2009-12-12 02:15:55Z andreaz $
-* @package		com_mnoGoSearch
-* @copyright	Copyright (C) 2009 Andrea Zagli. All rights reserved.
-* @license		GNU/GPL, see LICENSE.php
-* com_mnoGoSearch is free software. This version may have been modified pursuant
-* to the GNU General Public License, and as distributed it includes or
-* is derivative of works licensed under the GNU General Public License or
-* other free or open source software licenses.
-* See COPYRIGHT.php for copyright notices and details.
-*/
-
-// no direct access
-defined( '_JEXEC' ) or die( 'Restricted access' );
-
-require_once( JPATH_COMPONENT.DS.'controller.php' );
-
-$controller = new mnoGoSearchController();
-$controller->execute( JRequest::getCmd( 'task' ) );
-$controller->redirect();
diff --git a/com_mnogosearch/admin/views/search/index.html b/com_mnogosearch/admin/views/mnogosearch/index.html
similarity index 100%
rename from com_mnogosearch/admin/views/search/index.html
rename to com_mnogosearch/admin/views/mnogosearch/index.html
diff --git a/com_mnogosearch/admin/views/search/tmpl/default.php b/com_mnogosearch/admin/views/mnogosearch/tmpl/default.php
similarity index 100%
rename from com_mnogosearch/admin/views/search/tmpl/default.php
rename to com_mnogosearch/admin/views/mnogosearch/tmpl/default.php
diff --git a/com_mnogosearch/admin/views/search/tmpl/index.html b/com_mnogosearch/admin/views/mnogosearch/tmpl/index.html
similarity index 100%
rename from com_mnogosearch/admin/views/search/tmpl/index.html
rename to com_mnogosearch/admin/views/mnogosearch/tmpl/index.html
diff --git a/com_mnogosearch/admin/views/search/view.php b/com_mnogosearch/admin/views/mnogosearch/view.php
similarity index 100%
rename from com_mnogosearch/admin/views/search/view.php
rename to com_mnogosearch/admin/views/mnogosearch/view.php
diff --git a/com_mnogosearch/mnogosearch.xml b/com_mnogosearch/mnogosearch.xml
index 54ee475..0c80ef7 100644
--- a/com_mnogosearch/mnogosearch.xml
+++ b/com_mnogosearch/mnogosearch.xml
@@ -5,7 +5,7 @@
 	<author>Andrea Zagli</author>
 	<creationDate>December 2009</creationDate>
 	<copyright>Copyright (C) 2009 Andrea Zagli. All rights reserved.</copyright>
-	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
+	<license>http://www.gnu.org/licenses/gpl-3.0.html GNU/GPL</license>
 	<authorEmail>azagli@libero.it</authorEmail>
 	<authorUrl>http://saetta.homelinux.org/</authorUrl>
 	<version>1.0.0</version>
@@ -29,7 +29,24 @@
 	<administration>
 		<menu>jmnoGoSearch</menu>
 		<files folder="admin">
-			<filename></filename>
+			<filename>admin.mnogosearch.php</filename>
+			<filename>config.xml</filename>
+			<filename>controller.php</filename>
+			<filename>index.html</filename>
+			<filename>helpers/index.html</filename>
+			<filename>helpers/mnogosearch.php</filename>
+			<filename>helpers/site.php</filename>
+			<filename>models/index.html</filename>
+			<filename>models/mnogosearch.php</filename>
+			<filename>sql/index.html</filename>
+			<filename>sql/indstall.sql</filename>
+			<filename>sql/uninstall.sql</filename>
+			<filename>helpers/index.html</filename>
+			<filename>views/index.html</filename>
+			<filename>views/mnogosearch/index.html</filename>
+			<filename>views/mnogosearch/view.php</filename>
+			<filename>views/mnogosearch/tmpl/index.html</filename>
+			<filename>views/mnogosearch/tmpl/default.php</filename>
 		</files>
 	</administration>
 
diff --git a/mod_mnogosearch/mod_mnogosearch.xml b/mod_mnogosearch/mod_mnogosearch.xml
index 6e8e479..a2afd23 100644
--- a/mod_mnogosearch/mod_mnogosearch.xml
+++ b/mod_mnogosearch/mod_mnogosearch.xml
@@ -4,14 +4,16 @@
 	<author>Andrea Zagli</author>
 	<creationDate>December 2009</creationDate>
 	<copyright>Copyright (C) 2000 Andrea Zagli. All rights reserved.</copyright>
-	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
+	<license>http://www.gnu.org/licenses/gpl-3.0.html GNU/GPL</license>
 	<authorEmail>azagli@libero.it</authorEmail>
 	<authorUrl>http://saetta.homelinux.org/</authorUrl>
 	<version>1.0.0</version>
 	<description>This module will display a search box that is linked with the mnoGoSearch web search engine.</description>
+
 	<files>
 		<filename module="mod_mnogosearch">mod_mnogosearch.php</filename>
 	</files>
+
 	<params>
 		<param name="moduleclass_sfx" type="text" default="" label="Module Class Suffix" description="PARAMMODULECLASSSUFFIX" />
 		<param name="@spacer" type="spacer" default="" label="" description="" />
-- 
2.49.0