Database quota fix % lost in change

Pascal Dreissen

2016-07-08 f1193b43f4c9fd132741d30f03f0b35841011989

 install/uninstall.php

@@ -34,9 +34,9 @@

error_reporting(E_ALL|E_STRICT);

// This isnt needed until we decide to remove the ispconfig user from the database
//require_once "/usr/local/ispconfig/server/lib/config.inc.php";
//require_once "/usr/local/ispconfig/server/lib/app.inc.php";
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/lib/mysql_clientdb.conf";

//** The banner on the command line
echo "\n\n".str_repeat('-', 80)."\n";
@@ -51,23 +51,25 @@
echo "\n".str_repeat('-', 80)."\n";
echo "\n\n>> Uninstall  \n\n";

echo "Are you sure you want to uninsatll ISPConfig? [no]";
echo "Are you sure you want to uninstall ISPConfig? [no]";
$input = fgets(STDIN);
$do_uninstall = rtrim($input);

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

if($do_uninstall == 'yes') {

   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 = mysqli_connect($clientdb_host, $clientdb_user, $clientdb_password);
   if (!$link) {
      echo "Unable to connect to the database. mysql_error($link)";
   } else {
      $result=mysqli_query($link,"DROP DATABASE ".$conf['db_database'].";");
      if (!$result) echo "Unable to remove the ispconfig-database ".$conf['db_database']." ".mysqli_error($link)."\n";
      $result=mysqli_query($link,"DROP USER '".$conf['db_user']."'@'".$conf['db_host']."';");
           if (!$result) echo "Unable to remove the ispconfig-database-user ".$conf['db_user']." ".mysqli_error($link)."\n";
   }
   mysqli_close($link);
   
   // Deleting the symlink in /var/www
   // Apache
@@ -85,10 +87,19 @@
   // 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 "Finished.\n";
   echo "Backups in /var/backup/ and log files in /var/log/ispconfig are not deleted.";
   echo "Finished uninstalling.\n";

} else {
   echo "\n\n>> Canceled uninstall. \n\n";
}

?>