Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
drupal
Commits
8205b626
Commit
8205b626
authored
May 18, 2003
by
Dries
Browse files
- Replaced some PHP_SELF's by request_uri()'s. Patch by Gerhard.
parent
7e8aa526
Changes
4
Hide whitespace changes
Inline
Side-by-side
modules/search.module
View file @
8205b626
...
...
@@ -166,10 +166,10 @@ function do_search($search_array) {
$count
=
$value
[
"count"
];
switch
(
$type
)
{
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
;
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
;
}
}
...
...
modules/search/search.module
View file @
8205b626
...
...
@@ -166,10 +166,10 @@ function do_search($search_array) {
$count
=
$value
[
"count"
];
switch
(
$type
)
{
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
;
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
;
}
}
...
...
modules/user.module
View file @
8205b626
...
...
@@ -214,7 +214,7 @@ function user_access($string) {
** To reduce the number of SQL queries, we cache the user's permissions
** in a static variable.
*/
if
(
isset
(
$perm
))
{
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
);
...
...
@@ -289,7 +289,7 @@ function user_search($keys) {
$result
=
db_query_range
(
"SELECT * FROM users WHERE name LIKE '%
$keys
%'"
,
0
,
20
);
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
;
}
...
...
modules/user/user.module
View file @
8205b626
...
...
@@ -214,7 +214,7 @@ function user_access($string) {
** To reduce the number of SQL queries, we cache the user's permissions
** in a static variable.
*/
if
(
isset
(
$perm
))
{
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
);
...
...
@@ -289,7 +289,7 @@ function user_search($keys) {
$result
=
db_query_range
(
"SELECT * FROM users WHERE name LIKE '%
$keys
%'"
,
0
,
20
);
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
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment