Changeset 2111

Timestamp:

11/22/2015 09:24:33 PM (9 years ago)

Author:

ocean90

Message:

Translate: Update routes plugin to use the new rosetta roles WP plugin.

See #1352.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/routes/locale.php (modified) (15 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/routes/locale.php

@@ -39 +39 @@
         // Default to the Waiting or WordPress tabs
         $default_project_tab = 'waiting';
-        $user = GP::$user->current();
+        $user_id = get_current_user_id();
         if (
-            ! $user->id || // Not logged in
-            ! isset( GP::$plugins->wporg_rosetta_roles ) || // Rosetta Roles plugin is not enabled
+            ! is_user_logged_in() ||
+            ! function_exists( 'wporg_gp_rosetta_roles' ) || // Rosetta Roles plugin is not enabled
             ! (
-                GP::$plugins->wporg_rosetta_roles->is_global_administrator( $user->id ) || // Not a global admin
-                GP::$plugins->wporg_rosetta_roles->is_approver_for_locale( $user->id, $locale_slug ) // Doesn't have project-level access either
+                wporg_gp_rosetta_roles()->is_global_administrator( $user_id ) || // Not a global admin
+                wporg_gp_rosetta_roles()->is_approver_for_locale( $user_id, $locale_slug ) // Doesn't have project-level access either
             )
             // Add check to see if there are any waiting translations for this locale?
@@ -101 +101 @@
         $project_ids = array_merge(
             $project_ids,
-            $wpdb->get_col( "SELECT id FROM {$wpdb->projects} WHERE parent_project_id IN(" . implode(', ', $project_ids  ) . ")" )
+            $wpdb->get_col( "SELECT id FROM {$wpdb->gp_projects} WHERE parent_project_id IN(" . implode(', ', $project_ids  ) . ")" )
         );
 
@@ -249 +249 @@
         $slugs = $wpdb->get_col( $wpdb->prepare( "
             SELECT DISTINCT slug
-            FROM {$wpdb->translation_sets}
+            FROM {$wpdb->gp_translation_sets}
             WHERE
                 project_id IN( $project_ids )
@@ -328 +328 @@
         $_projects = $project->many( "
             SELECT *
-            FROM {$wpdb->projects}
+            FROM {$wpdb->gp_projects}
             WHERE
                 parent_project_id = %d AND
@@ -343 +343 @@
                 $sub_projects = $project->many( "
                     SELECT *
-                    FROM {$wpdb->projects}
+                    FROM {$wpdb->gp_projects}
                     WHERE
                         parent_project_id = %d AND
@@ -407 +407 @@
         // Special Waiting Project Tab
         // This removes the parent_project_id restriction and replaces it with all-translation-editer-projects
-        if ( 'waiting' == $project->slug && GP::$user->current()->id && isset( GP::$plugins->wporg_rosetta_roles ) ) {
+        if ( 'waiting' == $project->slug && is_user_logged_in() && function_exists( 'wporg_gp_rosetta_roles' ) ) {
 
             if ( ! $filter ) {
@@ -413 +413 @@
             }
 
-            $user_id = GP::$user->current()->id;
+            $user_id = get_current_user_id();
 
             // Global Admin or Locale-specific admin
-            $can_approve_for_all = GP::$plugins->wporg_rosetta_roles->is_global_administrator( $user_id );
+            $can_approve_for_all = wporg_gp_rosetta_roles()->is_global_administrator( $user_id );
 
             // Check to see if they have any special approval permissions
             $allowed_projects = array();
-            if ( ! $can_approve_for_all && GP::$plugins->wporg_rosetta_roles->is_approver_for_locale( $user_id, $locale ) ) {
-                $allowed_projects = GP::$plugins->wporg_rosetta_roles->get_project_id_access_list( $user_id, $locale, true );
+            if ( ! $can_approve_for_all && wporg_gp_rosetta_roles()->is_approver_for_locale( $user_id, $locale ) ) {
+                $allowed_projects = wporg_gp_rosetta_roles()->get_project_id_access_list( $user_id, $locale, true );
 
                 // Check to see if they can approve for all projects in this locale.
@@ -448 +448 @@
 
             // Limit to only showing base-level projects
-            $parent_project_sql .= " AND tp.parent_project_id IN( (SELECT id FROM {$wpdb->projects} WHERE parent_project_id IS NULL AND active = 1) )";
+            $parent_project_sql .= " AND tp.parent_project_id IN( (SELECT id FROM {$wpdb->gp_projects} WHERE parent_project_id IS NULL AND active = 1) )";
 
         }
@@ -463 +463 @@
             case 'special':
                 // Float favorites to the start, but only if they have untranslated strings
-                $user_fav_projects = array_map( array( $wpdb, 'escape' ), $this->get_user_favorites( $project->slug ) );
+                $user_fav_projects = array_map( 'esc_sql', $this->get_user_favorites( $project->slug ) );
 
                 // Float Favorites to the start, float fully translated to the bottom, order the rest by name
@@ -475 +475 @@
             case 'favorites':
                 // Only list favorites
-                $user_fav_projects = array_map( array( $wpdb, 'escape' ), $this->get_user_favorites( $project->slug ) );
+                $user_fav_projects = array_map( 'esc_sql', $this->get_user_favorites( $project->slug ) );
 
                 if ( $user_fav_projects ) {
@@ -513 +513 @@
         $_projects = $project->many( "
             SELECT SQL_CALC_FOUND_ROWS tp.*
-            FROM {$wpdb->projects} tp
+            FROM {$wpdb->gp_projects} tp
                 LEFT JOIN {$wpdb->project_translation_status} stats ON stats.project_id = tp.id AND stats.locale = %s AND stats.locale_slug = %s
             WHERE
@@ -547 +547 @@
     function get_user_favorites( $project_slug = false ) {
         global $wpdb;
-        $user = GP::$user->current();
-
-        if ( ! $user->id ) {
+
+        if ( ! is_user_logged_in() ) {
             return array();
         }
+
+        $user_id = get_current_user_id();
 
         switch ( $project_slug ) {
@@ -560 +561 @@
                 $theme_favorites = array_map( function( $slug ) {
                     return "wp-themes/$slug";
-                }, (array) $user->get_meta( 'theme_favorites' ) );
+                }, (array) get_user_meta( $user_id, 'theme_favorites', true ) );
 
                 if ( 'wp-themes' === $project_slug ) {
@@ -568 +569 @@
             case 'wp-plugins':
                 // Plugin favorites are stored as topic ID's
-                $plugin_fav_ids = array_keys( (array)$user->get_meta( PLUGINS_TABLE_PREFIX . 'plugin_favorite' ) );
+                $plugin_fav_ids = array_keys( (array) get_user_meta( $user_id, PLUGINS_TABLE_PREFIX . 'plugin_favorite', true ) );
                 $plugin_fav_slugs = array();
                 if ( $plugin_fav_ids ) {
@@ -598 +599 @@
         return GP::$project->many( "
             SELECT *
-            FROM {$wpdb->projects}
+            FROM {$wpdb->gp_projects}
             WHERE
                 parent_project_id IS NULL