From 9cfd4f4056bba6a956dd190b57cecc5ada4cf922 Mon Sep 17 00:00:00 2001
From: dvoraj42 <dvoraj42@fel.cvut.cz>
Date: Sun, 20 Mar 2011 17:21:47 +0100
Subject: [PATCH 01/12] undefined variables warnings FIX

---
 index.php                | 41 ++++++++++++++++++++++------------------
 themes/classic/theme.php |  6 ++++--
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/index.php b/index.php
index eedf984..55ed4cf 100755
--- a/index.php
+++ b/index.php
@@ -1,5 +1,4 @@
 <?php
-
 /****************************************************************/
 /*                                                              */
 /* File Admin                                                   */
@@ -32,7 +31,7 @@
 /* $defaultlang - default language.                             */
 /****************************************************************/
 
-$adminfile = $SCRIPT_NAME;
+$adminfile = $_SERVER['PHP_SELF'];
 $sitetitle = "Demo Browser";
 $config['db']['server'] 		= 'localhost';
 $config['db']['user'] 			= 'arzbeta_libra';
@@ -50,28 +49,30 @@
 mysql_select_db ($config['db']['db']);
 
 $yay = 0; $user = ''; $pass = ''; $sess = '';
+$theme='';
 
-if ($_REQUEST['login']) $user = $_REQUEST['login'];
-elseif ($_COOKIE['user']) $user = $_COOKIE['user'];
+if ( isset($_REQUEST['login']) ) $user = $_REQUEST['login'];
+elseif ( isset($_COOKIE['user']) ) $user = $_COOKIE['user'];
 
-if ($_REQUEST['encpas']) $pass = $_REQUEST['encpas'];
-elseif ($_COOKIE['pass']) $pass = $_COOKIE['pass'];
+if ( isset($_REQUEST['encpas']) ) $pass = $_REQUEST['encpas'];
+elseif ( isset($_COOKIE['pass']) ) $pass = $_COOKIE['pass'];
 
-if ($_REQUEST['randsess']) $sess = $_REQUEST['randsess'];
-elseif ($_COOKIE['sess']) $sess= $_COOKIE['sess'];
+if ( isset($_REQUEST['randsess']) ) $sess = $_REQUEST['randsess'];
+elseif ( isset($_COOKIE['sess']) ) $sess= $_COOKIE['sess'];
 
 if ($user && $pass) {
 
 	$mysql = mysql_query("SELECT pass, user, id, folder, http, spacelimit, language, theme, permbrowse, permupload, permcreate, permuser, permadmin, permdelete, permmove, permchmod, permget, permdeleteuser, permedituser, permmakeuser, permpass, permrename, permedit, permsub, formatperm, status, recycle, permprefs FROM ".$GLOBALS['config']['db']['pref']."users WHERE user='".mysql_escape_string($user)."'");
 	list ($dbpass, $dbuser, $userid, $userdir, $http, $limit, $language, $theme, $permbrowse, $permupload, $permcreate, $permuser, $permadmin, $permdelete, $permmove, $permchmod, $permget, $permdeleteuser, $permedituser, $permmakeuser, $permpass, $permrename, $permedit, $permsub, $formatperm, $status, $recycle, $permprefs) = mysql_fetch_row($mysql);
 
+        
+
 	if ($userid && $pass == md5($dbpass.$sess)) {
 		$yay = 1;
 	}
 }
 
 if ($yay) {
-
 	$user = $dbuser;
 	$activesess = date("YmdHis");
 	$mysql = mysql_query("UPDATE ".$GLOBALS['config']['db']['pref']."users SET currsess='$activesess' WHERE id='$userid'") or die (mysql_error());
@@ -96,14 +97,16 @@
 	setcookie('pass',$pass,time()+60*60*24*1);
 	setcookie('sess',$sess,time()+60*60*24*1);
 
-} else {
-	if ($_REQUEST['login'] || $_REQUEST['encpas']) $er = true;
-	require_once("themes/$defaulttheme/theme.php");
+} else {    
+	$er=false;
+        if ( isset($_REQUEST['login']) || isset($_REQUEST['encpas']) ) $er = true;
+	$theme=$defaulttheme;
+        require_once("themes/$theme/theme.php");
 	login($er);
 }
 
 
