Revision 1254
Added by Dietmar almost 15 years ago
| branches/2.8.x/CHANGELOG | ||
|---|---|---|
| 11 | 11 |
! = Update/Change |
| 12 | 12 |
|
| 13 | 13 |
------------------------------------- 2.8.1 ------------------------------------- |
| 14 |
21-Jan-2010 Dietmar Woellbrink (Luisehahne) |
|
| 15 |
# Ticket #915 fix bug in search (utf-8 characters corrupted)(thanks to Thorn) |
|
| 14 | 16 |
19-Jan-2010 Dietmar Woellbrink (Luisehahne) |
| 15 | 17 |
# fix some more small css-errors in WB Backend (thanks to Ruebenwurzel) |
| 16 | 18 |
19-Jan-2010 Dietmar Woellbrink (Luisehahne) |
| branches/2.8.x/wb/admin/interface/version.php | ||
|---|---|---|
| 1 | 1 |
<?php |
| 2 |
/**************************************************************************** |
|
| 3 |
* SVN Version information: |
|
| 4 |
* |
|
| 5 |
* $Id$ |
|
| 6 |
* |
|
| 7 |
* |
|
| 8 |
* |
|
| 9 |
***************************************************************************** |
|
| 10 |
* WebsiteBaker |
|
| 11 |
* |
|
| 12 |
* WebsiteBaker Project <http://www.websitebaker2.org/> |
|
| 13 |
* Copyright (C) 2009, Website Baker Org. e.V. |
|
| 14 |
* http://start.websitebaker2.org/impressum-datenschutz.php |
|
| 15 |
* Copyright (C) 2004-2009, Ryan Djurovich |
|
| 16 |
* |
|
| 17 |
* About WebsiteBaker |
|
| 18 |
* |
|
| 19 |
* Website Baker is a PHP-based Content Management System (CMS) |
|
| 20 |
* designed with one goal in mind: to enable its users to produce websites |
|
| 21 |
* with ease. |
|
| 22 |
* |
|
| 23 |
***************************************************************************** |
|
| 24 |
* |
|
| 25 |
***************************************************************************** |
|
| 26 |
* LICENSE INFORMATION |
|
| 27 |
* |
|
| 28 |
* WebsiteBaker is free software; you can redistribute it and/or |
|
| 29 |
* modify it under the terms of the GNU General Public License |
|
| 30 |
* as published by the Free Software Foundation; either version 2 |
|
| 31 |
* of the License, or (at your option) any later version. |
|
| 32 |
* |
|
| 33 |
* WebsiteBaker is distributed in the hope that it will be useful, |
|
| 34 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 35 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
|
| 36 |
* See the GNU General Public License for more details. |
|
| 37 |
* |
|
| 38 |
* You should have received a copy of the GNU General Public License |
|
| 39 |
* along with this program; if not, write to the Free Software |
|
| 40 |
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
|
| 41 |
**************************************************************************** |
|
| 42 |
* |
|
| 43 |
* WebsiteBaker Extra Information |
|
| 44 |
* |
|
| 45 |
* Version file |
|
| 46 |
* |
|
| 47 |
* This file is where the WB release version is stored. |
|
| 48 |
* |
|
| 49 |
* |
|
| 50 |
* |
|
| 51 |
*****************************************************************************/ |
|
| 52 |
/** |
|
| 2 |
/* |
|
| 3 |
* About WebsiteBaker |
|
| 53 | 4 |
* |
| 54 |
* @category admin |
|
| 55 |
* @package version |
|
| 56 |
* @author Ryan Djurovich |
|
| 57 |
* @copyright 2004-2009, Ryan Djurovich |
|
| 58 |
* @copyright 2009-2010, Website Baker Org. e.V. |
|
| 59 |
* @version $Id$ |
|
| 60 |
* @revision $Revision$ |
|
| 61 |
* @platform WebsiteBaker 2.8.x |
|
| 62 |
* @requirements >= PHP 4.3.4 |
|
| 63 |
* @license http://www.gnu.org/licenses/gpl.html |
|
| 5 |
* Website Baker is a PHP-based Content Management System (CMS) |
|
| 6 |
* designed with one goal in mind: to enable its users to produce websites |
|
| 7 |
* with ease. |
|
| 64 | 8 |
* |
| 9 |
* LICENSE INFORMATION |
|
| 10 |
* |
|
| 11 |
* WebsiteBaker is free software; you can redistribute it and/or |
|
| 12 |
* modify it under the terms of the GNU General Public License |
|
| 13 |
* as published by the Free Software Foundation; either version 2 |
|
| 14 |
* of the License, or (at your option) any later version. |
|
| 15 |
* |
|
| 16 |
* WebsiteBaker is distributed in the hope that it will be useful, |
|
| 17 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 18 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
|
| 19 |
* See the GNU General Public License for more details. |
|
| 20 |
* |
|
| 21 |
* You should have received a copy of the GNU General Public License |
|
| 22 |
* along with this program; if not, write to the Free Software |
|
| 23 |
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
|
| 24 |
* |
|
| 25 |
* WebsiteBaker Extra Information |
|
| 26 |
* |
|
| 27 |
* This file is where the WB release version is stored. |
|
| 28 |
* |
|
| 65 | 29 |
*/ |
| 30 |
/** |
|
| 31 |
* @category admin |
|
| 32 |
* @package interface |
|
| 33 |
* @filesource $HeadURL$ |
|
| 34 |
* @author Ryan Djurovich |
|
| 35 |
* @copyright 2004-2009, Ryan Djurovich |
|
| 36 |
* |
|
| 37 |
* @author WebsiteBaker Project |
|
| 38 |
* @link http://www.websitebaker2.org/ |
|
| 39 |
* @copyright 2009-2010, Website Baker Org. e.V. |
|
| 40 |
* @link http://start.websitebaker2.org/impressum-datenschutz.php |
|
| 41 |
* @license http://www.gnu.org/licenses/gpl.html |
|
| 42 |
* @version $Id$ |
|
| 43 |
* @revision $Revision$ |
|
| 44 |
* @platform WebsiteBaker 2.8.x |
|
| 45 |
* @requirements PHP 4.3.4 and higher |
|
| 46 |
* @lastmodified $Date: $ |
|
| 47 |
* |
|
| 48 |
*/ |
|
| 66 | 49 |
|
| 67 | 50 |
if(!defined('WB_URL')) {
|
| 68 | 51 |
header('Location: ../index.php');
|
| ... | ... | |
| 71 | 54 |
|
| 72 | 55 |
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) |
| 73 | 56 |
if(!defined('VERSION')) define('VERSION', '2.8.1');
|
| 74 |
if(!defined('REVISION')) define('REVISION', '1253');
|
|
| 57 |
if(!defined('REVISION')) define('REVISION', '1254');
|
|
| 75 | 58 |
|
| 76 | 59 |
?> |
| 77 | 60 | |
| branches/2.8.x/wb/search/search.php | ||
|---|---|---|
| 1 | 1 |
<?php |
| 2 |
/**************************************************************************** |
|
| 3 |
* SVN Version information: |
|
| 2 |
/* |
|
| 4 | 3 |
* |
| 5 |
* $Id$
|
|
| 4 |
* About WebsiteBaker
|
|
| 6 | 5 |
* |
| 7 |
* |
|
| 8 |
* |
|
| 9 |
***************************************************************************** |
|
| 10 |
* WebsiteBaker |
|
| 11 |
* |
|
| 12 |
* WebsiteBaker Project <http://www.websitebaker2.org/> |
|
| 13 |
* Copyright (C) 2009, Website Baker Org. e.V. |
|
| 14 |
* http://start.websitebaker2.org/impressum-datenschutz.php |
|
| 15 |
* Copyright (C) 2004-2009, Ryan Djurovich |
|
| 16 |
* |
|
| 17 |
* About WebsiteBaker |
|
| 18 |
* |
|
| 19 | 6 |
* Website Baker is a PHP-based Content Management System (CMS) |
| 20 | 7 |
* designed with one goal in mind: to enable its users to produce websites |
| 21 | 8 |
* with ease. |
| 22 | 9 |
* |
| 23 |
*****************************************************************************
|
|
| 10 |
* LICENSE INFORMATION
|
|
| 24 | 11 |
* |
| 25 |
***************************************************************************** |
|
| 26 |
* LICENSE INFORMATION |
|
| 27 |
* |
|
| 28 | 12 |
* WebsiteBaker is free software; you can redistribute it and/or |
| 29 | 13 |
* modify it under the terms of the GNU General Public License |
| 30 | 14 |
* as published by the Free Software Foundation; either version 2 |
| ... | ... | |
| 38 | 22 |
* You should have received a copy of the GNU General Public License |
| 39 | 23 |
* along with this program; if not, write to the Free Software |
| 40 | 24 |
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
| 41 |
**************************************************************************** |
|
| 42 | 25 |
* |
| 43 | 26 |
* WebsiteBaker Extra Information |
| 44 | 27 |
* |
| 45 | 28 |
* |
| 46 |
* |
|
| 47 |
* |
|
| 48 |
* |
|
| 49 |
* |
|
| 50 |
* |
|
| 51 |
*****************************************************************************/ |
|
| 29 |
*/ |
|
| 52 | 30 |
/** |
| 53 | 31 |
* |
| 54 |
* @category frontend |
|
| 55 |
* @package account |
|
| 56 |
* @author Ryan Djurovich |
|
| 57 |
* @copyright 2004-2009, Ryan Djurovich |
|
| 58 |
* @copyright 2009-2010, Website Baker Org. e.V. |
|
| 59 |
* @version $Id$ |
|
| 60 |
* @platform WebsiteBaker 2.8.x |
|
| 61 |
* @requirements >= PHP 4.3.4 |
|
| 62 |
* @license http://www.gnu.org/licenses/gpl.html |
|
| 32 |
* @category frontend |
|
| 33 |
* @package search |
|
| 34 |
* @filesource $HeadURL$ |
|
| 35 |
* @author Ryan Djurovich |
|
| 36 |
* @copyright 2004-2009, Ryan Djurovich |
|
| 63 | 37 |
* |
| 38 |
* @author WebsiteBaker Project |
|
| 39 |
* @link http://www.websitebaker2.org/ |
|
| 40 |
* @copyright 2009-2010, Website Baker Org. e.V. |
|
| 41 |
* @link http://start.websitebaker2.org/impressum-datenschutz.php |
|
| 42 |
* @license http://www.gnu.org/licenses/gpl.html |
|
| 43 |
* @version $Id$ |
|
| 44 |
* @platform WebsiteBaker 2.8.x |
|
| 45 |
* @requirements PHP 4.3.4 and higher |
|
| 46 |
* @lastmodified $Date: $ |
|
| 47 |
* |
|
| 64 | 48 |
*/ |
| 65 | 49 |
|
| 66 | 50 |
if(!defined('WB_URL')) {
|
| ... | ... | |
| 235 | 219 |
$search_display_string = ''; // for displaying |
| 236 | 220 |
$search_url_string = ''; // for $_GET -- ATTN: unquoted! Will become urldecoded later |
| 237 | 221 |
$string = ''; |
| 238 |
if(isset($_REQUEST['string'])) {
|
|
| 239 |
if($match!='exact') { // $string will be cleaned below
|
|
| 222 |
if(isset($_REQUEST['string'])) |
|
| 223 |
{
|
|
| 224 |
if($match!='exact') // $string will be cleaned below |
|
| 225 |
{
|
|
| 240 | 226 |
$string=str_replace(',', '', $_REQUEST['string']);
|
| 241 | 227 |
} else {
|
| 242 | 228 |
$string=$_REQUEST['string']; |
| 243 | 229 |
} |
| 244 |
// redo possible magic quotes
|
|
| 245 |
$string = $wb->strip_slashes($string);
|
|
| 246 |
$string = preg_replace('/\s+/', ' ', $string);
|
|
| 247 |
$string = trim($string);
|
|
| 230 |
// redo possible magic quotes
|
|
| 231 |
$string = $wb->strip_slashes($string);
|
|
| 232 |
$string = preg_replace('/[ \r\n\t]+/', ' ', $string);
|
|
| 233 |
$string = trim($string);
|
|
| 248 | 234 |
// remove some bad chars |
| 249 | 235 |
$string = str_replace ( array('[[',']]'),'', $string);
|
| 250 | 236 |
$string = preg_replace('/(^|\s+)[|.]+(?=\s+|$)/', '', $string);
|
Also available in: Unified diff
Ticket #915 fix bug in search (utf-8 characters corrupted)(thanks to Thorn)