From: Andrea Zagli Date: Sat, 12 Dec 2009 15:25:25 +0000 (+0100) Subject: Renaming files to jmnogosearch. X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=9fe00e1cd0c55138fac2d7c8ab4b3834f47ab554;p=joomla%2Fjmnogosearch Renaming files to jmnogosearch. --- diff --git a/com_jmnogosearch/admin/admin.jmnogosearch.php b/com_jmnogosearch/admin/admin.jmnogosearch.php new file mode 100644 index 0000000..4c507a4 --- /dev/null +++ b/com_jmnogosearch/admin/admin.jmnogosearch.php @@ -0,0 +1,21 @@ +execute( JRequest::getCmd( 'task' ) ); +$controller->redirect(); diff --git a/com_jmnogosearch/admin/config.xml b/com_jmnogosearch/admin/config.xml new file mode 100644 index 0000000..c98eba5 --- /dev/null +++ b/com_jmnogosearch/admin/config.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/com_jmnogosearch/admin/controller.php b/com_jmnogosearch/admin/controller.php new file mode 100644 index 0000000..c684b0d --- /dev/null +++ b/com_jmnogosearch/admin/controller.php @@ -0,0 +1,45 @@ +getModel( 'Search' ); + $view =& $this->getView( 'Search' ); + $view->setModel( $model, true ); + $view->display(); + } + + /** + * Reset Statistics + */ + function reset() + { + $model =& $this->getModel( 'Search' ); + $model->reset(); + $this->setRedirect('index.php?option=com_mnogosearch'); + } +} diff --git a/com_jmnogosearch/admin/helpers/index.html b/com_jmnogosearch/admin/helpers/index.html new file mode 100644 index 0000000..fa6d84e --- /dev/null +++ b/com_jmnogosearch/admin/helpers/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/com_jmnogosearch/admin/helpers/jmnogosearch.php b/com_jmnogosearch/admin/helpers/jmnogosearch.php new file mode 100644 index 0000000..b2b5cdf --- /dev/null +++ b/com_jmnogosearch/admin/helpers/jmnogosearch.php @@ -0,0 +1,204 @@ +getTag(); + $ignoreFile = $lang->getLanguagePath().DS.$tag.DS.$tag.'.ignore.php'; + if (file_exists($ignoreFile)) { + include $ignoreFile; + } + + // check for words to ignore + $aterms = explode( ' ', JString::strtolower( $searchword ) ); + + // first case is single ignored word + if ( count( $aterms ) == 1 && in_array( JString::strtolower( $searchword ), $search_ignore ) ) { + $ignored = true; + } + + // filter out search terms that are too small + foreach( $aterms AS $aterm ) { + if (JString::strlen( $aterm ) < 3) { + $search_ignore[] = $aterm; + } + } + + // next is to remove ignored words from type 'all' or 'any' (not exact) searches with multiple words + if ( count( $aterms ) > 1 && $searchphrase != 'exact' ) { + $pruned = array_diff( $aterms, $search_ignore ); + $searchword = implode( ' ', $pruned ); + } + + return $ignored; + } + + function limitSearchWord(&$searchword) + { + $restriction = false; + + // limit searchword to 20 characters + if ( JString::strlen( $searchword ) > 20 ) { + $searchword = JString::substr( $searchword, 0, 19 ); + $restriction = true; + } + + // searchword must contain a minimum of 3 characters + if ( $searchword && JString::strlen( $searchword ) < 3 ) { + $searchword = ''; + $restriction = true; + } + + return $restriction; + } + + function logSearch( $search_term ) + { + global $mainframe; + + $db =& JFactory::getDBO(); + + $params = &JComponentHelper::getParams( 'com_search' ); + $enable_log_searches = $params->get('enabled'); + + $search_term = $db->getEscaped( trim( $search_term) ); + + if ( @$enable_log_searches ) + { + $db =& JFactory::getDBO(); + $query = 'SELECT hits' + . ' FROM #__core_log_searches' + . ' WHERE LOWER( search_term ) = "'.$search_term.'"' + ; + $db->setQuery( $query ); + $hits = intval( $db->loadResult() ); + if ( $hits ) { + $query = 'UPDATE #__core_log_searches' + . ' SET hits = ( hits + 1 )' + . ' WHERE LOWER( search_term ) = "'.$search_term.'"' + ; + $db->setQuery( $query ); + $db->query(); + } else { + $query = 'INSERT INTO #__core_log_searches VALUES ( "'.$search_term.'", 1 )'; + $db->setQuery( $query ); + $db->query(); + } + } + } + + /** + * Prepares results from search for display + * + * @param string The source string + * @param int Number of chars to trim + * @param string The searchword to select around + * @return string + */ + function prepareSearchContent( $text, $length = 200, $searchword ) + { + // strips tags won't remove the actual jscript + $text = preg_replace( "']*>.*?'si", "", $text ); + $text = preg_replace( '/{.+?}/', '', $text); + //$text = preg_replace( '/]*>([^<]+)<\/a>/is','\2', $text ); + // replace line breaking tags with whitespace + $text = preg_replace( "'<(br[^/>]*?/|hr[^/>]*?/|/(div|h[1-6]|li|p|td))>'si", ' ', $text ); + + return SearchHelper::_smartSubstr( strip_tags( $text ), $length, $searchword ); + } + + /** + * Checks an object for search terms (after stripping fields of HTML) + * + * @param object The object to check + * @param string Search words to check for + * @param array List of object variables to check against + * @returns boolean True if searchTerm is in object, false otherwise + */ + function checkNoHtml($object, $searchTerm, $fields) { + $searchRegex = array( + '#]*>.*?#si', + '#]*>.*?#si', + '##si', + '#<[^>]*>#i' + ); + $terms = explode(' ', $searchTerm); + if(empty($fields)) return false; + foreach($fields AS $field) { + if(!isset($object->$field)) continue; + $text = $object->$field; + foreach($searchRegex As $regex) { + $text = preg_replace($regex, '', $text); + } + foreach($terms AS $term) { + if(JString::stristr($text, $term) !== false) { + return true; + } + } + } + return false; + } + + /** + * returns substring of characters around a searchword + * + * @param string The source string + * @param int Number of chars to return + * @param string The searchword to select around + * @return string + */ + function _smartSubstr($text, $length = 200, $searchword) + { + $textlen = JString::strlen($text); + $lsearchword = JString::strtolower($searchword); + $wordfound = false; + $pos = 0; + while ($wordfound === false && $pos < $textlen) { + if (($wordpos = @JString::strpos($text, ' ', $pos + $length)) !== false) { + $chunk_size = $wordpos - $pos; + } else { + $chunk_size = $length; + } + $chunk = JString::substr($text, $pos, $chunk_size); + $wordfound = JString::strpos(JString::strtolower($chunk), $lsearchword); + if ($wordfound === false) { + $pos += $chunk_size + 1; + } + } + + if ($wordfound !== false) { + return (($pos > 0) ? '... ' : '') . $chunk . ' ...'; + } else { + if (($wordpos = @JString::strpos($text, ' ', $length)) !== false) { + return JString::substr($text, 0, $wordpos) . ' ...'; + } else { + return JString::substr($text, 0, $length); + } + } + } +} diff --git a/com_jmnogosearch/admin/helpers/site.php b/com_jmnogosearch/admin/helpers/site.php new file mode 100644 index 0000000..6368a03 --- /dev/null +++ b/com_jmnogosearch/admin/helpers/site.php @@ -0,0 +1,38 @@ + \ No newline at end of file diff --git a/com_jmnogosearch/admin/models/index.html b/com_jmnogosearch/admin/models/index.html new file mode 100644 index 0000000..fa6d84e --- /dev/null +++ b/com_jmnogosearch/admin/models/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/com_jmnogosearch/admin/models/jmnogosearch.php b/com_jmnogosearch/admin/models/jmnogosearch.php new file mode 100644 index 0000000..c22bc10 --- /dev/null +++ b/com_jmnogosearch/admin/models/jmnogosearch.php @@ -0,0 +1,121 @@ +setQuery( 'DELETE FROM #__mnogosearch_log_searches' ); + $db->query(); + } + + function getItems( ) + { + global $mainframe, $option; + $db =& JFactory::getDBO(); + + $filter_order = $mainframe->getUserStateFromRequest( 'com_mnogosearch.filter_order', 'filter_order', 'hits', 'cmd' ); + $filter_order_Dir = $mainframe->getUserStateFromRequest( 'com_mnogosearch.filter_order_Dir', 'filter_order_Dir', '', 'word' ); + $limit = $mainframe->getUserStateFromRequest( 'global.list.limit', 'limit', $mainframe->getCfg('list_limit'), 'int' ); + $limitstart = $mainframe->getUserStateFromRequest( 'com_mnogosearch.limitstart', 'limitstart', 0, 'int' ); + $search = $mainframe->getUserStateFromRequest( 'com_mnogosearch.search', 'search', '', 'string' ); + $search = JString::strtolower( $search ); + $showResults = JRequest::getInt('search_results'); + + // table ordering + if ( $filter_order_Dir == 'ASC' ) { + $this->lists['order_Dir'] = 'ASC'; + } else { + $this->lists['order_Dir'] = 'DESC'; + } + $this->lists['order'] = $filter_order; + + // search filter + $this->lists['search']= $search; + + $where = array(); + if ($search) { + $where[] = 'LOWER( search_term ) LIKE '.$db->Quote( '%'.$db->getEscaped( $search, true ).'%', false ); + } + + $where = ( count( $where ) ? ' WHERE ' . implode( ' AND ', $where ) : '' ); + $orderby = ' ORDER BY '. $filter_order .' '. $filter_order_Dir .', hits DESC'; + + // get the total number of records + $query = 'SELECT COUNT(*)' + . ' FROM #__mnogosearch_log_searches' + . $where; + $db->setQuery( $query ); + $total = $db->loadResult(); + + jimport( 'joomla.html.pagination' ); + $pageNav = new JPagination( $total, $limitstart, $limit ); + + $query = ' SELECT * ' + . ' FROM #__mnogosearch_log_searches ' + . $where + . $orderby; + $db->setQuery( $query, $pageNav->limitstart, $pageNav->limit ); + + $rows = $db->loadObjectList(); + + JPluginHelper::importPlugin( 'search' ); + + if (!class_exists( 'JSite' )) + { + // This fools the routers in the search plugins into thinking it's in the frontend + require_once( JPATH_COMPONENT.DS.'helpers'.DS.'site.php' ); + } + + for ($i=0, $n = count($rows); $i < $n; $i++) { + // determine if number of results for search item should be calculated + // by default it is `off` as it is highly query intensive + if ( $showResults ) { + $results = $mainframe->triggerEvent( 'onSearch', array( $rows[$i]->search_term ) ); + + $count = 0; + for ($j = 0, $n2 = count( $results ); $j < $n2; $j++) { + $count += count( $results[$j] ); + } + + $rows[$i]->returns = $count; + } else { + $rows[$i]->returns = null; + } + } + + return $rows; + } +} diff --git a/com_jmnogosearch/admin/sql/index.html b/com_jmnogosearch/admin/sql/index.html new file mode 100644 index 0000000..fa6d84e --- /dev/null +++ b/com_jmnogosearch/admin/sql/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/com_jmnogosearch/admin/sql/install.sql b/com_jmnogosearch/admin/sql/install.sql new file mode 100644 index 0000000..e20d243 --- /dev/null +++ b/com_jmnogosearch/admin/sql/install.sql @@ -0,0 +1,6 @@ +DROP TABLE IF EXISTS `#__jmnogosearch_log_searches`; + +CREATE TABLE `#_jmnogosearch_log_searches` ( + `search_term` varchar(128) NOT NULL default '', + `hits` int(11) unsigned NOT NULL default '0' +) DEFAULT CHARSET=utf8 diff --git a/com_jmnogosearch/admin/sql/uninstall.sql b/com_jmnogosearch/admin/sql/uninstall.sql new file mode 100644 index 0000000..a5b3236 --- /dev/null +++ b/com_jmnogosearch/admin/sql/uninstall.sql @@ -0,0 +1 @@ +DROP TABLE IF EXISTS `#__jmnogosearch_log_searches`; diff --git a/com_jmnogosearch/admin/views/index.html b/com_jmnogosearch/admin/views/index.html new file mode 100644 index 0000000..fa6d84e --- /dev/null +++ b/com_jmnogosearch/admin/views/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/com_jmnogosearch/admin/views/jmnogosearch/index.html b/com_jmnogosearch/admin/views/jmnogosearch/index.html new file mode 100644 index 0000000..fa6d84e --- /dev/null +++ b/com_jmnogosearch/admin/views/jmnogosearch/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/com_jmnogosearch/admin/views/jmnogosearch/tmpl/default.php b/com_jmnogosearch/admin/views/jmnogosearch/tmpl/default.php new file mode 100644 index 0000000..cb86877 --- /dev/null +++ b/com_jmnogosearch/admin/views/jmnogosearch/tmpl/default.php @@ -0,0 +1,89 @@ + + +

+ + + + + + +

+ : + + + +

+ : + enabled ? ''. JText::_( 'Enabled' ) .'' : ''. JText::_( 'Disabled' ) .'' ?> + +

+ showResults ) : ?> + + + + +

+ +

+ + + + + + + showResults ) : ?> + + + + + + + + + + + items); $i < $n; $i++) { + $row =& $this->items[$i]; + ?> + + + + + showResults ) : ?> + + + + + +

+ +	+ lists['order_Dir'], @$this->lists['order'] ); ?> +	+ lists['order_Dir'], @$this->lists['order'] ); ?> +	+ +
+ pageNav->getListFooter(); ?> +
+ pageNav->limitstart; ?> +	+ search_term, ENT_QUOTES, 'UTF-8'); ?> +	+ hits; ?> +	+ returns; ?> +

+ + + + + +

diff --git a/com_jmnogosearch/admin/views/jmnogosearch/tmpl/index.html b/com_jmnogosearch/admin/views/jmnogosearch/tmpl/index.html new file mode 100644 index 0000000..fa6d84e --- /dev/null +++ b/com_jmnogosearch/admin/views/jmnogosearch/tmpl/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/com_jmnogosearch/admin/views/jmnogosearch/view.php b/com_jmnogosearch/admin/views/jmnogosearch/view.php new file mode 100644 index 0000000..223b68b --- /dev/null +++ b/com_jmnogosearch/admin/views/jmnogosearch/view.php @@ -0,0 +1,63 @@ +setTitle(JText::_('Search Statistics')); + + $limit = $mainframe->getUserStateFromRequest( 'global.list.limit', 'limit', $mainframe->getCfg('list_limit'), 'int' ); + $limitstart = $mainframe->getUserStateFromRequest( 'com_mnogosearch.limitstart', 'limitstart', 0, 'int' ); + + $model = $this->getModel(); + $items = $model->getItems(); + $params = &JComponentHelper::getParams( 'com_mnogosearch' ); + $enabled = $params->get('enabled'); + JHTML::_('behavior.tooltip'); + jimport('joomla.html.pagination'); + $pageNav = new JPagination( count($items), $limitstart, $limit ); + + $showResults = JRequest::getInt('search_results'); + + $search = $mainframe->getUserStateFromRequest( 'com_mnosearch.search', 'search', '', 'string' ); + + $this->assignRef('items', $items); + $this->assignRef('enabled', $enabled); + $this->assignRef('pageNav', $pageNav); + $this->assignRef('search', $search ); + $this->assignRef('lists', $model->lists ); + + $this->assignRef('showResults', $showResults); + + parent::display($tpl); + } +} diff --git a/com_jmnogosearch/jmnogosearch.xml b/com_jmnogosearch/jmnogosearch.xml new file mode 100644 index 0000000..c6f3c93 --- /dev/null +++ b/com_jmnogosearch/jmnogosearch.xml @@ -0,0 +1,53 @@ + + + + + JMnoGoSearch + Andrea Zagli + December 2009 + Copyright (C) 2009 Andrea Zagli. All rights reserved. + http://www.gnu.org/licenses/gpl-3.0.html GNU/GPL + azagli@libero.it + http://saetta.homelinux.org/ + 1.0.0 + A component to display search results from mnoGoSearch (http://www.mnogosearch.org/) web search engine. + + + + sql/install.sql + + + + + sql/uninstall.sql + + + + + index.html + + + + JMnoGoSearch + + admin.mnogosearch.php + config.xml + controller.php + index.html + helpers/index.html + helpers/mnogosearch.php + helpers/site.php + models/index.html + models/mnogosearch.php + sql/index.html + sql/install.sql + sql/uninstall.sql + views/index.html + views/mnogosearch/index.html + views/mnogosearch/view.php + views/mnogosearch/tmpl/index.html + views/mnogosearch/tmpl/default.php + + + + diff --git a/com_jmnogosearch/site/controller.php b/com_jmnogosearch/site/controller.php new file mode 100644 index 0000000..e2de408 --- /dev/null +++ b/com_jmnogosearch/site/controller.php @@ -0,0 +1,86 @@ + get stripped anyway later on. # causes problems. + $badchars = array('#','>','<','\\'); + $searchword = trim(str_replace($badchars, '', JRequest::getString('searchword', null, 'post'))); + // if searchword enclosed in double quotes, strip quotes and do exact match + if (substr($searchword,0,1) == '"' && substr($searchword, -1) == '"') { + $post['searchword'] = substr($searchword,1,-1); + JRequest::setVar('searchphrase', 'exact'); + } + else { + $post['searchword'] = $searchword; + } + $post['ordering'] = JRequest::getWord('ordering', null, 'post'); + $post['searchphrase'] = JRequest::getWord('searchphrase', 'all', 'post'); + $post['limit'] = JRequest::getInt('limit', null, 'post'); + if($post['limit'] === null) unset($post['limit']); + + $areas = JRequest::getVar('areas', null, 'post', 'array'); + if ($areas) { + foreach($areas as $area) + { + $post['areas'][] = JFilterInput::clean($area, 'cmd'); + } + } + + // set Itemid id for links from menu + $menu = &JSite::getMenu(); + $items = $menu->getItems('link', 'index.php?option=com_mnogosearch&view=search'); + + if(isset($items[0])) { + $post['Itemid'] = $items[0]->id; + } else if (JRequest::getInt('Itemid') > 0) { //use Itemid from requesting page only if there is no existing menu + $post['Itemid'] = JRequest::getInt('Itemid'); + } + + unset($post['task']); + unset($post['submit']); + + $uri = JURI::getInstance(); + $uri->setQuery($post); + $uri->setVar('option', 'com_mnogosearch'); + + + $this->setRedirect(JRoute::_('index.php'.$uri->toString(array('query', 'fragment')), false)); + } +} diff --git a/com_jmnogosearch/site/index.html b/com_jmnogosearch/site/index.html new file mode 100644 index 0000000..fa6d84e --- /dev/null +++ b/com_jmnogosearch/site/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/com_jmnogosearch/site/jmnogosearch.php b/com_jmnogosearch/site/jmnogosearch.php new file mode 100644 index 0000000..d7541fb --- /dev/null +++ b/com_jmnogosearch/site/jmnogosearch.php @@ -0,0 +1,27 @@ +execute(JRequest::getCmd('task')); + +// Redirect if set by the controller +$controller->redirect(); diff --git a/com_jmnogosearch/site/models/index.html b/com_jmnogosearch/site/models/index.html new file mode 100644 index 0000000..fa6d84e --- /dev/null +++ b/com_jmnogosearch/site/models/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/com_jmnogosearch/site/models/jmnogosearch.php b/com_jmnogosearch/site/models/jmnogosearch.php new file mode 100644 index 0000000..a29b56e --- /dev/null +++ b/com_jmnogosearch/site/models/jmnogosearch.php @@ -0,0 +1,214 @@ +setState('limit', $mainframe->getUserStateFromRequest('com_mnogosearch.limit', 'limit', $config->getValue('config.list_limit'), 'int')); + $this->setState('limitstart', JRequest::getVar('limitstart', 0, '', 'int')); + + // Set the search parameters + $keyword = urldecode(JRequest::getString('searchword')); + $match = JRequest::getWord('searchphrase', 'all'); + $ordering = JRequest::getWord('ordering', 'newest'); + $this->setSearch($keyword, $match, $ordering); + + //Set the search areas + $areas = JRequest::getVar('areas'); + $this->setAreas($areas); + } + + /** + * Method to set the search parameters + * + * @access public + * @param string search string + * @param string mathcing option, exact|any|all + * @param string ordering option, newest|oldest|popular|alpha|category + */ + function setSearch($keyword, $match = 'all', $ordering = 'newest') + { + if(isset($keyword)) { + $this->setState('keyword', $keyword); + } + + if(isset($match)) { + $this->setState('match', $match); + } + + if(isset($ordering)) { + $this->setState('ordering', $ordering); + } + } + + /** + * Method to set the search areas + * + * @access public + * @param array Active areas + * @param array Search areas + */ + function setAreas($active = array(), $search = array()) + { + $this->_areas['active'] = $active; + $this->_areas['search'] = $search; + } + + /** + * Method to get weblink item data for the category + * + * @access public + * @return array + */ + function getData() + { + // Lets load the content if it doesn't already exist + if (empty($this->_data)) + { + $areas = $this->getAreas(); + + JPluginHelper::importPlugin( 'search'); + $dispatcher =& JDispatcher::getInstance(); + $results = $dispatcher->trigger( 'onSearch', array( + $this->getState('keyword'), + $this->getState('match'), + $this->getState('ordering'), + $areas['active']) ); + + $rows = array(); + foreach($results AS $result) { + $rows = array_merge( (array) $rows, (array) $result); + } + + $this->_total = count($rows); + if($this->getState('limit') > 0) { + $this->_data = array_splice($rows, $this->getState('limitstart'), $this->getState('limit')); + } else { + $this->_data = $rows; + } + } + + return $this->_data; + } + + /** + * Method to get the total number of weblink items for the category + * + * @access public + * @return integer + */ + function getTotal() + { + return $this->_total; + } + + /** + * Method to get a pagination object of the weblink items for the category + * + * @access public + * @return integer + */ + function getPagination() + { + // Lets load the content if it doesn't already exist + if (empty($this->_pagination)) + { + jimport('joomla.html.pagination'); + $this->_pagination = new JPagination( $this->getTotal(), $this->getState('limitstart'), $this->getState('limit') ); + } + + return $this->_pagination; + } + + /** + * Method to get the search areas + * + * @since 1.5 + */ + function getAreas() + { + global $mainframe; + + // Load the Category data + if (empty($this->_areas['search'])) + { + $areas = array(); + + JPluginHelper::importPlugin( 'search'); + $dispatcher =& JDispatcher::getInstance(); + $searchareas = $dispatcher->trigger( 'onSearchAreas' ); + + foreach ($searchareas as $area) { + $areas = array_merge( $areas, $area ); + } + + $this->_areas['search'] = $areas; + } + + return $this->_areas; + } +} diff --git a/com_jmnogosearch/site/router.php b/com_jmnogosearch/site/router.php new file mode 100644 index 0000000..aed9b53 --- /dev/null +++ b/com_jmnogosearch/site/router.php @@ -0,0 +1,53 @@ +getCfg('sef')) && ($app->getCfg('sef_rewrite')) && !($app->getCfg('sef_suffix'))) { + $segments[] .= '/'; + } + + if (isset($query['view'])) { + unset($query['view']); + } + return $segments; +} + +/** + * @param array + * @return array + */ +function SearchParseRoute( $segments ) +{ + $vars = array(); + + $searchword = array_shift($segments); + $vars['searchword'] = $searchword; + $vars['view'] = 'search'; + + return $vars; +} \ No newline at end of file diff --git a/com_jmnogosearch/site/views/index.html b/com_jmnogosearch/site/views/index.html new file mode 100644 index 0000000..fa6d84e --- /dev/null +++ b/com_jmnogosearch/site/views/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/com_jmnogosearch/site/views/jmnogosearch/index.html b/com_jmnogosearch/site/views/jmnogosearch/index.html new file mode 100644 index 0000000..fa6d84e --- /dev/null +++ b/com_jmnogosearch/site/views/jmnogosearch/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/com_jmnogosearch/site/views/jmnogosearch/metadata.xml b/com_jmnogosearch/site/views/jmnogosearch/metadata.xml new file mode 100644 index 0000000..1d0748d --- /dev/null +++ b/com_jmnogosearch/site/views/jmnogosearch/metadata.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/com_jmnogosearch/site/views/jmnogosearch/tmpl/default.php b/com_jmnogosearch/site/views/jmnogosearch/tmpl/default.php new file mode 100644 index 0000000..94f3b1b --- /dev/null +++ b/com_jmnogosearch/site/views/jmnogosearch/tmpl/default.php @@ -0,0 +1,14 @@ + + +params->get( 'show_page_title', 1 ) ) : ?> +

