Add short pugins name.

Author: alexandergull

gvs.php

@@ -57,7 +57,7 @@ function gvs_main()
                 ->saveLogToState();
 
             // add a notice of success
-            $gvs->setNotice('Plugin succesfully replaced.', 'success');
+            $gvs->setNotice('Plugin '. $gvs->plugin_version_short_name .' successfully replaced.', 'success');
 
             // do redirect
             wp_redirect(get_admin_url() . '?page=gvs_page');
@@ -69,7 +69,7 @@ function gvs_main()
         $gvs->saveLogToState();
 
         // add a notice of error
-        $gvs->setNotice('Error occurred:' . $e->getMessage(), 'error');
+        $gvs->setNotice('Error occurred during installation of ' . $gvs->plugin_version_short_name . ':' . $e->getMessage(), 'error');
 
         // do redirect
         wp_redirect(get_admin_url() . '?page=gvs_page');

inc/gvs_helper.php

@@ -1,15 +1,4 @@
 <?php
-function gvs_log($msg)
-{
-    error_log('AVS_DEBUG: ' . var_export($msg,true));
-    if (GVS_DEBUG_DISPLAY) {
-        if (is_string($msg)) {
-            echo $msg . "\n";
-        } else {
-            echo var_export($msg) . "\n";
-        }
-    }
-}
 
 function gvs_delete_folder_recursive($path)
 {
@@ -82,3 +71,19 @@ function gvs_prepare_filesystem()
 
     return true;
 }
+
+function gvs_get_plugin_version_short_name($url)
+{
+    $regex_github = '/download\/([a-z,0-9].*)\/' . $this->process_plugin->plugin_slug . '/';
+    preg_match_all('/plugin\/([a-z,0-9].*\.zip)/', $url,$matches_wp);
+    preg_match_all($regex_github, $url,$matches_github);
+
+    if (isset($matches_wp[1],$matches_wp[1][0])) {
+        $short = $matches_wp[1][0];
+    }
+    if (isset($matches_github[1],$matches_github[1][0])) {
+        $short = $this->process_plugin->inner_name . '-' .  $matches_github[1][0];
+    }
+
+    return !empty($short) ? $short : $this->process_plugin->inner_name;
+}

lib/GVS/GVS.php

@@ -22,6 +22,11 @@ class GVS
      */
     private $state_file = GVS_PLUGIN_DIR . '\files\state.gvs';
 
+    /**
+     * @var
+     */
+    public $plugin_version_short_name;
+
     public function __construct()
     {
         $this->plugins_data['apbct'] = new GVSPluginDataDTO(
@@ -190,6 +195,8 @@ public function downloadPluginZip($url)
             throw new \Exception('This URL is not allowed: ' . $url);
         }
 
+        $this->plugin_version_short_name = gvs_get_plugin_version_short_name($url);
+
         $this->writeStreamLog("Downloading content of $url to $output_path ...");
 
         if ( !is_dir($output_path) ) {