Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
D
drupal
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Custom Issue Tracker
Custom Issue Tracker
Labels
Merge Requests
292
Merge Requests
292
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
project
drupal
Commits
92995414
Commit
92995414
authored
Nov 08, 2003
by
Dries
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Committed stage 1 of the menu callbacks improvements. Patch by Jonathan.
parent
432852fb
Changes
20
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
57 additions
and
60 deletions
+57
-60
includes/menu.inc
includes/menu.inc
+8
-0
index.php
index.php
+24
-8
modules/admin.module
modules/admin.module
+2
-29
modules/blog.module
modules/blog.module
+2
-2
modules/blog/blog.module
modules/blog/blog.module
+2
-2
modules/book.module
modules/book.module
+1
-1
modules/book/book.module
modules/book/book.module
+1
-1
modules/forum.module
modules/forum.module
+1
-1
modules/forum/forum.module
modules/forum/forum.module
+1
-1
modules/page.module
modules/page.module
+1
-1
modules/page/page.module
modules/page/page.module
+1
-1
modules/poll.module
modules/poll.module
+1
-1
modules/poll/poll.module
modules/poll/poll.module
+1
-1
modules/queue.module
modules/queue.module
+1
-1
modules/story.module
modules/story.module
+1
-1
modules/story/story.module
modules/story/story.module
+1
-1
modules/tracker.module
modules/tracker.module
+1
-1
modules/tracker/tracker.module
modules/tracker/tracker.module
+1
-1
modules/user.module
modules/user.module
+3
-3
modules/user/user.module
modules/user/user.module
+3
-3
No files found.
includes/menu.inc
View file @
92995414
...
...
@@ -110,6 +110,14 @@ function menu_execute_active_handler() {
}
}
function
menu_active_handler_exists
()
{
global
$_list
;
$path
=
menu_get_active_item
();
return
function_exists
(
$_list
[
$path
][
"callback"
]);
}
/**
* Returns true when the path is in the active trail.
*/
...
...
index.php
View file @
92995414
...
...
@@ -9,18 +9,34 @@
menu_build
(
"system"
);
$mod
=
arg
(
0
);
if
(
isset
(
$mod
)
&&
module_hook
(
$mod
,
"page"
))
{
module_invoke
(
$mod
,
"page"
);
if
(
menu_active_handler_exists
())
{
$breadcrumb
=
menu_get_active_breadcrumb
();
array_pop
(
$breadcrumb
);
$title
=
menu_get_active_title
();
theme
(
"header"
);
theme
(
"breadcrumb"
,
$breadcrumb
);
if
(
$help
=
menu_get_active_help
())
{
$contents
=
"<small>
$help
</small><hr />"
;
}
$contents
.
=
menu_execute_active_handler
();
theme
(
"box"
,
$title
,
$contents
);
theme
(
"footer"
);
}
else
{
if
(
module_hook
(
variable_get
(
"site_frontpage"
,
"node"
),
"page"
))
{
module_invoke
(
variable_get
(
"site_frontpage"
,
"node"
),
"page"
);
$mod
=
arg
(
0
);
if
(
isset
(
$mod
)
&&
module_hook
(
$mod
,
"page"
))
{
module_invoke
(
$mod
,
"page"
);
}
else
{
theme
(
"header"
);
theme
(
"footer"
);
if
(
module_hook
(
variable_get
(
"site_frontpage"
,
"node"
),
"page"
))
{
module_invoke
(
variable_get
(
"site_frontpage"
,
"node"
),
"page"
);
}
else
{
theme
(
"header"
);
theme
(
"footer"
);
}
}
}
...
...
modules/admin.module
View file @
92995414
...
...
@@ -32,36 +32,9 @@ function admin_link($type) {
}
}
function
admin_
page
()
{
function
admin_
admin
()
{
if
(
user_access
(
"access administration pages"
))
{
$title
=
menu_get_active_title
();
theme
(
"header"
,
$title
);
$contents
=
""
;
if
(
$help
=
menu_get_active_help
())
{
$contents
.
=
"<small>
$help
</small><hr />"
;
}
if
(
arg
(
1
))
{
$contents
.
=
menu_execute_active_handler
();
}
else
{
$contents
.
=
watchdog_overview
(
"actions"
);
}
$breadcrumb
=
menu_get_active_breadcrumb
();
array_pop
(
$breadcrumb
);
theme
(
"breadcrumb"
,
$breadcrumb
);
theme
(
"box"
,
$title
,
$contents
);
theme
(
"footer"
);
}
else
{
theme
(
"header"
,
t
(
"Access denied"
));
theme
(
"box"
,
t
(
"Access denied"
),
message_access
());
theme
(
"footer"
);
return
watchdog_overview
(
"actions"
);
}
}
...
...
modules/blog.module
View file @
92995414
...
...
@@ -252,10 +252,10 @@ function blog_link($type, $node = 0, $main) {
if
(
$type
==
"system"
)
{
if
(
user_access
(
"maintain personal blog"
))
{
menu
(
"node/add/blog"
,
t
(
"blog entry"
),
"
blog_
page"
,
0
);
menu
(
"node/add/blog"
,
t
(
"blog entry"
),
"page"
,
0
);
}
if
(
user_access
(
"maintain personal blog"
))
{
menu
(
"blog/"
.
$user
->
uid
,
t
(
"my blog"
),
"
user_
page"
,
1
);
menu
(
"blog/"
.
$user
->
uid
,
t
(
"my blog"
),
"page"
,
1
);
}
}
...
...
modules/blog/blog.module
View file @
92995414
...
...
@@ -252,10 +252,10 @@ function blog_link($type, $node = 0, $main) {
if
(
$type
==
"system"
)
{
if
(
user_access
(
"maintain personal blog"
))
{
menu
(
"node/add/blog"
,
t
(
"blog entry"
),
"
blog_
page"
,
0
);
menu
(
"node/add/blog"
,
t
(
"blog entry"
),
"page"
,
0
);
}
if
(
user_access
(
"maintain personal blog"
))
{
menu
(
"blog/"
.
$user
->
uid
,
t
(
"my blog"
),
"
user_
page"
,
1
);
menu
(
"blog/"
.
$user
->
uid
,
t
(
"my blog"
),
"page"
,
1
);
}
}
...
...
modules/book.module
View file @
92995414
...
...
@@ -71,7 +71,7 @@ function book_link($type, $node = 0, $main = 0) {
if
(
$type
==
"system"
)
{
if
(
user_access
(
"maintain books"
))
{
menu
(
"node/add/book"
,
t
(
"book page"
),
"
book_
page"
,
0
);
menu
(
"node/add/book"
,
t
(
"book page"
),
"page"
,
0
);
}
if
(
user_access
(
"administer nodes"
))
{
menu
(
"admin/node/book"
,
t
(
"books"
),
"book_admin"
,
4
);
...
...
modules/book/book.module
View file @
92995414
...
...
@@ -71,7 +71,7 @@ function book_link($type, $node = 0, $main = 0) {
if
(
$type
==
"system"
)
{
if
(
user_access
(
"maintain books"
))
{
menu
(
"node/add/book"
,
t
(
"book page"
),
"
book_
page"
,
0
);
menu
(
"node/add/book"
,
t
(
"book page"
),
"page"
,
0
);
}
if
(
user_access
(
"administer nodes"
))
{
menu
(
"admin/node/book"
,
t
(
"books"
),
"book_admin"
,
4
);
...
...
modules/forum.module
View file @
92995414
...
...
@@ -94,7 +94,7 @@ function forum_link($type, $node = 0, $main = 0) {
}
if
(
$type
==
"system"
&&
user_access
(
"create forum topics"
))
{
menu
(
"node/add/forum"
,
t
(
"forum topic"
),
"
forum_
page"
);
menu
(
"node/add/forum"
,
t
(
"forum topic"
),
"page"
);
}
if
(
!
$main
&&
$type
==
"node"
&&
$node
->
type
==
"forum"
)
{
...
...
modules/forum/forum.module
View file @
92995414
...
...
@@ -94,7 +94,7 @@ function forum_link($type, $node = 0, $main = 0) {
}
if
(
$type
==
"system"
&&
user_access
(
"create forum topics"
))
{
menu
(
"node/add/forum"
,
t
(
"forum topic"
),
"
forum_
page"
);
menu
(
"node/add/forum"
,
t
(
"forum topic"
),
"page"
);
}
if
(
!
$main
&&
$type
==
"node"
&&
$node
->
type
==
"forum"
)
{
...
...
modules/page.module
View file @
92995414
...
...
@@ -89,7 +89,7 @@ function page_link($type) {
if
(
$type
==
"system"
)
{
if
(
user_access
(
"maintain static pages"
))
{
menu
(
"node/add/page"
,
t
(
"static page"
),
"page
_page
"
,
0
);
menu
(
"node/add/page"
,
t
(
"static page"
),
"page"
,
0
);
}
}
...
...
modules/page/page.module
View file @
92995414
...
...
@@ -89,7 +89,7 @@ function page_link($type) {
if
(
$type
==
"system"
)
{
if
(
user_access
(
"maintain static pages"
))
{
menu
(
"node/add/page"
,
t
(
"static page"
),
"page
_page
"
,
0
);
menu
(
"node/add/page"
,
t
(
"static page"
),
"page"
,
0
);
}
}
...
...
modules/poll.module
View file @
92995414
...
...
@@ -182,7 +182,7 @@ function poll_link($type, $node = 0, $main) {
if
(
$type
==
"system"
)
{
if
(
user_access
(
"create polls"
))
{
menu
(
"node/add/poll"
,
t
(
"poll"
),
"p
oll_p
age"
,
0
);
menu
(
"node/add/poll"
,
t
(
"poll"
),
"page"
,
0
);
}
}
else
if
(
$type
==
"page"
&&
user_access
(
"access content"
))
{
...
...
modules/poll/poll.module
View file @
92995414
...
...
@@ -182,7 +182,7 @@ function poll_link($type, $node = 0, $main) {
if
(
$type
==
"system"
)
{
if
(
user_access
(
"create polls"
))
{
menu
(
"node/add/poll"
,
t
(
"poll"
),
"p
oll_p
age"
,
0
);
menu
(
"node/add/poll"
,
t
(
"poll"
),
"page"
,
0
);
}
}
else
if
(
$type
==
"page"
&&
user_access
(
"access content"
))
{
...
...
modules/queue.module
View file @
92995414
...
...
@@ -35,7 +35,7 @@ function queue_perm() {
function
queue_link
(
$type
)
{
if
(
$type
==
"system"
)
{
if
(
user_access
(
"access submission queue"
))
{
menu
(
"queue"
,
t
(
"view submissions"
),
"
queue_
page"
,
1
);
menu
(
"queue"
,
t
(
"view submissions"
),
"page"
,
1
);
}
}
...
...
modules/story.module
View file @
92995414
...
...
@@ -53,7 +53,7 @@ function story_link($type) {
if
(
$type
==
"system"
)
{
if
(
user_access
(
"create stories"
))
{
menu
(
"node/add/story"
,
t
(
"story"
),
"
story_
page"
,
0
);
menu
(
"node/add/story"
,
t
(
"story"
),
"page"
,
0
);
}
}
...
...
modules/story/story.module
View file @
92995414
...
...
@@ -53,7 +53,7 @@ function story_link($type) {
if
(
$type
==
"system"
)
{
if
(
user_access
(
"create stories"
))
{
menu
(
"node/add/story"
,
t
(
"story"
),
"
story_
page"
,
0
);
menu
(
"node/add/story"
,
t
(
"story"
),
"page"
,
0
);
}
}
...
...
modules/tracker.module
View file @
92995414
...
...
@@ -22,7 +22,7 @@ function tracker_link($type) {
if
(
$type
==
"system"
)
{
if
(
user_access
(
"access content"
))
{
menu
(
"tracker"
,
t
(
"recent posts"
),
"
tracker_
page"
,
1
);
menu
(
"tracker"
,
t
(
"recent posts"
),
"page"
,
1
);
}
}
...
...
modules/tracker/tracker.module
View file @
92995414
...
...
@@ -22,7 +22,7 @@ function tracker_link($type) {
if
(
$type
==
"system"
)
{
if
(
user_access
(
"access content"
))
{
menu
(
"tracker"
,
t
(
"recent posts"
),
"
tracker_
page"
,
1
);
menu
(
"tracker"
,
t
(
"recent posts"
),
"page"
,
1
);
}
}
...
...
modules/user.module
View file @
92995414
...
...
@@ -496,9 +496,9 @@ function user_link($type) {
if
(
$type
==
"system"
)
{
global
$user
;
if
(
$user
->
uid
)
{
menu
(
"user"
,
t
(
"my account"
),
"
user_
page"
,
8
);
menu
(
"user/edit"
,
t
(
"edit account"
),
"
user_
page"
,
0
);
menu
(
"user/logout"
,
t
(
"log out"
),
"
user_
page"
,
10
);
menu
(
"user"
,
t
(
"my account"
),
"page"
,
8
);
menu
(
"user/edit"
,
t
(
"edit account"
),
"page"
,
0
);
menu
(
"user/logout"
,
t
(
"log out"
),
"page"
,
10
);
}
if
(
user_access
(
"administer users"
))
{
...
...
modules/user/user.module
View file @
92995414
...
...
@@ -496,9 +496,9 @@ function user_link($type) {
if
(
$type
==
"system"
)
{
global
$user
;
if
(
$user
->
uid
)
{
menu
(
"user"
,
t
(
"my account"
),
"
user_
page"
,
8
);
menu
(
"user/edit"
,
t
(
"edit account"
),
"
user_
page"
,
0
);
menu
(
"user/logout"
,
t
(
"log out"
),
"
user_
page"
,
10
);
menu
(
"user"
,
t
(
"my account"
),
"page"
,
8
);
menu
(
"user/edit"
,
t
(
"edit account"
),
"page"
,
0
);
menu
(
"user/logout"
,
t
(
"log out"
),
"page"
,
10
);
}
if
(
user_access
(
"administer users"
))
{
...
...
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