Changeset 3301

Timestamp:

06/06/2016 12:12:09 AM (10 years ago)

Author:

pento

Message:

Plugin Directory: Tidy up the SVN access API

There were some bad variable names, __construct() needed to be public, and caching the DB results was (a) wildly unnecessary; and (b) bad practice.

Despite @rmccue's protests, the exit() is staying.

See #1722.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-svn-access.php (modified) (4 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-svn-access.php

@@ -15 +15 @@
 class SVN_Access extends Base {
 
-        protected $svn_access = array();
-
         protected $svn_access_table;
 
-        function __construct() {
+        public function __construct() {
                 $this->svn_access_table = PLUGINS_TABLE_PREFIX . 'svn_access';
 
@@ -32 +30 @@
          * Generates and prints the SVN access file for plugins.svn.
          *
-         * Rather than returning a value, the file is echo'd directly to STDOUT, so it can be piped 
+         * Rather than returning a value, the file is echo'd directly to STDOUT, so it can be piped
          * directly into a file. It exit()'s immediately.
-         * 
+         *
          * @param \WP_REST_Request $request The Rest API Request.
          *
@@ -40 +38 @@
          */
         public function generate_svn_access( $request ) {
-                $this->load_svn_access();
+                $svn_access = $this->load_svn_access();
 
-                if ( empty( $this->svn_access ) ) {
+                if ( empty( $svn_access ) ) {
                         return false;
                         }
 
-                foreach ( $this->svn_access as $slug => $users ) {
+                foreach ( $svn_access as $slug => $users ) {
                         $slug = ltrim( $slug, '/' );
                         echo "\n[/$slug]\n";
@@ -54 +52 @@
                         }
                 }
-                
+
                 exit();
         }
 
+
+        /**
+         * Loads the SVN access data from the svn access table.
+         *
+         * @access private
+         *
+         * @return array SVN access data, keyed by repo, then username.
+         */
         private function load_svn_access() {
                 global $wpdb;
 
-                $svn_access = (array) $wpdb->get_results( "SELECT * FROM {$this->svn_access_table}" );
+                $svn_access = array();
 
-                foreach ( $svn_access as $svn_access ) {
-                        if ( ! isset( $this->svn_access[ $svn_access->path ] ) ) {
-                                $this->svn_access[ $svn_access->path ] = array();
+                $access_data = (array) $wpdb->get_results( "SELECT * FROM {$this->svn_access_table}" );
+
+                foreach ( $access_data as $datum ) {
+                        if ( ! isset( $svn_access[ $datum->path ] ) ) {
+                                $svn_access[ $datum->path ] = array();
                         }
 
-                        $this->svn_access[ $svn_access->path ][ $svn_access->user ] = $svn_access->access;
+                        $svn_access[ $datum->path ][ $datum->user ] = $datum->access;
                 }
+
+                return $svn_access;
         }
-
-
 }