Changeset 2092 in ExiteCMS

Timestamp:

12/05/08 20:23:35 (3 years ago)

Author:

WanWizard

Message:

ticket #58: added "search entire site" to the search module
added missing svn properties to several files

Location:

trunk

Files:

• administration/tools/language_pack_English.php (modified) (2 diffs)
• administration/tools/language_pack_Nederlands.php (modified) (2 diffs)
• files/attachments/index.php (modified) (1 prop)
• files/cache/index.php (modified) (1 prop)
• files/downloads/index.php (modified) (1 prop)
• files/index.php (modified) (1 prop)
• files/locales/en.main.global.php (modified) (1 diff, 1 prop)
• files/locales/en.main.setup.php (modified) (1 diff, 1 prop)
• files/locales/index.php (modified) (1 prop)
• files/locales/nl.main.global.php (modified) (1 diff, 1 prop)
• files/locales/nl.main.setup.php (modified) (1 diff, 1 prop)
• files/pm_attachments/index.php (modified) (1 prop)
• files/tplcache/index.php (modified) (1 prop)
• images/advertising/index.php (modified) (1 prop)
• images/albums/index.php (modified) (1 prop)
• images/articles/index.php (modified) (1 prop)
• images/avatars/index.php (modified) (1 prop)
• images/download_cats/index.php (modified) (1 prop)
• images/imagelist.js (modified) (1 prop)
• images/index.php (modified) (1 prop)
• images/news/index.php (modified) (1 prop)
• images/news_cats/index.php (modified) (1 prop)
• images/smiley/index.php (modified) (1 prop)
• includes/SWFUpload-2.1.0/fileprogress.js (modified) (1 prop)
• includes/SWFUpload-2.1.0/handlers.js (modified) (1 prop)
• includes/SWFUpload-2.1.0/swfupload.js (modified) (1 prop)
• includes/SWFUpload-2.1.0/swfupload.queue.js (modified) (1 prop)
• includes/SWFUpload-2.1.0/swfupload.swfobject.js (modified) (1 prop)
• includes/Smarty-2.6.20/Config_File.class.php (modified) (1 diff, 1 prop)
• includes/Smarty-2.6.20/Smarty.class.php (modified) (1 diff, 1 prop)
• includes/Smarty-2.6.20/Smarty_Compiler.class.php (modified) (1 diff, 1 prop)
• includes/Smarty-2.6.20/debug.tpl (modified) (1 prop)
• includes/Smarty-2.6.20/internals/core.assemble_plugin_filepath.php (modified) (1 prop)
• includes/Smarty-2.6.20/internals/core.assign_smarty_interface.php (modified) (1 prop)
• includes/Smarty-2.6.20/internals/core.create_dir_structure.php (modified) (1 prop)
• includes/Smarty-2.6.20/internals/core.display_debug_console.php (modified) (1 prop)
• includes/Smarty-2.6.20/internals/core.get_include_path.php (modified) (1 prop)
• includes/Smarty-2.6.20/internals/core.get_microtime.php (modified) (1 prop)
• includes/Smarty-2.6.20/internals/core.get_php_resource.php (modified) (1 prop)
• includes/Smarty-2.6.20/internals/core.is_secure.php (modified) (1 prop)
• includes/Smarty-2.6.20/internals/core.is_trusted.php (modified) (1 prop)
• includes/Smarty-2.6.20/internals/core.load_plugins.php (modified) (1 prop)
• includes/Smarty-2.6.20/internals/core.load_resource_plugin.php (modified) (1 prop)
• includes/Smarty-2.6.20/internals/core.process_cached_inserts.php (modified) (1 prop)
• includes/Smarty-2.6.20/internals/core.process_compiled_include.php (modified) (1 prop)
• includes/Smarty-2.6.20/internals/core.read_cache_file.php (modified) (1 prop)
• includes/Smarty-2.6.20/internals/core.rm_auto.php (modified) (1 prop)
• includes/Smarty-2.6.20/internals/core.rmdir.php (modified) (1 prop)
• includes/Smarty-2.6.20/internals/core.run_insert_handler.php (modified) (1 prop)
• includes/Smarty-2.6.20/internals/core.smarty_include_php.php (modified) (1 prop)
• includes/Smarty-2.6.20/internals/core.write_cache_file.php (modified) (1 prop)
• includes/Smarty-2.6.20/internals/core.write_compiled_include.php (modified) (1 prop)
• includes/Smarty-2.6.20/internals/core.write_compiled_resource.php (modified) (1 prop)
• includes/Smarty-2.6.20/internals/core.write_file.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/block.textformat.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/compiler.assign.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/function.assign_debug_info.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/function.config_load.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/function.counter.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/function.cycle.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/function.debug.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/function.eval.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/function.fetch.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/function.html_checkboxes.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/function.html_image.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/function.html_options.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/function.html_radios.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/function.html_select_date.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/function.html_select_time.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/function.html_table.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/function.mailto.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/function.math.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/function.popup.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/function.popup_init.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/modifier.capitalize.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/modifier.cat.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/modifier.count_characters.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/modifier.count_paragraphs.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/modifier.count_sentences.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/modifier.count_words.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/modifier.date_format.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/modifier.debug_print_var.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/modifier.default.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/modifier.escape.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/modifier.indent.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/modifier.lower.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/modifier.nl2br.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/modifier.regex_replace.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/modifier.replace.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/modifier.spacify.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/modifier.string_format.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/modifier.strip.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/modifier.strip_tags.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/modifier.truncate.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/modifier.upper.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/modifier.wordwrap.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/outputfilter.trimwhitespace.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/shared.escape_special_chars.php (modified) (1 prop)
• includes/Smarty-2.6.20/smarty-plugins/shared.make_timestamp.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/abap.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/actionscript.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/actionscript3.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/ada.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/apache.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/applescript.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/apt_sources.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/asm.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/asp.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/autoit.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/bash.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/basic4gl.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/blitzbasic.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/bnf.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/boo.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/c.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/c_mac.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/caddcl.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/cadlisp.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/cfdg.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/cfm.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/cil.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/cobol.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/cpp-qt.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/cpp.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/csharp.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/css.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/d.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/delphi.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/diff.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/div.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/dos.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/dot.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/eiffel.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/fortran.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/freebasic.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/genero.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/gettext.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/glsl.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/gml.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/gnuplot.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/groovy.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/haskell.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/html4strict.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/idl.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/ini.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/inno.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/io.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/java.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/java5.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/javascript.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/kixtart.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/klonec.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/klonecpp.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/latex.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/lisp.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/lotusformulas.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/lotusscript.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/lua.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/m68k.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/matlab.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/mirc.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/mpasm.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/mxml.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/mysql.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/nsis.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/objc.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/ocaml-brief.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/ocaml.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/oobas.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/oracle8.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/pascal.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/per.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/perl.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/php-brief.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/php.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/pic16.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/plsql.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/povray.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/powershell.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/progress.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/python.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/qbasic.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/rails.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/reg.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/robots.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/ruby.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/sas.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/scala.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/scheme.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/sdlbasic.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/smalltalk.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/smarty.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/sql.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/tcl.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/text.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/thinbasic.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/tsql.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/typoscript.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/vb.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/vbnet.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/verilog.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/vhdl.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/visualfoxpro.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/winbatch.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/xml.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/xorg_conf.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/xpp.php (modified) (1 prop)
• includes/geshi-1.0.8/geshi/z80.php (modified) (1 prop)
• includes/jscripts/hoteditor-4.2/show_it.php (modified) (1 prop)
• includes/jscripts/tiny_mce-3.2/plugins/fullpage/fullpage.htm (modified) (1 prop)
• includes/jscripts/tiny_mce-3.2/plugins/ibrowser/config/config.inc.php (modified) (1 prop)
• includes/jscripts/tiny_mce-3.2/plugins/ibrowser/config/index.php (modified) (1 prop)
• includes/jscripts/tiny_mce-3.2/plugins/ibrowser/interface/index.php (modified) (1 prop)
• includes/jscripts/tiny_mce-3.2/plugins/ibrowser/langs/cs.php (modified) (1 prop)
• includes/jscripts/tiny_mce-3.2/plugins/ibrowser/langs/da.php (modified) (1 prop)
• includes/jscripts/tiny_mce-3.2/plugins/ibrowser/langs/de.php (modified) (1 prop)
• includes/jscripts/tiny_mce-3.2/plugins/ibrowser/langs/en.php (modified) (1 prop)
• includes/jscripts/tiny_mce-3.2/plugins/ibrowser/langs/es.php (modified) (1 prop)
• includes/jscripts/tiny_mce-3.2/plugins/ibrowser/langs/fr.php (modified) (1 prop)
• includes/jscripts/tiny_mce-3.2/plugins/ibrowser/langs/index.php (modified) (1 prop)
• includes/jscripts/tiny_mce-3.2/plugins/ibrowser/langs/it.php (modified) (1 prop)
• includes/jscripts/tiny_mce-3.2/plugins/ibrowser/langs/lang.class.php (modified) (1 prop)
• includes/jscripts/tiny_mce-3.2/plugins/ibrowser/langs/nl.php (modified) (1 prop)
• includes/jscripts/tiny_mce-3.2/plugins/ibrowser/langs/pl.php (modified) (1 prop)
• includes/jscripts/tiny_mce-3.2/plugins/ibrowser/langs/pt_br.php (modified) (1 prop)
• includes/jscripts/tiny_mce-3.2/plugins/ibrowser/langs/sk.php (modified) (1 prop)
• includes/jscripts/tiny_mce-3.2/plugins/ibrowser/temp/index.php (modified) (1 prop)
• includes/language/index.php (modified) (1 prop)
• includes/language/phpmailer.lang-br.php (modified) (1 prop)
• includes/language/phpmailer.lang-ca.php (modified) (1 prop)
• includes/language/phpmailer.lang-cz.php (modified) (1 prop)
• includes/language/phpmailer.lang-de.php (modified) (1 prop)
• includes/language/phpmailer.lang-dk.php (modified) (1 prop)
• includes/language/phpmailer.lang-en.php (modified) (1 prop)
• includes/language/phpmailer.lang-es.php (modified) (1 prop)
• includes/language/phpmailer.lang-et.php (modified) (1 prop)
• includes/language/phpmailer.lang-fa.php (modified) (1 prop)
• includes/language/phpmailer.lang-fi.php (modified) (1 prop)
• includes/language/phpmailer.lang-fo.php (modified) (1 prop)
• includes/language/phpmailer.lang-fr.php (modified) (1 prop)
• includes/language/phpmailer.lang-hu.php (modified) (1 prop)
• includes/language/phpmailer.lang-it.php (modified) (1 prop)
• includes/language/phpmailer.lang-ja.php (modified) (1 prop) (previous)
• includes/language/phpmailer.lang-nl.php (modified) (1 prop)
• includes/language/phpmailer.lang-no.php (modified) (1 prop)
• includes/language/phpmailer.lang-pl.php (modified) (1 prop)
• includes/language/phpmailer.lang-ro.php (modified) (1 prop)
• includes/language/phpmailer.lang-ru.php (modified) (1 prop)
• includes/language/phpmailer.lang-se.php (modified) (1 prop)
• includes/language/phpmailer.lang-tr.php (modified) (1 prop)
• includes/pm_functions_include.php (modified) (2 props)
• includes/reports/templates/index.php (modified) (1 prop)
• includes/search/search.articles.php (modified) (2 diffs)
• includes/search/search.downloads.php (modified) (2 diffs)
• includes/search/search.forumattachments.php (modified) (2 diffs)
• includes/search/search.forumposts.php (modified) (2 diffs)
• includes/search/search.members.php (modified) (3 diffs)
• includes/search/search.news.php (modified) (2 diffs)
• includes/search/search.pm.php (modified) (2 diffs)
• includes/search/templates/index.php (modified) (1 prop)
• includes/search/templates/search.articles.tpl (modified) (1 diff)
• includes/search/templates/search.downloads.tpl (modified) (1 diff)
• includes/search/templates/search.forumattachments.tpl (modified) (1 diff)
• includes/search/templates/search.forumposts.tpl (modified) (1 diff)
• includes/search/templates/search.members.tpl (modified) (1 diff)
• includes/search/templates/search.news.tpl (modified) (1 diff)
• includes/search/templates/search.pm.tpl (modified) (1 diff)
• includes/secureimage-1.0.3/securimage.php (modified) (1 prop)
• includes/secureimage-1.0.3/securimage_play.php (modified) (1 prop)
• includes/secureimage-1.0.3/securimage_show.php (modified) (1 prop)
• includes/template-plugins/function.buttonlink.php (modified) (1 prop)
• includes/template-plugins/function.html_select_date.php (modified) (1 prop)
• includes/template-plugins/function.imagelink.php (modified) (1 prop)
• includes/template-plugins/function.locale_load.php (modified) (1 prop)
• includes/template-plugins/function.mailto.php (modified) (1 prop)
• includes/template-plugins/function.makepagenav.php (modified) (1 prop)
• includes/template-plugins/function.ssprintf.php (modified) (1 prop)
• includes/template-plugins/modifier.abs.php (modified) (1 prop)
• includes/template-plugins/modifier.date_format.php (modified) (1 prop)
• includes/template-plugins/modifier.escape.php (modified) (1 prop)
• includes/template-plugins/modifier.trimhtml.php (modified) (1 prop)
• includes/templates/main.search.tpl (modified) (2 diffs)
• search.php (modified) (5 diffs)
• themes/ExiteCMS/hoteditor/php.gif (modified) (1 prop) (previous)
• themes/ExiteCMS/templates/templates/_close.tpl (modified) (1 diff, 1 prop)
• themes/ExiteCMS/templates/templates/_closeside.tpl (modified) (1 diff, 1 prop)
• themes/ExiteCMS/templates/templates/_closeside_x.tpl (modified) (1 diff, 1 prop)
• themes/ExiteCMS/templates/templates/_closetable.tpl (modified) (1 diff, 1 prop)
• themes/ExiteCMS/templates/templates/_closetable_x.tpl (modified) (1 diff, 1 prop)
• themes/ExiteCMS/templates/templates/_footer.tpl (modified) (1 diff, 1 prop)
• themes/ExiteCMS/templates/templates/_fullscreen_navigation.tpl (modified) (1 diff, 1 prop)
• themes/ExiteCMS/templates/templates/_header.tpl (modified) (1 diff, 1 prop)
• themes/ExiteCMS/templates/templates/_open.tpl (modified) (1 diff, 1 prop)
• themes/ExiteCMS/templates/templates/_openside.tpl (modified) (1 diff, 1 prop)
• themes/ExiteCMS/templates/templates/_openside_x.tpl (modified) (1 diff, 1 prop)
• themes/ExiteCMS/templates/templates/_opentable.tpl (modified) (1 diff, 1 prop)
• themes/ExiteCMS/templates/templates/_opentable_x.tpl (modified) (1 diff, 1 prop)
• themes/ExiteCMS/theme.php (modified) (1 diff, 1 prop)
• themes/ExiteCMS/theme_functions.php (modified) (1 diff, 1 prop)
• themes/index.php (modified) (1 prop)

trunk/administration/tools/language_pack_English.php

@@ -3465 +3465 @@
         $localestrings['src522'] = "To";
         $localestrings['src523'] = "From";
+        $localestrings['src524'] = "Entire site";
         load_localestrings($localestrings, LP_LOCALE, "main.search", $step);
 
@@ -3768 +3769 @@
 if (!defined('LP_COUNTRIES')) define('LP_COUNTRIES', "us|gb|ca|au|nz|in|za|ir|mt|hk|pr");
 if (!defined('LP_VERSION')) define('LP_VERSION', "7.20");
-if (!defined('LP_DATE')) define('LP_DATE', "1228396456");
+if (!defined('LP_DATE')) define('LP_DATE', "1228492311");
 $lp_date = LP_DATE;
 

trunk/administration/tools/language_pack_Nederlands.php

@@ -3465 +3465 @@
         $localestrings['src522'] = "Aan";
         $localestrings['src523'] = "Van";
+        $localestrings['src524'] = "De hele site";
         load_localestrings($localestrings, LP_LOCALE, "main.search", $step);
 
@@ -3768 +3769 @@
 if (!defined('LP_COUNTRIES')) define('LP_COUNTRIES', "nl|be|sr|aw|an");
 if (!defined('LP_VERSION')) define('LP_VERSION', "7.20");
-if (!defined('LP_DATE')) define('LP_DATE', "1228396459");
+if (!defined('LP_DATE')) define('LP_DATE', "1228492315");
 $lp_date = LP_DATE;
 

