From: Nyloth <ny...@ti...> - 2011-01-27 09:28:12
|
+1 Nyloth 2011/1/20 Pascal Kustner <pa...@ku...> > +1 > > pkdille > > 2011/1/4 <lph...@us...> > > Revision: 31751 >> http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31751&view=rev >> Author: lphuberdeau >> Date: 2011-01-04 18:14:10 +0000 (Tue, 04 Jan 2011) >> >> Log Message: >> ----------- >> [FIX]?\194?\160Preserve admin rights on user pages and prevent the user >> page prefix from being empty (which breaks new page creation) [bp/31750] >> >> Modified Paths: >> -------------- >> branches/proposals/6.x/lib/prefs/feature.php >> branches/proposals/6.x/lib/tikilib.php >> >> Modified: branches/proposals/6.x/lib/prefs/feature.php >> =================================================================== >> --- branches/proposals/6.x/lib/prefs/feature.php 2011-01-04 >> 17:58:40 UTC (rev 31750) >> +++ branches/proposals/6.x/lib/prefs/feature.php 2011-01-04 >> 18:14:10 UTC (rev 31751) >> @@ -1569,10 +1569,12 @@ >> ), >> 'feature_wiki_userpage' => array( >> 'name' => tra("User's page"), >> + 'description' => tra('A personal page for the user >> to manage.'), >> 'type' => 'flag', >> ), >> 'feature_wiki_userpage_prefix' => array( >> 'name' => tra('UserPage prefix'), >> + 'description' => tra('All user pages share a >> common prefix. The concatenation of the prefix and the username will >> generate the page name. The prefix cannot be empty.'), >> 'type' => 'text', >> 'size' => '40', >> ), >> >> Modified: branches/proposals/6.x/lib/tikilib.php >> =================================================================== >> --- branches/proposals/6.x/lib/tikilib.php 2011-01-04 17:58:40 UTC >> (rev 31750) >> +++ branches/proposals/6.x/lib/tikilib.php 2011-01-04 18:14:10 UTC >> (rev 31751) >> @@ -3731,9 +3731,12 @@ >> } >> } >> >> - $ret2 = $this->get_local_perms($user, $objectId, >> $objectType, $info, true); >> - if ($ret2) { >> - $ret = $ret2; >> + // Skip those 'local' permissions for admin users and when >> global is not requested. >> + if ($global && ! Perms::get()->admin) { >> + $ret2 = $this->get_local_perms($user, $objectId, >> $objectType, $info, true); >> + if ($ret2) { >> + $ret = $ret2; >> + } >> } >> >> return $ret; >> @@ -3826,7 +3829,8 @@ >> } >> return $ret; >> } >> - if ($prefs['feature_wiki_userpage'] == 'y' >> && !empty($user) && strcasecmp($prefs['feature_wiki_userpage_prefix'], >> substr($objectId, 0, strlen($prefs['feature_wiki_userpage_prefix']))) == 0) >> { >> + // Enabling userpage is not enough, the >> prefix must be present, otherwise, permissions will be messed-up on new page >> creation >> + if ($prefs['feature_wiki_userpage'] == 'y' >> && !empty($prefs['feature_wiki_userpage_prefix']) && !empty($user) && >> strcasecmp($prefs['feature_wiki_userpage_prefix'], substr($objectId, 0, >> strlen($prefs['feature_wiki_userpage_prefix']))) == 0) { >> if (strcasecmp($objectId, >> $prefs['feature_wiki_userpage_prefix'].$user) == 0) { //can edit his page >> if (!$global) { >> $perms = >> $userlib->get_permissions(0, -1, 'permName_desc', '', >> $this->get_permGroup_from_objectType($objectType)); >> >> >> This was sent by the SourceForge.net collaborative development platform, >> the world's largest Open Source development site. >> >> >> ------------------------------------------------------------------------------ >> Learn how Oracle Real Application Clusters (RAC) One Node allows customers >> to consolidate database storage, standardize their database environment, >> and, >> should the need arise, upgrade to a full multi-node Oracle RAC database >> without downtime or disruption >> http://p.sf.net/sfu/oracle-sfdevnl >> _______________________________________________ >> Tikiwiki-cvs mailing list >> Tik...@li... >> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs >> > > > > ------------------------------------------------------------------------------ > Protect Your Site and Customers from Malware Attacks > Learn about various malware tactics and how to avoid them. Understand > malware threats, the impact they can have on your business, and how you > can protect your company and customers by using code signing. > http://p.sf.net/sfu/oracle-sfdevnl > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > > |