Changeset 646

Timestamp:

06/24/09 14:39:49 (9 months ago)

Author:

mclight77

Message:

See details in NEWS (dates 090621 and 090624)

Location:

trunk

Files:

• NEWS (modified) (1 diff)
• TODO (modified) (2 diffs)
• configure.in (modified) (1 diff)
• m4/acinclude.m4 (modified) (1 diff)
• m4/fsusage.m4 (modified) (1 diff)
• php/icon/classic/user_active.png (added)
• php/icon/classic/user_inactive.png (added)
• php/icon/classic/user_moved.png (added)
• php/icon/classic/user_off.png (added)
• php/lang/lang.EN (modified) (5 diffs)
• php/lang/lang.KOI8-R (modified) (4 diffs)
• php/lang/lang.UTF8 (modified) (4 diffs)
• php/lang/lang.WIN1251 (modified) (4 diffs)
• php/lframe_users.php (modified) (3 diffs)
• php/samstools.php (modified) (2 diffs)
• php/src/grouptray.php (modified) (4 diffs)
• php/src/proxybuttom_9_down.php (modified) (2 diffs)
• php/src/shablontray.php (modified) (1 diff)
• php/src/userbuttom_1_prop.php (modified) (1 diff)
• php/src/usersbuttom_91_test.php (modified) (2 diffs)
• php/src/userstray.php (modified) (5 diffs)
• php/src/usertray.php (modified) (4 diffs)
• plugins/fsusage/getfsusage.cpp (modified) (11 diffs)

trunk/NEWS

@@ -155 +155 @@
 090615
   ИсправлеМ #370
+090621
+  МПжМП пПставОть статус пПльзПвателя "вП вреЌеММПЌ шаблПМе"
+  ЕслО пПльзПватель вП вреЌеММПЌ шаблПМе, тП в спОске пПльзПвателей пПказывается лОЌОт
+  вреЌеММПгП шаблПМа О выЎеляется желтыЌ цветПЌ.
+  В ОМфПрЌацОО пПльзПвателя ОспПльзПваММый трафОк пПказывается в фПрЌатОрПваММПЌ вОЎе.
+  ЗаЌеМеМы ОкПМкО статуса пПльзПвателя.
+090624
+  ИсправлеМа кПЌпОляцОя плагОМа fsusage в FreeBSD (прПвереМП Ма 7.2)

trunk/TODO

@@ -118 +118 @@
             РазЌер Мегабайта, учОтываеЌПгП вашОЌ прПвайЎерПЌ (byte)
   2.22) ПеревестО Ма русскОй язык разЎел МастрПйкО автПрОзацОО
-  2.23) ДПЎелать ОЌпПрт пПльзПвателей Оз OpenLDAP (спОсПк пПльзПвателей с указаММПй втПрОчМПй группПй)
++ 2.23) ДПЎелать ОЌпПрт пПльзПвателей Оз OpenLDAP (спОсПк пПльзПвателей с указаММПй втПрОчМПй группПй)
+  2.24) ПрО сПзЎаМОО МПвПгП спОска (redirlisttray.php) автПЌатОческО переÑ
+ПЎОть в реЎактОрПваМОе этПгП спОска.
++ 2.25) ЕслО статус пПльзПвателя "переЌещеМ вП вреЌеММый шаблПМ", тП пПказывать квПту втПрОчМПгП шаблПМа О выЎелять ее желтыЌ цветПЌ.
 
 3) ДеЌПМы
@@ -152 +155 @@
   3.18) Еще раз прПсЌПтреть рабПту сП спОскаЌО (TemplateList, UrlGroupList, ...). МПжет, ОЌеет сЌысл сПзЎать базПвый класс?
   3.19) ДПбавОть ПграМОчеМОе пП расшОреМОяЌ файлПв еслО Ме ОспПльзуется встрПеММый реЎОректПр.
-  3.20) ПрО сПзЎаМОО МПвПгП спОска (redirlisttray.php) автПЌатОческО переÑ
-ПЎОть в реЎактОрПваМОе этПгП спОска.
 
 4) ДПкуЌеМтацОя

trunk/configure.in

@@ -41 +41 @@
 gl_SYS_PROC_UPTIME
 gl_GETLOADAVG([plugins/loadavg])
-#gl_FSUSAGE
+gl_FSUSAGE
 #gl_LIST_MOUNTED_FILE_SYSTEMS
 

trunk/m4/acinclude.m4

@@ -9 +9 @@
 m4_include([m4/uptime.m4])
 m4_include([m4/getloadavg.m4])
+m4_include([m4/fsusage.m4])

trunk/m4/fsusage.m4

@@ -13 +13 @@
 AC_DEFUN([gl_FSUSAGE],
 [
-  AC_CHECK_HEADERS(sys/param.h)
-  AC_CHECK_HEADERS(sys/vfs.h sys/fs_types.h)
-  AC_CHECK_HEADERS(sys/mount.h, [], [],
-    [AC_INCLUDES_DEFAULT
-     [#if HAVE_SYS_PARAM_H
-       #include <sys/param.h>
-      #endif]])
-  gl_FILE_SYSTEM_USAGE([gl_cv_fs_space=yes], [gl_cv_fs_space=no])
-  if test $gl_cv_fs_space = yes; then
-    AC_LIBOBJ(fsusage)
-    gl_PREREQ_FSUSAGE_EXTRA
-  fi
+  AC_CHECK_HEADERS(mntent.h sys/statvfs.h sys/mount.h)
+  AC_CHECK_FUNCS(getmntent getmntinfo)
 ])
-
-# Try to determine how a program can obtain file system usage information.
-# If successful, define the appropriate symbol (see fsusage.c) and
-# execute ACTION-IF-FOUND.  Otherwise, execute ACTION-IF-NOT-FOUND.
-#
-# gl_FILE_SYSTEM_USAGE([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-
-AC_DEFUN([gl_FILE_SYSTEM_USAGE],
-[
-
-AC_MSG_NOTICE([checking how to get file system space usage])
-ac_fsusage_space=no
-
-# Perform only the link test since it seems there are no variants of the
-# statvfs function.  This check is more than just AC_CHECK_FUNCS(statvfs)
-# because that got a false positive on SCO OSR5.  Adding the declaration
-# of a `struct statvfs' causes this test to fail (as it should) on such
-# systems.  That system is reported to work fine with STAT_STATFS4 which
-# is what it gets when this test fails.
-if test $ac_fsusage_space = no; then
-  # SVR4
-  AC_CACHE_CHECK([for statvfs function (SVR4)], fu_cv_sys_stat_statvfs,
-                 [AC_TRY_LINK([#include <sys/types.h>
-#if defined __GLIBC__ && !defined __BEOS__
-Do not use statvfs on systems with GNU libc, because that function stats
-all preceding entries in /proc/mounts, and that makes df hang if even
-one of the corresponding file systems is hard-mounted, but not available.
-statvfs in GNU libc on BeOS operates differently: it only makes a system
-call.
-#endif
-#include <sys/statvfs.h>],
-                              [struct statvfs fsd; statvfs (0, &fsd);],
-                              fu_cv_sys_stat_statvfs=yes,
-                              fu_cv_sys_stat_statvfs=no)])
-  if test $fu_cv_sys_stat_statvfs = yes; then
-    ac_fsusage_space=yes
-    AC_DEFINE(STAT_STATVFS, 1,
-              [  Define if there is a function named statvfs.  (SVR4)])
-  fi
-fi
-
-if test $ac_fsusage_space = no; then
-  # DEC Alpha running OSF/1
-  AC_MSG_CHECKING([for 3-argument statfs function (DEC OSF/1)])
-  AC_CACHE_VAL(fu_cv_sys_stat_statfs3_osf1,
-  [AC_TRY_RUN([
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/mount.h>
-  int
-  main ()
-  {
-    struct statfs fsd;
-    fsd.f_fsize = 0;
-    return statfs (".", &fsd, sizeof (struct statfs)) != 0;
-  }],
-  fu_cv_sys_stat_statfs3_osf1=yes,
-  fu_cv_sys_stat_statfs3_osf1=no,
-  fu_cv_sys_stat_statfs3_osf1=no)])
-  AC_MSG_RESULT($fu_cv_sys_stat_statfs3_osf1)
-  if test $fu_cv_sys_stat_statfs3_osf1 = yes; then
-    ac_fsusage_space=yes
-    AC_DEFINE(STAT_STATFS3_OSF1, 1,
-              [   Define if  statfs takes 3 args.  (DEC Alpha running OSF/1)])
-  fi
-fi
-
-if test $ac_fsusage_space = no; then
-# AIX
-  AC_MSG_CHECKING([for two-argument statfs with statfs.bsize dnl
-member (AIX, 4.3BSD)])
-  AC_CACHE_VAL(fu_cv_sys_stat_statfs2_bsize,
-  [AC_TRY_RUN([
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_MOUNT_H
-#include <sys/mount.h>
-#endif
-#ifdef HAVE_SYS_VFS_H
-#include <sys/vfs.h>
-#endif
-  int
-  main ()
-  {
-  struct statfs fsd;
-  fsd.f_bsize = 0;
-  return statfs (".", &fsd) != 0;
-  }],
-  fu_cv_sys_stat_statfs2_bsize=yes,
-  fu_cv_sys_stat_statfs2_bsize=no,
-  fu_cv_sys_stat_statfs2_bsize=no)])
-  AC_MSG_RESULT($fu_cv_sys_stat_statfs2_bsize)
-  if test $fu_cv_sys_stat_statfs2_bsize = yes; then
-    ac_fsusage_space=yes
-    AC_DEFINE(STAT_STATFS2_BSIZE, 1,
-[  Define if statfs takes 2 args and struct statfs has a field named f_bsize.
-   (4.3BSD, SunOS 4, HP-UX, AIX PS/2)])
-  fi
-fi
-
-if test $ac_fsusage_space = no; then
-# SVR3
-  AC_MSG_CHECKING([for four-argument statfs (AIX-3.2.5, SVR3)])
-  AC_CACHE_VAL(fu_cv_sys_stat_statfs4,
-  [AC_TRY_RUN([#include <sys/types.h>
-#include <sys/statfs.h>
-  int
-  main ()
-  {
-  struct statfs fsd;
-  return statfs (".", &fsd, sizeof fsd, 0) != 0;
-  }],
-    fu_cv_sys_stat_statfs4=yes,
-    fu_cv_sys_stat_statfs4=no,
-    fu_cv_sys_stat_statfs4=no)])
-  AC_MSG_RESULT($fu_cv_sys_stat_statfs4)
-  if test $fu_cv_sys_stat_statfs4 = yes; then
-    ac_fsusage_space=yes
-    AC_DEFINE(STAT_STATFS4, 1,
-              [  Define if statfs takes 4 args.  (SVR3, Dynix, Irix, Dolphin)])
-  fi
-fi
-
-if test $ac_fsusage_space = no; then
-# 4.4BSD and NetBSD
-  AC_MSG_CHECKING([for two-argument statfs with statfs.fsize dnl
-member (4.4BSD and NetBSD)])
-  AC_CACHE_VAL(fu_cv_sys_stat_statfs2_fsize,
-  [AC_TRY_RUN([#include <sys/types.h>
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_MOUNT_H
-#include <sys/mount.h>
-#endif
-  int
-  main ()
-  {
-  struct statfs fsd;
-  fsd.f_fsize = 0;
-  return statfs (".", &fsd) != 0;
-  }],
-  fu_cv_sys_stat_statfs2_fsize=yes,
-  fu_cv_sys_stat_statfs2_fsize=no,
-  fu_cv_sys_stat_statfs2_fsize=no)])
-  AC_MSG_RESULT($fu_cv_sys_stat_statfs2_fsize)
-  if test $fu_cv_sys_stat_statfs2_fsize = yes; then
-    ac_fsusage_space=yes
-    AC_DEFINE(STAT_STATFS2_FSIZE, 1,
-[  Define if statfs takes 2 args and struct statfs has a field named f_fsize.
-   (4.4BSD, NetBSD)])
-  fi
-fi
-
-if test $ac_fsusage_space = no; then
-  # Ultrix
-  AC_MSG_CHECKING([for two-argument statfs with struct fs_data (Ultrix)])
-  AC_CACHE_VAL(fu_cv_sys_stat_fs_data,
-  [AC_TRY_RUN([#include <sys/types.h>
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_MOUNT_H
-#include <sys/mount.h>
-#endif
-#ifdef HAVE_SYS_FS_TYPES_H
-#include <sys/fs_types.h>
-#endif
-  int
-  main ()
-  {
-  struct fs_data fsd;
-  /* Ultrix's statfs returns 1 for success,
-     0 for not mounted, -1 for failure.  */
-  return statfs (".", &fsd) != 1;
-  }],
-  fu_cv_sys_stat_fs_data=yes,
-  fu_cv_sys_stat_fs_data=no,
-  fu_cv_sys_stat_fs_data=no)])
-  AC_MSG_RESULT($fu_cv_sys_stat_fs_data)
-  if test $fu_cv_sys_stat_fs_data = yes; then
-    ac_fsusage_space=yes
-    AC_DEFINE(STAT_STATFS2_FS_DATA, 1,
-[  Define if statfs takes 2 args and the second argument has
-   type struct fs_data.  (Ultrix)])
-  fi
-fi
-
-if test $ac_fsusage_space = no; then
-  # SVR2
-  AC_TRY_CPP([#include <sys/filsys.h>
-    ],
-    AC_DEFINE(STAT_READ_FILSYS, 1,
-      [Define if there is no specific function for reading file systems usage
-       information and you have the <sys/filsys.h> header file.  (SVR2)])
-    ac_fsusage_space=yes)
-fi
-
-AS_IF([test $ac_fsusage_space = yes], [$1], [$2])
-
-])
-
-
-# Check for SunOS statfs brokenness wrt partitions 2GB and larger.
-# If <sys/vfs.h> exists and struct statfs has a member named f_spare,
-# enable the work-around code in fsusage.c.
-AC_DEFUN([gl_STATFS_TRUNCATES],
-[
-  AC_MSG_CHECKING([for statfs that truncates block counts])
-  AC_CACHE_VAL(fu_cv_sys_truncating_statfs,
-  [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#if !defined(sun) && !defined(__sun)
-choke -- this is a workaround for a Sun-specific problem
-#endif
-#include <sys/types.h>
-#include <sys/vfs.h>]],
-    [[struct statfs t; long c = *(t.f_spare);
-      if (c) return 0;]])],
-    [fu_cv_sys_truncating_statfs=yes],
-    [fu_cv_sys_truncating_statfs=no])])
-  if test $fu_cv_sys_truncating_statfs = yes; then
-    AC_DEFINE(STATFS_TRUNCATES_BLOCK_COUNTS, 1,
-      [Define if the block counts reported by statfs may be truncated to 2GB
-       and the correct values may be stored in the f_spare array.
-       (SunOS 4.1.2, 4.1.3, and 4.1.3_U1 are reported to have this problem.
-       SunOS 4.1.1 seems not to be affected.)])
-  fi
-  AC_MSG_RESULT($fu_cv_sys_truncating_statfs)
-])
-
-
-# Prerequisites of lib/fsusage.c not done by gl_FILE_SYSTEM_USAGE.
-AC_DEFUN([gl_PREREQ_FSUSAGE_EXTRA],
-[
-  AC_CHECK_HEADERS(dustat.h sys/fs/s5param.h sys/filsys.h sys/statfs.h)
-  gl_STATFS_TRUNCATES
-])

trunk/php/lang/lang.EN

@@ -167 +167 @@
   $usertray_UserForm_12=" Template "; 
   $usertray_UserForm_13=" Active ";
+  $usertray_UserForm_14="Moved to temporary template";
+  $usertray_UserForm_15="Exceed limit";
   $usertray_UserTray_1=" User "; 
 
@@ -283 +285 @@
   $userbuttom_1_prop_UpdateUserForm_12=" Template "; 
   $userbuttom_1_prop_UpdateUserForm_13=" Change the data ";
+  $userbuttom_1_prop_UpdateUserForm_14="This user see statistic of his group users";
+  $userbuttom_1_prop_UpdateUserForm_15="Enabled";
+  $userbuttom_1_prop_UpdateUserForm_16="traffic Off";
+  $userbuttom_1_prop_UpdateUserForm_17="Disabled";
+  $userbuttom_1_prop_UpdateUserForm_18="This user see statistic";
+  $userbuttom_1_prop_UpdateUserForm_19="This user see statistic of his group users";
+  $userbuttom_1_prop_UpdateUserForm_20="This user see statistic of all users";
+  $userbuttom_1_prop_UpdateUserForm_21="This user has the right to activate/deactivate users";
+  $userbuttom_1_prop_UpdateUserForm_22="This user has the right to add users in SAMS";
+  $userbuttom_1_prop_UpdateUserForm_23="This user has the right to change URL lists";
+  $userbuttom_1_prop_UpdateUserForm_24="This user has the right to configure SAMS";
+  $userbuttom_1_prop_UpdateUserForm_25="Moved to a temporary template";
+
   
   $userbuttom_1_prop_userbuttom_1_prop_1=" Change the user data "; 
@@ -614 +629 @@
   $adminbuttom_1_prop_SamsReConfigForm_43="Not used redirector";
 
-  $userbuttom_1_prop_UpdateUserForm_14="This user see statistic of his group users";
   $usertray_UserTray_1="User";
   $deniedlisttray_DeniedListTray_1="The access is forbidden.  <BR>List";
@@ -852 +866 @@
   $adminbuttom_4_chpasswd_ChangeAdminPasswdForm_8="Retype new passwd";
   $shablontray_ShablonUsers_4="Users";
-  $userbuttom_1_prop_UpdateUserForm_15="Enabled";
-  $userbuttom_1_prop_UpdateUserForm_16="traffic Off";
-  $userbuttom_1_prop_UpdateUserForm_17="Disabled";
 
   $usersbuttom_1_adldap_AddUsersFromAdLDAPForm_5="Show all domain users";
@@ -885 +896 @@
   $shablonbuttom_9_delete_DeleteShablon_3="Error of removal a template";
 
-  $userbuttom_1_prop_UpdateUserForm_18="This user see statistic";
-  $userbuttom_1_prop_UpdateUserForm_19="This user see statistic of his group users";
-  $userbuttom_1_prop_UpdateUserForm_20="This user see statistic of all users";
-  $userbuttom_1_prop_UpdateUserForm_21="This user has the right to activate/deactivate users";
-  $userbuttom_1_prop_UpdateUserForm_22="This user has the right to add users in SAMS";
-  $userbuttom_1_prop_UpdateUserForm_23="This user has the right to change URL lists";
-  $userbuttom_1_prop_UpdateUserForm_24="This user has the right to configure SAMS";
-
   $usersbuttom_2_traffic_UsersTrafficForm_3="select sorting method";
   $usersbuttom_2_traffic_UsersTrafficForm_4="The size of the received traffic";

trunk/php/lang/lang.KOI8-R

@@ -166 +166 @@
   $usertray_UserForm_12="ûÁÂÌÏÎ";
   $usertray_UserForm_13="áËÔÉ×ÅÎ";
+  $usertray_UserForm_14="ðÅÒÅÍÅÝÅÎ ×Ï ×ÒÅÍÅÎÎÙÊ ÛÁÂÌÏÎ";
+  $usertray_UserForm_15="ðÒÅ×ÙÓÉÌ ÌÉÍÉÔ";
   $usertray_UserTray_1="ðÏÌØÚÏ×ÁÔÅÌØ";
 
@@ -282 +284 @@
   $userbuttom_1_prop_UpdateUserForm_13="éÚÍÅÎÉÔØ ÄÁÎÎÙÅ";
   $userbuttom_1_prop_UpdateUserForm_14="éÍÅÅÔ ÐÒÁ×Ï ÓÍÏÔÒÅÔØ ÓÔÁÔÉÓÔÉËÕ<BR> ÐÏÌØÚÏ×ÁÔÅÌÅÊ Ó×ÏÅÊ ÇÒÕÐÐÙ:";
+  $userbuttom_1_prop_UpdateUserForm_15="áËÔÉ×ÅÎ";
+  $userbuttom_1_prop_UpdateUserForm_16="ïÔËÌÀÞÅÎ ÚÁ ÐÒÅ×ÙÛÅÎÉÅ ÔÒÁÆÉËÁ";
+  $userbuttom_1_prop_UpdateUserForm_17="ïÔËÌÀÞÅÎ";
+  $userbuttom_1_prop_UpdateUserForm_18="éÍÅÅÔ ÐÒÁ×Ï ÓÍÏÔÒÅÔØ Ó×ÏÀ ÓÔÁÔÉÓÔÉËÕ";
+  $userbuttom_1_prop_UpdateUserForm_19="éÍÅÅÔ ÐÒÁ×Ï ÓÍÏÔÒÅÔØ ÓÔÁÔÉÓÔÉËÕ ÐÏÌØÚÏ×ÁÔÅÌÅÊ Ó×ÏÅÊ ÇÒÕÐÐÙ";
+  $userbuttom_1_prop_UpdateUserForm_20="éÍÅÅÔ ÐÒÁ×Ï ÓÍÏÔÒÅÔØ ÓÔÁÔÉÓÔÉËÕ ÷ÓÅÈ ÐÏÌØÚÏ×ÁÔÅÌÅÊ";
+  $userbuttom_1_prop_UpdateUserForm_21="éÍÅÅÔ ÐÒÁ×Ï ÁËÔÉ×ÉÒÏ×ÁÔØ/ÏÔËÌÀÞÁÔØ ÐÏÌØÚÏ×ÁÔÅÌÅÊ";
+  $userbuttom_1_prop_UpdateUserForm_22="éÍÅÅÔ ÐÒÁ×Ï ÄÏÂÁ×ÌÑÔØ ÐÏÌØÚÏ×ÁÔÅÌÅÊ × SAMS";
+  $userbuttom_1_prop_UpdateUserForm_23="éÍÅÅÔ ÐÒÁ×Ï ÉÚÍÅÎÑÔØ ÓÐÉÓËÉ URL";
+  $userbuttom_1_prop_UpdateUserForm_24="éÍÅÅÔ ÐÒÁ×Ï ÎÁÓÔÒÁÉ×ÁÔØ SAMS";
+  $userbuttom_1_prop_UpdateUserForm_25="ðÅÒÅÍÅÝÅÎ ×Ï ×ÒÅÍÅÎÎÙÊ ÛÁÂÌÏÎ";
+
+
   
   
@@ -875 +890 @@
   $shablontray_ShablonUsers_4="ûÁÂÌÏÎ ÐÒÉÓ×ÏÅÎ ÐÏÌØÚÏ×ÁÔÅÌÑÍ";
 
-  $userbuttom_1_prop_UpdateUserForm_15="áËÔÉ×ÅÎ";
-  $userbuttom_1_prop_UpdateUserForm_16="ïÔËÌÀÞÅÎ ÚÁ ÐÒÅ×ÙÛÅÎÉÅ ÔÒÁÆÉËÁ";
-  $userbuttom_1_prop_UpdateUserForm_17="ïÔËÌÀÞÅÎ";
-
   $usersbuttom_1_adldap_AddUsersFromAdLDAPForm_5="ðÏËÁÚÁÔØ ÐÏÌØÚÏ×ÁÔÅÌÅÊ ×ÓÅÈ ÇÒÕÐÐ ÄÏÍÅÎÁ";
   $usersbuttom_1_adldap_AddUsersFromAdLDAPForm_6="÷×ÅÓÔÉ ÎÁÚ×ÁÎÉÅ ÇÒÕÐÐÙ ×ÒÕÞÎÕÀ";
@@ -900 +911 @@
   $shablonbuttom_9_delete_DeleteShablon_3="ïÛÉÂËÁ ÕÄÁÌÅÎÉÑ ÛÁÂÌÏÎÁ";
 
-  $userbuttom_1_prop_UpdateUserForm_18="éÍÅÅÔ ÐÒÁ×Ï ÓÍÏÔÒÅÔØ Ó×ÏÀ ÓÔÁÔÉÓÔÉËÕ";
-  $userbuttom_1_prop_UpdateUserForm_19="éÍÅÅÔ ÐÒÁ×Ï ÓÍÏÔÒÅÔØ ÓÔÁÔÉÓÔÉËÕ ÐÏÌØÚÏ×ÁÔÅÌÅÊ Ó×ÏÅÊ ÇÒÕÐÐÙ";
-  $userbuttom_1_prop_UpdateUserForm_20="éÍÅÅÔ ÐÒÁ×Ï ÓÍÏÔÒÅÔØ ÓÔÁÔÉÓÔÉËÕ ÷ÓÅÈ ÐÏÌØÚÏ×ÁÔÅÌÅÊ";
-  $userbuttom_1_prop_UpdateUserForm_21="éÍÅÅÔ ÐÒÁ×Ï ÁËÔÉ×ÉÒÏ×ÁÔØ/ÏÔËÌÀÞÁÔØ ÐÏÌØÚÏ×ÁÔÅÌÅÊ";
-  $userbuttom_1_prop_UpdateUserForm_22="éÍÅÅÔ ÐÒÁ×Ï ÄÏÂÁ×ÌÑÔØ ÐÏÌØÚÏ×ÁÔÅÌÅÊ × SAMS";
-  $userbuttom_1_prop_UpdateUserForm_23="éÍÅÅÔ ÐÒÁ×Ï ÉÚÍÅÎÑÔØ ÓÐÉÓËÉ URL";
-  $userbuttom_1_prop_UpdateUserForm_24="éÍÅÅÔ ÐÒÁ×Ï ÎÁÓÔÒÁÉ×ÁÔØ SAMS";
-
   $usersbuttom_2_traffic_UsersTrafficForm_3="óÏÒÔÉÒÏ×ÁÔØ ÐÏ:";
   $usersbuttom_2_traffic_UsersTrafficForm_4="ÒÁÚÍÅÒÕ ÐÏÌÕÞÅÎÎÏÇÏ ÔÒÁÆÉËÁ";

trunk/php/lang/lang.UTF8

@@ -172 +172 @@
   $usertray_UserForm_12="КаблПМ";
   $usertray_UserForm_13="АктОвеМ";
+  $usertray_UserForm_14="ПереЌещеМ вП вреЌеММый шаблПМ";
+  $usertray_UserForm_15="ПревысОл лОЌОт";
   $usertray_UserTray_1="ППльзПватель";
 
@@ -302 +304 @@
   $userbuttom_1_prop_UpdateUserForm_13="ИзЌеМОть ЎаММые";
   $userbuttom_1_prop_UpdateUserForm_14="ИЌеет правП сЌПтреть статОстОку<BR> пПльзПвателей свПей группы:";
+  $userbuttom_1_prop_UpdateUserForm_15="АктОвеМ";
+  $userbuttom_1_prop_UpdateUserForm_16="ОтключеМ за превышеМОе трафОка";
+  $userbuttom_1_prop_UpdateUserForm_17="ОтключеМ";
+  $userbuttom_1_prop_UpdateUserForm_18="ИЌеет правП сЌПтреть свПю статОстОку";
+  $userbuttom_1_prop_UpdateUserForm_19="ИЌеет правП сЌПтреть статОстОку пПльзПвателей свПей группы";
+  $userbuttom_1_prop_UpdateUserForm_20="ИЌеет правП сЌПтреть статОстОку ВсеÑ
+ пПльзПвателей";
+  $userbuttom_1_prop_UpdateUserForm_21="ИЌеет правП актОвОрПвать/Птключать пПльзПвателей";
+  $userbuttom_1_prop_UpdateUserForm_22="ИЌеет правП ЎПбавлять пПльзПвателей в SAMS";
+  $userbuttom_1_prop_UpdateUserForm_23="ИЌеет правП ОзЌеМять спОскО URL";
+  $userbuttom_1_prop_UpdateUserForm_24="ИЌеет правП МастраОвать SAMS";
+  $userbuttom_1_prop_UpdateUserForm_25="ПереЌещеМ вП вреЌеММый шаблПМ";
+
+
   
   
@@ -954 +970 @@
   $shablontray_ShablonUsers_4="КаблПМ прОсвПеМ пПльзПвателяЌ";
 
-  $userbuttom_1_prop_UpdateUserForm_15="АктОвеМ";
-  $userbuttom_1_prop_UpdateUserForm_16="ОтключеМ за превышеМОе трафОка";
-  $userbuttom_1_prop_UpdateUserForm_17="ОтключеМ";
-
   $usersbuttom_1_adldap_AddUsersFromAdLDAPForm_5="ППказать пПльзПвателей всеÑ
  групп ЎПЌеМа";
@@ -981 +993 @@
   $shablonbuttom_9_delete_DeleteShablon_3="ОшОбка уЎалеМОя шаблПМа";
 
-  $userbuttom_1_prop_UpdateUserForm_18="ИЌеет правП сЌПтреть свПю статОстОку";
-  $userbuttom_1_prop_UpdateUserForm_19="ИЌеет правП сЌПтреть статОстОку пПльзПвателей свПей группы";
-  $userbuttom_1_prop_UpdateUserForm_20="ИЌеет правП сЌПтреть статОстОку ВсеÑ
- пПльзПвателей";
-  $userbuttom_1_prop_UpdateUserForm_21="ИЌеет правП актОвОрПвать/Птключать пПльзПвателей";
-  $userbuttom_1_prop_UpdateUserForm_22="ИЌеет правП ЎПбавлять пПльзПвателей в SAMS";
-  $userbuttom_1_prop_UpdateUserForm_23="ИЌеет правП ОзЌеМять спОскО URL";
-  $userbuttom_1_prop_UpdateUserForm_24="ИЌеет правП МастраОвать SAMS";
-
   $usersbuttom_2_traffic_UsersTrafficForm_3="СПртОрПвать пП:";
   $usersbuttom_2_traffic_UsersTrafficForm_4="разЌеру пПлучеММПгП трафОка";

trunk/php/lang/lang.WIN1251

@@ -166 +166 @@
   $usertray_UserForm_12="Øàáëîí";
   $usertray_UserForm_13="Àêòèâåí";
+  $usertray_UserForm_14="Ïåðåìåùåí âî âðåìåííûé øàáëîí";
+  $usertray_UserForm_15="Ïðåâûñèë ëèìèò";
   $usertray_UserTray_1="Ïîëüçîâàòåëü";
 
@@ -282 +284 @@
   $userbuttom_1_prop_UpdateUserForm_13="Èçìåíèòü äàííûå";
   $userbuttom_1_prop_UpdateUserForm_14="Èìååò ïðàâî ñìîòðåòü ñòàòèñòèêó<BR> ïîëüçîâàòåëåé ñâîåé ãðóïïû:";
+  $userbuttom_1_prop_UpdateUserForm_15="Àêòèâåí";
+  $userbuttom_1_prop_UpdateUserForm_16="Îòêëþ÷åí çà ïðåâûøåíèå òðàôèêà";
+  $userbuttom_1_prop_UpdateUserForm_17="Îòêëþ÷åí";
+  $userbuttom_1_prop_UpdateUserForm_18="Èìååò ïðàâî ñìîòðåòü ñâîþ ñòàòèñòèêó";
+  $userbuttom_1_prop_UpdateUserForm_19="Èìååò ïðàâî ñìîòðåòü ñòàòèñòèêó ïîëüçîâàòåëåé ñâîåé ãðóïïû";
+  $userbuttom_1_prop_UpdateUserForm_20="Èìååò ïðàâî ñìîòðåòü ñòàòèñòèêó Âñåõ ïîëüçîâàòåëåé";
+  $userbuttom_1_prop_UpdateUserForm_21="Èìååò ïðàâî àêòèâèðîâàòü/îòêëþ÷àòü ïîëüçîâàòåëåé";
+  $userbuttom_1_prop_UpdateUserForm_22="Èìååò ïðàâî äîáàâëÿòü ïîëüçîâàòåëåé â SAMS";
+  $userbuttom_1_prop_UpdateUserForm_23="Èìååò ïðàâî èçìåíÿòü ñïèñêè URL";
+  $userbuttom_1_prop_UpdateUserForm_24="Èìååò ïðàâî íàñòðàèâàòü SAMS";
+  $userbuttom_1_prop_UpdateUserForm_25="Ïåðåìåùåí âî âðåìåííûé øàáëîí";
+
+
   
   
@@ -875 +890 @@
   $shablontray_ShablonUsers_4="Øàáëîí ïðèñâîåí ïîëüçîâàòåëÿì";
 
-  $userbuttom_1_prop_UpdateUserForm_15="Àêòèâåí";
-  $userbuttom_1_prop_UpdateUserForm_16="Îòêëþ÷åí çà ïðåâûøåíèå òðàôèêà";
-  $userbuttom_1_prop_UpdateUserForm_17="Îòêëþ÷åí";
-
   $usersbuttom_1_adldap_AddUsersFromAdLDAPForm_5="Ïîêàçàòü ïîëüçîâàòåëåé âñåõ ãðóïï äîìåíà";
   $usersbuttom_1_adldap_AddUsersFromAdLDAPForm_6="Ââåñòè íàçâàíèå ãðóïïû âðó÷íóþ";
@@ -900 +911 @@
   $shablonbuttom_9_delete_DeleteShablon_3="Îøèáêà óäàëåíèÿ øàáëîíà";
 
-  $userbuttom_1_prop_UpdateUserForm_18="Èìååò ïðàâî ñìîòðåòü ñâîþ ñòàòèñòèêó";
-  $userbuttom_1_prop_UpdateUserForm_19="Èìååò ïðàâî ñìîòðåòü ñòàòèñòèêó ïîëüçîâàòåëåé ñâîåé ãðóïïû";
-  $userbuttom_1_prop_UpdateUserForm_20="Èìååò ïðàâî ñìîòðåòü ñòàòèñòèêó Âñåõ ïîëüçîâàòåëåé";
-  $userbuttom_1_prop_UpdateUserForm_21="Èìååò ïðàâî àêòèâèðîâàòü/îòêëþ÷àòü ïîëüçîâàòåëåé";
-  $userbuttom_1_prop_UpdateUserForm_22="Èìååò ïðàâî äîáàâëÿòü ïîëüçîâàòåëåé â SAMS";
-  $userbuttom_1_prop_UpdateUserForm_23="Èìååò ïðàâî èçìåíÿòü ñïèñêè URL";
-  $userbuttom_1_prop_UpdateUserForm_24="Èìååò ïðàâî íàñòðàèâàòü SAMS";
-
   $usersbuttom_2_traffic_UsersTrafficForm_3="Ñîðòèðîâàòü ïî:";
   $usersbuttom_2_traffic_UsersTrafficForm_4="ðàçìåðó ïîëó÷åííîãî òðàôèêà";

trunk/php/lframe_users.php

@@ -44 +44 @@
         .filetree span.groups { background: url($SAMSConf->ICONSET/pgroup.gif) 0 0 no-repeat; }\n
 
-        .filetree span.user { padding: 1px 0 1px 25px; display: block; }\n
-        .filetree span.user { background: url($SAMSConf->ICONSET/puser.gif) 0 0 no-repeat; }\n
+        .filetree span.user_active { padding: 1px 0 1px 25px; display: block; }\n
+        .filetree span.user_active { background: url($SAMSConf->ICONSET/user_active.png) 0 0 no-repeat; }\n
 
-        .filetree span.userd { padding: 1px 0 1px 25px; display: block; }\n
-        .filetree span.userd { background: url($SAMSConf->ICONSET/puserd.gif) 0 0 no-repeat; }\n
+        .filetree span.user_inactive { padding: 1px 0 1px 25px; display: block; }\n
+        .filetree span.user_inactive { background: url($SAMSConf->ICONSET/user_inactive.png) 0 0 no-repeat; }\n
 
-        .filetree span.userdd { padding: 1px 0 1px 25px; display: block; }\n
-        .filetree span.userdd { background: url($SAMSConf->ICONSET/duserd.gif) 0 0 no-repeat; }\n
+        .filetree span.user_moved { padding: 1px 0 1px 25px; display: block; }\n
+        .filetree span.user_moved { background: url($SAMSConf->ICONSET/user_moved.png) 0 0 no-repeat; }\n
 
-        .filetree span.usera { padding: 1px 0 1px 25px; display: block; }\n
-        .filetree span.usera { background: url($SAMSConf->ICONSET/quote_alarm.gif) 0 0 no-repeat; }\n
+        .filetree span.user_off { padding: 1px 0 1px 25px; display: block; }\n
+        .filetree span.user_off { background: url($SAMSConf->ICONSET/user_off.png) 0 0 no-repeat; }\n
+
+        .filetree span.quote_alarm { padding: 1px 0 1px 25px; display: block; }\n
+        .filetree span.quote_alarm { background: url($SAMSConf->ICONSET/quote_alarm.gif) 0 0 no-repeat; }\n
         </style>\n";
 
@@ -86 +89 @@
             while($row_=$DB2->samsdb_fetch_array())
                {
-                if($row_['s_enabled']>0)
+                if($row_['s_enabled']==1)
                     {
                       if($SAMSConf->realtraffic=="real")
@@ -93 +96 @@
                         $traffic=$row_['s_size'];
                       if($row_['s_quote']*$SAMSConf->KBSIZE*$SAMSConf->KBSIZE>=$traffic||$row_['s_quote']<=0)
-                         $class="user";
+                         $class="user_active";
                       else
                         if($row_['s_quote']>0)
-                          $class="usera.gif";
+                          $class="quote_alarm";
                     }
-                 if($row_['s_enabled']==0)
+                 else if($row_['s_enabled']==0)
                     {
-                       $class="userd";
+                       $class="user_inactive";
                     }
-                 if($row_['s_enabled']<0)
+                 else if($row_['s_enabled']==2)
                     {
-                       $class="userdd";
+                       $class="user_moved";
+                    }
+                 else if($row_['s_enabled']<0)
+                    {
+                       $class="user_off";
                     }
                  if($SAMSConf->SHOWNAME=="fam")

trunk/php/samstools.php

@@ -197 +197 @@
 }
 
-function PrintFormattedSize($size) {
+function PrintFormattedSize($size, $align) {
         global $SAMSConf;
         $result = "";
@@ -217 +217 @@
                 $ksize="0$ksize";
    
-        $result .= "  <TD ALIGN=RIGHT>&nbsp;";
+        if (empty($align) || is_null($align))
+          $align="RIGHT";
+        $result .= "  <TD ALIGN=$align>&nbsp;";
         if($gsize>0)
                 $result .= "<B>". $gsize ."</B>&nbsp;Gb ";
         if($gsize>0||$msize>0)
                 $result .= "<B>". $msize ."</B>&nbsp;Mb";
-        $result .= "<B>&nbsp;". $ksize ."</B>&nbsp;kb</TD>\n";
+        $result .= "<B>&nbsp;". $ksize ."</B>&nbsp;Kb</TD>\n";
         
         return $result;

trunk/php/src/grouptray.php

@@ -66 +66 @@
 
   $DB=new SAMSDB(&$SAMSConf);
+  $DB2=new SAMSDB(&$SAMSConf);
+
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);
@@ -111 +113 @@
 
   $count=0;
-  $num_rows=$DB->samsdb_query_value("SELECT squiduser.*, shablon.s_quote AS s_defquote FROM squiduser, shablon WHERE squiduser.s_group_id='$id' AND squiduser.s_shablon_id=shablon.s_shablon_id ORDER BY squiduser.s_nick");
+  $num_rows=$DB->samsdb_query_value("SELECT squiduser.*, shablon.s_quote AS s_defquote, shablon.s_shablon_id2 as tpl2 FROM squiduser, shablon WHERE squiduser.s_group_id='$id' AND squiduser.s_shablon_id=shablon.s_shablon_id ORDER BY squiduser.s_nick");
   while($row=$DB->samsdb_fetch_array())
       {
        print("<TR>\n");
 
-       if($row['s_enabled']>0)
-         {
-            if($SAMSConf->realtraffic=="real")
+        if($SAMSConf->realtraffic=="real")
+          $traffic=$row['s_size']-$row['s_hit'];
+        else
+          $traffic=$row['s_size'];
+
+        $defaultquote=$row['s_defquote'];
+
+        if($row['s_enabled']==2)
+          {
+             $gif="user_moved.png";
+             if ($row['tpl2'] > 0)
+               {
+                 $num_rows2=$DB2->samsdb_query_value("SELECT shablon.s_quote FROM shablon WHERE shablon.s_shablon_id=$row[tpl2]");
+                 if ($num_rows2 == 1)
+                   {
+                     $row2=$DB2->samsdb_fetch_array();
+                     $defaultquote=$row2['s_quote'];
+                   }
+               }
+          }
+        else if($row['s_enabled']==0)
+          {
+             $gif="user_inactive.png";
+          }
+        else if($row['s_enabled']<0)
+          {
+              $gif="user_off.png";
+          }
+        else if($row['s_enabled']==1)
+          {
+             if($SAMSConf->realtraffic=="real")
                 $traffic=$row['s_size']-$row['s_hit'];
-            else
+             else
                 $traffic=$row['s_size'];
-            if($row['s_quote']*$SAMSConf->KBSIZE*$SAMSConf->KBSIZE>=$traffic||$row['s_quote']<=0)
-               $gif="puser.gif";
-            else
+             if($row['s_quote']*$SAMSConf->KBSIZE*$SAMSConf->KBSIZE>=$traffic||$row['s_quote']<=0)
+               $gif="user_active.png";
+             else
                if($row['s_quote']>0)
                   $gif="quote_alarm.gif";
           }
-        if($row['s_enabled']==0)
-          {
-             $gif="puserd.gif";
-          }
-        if($row['s_enabled']<0)
-          {
-              $gif="duserd.gif";
-           }
         if($USERConf->ToWebInterfaceAccess("CGS")==1)
            {
@@ -144 +166 @@
            {
              print(" <INPUT TYPE=\"CHECKBOX\" NAME=users[$row[s_user_id]] ");
-             if($row['s_enabled']==1)
+             if($row['s_enabled']>0)
                print(" CHECKED ");
              print("></TD>\n");
@@ -156 +178 @@
          if($USERConf->ToWebInterfaceAccess("C")==1||$ga==1)
            {
-            if($SAMSConf->realtraffic=="real")
-                PrintFormattedSize($row['s_size'] - $row['s_hit']);
-            else
-                PrintFormattedSize($row['s_size']);
-             
+             PrintFormattedSize($traffic);
+
+             $font_start="";
+             $font_end="";
+             if ($row['s_enabled']==2)
+               {
+                 $font_start="<font color=#CFCF00>";
+                 $font_end="</font>";
+               }
+
              if($row['s_quote']>0)
-               print("  <TD WIDTH=\"15%\" ALIGN=CENTER><font color=red>$row[s_quote] Mb</font></TD>\n");
-             else if($row['s_quote']==0)
-               print("  <TD WIDTH=\"15%\" ALIGN=CENTER><font color=red>unlimited</font></TD>\n");
-             else if($row['s_defquote']>0)
-               print("  <TD WIDTH=\"15%\" ALIGN=CENTER>$row[s_defquote] Mb</TD>\n");
+               print("<TD WIDTH=\"15%\" ALIGN=CENTER><font color=red>$row[s_quote] Mb</font>");
+             else if ($row['s_quote'] == 0)
+               print("<TD WIDTH=\"15%\" ALIGN=CENTER><font color=red>unlimited</font>");
+             else if ($defaultquote > 0)
+               print("<TD WIDTH=\"15%\" ALIGN=CENTER>$font_start $defaultquote Mb $font_end");
              else
-               print("  <TD WIDTH=\"15%\" ALIGN=CENTER>unlimited</TD>\n");
+               print("<TD WIDTH=\"15%\" ALIGN=CENTER>$font_start unlimited $font_end");
            }
          print("  <TD WIDTH=\"40%\"> $row[s_family] $row[s_name] $row[s_soname]</TD>\n");

trunk/php/src/proxybuttom_9_down.php

@@ -68 +68 @@
        print("   window.location.reload();\n");
        print("}\n");
-       print("function ShutdownProxyServer(userid)\n");
+       print("function DeleteUser(userid)\n");
        print("{\n");
-
-       print("  value=window.confirm(\"$proxybuttom_1_down_proxybuttom_1_down_1 \" );\n");
-       print("  if(value==true) \n");
-       print("     {\n");
        print("        parent.basefrm.location.href=\"main.php?show=exe&function=shutdown_proxy&filename=proxybuttom_9_down.php&id=$id\";\n");
-       print("     }\n");
-
        print("}\n");
        print("</SCRIPT> \n");
@@ -83 +77 @@
        print("<IMAGE id=Trash name=\"Trash\" src=\"$SAMSConf->ICONSET/shutdown_32.jpg\" \n ");
        print("TITLE=\"Shutdown proxy server\"  border=0 ");
-       print("onclick=ShutdownProxyServer(\"userid\") \n");
+       print("onclick=DeleteUser(\"userid\") \n");
        print("onmouseover=\"this.src='$SAMSConf->ICONSET/shutdown_48.jpg'\" \n");
        print("onmouseout= \"this.src='$SAMSConf->ICONSET/shutdown_32.jpg'\" >\n");

trunk/php/src/shablontray.php

@@ -90 +90 @@
        print("<TR>\n");
        print("<TD>");
-       if($row['s_enabled']>0)
-         {
-           if($SAMSConf->realtraffic=="real")
-             $traffic=$row['s_size']-$row['s_hit'];
-           else
-             $traffic=$row['s_size'];
-           if($row['s_quote']*$SAMSConf->KBSIZE*$SAMSConf->KBSIZE>=$traffic||$row['s_quote']<=0)
-              $gif="puser.gif";
-           else
-              if($row['s_quote']>0)
+        if($row['s_enabled']==2)
+          {
+             $gif="user_moved.png";
+          }
+        else if($row['s_enabled']==0)
+          {
+             $gif="user_inactive.png";
+          }
+        else if($row['s_enabled']<0)
+          {
+              $gif="user_off.png";
+          }
+        else if($row['s_enabled']==1)
+          {
+             if($SAMSConf->realtraffic=="real")
+                $traffic=$row['s_size']-$row['s_hit'];
+             else
+                $traffic=$row['s_size'];
+             if($row['s_quote']*$SAMSConf->KBSIZE*$SAMSConf->KBSIZE>=$traffic||$row['s_quote']<=0)
+               $gif="user_active.png";
+             else
+               if($row['s_quote']>0)
                   $gif="quote_alarm.gif";
-         }
-       if($row['s_enabled']==0)
-         {
-            $gif="puserd.gif";
-         }
-       if($row['s_enabled']<0)
-         {
-            $gif="duserd.gif";
-         }
+           }
        print("<IMG SRC=\"$SAMSConf->ICONSET/$gif\" TITLE=\"\"> ");
        print("<TD> <B>$row[s_nick] </B>");

trunk/php/src/userbuttom_1_prop.php

@@ -233 +233 @@
   else
     print("<OPTION VALUE=\"1\"> $userbuttom_1_prop_UpdateUserForm_15"); 
+  if($SquidUSERConf->s_enabled==2)
+    print("<OPTION VALUE=\"2\" SELECTED> $userbuttom_1_prop_UpdateUserForm_25");
+  else
+    print("<OPTION VALUE=\"2\"> $userbuttom_1_prop_UpdateUserForm_25"); 
   if($SquidUSERConf->s_enabled==0)
     print("<OPTION VALUE=\"0\" SELECTED> $userbuttom_1_prop_UpdateUserForm_16");

trunk/php/src/usersbuttom_91_test.php

@@ -142 +142 @@
 
        //if($)
-       if($row['s_enabled']>0)
-         {
-            if($SAMSConf->realtraffic=="real")
-                $traffic=$row['s_size']-$row['s_hit'];
-            else
-                $traffic=$row['s_size'];
-            if($row['s_quote']*$SAMSConf->KBSIZE*$SAMSConf->KBSIZE>=$traffic||$row['s_quote']<=0)
-               $gif="puser.gif";
-            else
+        if($row['s_enabled']==2)
+          {
+             $gif="user_moved.png";
+          }
+        else if($row['s_enabled']==0)
+          {
+             $gif="user_inactive.png";
+          }
+        else if($row['s_enabled']<0)
+          {
+              $gif="user_off.png";
+          }
+        else if($row['s_enabled']==1)
+          {
+             if($SAMSConf->realtraffic=="real")
+                $traffic=$row['s_size']-$row['s_hit'];
+             else
+                $traffic=$row['s_size'];
+             if($row['s_quote']*$SAMSConf->KBSIZE*$SAMSConf->KBSIZE>=$traffic||$row['s_quote']<=0)
+               $gif="user_active.png";
+             else
                if($row['s_quote']>0)
                   $gif="quote_alarm.gif";
-          }
-        if($row['s_enabled']==0)
-          {
-             $gif="puserd.gif";
-          }
-        if($row['s_enabled']<0)
-          {
-              $gif="duserd.gif";
            }
         if($SAMSConf->access>0)
@@ -171 +175 @@
            {
              print(" <INPUT TYPE=\"CHECKBOX\" NAME=\"users\" ID=\"$count\" VALUE=\"$row[s_user_id]\" ");
-             if($row['s_enabled']==1)
+             if($row['s_enabled']>0)
                print(" CHECKED ");
              print("> \n ");

trunk/php/src/userstray.php

@@ -75 +75 @@
   global $USERConf;
   $DB=new SAMSDB(&$SAMSConf);
+  $DB2=new SAMSDB(&$SAMSConf);
   
   $lang="./lang/lang.$SAMSConf->LANG";
@@ -207 +208 @@
   if($type=="search")
   {
-    $num_rows=$DB->samsdb_query_value("SELECT squiduser.*,sgroup.s_name AS gnick, shablon.s_period, shablon.s_clrdate, shablon.s_quote AS s_defquote FROM squiduser LEFT JOIN sgroup ON sgroup.s_group_id=squiduser.s_group_id LEFT JOIN shablon ON squiduser.s_shablon_id=shablon.s_shablon_id WHERE squiduser.s_nick like '%$username%' ORDER BY squiduser.s_shablon_id,squiduser.s_nick");
+    $num_rows=$DB->samsdb_query_value("SELECT squiduser.*,sgroup.s_name AS gnick, shablon.s_period, shablon.s_clrdate, shablon.s_quote AS s_defquote, shablon.s_shablon_id2 as tpl2 FROM squiduser LEFT JOIN sgroup ON sgroup.s_group_id=squiduser.s_group_id LEFT JOIN shablon ON squiduser.s_shablon_id=shablon.s_shablon_id WHERE squiduser.s_nick like '%$username%' ORDER BY squiduser.s_shablon_id,squiduser.s_nick");
   }
   else
-    $num_rows=$DB->samsdb_query_value("SELECT squiduser.*,sgroup.s_name AS gnick, shablon.s_period, shablon.s_clrdate, shablon.s_quote AS s_defquote FROM squiduser LEFT JOIN sgroup ON sgroup.s_group_id=squiduser.s_group_id LEFT JOIN shablon ON squiduser.s_shablon_id=shablon.s_shablon_id ORDER BY squiduser.s_group_id,squiduser.s_nick");
+    $num_rows=$DB->samsdb_query_value("SELECT squiduser.*,sgroup.s_name AS gnick, shablon.s_period, shablon.s_clrdate, shablon.s_quote AS s_defquote, shablon.s_shablon_id2 as tpl2 FROM squiduser LEFT JOIN sgroup ON sgroup.s_group_id=squiduser.s_group_id LEFT JOIN shablon ON squiduser.s_shablon_id=shablon.s_shablon_id ORDER BY squiduser.s_group_id,squiduser.s_nick");
   
   print("<TBODY>\n");
@@ -219 +220 @@
        print("<TR>\n");
 
-       //if($)
-       if($row['s_enabled']>0)
-         {
-            if($SAMSConf->realtraffic=="real")
-                $traffic=$row['s_size']-$row['s_hit'];
-            else
-                $traffic=$row['s_size'];
-            if($row['s_quote']*$SAMSConf->KBSIZE*$SAMSConf->KBSIZE>=$traffic||$row['s_quote']<=0)
-               $gif="puser.gif";
-            else
+        if($SAMSConf->realtraffic=="real")
+          $traffic=$row['s_size']-$row['s_hit'];
+        else
+          $traffic=$row['s_size'];
+
+        $defaultquote=$row['s_defquote'];
+
+        if($row['s_enabled']==2)
+          {
+             $gif="user_moved.png";
+             if ($row['tpl2'] > 0)
+               {
+                 $num_rows2=$DB2->samsdb_query_value("SELECT shablon.s_quote FROM shablon WHERE shablon.s_shablon_id=$row[tpl2]");
+                 if ($num_rows2 == 1)
+                   {
+                     $row2=$DB2->samsdb_fetch_array();
+                     $defaultquote=$row2['s_quote'];
+                   }
+               }
+          }
+        else if($row['s_enabled']==0)
+          {
+             $gif="user_inactive.png";
+          }
+        else if($row['s_enabled']<0)
+          {
+              $gif="user_off.png";
+          }
+        else if($row['s_enabled']==1)
+          {
+             if($row['s_quote']*$SAMSConf->KBSIZE*$SAMSConf->KBSIZE>=$traffic||$row['s_quote']<=0)
+               $gif="user_active.png";
+             else
                if($row['s_quote']>0)
                   $gif="quote_alarm.gif";
-          }
-        if($row['s_enabled']==0)
-          {
-             $gif="puserd.gif";
-          }
-        if($row['s_enabled']<0)
-          {
-              $gif="duserd.gif";
            }
         if($USERConf->ToWebInterfaceAccess("CGS")==1)
@@ -249 +265 @@
            {
              print(" <INPUT TYPE=\"CHECKBOX\" NAME=\"users\" ID=\"$count\" VALUE=\"$row[s_user_id]\" ");
-             if($row['s_enabled']==1)
+             if($row['s_enabled']>0)
                print(" CHECKED ");
              print("> \n ");
@@ -260 +276 @@
         if($USERConf->ToWebInterfaceAccess("C")==1)
            {
-            if($SAMSConf->realtraffic=="real")
-                PrintFormattedSize($row['s_size']-$row['s_hit']);
-            else
-                PrintFormattedSize($row['s_size']);
-
+             PrintFormattedSize($traffic);
              
+             $font_start="";
+             $font_end="";
+             if ($row['s_enabled']==2)
+               {
+                 $font_start="<font color=#CFCF00>";
+                 $font_end="</font>";
+               }
+
              if($row['s_quote']>0)
                print("<TD WIDTH=\"15%\" ALIGN=CENTER><font color=red>$row[s_quote] Mb</font>");
              else if ($row['s_quote'] == 0)
                print("<TD WIDTH=\"15%\" ALIGN=CENTER><font color=red>unlimited</font>");
-             else if ($row[s_defquote] > 0)
-               print("<TD WIDTH=\"15%\" ALIGN=CENTER>$row[s_defquote] Mb");
+             else if ($defaultquote > 0)
+               print("<TD WIDTH=\"15%\" ALIGN=CENTER>$font_start $defaultquote Mb $font_end");
              else
-               print("<TD WIDTH=\"15%\" ALIGN=CENTER>unlimited");
+               print("<TD WIDTH=\"15%\" ALIGN=CENTER>$font_start unlimited $font_end");
            
               if($row['s_period']!="M"&&$row['s_period']!="W"&&$row['s_period']!="D")

trunk/php/src/usertray.php

@@ -145 +145 @@
        print("<B>$usertray_UserForm_10:\n");
        print("<TD>\n");
-       if($row['s_enabled']>0)
+       if($row['s_enabled']==2)
+          print("$usertray_UserForm_14\n");
+       else if($row['s_enabled']==1)
           print("$usertray_UserForm_13\n");
+       else if($row['s_enabled']==0)
+          print("$usertray_UserForm_15\n");
+       else if($row['s_enabled']==-1)
+          print("$usertray_UserForm_11\n");
        else
-          print("$usertray_UserForm_11 \n");
+          print("Unknown status\n");
 
        $num_rows2=$DB2->samsdb_query_value("SELECT * FROM shablon WHERE s_shablon_id='$row[s_shablon_id]' ");
@@ -166 +172 @@
   global $USERConf;
   global $SquidUSERConf;
+  //var $SamsTools;
+
+  $tools = new SamsTools();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);
@@ -176 +185 @@
     $quote=" unlimited ";
 
-  if($SquidUSERConf->s_enabled>0)
+  if($SquidUSERConf->s_enabled==2)
+    $enabled="$usertray_UserForm_14";
+  else if($SquidUSERConf->s_enabled==1)
     $enabled="$usertray_UserForm_13";
-  else if($SquidUSERConf->s_enabled<0)
+  else if($SquidUSERConf->s_enabled==0)
+    $enabled="$usertray_UserForm_15";
+  else if($SquidUSERConf->s_enabled==-1)
     $enabled="$usertray_UserForm_11";
   else
-    $enabled="Inactive";
+    $enabled="Unknown status";
 
 
@@ -200 +213 @@
   <TR><TD><B>$usertray_UserForm_10:<TD>$enabled";
         $htmlcode=$htmlcode."<TR><TD><B>$usertray_UserForm_8:<TD>$quote 
-        <TR><TD><B>$usertray_UserForm_9:<TD>$SquidUSERConf->s_size";
+        <TR><TD><B>$usertray_UserForm_9:".$tools->PrintFormattedSize($SquidUSERConf->s_size, "LEFT");
+        //<TR><TD><B>$usertray_UserForm_9:<TD>$SquidUSERConf->s_size";
   if($USERConf->ToWebInterfaceAccess("C")==1)
         {

trunk/plugins/fsusage/getfsusage.cpp

@@ -1 +1 @@
 using namespace std;
+
+#include "config.h"
 
 #include <stdio.h>
@@ -15 +17 @@
 #include <limits.h>
 
+#if HAVE_SYS_MOUNT_H
+#include <sys/mount.h>
+#endif
+
+#if HAVE_MNTENT_H
 #include <mntent.h>
+#endif
+
+#if HAVE_SYS_STATVFS_H
 #include <sys/statvfs.h>
+#endif
 
 #include "human.h"
 
-struct fs_usage
-{
+struct fs_info
+{
+  char *fs_dev;                 /* FS device */
+  char *fs_type;                /* FS type */
+  char *fs_disk;                /* FS mount point */
   uintmax_t fsu_blocksize;      /* Size of a block.  */
   uintmax_t fsu_blocks;         /* Total blocks. */
@@ -29 +43 @@
   uintmax_t fsu_files;          /* Total file nodes. */
   uintmax_t fsu_ffree;          /* Free file nodes. */
+
+  struct fs_info * next;
 };
 
@@ -83 +99 @@
 
 
-int get_fs_usage (char const *disk, struct fs_usage *fsp)
+void free_fs_info(struct fs_info **ptr)
+{
+  if (!ptr || !*ptr)
+    return;
+
+  if ((*ptr)->fs_dev)
+    free((*ptr)->fs_dev);
+  if ((*ptr)->fs_type)
+    free((*ptr)->fs_type);
+  if ((*ptr)->fs_disk)
+    free((*ptr)->fs_disk);
+
+  free(*ptr);
+}
+
+int get_fs_usage (struct fs_info *fsp)
 {
   struct statvfs fsd;
 
-  //printf ("\n========disk: %s==========\n", disk);
-  if (statvfs (disk, &fsd) < 0)
+  //printf ("\n========disk: %s==========\n", fsp->fs_disk);
+  if (statvfs (fsp->fs_disk, &fsd) < 0)
     return -1;
 
@@ -126 +157 @@
 }
 
-char * print_dev (struct mntent *mnt, struct fs_usage & fsu)
+char * print_dev (struct fs_info * fsu)
 {
   uintmax_t input_units;
@@ -144 +175 @@
   uintmax_t output_block_size = 1; // The units to use when printing sizes
 
-  input_units = fsu.fsu_blocksize;
+  input_units = fsu->fsu_blocksize;
   output_units = output_block_size;
-  total = fsu.fsu_blocks;
-  available = fsu.fsu_bavail;
-  negate_available = (fsu.fsu_bavail_top_bit_set
+  total = fsu->fsu_blocks;
+  available = fsu->fsu_bavail;
+  negate_available = (fsu->fsu_bavail_top_bit_set
                       & (available != UINTMAX_MAX));
-  available_to_root = fsu.fsu_bfree;
+  available_to_root = fsu->fsu_bfree;
 
   used = UINTMAX_MAX;
@@ -162 +193 @@
   str_res[0] = '\0';
   strcat (str_res, "<TR>");
-  sprintf (str_tmp, "  <TD>%s</TD>\n", mnt->mnt_fsname);
+  sprintf (str_tmp, "  <TD>%s</TD>\n", fsu->fs_dev);
   strcat (str_res, str_tmp);
 
@@ -216 +247 @@
 
 
-  sprintf (str_tmp, "  <TD>%s</TD>\n", mnt->mnt_dir);
+  sprintf (str_tmp, "  <TD>%s</TD>\n", fsu->fs_disk);
   strcat (str_res, str_tmp);
 
@@ -228 +259 @@
 char * get_fsusage()
 {
-  FILE *fp;
-  struct mntent *mnt;
-  struct fs_usage fsu;
+  struct fs_info *fs_list = NULL;
+  struct fs_info *fs_prev = NULL;
+  struct fs_info *fs_cur = NULL;
   bool file_systems_processed = false;
   char *header = NULL;
@@ -237 +268 @@
   char *footer = NULL;
 
-  fp = setmntent (MOUNTED, "r");
-  if (fp == NULL)
-    exit(1);
-
-  while ((mnt = getmntent (fp)))
+
+
+#ifdef HAVE_GETMNTENT
+  {
+    struct mntent *mnt = NULL;
+    FILE *fp;
+
+    fp = setmntent (MOUNTED, "r");
+    if (fp == NULL)
+      return NULL;
+
+    while ((mnt = getmntent (fp)))
+      {
+        fs_cur = (struct fs_info *)malloc(sizeof(struct fs_info));
+        if (!fs_list)
+          fs_list = fs_cur;
+
+        fs_cur->fs_dev = strdup(mnt->mnt_fsname);
+        fs_cur->fs_disk = strdup(mnt->mnt_dir);
+        fs_cur->fs_type = strdup(mnt->mnt_type);
+
+        fs_cur->next = NULL;
+        if (fs_prev)
+          fs_prev->next = fs_cur;
+        fs_prev = fs_cur;
+      }
+
+    endmntent (fp);
+  }
+#endif // HAVE_GETMNTENT
+
+
+
+#ifdef HAVE_GETMNTINFO
+  {
+    struct statfs *fsp;
+    int entries;
+
+    entries = getmntinfo (&fsp, MNT_NOWAIT);
+    if (entries < 0)
+      return NULL;
+
+    for (; entries-- > 0; fsp++)
+      {
+        fs_cur = (struct fs_info *)malloc(sizeof(struct fs_info));
+        if (!fs_list)
+          fs_list = fs_cur;
+
+        fs_cur->fs_dev = strdup(fsp->f_mntfromname);
+        fs_cur->fs_disk = strdup(fsp->f_mntonname);
+        fs_cur->fs_type = strdup(fsp->f_fstypename);
+
+        fs_cur->next = NULL;
+        if (fs_prev)
+          fs_prev->next = fs_cur;
+        fs_prev = fs_cur;
+      }
+  }
+#endif // HAVE_GETMNTINFO
+
+
+  if (!fs_list)
+    return NULL;
+
+  while (fs_list)
     {
-      if (ME_DUMMY(mnt->mnt_fsname, mnt->mnt_type) || ME_REMOTE(mnt->mnt_fsname, mnt->mnt_type))
-        continue;
-
-      if (get_fs_usage (mnt->mnt_dir, &fsu))
-        {
+      fs_cur = fs_list;
+      fs_list = fs_list->next;
+
+      if (ME_DUMMY(fs_cur->fs_dev, fs_cur->fs_type) || ME_REMOTE(fs_cur->fs_dev, fs_cur->fs_type))
+        {
+          free_fs_info(&fs_cur);
           continue;
         }
-
-      if (fsu.fsu_blocks == 0)
-        continue;
+      if (get_fs_usage (fs_cur))
+        {
+          free_fs_info(&fs_cur);
+          continue;
+        }
+      if (fs_cur->fsu_blocks == 0)
+        {
+          free_fs_info(&fs_cur);
+          continue;
+        }
 
       if (! file_systems_processed)
@@ -265 +364 @@
         }
 
-      dev = print_dev (mnt, fsu);
+      dev = print_dev (fs_cur);
 
       res = (char *) realloc (res, strlen (res) + strlen (dev)+1);
       strcat (res, dev);
       free (dev);
-
-/*
-      me = (struct mount_entry *)malloc (sizeof (struct mount_entry));
-      me->me_devname = xstrdup (mnt->mnt_fsname);
-      me->me_mountdir = xstrdup (mnt->mnt_dir);
-      me->me_type = xstrdup (mnt->mnt_type);
-      me->me_type_malloced = 1;
-      me->me_dummy = ME_DUMMY (me->me_devname, me->me_type);
-      me->me_remote = ME_REMOTE (me->me_devname, me->me_type);
-      me->me_dev = dev_from_mount_options (mnt->mnt_opts);
-
-      *mtail = me;
-      mtail = &me->me_next;
-*/
+      free_fs_info(&fs_cur);
     }
-
-  endmntent (fp);
 
   footer = strdup ("</TABLE>\n");