@@ -38,44 +38,44 @@ |
||
38 | 38 | } |
39 | 39 | |
40 | 40 | switch ($page_type) { |
41 | - case 'user': |
|
42 | - $title = elgg_echo('activity_tabs:user'); |
|
43 | - $page_filter = 'activity_tab'; |
|
44 | - |
|
45 | - $options['subject_guid'] = $id; |
|
46 | - break; |
|
47 | - case 'group': |
|
48 | - $db_prefix = elgg_get_config('dbprefix'); |
|
49 | - $title = elgg_echo('activity_tabs:group'); |
|
50 | - $page_filter = 'activity_tab'; |
|
51 | - $options['joins'] = array("JOIN {$db_prefix}entities e ON e.guid = rv.object_guid"); |
|
52 | - $options['wheres'] = array("e.container_guid = $id"); |
|
53 | - break; |
|
54 | - case 'mydept': |
|
55 | - $title = elgg_echo('activity_tabs:collection'); |
|
56 | - $page_filter = 'activity_tab'; |
|
41 | + case 'user': |
|
42 | + $title = elgg_echo('activity_tabs:user'); |
|
43 | + $page_filter = 'activity_tab'; |
|
44 | + |
|
45 | + $options['subject_guid'] = $id; |
|
46 | + break; |
|
47 | + case 'group': |
|
48 | + $db_prefix = elgg_get_config('dbprefix'); |
|
49 | + $title = elgg_echo('activity_tabs:group'); |
|
50 | + $page_filter = 'activity_tab'; |
|
51 | + $options['joins'] = array("JOIN {$db_prefix}entities e ON e.guid = rv.object_guid"); |
|
52 | + $options['wheres'] = array("e.container_guid = $id"); |
|
53 | + break; |
|
54 | + case 'mydept': |
|
55 | + $title = elgg_echo('activity_tabs:collection'); |
|
56 | + $page_filter = 'activity_tab'; |
|
57 | 57 | |
58 | - $db_prefix = elgg_get_config('dbprefix'); |
|
59 | - $dept = elgg_get_logged_in_user_entity()->department; |
|
60 | - $options['joins'] = array("INNER JOIN {$db_prefix}metadata md ON md.entity_guid = rv.subject_guid LEFT JOIN {$db_prefix}metastrings msn ON md.name_id = msn.id LEFT JOIN {$db_prefix}metastrings msv ON md.value_id = msv.id"); // we need this to filter by metadata |
|
61 | - $options['wheres'] = array("msn.string = \"department\" AND msv.string LIKE \"{$dept}\""); |
|
62 | - break; |
|
63 | - case 'otherdept': |
|
64 | - $title = elgg_echo('activity_tabs:collection'); |
|
65 | - $page_filter = 'activity_tab'; |
|
66 | - |
|
67 | - $db_prefix = elgg_get_config('dbprefix'); |
|
68 | - $dept = elgg_get_logged_in_user_entity()->department; |
|
69 | - $options['joins'] = array("INNER JOIN {$db_prefix}metadata md ON md.entity_guid = rv.subject_guid LEFT JOIN {$db_prefix}metastrings msn ON md.name_id = msn.id LEFT JOIN {$db_prefix}metastrings msv ON md.value_id = msv.id"); // we need this to filter by metadata |
|
70 | - $options['wheres'] = array("msn.string = \"department\" AND msv.string NOT LIKE \"{$dept}\""); |
|
71 | - break; |
|
72 | - case 'collection': |
|
73 | - default: |
|
74 | - $title = elgg_echo('activity_tabs:collection'); |
|
75 | - $page_filter = 'activity_tab'; |
|
76 | - |
|
77 | - $options['subject_guid'] = $members; |
|
78 | - break; |
|
58 | + $db_prefix = elgg_get_config('dbprefix'); |
|
59 | + $dept = elgg_get_logged_in_user_entity()->department; |
|
60 | + $options['joins'] = array("INNER JOIN {$db_prefix}metadata md ON md.entity_guid = rv.subject_guid LEFT JOIN {$db_prefix}metastrings msn ON md.name_id = msn.id LEFT JOIN {$db_prefix}metastrings msv ON md.value_id = msv.id"); // we need this to filter by metadata |
|
61 | + $options['wheres'] = array("msn.string = \"department\" AND msv.string LIKE \"{$dept}\""); |
|
62 | + break; |
|
63 | + case 'otherdept': |
|
64 | + $title = elgg_echo('activity_tabs:collection'); |
|
65 | + $page_filter = 'activity_tab'; |
|
66 | + |
|
67 | + $db_prefix = elgg_get_config('dbprefix'); |
|
68 | + $dept = elgg_get_logged_in_user_entity()->department; |
|
69 | + $options['joins'] = array("INNER JOIN {$db_prefix}metadata md ON md.entity_guid = rv.subject_guid LEFT JOIN {$db_prefix}metastrings msn ON md.name_id = msn.id LEFT JOIN {$db_prefix}metastrings msv ON md.value_id = msv.id"); // we need this to filter by metadata |
|
70 | + $options['wheres'] = array("msn.string = \"department\" AND msv.string NOT LIKE \"{$dept}\""); |
|
71 | + break; |
|
72 | + case 'collection': |
|
73 | + default: |
|
74 | + $title = elgg_echo('activity_tabs:collection'); |
|
75 | + $page_filter = 'activity_tab'; |
|
76 | + |
|
77 | + $options['subject_guid'] = $members; |
|
78 | + break; |
|
79 | 79 | } |
80 | 80 | |
81 | 81 | $options['no_results'] = elgg_echo('river:none'); |
@@ -38,44 +38,44 @@ |
||
38 | 38 | } |
39 | 39 | |
40 | 40 | switch ($page_type) { |
41 | - case 'user': |
|
42 | - $title = elgg_echo('activity_tabs:user'); |
|
43 | - $page_filter = 'activity_tab'; |
|
44 | - |
|
45 | - $options['subject_guid'] = $id; |
|
46 | - break; |
|
47 | - case 'group': |
|
48 | - $db_prefix = elgg_get_config('dbprefix'); |
|
49 | - $title = elgg_echo('activity_tabs:group'); |
|
50 | - $page_filter = 'activity_tab'; |
|
51 | - $options['joins'] = array("JOIN {$db_prefix}entities e ON e.guid = rv.object_guid"); |
|
52 | - $options['wheres'] = array("e.container_guid = $id"); |
|
53 | - break; |
|
54 | - case 'mydept': |
|
55 | - $title = elgg_echo('activity_tabs:collection'); |
|
56 | - $page_filter = 'activity_tab'; |
|
41 | + case 'user': |
|
42 | + $title = elgg_echo('activity_tabs:user'); |
|
43 | + $page_filter = 'activity_tab'; |
|
44 | + |
|
45 | + $options['subject_guid'] = $id; |
|
46 | + break; |
|
47 | + case 'group': |
|
48 | + $db_prefix = elgg_get_config('dbprefix'); |
|
49 | + $title = elgg_echo('activity_tabs:group'); |
|
50 | + $page_filter = 'activity_tab'; |
|
51 | + $options['joins'] = array("JOIN {$db_prefix}entities e ON e.guid = rv.object_guid"); |
|
52 | + $options['wheres'] = array("e.container_guid = $id"); |
|
53 | + break; |
|
54 | + case 'mydept': |
|
55 | + $title = elgg_echo('activity_tabs:collection'); |
|
56 | + $page_filter = 'activity_tab'; |
|
57 | 57 | |
58 | - $db_prefix = elgg_get_config('dbprefix'); |
|
59 | - $dept = elgg_get_logged_in_user_entity()->department; |
|
60 | - $options['joins'] = array("INNER JOIN {$db_prefix}metadata md ON md.entity_guid = rv.subject_guid LEFT JOIN {$db_prefix}metastrings msn ON md.name_id = msn.id LEFT JOIN {$db_prefix}metastrings msv ON md.value_id = msv.id"); // we need this to filter by metadata |
|
61 | - $options['wheres'] = array("msn.string = \"department\" AND msv.string LIKE \"{$dept}\""); |
|
62 | - break; |
|
63 | - case 'otherdept': |
|
64 | - $title = elgg_echo('activity_tabs:collection'); |
|
65 | - $page_filter = 'activity_tab'; |
|
58 | + $db_prefix = elgg_get_config('dbprefix'); |
|
59 | + $dept = elgg_get_logged_in_user_entity()->department; |
|
60 | + $options['joins'] = array("INNER JOIN {$db_prefix}metadata md ON md.entity_guid = rv.subject_guid LEFT JOIN {$db_prefix}metastrings msn ON md.name_id = msn.id LEFT JOIN {$db_prefix}metastrings msv ON md.value_id = msv.id"); // we need this to filter by metadata |
|
61 | + $options['wheres'] = array("msn.string = \"department\" AND msv.string LIKE \"{$dept}\""); |
|
62 | + break; |
|
63 | + case 'otherdept': |
|
64 | + $title = elgg_echo('activity_tabs:collection'); |
|
65 | + $page_filter = 'activity_tab'; |
|
66 | 66 | |
67 | - $db_prefix = elgg_get_config('dbprefix'); |
|
68 | - $dept = elgg_get_logged_in_user_entity()->department; |
|
69 | - $options['joins'] = array("INNER JOIN {$db_prefix}metadata md ON md.entity_guid = rv.subject_guid LEFT JOIN {$db_prefix}metastrings msn ON md.name_id = msn.id LEFT JOIN {$db_prefix}metastrings msv ON md.value_id = msv.id"); // we need this to filter by metadata |
|
70 | - $options['wheres'] = array("msn.string = \"department\" AND msv.string NOT LIKE \"{$dept}\""); |
|
71 | - break; |
|
72 | - case 'collection': |
|
73 | - default: |
|
74 | - $title = elgg_echo('activity_tabs:collection'); |
|
75 | - $page_filter = 'activity_tab'; |
|
76 | - |
|
77 | - $options['subject_guid'] = $members; |
|
78 | - break; |
|
67 | + $db_prefix = elgg_get_config('dbprefix'); |
|
68 | + $dept = elgg_get_logged_in_user_entity()->department; |
|
69 | + $options['joins'] = array("INNER JOIN {$db_prefix}metadata md ON md.entity_guid = rv.subject_guid LEFT JOIN {$db_prefix}metastrings msn ON md.name_id = msn.id LEFT JOIN {$db_prefix}metastrings msv ON md.value_id = msv.id"); // we need this to filter by metadata |
|
70 | + $options['wheres'] = array("msn.string = \"department\" AND msv.string NOT LIKE \"{$dept}\""); |
|
71 | + break; |
|
72 | + case 'collection': |
|
73 | + default: |
|
74 | + $title = elgg_echo('activity_tabs:collection'); |
|
75 | + $page_filter = 'activity_tab'; |
|
76 | + |
|
77 | + $options['subject_guid'] = $members; |
|
78 | + break; |
|
79 | 79 | } |
80 | 80 | |
81 | 81 | $options['no_results'] = elgg_echo('river:none'); |
@@ -178,10 +178,10 @@ |
||
178 | 178 | $request = OAuthRequest::from_consumer_and_token($this->consumer, $this->token, $method, $url, $parameters); |
179 | 179 | $request->sign_request($this->sha1_method, $this->consumer, $this->token); |
180 | 180 | switch ($method) { |
181 | - case 'GET': |
|
182 | - return $this->http($request->to_url(), 'GET'); |
|
183 | - default: |
|
184 | - return $this->http($request->get_normalized_http_url(), $method, $request->to_postdata()); |
|
181 | + case 'GET': |
|
182 | + return $this->http($request->to_url(), 'GET'); |
|
183 | + default: |
|
184 | + return $this->http($request->get_normalized_http_url(), $method, $request->to_postdata()); |
|
185 | 185 | } |
186 | 186 | } |
187 | 187 |
@@ -17,23 +17,23 @@ |
||
17 | 17 | |
18 | 18 | switch($subtype) { |
19 | 19 | |
20 | - case 'hjforumcategory': |
|
21 | - $content = general_information_form($object); |
|
22 | - break; |
|
20 | + case 'hjforumcategory': |
|
21 | + $content = general_information_form($object); |
|
22 | + break; |
|
23 | 23 | |
24 | - case 'hjforum': |
|
25 | - $content = array_merge(general_information_form($object), forums_information_form($object)); |
|
26 | - break; |
|
24 | + case 'hjforum': |
|
25 | + $content = array_merge(general_information_form($object), forums_information_form($object)); |
|
26 | + break; |
|
27 | 27 | |
28 | - case 'hjforumtopic': |
|
29 | - $content = array_merge(general_information_form($object), forums_topic_form($object)); |
|
30 | - break; |
|
28 | + case 'hjforumtopic': |
|
29 | + $content = array_merge(general_information_form($object), forums_topic_form($object)); |
|
30 | + break; |
|
31 | 31 | |
32 | - case 'hjforumpost': |
|
33 | - $content = general_information_form($object); |
|
34 | - break; |
|
32 | + case 'hjforumpost': |
|
33 | + $content = general_information_form($object); |
|
34 | + break; |
|
35 | 35 | |
36 | - default: |
|
36 | + default: |
|
37 | 37 | } |
38 | 38 | |
39 | 39 |