Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gnu-social
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
194
Issues
194
List
Boards
Labels
Milestones
Merge Requests
12
Merge Requests
12
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gnu.io
gnu-social
Commits
13e9e41d
Commit
13e9e41d
authored
Mar 22, 2011
by
Shashi Gowda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Blend in with some new code. New menus, etc.
parent
bf121a69
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
29 additions
and
45 deletions
+29
-45
actions/editpeopletag.php
actions/editpeopletag.php
+1
-1
actions/peopletagsbyuser.php
actions/peopletagsbyuser.php
+0
-5
actions/peopletagsforuser.php
actions/peopletagsforuser.php
+0
-6
actions/peopletagsubscriptions.php
actions/peopletagsubscriptions.php
+0
-6
actions/showprofiletag.php
actions/showprofiletag.php
+1
-1
classes/Notice.php
classes/Notice.php
+27
-26
No files found.
actions/editpeopletag.php
View file @
13e9e41d
...
...
@@ -181,7 +181,7 @@ class EditpeopletagAction extends OwnerDesignAction
$this
->
showPage
();
}
function
show
Local
Nav
()
function
show
Object
Nav
()
{
$nav
=
new
PeopletagGroupNav
(
$this
,
$this
->
peopletag
);
$nav
->
show
();
...
...
actions/peopletagsbyuser.php
View file @
13e9e41d
...
...
@@ -181,11 +181,6 @@ class PeopletagsbyuserAction extends OwnerDesignAction
$this
->
elementEnd
(
'dd'
);
$this
->
elementEnd
(
'dl'
);
}
function
showLocalNav
()
{
$nav
=
new
PersonalGroupNav
(
$this
);
$nav
->
show
();
}
function
showAnonymousMessage
()
{
...
...
actions/peopletagsforuser.php
View file @
13e9e41d
...
...
@@ -95,12 +95,6 @@ class PeopletagsforuserAction extends OwnerDesignAction
$this
->
showPage
();
}
function
showLocalNav
()
{
$nav
=
new
PersonalGroupNav
(
$this
);
$nav
->
show
();
}
function
showAnonymousMessage
()
{
$notice
=
...
...
actions/peopletagsubscriptions.php
View file @
13e9e41d
...
...
@@ -95,12 +95,6 @@ class PeopletagsubscriptionsAction extends OwnerDesignAction
$this
->
showPage
();
}
function
showLocalNav
()
{
$nav
=
new
PersonalGroupNav
(
$this
);
$nav
->
show
();
}
function
showAnonymousMessage
()
{
$notice
=
...
...
actions/showprofiletag.php
View file @
13e9e41d
...
...
@@ -179,7 +179,7 @@ class ShowprofiletagAction extends Action
);
}
function
show
Local
Nav
()
function
show
Object
Nav
()
{
$nav
=
new
PeopletagGroupNav
(
$this
);
$nav
->
show
();
...
...
classes/Notice.php
View file @
13e9e41d
...
...
@@ -871,38 +871,39 @@ class Notice extends Memcached_DataObject
}
}
foreach
(
$ptags
as
$ptag
)
{
$users
=
$ptag
->
getUserSubscribers
();
foreach
(
$users
as
$id
)
{
if
(
!
array_key_exists
(
$id
,
$ni
))
{
$user
=
User
::
staticGet
(
'id'
,
$id
);
if
(
!
$user
->
hasBlocked
(
$profile
))
{
$ni
[
$id
]
=
NOTICE_INBOX_SOURCE_PROFILE_TAG
;
foreach
(
$ptags
as
$ptag
)
{
$users
=
$ptag
->
getUserSubscribers
();
foreach
(
$users
as
$id
)
{
if
(
!
array_key_exists
(
$id
,
$ni
))
{
$user
=
User
::
staticGet
(
'id'
,
$id
);
if
(
!
$user
->
hasBlocked
(
$profile
))
{
$ni
[
$id
]
=
NOTICE_INBOX_SOURCE_PROFILE_TAG
;
}
}
}
}
}
foreach
(
$recipients
as
$recipient
)
{
if
(
!
array_key_exists
(
$recipient
,
$ni
))
{
$ni
[
$recipient
]
=
NOTICE_INBOX_SOURCE_REPLY
;
}
foreach
(
$recipients
as
$recipient
)
{
if
(
!
array_key_exists
(
$recipient
,
$ni
))
{
$ni
[
$recipient
]
=
NOTICE_INBOX_SOURCE_REPLY
;
}
// Exclude any deleted, non-local, or blocking recipients.
$profile
=
$this
->
getProfile
();
$originalProfile
=
null
;
if
(
$this
->
repeat_of
)
{
// Check blocks against the original notice's poster as well.
$original
=
Notice
::
staticGet
(
'id'
,
$this
->
repeat_of
);
if
(
$original
)
{
$originalProfile
=
$original
->
getProfile
();
// Exclude any deleted, non-local, or blocking recipients.
$profile
=
$this
->
getProfile
();
$originalProfile
=
null
;
if
(
$this
->
repeat_of
)
{
// Check blocks against the original notice's poster as well.
$original
=
Notice
::
staticGet
(
'id'
,
$this
->
repeat_of
);
if
(
$original
)
{
$originalProfile
=
$original
->
getProfile
();
}
}
}
foreach
(
$ni
as
$id
=>
$source
)
{
$user
=
User
::
staticGet
(
'id'
,
$id
);
if
(
empty
(
$user
)
||
$user
->
hasBlocked
(
$profile
)
||
(
$originalProfile
&&
$user
->
hasBlocked
(
$originalProfile
)))
{
unset
(
$ni
[
$id
]);
foreach
(
$ni
as
$id
=>
$source
)
{
$user
=
User
::
staticGet
(
'id'
,
$id
);
if
(
empty
(
$user
)
||
$user
->
hasBlocked
(
$profile
)
||
(
$originalProfile
&&
$user
->
hasBlocked
(
$originalProfile
)))
{
unset
(
$ni
[
$id
]);
}
}
}
...
...
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