+ params->get( 'page_title' ); ?> +

+ + +loadTemplate('form'); ?> +error && count($this->results) > 0) : + echo $this->loadTemplate('results'); +else : + echo $this->loadTemplate('error'); +endif; ?> diff --git a/com_jmnogosearch/site/views/jmnogosearch/tmpl/default.xml b/com_jmnogosearch/site/views/jmnogosearch/tmpl/default.xml new file mode 100644 index 0000000..372f1e2 --- /dev/null +++ b/com_jmnogosearch/site/views/jmnogosearch/tmpl/default.xml @@ -0,0 +1,22 @@ + + + + + + + + + Search + STANDARD SEARCH LAYOUT DESC + + + + + + + + + + + + \ No newline at end of file diff --git a/com_jmnogosearch/site/views/jmnogosearch/tmpl/default_error.php b/com_jmnogosearch/site/views/jmnogosearch/tmpl/default_error.php new file mode 100644 index 0000000..3f9cd4c --- /dev/null +++ b/com_jmnogosearch/site/views/jmnogosearch/tmpl/default_error.php @@ -0,0 +1,9 @@ + + + + + + +

+ escape($this->error); ?> +

diff --git a/com_jmnogosearch/site/views/jmnogosearch/tmpl/default_form.php b/com_jmnogosearch/site/views/jmnogosearch/tmpl/default_form.php new file mode 100644 index 0000000..9659ede --- /dev/null +++ b/com_jmnogosearch/site/views/jmnogosearch/tmpl/default_form.php @@ -0,0 +1,76 @@ + + + diff --git a/com_jmnogosearch/site/views/jmnogosearch/tmpl/default_results.php b/com_jmnogosearch/site/views/jmnogosearch/tmpl/default_results.php new file mode 100644 index 0000000..7c9635c --- /dev/null +++ b/com_jmnogosearch/site/views/jmnogosearch/tmpl/default_results.php @@ -0,0 +1,53 @@ + + + + + + + + + +

