From 604ff565e10596016753459243b35a1b075f007e Mon Sep 17 00:00:00 2001
From: SJ <sj@acts.hu>
Date: Tue, 11 Sep 2012 15:12:58 +0200
Subject: [PATCH] limit folder names to the top level

---
 webui/model/folder/folder.php | 2 +-
 webui/model/health/health.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/webui/model/folder/folder.php b/webui/model/folder/folder.php
index 25ad494d..1f7a17fe 100644
--- a/webui/model/folder/folder.php
+++ b/webui/model/folder/folder.php
@@ -85,7 +85,7 @@ class ModelFolderFolder extends Model {
    public function get_folders_by_string($s = '') {
       if(strlen($s) < 2) { return array(); }
 
-      $query = $this->db->query("SELECT name FROM `" . TABLE_FOLDER . "` WHERE name LIKE ? ORDER BY name ASC", array($s . "%") );
+      $query = $this->db->query("SELECT name FROM `" . TABLE_FOLDER . "` WHERE parent_id=0 AND name LIKE ? ORDER BY name ASC", array($s . "%") );
 
       if(isset($query->rows)) { return $query->rows; }
 
diff --git a/webui/model/health/health.php b/webui/model/health/health.php
index 9a31b255..55037c2c 100644
--- a/webui/model/health/health.php
+++ b/webui/model/health/health.php
@@ -70,10 +70,10 @@ class ModelHealthHealth extends Model {
          if(isset($a[0]) && $a[0]) { $_m[$a[0]] = $a[1]; }
       }
 
-      $mem_percentage = sprintf("%.2f", 100*($_m['MemTotal:'] - $_m['MemFree:'] - $_m['Cached:']) / $_m['MemTotal:']);
-      $swap_percentage = sprintf("%.2f", 100*($_m['SwapTotal:'] - $_m['SwapFree:']) / $_m['SwapTotal:']);
+      $mem_percentage = isset($_m['MemTotal:']) ? sprintf("%.2f", 100*($_m['MemTotal:'] - $_m['MemFree:'] - $_m['Cached:']) / $_m['MemTotal:']) : "0";
+      $swap_percentage = isset($_m['SwapTotal:']) ? sprintf("%.2f", 100*($_m['SwapTotal:'] - $_m['SwapFree:']) / $_m['SwapTotal:']) : "0";
 
-      return array(sprintf("%.0f", $_m['MemTotal:'] / 1000), $mem_percentage, sprintf("%.0f", $_m['SwapTotal:'] / 1000), $swap_percentage);
+      return array(sprintf("%.0f", @$_m['MemTotal:'] / 1000), $mem_percentage, sprintf("%.0f", @$_m['SwapTotal:'] / 1000), $swap_percentage);
    }