Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Replaced some PHP_SELF's by request_uri()'s. Patch by Gerhard.

4.2.x
Dries Buytaert 2003-05-18 20:21:35 +00:00
parent 7e8aa5268b
commit 8205b62666
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/search.module
View File

@ -166,10 +166,10 @@ function do_search($search_array) {
$count = $value["count"]; $count = $value["count"];
switch ($type) { switch ($type) {
case "node": case "node":
$find[$i++] = array("count" => $count, "title" => $title, "link" => (strstr($_SERVER["PHP_SELF"], "admin") ? url("admin/node/edit/$lno") : url("node/view/$lno")), "user" => $name, "date" => $created, "keywords" => implode("|", $words)); $find[$i++] = array("count" => $count, "title" => $title, "link" => (strstr(request_uri(), "admin") ? url("admin/node/edit/$lno") : url("node/view/$lno")), "user" => $name, "date" => $created, "keywords" => implode("|", $words));
break; break;
case "comment": case "comment":
$find[$i++] = array("count" => $count, "title" => $title, "link" => (strstr($_SERVER["PHP_SELF"], "admin") ? url("admin/comment/edit/$lno") : url("node/view/$nid#$lno")), "user" => $name, "date" => $created, "keywords" => implode("|", $words)); $find[$i++] = array("count" => $count, "title" => $title, "link" => (strstr(request_uri(), "admin") ? url("admin/comment/edit/$lno") : url("node/view/$nid#$lno")), "user" => $name, "date" => $created, "keywords" => implode("|", $words));
break; break;
} }
} }

4
modules/search/search.module
View File

@ -166,10 +166,10 @@ function do_search($search_array) {
$count = $value["count"]; $count = $value["count"];
switch ($type) { switch ($type) {
case "node": case "node":
$find[$i++] = array("count" => $count, "title" => $title, "link" => (strstr($_SERVER["PHP_SELF"], "admin") ? url("admin/node/edit/$lno") : url("node/view/$lno")), "user" => $name, "date" => $created, "keywords" => implode("|", $words)); $find[$i++] = array("count" => $count, "title" => $title, "link" => (strstr(request_uri(), "admin") ? url("admin/node/edit/$lno") : url("node/view/$lno")), "user" => $name, "date" => $created, "keywords" => implode("|", $words));
break; break;
case "comment": case "comment":
$find[$i++] = array("count" => $count, "title" => $title, "link" => (strstr($_SERVER["PHP_SELF"], "admin") ? url("admin/comment/edit/$lno") : url("node/view/$nid#$lno")), "user" => $name, "date" => $created, "keywords" => implode("|", $words)); $find[$i++] = array("count" => $count, "title" => $title, "link" => (strstr(request_uri(), "admin") ? url("admin/comment/edit/$lno") : url("node/view/$nid#$lno")), "user" => $name, "date" => $created, "keywords" => implode("|", $words));
break; break;
} }
} }

4
modules/user.module
View File

@ -214,7 +214,7 @@ function user_access($string) {
** To reduce the number of SQL queries, we cache the user's permissions ** To reduce the number of SQL queries, we cache the user's permissions
** in a static variable. ** in a static variable.
*/ */
if (isset($perm)) { if (isset($perm)) {
if ($user->uid) { if ($user->uid) {
$perm = db_result(db_query("SELECT p.perm FROM role r, permission p WHERE r.rid = p.rid AND name = '%s'", $user->role), 0); $perm = db_result(db_query("SELECT p.perm FROM role r, permission p WHERE r.rid = p.rid AND name = '%s'", $user->role), 0);
@ -289,7 +289,7 @@ function user_search($keys) {
$result = db_query_range("SELECT * FROM users WHERE name LIKE '%$keys%'", 0, 20); $result = db_query_range("SELECT * FROM users WHERE name LIKE '%$keys%'", 0, 20);
while ($account = db_fetch_object($result)) { while ($account = db_fetch_object($result)) {
$find[$i++] = array("title" => $account->name, "link" => (strstr($_SERVER["PHP_SELF"], "admin") ? url("admin/user/edit/$account->uid") : url("user/view/$account->uid")), "user" => $account->name); $find[$i++] = array("title" => $account->name, "link" => (strstr(request_uri(), "admin") ? url("admin/user/edit/$account->uid") : url("user/view/$account->uid")), "user" => $account->name);
} }
return $find; return $find;
} }

4
modules/user/user.module
View File

@ -214,7 +214,7 @@ function user_access($string) {
** To reduce the number of SQL queries, we cache the user's permissions ** To reduce the number of SQL queries, we cache the user's permissions
** in a static variable. ** in a static variable.
*/ */
if (isset($perm)) { if (isset($perm)) {
if ($user->uid) { if ($user->uid) {
$perm = db_result(db_query("SELECT p.perm FROM role r, permission p WHERE r.rid = p.rid AND name = '%s'", $user->role), 0); $perm = db_result(db_query("SELECT p.perm FROM role r, permission p WHERE r.rid = p.rid AND name = '%s'", $user->role), 0);
@ -289,7 +289,7 @@ function user_search($keys) {
$result = db_query_range("SELECT * FROM users WHERE name LIKE '%$keys%'", 0, 20); $result = db_query_range("SELECT * FROM users WHERE name LIKE '%$keys%'", 0, 20);
while ($account = db_fetch_object($result)) { while ($account = db_fetch_object($result)) {
$find[$i++] = array("title" => $account->name, "link" => (strstr($_SERVER["PHP_SELF"], "admin") ? url("admin/user/edit/$account->uid") : url("user/view/$account->uid")), "user" => $account->name); $find[$i++] = array("title" => $account->name, "link" => (strstr(request_uri(), "admin") ? url("admin/user/edit/$account->uid") : url("user/view/$account->uid")), "user" => $account->name);
} }
return $find; return $find;
} }