- don't set password via remoting if field is empty

Marius Cramer

2015-08-06 37b29231e47a0c4458dc1c15d98588f16f07e1e2

 install/uninstall.php

@@ -36,6 +36,7 @@

require_once "/usr/local/ispconfig/server/lib/config.inc.php";
require_once "/usr/local/ispconfig/server/lib/app.inc.php";
require "/usr/local/ispconfig/server/mysql_clientdb.conf";

//** The banner on the command line
echo "\n\n".str_repeat('-', 80)."\n";
@@ -59,14 +60,16 @@

   echo "\n\n>> Uninstalling ISPConfig 3... \n\n";

   // Delete the ISPConfig database
   // $app->db->query("DROP DATABASE '".$conf["db_database"]."'");
   // $app->db->query("DELETE FROM mysql.user WHERE User = 'ispconfig'");
	
	
   exec("/etc/init.d/mysql stop");
   exec("rm -rf /var/lib/mysql/".$conf["db_database"]);
   exec("/etc/init.d/mysql start");
   $link = mysql_connect($clientdb_host, $clientdb_user, $clientdb_password);
   if (!$link) {
      echo "Unable to connect to the database'.mysql_error($link)";
   } else {
      $result=mysql_query("DROP DATABASE ".$conf['db_database']."';", $link);
      if (!$result) echo "Unable to remove the ispconfig-database ".$conf['db_database']." ".mysql_error($link)."\n";
      $result=mysql_query("DROP USER '".$conf['db_user'] ."';");
           if (!$result) echo "Unable to remove the ispconfig-database-user ".$conf['db_user']." ".mysql_error($link)."\n";
   }
   mysql_close($link);
   
   // Deleting the symlink in /var/www
   // Apache
@@ -84,7 +87,15 @@
   // Delete the ispconfig files
   exec('rm -rf /usr/local/ispconfig');
   
   echo "Please do not forget to delete the ispconfig user in the mysql.user table.\n\n";
   // Delete various other files
   @unlink("/usr/local/bin/ispconfig_update.sh");
   @unlink("/usr/local/bin/ispconfig_update_from_svn.sh");
   @unlink("/var/spool/mail/ispconfig");
   @unlink("/var/www/ispconfig");
   @unlink("/var/www/php-fcgi-scripts/ispconfig");
   @unlink("/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter");
	
   echo "Backups in /var/backup/ and log files in /var/log/ispconfig are not deleted.";
   echo "Finished uninstalling.\n";

} else {