Minor Fixes

includes/form_table_class.php

@@ -56,30 +56,32 @@
 }
 </style>
 <?php
+
 class FormTable {
 
 
-	function FormTable()
+	public function __construct()
 	{
 		$this->i = 0;
 	}
 
-	function start_form($action, $method = "post", $extra = "")
+	public function start_form($action, $method = "post", $extra = "")
 	{
 		echo "<div align='center'>";
 		echo "<form action='".$action."' method='".$method."' $extra >";
 	}
-	function start_table()
+
+	public function start_table()
 	{
 		echo "<table class='center'>";
 	}
 
-	function add_field_hidden($name, $value)
+	public function add_field_hidden($name, $value)
 	{
 		echo "<input type='hidden' name='".$name."' value='".@$value."'/>";
 	}
 
-	function add_field($type, $name, $value, $size = 50, $extra = "")
+	public function add_field($type, $name, $value, $size = 50, $extra = "")
 	{
 		echo "<tr><td align='right'><label for='".$name."'>".get_lang($name).":</label></td>";
 		echo "<td align='left'>";
@@ -132,7 +134,7 @@ function add_field($type, $name, $value, $size = 50, $extra = "")
 		}
 	}
 
-	function add_custom_field($name,$data,$td_extra = "")
+	public function add_custom_field($name,$data,$td_extra = "")
 	{
 		echo "<tr><td align='right' $td_extra><label for='".$name."'>".get_lang($name).":</label></td>";
 		echo "<td align='left'>".$data."</td>\n";
@@ -148,17 +150,17 @@ function add_custom_field($name,$data,$td_extra = "")
 		}
 	}
 
-	function end_table()
+	public function end_table()
 	{
 		echo "</table>";
 	}
 
-	function add_button($type,$name,$value)
+	public function add_button($type,$name,$value)
 	{
 		echo "<p class='center'><input type='$type' name='$name' value='$value' /></p>";
 	}
 
-	function end_form()
+	public function end_form()
 	{
 		echo "</form>";
 		echo "</div>";

includes/lib_remote.php

@@ -38,7 +38,7 @@ class OGPRemoteLibrary
 	private $enc;
 	private $timeout;
 
-	function __construct($host,$port,$encryption_key,$timeout = 2)
+	public function __construct($host,$port,$encryption_key,$timeout = 5)
 	{
 		$this->host = $host;
 		$this->port = $port;
@@ -48,7 +48,7 @@ function __construct($host,$port,$encryption_key,$timeout = 2)
 		$this->timeout = $timeout;
 	}
 
-	function __destruct()
+	public function __destruct()
 	{
 	}
 
@@ -486,12 +486,10 @@ public function remote_dirlistfm($args)
 			return -2;
 		if ( $response == 1 )
 			return array();
-
-		function base_64_decode_filename(&$item, $key){
-			if( $key == 'filename' ) $item = base64_decode($item);
-		}
-
-		array_walk_recursive($response, 'base_64_decode_filename');
+
+		array_walk_recursive($response, function (&$item, $key) {
+			if ($key == 'filename')$item = base64_decode($item);
+		});
 
 		return $response;
 	}

includes/refreshed.php

@@ -39,7 +39,7 @@ class refreshed
 	private $url;
 	private $pos;
 
-	public function refreshed()
+	public function __construct()
 	{
 		$this->url = array();
 		$this->pos = 0;

includes/view.php

@@ -196,8 +196,8 @@ function printView($cleared = false, $dataType = "html") {
 			// Attempt to automatically delete the install file only if an admin user has already been created and exists
 			if(is_object($db)){
 				$admins = $db->getAdmins();
-				if(isset($admins) && is_array($admins) && count($admins) > 0){
-					@unlink($filename);
+				if (file_exists($filename) && is_array($admins) && !empty($admins)) {
+					unlink($filename);
 				}
 			}
 

lang/English/global.php

@@ -124,4 +124,6 @@
 define('admin_dsi', "DSi Settings");
 define('user_dsi', "DSi");
 define('list_dsi', "DSi List");
+define('no_remote_servers', "There is no known remote servers! Add a server to use this function.");
+
 ?>

lang/English/modules/TS3Admin.php

@@ -169,4 +169,5 @@
 define('unassign_from_subuser', "Unassign from subuser.");
 define('assign_to_subuser', "Assign to subuser.");
 define('select_subuser', "Select subuser.");
+define('no_ts3_servers_assigned_to_account', "You have no servers assigned to your account.");
 ?>

lang/English/modules/status.php

@@ -35,4 +35,6 @@
 define('storage_used', "Used");
 define('storage_free', "Free Space");
 define('process_monitor', "Process Monitor");
+define('status_extension_required', "Extension Required");
+define('gd_info', "PHP Extension <a href=\"http://php.net/manual/en/image.installation.php\">GD</a> is required to generate these bar images!");
 ?>

modules/TS3Admin/TS3Admin.php

@@ -36,21 +36,28 @@ function exec_ogp_module()
 		if( isset( $_GET['changevServer'] ) OR  !isset( $_SESSION['ts3_ip'] ))
 		{
 			$remote_servers = $db->getRemoteServers();
-			echo "<form action='home.php?m=TS3Admin' method='GET'>
-				 <input type='hidden' name='m' value='". $_GET['m'] . "' />
-				 <table class='center'>
-				 <tr>
-				 <td class='left'>
-				 <select onchange=".'"this.form.submit()"'." name='rserver_id'>
-				 <option></option>\n";
-			foreach ( $remote_servers as $server )
-			{
-				echo "<option value='".$server['remote_server_id']."'>".
-					$server['remote_server_name']." (".$server['agent_ip'].")</option>\n";
+
+			if ($remote_servers !== false) {
+				echo "<form action='home.php?m=TS3Admin' method='GET'>
+					 <input type='hidden' name='m' value='". $_GET['m'] . "' />
+					 <table class='center'>
+					 <tr>
+					 <td class='left'>
+					 <select onchange=".'"this.form.submit()"'." name='rserver_id'>
+					 <option></option>\n";
+				foreach ( $remote_servers as $server )
+				{
+					echo "<option value='".$server['remote_server_id']."'>".
+						$server['remote_server_name']." (".$server['agent_ip'].")</option>\n";
+				}
+				echo "</select>
+					  </form>
+					  </td></tr></table>";
+
+			} else {
+				echo get_lang('no_remote_servers');
+
 			}
-			echo "</select>
-				  </form>
-				  </td></tr></table>";
 		}
 
 		if( isset( $_GET['rserver_id'] ) )
@@ -112,7 +119,7 @@ function exec_ogp_module()
 			}
 			else
 			{
-				echo "There are no TS3 servers assigned to your account.";
+				echo get_lang('no_ts3_servers_assigned_to_account');
 				return;
 			}
 		}