From 72d2885b124a53a36b5ac1f6c14f43cf66c85d9a Mon Sep 17 00:00:00 2001 From: System Void Date: Tue, 4 Aug 2015 11:45:22 +0100 Subject: [PATCH 1/8] Removed closing PHP tags They aren't needed, and every little helps. :) --- web/index.php | 1 - 1 file changed, 1 deletion(-) diff --git a/web/index.php b/web/index.php index 35c889c9f6..be1ea8bc28 100644 --- a/web/index.php +++ b/web/index.php @@ -5,4 +5,3 @@ } else { header("Location: /login/"); } -?> From 54f23757ea9d0eb43eed88568020443e45fbe4e4 Mon Sep 17 00:00:00 2001 From: System Void Date: Tue, 4 Aug 2015 14:41:32 +0100 Subject: [PATCH 2/8] Removed closing PHP tags. They aren't needed, and every little helps. --- web/api/index.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/web/api/index.php b/web/api/index.php index cfa74ff76f..7806a0b4f1 100644 --- a/web/api/index.php +++ b/web/api/index.php @@ -78,5 +78,3 @@ } } } - -?> From 7a7788b18547a9282e9cad79d882a5cfca20f7ee Mon Sep 17 00:00:00 2001 From: System Void Date: Tue, 4 Aug 2015 14:42:06 +0100 Subject: [PATCH 3/8] Removed closing PHP tags. --- web/inc/main.php | 1 - 1 file changed, 1 deletion(-) diff --git a/web/inc/main.php b/web/inc/main.php index c7305a6f55..3f449d2bbc 100644 --- a/web/inc/main.php +++ b/web/inc/main.php @@ -340,4 +340,3 @@ function list_timezones() { } return $timezone_list; } -?> From 9b68b7eb93d644e5ba78bbc881433b61597d82c8 Mon Sep 17 00:00:00 2001 From: System Void Date: Tue, 4 Aug 2015 14:42:32 +0100 Subject: [PATCH 4/8] Removed closing PHP tags. --- web/inc/mail-wrapper.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/web/inc/mail-wrapper.php b/web/inc/mail-wrapper.php index bf1c3d9e38..a8c48a09e3 100755 --- a/web/inc/mail-wrapper.php +++ b/web/inc/mail-wrapper.php @@ -32,5 +32,3 @@ if ((!empty($to)) && (!empty($subject))) { send_email($to,$subject,$mailtext,$from); } - -?> From fe21f1cc32373829c345320e15944a39305c589f Mon Sep 17 00:00:00 2001 From: System Void Date: Tue, 4 Aug 2015 14:44:11 +0100 Subject: [PATCH 5/8] Removed closing PHP tags. --- web/login/index.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/web/login/index.php b/web/login/index.php index 332f8ee6ce..cdb98b3972 100644 --- a/web/login/index.php +++ b/web/login/index.php @@ -90,5 +90,3 @@ require_once($_SERVER['DOCUMENT_ROOT'].'/inc/i18n/'.$_SESSION['language'].'.php'); require_once('../templates/header.html'); require_once('../templates/login.html'); - -?> From b2766e5d881270409ce6cf3ca3f286bb11994eb1 Mon Sep 17 00:00:00 2001 From: System Void Date: Tue, 4 Aug 2015 14:44:55 +0100 Subject: [PATCH 6/8] Removed double space that was not needed. Saving bytes, that's all! --- web/login/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/login/index.php b/web/login/index.php index cdb98b3972..62541b043a 100644 --- a/web/login/index.php +++ b/web/login/index.php @@ -14,7 +14,7 @@ // Login as someone else if (isset($_SESSION['user'])) { - if ($_SESSION['user'] == 'admin' && !empty($_GET['loginas'])) { + if ($_SESSION['user'] == 'admin' && !empty($_GET['loginas'])) { exec (VESTA_CMD . "v-list-user ".escapeshellarg($_GET['loginas'])." json", $output, $return_var); if ( $return_var == 0 ) { $data = json_decode(implode('', $output), true); From 01541088ce8810bdc5323cd6d819eac08175014d Mon Sep 17 00:00:00 2001 From: System Void Date: Tue, 4 Aug 2015 14:46:35 +0100 Subject: [PATCH 7/8] Removed closing PHP tags. --- web/generate/ssl/index.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/web/generate/ssl/index.php b/web/generate/ssl/index.php index 2d093db2fa..3f96ebf9e4 100644 --- a/web/generate/ssl/index.php +++ b/web/generate/ssl/index.php @@ -108,5 +108,3 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_ssl.html'); include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html'); unset($_SESSION['ok_msg']); - -?> From de6fcff868245e12a3b1e0086ed7df588ac9d2a2 Mon Sep 17 00:00:00 2001 From: System Void Date: Tue, 4 Aug 2015 15:00:51 +0100 Subject: [PATCH 8/8] Cleaned it up a bit. --- web/file_manager/files.php | 107 ++++++++++++++----------------------- 1 file changed, 40 insertions(+), 67 deletions(-) diff --git a/web/file_manager/files.php b/web/file_manager/files.php index c11cd917ec..657194dca9 100644 --- a/web/file_manager/files.php +++ b/web/file_manager/files.php @@ -4,25 +4,18 @@ //define(LISTING_TIMEOUT, 0.000001); define(LISTING_TIMEOUT, 5); - - - //echo 'files: '; //$files = scandir(__DIR__); - //echo '
';
 //print_r($files);
 
