Some fixes to make mod_mnogosearch installable.

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..c4c4ffc
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.zip

diff --git a/com_mnogosearch/mnogosearch.xml b/com_mnogosearch/mnogosearch.xml
index 0c80ef74c6474badfa978dbf468f465721d03b47..02dfc841d153b9fa9a9eee811388edc62e4c1dcc 100644 (file)
--- a/com_mnogosearch/mnogosearch.xml
+++ b/com_mnogosearch/mnogosearch.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE install SYSTEM "http://dev.joomla.org/xml/1.5/component-install.dtd">\r
 <install type="component" version="1.5.0">\r
-       <name>mnoGoSearch</name>\r
+       <name>JMnoGoSearch</name>\r
        <author>Andrea Zagli</author>\r
        <creationDate>December 2009</creationDate>\r
        <copyright>Copyright (C) 2009 Andrea Zagli. All rights reserved.</copyright>\r
@@ -9,7 +9,7 @@
        <authorEmail>azagli@libero.it</authorEmail>\r
        <authorUrl>http://saetta.homelinux.org/</authorUrl>\r
        <version>1.0.0</version>\r
-       <description>A component to display search results from mnoGoSearch web search engine.</description>
+       <description>A component to display search results from mnoGoSearch (http://www.mnogosearch.org/) web search engine.</description>
 
        <install>
                <sql>
@@ -27,7 +27,7 @@
        </files>
 
        <administration>
-               <menu>jmnoGoSearch</menu>
+               <menu>JMnoGoSearch</menu>
                <files folder="admin">
                        <filename>admin.mnogosearch.php</filename>
                        <filename>config.xml</filename>

diff --git a/mod_mnogosearch/mod_mnogosearch.php b/mod_mnogosearch/mod_mnogosearch.php
new file mode 100644 (file)
index 0000000..d26d9b2
--- /dev/null
+++ b/mod_mnogosearch/mod_mnogosearch.php
@@ -0,0 +1,34 @@
+<?php
+/**
+* @version             $Id: mod_mnogosearch.php 1 2009-12-12 02:15:55Z andreaz $
+* @package             mod_mnoGoSearch
+* @copyright   Copyright (C) 2009 Andrea Zagli. All rights reserved.
+* @license             GNU/GPL, see LICENSE.php
+* mod_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');
+
+// Include the syndicate functions only once
+require_once( dirname(__FILE__).DS.'helper.php' );
+
+$button                         = $params->get('button', '');
+$imagebutton    = $params->get('imagebutton', '');
+$button_pos             = $params->get('button_pos', 'left');
+$button_text    = $params->get('button_text', JText::_('Search'));
+$width                  = intval($params->get('width', 20));
+$maxlength              = $width > 20 ? $width : 20;
+$text                   = $params->get('text', JText::_('search...'));
+$set_Itemid             = intval($params->get('set_itemid', 0));
+$moduleclass_sfx = $params->get('moduleclass_sfx', '');
+
+if ($imagebutton) {
+    $img = modMnoGoSearchHelper::getSearchImage( $button_text );
+}
+$mitemid = $set_Itemid > 0 ? $set_Itemid : JRequest::getInt('Itemid');
+require(JModuleHelper::getLayoutPath('mod_mnogosearch'));

diff --git a/mod_mnogosearch/mod_mnogosearch.xml b/mod_mnogosearch/mod_mnogosearch.xml
index a2afd2335998168a73bc5ba360c764796e42e9c4..7202a6718cb516048cd7e4c8aa49b4bb6eeec859 100644 (file)
--- a/mod_mnogosearch/mod_mnogosearch.xml
+++ b/mod_mnogosearch/mod_mnogosearch.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<install type="module" version="1.0.0">
+<install type="module" version="1.5.0">
+
        <name>mnoGoSearch</name>
        <author>Andrea Zagli</author>
        <creationDate>December 2009</creationDate>
@@ -11,7 +12,10 @@
        <description>This module will display a search box that is linked with the mnoGoSearch web search engine.</description>
 
        <files>
+               <filename>helper.php</filename>
+               <filename>index.html</filename>
                <filename module="mod_mnogosearch">mod_mnogosearch.php</filename>
+               <filename>mod_mnogosearch.xml</filename>
        </files>
 
        <params>
@@ -38,11 +42,5 @@
                <param name="@spacer" type="spacer" default="" label="" description="" />
                <param name="set_itemid" type="text" default="" label="Set Itemid" description="PARAMSETITEMID" />
        </params>
-       <params group="advanced">
-               <param name="cache" type="list" default="1" label="Caching" description="Select whether to cache the content of this module">
-                       <option value="1">Use global</option>
-                       <option value="0">No caching</option>
-               </param>
-               <param name="cache_time" type="text" default="900" label="Cache Time" description="The time before the module is recached" />
-       </params>
+
 </install>

diff --git a/mod_mnogosearch/mod_mnosearch.php b/mod_mnogosearch/mod_mnosearch.php
deleted file mode 100644 (file)
index d26d9b2..0000000
--- a/mod_mnogosearch/mod_mnosearch.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
-* @version             $Id: mod_mnogosearch.php 1 2009-12-12 02:15:55Z andreaz $
-* @package             mod_mnoGoSearch
-* @copyright   Copyright (C) 2009 Andrea Zagli. All rights reserved.
-* @license             GNU/GPL, see LICENSE.php
-* mod_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');
-
-// Include the syndicate functions only once
-require_once( dirname(__FILE__).DS.'helper.php' );
-
-$button                         = $params->get('button', '');
-$imagebutton    = $params->get('imagebutton', '');
-$button_pos             = $params->get('button_pos', 'left');
-$button_text    = $params->get('button_text', JText::_('Search'));
-$width                  = intval($params->get('width', 20));
-$maxlength              = $width > 20 ? $width : 20;
-$text                   = $params->get('text', JText::_('search...'));
-$set_Itemid             = intval($params->get('set_itemid', 0));
-$moduleclass_sfx = $params->get('moduleclass_sfx', '');
-
-if ($imagebutton) {
-    $img = modMnoGoSearchHelper::getSearchImage( $button_text );
-}
-$mitemid = $set_Itemid > 0 ? $set_Itemid : JRequest::getInt('Itemid');
-require(JModuleHelper::getLayoutPath('mod_mnogosearch'));