+ results as $result ) : ?> + + + + pagination->limitstart + $result->count.'. ';?> + + href ) : + if ($result->browsernav == 1 ) : ?> + + + + escape($result->title); + + if ( $result->href ) : ?> + + section ) : ?> + + + (escape($result->section); ?>) + + + + + + text; ?> + + params->get( 'show_date' )) : ?> + + created; ?> + + + + +
+ + pagination->getPagesLinks( ); ?> + +

diff --git a/com_jmnogosearch/site/views/jmnogosearch/tmpl/index.html b/com_jmnogosearch/site/views/jmnogosearch/tmpl/index.html new file mode 100644 index 0000000..fa6d84e --- /dev/null +++ b/com_jmnogosearch/site/views/jmnogosearch/tmpl/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/com_jmnogosearch/site/views/jmnogosearch/view.html.php b/com_jmnogosearch/site/views/jmnogosearch/view.html.php new file mode 100644 index 0000000..cb721c6 --- /dev/null +++ b/com_jmnogosearch/site/views/jmnogosearch/view.html.php @@ -0,0 +1,177 @@ +getPathway(); + $uri =& JFactory::getURI(); + + $error = ''; + $rows = null; + $total = 0; + + // Get some data from the model + $areas = &$this->get('areas'); + $state = &$this->get('state'); + $searchword = $state->get('keyword'); + + $params = &$mainframe->getParams(); + + $menus = &JSite::getMenu(); + $menu = $menus->getActive(); + + // because the application sets a default page title, we need to get it + // right from the menu item itself + if (is_object( $menu )) { + $menu_params = new JParameter( $menu->params ); + if (!$menu_params->get( 'page_title')) { + $params->set('page_title', JText::_( 'Search' )); + } + } else { + $params->set('page_title', JText::_( 'Search' )); + } + + $document = &JFactory::getDocument(); + $document->setTitle( $params->get( 'page_title' ) ); + + // Get the parameters of the active menu item + $params = &$mainframe->getParams(); + + // built select lists + $orders = array(); + $orders[] = JHTML::_('select.option', 'newest', JText::_( 'Newest first' ) ); + $orders[] = JHTML::_('select.option', 'oldest', JText::_( 'Oldest first' ) ); + $orders[] = JHTML::_('select.option', 'popular', JText::_( 'Most popular' ) ); + $orders[] = JHTML::_('select.option', 'alpha', JText::_( 'Alphabetical' ) ); + $orders[] = JHTML::_('select.option', 'category', JText::_( 'Section/Category' ) ); + + $lists = array(); + $lists['ordering'] = JHTML::_('select.genericlist', $orders, 'ordering', 'class="inputbox"', 'value', 'text', $state->get('ordering') ); + + $searchphrases = array(); + $searchphrases[] = JHTML::_('select.option', 'all', JText::_( 'All words' ) ); + $searchphrases[] = JHTML::_('select.option', 'any', JText::_( 'Any words' ) ); + $searchphrases[] = JHTML::_('select.option', 'exact', JText::_( 'Exact phrase' ) ); + $lists['searchphrase' ]= JHTML::_('select.radiolist', $searchphrases, 'searchphrase', '', 'value', 'text', $state->get('match') ); + + // log the search + SearchHelper::logSearch( $searchword); + + //limit searchword + + if(SearchHelper::limitSearchWord($searchword)) { + $error = JText::_( 'SEARCH_MESSAGE' ); + } + + //sanatise searchword + if(SearchHelper::santiseSearchWord($searchword, $state->get('match'))) { + $error = JText::_( 'IGNOREKEYWORD' ); + } + + if (!$searchword && count( JRequest::get('post') ) ) { + //$error = JText::_( 'Enter a search keyword' ); + } + + // put the filtered results back into the model + // for next release, the checks should be done in the model perhaps... + $state->set('keyword', $searchword); + + if(!$error) + { + $results = &$this->get('data' ); + $total = &$this->get('total'); + $pagination = &$this->get('pagination'); + + require_once (JPATH_SITE.DS.'components'.DS.'com_content'.DS.'helpers'.DS.'route.php'); + + for ($i=0; $i < count($results); $i++) + { + $row = &$results[$i]->text; + + if ($state->get('match') == 'exact') + { + $searchwords = array($searchword); + $needle = $searchword; + } + else + { + $searchwords = preg_split("/\s+/u", $searchword); + $needle = $searchwords[0]; + } + + $row = SearchHelper::prepareSearchContent( $row, 200, $needle ); + $searchwords = array_unique( $searchwords ); + $searchRegex = '#('; + $x = 0; + foreach ($searchwords as $k => $hlword) + { + $searchRegex .= ($x == 0 ? '' : '|'); + $searchRegex .= preg_quote($hlword, '#'); + $x++; + } + $searchRegex .= ')#iu'; + + $row = preg_replace($searchRegex, '\0', $row ); + + $result =& $results[$i]; + if ($result->created) { + $created = JHTML::Date ( $result->created ); + } + else { + $created = ''; + } + + $result->created = $created; + $result->count = $i + 1; + } + } + + $this->result = JText::sprintf( 'TOTALRESULTSFOUND', $total ); + + $this->assignRef('pagination', $pagination); + $this->assignRef('results', $results); + $this->assignRef('lists', $lists); + $this->assignRef('params', $params); + + $this->assign('ordering', $state->get('ordering')); + $this->assign('searchword', $searchword); + $this->assign('searchphrase', $state->get('match')); + $this->assign('searchareas', $areas); + + $this->assign('total', $total); + $this->assign('error', $error); + $this->assign('action', $uri->toString()); + + parent::display($tpl); + } +} diff --git a/com_mnogosearch/admin/admin.mnogosearch.php b/com_mnogosearch/admin/admin.mnogosearch.php deleted file mode 100644 index 4c507a4..0000000 --- a/com_mnogosearch/admin/admin.mnogosearch.php +++ /dev/null @@ -1,21 +0,0 @@ -execute( JRequest::getCmd( 'task' ) ); -$controller->redirect(); diff --git a/com_mnogosearch/admin/config.xml b/com_mnogosearch/admin/config.xml deleted file mode 100644 index c98eba5..0000000 --- a/com_mnogosearch/admin/config.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/com_mnogosearch/admin/controller.php b/com_mnogosearch/admin/controller.php deleted file mode 100644 index c684b0d..0000000 --- a/com_mnogosearch/admin/controller.php +++ /dev/null @@ -1,45 +0,0 @@ -getModel( 'Search' ); - $view =& $this->getView( 'Search' ); - $view->setModel( $model, true ); - $view->display(); - } - - /** - * Reset Statistics - */ - function reset() - { - $model =& $this->getModel( 'Search' ); - $model->reset(); - $this->setRedirect('index.php?option=com_mnogosearch'); - } -} diff --git a/com_mnogosearch/admin/helpers/index.html b/com_mnogosearch/admin/helpers/index.html deleted file mode 100644 index fa6d84e..0000000 --- a/com_mnogosearch/admin/helpers/index.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/com_mnogosearch/admin/helpers/mnogosearch.php b/com_mnogosearch/admin/helpers/mnogosearch.php deleted file mode 100644 index b2b5cdf..0000000 --- a/com_mnogosearch/admin/helpers/mnogosearch.php +++ /dev/null @@ -1,204 +0,0 @@ -getTag(); - $ignoreFile = $lang->getLanguagePath().DS.$tag.DS.$tag.'.ignore.php'; - if (file_exists($ignoreFile)) { - include $ignoreFile; - } - - // check for words to ignore - $aterms = explode( ' ', JString::strtolower( $searchword ) ); - - // first case is single ignored word - if ( count( $aterms ) == 1 && in_array( JString::strtolower( $searchword ), $search_ignore ) ) { - $ignored = true; - } - - // filter out search terms that are too small - foreach( $aterms AS $aterm ) { - if (JString::strlen( $aterm ) < 3) { - $search_ignore[] = $aterm; - } - } - - // next is to remove ignored words from type 'all' or 'any' (not exact) searches with multiple words - if ( count( $aterms ) > 1 && $searchphrase != 'exact' ) { - $pruned = array_diff( $aterms, $search_ignore ); - $searchword = implode( ' ', $pruned ); - } - - return $ignored; - } - - function limitSearchWord(&$searchword) - { - $restriction = false; - - // limit searchword to 20 characters - if ( JString::strlen( $searchword ) > 20 ) { - $searchword = JString::substr( $searchword, 0, 19 ); - $restriction = true; - } - - // searchword must contain a minimum of 3 characters - if ( $searchword && JString::strlen( $searchword ) < 3 ) { - $searchword = ''; - $restriction = true; - } - - return $restriction; - } - - function logSearch( $search_term ) - { - global $mainframe; - - $db =& JFactory::getDBO(); - - $params = &JComponentHelper::getParams( 'com_search' ); - $enable_log_searches = $params->get('enabled'); - - $search_term = $db->getEscaped( trim( $search_term) ); - - if ( @$enable_log_searches ) - { - $db =& JFactory::getDBO(); - $query = 'SELECT hits' - . ' FROM #__core_log_searches' - . ' WHERE LOWER( search_term ) = "'.$search_term.'"' - ; - $db->setQuery( $query ); - $hits = intval( $db->loadResult() ); - if ( $hits ) { - $query = 'UPDATE #__core_log_searches' - . ' SET hits = ( hits + 1 )' - . ' WHERE LOWER( search_term ) = "'.$search_term.'"' - ; - $db->setQuery( $query ); - $db->query(); - } else { - $query = 'INSERT INTO #__core_log_searches VALUES ( "'.$search_term.'", 1 )'; - $db->setQuery( $query ); - $db->query(); - } - } - } - - /** - * Prepares results from search for display - * - * @param string The source string - * @param int Number of chars to trim - * @param string The searchword to select around - * @return string - */ - function prepareSearchContent( $text, $length = 200, $searchword ) - { - // strips tags won't remove the actual jscript - $text = preg_replace( "']*>.*?'si", "", $text ); - $text = preg_replace( '/{.+?}/', '', $text); - //$text = preg_replace( '/]*>([^<]+)<\/a>/is','\2', $text ); - // replace line breaking tags with whitespace - $text = preg_replace( "'<(br[^/>]*?/|hr[^/>]*?/|/(div|h[1-6]|li|p|td))>'si", ' ', $text ); - - return SearchHelper::_smartSubstr( strip_tags( $text ), $length, $searchword ); - } - - /** - * Checks an object for search terms (after stripping fields of HTML) - * - * @param object The object to check - * @param string Search words to check for - * @param array List of object variables to check against - * @returns boolean True if searchTerm is in object, false otherwise - */ - function checkNoHtml($object, $searchTerm, $fields) { - $searchRegex = array( - '#]*>.*?#si', - '#]*>.*?#si', - '##si', - '#<[^>]*>#i' - ); - $terms = explode(' ', $searchTerm); - if(empty($fields)) return false; - foreach($fields AS $field) { - if(!isset($object->$field)) continue; - $text = $object->$field; - foreach($searchRegex As $regex) { - $text = preg_replace($regex, '', $text); - } - foreach($terms AS $term) { - if(JString::stristr($text, $term) !== false) { - return true; - } - } - } - return false; - } - - /** - * returns substring of characters around a searchword - * - * @param string The source string - * @param int Number of chars to return - * @param string The searchword to select around - * @return string - */ - function _smartSubstr($text, $length = 200, $searchword) - { - $textlen = JString::strlen($text); - $lsearchword = JString::strtolower($searchword); - $wordfound = false; - $pos = 0; - while ($wordfound === false && $pos < $textlen) { - if (($wordpos = @JString::strpos($text, ' ', $pos + $length)) !== false) { - $chunk_size = $wordpos - $pos; - } else { - $chunk_size = $length; - } - $chunk = JString::substr($text, $pos, $chunk_size); - $wordfound = JString::strpos(JString::strtolower($chunk), $lsearchword); - if ($wordfound === false) { - $pos += $chunk_size + 1; - } - } - - if ($wordfound !== false) { - return (($pos > 0) ? '... ' : '') . $chunk . ' ...'; - } else { - if (($wordpos = @JString::strpos($text, ' ', $length)) !== false) { - return JString::substr($text, 0, $wordpos) . ' ...'; - } else { - return JString::substr($text, 0, $length); - } - } - } -} diff --git a/com_mnogosearch/admin/helpers/site.php b/com_mnogosearch/admin/helpers/site.php deleted file mode 100644 index 6368a03..0000000 --- a/com_mnogosearch/admin/helpers/site.php +++ /dev/null @@ -1,38 +0,0 @@ - \ No newline at end of file diff --git a/com_mnogosearch/admin/models/index.html b/com_mnogosearch/admin/models/index.html deleted file mode 100644 index fa6d84e..0000000 --- a/com_mnogosearch/admin/models/index.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/com_mnogosearch/admin/models/mnogosearch.php b/com_mnogosearch/admin/models/mnogosearch.php deleted file mode 100644 index c22bc10..0000000 --- a/com_mnogosearch/admin/models/mnogosearch.php +++ /dev/null @@ -1,121 +0,0 @@ -setQuery( 'DELETE FROM #__mnogosearch_log_searches' ); - $db->query(); - } - - function getItems( ) - { - global $mainframe, $option; - $db =& JFactory::getDBO(); - - $filter_order = $mainframe->getUserStateFromRequest( 'com_mnogosearch.filter_order', 'filter_order', 'hits', 'cmd' ); - $filter_order_Dir = $mainframe->getUserStateFromRequest( 'com_mnogosearch.filter_order_Dir', 'filter_order_Dir', '', 'word' ); - $limit = $mainframe->getUserStateFromRequest( 'global.list.limit', 'limit', $mainframe->getCfg('list_limit'), 'int' ); - $limitstart = $mainframe->getUserStateFromRequest( 'com_mnogosearch.limitstart', 'limitstart', 0, 'int' ); - $search = $mainframe->getUserStateFromRequest( 'com_mnogosearch.search', 'search', '', 'string' ); - $search = JString::strtolower( $search ); - $showResults = JRequest::getInt('search_results'); - - // table ordering - if ( $filter_order_Dir == 'ASC' ) { - $this->lists['order_Dir'] = 'ASC'; - } else { - $this->lists['order_Dir'] = 'DESC'; - } - $this->lists['order'] = $filter_order; - - // search filter - $this->lists['search']= $search; - - $where = array(); - if ($search) { - $where[] = 'LOWER( search_term ) LIKE '.$db->Quote( '%'.$db->getEscaped( $search, true ).'%', false ); - } - - $where = ( count( $where ) ? ' WHERE ' . implode( ' AND ', $where ) : '' ); - $orderby = ' ORDER BY '. $filter_order .' '. $filter_order_Dir .', hits DESC'; - - // get the total number of records - $query = 'SELECT COUNT(*)' - . ' FROM #__mnogosearch_log_searches' - . $where; - $db->setQuery( $query ); - $total = $db->loadResult(); - - jimport( 'joomla.html.pagination' ); - $pageNav = new JPagination( $total, $limitstart, $limit ); - - $query = ' SELECT * ' - . ' FROM #__mnogosearch_log_searches ' - . $where - . $orderby; - $db->setQuery( $query, $pageNav->limitstart, $pageNav->limit ); - - $rows = $db->loadObjectList(); - - JPluginHelper::importPlugin( 'search' ); - - if (!class_exists( 'JSite' )) - { - // This fools the routers in the search plugins into thinking it's in the frontend - require_once( JPATH_COMPONENT.DS.'helpers'.DS.'site.php' ); - } - - for ($i=0, $n = count($rows); $i < $n; $i++) { - // determine if number of results for search item should be calculated - // by default it is `off` as it is highly query intensive - if ( $showResults ) { - $results = $mainframe->triggerEvent( 'onSearch', array( $rows[$i]->search_term ) ); - - $count = 0; - for ($j = 0, $n2 = count( $results ); $j < $n2; $j++) { - $count += count( $results[$j] ); - } - - $rows[$i]->returns = $count; - } else { - $rows[$i]->returns = null; - } - } - - return $rows; - } -} diff --git a/com_mnogosearch/admin/sql/index.html b/com_mnogosearch/admin/sql/index.html deleted file mode 100644 index fa6d84e..0000000 --- a/com_mnogosearch/admin/sql/index.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/com_mnogosearch/admin/sql/install.sql b/com_mnogosearch/admin/sql/install.sql deleted file mode 100644 index e20d243..0000000 --- a/com_mnogosearch/admin/sql/install.sql +++ /dev/null @@ -1,6 +0,0 @@ -DROP TABLE IF EXISTS `#__jmnogosearch_log_searches`; - -CREATE TABLE `#_jmnogosearch_log_searches` ( - `search_term` varchar(128) NOT NULL default '', - `hits` int(11) unsigned NOT NULL default '0' -) DEFAULT CHARSET=utf8 diff --git a/com_mnogosearch/admin/sql/uninstall.sql b/com_mnogosearch/admin/sql/uninstall.sql deleted file mode 100644 index a5b3236..0000000 --- a/com_mnogosearch/admin/sql/uninstall.sql +++ /dev/null @@ -1 +0,0 @@ -DROP TABLE IF EXISTS `#__jmnogosearch_log_searches`; diff --git a/com_mnogosearch/admin/views/index.html b/com_mnogosearch/admin/views/index.html deleted file mode 100644 index fa6d84e..0000000 --- a/com_mnogosearch/admin/views/index.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/com_mnogosearch/admin/views/mnogosearch/index.html b/com_mnogosearch/admin/views/mnogosearch/index.html deleted file mode 100644 index fa6d84e..0000000 --- a/com_mnogosearch/admin/views/mnogosearch/index.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/com_mnogosearch/admin/views/mnogosearch/tmpl/default.php b/com_mnogosearch/admin/views/mnogosearch/tmpl/default.php deleted file mode 100644 index cb86877..0000000 --- a/com_mnogosearch/admin/views/mnogosearch/tmpl/default.php +++ /dev/null @@ -1,89 +0,0 @@ - - -