-
 //$_REQUEST['sort_field'] = 'size';
 $_REQUEST['sort_field'] = 'name';
 //$_REQUEST['sort_field'] = 'atime';
 //$_REQUEST['sort_field'] = 'mtime';
 $_REQUEST['sort_desc'] = 1;
 
-
-
 /*
 +-  copy file / dir [ recursive ]
 +-  rename(move) file / dir
@@ -33,7 +26,7 @@
 +-  create dir
 */
 
-switch($_REQUEST['action']){
+switch($_REQUEST['action']) {
     case 'copy': fm_copy($_REQUEST['source'], $_REQUEST['dest']); break;
     case 'rename': fm_rename($_REQUEST['source'], $_REQUEST['dest']); break;
     case 'delete': fm_delete($_REQUEST['source']); break;
@@ -53,24 +46,12 @@
     break;
 }
 
-
-
-
-
-
 //echo $_GET['sort_field'];
 
 //    if(in_array($_GET['sort_field'], $available_sort_fields)){
 //	echo '1';
 //    }	
 
-
-
-
-
-
-
-
 /*
   upload_file
 
@@ -87,17 +68,16 @@
   download file / image   
 */
 
-
-
-function fm_create_file($filename){
+function fm_create_file($filename)
+{
     if(is_file($filename))
         return array('error' => 'file exists', 'code' => 1);
 
-    return !!fopen($filename, 'w');
+    return (bool) fopen($filename, 'w'); // (bool) > !!, sorry
 }
 
-
-function fm_create_dir($dirname){
+function fm_create_dir($dirname)
+{
     if(is_dir($filename))
         return array('error' => 'directory exists', 'code' => 1);
 
@@ -105,49 +85,49 @@ function fm_create_dir($dirname){
     return mkdir($dirname);
 }
 
-
-function fm_chown($filename, $recursive = 0, $uid = FALSE, $gid = FALSE){
-    if(is_dir($filename) && $recursive){
+function fm_chown($filename, $recursive = 0, $uid = FALSE, $gid = FALSE)
+{
+    if (is_dir($filename) && $recursive) {
         $dir_handle  = opendir($dir);
-	while ($item = readdir($dir_handle)){
-    	    if (!in_array($item, array('.','..'))){
+	while ($item = readdir($dir_handle)) {
+    	    if (!in_array($item, array('.','..'))) {
 		$new_item = $filename.'/'.$item;
 
-	        if($uid !== FALSE) chown($new_item, (int)$uid);
-		if($gid !== FALSE) chgrp($new_item, (int)$gid); 
+	        if ($uid !== FALSE) chown($new_item, (int)$uid);
+		if ($gid !== FALSE) chgrp($new_item, (int)$gid); 
 
-		if(is_dir($new_item)){
+		if (is_dir($new_item)) {
 		    fm_chown($new_item, $recursive, $uid, $gid);
 		}
 	    }
 	}
-    }else{
+    } else {
         if($uid !== FALSE) chown($filename, (int)$uid);
 	if($gid !== FALSE) chgrp($filename, (int)$gid); 
     }
 }
 
-
-function fm_chmod($filename, $recursive = 0, $mode){
-    if(is_dir($filename) && $recursive){
+function fm_chmod($filename, $recursive = 0, $mode)
+{
+    if(is_dir($filename) && $recursive) {
         $dir_handle  = opendir($dir);
-	while ($item = readdir($dir_handle)){
-    	    if (!in_array($item, array('.','..'))){
+	while ($item = readdir($dir_handle)) {
+    	    if (!in_array($item, array('.','..'))) {
 		$new_item = $filename.'/'.$item;
 	        chmod($new_item, octdec($mode));
 
-		if(is_dir($new_item)){
+		if (is_dir($new_item)) {
 		    fm_chmod($new_item, $recursive, $mode);
 		}
 	    }
 	}
-    }else{
+    } else {
 	chmod($filename, octdec($mode));
     }
 }
 
-
-function fm_delete($filename){
+function fm_delete($filename)
+{
     if(is_dir($filename)){
 	foreach (
 	    $iterator = new RecursiveIteratorIterator(
@@ -162,19 +142,21 @@ function fm_delete($filename){
 //	    copy($item, $dest . DIRECTORY_SEPARATOR . $iterator->getSubPathName());
 	  }
 	}
-    }else{
+    } else {
 	return unlink($filename);
     }
 }
 
 
-function fm_rename($source, $dest){
+function fm_rename($source, $dest)
+{
     return rename($source, $dest);
 }
 
 
-function fm_copy($source, $dest){
-    if(is_dir($source)){
+function fm_copy($source, $dest)
+{
+    if (is_dir($source)) {
 	foreach (
 	    $iterator = new RecursiveIteratorIterator(
 	    new RecursiveDirectoryIterator($source, RecursiveDirectoryIterator::SKIP_DOTS),
@@ -187,14 +169,13 @@ function fm_copy($source, $dest){
 	    copy($item, $dest . DIRECTORY_SEPARATOR . $iterator->getSubPathName());
 	  }
 	}
-    
     }else{
 	return copy($source, $dest);
     }
 }
 
-
-function list_dir(){
+function list_dir()
+{
     $dir_iterator = new RecursiveDirectoryIterator("/path");
     $iterator = new RecursiveIteratorIterator($dir_iterator, RecursiveIteratorIterator::SELF_FIRST);
     // could use CHILD_FIRST if you so wish
@@ -214,12 +195,9 @@ function list_dir(){
     echo "\nTotal file size: ", $size, " bytes\n";
 }
 
-
-
-
 /// fast removing directory 
-function rmrf($dir) {
-    
+function rmrf($dir)
+{
     foreach (glob($dir) as $file) {
         if (is_dir($file)) {
             rmrf("$file/*");
@@ -230,9 +208,6 @@ function rmrf($dir) {
     }
 }
 
-
-
-
 function dir_list($dir, $sort = 0)
 {
     $sort_order_for_filename = SORT_ASC;
@@ -252,7 +227,7 @@ function dir_list($dir, $sort = 0)
         if (!in_array($object, array('.','..'))){
             $filename    = $dir . $object;
 	    $time = microtime(true) - $start;
-	    if($time <= LISTING_TIMEOUT){
+	    if ($time <= LISTING_TIMEOUT) {
     		$stats = stat($filename);
     		$mode = explain_mode($stats['mode']);
 		$perms = decoct(fileperms($filename));
@@ -274,8 +249,11 @@ function dir_list($dir, $sort = 0)
             	);
 	    }else{
 		$listing['timeout_exeeded'] = TRUE;
-		if(is_dir($filename)){   $type = 'd';
-		}else{   $type = '-'; }
+		if (is_dir($filename)) {
+			$type = 'd';
+		} else {
+			$type = '-';
+		}
 
 	        $item = array(
             	    'name' => $object,
@@ -294,7 +272,6 @@ function dir_list($dir, $sort = 0)
             	);
 	    }
 
-
 	    $listing['count']++;
 
 	    if($item['type'] == 'd'){
@@ -311,7 +288,6 @@ function dir_list($dir, $sort = 0)
     }
     $listing['time'] = microtime(TRUE) - $start;
 
-
     if(!$listing['timeout_exeeded']){
 	if(in_array($_REQUEST['sort_field'], $available_sort_fields)){
 	    if($_REQUEST['sort_desc']){
@@ -324,7 +300,6 @@ function dir_list($dir, $sort = 0)
 
     return $listing;
 }
-
 	
 function explain_mode($mode)
 {
@@ -355,5 +330,3 @@ function explain_mode($mode)
 
     return $info;
 }
-
-?>