Interface fix: add config variable about rights of edition for admins [Config file modified: ].
git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@283 b3834d28-1941-0410-a4f8-b48e95affb8f
This commit is contained in:
parent
5933ad03fa
commit
715ddba1dc
3 changed files with 13 additions and 1 deletions
|
@ -30,6 +30,7 @@ $tableprefix = 'sc_'; # table prefix used for this installation. Do not use '-'
|
||||||
### Users ###
|
### Users ###
|
||||||
$adminemail = 'admin@example.org'; # Contact address for the site administrator. Used as the FROM address in password retrieval e-mails.
|
$adminemail = 'admin@example.org'; # Contact address for the site administrator. Used as the FROM address in password retrieval e-mails.
|
||||||
$admin_users = array(''); # admin users = array('adminnickname', 'user1nick', 'user2nick');
|
$admin_users = array(''); # admin users = array('adminnickname', 'user1nick', 'user2nick');
|
||||||
|
$adminsCanModifyBookmarksFromOtherUsers = true; # 'true' if admin users can edit or delete bookmarks belonging to other users. Else 'false'.
|
||||||
$reservedusers = array('all', 'watchlist'); # array of usernames that cannot be registered
|
$reservedusers = array('all', 'watchlist'); # array of usernames that cannot be registered
|
||||||
# Antispam
|
# Antispam
|
||||||
$antispamQuestion = 'name of this application (no Caps)'; # antispamQuestion: A question to avoid spam
|
$antispamQuestion = 'name of this application (no Caps)'; # antispamQuestion: A question to avoid spam
|
||||||
|
|
|
@ -107,7 +107,7 @@ class BookmarkService {
|
||||||
|
|
||||||
$userservice = & ServiceFactory :: getServiceInstance('UserService');
|
$userservice = & ServiceFactory :: getServiceInstance('UserService');
|
||||||
$userid = $userservice->getCurrentUserId();
|
$userid = $userservice->getCurrentUserId();
|
||||||
if ($userservice->isAdmin($userid))
|
if ($GLOBALS['adminsCanModifyBookmarksFromOtherUsers'] && $userservice->isAdmin($userid))
|
||||||
return true;
|
return true;
|
||||||
else
|
else
|
||||||
return ($bookmark['uId'] == $userid);
|
return ($bookmark['uId'] == $userid);
|
||||||
|
|
11
upgrade.txt
11
upgrade.txt
|
@ -1,5 +1,16 @@
|
||||||
==== UPGRADE instructions ====
|
==== UPGRADE instructions ====
|
||||||
|
|
||||||
|
=== From version 0.92 to 0.93 ===
|
||||||
|
Message: this version modifies the database to UTF-8 charset. The idea is to convert the content (through BLOB type) and then to change the tables' charsets.
|
||||||
|
|
||||||
|
- Backup you database
|
||||||
|
- Make a copy from your SemanticScuttle Web directory
|
||||||
|
- Upgrade your database by following instructions ONE after ONE (order is important) :
|
||||||
|
#NOTHING TO CHANGE IN DB
|
||||||
|
- Upgrade your current configuration file (config.inc.php) with respect to config.inc.php.example
|
||||||
|
$adminsCanModifyBookmarksFromOtherUsers = true; # 'true' if admin users can edit or delete bookmarks belonging to other users. Else 'false'.
|
||||||
|
|
||||||
|
|
||||||
=== From version 0.91 to 0.92 ===
|
=== From version 0.91 to 0.92 ===
|
||||||
Message: this version modifies the database to UTF-8 charset. The idea is to convert the content (through BLOB type) and then to change the tables' charsets.
|
Message: this version modifies the database to UTF-8 charset. The idea is to convert the content (through BLOB type) and then to change the tables' charsets.
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue