Changeset 2120

Timestamp:

11/23/2015 09:28:30 PM (11 years ago)

Author:

ocean90

Message:

Translate: Merge the GP plugin "wporg-log-discarded-warnings" into the custom stats WP plugin for GlotPress.

See #1352.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-custom-stats

Files:

• stats/discarded-warning.php (copied) (copied from sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-log-discarded-warnings/wporg-log-discarded-warnings.php ) (6 diffs)
• wporg-gp-custom-stats.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-custom-stats/stats/discarded-warning.php

@@ -1 +1 @@
 <?php
+
 /**
  * This plugin logs discared warnings into a database table.
@@ -5 +6 @@
  * @author Dominik Schilling (ocean90)
  */
-class GP_WPorg_Log_Discarded_Warnings extends GP_Plugin {
-        var $id = 'wporg-log-discarded-warnings';
+class WPorg_GP_Discarded_Warning_Stats {
 
         /**
@@ -13 +13 @@
          * @var string
          */
-        var $table_name = 'translate_dotorg_warnings';
+        private $table_name = 'translate_dotorg_warnings';
 
-        function __construct() {
-                parent::__construct();
-                $this->add_action( 'warning_discarded', array( 'args' => 5 ) );
+        public function __construct() {
+                add_action( 'warning_discarded', array( $this, 'log_discarded_warning' ), 10, 5 );
         }
 
@@ -29 +28 @@
          * @param  int    $user            ID of the user.
          */
-        function warning_discarded( $project_id, $translation_set, $translation, $warning, $user ) {
-                global $gpdb;
+        public function log_discarded_warning( $project_id, $translation_set, $translation, $warning, $user ) {
+                global $wpdb;
 
                 $warning = array(
@@ -41 +40 @@
                 );
                 $format = array( '%d', '%d', '%d', '%s', '%d', '%s' );
-                $gpdb->insert(
+                $wpdb->insert(
                         $this->table_name,
                         $warning,
@@ -48 +47 @@
         }
 }
-GP::$plugins->wporg_log_discared_warnings = new GP_WPorg_Log_Discarded_Warnings;
 
 /*

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-custom-stats/wporg-gp-custom-stats.php

@@ -10 +10 @@
 class WPorg_GP_Custom_Stats {
 
+        /**
+         * Holds the user stats instance.
+         *
+         * @var WPorg_GP_User_Stats
+         */
         public $user;
+
+        /**
+         * Holds the project stats instance.
+         *
+         * @var WPorg_GP_Project_Stats
+         */
         public $project;
+
+        /**
+         * Holds the discarded warning stats instance.
+         *
+         * @var WPorg_GP_Discarded_Warning_Stats
+         */
+        public $discarded_warning;
 
         public function __construct() {
@@ -17 +35 @@
         }
 
+        /**
+         * Initializes custom stats classes.
+         */
         public function init_stats() {
-
                 $this->user    = new WPorg_GP_User_Stats();
                 $this->project = new WPorg_GP_Project_Stats();
+                $this->discarded_warning = new WPorg_GP_Discarded_Warning_Stats();
         }
 }