Changes to Support Pre Start Commands and Environment Variables

OGP/EHCP/addAccount.php

@@ -1,9 +1,6 @@
 <?php
-
 // Adds users to the database
-
 // Variables
-
 $success = 0;
 
 if (isset($_GET['username'])) {
@@ -128,7 +125,5 @@ if ($errorCount > 0) {
 }
 
 // Return value:
-
 echo $success;
-
 ?>

OGP/EHCP/config.php

@@ -1,5 +1,4 @@
 <?php
-
 /*
 This FTP addon works with EHCP (www.ehcp.net)
 It allows OGP - the open game panel - to manage custom FTP user accounts
@@ -22,6 +21,7 @@ if(!isset($dbpass) || empty($dbpass)){
 }
 
 $dbName = 'ehcp';
+$debug=false;
 
 /**********************************
 *          END DB Creds           *
@@ -31,7 +31,7 @@ $dbName = 'ehcp';
 $logFile = 'ehcp_ftp_log.txt';
 
 function addToLog($errors) {
-    global $logFile;
+    global $logFile, $debug;
     
     if (!file_exists($logFile)) {
         $createLog = fopen($logFile, 'a+');
@@ -53,8 +53,10 @@ function addToLog($errors) {
     
     foreach ($errors as $err) {
         $logContents.= $err . "\n";
-        trigger_error($err, E_USER_NOTICE);
-        echo $err . "\n";
+        if($debug){
+			trigger_error($err, E_USER_NOTICE);
+			echo $err . "\n";
+		}
     }
     $updateLog = file_put_contents($logFile, $logContents);
     
@@ -78,6 +80,4 @@ if(!$connection){
     addToLog($errToLog);
     die('Unable to connect to the EHCP MySQL database using provided credentials! Please update your config.php settings!');
 }
-
 ?>
-

OGP/EHCP/delAccount.php

@@ -1,5 +1,4 @@
 <?php
-
 if (file_exists("config.php")) {
     include 'config.php';
 } else {
@@ -28,23 +27,19 @@ if (!isset($userToDelete)) {
     $SQL = "SELECT ftpusername FROM ftpaccounts WHERE ftpusername = '$userToDelete'";
 	$Result = execSQL($SQL, $connection);
     
-    if ($Result !== FALSE) {
+    if ($Result !== FALSE && countSQLResult($Result) == 1) {
 		$row = getSQLRowArray($Result);
         $unameDeleted = $row[0];
-    }
+    }else{
+		$errorCount++;
+        $errors[] = "The specified user $userToDelete does not exist within the databse. No actions were taken!";
+	}
     
     if (isset($unameDeleted)) {
         $SQL = "DELETE FROM ftpaccounts WHERE ftpusername = '$userToDelete'";
-		$Result = execSQL($SQL, $connection);
-        
+		$Result = execSQL($SQL, $connection); 
         if ($Result !== FALSE) {
-            
-            if ($unameDeleted === "none") {
-                $errorCount++;
-                $errors[] = "The specified user $userToDelete does not exist within the databse. No actions were taken!";
-            } else {
-                $success = 1;
-            }
+			$success = 1;
         } else {
             $errorCount++;
 			$errors[] = getSQLError($connection);			
@@ -61,5 +56,4 @@ if ($errorCount > 0) {
 
 // Return value:
 echo $success;
-
 ?>

OGP/EHCP/listAllUsers.php

@@ -1,9 +1,6 @@
 <?php
-
 // Returns a list of all custom FTP users
-
 // Only custom users are setup when tying into the EHCP FTP API
-
 $countNotNull = 0;
 $users_list = "";
 $success = 0;
@@ -66,5 +63,4 @@ if (!isset($connection)) {
 
 // Return the user list
 echo $users_list;
-
 ?>

OGP/EHCP/showAccount.php

@@ -1,9 +1,4 @@
 <?php
-
-// Returns the information of ONE custom ftpuser
-
-// Only custom users are setup when tying into the EHCP FTP API
-
 $countNotNull = 0;
 $user_details = "";
 $success = 0;
@@ -68,5 +63,4 @@ if (isset($ftp_account)) {
 
 // Return the user list
 echo $user_details;
-
 ?>

OGP/EHCP/syncftp.php

@@ -1,6 +1,5 @@
 <?php
 $curDir = getcwd();
-
 if(chdir("/var/www/new/ehcp/")){
 	require ("classapp.php");
 	$app = new Application();
@@ -8,7 +7,5 @@ if(chdir("/var/www/new/ehcp/")){
 
 	$app->addDaemonOp('syncftp', '', '', '', 'sync ftp for nonstandard homes');
 }
-
 chdir($curDir);
-
 ?>

OGP/EHCP/updateInfo.php

@@ -1,5 +1,4 @@
 <?php
-
 if (file_exists("config.php")) {
     include 'config.php';
 } else {
@@ -142,5 +141,4 @@ if ($errorCount > 0) {
 
 // Return value:
 echo $success;
-
 ?>

OGP/EHCP/updatePass.php

@@ -1,5 +1,4 @@
 <?php
-
 if (file_exists("config.php")) {
     include 'config.php';
 } else {
@@ -67,16 +66,11 @@ if (!isset($ftp_username) || !isset($ftp_pass)) {
     }
 }
 
-
-
 // Log errors
-
 if ($errorCount > 0) {
     addToLog($errors);
 }
 
 // Return value:
-
 echo $success;
-
 ?>

OGP/ogp_agent.pl

@@ -688,7 +688,7 @@ sub universal_start_without_decrypt
 			$line = replace_OGP_Env_Vars($home_id, $home_path, $line);
 			if($line ne ""){
 				logger "Configuring environment variable: $line";
-				$envVarStr .= "$line\n";
+				$envVarStr .= "$line\r\n";
 			}
 		}