Fix todo and uninstall error

unknown

2013-11-22 35f02f3eb968c1e35c596fa6c7edda6663d09c33

 install/uninstall.php

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

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";

//** The banner on the command line
echo "\n\n".str_repeat('-', 80)."\n";
@@ -55,10 +54,10 @@
$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"]."'");
@@ -86,9 +85,10 @@
   exec('rm -rf /usr/local/ispconfig');
   
   echo "Please do not forget to delete the ispconfig user in the mysql.user table.\n\n";
	
   echo "Finished.\n";
   echo "Finished uninstalling.\n";

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

?>