trunk/files/locales/en.main.global.php

@@ -3 +3 @@
 // locale       : English
 // locale name  : main.global
-// generated on : Sat Nov 29 2008, 23:48:23 CET
+// generated on : Fri Dec 5 2008, 16:52:09 CET
 // translators  : ExiteCMS team,WanWizard
 // ----------------------------------------------------------

trunk/files/locales/en.main.setup.php

@@ -3 +3 @@
 // locale       : English
 // locale name  : main.setup
-// generated on : Sat Nov 29 2008, 23:42:01 CET
+// generated on : Thu Dec 4 2008, 15:56:51 CET
 // translators  : ExiteCMS team,WanWizard
 // ----------------------------------------------------------

trunk/files/locales/nl.main.global.php

@@ -1 +1 @@
 <?php
 // ----------------------------------------------------------
-// locale       : Nederlands
+// locale       : English
 // locale name  : main.global
-// generated on : Wed Dec 3 2008, 16:48:23 CET
+// generated on : Thu Dec 4 2008, 15:56:55 CET
 // translators  : ExiteCMS team,WanWizard
 // ----------------------------------------------------------

trunk/files/locales/nl.main.setup.php

@@ -3 +3 @@
 // locale       : English
 // locale name  : main.setup
-// generated on : Sat Nov 29 2008, 23:41:57 CET
+// generated on : Thu Dec 4 2008, 15:56:55 CET
 // translators  : ExiteCMS team,WanWizard
 // ----------------------------------------------------------

trunk/includes/Smarty-2.6.20/Config_File.class.php

@@ -26 +26 @@
  */
 
-/* $Id: Config_File.class.php 1935 2008-10-29 23:42:42Z WanWizard $ */
+/* $Id$ */
 
 /**

trunk/includes/Smarty-2.6.20/Smarty.class.php

@@ -31 +31 @@
  */
 
-/* $Id: Smarty.class.php 1935 2008-10-29 23:42:42Z WanWizard $ */
+/* $Id$ */
 
 /**

trunk/includes/Smarty-2.6.20/Smarty_Compiler.class.php

@@ -27 +27 @@
  */
 
-/* $Id: Smarty_Compiler.class.php 1935 2008-10-29 23:42:42Z WanWizard $ */
+/* $Id$ */
 
 /**

trunk/includes/search/search.articles.php

@@ -18 +18 @@
 +---------------------------------------------------------------------*/
 if (eregi("search.articles.php", $_SERVER['PHP_SELF']) || !defined('INIT_CMS_OK')) die();
-
-// array to store variables we want to use in the search template
-$reportvars = array();
 
 // make sure we have an action variable
@@ -154 +151 @@
         }
 
-        // check if we have a rowstart value
-        if (!isset($rowstart)) $rowstart = 0;
-    
         // check how many rows this would output
         $rptresult = mysql_query($sql.($limit?" LIMIT $limit":""));
-        $variables['rows'] = dbrows($rptresult);
-        if ($variables['rows']) {
-            $variables['rowstart'] = $rowstart;
-            $variables['items_per_page'] = $settings['numofthreads'];
+        $rows = dbrows($rptresult);
 
-            // now add a query limit, make sure not to overshoot the limit requested
-            if ($variables['rows']-$rowstart > $settings['numofthreads']) {
-                $sql .= " LIMIT ".$rowstart.",".$settings['numofthreads'];
-            } else {
-                $sql .= " LIMIT ".$rowstart.",".($variables['rows']-$rowstart);
-            }
-            $rptresult = dbquery($sql);
+        // are there any results?
+        if ($rows) {
 
-            // get the results if any
-            if ($rptresult) {
-                $reportvars['output'] = array();
-                while ($rptdata = dbarray($rptresult)) {
-                    $reportvars['output'][] = $rptdata;
+            // are we interested in these results?
+            if ($lines < $settings['numofthreads'] && $rowstart < $variables['rows'] + $rows) {
+
+                // add a query limit, we might not need all records
+                $sql .= " LIMIT ".(max($rowstart-$variables['rows'],0)).",".min($rows,($settings['numofthreads']-$lines));
+
+                // launch the query
+                $rptresult = dbquery($sql);
+
+                // get the results if any
+                if ($rptresult) {
+                    while ($rptdata = dbarray($rptresult)) {
+                        $rptdata['_template'] = $data['template'];
+                        $reportvars['output'][] = $rptdata;
+                    }
+
+                    // get the score divider for this result set
+                    $divider = 0;
+                    foreach($reportvars['output'] as $key => $value) {
+                        $divider = max($divider, $value['score']);
+                    }
+
+                    // calculate the relevance for this result set
+                    foreach($reportvars['output'] as $key => $value) {
+                        $reportvars['output'][$key]['relevance'] = $value['score'] / $divider * 100;
+                    }
                 }
 
-                // get the score divider for this result set
-                $divider = 0;
-                foreach($reportvars['output'] as $key => $value) {
-                    $divider = max($divider, $value['score']);
-                }
+            }
 
-                // calculate the relevance for this result set
-                foreach($reportvars['output'] as $key => $value) {
-                    $reportvars['output'][$key]['relevance'] = $value['score'] / $divider * 100;
-                }
-            }
+            // add the amount of rows found to the total rows counter
+            $variables['rows'] += $rows;
+
         }
+
     }
 }

trunk/includes/search/search.downloads.php

@@ -19 +19 @@
 if (eregi("search.downloads.php", $_SERVER['PHP_SELF']) || !defined('INIT_CMS_OK')) die();
 
-// array to store variables we want to use in the search template
-$reportvars = array();
+// shared forum functions include
+require_once PATH_INCLUDES."forum_functions_include.php";
 
 // make sure we have an action variable
@@ -135 +135 @@
         }
 
-        // check if we have a rowstart value
-        if (!isset($rowstart)) $rowstart = 0;
-
         // check how many rows this would output
         $rptresult = mysql_query($sql.($limit?" LIMIT $limit":""));
-        $variables['rows'] = dbrows($rptresult);
-        if ($variables['rows']) {
-            $variables['rowstart'] = $rowstart;
-            $variables['items_per_page'] = $settings['numofthreads'];
+        $rows = dbrows($rptresult);
 
-            // now add a query limit, make sure not to overshoot the limit requested
-            if ($variables['rows']-$rowstart > $settings['numofthreads']) {
-                $sql .= " LIMIT ".$rowstart.",".$settings['numofthreads'];
-            } else {
-                $sql .= " LIMIT ".$rowstart.",".($variables['rows']-$rowstart);
-            }
-            $rptresult = dbquery($sql);
+        // are there any results?
+        if ($rows) {
 
-            // get the results if any
-            if ($rptresult) {
-                $reportvars['output'] = array();
-                while ($rptdata = dbarray($rptresult)) {
-                    $reportvars['output'][] = $rptdata;
+            // are we interested in these results?
+            if ($lines < $settings['numofthreads'] && $rowstart < $variables['rows'] + $rows) {
+
+                // add a query limit, we might not need all records
+                $sql .= " LIMIT ".(max($rowstart-$variables['rows'],0)).",".min($rows,($settings['numofthreads']-$lines));
+
+                // launch the query
+                $rptresult = dbquery($sql);
+
+                // get the results if any
+                if ($rptresult) {
+                    while ($rptdata = dbarray($rptresult)) {
+                        $rptdata['_template'] = $data['template'];
+                        $rptdata['download_description'] = parsemessage(array(), $rptdata['download_description'], true, true);
+                        $reportvars['output'][] = $rptdata;
+                    }
+
+                    // get the score divider for this result set
+                    $divider = 0;
+                    foreach($reportvars['output'] as $key => $value) {
+                        $divider = max($divider, $value['score']);
+                    }
+
+                    // calculate the relevance for this result set
+                    foreach($reportvars['output'] as $key => $value) {
+                        $reportvars['output'][$key]['relevance'] = $value['score'] / $divider * 100;
+                    }
                 }
 
-                // get the score divider for this result set
-                $divider = 0;
-                foreach($reportvars['output'] as $key => $value) {
-                    $divider = max($divider, $value['score']);
-                }
+            }
 
-                // calculate the relevance for this result set
-                foreach($reportvars['output'] as $key => $value) {
-                    $reportvars['output'][$key]['relevance'] = $value['score'] / $divider * 100;
-                }
-            }
+            // add the amount of rows found to the total rows counter
+            $variables['rows'] += $rows;
+
         }
+
     }
 }