-$d = $_REQUEST['d'];
+if( isset($_REQUEST['d']) ) $d=$_REQUEST['d']; else $d=null;
 if ($d) {
   while (preg_match('/\\\/',$d)) $d = preg_replace('/\\\/','/',$d);
   while (preg_match('/\/\//',$d)) $d = preg_replace('/\/\//','/',$d);
@@ -172,6 +175,7 @@ function alternatehome() {
 
 function home() {
   global $nobar, $d, $bgcolor3, $tbcolor1, $tbcolor2, $tbcolor3, $tbcolor4, $userdir, $HTTP_HOST, $theme, $http, $extraheaders, $IMG_CHECK, $IMG_RENAME, $IMG_GET, $IMG_EDIT, $IMG_OPEN, $IMG_RENAME_NULL, $IMG_EDIT_NULL, $IMG_OPEN_NULL, $IMG_GET_NULL, $IMG_MIME_FOLDER, $IMG_MIME_BINARY, $IMG_MIME_AUDIO, $IMG_MIME_VIDEO, $IMG_MIME_IMAGE, $IMG_MIME_TEXT, $IMG_MIME_UNKNOWN, $permget, $permedit, $permrename, $permsub, $formatperm, $permmove, $permdelete, $permchmod;
+  global $adminfile;
   $extraheaders = "<script language=javascript>\n"
                  ."function itemsel(item,ff,check,action,overcolor,outcolor,clickcolor) {\n"
                  ."  if (action == 1) {\n"
@@ -209,6 +213,7 @@ function home() {
 
   $count = "0";
   $a=1; $b=1; $content1 = ""; $content2 = "";
+  $p=0; $tcoloring=''; $totalsize=0;
 
   $handle=opendir($userdir.$d);
   while ($fileinfo = readdir($handle)) $filelist[] = $fileinfo;
@@ -355,7 +360,7 @@ function listdir($dir, $level_count = 0) {
 function logout() {
   setcookie("user","",time()-60*60*24*1);
   setcookie("pass","",time()-60*60*24*1);
-  $login=yes;
+  $login=null;
   page_header("Logout",false);
   echo "Your are now logged out."
       ."<br><br>"
@@ -564,7 +569,7 @@ function save($ncontent, $fename, $d, $next_action) {
 
 
 function cr() {
-  global $d, $userdir;
+  global $d, $userdir,$content,$adminfile;
   page_header("Create");
   opentitle("Create");
   opentable("100%");
@@ -1528,7 +1533,7 @@ function pass() {
                  ."      document.prefmod.encpas2.value = hashb;\n"
                  ."      return true;\n"
                  ."    } else {\n"
-                 ."      form.onsubmit=null;\n"
+                 ."      form.onsubmit=function(){return false;};\n"
                  ."      return false;\n"
                  ."    }\n"
                  ."  } \n"
@@ -1850,8 +1855,8 @@ function valid_js() {
 
 
 
-
-switch($_REQUEST['p']) {
+if ( isset($_REQUEST['p']) ) $p=$_REQUEST['p']; else $p=null;
+switch($p) {
   case "logout":
     logout();
 	break;
diff --git a/themes/classic/theme.php b/themes/classic/theme.php
index 84109a2..3654e69 100755
--- a/themes/classic/theme.php
+++ b/themes/classic/theme.php
@@ -1,5 +1,5 @@
 <?php
-//$theme = "classic";
+
 $tbcolor1 = "#E5E5E5";
 $tbcolor2 = "#EEEEEE";
 $tbcolor3 = "#FFCC99";
@@ -32,8 +32,10 @@
 function page_header($title,$show = true) {
   global $HEADER_CHARACTERSET, $permmakeuser, $permedituser, $permdeleteuser, $permbrowse, $permupload, $permcreate, $permuser, $permadmin, $d, $darkgrey, $lkcolor1, $lkcolor2, $lkcolor3, $lkcolor4, $background, $lightgrey, $incolor2, $incolor1, $black, $white, $user, $pass, $extraheaders, $sitetitle, $bgcolor1, $bgcolor2, $bgcolor3, $txtcolor1, $txtcolor2, $tbcolor4, $IMG_ACTION, $IMG_CHMOD, $IMG_DELETE, $IMG_MOVE;
   global $extraheaders, $sitetitle, $lastsess, $login, $viewing, $iftop, $bgcolor1, $bgcolor2, $bgcolor3, $txtcolor1, $txtcolor2, $user, $pass, $password, $debug, $issuper;
+  global $adminfile;
+
   echo "<html>\n<head>\n"
-      ."<title>$sitetitle :: $title »   Powerd by Arz FileManager 2.0 (Libra)</title>\n"
+      ."<title>$sitetitle :: $title �   Powerd by Arz FileManager 2.0 (Libra)</title>\n"
       ."<meta http-equiv=\"Content-Type\" content=\"text/html; charset=$HEADER_CHARACTERSET\">\n"
       ."</head>\n"
       ."<body bgcolor=\"#ffffff\">\n"

From 011827cd19d8aeb2dffbc440b4a4890fb3cb8c09 Mon Sep 17 00:00:00 2001
From: dvoraj42 <dvoraj42@fel.cvut.cz>
Date: Sun, 20 Mar 2011 17:42:59 +0100
Subject: [PATCH 02/12] Devision by zero bug FIX

---
 index.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/index.php b/index.php
index 55ed4cf..b97a5a2 100755
--- a/index.php
+++ b/index.php
@@ -49,7 +49,7 @@
 mysql_select_db ($config['db']['db']);
 
 $yay = 0; $user = ''; $pass = ''; $sess = '';
-$theme='';
+$theme=''; $logged=false;
 
 if ( isset($_REQUEST['login']) ) $user = $_REQUEST['login'];
 elseif ( isset($_COOKIE['user']) ) $user = $_COOKIE['user'];
@@ -97,11 +97,14 @@
 	setcookie('pass',$pass,time()+60*60*24*1);
 	setcookie('sess',$sess,time()+60*60*24*1);
 
+        $logged=true;
+
 } else {    
 	$er=false;
         if ( isset($_REQUEST['login']) || isset($_REQUEST['encpas']) ) $er = true;
 	$theme=$defaulttheme;
         require_once("themes/$theme/theme.php");
+        $logged=false;
 	login($er);
 }
 
@@ -123,7 +126,6 @@ function login($fail = false) {
 	setcookie('sess','',time()-60*60*24*1);
 	$user = '';
 	$pass = '';
-
   global $configindex, $extraheaders, $REQUEST_URI, $sqlpref, $lastpage, $bgcolor1, $bgcolor2,$bgcolor3, $tbcolor1, $tbcolor2, $fail, $login, $password, $user, $pass;
     $randsess = md5(md5(rand(1,25419876)).md5(date("DMjygia")));
     $extraheaders = "<script language=javascript>\n"
@@ -358,6 +360,7 @@ function listdir($dir, $level_count = 0) {
 
 
 function logout() {
+  global $logged;
   setcookie("user","",time()-60*60*24*1);
   setcookie("pass","",time()-60*60*24*1);
   $login=null;
@@ -365,6 +368,7 @@ function logout() {
   echo "Your are now logged out."
       ."<br><br>"
       ."<a href=?p=login>Click here to Log in again</a>";
+  $logged=false;
   page_footer();
 }
 

From e41c3e0bfeeceaaf62dc9dcee3b3df525ea3baa3 Mon Sep 17 00:00:00 2001
From: dvoraj42 <dvoraj42@fel.cvut.cz>
Date: Sun, 20 Mar 2011 19:40:02 +0100
Subject: [PATCH 03/12] browser Opera support

---
 index.php                |  7 +++++--
 themes/classic/theme.php | 21 +++++++++++----------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/index.php b/index.php
index b97a5a2..131d5d3 100755
--- a/index.php
+++ b/index.php
@@ -138,7 +138,7 @@ function login($fail = false) {
                    ."      document.login.submit();\n"
                    ."      return true;\n"
                    ."    } else {\n"
-                   ."      form.onsubmit=null;\n"
+                   ."      document.login.onsubmit=function(){return false;}\n"
                    ."      return false;\n"
                    ."    }\n"
                    ."  }\n"
@@ -1847,9 +1847,12 @@ function binl2hex(binarray) {
       return str;
     }
 
-    function valid_js() {
+    function valid_js() {      
       if (navigator.userAgent.indexOf(\"Mozilla/\") == 0) {
         return (parseInt(navigator.appVersion) >= 4);
+      
+      }else if( navigator.userAgent.indexOf(\"Opera/\") == 0) {
+        return (parseInt(navigator.appVersion) >= 9);
       }
       return false;
     }
diff --git a/themes/classic/theme.php b/themes/classic/theme.php
index 3654e69..fda14e4 100755
--- a/themes/classic/theme.php
+++ b/themes/classic/theme.php
@@ -41,10 +41,10 @@ function page_header($title,$show = true) {
       ."<body bgcolor=\"#ffffff\">\n"
       ."<style>\n"
       ."td { font-size : 80%;font-family : tahoma;color: $txtcolor1;}\n"
-      ."A:visited {color: \"$txtcolor2\";text-decoration: underline;}\n"
-      ."A:hover {color: \"$txtcolor1\";text-decoration: underline;}\n"
-      ."A:link {color: \"$txtcolor2\";text-decoration: underline;}\n"
-      ."A:active {color: \"$bgcolor2\";text-decoration: underline;}\n"
+      ."A:visited {color: $txtcolor2;text-decoration: underline;}\n"
+      ."A:hover {color: $txtcolor1;text-decoration: underline;}\n"
+      ."A:link {color: $txtcolor2;text-decoration: underline;}\n"
+      ."A:active {color: $bgcolor2;text-decoration: underline;}\n"
       ."BODY {color: $txtcolor1; FONT-SIZE: 10pt; FONT-FAMILY: Verdana, Tahoma, Arial, Helvetica, sans-serif; MARGIN: 0px 0px 10px; BACKGROUND-COLOR: $bgcolor1;\n"
       ."                      SCROLLBAR-BASE-COLOR: #5B628C; \n"
       ."                      MARGIN: 0px; SCROLLBAR-HIGHLIGHT-COLOR: #e0e5ff; \n"
@@ -53,14 +53,14 @@ function page_header($title,$show = true) {
       ."                      SCROLLBAR-DARKSHADOW-COLOR: #e0e5ff;}\n"
       ."SELECT,TEXTAREA      {FONT-SIZE: 8pt; FONT-FAMILY: Verdana, Arial, Helvetica, sans-serif; \n"
       ."                      BORDER-RIGHT: 1px solid; BORDER-TOP: 1px solid; BORDER-LEFT: 1px solid; \n"
-      ."                      BORDER-BOTTOM: 1px solid; BACKGROUND: #EFF1F3; COLOR: #000000; spacing: 0; \n"
+      ."                      BORDER-BOTTOM: 1px solid; BACKGROUND: #EFF1F3; COLOR: #000000; letter-spacing: 0; \n"
       ."                      BORDER-RIGHT-COLOR: #000000; BORDER-TOP-COLOR: #000000; BORDER-LEFT-COLOR: #000000; \n"
       ."                      BORDER-BOTTOM-COLOR: #000000; SCROLLBAR-BASE-COLOR: #5B628C; \n"
       ."                      MARGIN: 0px; SCROLLBAR-HIGHLIGHT-COLOR: #e0e5ff; \n"
       ."                      SCROLLBAR-SHADOW-COLOR: #e0e5ff; SCROLLBAR-3DLIGHT-COLOR: #5B628C; \n"
       ."                      SCROLLBAR-ARROW-COLOR: #e0e5ff; SCROLLBAR-TRACK-COLOR: #e0e5ff; \n"
       ."                      SCROLLBAR-DARKSHADOW-COLOR: #e0e5ff;}\n"
-      ."INPUT                {border: 1px solid #000000; spacing: 0; MARGIN: 0px 0px 0px 0px; margin-right: 0px; margin-left: 0px; margin-top: 0px; margin-bottom: 0px;}\n"
+      ."INPUT                {border: 1px solid #000000; letter-spacing: 0; MARGIN: 0px 0px 0px 0px; margin-right: 0px; margin-left: 0px; margin-top: 0px; margin-bottom: 0px;}\n"
 
       ."TEXTAREA             {FONT-FAMILY: Lucida Console, Courier New, Courier;}\n"
       .".title {FONT-WEIGHT: bold; FONT-SIZE: 10pt; COLOR: #000000; TEXT-ALIGN: center; FONT-FAMILY: Verdana, Arial, Helvetica, sans-serif}\n"
@@ -76,12 +76,12 @@ function page_header($title,$show = true) {
       .".barerror {BACKGROUND-COLOR: #d70000;}\n"
       .".txtinput {background: rgb(255, 255, 255) url('themes/classic/images/txtbar.jpg'); FONT-SIZE: 8pt; FONT-FAMILY: Verdana, Arial, Helvetica, sans-serif; \n"
       ."                      BORDER-RIGHT: 1px solid; BORDER-TOP: 1px solid; BORDER-LEFT: 1px solid; \n"
-      ."                      BORDER-BOTTOM: 1px solid; COLOR: #000000; spacing: 0; \n"
+      ."                      BORDER-BOTTOM: 1px solid; COLOR: #000000; letter-spacing: 0; \n"
       ."                      BORDER-RIGHT-COLOR: #000000; BORDER-TOP-COLOR: #000000; BORDER-LEFT-COLOR: #000000; \n"
       ."                      BORDER-BOTTOM-COLOR: #000000; MARGIN: 0px; }\n"
       .".button {BACKGROUND: #EFF1F3; FONT-SIZE: 8pt; FONT-FAMILY: Verdana, Arial, Helvetica, sans-serif; \n"
       ."                      BORDER-RIGHT: 1px solid; BORDER-TOP: 1px solid; BORDER-LEFT: 1px solid; \n"
-      ."                      BORDER-BOTTOM: 1px solid; COLOR: #000000; spacing: 0; \n"
+      ."                      BORDER-BOTTOM: 1px solid; COLOR: #000000; letter-spacing: 0; \n"
       ."                      BORDER-RIGHT-COLOR: #000000; BORDER-TOP-COLOR: #000000; BORDER-LEFT-COLOR: #000000; \n"
       ."                      BORDER-BOTTOM-COLOR: #000000; MARGIN: 0px; }\n"
       .".titlebar1         { COLOR: #FFFFFF; background: url(\"themes/classic/images/titlebar1.jpg\") repeat-x top left; }\n"
@@ -112,9 +112,10 @@ function page_header($title,$show = true) {
 
 
 function page_footer() {
-  global $nobar, $user;
+  global $nobar, $user, $logged;  
   /* keep this footer or you are just a big meaning :( */
-  if ($nobar != 1) echo "<tr class=titlebar2 align=right><td class=titlebar2 align=right height=15>\n"; if ($user) showdiskspace();
+  if ($nobar != 1) echo "<tr class=titlebar2 align=right><td class=titlebar2 align=right height=15>\n";
+  if ($logged==true) showdiskspace();
   echo "</table></table><tr><td align=right><font class=copyright>Powerd by <a href=http://www.osfilemanager.com/>osFileManager</a><br>&copy; 2003-".date("Y")." <a href=http://www.arzy.net/>Arzy LLC</a></font></table>\n"
       ."</body>\n"
       ."</html>\n";

From 651bf703093c428076c78dbec9d9802889bf831b Mon Sep 17 00:00:00 2001
From: dvoraj42 <dvoraj42@fel.cvut.cz>
Date: Fri, 8 Apr 2011 15:52:11 +0200
Subject: [PATCH 04/12] FileList - open readable files FIX

---
 index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.php b/index.php
index 131d5d3..13245dd 100755
--- a/index.php
+++ b/index.php
@@ -263,7 +263,7 @@ function home() {
         else $rename = "<img src=\"$IMG_RENAME_NULL\" border=0>\n";
         if ($permget == 1) $get = "<a href=\"".$adminfile."?p=view&file=".$fileinfo."&d=$d\"><img src=\"$IMG_GET\" border=0 onclick=\"itemsel(this,1,'filesel_$b',3,'#CCCCFF','$tcoloring','#FFCC99');\"></a>\n";
         else $get = "<img src=\"$IMG_GET_NULL\" border=0>\n";
-        if ($permget == 1) $filefile = "<a href=\"".$http.$d.$fileinfo."\" onclick=\"itemsel(this,1,'filesel_$b',3,'#CCCCFF','$tcoloring','#FFCC99');\">".$fileinfoa."</a>\n";
+        if ($permget == 1) $filefile = "<a href=\"".$http.$userdir.$d.$fileinfo."\" onclick=\"itemsel(this,1,'filesel_$b',3,'#CCCCFF','$tcoloring','#FFCC99');\">".$fileinfoa."</a>\n";
         else $filefile = "$fileinfoa\n";
 
         $content2[$b] ="<td><input type=checkbox name=\"filesel[$b]\" id=\"filesel_$b\" value=\"".$fileinfo."\" onclick=\"itemsel(this,1,'filesel_$b',3,'#CCCCFF','$tcoloring','#FFCC99');\">\n"

From 4ef6ff2db5cf44ff6f97bf4d1b156cc580ecef68 Mon Sep 17 00:00:00 2001
From: dvoraj42 <dvoraj42@fel.cvut.cz>
Date: Fri, 8 Apr 2011 17:18:22 +0200
Subject: [PATCH 05/12] mime_content_type sniff

---
 index.php | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/index.php b/index.php
index 13245dd..9561dcd 100755
--- a/index.php
+++ b/index.php
@@ -386,9 +386,18 @@ function getfilesize($size) {
 
 
 if (!function_exists('mime_content_type')) {
-   function mime_content_type($f) {
-       $f = escapeshellarg($f);
-       return trim( `file -bi $f` );
+   function mime_content_type($filename) {
+        $i=strrpos($filename,"."); $m=strtolower(substr($filename,$i+1));
+        switch($m){
+            case "js": return "application/javascript";
+            case "json": return "application/json";
+            case "jpg": case "jpeg": case "jpe": return "image/jpg";
+            case "png": case "gif": case "bmp": return "image/".$m;
+            case "css": return "text/css";
+            case "xml": return "application/xml";
+            case "html": case "htm": case "php": return "text/html";
+            default: return "";
+        }
    }
 }
 

From 276a52f30b2636d884a903fe6c925eb246ab341c Mon Sep 17 00:00:00 2001
From: dvoraj42 <dvoraj42@fel.cvut.cz>
Date: Fri, 8 Apr 2011 17:20:44 +0200
Subject: [PATCH 06/12] File list - edit files enable

---
 index.php | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/index.php b/index.php
index 9561dcd..4571c52 100755
--- a/index.php
+++ b/index.php
@@ -217,16 +217,16 @@ function home() {
   $a=1; $b=1; $content1 = ""; $content2 = "";
   $p=0; $tcoloring=''; $totalsize=0;
 
-  $handle=opendir($userdir.$d);
+  $handle=opendir($http.$userdir.$d);
   while ($fileinfo = readdir($handle)) $filelist[] = $fileinfo;
   natcasesort($filelist);
   while (list ($key, $fileinfo) = each ($filelist)) {
     if (strlen($fileinfo)>40) $fileinfoa = substr($fileinfo,0,40)."...";
     else $fileinfoa = $fileinfo;
     if ($fileinfo[0] != "." && $fileinfo[0] != ".." ) {
-      if (is_dir($userdir.$d.$fileinfo) && is_readable($userdir.$d.$fileinfo)) { 
-        if ($formatperm == 1) $perms = formatperms(@fileperms($userdir.$d.$fileinfo));
-        else $perms = substr(sprintf('%o', @fileperms($userdir.$d.$fileinfo)), -4);
+      if (is_dir($http.$userdir.$d.$fileinfo) && is_readable($http.$userdir.$d.$fileinfo)) {
+        if ($formatperm == 1) $perms = formatperms(@fileperms($http.$userdir.$d.$fileinfo));
+        else $perms = substr(sprintf('%o', @fileperms($http.$userdir.$d.$fileinfo)), -4);
 
         if ($permrename == 1) $lnk_rename = "<a href=\"".$adminfile."?p=ren&file=".$fileinfo."&d=$d\"><img src=\"$IMG_RENAME\" border=0 onclick=\"itemsel(this,1,'foldersel_$a',3,'#CCCCFF','$tcoloring','#FFCC99');\"></a>\n";
         else $lnk_rename = "<img src=\"$IMG_RENAME_NULL\" border=0>\n";
@@ -240,12 +240,12 @@ function home() {
                  ."<td align=\"center\">".$lnk_rename."\n"
                  ."<td> <td align=\"center\"> <td align=\"center\">$perms\n";
         $a++;
-      } elseif (!is_dir($userdir.$d.$fileinfo) && is_readable($userdir.$d.$fileinfo)) { 
-        if ($formatperm == 1) $perms = formatperms(@fileperms($userdir.$d.$fileinfo));
-        else $perms = substr(sprintf('%o', @fileperms($userdir.$d.$fileinfo)), -4);
-        $size = filesize($userdir.$d.$fileinfo);
+      } elseif (!is_dir($http.$userdir.$d.$fileinfo) && is_readable($http.$userdir.$d.$fileinfo)) {
+        if ($formatperm == 1) $perms = formatperms(@fileperms($http.$userdir.$d.$fileinfo));
+        else $perms = substr(sprintf('%o', @fileperms($http.$userdir.$d.$fileinfo)), -4);
+        $size = filesize($http.$userdir.$d.$fileinfo);
         $totalsize = $totalsize + $size;
-        $type = mime_content_type($userdir.$d.$fileinfo);
+        $type = mime_content_type($http.$userdir.$d.$fileinfo);        
         if (substr($type,0,4) == "text") $mimeimage = "<img src=\"$IMG_MIME_TEXT\">";
         elseif (substr($type,0,5) == "image") $mimeimage = "<img src=\"$IMG_MIME_IMAGE\">";
         elseif (substr($type,0,11) == "application") $mimeimage = "<img src=\"$IMG_MIME_BINARY\">";
@@ -256,9 +256,9 @@ function home() {
         elseif (substr($type,0,9) == "multipart") $mimeimage = "<img src=\"$IMG_MIME_TEXT\">";
         else $mimeimage = "<img src=\"$IMG_MIME_UNKNOWN\">";
 
-        if ((substr($type,0,4) == "text" || $size == 0) && $permedit == 1) $edit = "<a href=\"".$adminfile."?p=edit&fename=".$fileinfo."&d=$d\"><img src=\"$IMG_EDIT\" border=0 onclick=\"itemsel(this,1,'filesel_$b',3,'#CCCCFF','$tcoloring','#FFCC99');\"></a>\n";
-        elseif (substr($type,0,4) == "text" || $size == 0) $edit = "<a href=\"".$adminfile."?p=edit&fename=".$fileinfo."&d=$d\"><img src=\"$IMG_EDIT_NULL\" border=0>\n"; 
-        else $edit = "";
+        if ((substr($type,0,4) == "text" || $size == 0) && $permedit == 1) $edit = "<a href=\"".$adminfile."?p=edit&fename=".$fileinfo."&d=$d&next_action=0\"><img src=\"$IMG_EDIT\" border=0 onclick=\"itemsel(this,1,'filesel_$b',3,'#CCCCFF','$tcoloring','#FFCC99');\"></a>\n";
+        elseif (substr($type,0,4) == "text" || $size == 0) $edit = "<a href=\"".$adminfile."?p=edit&fename=".$fileinfo."&d=$d&next_action=0\"><img src=\"$IMG_EDIT_NULL\" border=0>\n";
+        else $edit = "";        
         if ($permrename == 1) $rename = "<a href=\"".$adminfile."?p=ren&file=".$fileinfo."&d=$d\"><img src=\"$IMG_RENAME\" border=0 onclick=\"itemsel(this,1,'filesel_$b',3,'#CCCCFF','$tcoloring','#FFCC99');\"></a>\n";
         else $rename = "<img src=\"$IMG_RENAME_NULL\" border=0>\n";
         if ($permget == 1) $get = "<a href=\"".$adminfile."?p=view&file=".$fileinfo."&d=$d\"><img src=\"$IMG_GET\" border=0 onclick=\"itemsel(this,1,'filesel_$b',3,'#CCCCFF','$tcoloring','#FFCC99');\"></a>\n";
@@ -283,6 +283,7 @@ function home() {
   @closedir($userdir.$d);
   $filetotal = $b;
   $foldertotal = $a;
+  $pdir='';
   echo "<tr bgcolor=\"$tbcolor3\" width=20 class=titlebar1 height=25><td width=10 align=left valign=bottom><a href=\"javascript:selectall();\"><img src=\"$IMG_CHECK\" border=0></a> "
       ."<td class=theader width=420>Filename\n"
       ."<td align=\"center\" width=80 class=theader colspan=3>Actions<font size=1>\n"

From ac443c5765834c17776f2c25c868d7cbab4b7f00 Mon Sep 17 00:00:00 2001
From: dvoraj42 <dvoraj42@fel.cvut.cz>
Date: Fri, 8 Apr 2011 17:21:26 +0200
Subject: [PATCH 07/12] file Edit / Save upgrade + FIX

---
 index.php | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/index.php b/index.php
index 4571c52..40b22c4 100755
--- a/index.php
+++ b/index.php
@@ -508,9 +508,10 @@ function upload($upfile, $ndir, $d) {
 }
 
 
-function edit($fename) {
-  global $userdir, $d, $next_action, $message;
-  if ($fename && file_exists($userdir.$d.$fename)) {
+function edit($fename,$next_action) {
+  global $userdir, $d, $message,$adminfile,$http;  
+  $sel1=''; $sel2='';
+  if ($fename && file_exists($http.$userdir.$d.$fename)) {      
     if ($next_action == 2) $sel2 = " checked";
     else $sel1 = " checked";
     page_header("Edit");
@@ -520,15 +521,9 @@ function edit($fename) {
     else echo "Editing: '".$d.$fename."'<br>\n";
     echo "<form action=\"".$adminfile."?p=save\" method=\"post\">\n"
         ."<textarea cols=\"73\" rows=\"40\" name=\"ncontent\" wrap=off>\n";
-    $handle = fopen ($userdir.$d.$fename, "r");
-    $contents = "";
-    while ($x<1) {
-      $data = @fread ($handle, filesize ($userdir.$d.$fename));
-      if (strlen($data) == 0) break;
-      $contents .= $data;
-    }
-    fclose ($handle);
-    echo  ereg_replace ("</textarea>","&lt;/textarea&gt;",$contents)
+    $handle = fopen ($http.$userdir.$d.$fename, "r");    
+    $contents = file_get_contents($http.$userdir.$d.$fename);        
+    echo  str_replace ("</textarea>","&lt;/textarea&gt;",$contents)
         ."</textarea>\n"
         ."<br>\n"
         ."<input type=\"hidden\" name=\"d\" value=\"".$d."\">\n"
@@ -553,9 +548,9 @@ function edit($fename) {
 
 
 function save($ncontent, $fename, $d, $next_action) {
-  global $userdir, $message;
+  global $userdir, $message,$http;
   if ($fename) {
-    $fp = fopen($userdir.$d.$fename, "w");
+    $fp = fopen($http.$userdir.$d.$fename, "w");
     if ($ncontent) {
       if(fwrite($fp, stripslashes($ncontent))) {
         $fp = null;
@@ -1886,7 +1881,7 @@ function valid_js() {
     else permerror("You do not currently have permission to upload.\n");
     break;
   case "edit":
-    if ($permedit == 1) edit($_REQUEST['fename']);
+    if ($permedit == 1) edit($_REQUEST['fename'],$_REQUEST['next_action']);
     else permerror("You do not currently have permission to edit.\n");
     break;
   case "save":

From cc37352fb102d72395b84f0b92b523fc2a86e546 Mon Sep 17 00:00:00 2001
From: dvoraj42 <dvoraj42@fel.cvut.cz>
Date: Sun, 17 Apr 2011 09:28:10 +0200
Subject: [PATCH 08/12] requests - small fixes

---
 index.php | 56 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/index.php b/index.php
index 40b22c4..6957bc3 100755
--- a/index.php
+++ b/index.php
@@ -636,7 +636,7 @@ function create($nfname, $isfolder, $d, $ndir) {
 
 
 function ren($file) {
-  global $d;
+  global $d,$adminfile;
   if (!$file == "") {
     page_header("Rename");
     opentitle("Rename");
@@ -678,14 +678,18 @@ function renam($rename, $nrename, $d) {
 
 
 function bulk_submit($bulk_action,$d) {
-  global $_POST, $sqlpref, $d, $tbcolor1, $userdir, $tbcolor2;
+  global $_POST, $sqlpref, $d, $tbcolor1, $userdir, $tbcolor2, $item;
   if (!$bulk_action) $error .= "Please select an action.<br>\n";
-  if (!$_POST[filesel] && !$_POST[foldersel]) $error .= "Please select at least one file to perform an action on.<br>\n";
-  if ($_POST[filesel] && $_POST[foldersel]) $delvar = "files/folders and all of their content";
-  elseif ($_POST[filesel] && count($_POST[filesel]) > 1) $delvar = "files";
-  elseif ($_POST[foldersel] && count($_POST[foldersel]) > 1) $delvar = "folders and all of their content";
-  elseif ($_POST[filesel]) $delvar = "file";
-  elseif ($_POST[foldersel]) $delvar = "folder and all of its contents";
+  $filesel=null; $foldersel=null; $error='';
+  if( isset($_POST["filesel"]) )$filesel=$_POST["filesel"];  
+  if( isset($_POST["foldersel"]) )$foldersel=$_POST["foldersel"];
+
+  if (!$filesel && !$foldersel) $error .= "Please select at least one file to perform an action on.<br>\n";
+  if ($filesel && $foldersel) $delvar = "files/folders and all of their content";
+  elseif ($filesel && count($filesel) > 1) $delvar = "files";
+  elseif ($foldersel && count($foldersel) > 1) $delvar = "folders and all of their content";
+  elseif ($filesel) $delvar = "file";
+  elseif ($foldersel) $delvar = "folder and all of its contents";
   if (!$error && $bulk_action == "delete") {
     page_header("Delete");
     opentitle("Delete");
@@ -695,14 +699,14 @@ function bulk_submit($bulk_action,$d) {
         ."<tr><td><font class=error>Are you sure you want to delete the following $delvar?</font><br>\n"
         ."<tr><td bgcolor=$tbcolor1>\n";
     $a=0; $b=0;
-    if (is_array($_POST[filesel])) {
-      foreach ($_POST[filesel] as $file) {
+    if (is_array($filesel)) {
+      foreach ($filesel as $file) {
         echo "$file <input type=hidden name=filesel[$a] value=$file><br>\n";
         $a++;
       }
     }
-    if (is_array($_POST[foldersel])) {
-      foreach ($_POST[foldersel] as $file) {
+    if (is_array($foldersel)) {
+      foreach ($foldersel as $file) {
         echo "$file<input type=hidden name=foldersel[$b] value=$file><br>\n";
         $b++;
       }
@@ -724,14 +728,14 @@ function bulk_submit($bulk_action,$d) {
         ."<tr><td bgcolor=$tbcolor1>\n";
 
     $a=0; $b=0;
-    if (is_array($_POST[filesel])) {
-      foreach ($_POST[filesel] as $file) {
+    if (is_array($filesel)) {
+      foreach ($filesel as $file) {
         echo "$file <input type=hidden name=filesel[$a] value=$file><br>\n";
         $a++;
       }
     }
-    if (is_array($_POST[foldersel])) {
-      foreach ($_POST[foldersel] as $file) {
+    if (is_array($foldersel)) {
+      foreach ($foldersel as $file) {
         echo "$file<input type=hidden name=foldersel[$b] value=$file><br>\n";
         $b++;
       }
@@ -758,25 +762,25 @@ function bulk_submit($bulk_action,$d) {
         ."<tr><td bgcolor=$tbcolor1>\n";
 
     $a=0; $b=0;
-    if (is_array($_POST[filesel])) {
-      foreach ($_POST[filesel] as $file) {
+    if (is_array($filesel)) {
+      foreach ($filesel as $file) {
         echo "$file <input type=hidden name=filesel[$a] value=$file><br>\n";
         $a++;
       }
     }
-    if (is_array($_POST[foldersel])) {
-      foreach ($_POST[foldersel] as $file) {
+    if (is_array($foldersel)) {
+      foreach ($foldersel as $file) {
         echo "$file<input type=hidden name=foldersel[$b] value=$file><br>\n";
         $b++;
       }
     }
     
-    if (is_array($_POST[filesel])) {
-      $keys = array_keys($_POST[filesel]);
-      $chval = substr(sprintf('%o', @fileperms($userdir.$d.$_POST[filesel][$keys{0}])), -4);
+    if (is_array($filesel)) {
+      $keys = array_keys($filesel);
+      $chval = substr(sprintf('%o', @fileperms($userdir.$d.$filesel[$keys{0}])), -4);
     } else {
-      $keys = array_keys($_POST[foldersel]);
-      $chval = substr(sprintf('%o', @fileperms($userdir.$d.$_POST[foldersel][$keys{0}])), -4);
+      $keys = array_keys($foldersel);
+      $chval = substr(sprintf('%o', @fileperms($userdir.$d.$foldersel[$keys{0}])), -4);
     }
     echo "<tr><td><br><table cellpadding=0 cellspacing=0>\n"
 /* Work in Progess
@@ -1968,7 +1972,7 @@ function valid_js() {
     if ($permmove != 1 && $_REQUEST['bulk_action'] == "move") permerror("You do not currently have permission to move files/folders.\n");
     elseif ($permdelete != 1 && $_REQUEST['bulk_action'] == "delete") permerror("You do not currently have permission to delete files/folders.\n");
     elseif ($permchmod != 1 && $_REQUEST['bulk_action'] == "chmod") permerror("You do not currently have permission to change file/folders permissions.\n");
-    else bulk_action($_REQUEST['bulk_action'], $d,$_REQUEST['ndir']);
+    else bulk_action($_REQUEST['bulk_action'], $d,@$_REQUEST['ndir']);
     break;
   case "users":
     if ($permedituser == "1" || $permedituser == "1") usermod();

From 5c6480cea5b2821badc7c4e09490b80cd0463f1c Mon Sep 17 00:00:00 2001
From: dvoraj42 <dvoraj42@fel.cvut.cz>
Date: Sun, 17 Apr 2011 09:39:35 +0200
Subject: [PATCH 09/12] create folder - inherit rights from parent

---
 index.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/index.php b/index.php
index 6957bc3..e830094 100755
--- a/index.php
+++ b/index.php
@@ -607,13 +607,15 @@ function cr() {
 function create($nfname, $isfolder, $d, $ndir) {
   global $userdir, $default_perm;
   if (!$d) $dis = "/";
+  $error='';
   page_header("Create");
   opentitle("Create");
   opentable("100%");
   if (!$nfname == "") {
     if (!file_exists($userdir.$d.$nfname)) {
       if ($isfolder == 1) {
-        if(mkdir($userdir.$d.$nfname, $default_perm)) $ok = "Your directory, '".$dis.$d.$ndir.$nfname."', was succesfully created.\n";
+        $perm=substr(sprintf('%o', @fileperms($userdir.$d)), -4);
+        if(mkdir($userdir.$d.$nfname, $perm))$ok = "Your directory, '".$dis.$d.$ndir.$nfname."', was succesfully created.\n";
         else $error = "The directory, '/".$d.$ndir.$nfname."', could not be created. Check to make sure the permisions on the directory is set to '0777'.\n";
       } else {
         if(fopen($userdir.$d.$nfname, "w")) {
@@ -624,7 +626,7 @@ function create($nfname, $isfolder, $d, $ndir) {
       if ($ok) echo "<font class=ok>$ok</font><br><a href=\"?d=$d\">Return</a>\n";
       if ($error) echo "<font class=error>$error</font><br><a href=\"javascript:history.back();\">Back</a>\n";
     } else {
-      if (is_dir($userdir.d.$nfname)) echo "<font class=error>A directory by this name already exists. Please choose another.</font><br><a href=\"javascript:history.back();\">Back</a>\n";
+      if (is_dir($userdir.$d.$nfname)) echo "<font class=error>A directory by this name already exists. Please choose another.</font><br><a href=\"javascript:history.back();\">Back</a>\n";
       else echo "<font class=error>A file/directory by this name already exists. Please choose another.</font><br><a href=\"javascript:history.back();\">Back</a>\n";
     }
   } else {

From f46a79124d257502b873b4d38b36bf4c755353b1 Mon Sep 17 00:00:00 2001
From: dvoraj42 <dvoraj42@fel.cvut.cz>
Date: Sun, 17 Apr 2011 09:50:46 +0200
Subject: [PATCH 10/12] delete / remove, ... files with blanks in name

---
 index.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/index.php b/index.php
index e830094..a7f10fd 100755
--- a/index.php
+++ b/index.php
@@ -703,13 +703,13 @@ function bulk_submit($bulk_action,$d) {
     $a=0; $b=0;
     if (is_array($filesel)) {
       foreach ($filesel as $file) {
-        echo "$file <input type=hidden name=filesel[$a] value=$file><br>\n";
+        echo "$file <input type=hidden name=\"filesel[$a]\" value=\"$file\"><br>\n";
         $a++;
       }
     }
     if (is_array($foldersel)) {
       foreach ($foldersel as $file) {
-        echo "$file<input type=hidden name=foldersel[$b] value=$file><br>\n";
+        echo "$file<input type=hidden name=\"foldersel[$b]\" value=\"$file\"><br>\n";
         $b++;
       }
     }
@@ -732,13 +732,13 @@ function bulk_submit($bulk_action,$d) {
     $a=0; $b=0;
     if (is_array($filesel)) {
       foreach ($filesel as $file) {
-        echo "$file <input type=hidden name=filesel[$a] value=$file><br>\n";
+        echo "$file <input type=hidden name=\"filesel[$a]\" value=\"$file\"><br>\n";
         $a++;
       }
     }
     if (is_array($foldersel)) {
       foreach ($foldersel as $file) {
-        echo "$file<input type=hidden name=foldersel[$b] value=$file><br>\n";
+        echo "$file<input type=hidden name=\"foldersel[$b]\" value=\"$file\"><br>\n";
         $b++;
       }
     }
@@ -766,13 +766,13 @@ function bulk_submit($bulk_action,$d) {
     $a=0; $b=0;
     if (is_array($filesel)) {
       foreach ($filesel as $file) {
-        echo "$file <input type=hidden name=filesel[$a] value=$file><br>\n";
+        echo "$file <input type=hidden name=\"filesel[$a]\" value=\"$file\"><br>\n";
         $a++;
       }
     }
     if (is_array($foldersel)) {
       foreach ($foldersel as $file) {
-        echo "$file<input type=hidden name=foldersel[$b] value=$file><br>\n";
+        echo "$file<input type=hidden name=\"foldersel[$b]\" value=\"$file\"><br>\n";
         $b++;
       }
     }

From 3aba7523058222df11b0d64a141ca7d353aa7832 Mon Sep 17 00:00:00 2001
From: dvoraj42 <dvoraj42@fel.cvut.cz>
Date: Tue, 26 Apr 2011 19:10:45 +0200
Subject: [PATCH 11/12] ismail - replaced deprecated eregi

---
 index.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/index.php b/index.php
index a7f10fd..1492126 100755
--- a/index.php
+++ b/index.php
@@ -445,9 +445,9 @@ function permerror($error) {
 } 
 
 
-function ismail($str) {
-  if(eregi("^[\'+\\./0-9A-Z^_\`a-z{|}~\-]+@[a-zA-Z0-9_\-]+(\.[a-zA-Z0-9_\-]+){1,5}$",$str) || !$str) return true;
-  else return false;
+function ismail($str) {  
+  if (preg_match('/^([a-z0-9])(([-a-z0-9._])*([a-z0-9]))*\@([a-z0-9])(([a-z0-9-])*([a-z0-9]))+' . '(\.([a-z0-9])([-a-z0-9_-])?([a-z0-9])+)+$/i', $str)) return true;
+    else return false;
 }
 
 

From 1fe4a0fca7415ec3d03fc420948667ce4db30857 Mon Sep 17 00:00:00 2001
From: dvoraj42 <dvoraj42@fel.cvut.cz>
Date: Tue, 26 Apr 2011 19:25:41 +0200
Subject: [PATCH 12/12] user CP-preferences-FIX (now permission view functions,
 no error editing name, new mail validation, keep filled values on error
 correting)

---
 index.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/index.php b/index.php
index 1492126..0cb6ff4 100755
--- a/index.php
+++ b/index.php
@@ -1603,9 +1603,14 @@ function password($oldpass, $newpass, $cnewpass) {
 
 
 function prefs() {
-  global $user, $d, $error, $sqlpref, $extraheaders, $config_email, $config_name, $config_theme, $config_language, $config_recycle, $config_formatperm;
+  global $user, $d, $error, $sqlpref, $extraheaders, $config_recycle;
   $result = mysql_query("SELECT id, user, email, name, theme, language, recycle, formatperm, permrecycle FROM ".$GLOBALS['config']['db']['pref']."users WHERE user='".$user."'");
   list($uid, $uname, $email, $name, $theme, $language, $recycle, $formatperm, $permrecycle) = mysql_fetch_row($result);
+  if (isset($_REQUEST["config_name"])) $config_name=$_REQUEST["config_name"]; else $config_name='';
+  if (isset($_REQUEST["config_email"])) $config_email=$_REQUEST["config_email"]; else $config_email='';
+  if (isset($_REQUEST["config_theme"])) $config_theme=$_REQUEST["config_theme"]; else $config_theme='';
+  if (isset($_REQUEST["config_language"])) $config_language=$_REQUEST["config_language"]; else $config_language='';
+  if (isset($_REQUEST["config_formatperm"])) $config_formatperm=$_REQUEST["config_formatperm"]; else $config_formatperm='';
   if ($error){
     $email = $config_email;
     $name = $config_name;
@@ -1619,6 +1624,7 @@ function prefs() {
   opentable("100%");
   echo "<table>\n"
       ."<form name=\"prefs\" action=\"?p=saveprefs\" method=\"post\">\n";
+  $perm1 = ''; $perm2 = '';
   if ($formatperm == '0') $perm1 = " checked";
   elseif ($formatperm == '1') $perm2 = " checked"; 
   if ($recycle == 0) $rec1 = " checked";
@@ -1662,7 +1668,7 @@ function prefs() {
   }
   echo "<tr><td>Permission View: <td>\n"
       ."<input type=\"radio\" name=\"config_formatperm\" id=\"perm1\" value=\"0\" $perm1><label for=\"perm1\"> UNIX (0644)</label>&nbsp;&nbsp;&nbsp;\n"
-      ."<input type=\"radio\" name=\"config_formatperm\" id=\"perm2\" value=\"1\" checked><label for=\"perm2\"> Symbolic (-rw-r--r--)</label>\n"
+      ."<input type=\"radio\" name=\"config_formatperm\" id=\"perm2\" value=\"1\" $perm2><label for=\"perm2\"> Symbolic (-rw-r--r--)</label>\n"
       ."<input type=hidden name=d value=\"$d\">\n"
       ."<tr><td colspan=\"2\"><br><input type=\"submit\" name=\"submitButtonName\" value=\"Save\" border=\"0\" class=\"button\">\n"
       ."</td></tr></form></table>\n";
@@ -1927,7 +1933,7 @@ function valid_js() {
     else permerror("You do not currently have permission to change your preferences.\n");
     break;
   case "saveprefs":
-    if ($permpass == 1) preferences($_REQUEST['config_email'], $_REQUEST['config_name'], $_REQUEST['config_theme'], $_REQUEST['config_language'], $_REQUEST['config_recycle'], $_REQUEST['config_formatperm']);
+    if ($permpass == 1) preferences(@$_REQUEST['config_email'], @$_REQUEST['config_name'], @$_REQUEST['config_theme'], @$_REQUEST['config_language'], @$_REQUEST['config_recycle'], @$_REQUEST['config_formatperm']);
     else permerror("You do not currently have permission to change your preferences.\n");
     break;
   case "super":