minor fixes in mysql restore program

Author: k2s

storage/Mysql/cliRestore.php

@@ -244,7 +244,8 @@ protected function _filterExt($action, $objName, $cmd=null)
         }
 
         $cmd .= $this->_opts['database'] . " $action $objName";
-        $output = $ret = null;
+        $output = array();
+        $ret = null;
         exec($cmd, $output, $ret);
         if ($output) {
             echo "Error output from external filter:".PHP_EOL.implode(PHP_EOL, $output);
@@ -269,8 +270,14 @@ public function getReturnCode()
         return self::RETCODE_OK;
     }
 
+    /**
+     * Output information about backup data
+     *
+     * @return string
+     */
     public function getInfo()
     {
+        return "backup";
     }
 
     protected function _connectMysql()
@@ -356,7 +363,7 @@ public function cloneTo()
                             }
 
                             if (1!==$this->_filterExt($subPath, $fn)) {
-                                $task = $this->_log->subtask()->log("$subPath: skip '$fn' because of external filter");
+                                $this->_log->subtask()->log("$subPath: skip '$fn' because of external filter");
                                 continue;
                             }
 
@@ -582,7 +589,7 @@ function importDataFromFolderToRemoteServer($path, $truncate=true)
 
     function importDataFromFolderToLocalServer($subPath, $truncate=true)
     {
-        return $this->importDataFromFolder(true, $path, $truncate);
+        return $this->importDataFromFolder(true, $subPath, $truncate);
     }
 
     function importDataFromFolder($isLocalHost, $subPath, $truncate=true)
@@ -593,7 +600,7 @@ function importDataFromFolder($isLocalHost, $subPath, $truncate=true)
                 if ($fn!="." && $fn!="..") {
 
                     if (1!==$this->_filterExt($subPath, $fn)) {
-                        $task = $this->_log->subtask()->log("$subPath: skip '$fn' because of external filter");
+                        $this->_log->subtask()->log("$subPath: skip '$fn' because of external filter");
                         continue;
                     }
 
@@ -627,6 +634,8 @@ function importDataFromFolder($isLocalHost, $subPath, $truncate=true)
             }
             closedir($handle);
         }
+
+        return true;
     }
 
     function execSqlFromFolderTogether($path)
@@ -664,7 +673,7 @@ function execSqlFromFolder($subPath, $tryRepeat=false)
                     $fullFn = $path.$fn;
 
                     if (1!==$this->_filterExt($subPath, $fn)) {
-                        $task = $this->_log->subtask()->log("skip '$fn' because of external filter");
+                        $this->_log->subtask()->log("skip '$fn' because of external filter");
                         continue;
                     }
 

xtbackup.iml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
+  <component name="DBNavigator.Module.ConnectionManager">
+    <connections />
+  </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">