trunk/includes/search/search.forumattachments.php

@@ -18 +18 @@
 +---------------------------------------------------------------------*/
 if (eregi("search.forumattachments.php", $_SERVER['PHP_SELF']) || !defined('INIT_CMS_OK')) die();
-
-// array to store variables we want to use in the search template
-$reportvars = array();
 
 // make sure we have an action variable
@@ -176 +173 @@
         }
 
-        // check if we have a rowstart value
-        if (!isset($rowstart)) $rowstart = 0;
-
         // check how many rows this would output
         $rptresult = mysql_query($sql.($limit?" LIMIT $limit":""));
-        $variables['rows'] = dbrows($rptresult);
-        if ($variables['rows']) {
-            $variables['rowstart'] = $rowstart;
-            $variables['items_per_page'] = $settings['numofthreads'];
-
-            // now add a query limit, make sure not to overshoot the limit requested
-            if ($variables['rows']-$rowstart > $settings['numofthreads']) {
-                $sql .= " LIMIT ".$rowstart.",".$settings['numofthreads'];
-            } else {
-                $sql .= " LIMIT ".$rowstart.",".($variables['rows']-$rowstart);
-            }
-            $rptresult = dbquery($sql);
-
-            // get the results if any
-            if ($rptresult) {
-                $reportvars['output'] = array();
-                while ($rptdata = dbarray($rptresult)) {
-                    $reportvars['output'][] = $rptdata;
+        $rows = dbrows($rptresult);
+
+        // are there any results?
+        if ($rows) {
+
+            // are we interested in these results?
+            if ($lines < $settings['numofthreads'] && $rowstart < $variables['rows'] + $rows) {
+
+                // add a query limit, we might not need all records
+                $sql .= " LIMIT ".(max($rowstart-$variables['rows'],0)).",".min($rows,($settings['numofthreads']-$lines));
+
+                // launch the query
+                $rptresult = dbquery($sql);
+
+                // get the results if any
+                if ($rptresult) {
+                    while ($rptdata = dbarray($rptresult)) {
+                        $rptdata['_template'] = $data['template'];
+                        $rptdata['download_description'] = parsemessage(array(), $rptdata['download_description'], true, true);
+                        $reportvars['output'][] = $rptdata;
+                    }
+
+                    // get the score divider for this result set
+                    $divider = 0;
+                    foreach($reportvars['output'] as $key => $value) {
+                        $divider = max($divider, $value['score']);
+                    }
+
+                    // calculate the relevance for this result set
+                    foreach($reportvars['output'] as $key => $value) {
+                        $reportvars['output'][$key]['relevance'] = $value['score'] / $divider * 100;
+                    }
                 }
 
-                // get the score divider for this result set
-                $divider = 0;
-                foreach($reportvars['output'] as $key => $value) {
-                    $divider = max($divider, $value['score']);
-                }
-
-                // calculate the relevance for this result set
-                foreach($reportvars['output'] as $key => $value) {
-                    $reportvars['output'][$key]['relevance'] = $value['score'] / $divider * 100;
-                }
-            }
-        }
+            }
+
+            // add the amount of rows found to the total rows counter
+            $variables['rows'] += $rows;
+
+        }
+
     }
 }

trunk/includes/search/search.forumposts.php

@@ -18 +18 @@
 +---------------------------------------------------------------------*/
 if (eregi("search.forumposts.php", $_SERVER['PHP_SELF']) || !defined('INIT_CMS_OK')) die();
-
-// array to store variables we want to use in the search template
-$reportvars = array();
 
 // make sure we have an action variable
@@ -199 +196 @@
         }
 
-        // check if we have a rowstart value
-        if (!isset($rowstart)) $rowstart = 0;
-
         // check how many rows this would output
         $rptresult = mysql_query($sql.($limit?" LIMIT $limit":""));
-        $variables['rows'] = dbrows($rptresult);
-        if ($variables['rows']) {
-            $variables['rowstart'] = $rowstart;
-            $variables['items_per_page'] = $settings['numofthreads'];
-
-            // now add a query limit, make sure not to overshoot the limit requested
-            if ($variables['rows']-$rowstart > $settings['numofthreads']) {
-                $sql .= " LIMIT ".$rowstart.",".$settings['numofthreads'];
-            } else {
-                $sql .= " LIMIT ".$rowstart.",".($variables['rows']-$rowstart);
-            }
-            $rptresult = dbquery($sql);
-
-            // get the results if any
-            if ($variables['rows']) {
-                $reportvars['output'] = array();
-                while ($rptdata = dbarray($rptresult)) {
-                    $reportvars['output'][] = $rptdata;
+        $rows = dbrows($rptresult);
+
+        // are there any results?
+        if ($rows) {
+
+            // are we interested in these results?
+            if ($lines < $settings['numofthreads'] && $rowstart < $variables['rows'] + $rows) {
+
+                // add a query limit, we might not need all records
+                $sql .= " LIMIT ".(max($rowstart-$variables['rows'],0)).",".min($rows,($settings['numofthreads']-$lines));
+
+                // launch the query
+                $rptresult = dbquery($sql);
+
+                // get the results if any
+                if ($rptresult) {
+                    while ($rptdata = dbarray($rptresult)) {
+                        $rptdata['_template'] = $data['template'];
+                        $reportvars['output'][] = $rptdata;
+                    }
+
+                    // get the score divider for this result set
+                    $divider = 0;
+                    foreach($reportvars['output'] as $key => $value) {
+                        $divider = max($divider, $value['score']);
+                    }
+
+                    // calculate the relevance for this result set
+                    foreach($reportvars['output'] as $key => $value) {
+                        $reportvars['output'][$key]['relevance'] = $value['score'] / $divider * 100;
+                    }
                 }
 
-                // get the score divider for this result set
-                $divider = 0;
-                foreach($reportvars['output'] as $key => $value) {
-                    $divider = max($divider, $value['score']);
-                }
-
-                // calculate the relevance for this result set
-                foreach($reportvars['output'] as $key => $value) {
-                    $reportvars['output'][$key]['relevance'] = $value['score'] / $divider * 100;
-                }
-            }
-        }
+            }
+
+            // add the amount of rows found to the total rows counter
+            $variables['rows'] += $rows;
+
+        }
+
     }
 }

trunk/includes/search/search.members.php

@@ -19 +19 @@
 if (eregi("search.members.php", $_SERVER['PHP_SELF']) || !defined('INIT_CMS_OK')) die();
 
-// array to store variables we want to use in the search template
-$reportvars = array();
-
 // make sure we have an action variable
 if (isset($action)) {
@@ -29 +26 @@
         // add the possible  search filters ($data is defined in the calling script!)
         $data['search_filters' ] = "";
-
 
     } else {
@@ -118 +114 @@
         }
 
-        // check if we have a rowstart value
-        if (!isset($rowstart)) $rowstart = 0;
-    
         // check how many rows this would output
         $rptresult = mysql_query($sql.($limit?" LIMIT $limit":""));
-        $variables['rows'] = dbrows($rptresult);
-        if ($variables['rows']) {
-            $variables['rowstart'] = $rowstart;
-            $variables['items_per_page'] = $settings['numofthreads'];
+        $rows = dbrows($rptresult);
 
-            // now add a query limit, make sure not to overshoot the limit requested
-            if ($variables['rows']-$rowstart > $settings['numofthreads']) {
-                $sql .= " LIMIT ".$rowstart.",".$settings['numofthreads'];
-            } else {
-                $sql .= " LIMIT ".$rowstart.",".($variables['rows']-$rowstart);
-            }
-            $rptresult = dbquery($sql);
+        // are there any results?
+        if ($rows) {
 
-            // get the results if any
-            if ($variables['rows']) {
-                $reportvars['output'] = array();
-                while ($rptdata = dbarray($rptresult)) {
-                    $reportvars['output'][] = $rptdata;
+            // are we interested in these results?
+            if ($lines < $settings['numofthreads'] && $rowstart < $variables['rows'] + $rows) {
+
+                // add a query limit, we might not need all records
+                $sql .= " LIMIT ".(max($rowstart-$variables['rows'],0)).",".min($rows,($settings['numofthreads']-$lines));
+
+                // launch the query
+                $rptresult = dbquery($sql);
+
+                // get the results if any
+                if ($rptresult) {
+                    while ($rptdata = dbarray($rptresult)) {
+                        $rptdata['_template'] = $data['template'];
+                        $rptdata['download_description'] = parsemessage(array(), $rptdata['download_description'], true, true);
+                        $reportvars['output'][] = $rptdata;
+                    }
+
+                    // get the score divider for this result set
+                    $divider = 0;
+                    foreach($reportvars['output'] as $key => $value) {
+                        $divider = max($divider, $value['score']);
+                    }
+
+                    // calculate the relevance for this result set
+                    foreach($reportvars['output'] as $key => $value) {
+                        $reportvars['output'][$key]['relevance'] = $value['score'] / $divider * 100;
+                    }
                 }
 
-                // get the score divider for this result set
-                $divider = 0;
-                foreach($reportvars['output'] as $key => $value) {
-                    $divider = max($divider, $value['score']);
-                }
+            }
 
-                // calculate the relevance for this result set
-                foreach($reportvars['output'] as $key => $value) {
-                    $reportvars['output'][$key]['relevance'] = $value['score'] / $divider * 100;
-                }
-            }
+            // add the amount of rows found to the total rows counter
+            $variables['rows'] += $rows;
+
         }
+
     }
 }

