Changeset 5488

Timestamp:

05/14/2017 09:23:41 PM (9 years ago)

Author:

ocean90

Message:

Plugin Directory: Replace shell_exec()/system() calls with exec().

Avoids printing the CLI output to stdout.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory

Files:

• cli/i18n/class-i18n-import.php (modified) (3 diffs)
• jobs/class-plugin-i18n-import.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/i18n/class-i18n-import.php

@@ -75 +75 @@
         $cmd = WPORGTRANSLATE_WPCLI . ' wporg-translate set-plugin-project ' . escapeshellarg( $plugin_slug ) . ' ' . escapeshellarg( $process_type );
 
-        $last_line = system( $cmd, $return_code );
+        $return_code = 0;
+        $output = [];
+        exec( $cmd, $output, $return_code );
+        $last_line = array_pop( $output );
 
         if ( 0 === $return_code ) {
@@ -122 +125 @@
         // Note: this will only work if the GlotPress project/sub-projects exist.
         $cmd = WPORGTRANSLATE_WPCLI . ' glotpress import-originals ' . escapeshellarg( "wp-plugins/{$project}/{$branch}" ) . ' ' . escapeshellarg( $file );
-        echo shell_exec( $cmd ) . "\n";
+        exec( $cmd );
 
         if ( empty( $str_priorities ) ) {
@@ -228 +231 @@
 
             $cmd = WPORGTRANSLATE_WPCLI . ' wporg-translate import-plugin-translations ' . escapeshellarg( "wp-plugins/{$project}/{$branch}" ) . ' ' . escapeshellarg( $language ) . ' ' . escapeshellarg( $file ) . ' --format=' . escapeshellarg( $ext );
-            echo shell_exec( $cmd . ' 2>&1' );
+            exec( $cmd );
         }
     }

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs/class-plugin-i18n-import.php

@@ -110 +110 @@
 
             $cmd = self::PHP . ' ' . dirname( __DIR__ ) . "/bin/import-plugin-to-glotpress.php --plugin {$esc_plugin_slug} --tag {$esc_tag} --type {$esc_type}";
-
-            echo "\n\$$cmd\n";
-            echo shell_exec( $cmd ) . "\n";
+            exec( $cmd );
         }
     }
-
 }