Cleaning up code to match coding guidelines

Marius Cramer

2013-11-14 b1a6a5a3991cec5cd08873b01376e45d0b247f18

 install/setrights.php

@@ -47,13 +47,13 @@
   echo "\n\n>>This script tries to repair the client rights  \n\n";

//** Include the library with the basic installer functions
require_once('lib/install.lib.php');
require_once 'lib/install.lib.php';

//** Include the library with the basic updater functions
require_once('lib/update.lib.php');
require_once 'lib/update.lib.php';

//** Include the base class of the installer class
require_once('lib/installer_base.lib.php');
require_once 'lib/installer_base.lib.php';

//** Ensure that current working directory is install directory
$cur_dir = getcwd();
@@ -62,16 +62,16 @@
//** Get distribution identifier
$dist = get_distname();

include_once("/usr/local/ispconfig/server/lib/config.inc.php");
include_once "/usr/local/ispconfig/server/lib/config.inc.php";
$conf_old = $conf;
unset($conf);

if($dist['id'] == '') die('Linux distribution or version not recognized.');

//** Include the distribution-specific installer class library and configuration
if(is_file('dist/lib/'.$dist['baseid'].'.lib.php')) include_once('dist/lib/'.$dist['baseid'].'.lib.php');
include_once('dist/lib/'.$dist['id'].'.lib.php');
include_once('dist/conf/'.$dist['id'].'.conf.php');
if(is_file('dist/lib/'.$dist['baseid'].'.lib.php')) include_once 'dist/lib/'.$dist['baseid'].'.lib.php';
include_once 'dist/lib/'.$dist['id'].'.lib.php';
include_once 'dist/conf/'.$dist['id'].'.conf.php';

//** Get hostname
exec('hostname -f', $tmp_out);
@@ -90,7 +90,7 @@
$clientdb_host         = '';
$clientdb_user         = '';
$clientdb_password      = '';
include_once("/usr/local/ispconfig/server/lib/mysql_clientdb.conf");
include_once "/usr/local/ispconfig/server/lib/mysql_clientdb.conf";
$conf["mysql"]["admin_user"] = $clientdb_user;
$conf["mysql"]["admin_password"] = $clientdb_password;
$clientdb_host         = '';
@@ -105,7 +105,7 @@
$inst = new installer();

//** Initialize the MySQL server connection
include_once('lib/mysql.lib.php');
include_once 'lib/mysql.lib.php';

//* initialize the database
$inst->db = new db();