trunk/includes/search/search.news.php

@@ -18 +18 @@
 +---------------------------------------------------------------------*/
 if (eregi("search.news.php", $_SERVER['PHP_SELF']) || !defined('INIT_CMS_OK')) die();
-
-// array to store variables we want to use in the search template
-$reportvars = array();
 
 // make sure we have an action variable
@@ -152 +149 @@
         }
 
-        // check if we have a rowstart value
-        if (!isset($rowstart)) $rowstart = 0;
-    
         // check how many rows this would output
         $rptresult = mysql_query($sql.($limit?" LIMIT $limit":""));
-        $variables['rows'] = dbrows($rptresult);
-        if ($variables['rows']) {
-            $variables['rowstart'] = $rowstart;
-            $variables['items_per_page'] = $settings['numofthreads'];
+        $rows = dbrows($rptresult);
 
-            // now add a query limit, make sure not to overshoot the limit requested
-            if ($variables['rows']-$rowstart > $settings['numofthreads']) {
-                $sql .= " LIMIT ".$rowstart.",".$settings['numofthreads'];
-            } else {
-                $sql .= " LIMIT ".$rowstart.",".($variables['rows']-$rowstart);
-            }
-            $rptresult = dbquery($sql);
+        // are there any results?
+        if ($rows) {
 
-            // get the results if any
-            if ($variables['rows']) {
-                $reportvars['output'] = array();
-                while ($rptdata = dbarray($rptresult)) {
-                    $reportvars['output'][] = $rptdata;
+            // are we interested in these results?
+            if ($lines < $settings['numofthreads'] && $rowstart < $variables['rows'] + $rows) {
+
+                // add a query limit, we might not need all records
+                $sql .= " LIMIT ".(max($rowstart-$variables['rows'],0)).",".min($rows,($settings['numofthreads']-$lines));
+
+                // launch the query
+                $rptresult = dbquery($sql);
+
+                // get the results if any
+                if ($rptresult) {
+                    while ($rptdata = dbarray($rptresult)) {
+                        $rptdata['_template'] = $data['template'];
+                        $reportvars['output'][] = $rptdata;
+                    }
+
+                    // get the score divider for this result set
+                    $divider = 0;
+                    foreach($reportvars['output'] as $key => $value) {
+                        $divider = max($divider, $value['score']);
+                    }
+
+                    // calculate the relevance for this result set
+                    foreach($reportvars['output'] as $key => $value) {
+                        $reportvars['output'][$key]['relevance'] = $value['score'] / $divider * 100;
+                    }
                 }
 
-                // get the score divider for this result set
-                $divider = 0;
-                foreach($reportvars['output'] as $key => $value) {
-                    $divider = max($divider, $value['score']);
-                }
+            }
 
-                // calculate the relevance for this result set
-                foreach($reportvars['output'] as $key => $value) {
-                    $reportvars['output'][$key]['relevance'] = $value['score'] / $divider * 100;
-                }
-            }
+            // add the amount of rows found to the total rows counter
+            $variables['rows'] += $rows;
+
         }
+
     }
 }

trunk/includes/search/search.pm.php

@@ -18 +18 @@
 +---------------------------------------------------------------------*/
 if (eregi("search.forumposts.php", $_SERVER['PHP_SELF']) || !defined('INIT_CMS_OK')) die();
-
-// array to store variables we want to use in the search template
-$reportvars = array();
 
 // make sure we have an action variable
@@ -133 +130 @@
         }
 
-        // check if we have a rowstart value
-        if (!isset($rowstart)) $rowstart = 0;
-
         // check how many rows this would output
         $rptresult = mysql_query($sql.($limit?" LIMIT $limit":""));
-        $variables['rows'] = dbrows($rptresult);
-        if ($variables['rows']) {
-            $variables['rowstart'] = $rowstart;
-            $variables['items_per_page'] = $settings['numofthreads'];
-
-            // now add a query limit, make sure not to overshoot the limit requested
-            if ($variables['rows']-$rowstart > $settings['numofthreads']) {
-                $sql .= " LIMIT ".$rowstart.",".$settings['numofthreads'];
-            } else {
-                $sql .= " LIMIT ".$rowstart.",".($variables['rows']-$rowstart);
-            }
-            $rptresult = dbquery($sql);
-
-            // get the results if any
-            if ($variables['rows']) {
-                $pmfolders = array($locale['src519'], $locale['src520'], $locale['src521']);
-                $reportvars['output'] = array();
-                while ($rptdata = dbarray($rptresult)) {
-                    $rptdata['folder'] = $pmfolders[$rptdata['pmindex_folder']];
-                    // get the information for the recipient(s)
-                    $rptdata['recipients'] = array();
-                    if ($rptdata['pmindex_folder'] == 0 || ($rptdata['pmindex_folder'] == 2 && $rptdata['pmindex_user_id'] != $rptdata['pmindex_from_id'])) {
-                        // incomming, get the sender info
-                        $result2 = dbquery("SELECT 0 as is_group, user_name AS name FROM ".$db_prefix."users WHERE user_id = '".$rptdata['pmindex_from_id']."'");
-                        if ($data2 = dbarray($result2)) {
-                            $rptdata['recipients'][] = $data2;
-                        }
-                    } elseif ($rptdata['pmindex_folder'] == 1 || ($rptdata['pmindex_folder'] == 2 && $rptdata['pmindex_user_id'] == $rptdata['pmindex_from_id'])) {
-                        // outgoing, get the recepient info
-                        $recipients = explode(",", $rptdata['pm_recipients']);
-                        foreach ($recipients as $recipient) {
-                            if ($recipient < 0) {
-                                // recipient is a user group
-                                $result2 = dbquery("SELECT 1 as is_group, group_id AS id, group_name AS name, group_visible AS visible FROM ".$db_prefix."user_groups WHERE group_id = '".abs($recipient)."'");
-                                if ($data2 = dbarray($result2)) {
-                                    $data2['visible'] = $data2['visible'] & pow(2, 0);
-                                    $rptdata['recipients'][] = $data2;
-                                }
-                            } else {
-                                // recipient is a single member
-                                $result2 = dbquery("SELECT 0 as is_group, user_id AS id, user_name AS name FROM ".$db_prefix."users WHERE user_id = '".$recipient."'");
-                                if ($data2 = dbarray($result2)) {
-                                    $data2['visible'] = iMEMBER;
-                                    $rptdata['recipients'][] = $data2;
+        $rows = dbrows($rptresult);
+
+        // are there any results?
+        if ($rows) {
+
+            // are we interested in these results?
+            if ($lines < $settings['numofthreads'] && $rowstart < $variables['rows'] + $rows) {
+
+                // add a query limit, we might not need all records
+                $sql .= " LIMIT ".(max($rowstart-$variables['rows'],0)).",".min($rows,($settings['numofthreads']-$lines));
+
+                // launch the query
+                $rptresult = dbquery($sql);
+
+                // get the results if any
+                if ($rptresult) {
+                    $pmfolders = array($locale['src519'], $locale['src520'], $locale['src521']);
+                    while ($rptdata = dbarray($rptresult)) {
+                        $rptdata['folder'] = $pmfolders[$rptdata['pmindex_folder']];
+                        // get the information for the recipient(s)
+                        $rptdata['recipients'] = array();
+                        if ($rptdata['pmindex_folder'] == 0 || ($rptdata['pmindex_folder'] == 2 && $rptdata['pmindex_user_id'] != $rptdata['pmindex_from_id'])) {
+                            // incomming, get the sender info
+                            $result2 = dbquery("SELECT 0 as is_group, user_name AS name FROM ".$db_prefix."users WHERE user_id = '".$rptdata['pmindex_from_id']."'");
+                            if ($data2 = dbarray($result2)) {
+                                $rptdata['recipients'][] = $data2;
+                            }
+                        } elseif ($rptdata['pmindex_folder'] == 1 || ($rptdata['pmindex_folder'] == 2 && $rptdata['pmindex_user_id'] == $rptdata['pmindex_from_id'])) {
+                            // outgoing, get the recepient info
+                            $recipients = explode(",", $rptdata['pm_recipients']);
+                            foreach ($recipients as $recipient) {
+                                if ($recipient < 0) {
+                                    // recipient is a user group
+                                    $result2 = dbquery("SELECT 1 as is_group, group_id AS id, group_name AS name, group_visible AS visible FROM ".$db_prefix."user_groups WHERE group_id = '".abs($recipient)."'");
+                                    if ($data2 = dbarray($result2)) {
+                                        $data2['visible'] = $data2['visible'] & pow(2, 0);
+                                        $rptdata['recipients'][] = $data2;
+                                    }
+                                } else {
+                                    // recipient is a single member
+                                    $result2 = dbquery("SELECT 0 as is_group, user_id AS id, user_name AS name FROM ".$db_prefix."users WHERE user_id = '".$recipient."'");
+                                    if ($data2 = dbarray($result2)) {
+                                        $data2['visible'] = iMEMBER;
+                                        $rptdata['recipients'][] = $data2;
+                                    }
                                 }
                             }
                         }
+                        $rptdata['_template'] = $data['template'];
+                        $reportvars['output'][] = $rptdata;
                     }
-                    $reportvars['output'][] = $rptdata;
+
+                    // get the score divider for this result set
+                    $divider = 0;
+                    foreach($reportvars['output'] as $key => $value) {
+                        $divider = max($divider, $value['score']);
+                    }
+
+                    // calculate the relevance for this result set
+                    foreach($reportvars['output'] as $key => $value) {
+                        $reportvars['output'][$key]['relevance'] = $value['score'] / $divider * 100;
+                    }
                 }
 
-                // get the score divider for this result set
-                $divider = 0;
-                foreach($reportvars['output'] as $key => $value) {
-                    $divider = max($divider, $value['score']);
-                }
-
-                // calculate the relevance for this result set
-                foreach($reportvars['output'] as $key => $value) {
-                    $reportvars['output'][$key]['relevance'] = $value['score'] / $divider * 100;
-                }
-            }
-//          _debug($reportvars, true);
-        }
+            }
+
+            // add the amount of rows found to the total rows counter
+            $variables['rows'] += $rows;
+
+        }
+
     }
 }

trunk/includes/search/templates/search.articles.tpl

@@ -19 +19 @@
 {***************************************************************************}
 {if $action == "search"}
-    {section name=idx loop=$reportvars.output}
-        {if !$smarty.section.idx.first}
-            <br /><br />
-        {/if}
-        {$reportvars.output[idx].relevance|string_format:"%u"}% - <a href='readarticle.php?article_id={$reportvars.output[idx].article_id}'>{$reportvars.output[idx].article_subject}</a>
-        <br />
-        <span class='small'><font class='smallalt'>{$locale.040}</font>
-        {if iMEMBER}
-            <a href='profile.php?lookup={$reportvars.output[idx].user_id}'>{$reportvars.output[idx].user_name}</a>
-        {else}
-            {$reportvars.output[idx].user_name}
-        {/if}
-        <font class='smallalt'>{$locale.041}</font> {$reportvars.output[idx].article_datestamp|date_format:"longdate"}</span>
-    {/section}
+    <br /><br />
+    {$output.relevance|string_format:"%u"}% - <a href='readarticle.php?article_id={$output.article_id}'>{$output.article_subject}</a>
+    <br />
+    <span class='small'><font class='smallalt'>{$locale.040}</font>
+    {if iMEMBER}
+        <a href='profile.php?lookup={$output.user_id}'>{$output.user_name}</a>
+    {else}
+        {$output.user_name}
+    {/if}
+    <font class='smallalt'>{$locale.041}</font> {$output.article_datestamp|date_format:"longdate"}</span>
 {else}
     <input type='radio' name='search_id' value='{$searches[id].search_id}' {if $search_id == $searches[id].search_id || $searches[id].search_order == $default_location}checked='checked'{/if}  onclick='javascript:show_filter("{$searches[id].search_filters}");'/> {$searches[id].search_title} {if $searches[id].search_fulltext}<span style='color:red;'>*</span>{/if}<br />

trunk/includes/search/templates/search.downloads.tpl

@@ -19 +19 @@
 {***************************************************************************}
 {if $action == "search"}
-    {section name=idx loop=$reportvars.output}
-        {if !$smarty.section.idx.first}
-            <br /><br />
-        {/if}
-        <a href='downloads.php?cat_id={$v[idx].download_cat}&amp;download_id={$reportvars.output[idx].download_id}' target='_blank'>{$reportvars.output[idx].download_title}</a> - {$reportvars.output[idx].download_filesize}
-        {if $reportvars.output[idx].download_description}
-            &nbsp;&middot;&nbsp;{$reportvars.output[idx].download_description}<br />
-        {/if}
-        <span class='small'><font class='smallalt'>{$locale.src433}</font> {$reportvars.output[idx].download_license},
-        <font class='smallalt'>{$locale.src434}</font> {$reportvars.output[idx].download_os},
-        <font class='smallalt'>{$locale.src435}</font> {$reportvars.output[idx].download_version}
-        <font class='smallalt'>{$locale.src436}</font>{$reportvars.output[idx].download_datestamp|date_format:"longdate"},
-        <font class='smallalt'>{$locale.src437}</font> {$reportvars.output[idx].download_count}</span>
-    {/section}
+    <br /><br />
+    <a href='downloads.php?cat_id={$output.download_cat}&amp;download_id={$output.download_id}' target='_blank'>{$output.download_title}</a> - {$output.download_filesize}
+    {if $output.download_description}
+        &nbsp;&middot;&nbsp;{$output.download_description}<br />
+    {/if}
+    <span class='small'><font class='smallalt'>{$locale.src433}</font> {$output.download_license},
+    <font class='smallalt'>{$locale.src434}</font> {$output.download_os},
+    <font class='smallalt'>{$locale.src435}</font> {$output.download_version}
+    <font class='smallalt'>{$locale.src436}</font> {$output.download_datestamp|date_format:"longdate"},
+    <font class='smallalt'>{$locale.src437}</font> {$output.download_count}</span>
 {else}
     <input type='radio' name='search_id' value='{$searches[id].search_id}' {if $search_id == $searches[id].search_id || $searches[id].search_order == $default_location}checked='checked'{/if}  onclick='javascript:show_filter("{$searches[id].search_filters}");'/> {$searches[id].search_title} {if $searches[id].search_fulltext}<span style='color:red;'>*</span>{/if}<br />

trunk/includes/search/templates/search.forumattachments.tpl

@@ -19 +19 @@
 {***************************************************************************}
 {if $action == "search"}
-    {section name=idx loop=$reportvars.output}
-        {if !$smarty.section.idx.first}
-            <br /><br />
-        {/if}
-        {$reportvars.output[idx].relevance|string_format:"%u"}% - <a href='/forum/viewthread.php?forum_id={$reportvars.output[idx].forum_id}&amp;thread_id={$reportvars.output[idx].thread_id}&amp;pid={$reportvars.output[idx].post_id}#post_{$reportvars.output[idx].post_id}'>{$reportvars.output[idx].post_subject}</a>,
-        {$locale.src441} {$reportvars.output[idx].attach_realname}
-        <br />
-        <span class='small'><font class='smallalt'>{$locale.040}</font>
-        {if iMEMBER}
-            <a href='profile.php?lookup={$reportvars.output[idx].user_id}'>{$reportvars.output[idx].user_name}</a>
-        {else}
-            {$reportvars.output[idx].user_name}
-        {/if}
-        <font class='smallalt'>{$locale.436}</font> {$reportvars.output[idx].post_datestamp|date_format:"longdate"}</span>
-    {/section}
+    <br /><br />
+    {$output.relevance|string_format:"%u"}% - <a href='/forum/viewthread.php?forum_id={$output.forum_id}&amp;thread_id={$output.thread_id}&amp;pid={$output.post_id}#post_{$output.post_id}'>{$output.post_subject}</a>,
+    {$locale.src441} {$output.attach_realname}
+    <br />
+    <span class='small'><font class='smallalt'>{$locale.040}</font>
+    {if iMEMBER}
+        <a href='profile.php?lookup={$output.user_id}'>{$output.user_name}</a>
+    {else}
+        {$output.user_name}
+    {/if}
+    <font class='smallalt'>{$locale.436}</font> {$output.post_datestamp|date_format:"longdate"}</span>
 {else}
     <input type='radio' name='search_id' value='{$searches[id].search_id}' {if $search_id == $searches[id].search_id || $searches[id].search_order == $default_location}checked='checked'{/if}  onclick='javascript:show_filter("{$searches[id].search_filters}");'/> {$searches[id].search_title} {if $searches[id].search_fulltext}<span style='color:red;'>*</span>{/if}<br />

trunk/includes/search/templates/search.forumposts.tpl

@@ -19 +19 @@
 {***************************************************************************}
 {if $action == "search"}
-    {section name=idx loop=$reportvars.output}
-        {if !$smarty.section.idx.first}
-            <br /><br />
-        {/if}
-        {$reportvars.output[idx].relevance|string_format:"%u"}% - <a href='/forum/viewthread.php?forum_id={$reportvars.output[idx].forum_id}&amp;thread_id={$reportvars.output[idx].thread_id}&amp;pid={$reportvars.output[idx].post_id}#post_{$reportvars.output[idx].post_id}'>{$reportvars.output[idx].post_subject}</a>
-        <br />
-        <span class='small'><font class='smallalt'>{$locale.040}</font>
-        {if iMEMBER}
-            <a href='profile.php?lookup={$reportvars.output[idx].user_id}'>{$reportvars.output[idx].user_name}</a>
-        {else}
-            {$reportvars.output[idx].user_name}
-        {/if}
-        <font class='smallalt'>{$locale.src436}</font> {$reportvars.output[idx].post_datestamp|date_format:"longdate"}</span>
-    {/section}
+    <br /><br />
+    {$output.relevance|string_format:"%u"}% - <a href='/forum/viewthread.php?forum_id={$output.forum_id}&amp;thread_id={$output.thread_id}&amp;pid={$output.post_id}#post_{$output.post_id}'>{$output.post_subject}</a>
+    <br />
+    <span class='small'><font class='smallalt'>{$locale.040}</font>
+    {if iMEMBER}
+        <a href='profile.php?lookup={$output.user_id}'>{$output.user_name}</a>
+    {else}
+        {$output.user_name}
+    {/if}
+    <font class='smallalt'>{$locale.src436}</font> {$output.post_datestamp|date_format:"longdate"}</span>
 {else}
     <input type='radio' name='search_id' value='{$searches[id].search_id}.2' {if $search_id == $searches[id].search_id || $searches[id].search_order == $default_location}checked='checked'{/if}  onclick='javascript:show_filter("{$searches[id].search_filters}");'/> {$searches[id].search_title} {$locale.src517} {if $searches[id].search_fulltext}<span style='color:red;'>*</span>{/if}<br />

trunk/includes/search/templates/search.members.tpl

@@ -19 +19 @@
 {***************************************************************************}
 {if $action == "search"}
-    {section name=idx loop=$reportvars.output}
-        {if !$smarty.section.idx.first}
-            <br /><br />
-        {/if}
-        <img src='{$smarty.const.THEME}images/bullet.gif' alt='' />
-        {if iMEMBER}
-            <a href='profile.php?lookup={$reportvars.output[idx].user_id}'>{$reportvars.output[idx].user_name}</a>
-        {else}
-            {$reportvars.output[idx].user_name}
-        {/if}
-        <br />&nbsp;
-        <span class='small'><font class='smallalt'>{$locale.src438}</font> {$reportvars.output[idx].user_joined|date_format:"forumdate"},
-        <font class='smallalt'>{$locale.src439}</font> {if $reportvars.output[idx].user_lastvisit}{$reportvars.output[idx].user_lastvisit|date_format:"forumdate"}{else}{$locale.src440}{/if}</span>
-    {/section}
+    <br /><br />
+    <img src='{$smarty.const.THEME}images/bullet.gif' alt='' />
+    {if iMEMBER}
+        <a href='profile.php?lookup={$output.user_id}'>{$output.user_name}</a>
+    {else}
+        {$output.user_name}
+    {/if}
+    <br />&nbsp;
+    <span class='small'><font class='smallalt'>{$locale.src438}</font> {$output.user_joined|date_format:"forumdate"},
+    <font class='smallalt'>{$locale.src439}</font> {if $output.user_lastvisit}{$output.user_lastvisit|date_format:"forumdate"}{else}{$locale.src440}{/if}</span>
 {else}
     <input type='radio' name='search_id' value='{$searches[id].search_id}' {if $search_id == $searches[id].search_id || $searches[id].search_order == $default_location}checked='checked'{/if}  onclick='javascript:show_filter("{$searches[id].search_filters}");'/> {$searches[id].search_title} {if $searches[id].search_fulltext}<span style='color:red;'>*</span>{/if}<br />

trunk/includes/search/templates/search.news.tpl

@@ -19 +19 @@
 {***************************************************************************}
 {if $action == "search"}
-    {section name=idx loop=$reportvars.output}
-        {if !$smarty.section.idx.first}
-            <br /><br />
-        {/if}
-        {$reportvars.output[idx].relevance|string_format:"%u"}% - <a href='news.php?readmore={$reportvars.output[idx].news_id}'>{$reportvars.output[idx].news_subject}</a>
-        <br />
-        <span class='small'><font class='smallalt'>{$locale.040}</font>
-        {if iMEMBER}
-            <a href='profile.php?lookup={$reportvars.output[idx].user_id}'>{$reportvars.output[idx].user_name}</a>
-        {else}
-            {$reportvars.output[idx].user_name}
-        {/if}
-        <font class='smallalt'>{$locale.041}</font> {$reportvars.output[idx].news_datestamp|date_format:"longdate"}</span>
-    {/section}
+    <br /><br />
+    {$output.relevance|string_format:"%u"}% - <a href='news.php?readmore={$output.news_id}'>{$output.news_subject}</a>
+    <br />
+    <span class='small'><font class='smallalt'>{$locale.040}</font>
+    {if iMEMBER}
+        <a href='profile.php?lookup={$output.user_id}'>{$output.user_name}</a>
+    {else}
+        {$output.user_name}
+    {/if}
+    <font class='smallalt'>{$locale.041}</font> {$output.news_datestamp|date_format:"longdate"}</span>
 {else}
     <input type='radio' name='search_id' value='{$searches[id].search_id}' {if $search_id == $searches[id].search_id || $searches[id].search_order == $default_location}checked='checked'{/if}  onclick='javascript:show_filter("{$searches[id].search_filters}");'/> {$searches[id].search_title} {if $searches[id].search_fulltext}<span style='color:red;'>*</span>{/if}<br />

trunk/includes/search/templates/search.pm.tpl

@@ -19 +19 @@
 {***************************************************************************}
 {if $action == "search"}
-    {section name=idx loop=$reportvars.output}
-        {if !$smarty.section.idx.first}
-            <br /><br />
+    <br /><br />
+    {$output.relevance|string_format:"%u"}% - <a href='{$smarty.const.BASEDIR}pm.php?folder={$output.folder}&amp;action=view&amp;msg_id={$output.pmindex_id}#view_{$output.pmindex_id}'>{$output.pm_subject}</a>
+    <br />
+    <span class='small'><font class='smallalt'>{if $output.pmindex_user_id == $output.pmindex_from_id}{$locale.src522}{else}{$locale.src523}{/if}:</font>
+    {section name=uid loop=$output.recipients}
+        {if $output.recipients[uid].visible}
+            {if $output.recipients[uid].is_group}
+                <a href='{$smarty.const.BASEDIR}profile.php?group_id={$output.recipients[uid].id}'><b>{$output.recipients[uid].name}</b></a>{if !$smarty.section.uid.last},{/if}
+            {else}
+                <a href='{$smarty.const.BASEDIR}profile.php?lookup={$output.recipients[uid].id}'>{$output.recipients[uid].name}</a>{if !$smarty.section.uid.last},{/if}
+            {/if}
+        {else}
+            {if $output.recipients[uid].is_group}
+                <b>{$output.recipients[uid].name}</b>{if !$smarty.section.uid.last},{/if}
+            {else}
+                {$output.recipients[uid].name}{if !$smarty.section.uid.last},{/if}
+            {/if}
         {/if}
-        {$reportvars.output[idx].relevance|string_format:"%u"}% - <a href='{$smarty.const.BASEDIR}pm.php?folder={$reportvars.output[idx].folder}&amp;action=view&amp;msg_id={$reportvars.output[idx].pmindex_id}#view_{$reportvars.output[idx].pmindex_id}'>{$reportvars.output[idx].pm_subject}</a>
-        <br />
-        <span class='small'><font class='smallalt'>{if $reportvars.output[idx].pmindex_user_id == $reportvars.output[idx].pmindex_from_id}{$locale.src522}{else}{$locale.src523}{/if}:</font>
-        {section name=uid loop=$reportvars.output[idx].recipients}
-            {if $reportvars.output[idx].recipients[uid].visible}
-                {if $reportvars.output[idx].recipients[uid].is_group}
-                    <a href='{$smarty.const.BASEDIR}profile.php?group_id={$reportvars.output[idx].recipients[uid].id}'><b>{$reportvars.output[idx].recipients[uid].name}</b></a>{if !$smarty.section.uid.last},{/if}
-                {else}
-                    <a href='{$smarty.const.BASEDIR}profile.php?lookup={$reportvars.output[idx].recipients[uid].id}'>{$reportvars.output[idx].recipients[uid].name}</a>{if !$smarty.section.uid.last},{/if}
-                {/if}
-            {else}
-                {if $reportvars.output[idx].recipients[uid].is_group}
-                    <b>{$reportvars.output[idx].recipients[uid].name}</b>{if !$smarty.section.uid.last},{/if}
-                {else}
-                    {$reportvars.output[idx].recipients[uid].name}{if !$smarty.section.uid.last},{/if}
-                {/if}
-            {/if}
-        {/section}
-        <br />
-        <font class='smallalt'>{$locale.src436}</font> {$reportvars.output[idx].pm_datestamp|date_format:"longdate"}</span>
     {/section}
+    <br />
+    <font class='smallalt'>{$locale.src436}</font> {$output.pm_datestamp|date_format:"longdate"}</span>
 {elseif iMEMBER}
     <input type='radio' name='search_id' value='{$searches[id].search_id}' {if $search_id == $searches[id].search_id || $searches[id].search_order == $default_location}checked='checked'{/if}  onclick='javascript:show_filter("{$searches[id].search_filters}");'/> {$searches[id].search_title} {if $searches[id].search_fulltext}<span style='color:red;'>*</span>{/if}<br />

trunk/includes/templates/main.search.tpl

@@ -56 +56 @@
                     {section name=id loop=$searches}
                         {include file=$searches[id].template}
+                        {if $smarty.section.id.last}
+                            <input type='radio' name='search_id' value='99999' onclick='javascript:show_filter("date,users,forums");'/> {$locale.src524} <span style='color:red;'>*</span><br />
+                        {/if}
                     {sectionelse}
                         {$locale.src409}
@@ -195 +198 @@
             </td>
         </tr>
-        {if $message|default:"" != ""}
-        <tr>
-            <td align='left'>
-                <span style='color:red;font-weight:bold;'>{$message}</span>
-            </td>
-        </tr>
-        {/if}
     </table>
-    {if $message|default:"" == ""}
-        <hr />
-        {include file=$searches.0.template}
-    {/if}
+    {section name=id loop=$reportvars.output}
+        {include file=$reportvars.output[id]._template output=$reportvars.output[id]}
+    {sectionelse}
+        <div style='color:red;font-weight:bold;text-align:center;padding:10px;'>{$locale.src432}</div>
+    {/section}
     {include file="_closetable.tpl"}
     {if $rows > $items_per_page}

trunk/search.php

@@ -36 +36 @@
 $content_filters = array();
 
-if (!isset($rowstart) || !isNum($rowstart)) $rowstart = 0;
-$variables['rowstart'] = $rowstart;
+$variables['items_per_page'] = $settings['numofthreads'];
 
 if (!isset($action)) $action = "";
@@ -72 +71 @@
 $searches = array();
 $searchindex = array();
-$result = dbquery("SELECT s.*, m.mod_folder FROM ".$db_prefix."search s LEFT JOIN ".$db_prefix."modules m ON s.search_mod_id = m.mod_id WHERE s.search_active = 1".($search_id?" AND s.search_id = '$search_id'":""));
+
+// array to store variables we use in the search templates
+$reportvars = array();
+$reportvars['output'] = array();
+
+// variable initialisation
+if (!isset($rowstart) || !isNum($rowstart)) $rowstart = 1;
+$variables['rowstart'] = $rowstart;
+
+$variables['rows'] = 0;
+$lines = 0;
+$result = dbquery("SELECT s.*, m.mod_folder FROM ".$db_prefix."search s LEFT JOIN ".$db_prefix."modules m ON s.search_mod_id = m.mod_id WHERE s.search_active = 1".(($search_id > 0 && $search_id < 99999)?" AND s.search_id = '$search_id'":""));
 while ($data = dbarray($result)) {
     if (checkgroup($data['search_visibility'])) {
@@ -93 +103 @@
                 // do any preprocessing
                 @include PATH_INCLUDES."search/search.".strtolower($data['search_name']).".php";
+                $lines = count($reportvars['output']);
             } else {
                 $data['mod_folder'] = "-";
@@ -130 +141 @@
     $variables['default_filter'] = "";
     foreach($variables['searches'] as $key => $search) {
-        if ($search['search_order'] < $variables['default_location']) {
+        if (isset($search['search_filters']) && $search['search_order'] < $variables['default_location']) {
             $variables['default_location'] = $search['search_order'];
             $variables['default_filter'] = $search['search_filters'];
-            if (!isset($search['search_filters'])) _debug($search, true);
         }
     }
@@ -149 +159 @@
 }
 
+// update the search title in case of a global search
+if ($search_id == 99999) {
+    $variables['searches'][0]['search_title'] = $locale['src524'];
+}
+
 // define the search body panel variables
 $template_panels[] = array('type' => 'body', 'name' => 'search', 'title' => $title, 'template' => 'main.search.tpl', 'locale' => $locales);

trunk/themes/ExiteCMS/templates/templates/_close.tpl

@@ -9 +9 @@
 {* http://gnu.org                                                          *}
 {***************************************************************************}
-{* $Id:: _close.tpl 1935 2008-10-29 23:42:42Z WanWizard                   $*}
+{* $Id::                                                                  $*}
 {*-------------------------------------------------------------------------*}
-{* Last modified by $Author:: WanWizard                                   $*}
-{* Revision number $Rev:: 1935                                            $*}
+{* Last modified by $Author::                                             $*}
+{* Revision number $Rev::                                                 $*}
 {***************************************************************************}
 {*                                                                         *}

trunk/themes/ExiteCMS/templates/templates/_closeside.tpl

@@ -9 +9 @@
 {* http://gnu.org                                                          *}
 {***************************************************************************}
-{* $Id:: _closeside.tpl 1935 2008-10-29 23:42:42Z WanWizard               $*}
+{* $Id::                                                                  $*}
 {*-------------------------------------------------------------------------*}
-{* Last modified by $Author:: WanWizard                                   $*}
-{* Revision number $Rev:: 1935                                            $*}
+{* Last modified by $Author::                                             $*}
+{* Revision number $Rev::                                                 $*}
 {***************************************************************************}
 {*                                                                         *}

trunk/themes/ExiteCMS/templates/templates/_closeside_x.tpl

@@ -9 +9 @@
 {* http://gnu.org                                                          *}
 {***************************************************************************}
-{* $Id:: _closeside_x.tpl 1935 2008-10-29 23:42:42Z WanWizard             $*}
+{* $Id::                                                                  $*}
 {*-------------------------------------------------------------------------*}
-{* Last modified by $Author:: WanWizard                                   $*}