Changeset 7316 for trunk/bp-groups/bp-groups-classes.php

Timestamp:

07/26/2013 06:13:51 PM (11 years ago)

Author:

boonebgorges

Message:

Explicit PHP5 visibility and static declarations for bp-groups-classes.php

See #5108, #3886

File:

• trunk/bp-groups/bp-groups-classes.php (modified) (52 diffs)

trunk/bp-groups/bp-groups-classes.php

@@ -12 +12 @@
 
 class BP_Groups_Group {
-    var $id;
-    var $creator_id;
-    var $name;
-    var $slug;
-    var $description;
-    var $status;
-    var $enable_forum;
-    var $date_created;
-
-    var $admins;
-    var $mods;
-    var $total_member_count;
+    public $id;
+    public $creator_id;
+    public $name;
+    public $slug;
+    public $description;
+    public $status;
+    public $enable_forum;
+    public $date_created;
+
+    public $admins;
+    public $mods;
+    public $total_member_count;
 
     /**
@@ -49 +49 @@
     public $user_has_access;
 
-    function __construct( $id = null ) {
+    public function __construct( $id = null ) {
         if ( !empty( $id ) ) {
             $this->id = $id;
@@ -56 +56 @@
     }
 
-    function populate() {
+    public function populate() {
         global $wpdb, $bp;
 
@@ -97 +97 @@
     }
 
-    function save() {
+    public function save() {
         global $wpdb, $bp;
 
@@ -168 +168 @@
     }
 
-    function delete() {
+    public function delete() {
         global $wpdb, $bp;
 
@@ -213 +213 @@
     }
 
-    function get_invites( $user_id, $group_id ) {
+    public static function get_invites( $user_id, $group_id ) {
         global $wpdb, $bp;
         return $wpdb->get_col( $wpdb->prepare( "SELECT user_id FROM {$bp->groups->table_name_members} WHERE group_id = %d and is_confirmed = 0 AND inviter_id = %d", $group_id, $user_id ) );
     }
 
-    function filter_user_groups( $filter, $user_id = 0, $order = false, $limit = null, $page = null ) {
+    public static function filter_user_groups( $filter, $user_id = 0, $order = false, $limit = null, $page = null ) {
         global $wpdb, $bp;
 
@@ -246 +246 @@
      * @todo Deprecate in favor of get()
      */
-    function search_groups( $filter, $limit = null, $page = null, $sort_by = false, $order = false ) {
+    public static function search_groups( $filter, $limit = null, $page = null, $sort_by = false, $order = false ) {
         global $wpdb, $bp;
 
@@ -269 +269 @@
     }
 
-    function check_slug( $slug ) {
+    public static function check_slug( $slug ) {
         global $wpdb, $bp;
 
@@ -275 +275 @@
     }
 
-    function get_slug( $group_id ) {
+    public static function get_slug( $group_id ) {
         global $wpdb, $bp;
 
@@ -281 +281 @@
     }
 
-    function has_members( $group_id ) {
+    public static function has_members( $group_id ) {
         global $wpdb, $bp;
 
@@ -292 +292 @@
     }
 
-    function has_membership_requests( $group_id ) {
+    public static function has_membership_requests( $group_id ) {
         global $wpdb, $bp;
 
@@ -298 +298 @@
     }
 
-    function get_membership_requests( $group_id, $limit = null, $page = null ) {
+    public static function get_membership_requests( $group_id, $limit = null, $page = null ) {
         global $wpdb, $bp;
 
@@ -311 +311 @@
     }
 
-    function get( $args = array() ) {
+    public static function get( $args = array() ) {
         global $wpdb, $bp;
 
@@ -621 +621 @@
      * @return string $order_by_term
      */
-    protected function convert_orderby_to_order_by_term( $orderby ) {
+    protected static function convert_orderby_to_order_by_term( $orderby ) {
         $order_by_term = '';
 
@@ -650 +650 @@
     }
 
-    function get_by_most_forum_topics( $limit = null, $page = null, $user_id = 0, $search_terms = false, $populate_extras = true, $exclude = false ) {
+    public static function get_by_most_forum_topics( $limit = null, $page = null, $user_id = 0, $search_terms = false, $populate_extras = true, $exclude = false ) {
         global $wpdb, $bp, $bbdb;
 
@@ -692 +692 @@
     }
 
-    function get_by_most_forum_posts( $limit = null, $page = null, $search_terms = false, $populate_extras = true, $exclude = false ) {
+    public static function get_by_most_forum_posts( $limit = null, $page = null, $search_terms = false, $populate_extras = true, $exclude = false ) {
         global $wpdb, $bp, $bbdb;
 
@@ -734 +734 @@
     }
 
-    function get_by_letter( $letter, $limit = null, $page = null, $populate_extras = true, $exclude = false ) {
+    public static function get_by_letter( $letter, $limit = null, $page = null, $populate_extras = true, $exclude = false ) {
         global $wpdb, $bp;
 
@@ -777 +777 @@
     }
 
-    function get_random( $limit = null, $page = null, $user_id = 0, $search_terms = false, $populate_extras = true, $exclude = false ) {
+    public static function get_random( $limit = null, $page = null, $user_id = 0, $search_terms = false, $populate_extras = true, $exclude = false ) {
         global $wpdb, $bp;
 
@@ -817 +817 @@
     }
 
-    function get_group_extras( &$paged_groups, &$group_ids, $type = false ) {
+    public static function get_group_extras( &$paged_groups, &$group_ids, $type = false ) {
         global $bp, $wpdb;
 
@@ -852 +852 @@
     }
 
-    function delete_all_invites( $group_id ) {
+    public static function delete_all_invites( $group_id ) {
         global $wpdb, $bp;
 
@@ -858 +858 @@
     }
 
-    function get_total_group_count() {
+    public static function get_total_group_count() {
         global $wpdb, $bp;
 
@@ -868 +868 @@
     }
 
-    function get_global_forum_topic_count( $type ) {
+    public static function get_global_forum_topic_count( $type ) {
         global $bbdb, $wpdb, $bp;
 
@@ -884 +884 @@
     }
 
-    function get_total_member_count( $group_id ) {
+    public static function get_total_member_count( $group_id ) {
         global $wpdb, $bp;
 
@@ -899 +899 @@
      * @return int The topic count
      */
-    function get_global_topic_count( $status = 'public', $search_terms = false ) {
+    public static function get_global_topic_count( $status = 'public', $search_terms = false ) {
         global $bbdb, $wpdb, $bp;
 
@@ -945 +945 @@
      * @return array
      */
-    function get_group_type_ids() {
+    public static function get_group_type_ids() {
         global $wpdb, $bp;
 
@@ -1195 +1195 @@
     var $user;
 
-    function __construct( $user_id = 0, $group_id = 0, $id = false, $populate = true ) {
+    public function __construct( $user_id = 0, $group_id = 0, $id = false, $populate = true ) {
 
         // User and group are not empty, and ID is
@@ -1217 +1217 @@
     }
 
-    function populate() {
+    public function populate() {
         global $wpdb, $bp;
 
@@ -1246 +1246 @@
     }
 
-    function save() {
+    public function save() {
         global $wpdb, $bp;
 
@@ -1290 +1290 @@
     }
 
-    function promote( $status = 'mod' ) {
+    public function promote( $status = 'mod' ) {
         if ( 'mod' == $status ) {
             $this->is_admin   = 0;
@@ -1306 +1306 @@
     }
 
-    function demote() {
+    public function demote() {
         $this->is_mod     = 0;
         $this->is_admin   = 0;
@@ -1314 +1314 @@
     }
 
-    function ban() {
+    public function ban() {
         if ( !empty( $this->is_admin ) )
             return false;
@@ -1324 +1324 @@
     }
 
-    function unban() {
+    public function unban() {
         if ( !empty( $this->is_admin ) )
             return false;
@@ -1333 +1333 @@
     }
 
-    function accept_invite() {
+    public function accept_invite() {
         $this->inviter_id    = 0;
         $this->is_confirmed  = 1;
@@ -1339 +1339 @@
     }
 
-    function accept_request() {
+    public function accept_request() {
         $this->is_confirmed = 1;
         $this->date_modified = bp_core_current_time();
     }
 
-    function remove() {
+    public function remove() {
         global $wpdb, $bp;
 
@@ -1385 +1385 @@
     }
 
-    function delete( $user_id, $group_id ) {
+    public static function delete( $user_id, $group_id ) {
         global $wpdb, $bp;
 
@@ -1399 +1399 @@
     }
 
-    function get_group_ids( $user_id, $limit = false, $page = false ) {
+    public static function get_group_ids( $user_id, $limit = false, $page = false ) {
         global $wpdb, $bp;
 
@@ -1420 +1420 @@
     }
 
-    function get_recently_joined( $user_id, $limit = false, $page = false, $filter = false ) {
+    public static function get_recently_joined( $user_id, $limit = false, $page = false, $filter = false ) {
         global $wpdb, $bp;
 
@@ -1442 +1442 @@
     }
 
-    function get_is_admin_of( $user_id, $limit = false, $page = false, $filter = false ) {
+    public static function get_is_admin_of( $user_id, $limit = false, $page = false, $filter = false ) {
         global $wpdb, $bp;
 
@@ -1464 +1464 @@
     }
 
-    function get_is_mod_of( $user_id, $limit = false, $page = false, $filter = false ) {
+    public static function get_is_mod_of( $user_id, $limit = false, $page = false, $filter = false ) {
         global $wpdb, $bp;
 
@@ -1518 +1518 @@
     }
 
-    function check_has_invite( $user_id, $group_id, $type = 'sent' ) {
+    public static function check_has_invite( $user_id, $group_id, $type = 'sent' ) {
         global $wpdb, $bp;
 
@@ -1532 +1532 @@
     }
 
-    function delete_invite( $user_id, $group_id ) {
+    public static function delete_invite( $user_id, $group_id ) {
         global $wpdb, $bp;
 
@@ -1541 +1541 @@
     }
 
-    function delete_request( $user_id, $group_id ) {
+    public static function delete_request( $user_id, $group_id ) {
         global $wpdb, $bp;
 
@@ -1595 +1595 @@
      * @since BuddyPress (1.2.6)
      */
-    function check_is_creator( $user_id, $group_id ) {
+    public static function check_is_creator( $user_id, $group_id ) {
         global $bp, $wpdb;
 
@@ -1604 +1604 @@
     }
 
-    function check_for_membership_request( $user_id, $group_id ) {
+    public static function check_for_membership_request( $user_id, $group_id ) {
         global $wpdb, $bp;
 
@@ -1613 +1613 @@
     }
 
-    function get_random_groups( $user_id = 0, $total_groups = 5 ) {
+    public static function get_random_groups( $user_id = 0, $total_groups = 5 ) {
         global $wpdb, $bp;
 
@@ -1624 +1624 @@
     }
 
-    function get_group_member_ids( $group_id ) {
+    public static function get_group_member_ids( $group_id ) {
         global $bp, $wpdb;
 
@@ -1630 +1630 @@
     }
 
-    function get_group_administrator_ids( $group_id ) {
+    public static function get_group_administrator_ids( $group_id ) {
         global $bp, $wpdb;
 
@@ -1636 +1636 @@
     }
 
-    function get_group_moderator_ids( $group_id ) {
+    public static function get_group_moderator_ids( $group_id ) {
         global $bp, $wpdb;
 
@@ -1642 +1642 @@
     }
 
-    function get_all_membership_request_user_ids( $group_id ) {
+    public static function get_all_membership_request_user_ids( $group_id ) {
         global $bp, $wpdb;
 
@@ -1648 +1648 @@
     }
 
-    function get_all_for_group( $group_id, $limit = false, $page = false, $exclude_admins_mods = true, $exclude_banned = true, $exclude = false ) {
+    public static function get_all_for_group( $group_id, $limit = false, $page = false, $exclude_admins_mods = true, $exclude_banned = true, $exclude = false ) {
         global $bp, $wpdb;
 
@@ -1708 +1708 @@
     }
 
-    function delete_all( $group_id ) {
+    public static function delete_all( $group_id ) {
         global $wpdb, $bp;
 
@@ -1723 +1723 @@
      * @uses BP_Groups_Member
      */
-    function delete_all_for_user( $user_id ) {
+    public static function delete_all_for_user( $user_id ) {
         global $bp, $wpdb;