summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--modules/aggregator.module2
-rw-r--r--modules/aggregator/aggregator.module2
-rw-r--r--modules/blog.module14
-rw-r--r--modules/blog/blog.module14
-rw-r--r--modules/blogapi.module2
-rw-r--r--modules/blogapi/blogapi.module2
-rw-r--r--modules/page.module8
-rw-r--r--modules/page/page.module8
-rw-r--r--modules/story.module8
-rw-r--r--modules/story/story.module8
10 files changed, 34 insertions, 34 deletions
diff --git a/modules/aggregator.module b/modules/aggregator.module
index 7a8983c78..16b12d464 100644
--- a/modules/aggregator.module
+++ b/modules/aggregator.module
@@ -1009,7 +1009,7 @@ function theme_aggregator_feed($feed) {
function theme_aggregator_block_item($item, $feed = 0) {
global $user;
- if ($user->uid && module_exist('blog') && user_access('maintain personal blog')) {
+ if ($user->uid && module_exist('blog') && user_access('edit own blog')) {
$output .= '<div class="icon">'. l('<img src="'. theme('image', 'blog.png') .'" alt="'. t('blog it') .'" title="'. t('blog it') .'" />', 'node/add/blog', array('title' => t('Comment on this news item in your personal blog.'), 'class' => 'blog-it'), "iid=$item->iid") .'</div>';
}
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index 7a8983c78..16b12d464 100644
--- a/modules/aggregator/aggregator.module
+++ b/modules/aggregator/aggregator.module
@@ -1009,7 +1009,7 @@ function theme_aggregator_feed($feed) {
function theme_aggregator_block_item($item, $feed = 0) {
global $user;
- if ($user->uid && module_exist('blog') && user_access('maintain personal blog')) {
+ if ($user->uid && module_exist('blog') && user_access('edit own blog')) {
$output .= '<div class="icon">'. l('<img src="'. theme('image', 'blog.png') .'" alt="'. t('blog it') .'" title="'. t('blog it') .'" />', 'node/add/blog', array('title' => t('Comment on this news item in your personal blog.'), 'class' => 'blog-it'), "iid=$item->iid") .'</div>';
}
diff --git a/modules/blog.module b/modules/blog.module
index d49a55de6..d83b7a126 100644
--- a/modules/blog.module
+++ b/modules/blog.module
@@ -21,7 +21,7 @@ function blog_node_name($node) {
* Implementation of hook_perm().
*/
function blog_perm() {
- return array('maintain personal blog');
+ return array('edit own blog');
}
/**
@@ -35,15 +35,15 @@ function blog_access($op, $node) {
}
if ($op == 'create') {
- return user_access('maintain personal blog') && $user->uid;
+ return user_access('edit own blog') && $user->uid;
}
if ($op == 'update') {
- return user_access('maintain personal blog') && ($user->uid == $node->uid);
+ return user_access('edit own blog') && ($user->uid == $node->uid);
}
if ($op == 'delete') {
- return user_access('maintain personal blog') && ($user->uid == $node->uid);
+ return user_access('edit own blog') && ($user->uid == $node->uid);
}
}
@@ -52,7 +52,7 @@ function blog_access($op, $node) {
* Implementation of hook_user().
*/
function blog_user($type, &$edit, &$user) {
- if ($type == 'view' && user_access('maintain personal blog', $user)) {
+ if ($type == 'view' && user_access('edit own blog', $user)) {
return array(t('History') => form_item(t('Blog'), l(t('view recent blog entries'), "blog/$user->uid", array('title' => t("Read %username's latest blog entries.", array('%username' => $user->name))))));
}
}
@@ -268,13 +268,13 @@ function blog_menu() {
$items = array();
$items[] = array('path' => 'node/add/blog', 'title' => t('blog entry'),
- 'access' => user_access('maintain personal blog'));
+ 'access' => user_access('edit own blog'));
$items[] = array('path' => 'blog', 'title' => t('blogs'),
'callback' => 'blog_page',
'access' => user_access('access content'),
'type' => MENU_SUGGESTED_ITEM);
$items[] = array('path' => 'blog/'. $user->uid, 'title' => t('my blog'),
- 'access' => user_access('maintain personal blog'),
+ 'access' => user_access('edit own blog'),
'type' => MENU_DYNAMIC_ITEM);
$items[] = array('path' => 'blog/feed', 'title' => t('RSS feed'),
'callback' => 'blog_feed',
diff --git a/modules/blog/blog.module b/modules/blog/blog.module
index d49a55de6..d83b7a126 100644
--- a/modules/blog/blog.module
+++ b/modules/blog/blog.module
@@ -21,7 +21,7 @@ function blog_node_name($node) {
* Implementation of hook_perm().
*/
function blog_perm() {
- return array('maintain personal blog');
+ return array('edit own blog');
}
/**
@@ -35,15 +35,15 @@ function blog_access($op, $node) {
}
if ($op == 'create') {
- return user_access('maintain personal blog') && $user->uid;
+ return user_access('edit own blog') && $user->uid;
}
if ($op == 'update') {
- return user_access('maintain personal blog') && ($user->uid == $node->uid);
+ return user_access('edit own blog') && ($user->uid == $node->uid);
}
if ($op == 'delete') {
- return user_access('maintain personal blog') && ($user->uid == $node->uid);
+ return user_access('edit own blog') && ($user->uid == $node->uid);
}
}
@@ -52,7 +52,7 @@ function blog_access($op, $node) {
* Implementation of hook_user().
*/
function blog_user($type, &$edit, &$user) {
- if ($type == 'view' && user_access('maintain personal blog', $user)) {
+ if ($type == 'view' && user_access('edit own blog', $user)) {
return array(t('History') => form_item(t('Blog'), l(t('view recent blog entries'), "blog/$user->uid", array('title' => t("Read %username's latest blog entries.", array('%username' => $user->name))))));
}
}
@@ -268,13 +268,13 @@ function blog_menu() {
$items = array();
$items[] = array('path' => 'node/add/blog', 'title' => t('blog entry'),
- 'access' => user_access('maintain personal blog'));
+ 'access' => user_access('edit own blog'));
$items[] = array('path' => 'blog', 'title' => t('blogs'),
'callback' => 'blog_page',
'access' => user_access('access content'),
'type' => MENU_SUGGESTED_ITEM);
$items[] = array('path' => 'blog/'. $user->uid, 'title' => t('my blog'),
- 'access' => user_access('maintain personal blog'),
+ 'access' => user_access('edit own blog'),
'type' => MENU_DYNAMIC_ITEM);
$items[] = array('path' => 'blog/feed', 'title' => t('RSS feed'),
'callback' => 'blog_feed',
diff --git a/modules/blogapi.module b/modules/blogapi.module
index 7f38508ee..9218e8fb3 100644
--- a/modules/blogapi.module
+++ b/modules/blogapi.module
@@ -424,7 +424,7 @@ function blogapi_validate_user($username, $password) {
$user = user_load(array('name' => $username, 'pass' => $password, 'status' => 1));
if ($user->uid) {
- if (user_access('maintain personal blog')) {
+ if (user_access('edit own blog')) {
return $user;
}
else {
diff --git a/modules/blogapi/blogapi.module b/modules/blogapi/blogapi.module
index 7f38508ee..9218e8fb3 100644
--- a/modules/blogapi/blogapi.module
+++ b/modules/blogapi/blogapi.module
@@ -424,7 +424,7 @@ function blogapi_validate_user($username, $password) {
$user = user_load(array('name' => $username, 'pass' => $password, 'status' => 1));
if ($user->uid) {
- if (user_access('maintain personal blog')) {
+ if (user_access('edit own blog')) {
return $user;
}
else {
diff --git a/modules/page.module b/modules/page.module
index b5f742be4..7babfbcf5 100644
--- a/modules/page.module
+++ b/modules/page.module
@@ -12,7 +12,7 @@ function page_help($section) {
<p>If you enable the <strong>create PHP content</strong> permission for a role, pages may consist of PHP code in addition to HTML and text.</p>
<h3>User access permissions for pages</h3>
<p><strong>create pages:</strong> Allows a role to create pages. They cannot edit or delete pages, even if they are the authors. You must enable this permission to in order for a role to create a page.</p>
- <p><strong>maintain personal pages:</strong> Allows a role to add/edit pages if they own the page. Use this permission if you want users to be able to edit and maintain their own pages.</p>
+ <p><strong>edit own pages:</strong> Allows a role to add/edit pages if they own the page. Use this permission if you want users to be able to edit and maintain their own pages.</p>
");
case 'admin/modules#description':
return t('Enables the creation of pages that can be added to the navigation system.');
@@ -25,7 +25,7 @@ function page_help($section) {
* Implementation of hook_perm().
*/
function page_perm() {
- return array('create pages', 'maintain personal pages');
+ return array('create pages', 'edit own pages');
}
/**
@@ -50,11 +50,11 @@ function page_access($op, $node) {
}
if ($op == 'update') {
- return user_access('maintain personal pages') && ($user->uid == $node->uid);
+ return user_access('edit own pages') && ($user->uid == $node->uid);
}
if ($op == 'delete') {
- return user_access('maintain personal pages') && ($user->uid == $node->uid);
+ return user_access('edit own pages') && ($user->uid == $node->uid);
}
}
diff --git a/modules/page/page.module b/modules/page/page.module
index b5f742be4..7babfbcf5 100644
--- a/modules/page/page.module
+++ b/modules/page/page.module
@@ -12,7 +12,7 @@ function page_help($section) {
<p>If you enable the <strong>create PHP content</strong> permission for a role, pages may consist of PHP code in addition to HTML and text.</p>
<h3>User access permissions for pages</h3>
<p><strong>create pages:</strong> Allows a role to create pages. They cannot edit or delete pages, even if they are the authors. You must enable this permission to in order for a role to create a page.</p>
- <p><strong>maintain personal pages:</strong> Allows a role to add/edit pages if they own the page. Use this permission if you want users to be able to edit and maintain their own pages.</p>
+ <p><strong>edit own pages:</strong> Allows a role to add/edit pages if they own the page. Use this permission if you want users to be able to edit and maintain their own pages.</p>
");
case 'admin/modules#description':
return t('Enables the creation of pages that can be added to the navigation system.');
@@ -25,7 +25,7 @@ function page_help($section) {
* Implementation of hook_perm().
*/
function page_perm() {
- return array('create pages', 'maintain personal pages');
+ return array('create pages', 'edit own pages');
}
/**
@@ -50,11 +50,11 @@ function page_access($op, $node) {
}
if ($op == 'update') {
- return user_access('maintain personal pages') && ($user->uid == $node->uid);
+ return user_access('edit own pages') && ($user->uid == $node->uid);
}
if ($op == 'delete') {
- return user_access('maintain personal pages') && ($user->uid == $node->uid);
+ return user_access('edit own pages') && ($user->uid == $node->uid);
}
}
diff --git a/modules/story.module b/modules/story.module
index 2d8357bc1..fced1d355 100644
--- a/modules/story.module
+++ b/modules/story.module
@@ -16,7 +16,7 @@ function story_help($section) {
In <a href=\"%story-config\">administer &raquo; settings &raquo; story</a> you can set up an introductory text for story authors, and a floor on the number of words which may be included in a story. This is designed to help discourage the submission of trivially short stories.</p>
<h3>User access permissions for stories</h3>
<p><strong>create stories:</strong> Allows a role to create stories. They cannot edit or delete stories, even if they are the authors. You must enable this permission to in order for a role to create a story.</p>
- <p><strong>maintain personal stories:</strong> Allows a role to add/edit stories if they own the story. Use this permission if you want users to be able to edit and maintain their own stories.</p>
+ <p><strong>edit own stories:</strong> Allows a role to add/edit stories if they own the story. Use this permission if you want users to be able to edit and maintain their own stories.</p>
", array('%story-config' => url('admin/settings/story')));
case 'node/add/story':
return variable_get('story_help', '');
@@ -46,7 +46,7 @@ function story_node_name($node) {
* Implementation of hook_perm().
*/
function story_perm() {
- return array('create stories', 'maintain personal stories');
+ return array('create stories', 'edit own stories');
}
/**
@@ -64,11 +64,11 @@ function story_access($op, $node) {
}
if ($op == 'update') {
- return user_access('maintain personal stories') && ($user->uid == $node->uid);
+ return user_access('edit own stories') && ($user->uid == $node->uid);
}
if ($op == 'delete') {
- return user_access('maintain personal stories') && ($user->uid == $node->uid);
+ return user_access('edit own stories') && ($user->uid == $node->uid);
}
}
diff --git a/modules/story/story.module b/modules/story/story.module
index 2d8357bc1..fced1d355 100644
--- a/modules/story/story.module
+++ b/modules/story/story.module
@@ -16,7 +16,7 @@ function story_help($section) {
In <a href=\"%story-config\">administer &raquo; settings &raquo; story</a> you can set up an introductory text for story authors, and a floor on the number of words which may be included in a story. This is designed to help discourage the submission of trivially short stories.</p>
<h3>User access permissions for stories</h3>
<p><strong>create stories:</strong> Allows a role to create stories. They cannot edit or delete stories, even if they are the authors. You must enable this permission to in order for a role to create a story.</p>
- <p><strong>maintain personal stories:</strong> Allows a role to add/edit stories if they own the story. Use this permission if you want users to be able to edit and maintain their own stories.</p>
+ <p><strong>edit own stories:</strong> Allows a role to add/edit stories if they own the story. Use this permission if you want users to be able to edit and maintain their own stories.</p>
", array('%story-config' => url('admin/settings/story')));
case 'node/add/story':
return variable_get('story_help', '');
@@ -46,7 +46,7 @@ function story_node_name($node) {
* Implementation of hook_perm().
*/
function story_perm() {
- return array('create stories', 'maintain personal stories');
+ return array('create stories', 'edit own stories');
}
/**
@@ -64,11 +64,11 @@ function story_access($op, $node) {
}
if ($op == 'update') {
- return user_access('maintain personal stories') && ($user->uid == $node->uid);
+ return user_access('edit own stories') && ($user->uid == $node->uid);
}
if ($op == 'delete') {
- return user_access('maintain personal stories') && ($user->uid == $node->uid);
+ return user_access('edit own stories') && ($user->uid == $node->uid);
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-22 11:30:02 +0000