Menu
▾
▴
[Tikiwiki-cvs] tiki/lib index.php,1.3,1.4 searchlib.php,1.24,1.25 tikidblib.php,1.8,1.9 tikilib.php,1.443,1.444
|
From: <dam...@us...> - 2004-05-01 01:07:07
|
Update of /cvsroot/tikiwiki/tiki/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20182/lib Modified Files: index.php searchlib.php tikidblib.php tikilib.php Log Message: damians first big merge from BRANCH to HEAD Index: index.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/lib/index.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- index.php 28 Mar 2004 07:32:35 -0000 1.3 +++ index.php 1 May 2004 01:06:27 -0000 1.4 @@ -8,7 +8,7 @@ // This redirects to the sites root to prevent directory browsing -header ("location: ../tiki-index.php"); +header ("location: ../index.php"); die; ?> Index: searchlib.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/lib/searchlib.php,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- searchlib.php 29 Mar 2004 21:26:30 -0000 1.24 +++ searchlib.php 1 May 2004 01:06:27 -0000 1.25 @@ -1,5 +1,7 @@ <?php +//test + //this script may only be included - so its better to die if called directly. if (strpos($_SERVER["SCRIPT_NAME"],basename(__FILE__)) !== false) { header("location: index.php"); Index: tikidblib.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/lib/tikidblib.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- tikidblib.php 3 Apr 2004 09:36:50 -0000 1.8 +++ tikidblib.php 1 May 2004 01:06:27 -0000 1.9 @@ -170,6 +170,11 @@ break; + case "mssql": + $query = preg_replace("/`/","",$query); + $query = preg_replace("/\?/","'?'",$query); + break; + case "sqlite": $query = preg_replace("/`/", "", $query); break; @@ -208,6 +213,7 @@ case "postgres7": case "oci8": case "sybase": + case "mssql": // Postgres needs " " around column names //preg_replace("#([A-Za-z]+)#","\"\$1\"",$sort_mode); $sort_mode = str_replace("_asc", "\" asc", $sort_mode); Index: tikilib.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/lib/tikilib.php,v retrieving revision 1.443 retrieving revision 1.444 diff -u -d -r1.443 -r1.444 --- tikilib.php 29 Apr 2004 23:33:03 -0000 1.443 +++ tikilib.php 1 May 2004 01:06:27 -0000 1.444 @@ -1442,7 +1442,7 @@ $result = $this->query($query, array( $id, $type )); // Remove individual permissions for this object if they exist $query = "delete from `users_objectpermissions` where `objectId`=? and `objectType`=?"; - $result = $this->query($query,array((int)$object,$type)); + $result = $this->query($query,array(md5($object),$type)); return true; } @@ -3884,15 +3884,15 @@ if ($feature_hotwords == 'y') { foreach ($words as $word => $url) { // \b is a word boundary, \s is a space char - $line = preg_replace("/^$word(\b)/i","<a class=\"wiki\" href=\"$url\" $hotw_nw>$word</a>$1",$line); - $line = preg_replace("/(=(\"|')[^\"']*)$word(\b)([^\"']*(\"|'))/i","$1 :::::$word$3$4",$line); - $line = preg_replace("/\s$word(\b)/i"," <a class=\"wiki\" href=\"$url\" $hotw_nw>$word</a>$1",$line); - $line = preg_replace("/:::::$word(\b)/i"," $word$1",$line); + $line = preg_replace("/(=(\"|')[^\"']*[ \n\t\r\,\;])$word([ \n\t\r\,\;][^\"']*(\"|'))/i","$1:::::$word,:::::$3",$line); + $line = preg_replace("/([ \n\t\r\,\;]|^)$word($|[ \n\t\r\,\;])/i","$1<a class=\"wiki\" href=\"$url\" $hotw_nw>$word</a>$2",$line); + $line = preg_replace("/:::::$word,:::::/i","$word",$line); } } return $line; } + //Updates a dynamic variable found in some object /*Shared*/ function update_dynamic_variable($name,$value) { $query = "delete from `tiki_dynamic_variables` where `name`=?"; @@ -4360,8 +4360,8 @@ foreach (array_unique($pages[2])as $page_parse) { if (!array_key_exists($page_parse, $words)) { if ($desc = $this->page_exists_desc($page_parse)) { - $desc = preg_replace("/([ \n\t\r\,\;]|^)([A-Z][a-z0-9_\-]+[A-Z][a-z0-9_\-]+[A-Za-z0-9\-_]*)($|[ \n\t\r\,\;\.])/s", "$1))$2(($3", $desc); - $repl = '<a title="' . $desc . '" href="tiki-index.php?page=' . urlencode($page_parse). '" class="wiki">' . $page_parse . '</a>'; + //$desc = preg_replace("/([ \n\t\r\,\;]|^)([A-Z][a-z0-9_\-]+[A-Z][a-z0-9_\-]+[A-Za-z0-9\-_]*)($|[ \n\t\r\,\;\.])/s", "$1))$2(($3", $desc); + $repl = '<a title="' . htmlspecialchars($desc) . '" href="tiki-index.php?page=' . urlencode($page_parse). '" class="wiki">' . $page_parse . '</a>'; } elseif ($feature_wiki_plurals == 'y' && $this->get_locale() == 'en_US') { # Link plural topic names to singular topic names if the plural # doesn't exist, and the language is english @@ -4375,7 +4375,7 @@ # Others, excluding ending ss like address(es) $plural_tmp = preg_replace("/([A-Za-rt-z])s$/", "$1", $plural_tmp); if($desc = $this->page_exists_desc($plural_tmp)) { - $desc = preg_replace("/([ \n\t\r\,\;]|^)([A-Z][a-z0-9_\-]+[A-Z][a-z0-9_\-]+[A-Za-z0-9\-_]*)($|[ \n\t\r\,\;\.])/s", "$1))$2(($3", $desc); + // $desc = preg_replace("/([ \n\t\r\,\;]|^)([A-Z][a-z0-9_\-]+[A-Z][a-z0-9_\-]+[A-Za-z0-9\-_]*)($|[ \n\t\r\,\;\.])/s", "$1))$2(($3", $desc); // $repl = "<a title=\"".$desc."\" href=\"tiki-index.php?page=$plural_tmp\" class=\"wiki\" title=\"spanner\">$page_parse</a>"; $repl = "<a title='".$desc."' href='tiki-index.php?page=$plural_tmp' class='wiki'>$page_parse</a>"; } else { @@ -4695,9 +4695,9 @@ } // check if we are inside a table, if so, ignore monospaced and do - // not insert <br /> - $inTable += substr_count($line, "<table"); - $inTable -= substr_count($line, "</table"); + // not insert <br/> + $inTable += substr_count(strtolower($line), "<table"); + $inTable -= substr_count(strtolower($line), "</table"); // If the first character is ' ' and we are not in pre then we are in pre global $feature_wiki_monosp; |