- - - - - - -

- : - - - -

- : - enabled ? ''. JText::_( 'Enabled' ) .'' : ''. JText::_( 'Disabled' ) .'' ?> - -

- showResults ) : ?> - - - - -

- -

- - - - - - - showResults ) : ?> - - - - - - - - - - - items); $i < $n; $i++) { - $row =& $this->items[$i]; - ?> - - - - - showResults ) : ?> - - - - - -

- -	- lists['order_Dir'], @$this->lists['order'] ); ?> -	- lists['order_Dir'], @$this->lists['order'] ); ?> -	- -
- pageNav->getListFooter(); ?> -
- pageNav->limitstart; ?> -	- search_term, ENT_QUOTES, 'UTF-8'); ?> -	- hits; ?> -	- returns; ?> -

- - - - - -

diff --git a/com_mnogosearch/admin/views/mnogosearch/tmpl/index.html b/com_mnogosearch/admin/views/mnogosearch/tmpl/index.html deleted file mode 100644 index fa6d84e..0000000 --- a/com_mnogosearch/admin/views/mnogosearch/tmpl/index.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/com_mnogosearch/admin/views/mnogosearch/view.php b/com_mnogosearch/admin/views/mnogosearch/view.php deleted file mode 100644 index 223b68b..0000000 --- a/com_mnogosearch/admin/views/mnogosearch/view.php +++ /dev/null @@ -1,63 +0,0 @@ -setTitle(JText::_('Search Statistics')); - - $limit = $mainframe->getUserStateFromRequest( 'global.list.limit', 'limit', $mainframe->getCfg('list_limit'), 'int' ); - $limitstart = $mainframe->getUserStateFromRequest( 'com_mnogosearch.limitstart', 'limitstart', 0, 'int' ); - - $model = $this->getModel(); - $items = $model->getItems(); - $params = &JComponentHelper::getParams( 'com_mnogosearch' ); - $enabled = $params->get('enabled'); - JHTML::_('behavior.tooltip'); - jimport('joomla.html.pagination'); - $pageNav = new JPagination( count($items), $limitstart, $limit ); - - $showResults = JRequest::getInt('search_results'); - - $search = $mainframe->getUserStateFromRequest( 'com_mnosearch.search', 'search', '', 'string' ); - - $this->assignRef('items', $items); - $this->assignRef('enabled', $enabled); - $this->assignRef('pageNav', $pageNav); - $this->assignRef('search', $search ); - $this->assignRef('lists', $model->lists ); - - $this->assignRef('showResults', $showResults); - - parent::display($tpl); - } -} diff --git a/com_mnogosearch/mnogosearch.xml b/com_mnogosearch/mnogosearch.xml deleted file mode 100644 index 02dfc84..0000000 --- a/com_mnogosearch/mnogosearch.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - JMnoGoSearch - Andrea Zagli - December 2009 - Copyright (C) 2009 Andrea Zagli. All rights reserved. - http://www.gnu.org/licenses/gpl-3.0.html GNU/GPL - azagli@libero.it - http://saetta.homelinux.org/ - 1.0.0 - A component to display search results from mnoGoSearch (http://www.mnogosearch.org/) web search engine. - - - - sql/install.sql - - - - - sql/uninstall.sql - - - - - - - - - JMnoGoSearch - - admin.mnogosearch.php - config.xml - controller.php - index.html - helpers/index.html - helpers/mnogosearch.php - helpers/site.php - models/index.html - models/mnogosearch.php - sql/index.html - sql/indstall.sql - sql/uninstall.sql - helpers/index.html - views/index.html - views/mnogosearch/index.html - views/mnogosearch/view.php - views/mnogosearch/tmpl/index.html - views/mnogosearch/tmpl/default.php - - - - diff --git a/com_mnogosearch/site/controller.php b/com_mnogosearch/site/controller.php deleted file mode 100644 index e2de408..0000000 --- a/com_mnogosearch/site/controller.php +++ /dev/null @@ -1,86 +0,0 @@ - get stripped anyway later on. # causes problems. - $badchars = array('#','>','<','\\'); - $searchword = trim(str_replace($badchars, '', JRequest::getString('searchword', null, 'post'))); - // if searchword enclosed in double quotes, strip quotes and do exact match - if (substr($searchword,0,1) == '"' && substr($searchword, -1) == '"') { - $post['searchword'] = substr($searchword,1,-1); - JRequest::setVar('searchphrase', 'exact'); - } - else { - $post['searchword'] = $searchword; - } - $post['ordering'] = JRequest::getWord('ordering', null, 'post'); - $post['searchphrase'] = JRequest::getWord('searchphrase', 'all', 'post'); - $post['limit'] = JRequest::getInt('limit', null, 'post'); - if($post['limit'] === null) unset($post['limit']); - - $areas = JRequest::getVar('areas', null, 'post', 'array'); - if ($areas) { - foreach($areas as $area) - { - $post['areas'][] = JFilterInput::clean($area, 'cmd'); - } - } - - // set Itemid id for links from menu - $menu = &JSite::getMenu(); - $items = $menu->getItems('link', 'index.php?option=com_mnogosearch&view=search'); - - if(isset($items[0])) { - $post['Itemid'] = $items[0]->id; - } else if (JRequest::getInt('Itemid') > 0) { //use Itemid from requesting page only if there is no existing menu - $post['Itemid'] = JRequest::getInt('Itemid'); - } - - unset($post['task']); - unset($post['submit']); - - $uri = JURI::getInstance(); - $uri->setQuery($post); - $uri->setVar('option', 'com_mnogosearch'); - - - $this->setRedirect(JRoute::_('index.php'.$uri->toString(array('query', 'fragment')), false)); - } -} diff --git a/com_mnogosearch/site/index.html b/com_mnogosearch/site/index.html deleted file mode 100644 index fa6d84e..0000000 --- a/com_mnogosearch/site/index.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/com_mnogosearch/site/mnogosearch.php b/com_mnogosearch/site/mnogosearch.php deleted file mode 100644 index d7541fb..0000000 --- a/com_mnogosearch/site/mnogosearch.php +++ /dev/null @@ -1,27 +0,0 @@ -execute(JRequest::getCmd('task')); - -// Redirect if set by the controller -$controller->redirect(); diff --git a/com_mnogosearch/site/models/index.html b/com_mnogosearch/site/models/index.html deleted file mode 100644 index fa6d84e..0000000 --- a/com_mnogosearch/site/models/index.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/com_mnogosearch/site/models/mnogosearch.php b/com_mnogosearch/site/models/mnogosearch.php deleted file mode 100644 index a29b56e..0000000 --- a/com_mnogosearch/site/models/mnogosearch.php +++ /dev/null @@ -1,214 +0,0 @@ -setState('limit', $mainframe->getUserStateFromRequest('com_mnogosearch.limit', 'limit', $config->getValue('config.list_limit'), 'int')); - $this->setState('limitstart', JRequest::getVar('limitstart', 0, '', 'int')); - - // Set the search parameters - $keyword = urldecode(JRequest::getString('searchword')); - $match = JRequest::getWord('searchphrase', 'all'); - $ordering = JRequest::getWord('ordering', 'newest'); - $this->setSearch($keyword, $match, $ordering); - - //Set the search areas - $areas = JRequest::getVar('areas'); - $this->setAreas($areas); - } - - /** - * Method to set the search parameters - * - * @access public - * @param string search string - * @param string mathcing option, exact|any|all - * @param string ordering option, newest|oldest|popular|alpha|category - */ - function setSearch($keyword, $match = 'all', $ordering = 'newest') - { - if(isset($keyword)) { - $this->setState('keyword', $keyword); - } - - if(isset($match)) { - $this->setState('match', $match); - } - - if(isset($ordering)) { - $this->setState('ordering', $ordering); - } - } - - /** - * Method to set the search areas - * - * @access public - * @param array Active areas - * @param array Search areas - */ - function setAreas($active = array(), $search = array()) - { - $this->_areas['active'] = $active; - $this->_areas['search'] = $search; - } - - /** - * Method to get weblink item data for the category - * - * @access public - * @return array - */ - function getData() - { - // Lets load the content if it doesn't already exist - if (empty($this->_data)) - { - $areas = $this->getAreas(); - - JPluginHelper::importPlugin( 'search'); - $dispatcher =& JDispatcher::getInstance(); - $results = $dispatcher->trigger( 'onSearch', array( - $this->getState('keyword'), - $this->getState('match'), - $this->getState('ordering'), - $areas['active']) ); - - $rows = array(); - foreach($results AS $result) { - $rows = array_merge( (array) $rows, (array) $result); - } - - $this->_total = count($rows); - if($this->getState('limit') > 0) { - $this->_data = array_splice($rows, $this->getState('limitstart'), $this->getState('limit')); - } else { - $this->_data = $rows; - } - } - - return $this->_data; - } - - /** - * Method to get the total number of weblink items for the category - * - * @access public - * @return integer - */ - function getTotal() - { - return $this->_total; - } - - /** - * Method to get a pagination object of the weblink items for the category - * - * @access public - * @return integer - */ - function getPagination() - { - // Lets load the content if it doesn't already exist - if (empty($this->_pagination)) - { - jimport('joomla.html.pagination'); - $this->_pagination = new JPagination( $this->getTotal(), $this->getState('limitstart'), $this->getState('limit') ); - } - - return $this->_pagination; - } - - /** - * Method to get the search areas - * - * @since 1.5 - */ - function getAreas() - { - global $mainframe; - - // Load the Category data - if (empty($this->_areas['search'])) - { - $areas = array(); - - JPluginHelper::importPlugin( 'search'); - $dispatcher =& JDispatcher::getInstance(); - $searchareas = $dispatcher->trigger( 'onSearchAreas' ); - - foreach ($searchareas as $area) { - $areas = array_merge( $areas, $area ); - } - - $this->_areas['search'] = $areas; - } - - return $this->_areas; - } -} diff --git a/com_mnogosearch/site/router.php b/com_mnogosearch/site/router.php deleted file mode 100644 index aed9b53..0000000 --- a/com_mnogosearch/site/router.php +++ /dev/null @@ -1,53 +0,0 @@ -getCfg('sef')) && ($app->getCfg('sef_rewrite')) && !($app->getCfg('sef_suffix'))) { - $segments[] .= '/'; - } - - if (isset($query['view'])) { - unset($query['view']); - } - return $segments; -} - -/** - * @param array - * @return array - */ -function SearchParseRoute( $segments ) -{ - $vars = array(); - - $searchword = array_shift($segments); - $vars['searchword'] = $searchword; - $vars['view'] = 'search'; - - return $vars; -} \ No newline at end of file diff --git a/com_mnogosearch/site/views/index.html b/com_mnogosearch/site/views/index.html deleted file mode 100644 index fa6d84e..0000000 --- a/com_mnogosearch/site/views/index.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/com_mnogosearch/site/views/search/index.html b/com_mnogosearch/site/views/search/index.html deleted file mode 100644 index fa6d84e..0000000 --- a/com_mnogosearch/site/views/search/index.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/com_mnogosearch/site/views/search/metadata.xml b/com_mnogosearch/site/views/search/metadata.xml deleted file mode 100644 index 1d0748d..0000000 --- a/com_mnogosearch/site/views/search/metadata.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/com_mnogosearch/site/views/search/tmpl/default.php b/com_mnogosearch/site/views/search/tmpl/default.php deleted file mode 100644 index 94f3b1b..0000000 --- a/com_mnogosearch/site/views/search/tmpl/default.php +++ /dev/null @@ -1,14 +0,0 @@ - - -params->get( 'show_page_title', 1 ) ) : ?> -

