added file count in Website quota #2105

xaver

2012-02-28 b4daebfaff3a7cfb84f5700de0fda1c4dc943a03

added file count in Website quota #2105

 interface/web/sites/lib/lang/de_user_quota_stats_list.lng

@@ -4,5 +4,5 @@
$wb['system_user_txt'] = 'Linux user';
$wb['used_txt'] = 'Used space';
$wb['hard_txt'] = 'Hard limit';
$wb['soft_txt'] = 'Soft limit';
$wb["files_txt"] = 'Dateien';
?>

 interface/web/sites/lib/lang/en_user_quota_stats_list.lng

@@ -5,4 +5,5 @@
$wb["used_txt"] = 'Used space';
$wb["hard_txt"] = 'Hard limit';
$wb["soft_txt"] = 'Soft limit';
$wb["files_txt"] = 'Single files';
?>

 interface/web/sites/templates/user_quota_stats_list.htm

@@ -12,11 +12,13 @@
            <th class="tbl_col_system_user" scope="col" style="text-align:right;"><tmpl_var name="used_txt"></th>
            <th class="tbl_col_system_user" scope="col" style="text-align:right;"><tmpl_var name="soft_txt"></th>
            <th class="tbl_col_system_user" scope="col" style="text-align:right;"><tmpl_var name="hard_txt"></th>
            <th class="tbl_col_system_user" scope="col" style="text-align:right;"><tmpl_var name="files_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
          </tr>
          <tr>
            <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
            <td class="tbl_col_system_user"><input type="text" name="search_system_user" value="{tmpl_var name='search_system_user'}" /></td>
            <td class="tbl_col_system_user">&nbsp;</td>
            <td class="tbl_col_system_user">&nbsp;</td>
            <td class="tbl_col_system_user">&nbsp;</td>
            <td class="tbl_col_system_user">&nbsp;</td>
@@ -31,6 +33,7 @@
            <td class="tbl_col_used" style="text-align:right;"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="used"}</a></td>
            <td class="tbl_col_soft" style="text-align:right;"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="soft"}</a></td>
            <td class="tbl_col_hard" style="text-align:right;"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="hard"}</a></td>
            <td class="tbl_col_files" style="text-align:right;"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="files"}</a></td>
            <td class="tbl_col_buttons">
              <div class="buttons icons16">    
                &nbsp;
@@ -41,7 +44,7 @@
        </tbody>
        <tfoot>
          <tr>
            <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
            <td class="tbl_footer tbl_paging" colspan="7"><tmpl_var name="paging"></td>
          </tr>
        </tfoot>
      </table>

 interface/web/sites/user_quota_stats.php

@@ -44,10 +44,12 @@
        $rec['used'] = $monitor_data['user'][$username]['used'];
        $rec['soft'] = $monitor_data['user'][$username]['soft'];
        $rec['hard'] = $monitor_data['user'][$username]['hard'];
        $rec['files'] = $monitor_data['user'][$username]['files'];
        
        if (!is_numeric($rec['used'])) $rec['used']=$rec['used'][1];
        if (!is_numeric($rec['soft'])) $rec['soft']=$rec['soft'][1];
        if (!is_numeric($rec['hard'])) $rec['hard']=$rec['hard'][1];
        if (!is_numeric($rec['files'])) $rec['files']=$rec['files'][1];
        
        if($rec['used'] > 1024) {
            $rec['used'] = round($rec['used'] / 1024,2).' MB';

 server/lib/classes/monitor_tools.inc.php

@@ -241,10 +241,12 @@
                        $data['user'][$username]['used'] += $s[2];
                        $data['user'][$username]['soft'] += $s[3];
                        $data['user'][$username]['hard'] += $s[4];
                        $data['user'][$username]['files'] += $s[5];
                    } else {
                        $data['user'][$username]['used'] = $s[2];
                        $data['user'][$username]['soft'] = $s[3];
                        $data['user'][$username]['hard'] = $s[4];
                        $data['user'][$username]['files'] = $s[5];
                    }
                }
            }