- params->get( 'page_title' ); ?> -

- - -loadTemplate('form'); ?> -error && count($this->results) > 0) : - echo $this->loadTemplate('results'); -else : - echo $this->loadTemplate('error'); -endif; ?> diff --git a/com_mnogosearch/site/views/search/tmpl/default.xml b/com_mnogosearch/site/views/search/tmpl/default.xml deleted file mode 100644 index 372f1e2..0000000 --- a/com_mnogosearch/site/views/search/tmpl/default.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - Search - STANDARD SEARCH LAYOUT DESC - - - - - - - - - - - - \ No newline at end of file diff --git a/com_mnogosearch/site/views/search/tmpl/default_error.php b/com_mnogosearch/site/views/search/tmpl/default_error.php deleted file mode 100644 index 3f9cd4c..0000000 --- a/com_mnogosearch/site/views/search/tmpl/default_error.php +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - -

- escape($this->error); ?> -

diff --git a/com_mnogosearch/site/views/search/tmpl/default_form.php b/com_mnogosearch/site/views/search/tmpl/default_form.php deleted file mode 100644 index 9659ede..0000000 --- a/com_mnogosearch/site/views/search/tmpl/default_form.php +++ /dev/null @@ -1,76 +0,0 @@ - - - diff --git a/com_mnogosearch/site/views/search/tmpl/default_results.php b/com_mnogosearch/site/views/search/tmpl/default_results.php deleted file mode 100644 index 7c9635c..0000000 --- a/com_mnogosearch/site/views/search/tmpl/default_results.php +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - -

- results as $result ) : ?> - - - - pagination->limitstart + $result->count.'. ';?> - - href ) : - if ($result->browsernav == 1 ) : ?> - - - - escape($result->title); - - if ( $result->href ) : ?> - - section ) : ?> - - - (escape($result->section); ?>) - - - - - - text; ?> - - params->get( 'show_date' )) : ?> - - created; ?> - - - - -
- - pagination->getPagesLinks( ); ?> - -

diff --git a/com_mnogosearch/site/views/search/tmpl/index.html b/com_mnogosearch/site/views/search/tmpl/index.html deleted file mode 100644 index fa6d84e..0000000 --- a/com_mnogosearch/site/views/search/tmpl/index.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/com_mnogosearch/site/views/search/view.html.php b/com_mnogosearch/site/views/search/view.html.php deleted file mode 100644 index cb721c6..0000000 --- a/com_mnogosearch/site/views/search/view.html.php +++ /dev/null @@ -1,177 +0,0 @@ -getPathway(); - $uri =& JFactory::getURI(); - - $error = ''; - $rows = null; - $total = 0; - - // Get some data from the model - $areas = &$this->get('areas'); - $state = &$this->get('state'); - $searchword = $state->get('keyword'); - - $params = &$mainframe->getParams(); - - $menus = &JSite::getMenu(); - $menu = $menus->getActive(); - - // because the application sets a default page title, we need to get it - // right from the menu item itself - if (is_object( $menu )) { - $menu_params = new JParameter( $menu->params ); - if (!$menu_params->get( 'page_title')) { - $params->set('page_title', JText::_( 'Search' )); - } - } else { - $params->set('page_title', JText::_( 'Search' )); - } - - $document = &JFactory::getDocument(); - $document->setTitle( $params->get( 'page_title' ) ); - - // Get the parameters of the active menu item - $params = &$mainframe->getParams(); - - // built select lists - $orders = array(); - $orders[] = JHTML::_('select.option', 'newest', JText::_( 'Newest first' ) ); - $orders[] = JHTML::_('select.option', 'oldest', JText::_( 'Oldest first' ) ); - $orders[] = JHTML::_('select.option', 'popular', JText::_( 'Most popular' ) ); - $orders[] = JHTML::_('select.option', 'alpha', JText::_( 'Alphabetical' ) ); - $orders[] = JHTML::_('select.option', 'category', JText::_( 'Section/Category' ) ); - - $lists = array(); - $lists['ordering'] = JHTML::_('select.genericlist', $orders, 'ordering', 'class="inputbox"', 'value', 'text', $state->get('ordering') ); - - $searchphrases = array(); - $searchphrases[] = JHTML::_('select.option', 'all', JText::_( 'All words' ) ); - $searchphrases[] = JHTML::_('select.option', 'any', JText::_( 'Any words' ) ); - $searchphrases[] = JHTML::_('select.option', 'exact', JText::_( 'Exact phrase' ) ); - $lists['searchphrase' ]= JHTML::_('select.radiolist', $searchphrases, 'searchphrase', '', 'value', 'text', $state->get('match') ); - - // log the search - SearchHelper::logSearch( $searchword); - - //limit searchword - - if(SearchHelper::limitSearchWord($searchword)) { - $error = JText::_( 'SEARCH_MESSAGE' ); - } - - //sanatise searchword - if(SearchHelper::santiseSearchWord($searchword, $state->get('match'))) { - $error = JText::_( 'IGNOREKEYWORD' ); - } - - if (!$searchword && count( JRequest::get('post') ) ) { - //$error = JText::_( 'Enter a search keyword' ); - } - - // put the filtered results back into the model - // for next release, the checks should be done in the model perhaps... - $state->set('keyword', $searchword); - - if(!$error) - { - $results = &$this->get('data' ); - $total = &$this->get('total'); - $pagination = &$this->get('pagination'); - - require_once (JPATH_SITE.DS.'components'.DS.'com_content'.DS.'helpers'.DS.'route.php'); - - for ($i=0; $i < count($results); $i++) - { - $row = &$results[$i]->text; - - if ($state->get('match') == 'exact') - { - $searchwords = array($searchword); - $needle = $searchword; - } - else - { - $searchwords = preg_split("/\s+/u", $searchword); - $needle = $searchwords[0]; - } - - $row = SearchHelper::prepareSearchContent( $row, 200, $needle ); - $searchwords = array_unique( $searchwords ); - $searchRegex = '#('; - $x = 0; - foreach ($searchwords as $k => $hlword) - { - $searchRegex .= ($x == 0 ? '' : '|'); - $searchRegex .= preg_quote($hlword, '#'); - $x++; - } - $searchRegex .= ')#iu'; - - $row = preg_replace($searchRegex, '\0', $row ); - - $result =& $results[$i]; - if ($result->created) { - $created = JHTML::Date ( $result->created ); - } - else { - $created = ''; - } - - $result->created = $created; - $result->count = $i + 1; - } - } - - $this->result = JText::sprintf( 'TOTALRESULTSFOUND', $total ); - - $this->assignRef('pagination', $pagination); - $this->assignRef('results', $results); - $this->assignRef('lists', $lists); - $this->assignRef('params', $params); - - $this->assign('ordering', $state->get('ordering')); - $this->assign('searchword', $searchword); - $this->assign('searchphrase', $state->get('match')); - $this->assign('searchareas', $areas); - - $this->assign('total', $total); - $this->assign('error', $error); - $this->assign('action', $uri->toString()); - - parent::display($tpl); - } -} diff --git a/mod_jmnogosearch/helper.php b/mod_jmnogosearch/helper.php new file mode 100644 index 0000000..7a0c9f4 --- /dev/null +++ b/mod_jmnogosearch/helper.php @@ -0,0 +1,22 @@ + \ No newline at end of file diff --git a/mod_jmnogosearch/mod_jmnogosearch.php b/mod_jmnogosearch/mod_jmnogosearch.php new file mode 100644 index 0000000..d26d9b2 --- /dev/null +++ b/mod_jmnogosearch/mod_jmnogosearch.php @@ -0,0 +1,34 @@ +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_jmnogosearch/mod_jmnogosearch.xml b/mod_jmnogosearch/mod_jmnogosearch.xml new file mode 100644 index 0000000..560fe13 --- /dev/null +++ b/mod_jmnogosearch/mod_jmnogosearch.xml @@ -0,0 +1,48 @@ + + + + JMnoGoSearch + Andrea Zagli + December 2009 + Copyright (C) 2000 Andrea Zagli. All rights reserved. + http://www.gnu.org/licenses/gpl-3.0.html GNU/GPL + azagli@libero.it + http://saetta.homelinux.org/ + 1.0.0 + This module will display a search box that is linked with the mnoGoSearch web search engine. + + + helper.php + index.html + mod_jmnogosearch.php + mod_jmnogosearch.xml + tmpl/index.html + tmpl/default.php + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mod_jmnogosearch/tmpl/default.php b/mod_jmnogosearch/tmpl/default.php new file mode 100644 index 0000000..12cc23a --- /dev/null +++ b/mod_jmnogosearch/tmpl/default.php @@ -0,0 +1,44 @@ + + diff --git a/mod_jmnogosearch/tmpl/index.html b/mod_jmnogosearch/tmpl/index.html new file mode 100644 index 0000000..fa6d84e --- /dev/null +++ b/mod_jmnogosearch/tmpl/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/mod_mnogosearch/helper.php b/mod_mnogosearch/helper.php deleted file mode 100644 index 7a0c9f4..0000000 --- a/mod_mnogosearch/helper.php +++ /dev/null @@ -1,22 +0,0 @@ - \ No newline at end of file diff --git a/mod_mnogosearch/mod_mnogosearch.php b/mod_mnogosearch/mod_mnogosearch.php deleted file mode 100644 index d26d9b2..0000000 --- a/mod_mnogosearch/mod_mnogosearch.php +++ /dev/null @@ -1,34 +0,0 @@ -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 deleted file mode 100644 index a12795b..0000000 --- a/mod_mnogosearch/mod_mnogosearch.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - mnoGoSearch - Andrea Zagli - December 2009 - Copyright (C) 2000 Andrea Zagli. All rights reserved. - http://www.gnu.org/licenses/gpl-3.0.html GNU/GPL - azagli@libero.it - http://saetta.homelinux.org/ - 1.0.0 - This module will display a search box that is linked with the mnoGoSearch web search engine. - - - helper.php - index.html - mod_mnogosearch.php - mod_mnogosearch.xml - tmpl/index.html - tmpl/default.php - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mod_mnogosearch/tmpl/default.php b/mod_mnogosearch/tmpl/default.php deleted file mode 100644 index 12cc23a..0000000 --- a/mod_mnogosearch/tmpl/default.php +++ /dev/null @@ -1,44 +0,0 @@ - - diff --git a/mod_mnogosearch/tmpl/index.html b/mod_mnogosearch/tmpl/index.html deleted file mode 100644 index fa6d84e..0000000 --- a/mod_mnogosearch/tmpl/index.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file

+ + : + +	+ +	+ +
+ lists['searchphrase']; ?> +
+ + : + + lists['ordering'];?> +

+ + '. $this->escape($this->searchword) .''; ?> +
+ + result; ?> +

- - : - -	- -	- -
- lists['searchphrase']; ?> -
- - : - - lists['ordering'];?> -

- - '. $this->escape($this->searchword) .''; ?> -
- - result; ?> -