Changeset 782

Timestamp:

02/05/10 13:33:13 (6 weeks ago)

Author:

DmitryChemerik

Message:

изменена функция создания базы данных SAMS2 из web интерфейса

Location:

trunk/php

Files:

• authclass.php (modified) (3 diffs)
• blocked.php (modified) (2 diffs)
• dbclass.php (modified) (6 diffs)
• icon/classic/setup.css (added)
• icon/classic/tree.css (modified) (2 diffs)
• index.html (modified) (1 diff)
• index.php (added)
• lang/lang.EN (modified) (1 diff)
• lang/lang.KOI8-R (modified) (1 diff)
• lang/lang.UTF8 (modified) (1 diff)
• lang/lang.WIN1251 (modified) (1 diff)
• lframe_users.php (modified) (1 diff)
• main.php (modified) (1 diff)
• poolclass.php (modified) (1 diff)
• proxyclass.php (modified) (1 diff)
• samsclass.php (modified) (6 diffs)
• setup.php (added)
• shablonclass.php (modified) (1 diff)
• src/adminbuttom_4_chpasswd.php (modified) (1 diff)
• src/authadldbuttom_1_prop.php (modified) (1 diff)
• src/authadldbuttom_2_usersadd.php (modified) (2 diffs)
• src/authadldbuttom_3_importfromad.php (modified) (4 diffs)
• src/authadldtray.php (modified) (3 diffs)
• src/authldapbuttom_1_prop.php (modified) (1 diff)
• src/authldapbuttom_2_usersadd.php (modified) (2 diffs)
• src/authldapbuttom_3_importfromldap.php (modified) (4 diffs)
• src/authldaptray.php (modified) (3 diffs)
• src/authncsabuttom_1_usersimport.php (modified) (2 diffs)
• src/authncsabuttom_2_ncsaimport.php (modified) (2 diffs)
• src/authntlmbuttom_1_prop.php (modified) (1 diff)
• src/authntlmbuttom_2_usersadd.php (modified) (2 diffs)
• src/authntlmbuttom_3_importfromntlm.php (modified) (4 diffs)
• src/authntlmtray.php (modified) (2 diffs)
• src/authtray.php (modified) (1 diff)
• src/configbuttom_3_import.php (modified) (2 diffs)
• src/configbuttom_4_backup.php (modified) (5 diffs)
• src/configbuttom_5_restore.php (modified) (3 diffs)
• src/configbuttom_6_moveusertrafficdata.php (modified) (2 diffs)
• src/configtray.php (modified) (1 diff)
• src/groupbuttom_0_prop.php (modified) (2 diffs)
• src/groupbuttom_2_traffic.php (modified) (3 diffs)
• src/groupbuttom_9_delete.php (modified) (2 diffs)
• src/grouptray.php (modified) (4 diffs)
• src/ldap.php (modified) (3 diffs)
• src/lffolder_2_squid.php (modified) (1 diff)
• src/lffolder_4_z0_filedenied.php (modified) (1 diff)
• src/lffolder_4_z0_redirect.php (modified) (1 diff)
• src/lffolder_4_z0_subst.php (modified) (1 diff)
• src/lffolder_4_z1_urldenied.php (modified) (1 diff)
• src/lffolder_4_z2_url.php (modified) (1 diff)
• src/lffolder_4_z3_urlallow.php (modified) (1 diff)
• src/lffolder_4_z4_local.php (modified) (1 diff)
• src/lffolder_5_z0_trange.php (modified) (1 diff)
• src/lffolder_5_z1_shablon.php (modified) (1 diff)
• src/lffolder_5_z20_delaypool.php (modified) (1 diff)
• src/newgrpbuttom_5_addgroup.php (modified) (1 diff)
• src/poolbuttom_1_prop.php (modified) (2 diffs)
• src/poolbuttom_9_delete.php (modified) (1 diff)
• src/pooltray.php (modified) (1 diff)
• src/proxybuttom_1_prop.php (modified) (2 diffs)
• src/proxybuttom_2_reconfig.php (modified) (1 diff)
• src/proxybuttom_8_clear.php (modified) (1 diff)
• src/proxybuttom_9_delete.php (modified) (1 diff)
• src/proxybuttom_9_down.php (modified) (1 diff)
• src/proxytray.php (modified) (1 diff)
• src/redirbuttom_1_loadlist.php (modified) (1 diff)
• src/redirbuttom_3_deletelist.php (modified) (1 diff)
• src/redirlisttray.php (modified) (9 diffs)
• src/shablonbuttom_1_prop.php (modified) (4 diffs)
• src/shablonbuttom_9_delete.php (modified) (1 diff)
• src/shablonnew.php (modified) (2 diffs)
• src/shablontray.php (modified) (2 diffs)
• src/squidbuttom_4_addcache.php (modified) (3 diffs)
• src/sysplugconfigtray.php (modified) (2 diffs)
• src/trangebuttom_1_prop.php (modified) (1 diff)
• src/trangebuttom_9_delete.php (modified) (1 diff)
• src/trangetray.php (modified) (1 diff)
• src/userbuttom_1_prop.php (modified) (2 diffs)
• src/userbuttom_2_traffic.php (modified) (2 diffs)
• src/userbuttom_4_site.php (modified) (1 diff)
• src/userbuttom_5_clear.php (modified) (2 diffs)
• src/userbuttom_6_chpasswd.php (modified) (2 diffs)
• src/userbuttom_9_delete.php (modified) (1 diff)
• src/usersbuttom_1_useradd.php (modified) (2 diffs)
• src/usersbuttom_1_usersimport.php (modified) (2 diffs)
• src/usersbuttom_2_traffic.php (modified) (3 diffs)
• src/usersbuttom_3_site.php (modified) (3 diffs)
• src/usersbuttom_4_percent.php (modified) (3 diffs)
• src/usersbuttom_5_recalc.php (modified) (1 diff)
• src/usersbuttom_6_clear.php (modified) (1 diff)
• src/usersbuttom_91_test.php (modified) (1 diff)
• src/userstray.php (modified) (2 diffs)
• src/usertray.php (modified) (3 diffs)
• src/webconfigbuttom_1_prop.php (modified) (2 diffs)
• tools.php (modified) (7 diffs)
• trangeclass.php (modified) (1 diff)
• userclass.php (modified) (5 diffs)

trunk/php/authclass.php

@@ -27 +27 @@
 {
         global $SAMSConf;
-        $DB=new SAMSDB(&$SAMSConf);
+        $DB=new SAMSDB();
 
         $time=time();
@@ -54 +54 @@
 {
     global $SAMSConf;
-    $DB=new SAMSDB(&$SAMSConf);
+    $DB=new SAMSDB();
     $num_rows=$DB->samsdb_query_value($request);
 
@@ -78 +78 @@
 {
     global $SAMSConf;
-    $DB=new SAMSDB(&$SAMSConf);
+    $DB=new SAMSDB();
     $num_rows=$DB->samsdb_query_value($request);
 

trunk/php/blocked.php

@@ -43 +43 @@
   require($langfile);
 
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $QUERY="SELECT s_nick, s_family, s_name, s_shablon_id FROM squiduser WHERE s_ip='$id' OR s_nick='$id'";
 
@@ -80 +80 @@
         print("  <P><FONT COLOR=\"RED\"><B><H3>$blocked_php_9");
         print("  <BR>$blocked_php_10</H3></FONT> ");
-        print("  <P>access time:");
+        print("  <P>$blocked_php_14");
 
-        $DB2=new SAMSDB(&$SAMSConf);
+        $DB2=new SAMSDB();
         $QUERY2="SELECT sconfig_time.s_shablon_id,timerange.s_timestart,timerange.s_timeend FROM sconfig_time LEFT JOIN timerange
         ON sconfig_time.s_trange_id=timerange.s_trange_id WHERE sconfig_time.s_shablon_id='$row[s_shablon_id]'";

trunk/php/dbclass.php

@@ -31 +31 @@
   function mysqldb_query_value($query)
   {
-        $this->result = mysql_query($query) or die("Invalid query: " . mysql_error());
-        $num_rows = mysql_num_rows($this->result);
+        if(($this->result = mysql_query($query))==FALSE)
+        {
+                $this->dberror=1;
+                $this->dberrortext=mysql_error();
+        }
+        else
+        {
+                $num_rows = mysql_num_rows($this->result);
+                return($num_rows);
+        }
         return($num_rows);
   }
   function pgsqldb_query_value($query)
   {
-        $this->result = pg_query($query) or die('Query failed: ' . pg_last_error());
-        $num_rows = pg_num_rows($this->result);
+        if(($this->result = pg_query($query))==FALSE)
+        {
+                $this->dberror=1;
+                $this->dberrortext=pg_last_error();
+        }
+        else
+        {
+                $num_rows = pg_num_rows($this->result);
+                return($num_rows);
+        }
         return($num_rows);
   }
@@ -269 +285 @@
                 $this->dberror=1;
           }
-        return(0);
+        return($link);
   }
   function pgsqldb_connect($host,$user,$passwd,$dbname)
   {
         $this->dberror=0;
-        $link = pg_connect("host=$host dbname=$dbname user=$user password=$passwd") or die('Could not connect: ' . pg_last_error());
+        $link = pg_connect("host=$host dbname=$dbname user=$user password=$passwd");
         return($link);
   }
@@ -342 +358 @@
 //$DB=new SAMSDB($SAMSConf->DB_ENGINE, $SAMSConf->ODBC, $SAMSConf->DB_SERVER, $SAMSConf->DB_USER, $SAMSConf->DB_PASSWORD, $SAMSConf->SAMSDB, $SAMSConf->ODBCSOURCE);
 
-  function SAMSDB($samsconf)
-  {
-
-$db=$samsconf->DB_ENGINE;
-$odbc=$samsconf->ODBC;
-$host=$samsconf->DB_SERVER;
-$user=$samsconf->DB_USER;
-$passwd=$samsconf->DB_PASSWORD;
-$dbname=$samsconf->SAMSDB;
-$odbc_source=$samsconf->ODBCSOURCE;
+  function SAMSDB()
+  {
+        $SAMSConf=new MAINCONF();
+
+        $db=$SAMSConf->DB_ENGINE;
+        $odbc=$SAMSConf->ODBC;
+        $host=$SAMSConf->DB_SERVER;
+        $user=$SAMSConf->DB_USER;
+        $passwd=$SAMSConf->DB_PASSWORD;
+        $dbname=$SAMSConf->SAMSDB;
+        $odbc_source=$SAMSConf->ODBCSOURCE;
 
 //echo "$dbname: $user@$host <BR>\n";
-    $this->db_odbc=0;
-    $phpver=explode(".",phpversion());
-    if( $odbc==1 )
-    {
-        $this->db_odbc=1;
-        $this->odbc_source=$odbc_source;
-        if(function_exists('odbc_connect'))
-        {
-            $this->db_odbc=1;
-        }
-        else
-        {
-            $this->db_pdo=1;
-        }
-    }
-    $this->db_name=$db;
-    if($this->db_name=="MySQL" && $this->db_odbc==0 && $this->db_pdo==0)
-      {
-        $link=$this->mysqldb_connect($host,$user,$passwd,$dbname);
-      }
-    if($this->db_name=="PostgreSQL" && $this->db_odbc==0 && $this->db_pdo==0)
-      {
-        $this->link=$this->pgsqldb_connect($host,$user,$passwd,$dbname);
-      }
-    if($this->db_odbc==1 && $this->db_pdo==0)
-      {
-        $this->odbcdb_connect($host,$user,$passwd,$dbname);
-      }
-    if($this->db_odbc==1 && $this->db_pdo==1)
-      {
-        $this->pdodb_connect($host,$user,$passwd,$dbname);
-      }
+        $this->db_odbc=0;
+        $phpver=explode(".",phpversion());
+        if( $odbc==1 )
+        {
+                $this->db_odbc=1;
+                $this->odbc_source=$odbc_source;
+                if(function_exists('odbc_connect'))
+                {
+                        $this->db_odbc=1;
+                }
+                else
+                {
+                        $this->db_pdo=1;
+                }
+        }
+        $this->db_name=$db;
+        if($this->db_name=="MySQL" && $this->db_odbc==0 && $this->db_pdo==0)
+        {
+                $this->link=$this->mysqldb_connect($host,$user,$passwd,$dbname);
+        }
+        if($this->db_name=="PostgreSQL" && $this->db_odbc==0 && $this->db_pdo==0)
+        {
+                $this->link=$this->pgsqldb_connect($host,$user,$passwd,$dbname);
+        }
+        if($this->db_odbc==1 && $this->db_pdo==0)
+        {
+                $this->odbcdb_connect($host,$user,$passwd,$dbname);
+        }
+        if($this->db_odbc==1 && $this->db_pdo==1)
+        {
+                $this->pdodb_connect($host,$user,$passwd,$dbname);
+        }
+//      if($this->link==FALSE)
+//              echo "error connection to db<BR>";
   }
 /*
@@ -391 +410 @@
   {
 
-    $phpver=explode(".",phpversion());
-    if( $odbc==1 )
-    {
-        $this->db_odbc=1;
-        $this->odbc_source=$odbc_source;
-        if(function_exists('odbc_connect'))
-        {
-            $this->db_odbc=1;
-        }
-        else
-        {
-            $this->db_pdo=1;
-        }
-    }
-    $this->db_name=$db;
-
-    if($this->db_name=="MySQL" && $this->db_odbc==0 && $this->db_pdo==0)
-      {
-        $link=$this->mysqldb_connect($host,$user,$passwd,$dbname);
-      }
-    if($this->db_name=="PostgreSQL" && $this->db_odbc==0 && $this->db_pdo==0)
-      {
-        $this->link=$this->pgsqldb_connect($host,$user,$passwd,$dbname);
-      }
-    if($this->db_odbc==1 && $this->db_pdo==0)
-      {
-        $this->odbcdb_connect($host,$user,$passwd,$dbname);
-      }
-    if($this->db_odbc==1 && $this->db_pdo==1)
-      {
-        $this->pdodb_connect($host,$user,$passwd,$dbname);
-      }
-  }
-
+        $this->db_odbc=0;
+        $phpver=explode(".",phpversion());
+        if( $odbc==1 )
+        {
+                $this->db_odbc=1;
+                $this->odbc_source=$odbc_source;
+                if(function_exists('odbc_connect'))
+                {
+                        $this->db_odbc=1;
+                }
+                else
+                {
+                        $this->db_pdo=1;
+                }
+        }
+        $this->db_name=$db;
+        if($this->db_name=="MySQL" && $this->db_odbc==0 && $this->db_pdo==0)
+        {
+                $this->link=$this->mysqldb_connect($host,$user,$passwd,$dbname);
+        }
+        if($this->db_name=="PostgreSQL" && $this->db_odbc==0 && $this->db_pdo==0)
+        {
+                $this->link=$this->pgsqldb_connect($host,$user,$passwd,$dbname);
+        }
+        if($this->db_odbc==1 && $this->db_pdo==0)
+        {
+                $this->odbcdb_connect($host,$user,$passwd,$dbname);
+        }
+        if($this->db_odbc==1 && $this->db_pdo==1)
+        {
+                $this->pdodb_connect($host,$user,$passwd,$dbname);
+        }
+        if($this->link==FALSE)
+                echo "error connection to db<BR>";
+  }
 */
 
@@ -493 +513 @@
 }
 
-
+/*
 
 //$db, $odbc, $host, $user ,$passwd, $dbname
@@ -668 +688 @@
 exit(0);
 }
-
+*/
 function CreateSAMSdbPgSQL($host, $user, $passwd, $dbname)
 {

trunk/php/icon/classic/tree.css

@@ +1 @@
+
+
 TD {
     FONT: 13px sans-serif;
-#    cursor:se-resize;
-}
-BODY    {
+    # cursor:se-resize;
+  }
+
+
+BODY {
     FONT: 13px sans-serif;
     BORDER: 0;
-        BORDER-LEFT: 1px inset;
-        BORDER-RIGHT: 1px inset;
+    BORDER-LEFT: 1px inset;
+    BORDER-RIGHT: 1px inset;
     BACKGROUND-COLOR: white;
-}
-.item {
-        line-height: 20px;
-        position: relative;
-        left: 0px;
-}
-A       {
-        text-decoration: none;
-        color: black;
-}
-.editable {
-        color: black;
-}
-.editable .selected {
-        background-color: #333399;
-        color: white;
-}
-.fixed {
-        color: #999999;
-}
-.fixed .selected {
-        color: #CCCCCC;
-        background-color: #333399;
-}
-.invisible {
-        font-style: italic;
-}
-.row {
-        height: 20px;
-}
-IMG.icon {
-        padding: 0px;
-        border: 0px;
-        margin: 0px;
-        margin-left: -3px;
-        margin-right: 3px;
-}
-IMG.flag {
-        margin-top: 5px;
-}
-
-TABLE.samstable { background:white; width:95%;  }
-TABLE.samstable TH { background:beige; width:auto; }
-TABLE.samstable TD { background:blanchedalmond;  width:auto;  }
-
-TD.samstraytd { width:50px; height:50px; vertical-align:bottom; text-align: center; background-color: WHITE; }
+  }
 
 
-IMG { border:0; }
+.item {
+    line-height: 20px;
+    position: relative;
+    left: 0px;
+  }
+
+
+A {
+    text-decoration: none;
+    color: black;
+  }
+
+
+.editable {
+    color: black;
+  }
+
+
+.editable .selected {
+    background-color: #333399;
+    color: white;
+  }
+
+
+.fixed {
+    color: #999999;
+  }
+
+
+.fixed .selected {
+    color: #CCCCCC;
+    background-color: #333399;
+  }
+
+
+.invisible {
+    font-style: italic;
+  }
+
+
+.row {
+    height: 20px;
+  }
+
+
+IMG.icon {
+    padding: 0px;
+    border: 0px;
+    margin: 0px;
+    margin-left: -3px;
+    margin-right: 3px;
+  }
+
+
+IMG.flag {
+    margin-top: 5px;
+  }
+
+
+TABLE.samstable {
+    background:white;
+    width:95%;
+  }
+
+
+TABLE.samstable TH {
+    background:beige;
+    width:auto;
+  }
+
+
+TABLE.samstable TD {
+    background:blanchedalmond;
+    width:auto;
+  }
+
+
+TD.samstraytd {
+    width:50px;
+    height:50px;
+    vertical-align:bottom;
+    text-align: center;
+    background-color: WHITE;
+  }
+
+
+IMG {
+    border:0;
+  }
 
 /* Sortable tables */
+
 table.sortable a.sortheader {
     background-color:#eee;
@@ -66 +114 @@
     text-decoration: none;
     display: block;
-}
+  }
+
+
 table.sortable span.sortarrow {
     color: black;
     text-decoration: none;
-}
+  }
+
+
+TABLE.pagetop {
+    border-width: 2;
+    background:white;
+    width:95%;
+  }
+TABLE.pagetop TD {
+    background:white;
+    width:auto;
+    text-align: center;
+    vertical-align: middle;
+  }
+TABLE.pagetop IMG {
+    background:white;
+    vertical-align: middle;
+  }
+

trunk/php/index.html

@@ -2 +2 @@
 <head>
 <TITLE>SAMS 2.0.0-beta1 (SQUID Account Management System).</TITLE>
-<META  content="text/html; charset=koi8-r" http-equiv="Content-Type">
-<META HTTP-EQUIV="expires" CONTENT="THU, 01 Jan 1970 00:00:01 GMT">
-<META HTTP-EQUIV="pragma" CONTENT="no-cache">
-
-<script>
-function op() { //This function is used with folders that do not open pages themselves. See online docs.
-}
-</script>
-</head>
-
-<FRAMESET frameborder="0" framespacing="0" cols="25%,*,0">
-  <FRAME src="lframe.php?value=start" name="lframe" >
-  <FRAMESET frameborder="0" framespacing="0" rows="*,75">
-    <FRAME SRC="main.php?show=exe&function=userdoc&value=start" name="basefrm">
-    <FRAME SRC="tray.php?show=exe&filename=admintray.php&function=admintray&value=start" name="tray">
-    <FRAME SRC="" name="hidden" >
-  </FRAMESET> 
-</FRAMESET> 
+<META HTTP-EQUIV="REFRESH" CONTENT="1; index.php"></HTML>
+</HEAD>
+<BODY>
+</BODY>
 </HTML>

trunk/php/lang/lang.EN

@@ -969 +969 @@
   $authbuttom_1_ncsaimport_LoadFileForm_1="Loading of the list of users from a file with passwords";
 
+  $setup_1="Choose language";
+  $setup_2="Verify requirements";
+  $setup_3="Set up database";
+  $setup_4="Finished";
+  $setup_5="Requirements problem";
+  $setup_6="The following errors must be resolved before you can continue the installation process:";
+   $setup_7="Web interface SAMS demands the right to record in the catalogue ./data";
+   $setup_8="ëÁÔÁÌÏÇ ./data ÚÁËÒÙÔ ÄÌÑ ÚÁÐÉÓÉ. þÔÏÂÙ ÐÒÏÄÏÌÖÉÔØ ÕÓÔÁÎÏ×ËÕ, ÎÁÓÔÒÏÊÔÅ ÒÁÚÒÅÛÅÎÉÑ ×ÒÕÞÎÕÀ.";
+   $setup_9="ðÏÖÁÌÕÊÓÔÁ, ÐÒÏ×ÅÒØÔÅ ÓÏÏÂÝÅÎÉÅ Ï ÏÛÉÂËÅ É ÐÏÐÒÏÂÕÊÔÅ ÓÎÏ×Á.";
+   $setup_10="äÌÑ ÓÏÚÄÁÎÉÑ ×ÁÛÅÊ ÂÁÚÙ ÄÁÎÎÙÈ SAMS2 ÕËÁÖÉÔÅ ÓÌÅÄÕÀÝÕÀ ÉÎÆÏÒÍÁÃÉÀ.";
+   $setup_11="database engine";
+   $setup_12="database user";
+   $setup_13="Password";
+   $setup_14="hostname";
+   $setup_15="database name";
+
+   $setup_16="Next";
+   $setup_17="Back";
+   $setup_18="Check up again";
+   $setup_19="Access rights";
+   $setup_20="php settings";
+   $setup_21="php modules";
+   $setup_22="Zlib module";
+   $setup_23="GD2 module";
+   $setup_24="MySQL support";
+   $setup_25="installed";
+   $setup_26="accessible to record";
+   $setup_27="inaccessible to record";
+   $setup_28="not installed";
+   $setup_29="Recommended";
+   $setup_30="Installed";
+   $setup_31="Options";
+   $setup_32="Create SAMS DB user";
+   $setup_33="SAMS DB user";
+   $setup_34="SAMS DB user password";
+   $setup_35="PostgreSQL support";
+   $setup_36="Start SAMS web interface";
+   $setup_37="Creation of database SAMS";
 
 ?>

trunk/php/lang/lang.KOI8-R

@@ -983 +983 @@
    $authbuttom_1_ncsaimport_LoadFileForm_1="úÁÇÒÕÚËÁ ÓÐÉÓËÁ ÐÏÌØÚÏ×ÁÔÅÌÅÊ ÉÚ ÆÁÊÌÁ Ó ÐÁÒÏÌÑÍÉ";
 
+   $setup_1="÷ÙÂÏÒ ÑÚÙËÁ";
+   $setup_2="ðÒÏ×ÅÒËÁ ÔÒÅÂÏ×ÁÎÉÊ";
+   $setup_3="õÓÔÁÎÏ×ËÁ ÂÁÚÙ ÄÁÎÎÙÈ";
+   $setup_4="úÁ×ÅÒÛÅÎÏ";
+   $setup_5="îÁÞÁÌØÎÁÑ ÐÒÏ×ÅÒËÁ";
+   $setup_6="óÌÅÄÕÀÝÉÅ ÏÛÉÂËÉ ÎÕÖÎÏ ÉÓÐÒÁ×ÉÔØ ÐÅÒÅÄ ÐÒÏÄÏÌÖÅÎÉÅÍ ÐÒÏÃÅÓÓÁ ÉÎÓÔÁÌÌÑÃÉÉ:";
+   $setup_7="Web ÉÎÔÅÒÆÅÊÓ SAMS ÔÒÅÂÕÅÔ ÐÒÁ×Á ÎÁ ÚÁÐÉÓØ × ËÁÔÁÌÏÇ ./data.";
+   $setup_8="ëÁÔÁÌÏÇ ./data ÚÁËÒÙÔ ÄÌÑ ÚÁÐÉÓÉ. þÔÏÂÙ ÐÒÏÄÏÌÖÉÔØ ÕÓÔÁÎÏ×ËÕ, ÎÁÓÔÒÏÊÔÅ ÒÁÚÒÅÛÅÎÉÑ ×ÒÕÞÎÕÀ.";
+   $setup_9="ðÏÖÁÌÕÊÓÔÁ, ÐÒÏ×ÅÒØÔÅ ÓÏÏÂÝÅÎÉÅ Ï ÏÛÉÂËÅ É ÐÏÐÒÏÂÕÊÔÅ ÓÎÏ×Á.";
+   $setup_10="äÌÑ ÓÏÚÄÁÎÉÑ ×ÁÛÅÊ ÂÁÚÙ ÄÁÎÎÙÈ SAMS2 ÕËÁÖÉÔÅ ÓÌÅÄÕÀÝÕÀ ÉÎÆÏÒÍÁÃÉÀ.";
+   $setup_11="îÁÚ×ÁÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ";
+   $setup_12="éÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ âä";
+   $setup_13="ðÁÒÏÌØ Ë ÂÁÚÅ ÄÁÎÎÙÈ";
+   $setup_14="èÏÓÔ ÂÁÚÙ ÄÁÎÎÙÈ";
+   $setup_15="éÍÑ ÂÁÚÙ ÄÁÎÎÙÈ";
+   $setup_16="äÁÌÅÅ";
+   $setup_17="îÁÚÁÄ";
+   $setup_18="ðÒÏ×ÅÒÉÔØ ÓÎÏ×Á";
+   $setup_19="ðÒÁ×Á ÄÏÓÔÕÐÁ";
+   $setup_20="õÓÔÁÎÏ×ËÉ php";
+   $setup_21="âÉÂÌÉÏÔÅËÉ php";
+   $setup_22="ðÏÄÄÅÒÖËÁ ÂÉÂÌÉÏÔÅËÉ ÓÖÁÔÉÑ Zlib";
+   $setup_23="ðÏÄÄÅÒÖËÁ ÂÉÂÌÉÏÔÅËÉ GD2";
+   $setup_24="ðÏÄÄÅÒÖËÁ MySQL";
+   $setup_25="ÕÓÔÁÎÏ×ÌÅÎÁ";
+   $setup_26="ÄÏÓÔÕÐÅÎ ÄÌÑ ÚÁÐÉÓÉ";
+   $setup_27="ÎÅÄÏÓÔÕÐÅÎ ÄÌÑ ÚÁÐÉÓÉ";
+   $setup_28="ÎÅ ÕÓÔÁÎÏ×ÌÅÎÁ";
+   $setup_29="òÅËÏÍÅÎÄÕÅÔÓÑ";
+   $setup_30="õÓÔÁÎÏ×ÌÅÎÏ";
+   $setup_31="äÉÒÅËÔÉ×Á";
+   $setup_32="óÏÚÄÁÔØ ÐÏÌØÚÏ×ÁÔÅÌÑ SAMS ÄÌÑ ÄÏÓÔÕÐÁ Ë ÂÁÚÅ ÄÁÎÎÙÈ";
+   $setup_33="ÉÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ SAMS";
+   $setup_34="ÐÁÒÏÌØ";
+   $setup_35="ðÏÄÄÅÒÖËÁ PostgreSQL";
+   $setup_36="úÁÐÕÓÔÉÔØ WEB ÉÎÔÅÒÆÅÊÓ SAMS";
+   $setup_37="óÏÚÄÁÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ SAMS";
+
 ?>

trunk/php/lang/lang.UTF8

@@ -1082 +1082 @@
    $authbuttom_1_ncsaimport_LoadFileForm_1="Загрузка спОска пПльзПвателей Оз файла с парПляЌО";
 
+   $setup_1="ВыбПр языка";
+   $setup_2="ПрПверка требПваМОй";
+   $setup_3="УстаМПвка базы ЎаММыÑ
+";
+   $setup_4="ЗавершеМП";
+   $setup_5="НачальМая прПверка";
+   $setup_6="СлеЎующОе ПшОбкО МужМП ОсправОть переЎ прПЎПлжеМОеЌ прПцесса ОМсталляцОО:";
+   $setup_7="Web ОМтерфейс SAMS требует права Ма запОсь в каталПг ./data.";
+   $setup_8="КаталПг ./data закрыт Ўля запОсО. ЧтПбы прПЎПлжОть устаМПвку, МастрПйте разрешеМОя вручМую.";
+   $setup_9="ППжалуйста, прПверьте сППбщеМОе Пб ПшОбке О пПпрПбуйте сМПва.";
+   $setup_10="Для сПзЎаМОя вашей базы ЎаММыÑ
+ SAMS2 укажОте слеЎующую ОМфПрЌацОю.";
+   $setup_11="НазваМОе базы ЎаММыÑ
+";
+   $setup_12="ИЌя пПльзПвателя БД";
+   $setup_13="ПарПль к базе ЎаММыÑ
+";
+   $setup_14="ХПст базы ЎаММыÑ
+";
+   $setup_15="ИЌя базы ЎаММыÑ
+";
+   $setup_16="Далее";
+   $setup_17="НазаЎ";
+   $setup_18="ПрПверОть сМПва";
+   $setup_19="Права ЎПступа";
+   $setup_20="УстаМПвкО php";
+   $setup_21="БОблОПтекО php";
+   $setup_22="ППЎЎержка бОблОПтекО сжатОя Zlib";
+   $setup_23="ППЎЎержка бОблОПтекО GD2";
+   $setup_24="ППЎЎержка MySQL";
+   $setup_25="устаМПвлеМа";
+   $setup_26="ЎПступеМ Ўля запОсО";
+   $setup_27="МеЎПступеМ Ўля запОсО";
+   $setup_28="Ме устаМПвлеМа";
+   $setup_29="РекПЌеМЎуется";
+   $setup_30="УстаМПвлеМП";
+   $setup_31="ДОректОва";
+   $setup_32="СПзЎать пПльзПвателя SAMS Ўля ЎПступа к базе ЎаММыÑ
+";
+   $setup_33="ОЌя пПльзПвателя SAMS";
+   $setup_34="парПль";
+   $setup_35="ППЎЎержка PostgreSQL";
+   $setup_36="ЗапустОть WEB ОМтерфейс SAMS";
+   $setup_37="СПзЎаМОе базы ЎаММыÑ
+ SAMS";
+
 ?>

trunk/php/lang/lang.WIN1251

@@ -983 +983 @@
    $authbuttom_1_ncsaimport_LoadFileForm_1="Çàãðóçêà ñïèñêà ïîëüçîâàòåëåé èç ôàéëà ñ ïàðîëÿìè";
 
+   $setup_1="Âûáîð ÿçûêà";
+   $setup_2="Ïðîâåðêà òðåáîâàíèé";
+   $setup_3="Óñòàíîâêà áàçû äàííûõ";
+   $setup_4="Çàâåðøåíî";
+   $setup_5="Íà÷àëüíàÿ ïðîâåðêà";
+   $setup_6="Ñëåäóþùèå îøèáêè íóæíî èñïðàâèòü ïåðåä ïðîäîëæåíèåì ïðîöåññà èíñòàëëÿöèè:";
+   $setup_7="Web èíòåðôåéñ SAMS òðåáóåò ïðàâà íà çàïèñü â êàòàëîã ./data.";
+   $setup_8="Êàòàëîã ./data çàêðûò äëÿ çàïèñè. ×òîáû ïðîäîëæèòü óñòàíîâêó, íàñòðîéòå ðàçðåøåíèÿ âðó÷íóþ.";
+   $setup_9="Ïîæàëóéñòà, ïðîâåðüòå ñîîáùåíèå îá îøèáêå è ïîïðîáóéòå ñíîâà.";
+   $setup_10="Äëÿ ñîçäàíèÿ âàøåé áàçû äàííûõ SAMS2 óêàæèòå ñëåäóþùóþ èíôîðìàöèþ.";
+   $setup_11="Íàçâàíèå áàçû äàííûõ";
+   $setup_12="Èìÿ ïîëüçîâàòåëÿ ÁÄ";
+   $setup_13="Ïàðîëü ê áàçå äàííûõ";
+   $setup_14="Õîñò áàçû äàííûõ";
+   $setup_15="Èìÿ áàçû äàííûõ";
+   $setup_16="Äàëåå";
+   $setup_17="Íàçàä";
+   $setup_18="Ïðîâåðèòü ñíîâà";
+   $setup_19="Ïðàâà äîñòóïà";
+   $setup_20="Óñòàíîâêè php";
+   $setup_21="Áèáëèîòåêè php";
+   $setup_22="Ïîääåðæêà áèáëèîòåêè ñæàòèÿ Zlib";
+   $setup_23="Ïîääåðæêà áèáëèîòåêè GD2";
+   $setup_24="Ïîääåðæêà MySQL";
+   $setup_25="óñòàíîâëåíà";
+   $setup_26="äîñòóïåí äëÿ çàïèñè";
+   $setup_27="íåäîñòóïåí äëÿ çàïèñè";
+   $setup_28="íå óñòàíîâëåíà";
+   $setup_29="Ðåêîìåíäóåòñÿ";
+   $setup_30="Óñòàíîâëåíî";
+   $setup_31="Äèðåêòèâà";
+   $setup_32="Ñîçäàòü ïîëüçîâàòåëÿ SAMS äëÿ äîñòóïà ê áàçå äàííûõ";
+   $setup_33="èìÿ ïîëüçîâàòåëÿ SAMS";
+   $setup_34="ïàðîëü";
+   $setup_35="Ïîääåðæêà PostgreSQL";
+   $setup_36="Çàïóñòèòü WEB èíòåðôåéñ SAMS";
+   $setup_37="Ñîçäàíèå áàçû äàííûõ SAMS";
+
 ?>

trunk/php/lframe_users.php

@@ -13 +13 @@
  global $SAMSConf;
  global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
-  $DB2=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
+  $DB2=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);

trunk/php/main.php

@@ -104 +104 @@
 $SAMSConf=new SAMSCONFIG();
 
-//$DB=new SAMSDB($$SAMSConf);
-$DB=new SAMSDB(&$SAMSConf);
+$DB=new SAMSDB();
 
 require('./userclass.php');

trunk/php/poolclass.php

@@ -24 +24 @@
 {
   global $SAMSConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
 
   $num_rows=$DB->samsdb_query_value("SELECT * FROM delaypool WHERE s_pool_id='$poolid' ");

trunk/php/proxyclass.php

@@ -42 +42 @@
 {
   global $SAMSConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $num_rows=$DB->samsdb_query_value("SELECT * FROM proxy WHERE s_proxy_id='$proxy_id' ");
   $row=$DB->samsdb_fetch_array();

trunk/php/samsclass.php

@@ -5 +5 @@
  * (see the file 'main.php' for license details)
  */
-
-class SAMSCONFIG
+class MAINCONF
 {
   var $DB_ENGINE;
+  var $DB_SERVER;
+  var $DB_USER;
+  var $DB_PASSWORD;
   var $SAMSPATH;
   var $access;
@@ -33 +35 @@
   var $EXINT;
   var $EXIP;
-  var $LANG;
   var $CHARSET;
   var $NTLMDOMAIN;
@@ -66 +67 @@
   var $DBCONN;
   var $ODBCSOURCE;
-/*á×ÔÏÒÉÚÁÃÉÑ ÐÏÌØÚÏ×ÁÔÅÌÑ × ×Å ÉÎÔÅÒÆÅÊÓÅ*/
-  var $USERID;
-  var $USERWEBACCESS;
-  var $AUTHERRORRC;
-  var $AUTHERRORRT;
-  var $USERPASSWD;
-
-  function ToUserDataAccess($userid, $str)
-    {
-$this->USERWEBACCESS="W";
-        $maslen=strlen($str);
-        for($i=0;$i<$maslen;$i++)
-        {
-                if($str[$i]=="W" && $this->USERID==$userid && strstr($this->USERWEBACCESS,"W") )
-                {
-                        return(1);
-                }
-                if(strstr($this->USERWEBACCESS,$str[$i]) && $str[$i]!="W")
-                {
-                        return(1);
-                }
-        }       
-        return(0);
- }
-
-  function SAMSCONFIG()
-    {
-      require('./config.php');
-      $this->ReadSAMSConfFile($configfile);
-      $this->ReadSAMSSettings();
-      //$this->PrintSAMSSettings();
-    }
-  function LoadConfig()
-    {
-      require('./config.php');      
-      $this->ReadSAMSConfFile($configfile);
-    }
-
-  function ReadSAMSSettings()
-    {
-      $dbadmin="root";
-//      echo "BD CONFIG: $this->DB_ENGINE, $this->ODBC, $this->DB_SERVER, $this->DB_USER, $this->DB_PASSWORD, $this->SAMSDB, $this->ODBC_DRIVER<BR>";
-
-        if($this->ODBC == "1" )
-        {
-                $DB=new SAMSDB($this->DB_ENGINE, $this->ODBC, $this->DB_SERVER, $this->DB_USER, $this->DB_PASSWORD, $this->SAMSDB,  $this->ODBCSOURCE);
-                if($DB->dberror != '1')
-                {
-                        $num_rows=$DB->samsdb_query_value("select s_lang from websettings");         
-
-                        $row=$DB->samsdb_fetch_array();
-                        if($row['s_lang'] != "EN" )
-                        {
-                                $dbadmin="";
-                                echo "table is NOT created<BR>";
-                                $DB->dberror=1;
-                                        //CreateSAMSdbPgSQL($this->DB_SERVER, $this->DB_USER, $this->DB_PASSWORD, $this->SAMSDB);
-                          }
-                }
-        }
-
-        if($this->DB_ENGINE == "MySQL" && $this->ODBC == "0" )
-        {
-                $DB=new SAMSDB(&$this);
-        }
-        if($this->DB_ENGINE == "PostgreSQL" && $this->ODBC == "0" )
-        {
-                $DB=new SAMSDB(&$this);
-//              $DB=new SAMSDB($this->DB_ENGINE, $this->ODBC, $this->DB_SERVER, $this->DB_USER, $this->DB_PASSWORD, $this->SAMSDB, $this->ODBC_DRIVER);
-                if($DB->dberror != '1')
-                        {
-                                $num_rows=$DB->samsdb_query_value("select count(tablename) from pg_tables where tablename LIKE 'squiduser' ");         
-                                $row=$DB->samsdb_fetch_array();
-                                if($row[0] == 0 )
-                                  {
-                                        $dbadmin="postgres";
-                                        echo "table is NOT created<BR>";
-                                        $DB->dberror=1;
-                                        //CreateSAMSdbPgSQL($this->DB_SERVER, $this->DB_USER, $this->DB_PASSWORD, $this->SAMSDB);
-                                  }
-                        }
-        }
-        if($DB->dberror=="1"&&strstr($_SERVER['SCRIPT_FILENAME'],"main.php"))
-        {
-                echo "SAMS ERROR:<BR>";
-                echo "$DB->dberrortext<BR>";
-
-                echo "<FONT COLOR=\"RED\">Access denied for user $this->DB_USER@$this->DB_SERVER to database $this->DB_ENGINE</FONT><BR>";
-                if(isset($_GET["function"])) $function=$_GET["function"];
-                if($function=="userdoc")
-                  {
-                        print("<TABLE><TR> \n");
-                        echo "<TD><IMG SRC=\"icon/classic/warning.jpg\" ALIGN=LEFT>";
-                        echo "<TD>SAMS databases not connected<BR>";
-                        print("</TABLE> \n");
-                        print("<hr>\n");
-                        if($squidlogdb==1)
-                                echo "The base $this->LOGDB not created or the user $this->DB_USER has no rights to connection to it<BR>";
-                        if($squidctrldb==1)
-                                echo "The base $this->SAMSDB not created or the user $this->DB_USER has no rights to connection to it<BR>";
-
-                        print("<SCRIPT LANGUAGE=JAVASCRIPT>");
-                        print("function SetChange()");
-                        print("{");
-                        print("if(document.forms[\"createdatabase\"].elements[\"create\"].checked==true)\n");
-                        print("  {\n");
-                        print("    document.forms[\"createdatabase\"].elements[\"muser\"].disabled=false\n");
-                        print("    document.forms[\"createdatabase\"].elements[\"mpass\"].disabled=false\n");
-                        print("  }\n");
-                        print("if(document.forms[\"createdatabase\"].elements[\"create\"].checked==false)\n");
-                        print("  {\n");
-                        print("    document.forms[\"createdatabase\"].elements[\"muser\"].disabled=true\n");
-                        print("    document.forms[\"createdatabase\"].elements[\"mpass\"].disabled=true\n");
-                        print("  }\n");
-                        print("}\n");
-                        print("</SCRIPT>");
-
-                        print("<H2 ALIGN=\"CENTER\">Create database</H2>");
-                        print("<FORM NAME=\"createdatabase\" ACTION=\"createdb.php\">\n");
-                        print("<INPUT TYPE=\"HIDDEN\" NAME=\"action\" value=\"createdatabase\">\n");
-                        print("<INPUT TYPE=\"HIDDEN\" NAME=\"dbname\" value=\"$this->DB_ENGINE\">\n");
-                        print("<INPUT TYPE=\"HIDDEN\" NAME=\"samsdb\" value=\"$this->SAMSDB\">\n");
-                        print("<INPUT TYPE=\"HIDDEN\" NAME=\"odbc\" value=\"$this->ODBC\">\n");
-                        print("<INPUT TYPE=\"HIDDEN\" NAME=\"pdo\" value=\"$this->PDO\">\n");
-                        print("<TABLE WIDTH=\"90%\">\n");
-                        print("<TR><TD ALIGN=RIGHT>DB Hostname: <TD ALIGN=LEFT><INPUT TYPE=\"TEXT\" NAME=\"hostname\" value=\"localhost\">\n");
-                        print("<TR><TD ALIGN=RIGHT>DB login: <TD ALIGN=LEFT><INPUT TYPE=\"TEXT\" NAME=\"username\" value=\"$dbadmin\">\n");
-                        print("<TR><TD ALIGN=RIGHT>DB password: <TD ALIGN=LEFT><INPUT TYPE=\"PASSWORD\" NAME=\"pass\">\n");
-                        if($this->DB_ENGINE == "MySQL")
-                        {
-                        print("<TR><TD ALIGN=RIGHT><P>Create SAMS DB user <INPUT TYPE=\"CHECKBOX\" NAME=\"create\" CHECKED  onclick=SetChange()><TD>\n");
-                        print("<TR><TD ALIGN=RIGHT><P>SAMS DB user: <TD ALIGN=LEFT><INPUT TYPE=\"TEXT\" NAME=\"muser\" value=\"sams@localhost\">\n");
-                        print("<TR><TD ALIGN=RIGHT>SAMS DB user password: <TD ALIGN=LEFT><INPUT TYPE=\"PASSWORD\" NAME=\"mpass\">\n");
-                        }
-                        print("</TABLE>\n");
-
-                        printf("<BR><CENTER>");
-                        print("<BR><INPUT TYPE=\"SUBMIT\" value=\"Create Database\">\n");
-                        print("</FORM>\n");
-
-                        print("<P><B>SAMS documentation</B><BR>\n");
-                        print("<A HREF=\"doc/EN/index.html\">english<BR>\n");
-                        print("<A HREF=\"doc/RU/index.html\">russian<BR>\n");
-                        
-                  }
-          exit(0);
-        }
-        if($DB->dberror=="1")
-        {
-                exit(0);
-        }
-      $DB->samsdb_query("SELECT * FROM websettings");
-      $row=$DB->samsdb_fetch_array();
-      $this->LANG=$row['s_lang'];
-      if ($this->LANG == "WIN1251")
-        $this->CHARSET = "windows-1251";
-      else
-        $this->CHARSET = $this->LANG;
-
-      if ($this->LANG=="EN") 
-        $this->LANGCODE = "EN"; 
-      else
-        $this->LANGCODE = "RU";
-      $this->ICONSET="icon/$row[s_iconset]";
-      $this->USERACCESS=$row['s_user'];
-      $this->URLACCESS=$row['s_urlaccess'];
-      $this->SHOWUTREE=$row['s_showutree'];
-      $this->SHOWNAME=$row['s_showname'];
-        if($this->KBSIZE==0) $this->KBSIZE=1024;
-        if($this->MBSIZE==0) $this->MBSIZE=$this->KBSIZE*$this->KBSIZE;
-      $this->SHOWGRAPH=$row['s_showgraph'];
-      $this->PDFLIB=$row['s_createpdf'];
-
-      $DB->samsdb_query("SELECT COUNT(*) FROM proxy ");
-      $row=$DB->samsdb_fetch_array();
-      $this->PROXYCOUNT=$row[0];
-      if($row[0]==0)
-        $this->PROXYCOUNT = 1;
-        $this->SWITCHTO=1;
-//      $DB->samsdb_query("USE $this->SAMSDB");
-    }
 
   function ReadSAMSConfFile($configfile)
@@ -263 +83 @@
          $string=fgets($finp, 10000);
          $str2=trim(strtok($string,"="));
-//         if(!strcasecmp($str2,"SAMSPATH" ))               $this->SAMSDB=trim(strtok("="));
+
          if(!strcasecmp($str2,"DBNAME" ))       $this->DB_ENGINE=trim(strtok("="));
          if(!strcasecmp($str2,"DB_ENGINE" ))       $this->DB_ENGINE=trim(strtok("="));
@@ -319 +139 @@
       fclose($finp);
     }
+
+  function LoadConfig()
+    {
+      require('./config.php');      
+      $this->ReadSAMSConfFile($configfile);
+    }
+  function MAINCONF()
+    {
+      $this->LoadConfig();
+    }
+
+}
+
+###################################################################################
+class SAMSCONFIG extends MAINCONF
+{
+//  $SAMSConf=new MAINCONF();
+/*á×ÔÏÒÉÚÁÃÉÑ ÐÏÌØÚÏ×ÁÔÅÌÑ × ×Å ÉÎÔÅÒÆÅÊÓÅ*/
+  var $LANG;
+  var $USERID;
+  var $USERWEBACCESS;
+  var $AUTHERRORRC;
+  var $AUTHERRORRT;
+  var $USERPASSWD;
+
+  function ToUserDataAccess($userid, $str)
+    {
+        $this->USERWEBACCESS="W";
+        $maslen=strlen($str);
+        for($i=0;$i<$maslen;$i++)
+        {
+                if($str[$i]=="W" && $this->USERID==$userid && strstr($this->USERWEBACCESS,"W") )
+                {
+                        return(1);
+                }
+                if(strstr($this->USERWEBACCESS,$str[$i]) && $str[$i]!="W")
+                {
+                        return(1);
+                }
+        }       
+        return(0);
+ }
+
+  function SAMSCONFIG()
+  {
+        parent::__construct();
+        $this->ReadSAMSSettings();
+  }
+
+  function ReadSAMSSettings()
+    {
+      $dbadmin="root";
+        $DB=new SAMSDB();
+        if($DB->link==FALSE)
+        {
+                return(FALSE);
+        }
+
+        if($DB->dberror=="1")
+        {
+                exit(0);
+        }
+      $DB->samsdb_query("SELECT * FROM websettings");
+      $row=$DB->samsdb_fetch_array();
+      $this->LANG=$row['s_lang'];
+      if ($this->LANG == "WIN1251")
+        $this->CHARSET = "windows-1251";
+      else
+        $this->CHARSET = $this->LANG;
+
+      if ($this->LANG=="EN") 
+        $this->LANGCODE = "EN"; 
+      else
+        $this->LANGCODE = "RU";
+      $this->ICONSET="icon/$row[s_iconset]";
+      $this->USERACCESS=$row['s_user'];
+      $this->URLACCESS=$row['s_urlaccess'];
+      $this->SHOWUTREE=$row['s_showutree'];
+      $this->SHOWNAME=$row['s_showname'];
+        if($this->KBSIZE==0) $this->KBSIZE=1024;
+        if($this->MBSIZE==0) $this->MBSIZE=$this->KBSIZE*$this->KBSIZE;
+      $this->SHOWGRAPH=$row['s_showgraph'];
+      $this->PDFLIB=$row['s_createpdf'];
+
+      $DB->samsdb_query("SELECT COUNT(*) FROM proxy ");
+      $row=$DB->samsdb_fetch_array();
+      $this->PROXYCOUNT=$row[0];
+      if($row[0]==0)
+        $this->PROXYCOUNT = 1;
+        $this->SWITCHTO=1;
+//      $DB->samsdb_query("USE $this->SAMSDB");
+    }
+
 
   function PrintSAMSSettings()
@@ -368 +281 @@
 }
 
-/*
-  function LoadConfig()
-    {
-      require('./config.php');      
-      $this->ReadSAMSConfFile($configfile);
-    }
-      
-*/
 
 ?>

trunk/php/shablonclass.php

@@ -20 +20 @@
 {
   global $SAMSConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
 
   $num_rows=$DB->samsdb_query_value("SELECT * FROM shablon WHERE s_shablon_id='$shablonid' ");

trunk/php/src/adminbuttom_4_chpasswd.php

@@ -10 +10 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";

trunk/php/src/authadldbuttom_1_prop.php

@@ -31 +31 @@
   global $PROXYConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
 
   $files=array();

trunk/php/src/authadldbuttom_2_usersadd.php

@@ -13 +13 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";
@@ -116 +116 @@
 
         print("<FORM NAME=\"AddDomainUsers\" ACTION=\"main.php\">\n");
-        $DB=new SAMSDB(&$SAMSConf);
+        $DB=new SAMSDB();
 
         $adldserver=GetAuthParameter("adld","adldserver");

trunk/php/src/authadldbuttom_3_importfromad.php

@@ -9 +9 @@
 {
   global $SAMSConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);
@@ -42 +42 @@
 {
   global $SAMSConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";
@@ -93 +93 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";
@@ -256 +256 @@
 
         print("<FORM NAME=\"AddDomainUsers\" ACTION=\"main.php\">\n");
-        $DB=new SAMSDB(&$SAMSConf);
+        $DB=new SAMSDB();
 
         $adldserver=GetAuthParameter("adld","adldserver");

trunk/php/src/authadldtray.php

@@ -82 +82 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";
@@ -108 +108 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";
@@ -146 +146 @@
   print("<P>\n");
 
-  $DB=new SAMSDB(&$SAMSConf);
-  $DB2=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
+  $DB2=new SAMSDB();
   $result=$DB->samsdb_query_value("SELECT s_value FROM auth_param WHERE s_auth='adld' AND s_param='adldgroup'");
   if($result>0)

trunk/php/src/authldapbuttom_1_prop.php

@@ -35 +35 @@
   global $PROXYConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
 
   $files=array();

trunk/php/src/authldapbuttom_2_usersadd.php

@@ -12 +12 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";
@@ -70 +70 @@
   
 
-        $DB=new SAMSDB(&$SAMSConf);
+        $DB=new SAMSDB();
 
         $adldserver=GetAuthParameter("ldap","ldapserver");

trunk/php/src/authldapbuttom_3_importfromldap.php

@@ -9 +9 @@
 {
   global $SAMSConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);
@@ -42 +42 @@
 {
   global $SAMSConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";
@@ -91 +91 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";
@@ -228 +228 @@
         exit(0);  
 
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
 
   PageTop("importfromldap-48.jpg"," $authadldbuttom_3_importfromldap_ImportFromLDAPForm_1 ");

trunk/php/src/authldaptray.php

@@ -75 +75 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";
@@ -101 +101 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";
@@ -136 +136 @@
   require($lang);
 
-  $DB=new SAMSDB(&$SAMSConf);
-  $DB2=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
+  $DB2=new SAMSDB();
 
   PageTop("config_48.jpg","LDAP configuration ");

trunk/php/src/authncsabuttom_1_usersimport.php

@@ -10 +10 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";
@@ -85 +85 @@
         exit;
   
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
 
   PageTop("user.jpg","$authbuttom_1_usersimport_LoadFileForm_1");

trunk/php/src/authncsabuttom_2_ncsaimport.php

@@ -10 +10 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";
@@ -86 +86 @@
         exit;
   
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
 
   PageTop("loadncsa_48.jpg","$authbuttom_1_ncsaimport_LoadFileForm_1");

trunk/php/src/authntlmbuttom_1_prop.php

@@ -30 +30 @@
   global $PROXYConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
 
   $files=array();

trunk/php/src/authntlmbuttom_2_usersadd.php

@@ -13 +13 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";
@@ -78 +78 @@
         exit(0);  
 
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   PageTop("user.jpg"," $usersbuttom_1_domain_AddUsersFromDomainForm_1 NTLM ");
   

trunk/php/src/authntlmbuttom_3_importfromntlm.php

@@ -9 +9 @@
 {
   global $SAMSConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);
@@ -42 +42 @@
 {
   global $SAMSConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";
@@ -90 +90 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";
@@ -241 +241 @@
         exit(0);  
 
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
 
   PageTop("importfromad-48.jpg"," $authadldbuttom_3_importfromntlm_ImportFromNTLMForm_1 ");

trunk/php/src/authntlmtray.php

@@ -50 +50 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";
@@ -109 +109 @@
   require($lang);
 
-  $DB=new SAMSDB(&$SAMSConf);
-  $DB2=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
+  $DB2=new SAMSDB();
 
   PageTop("config_48.jpg","NTLM configuration ");

trunk/php/src/authtray.php

@@ -26 +26 @@
 
 
-        $DB=new SAMSDB(&$SAMSConf);
+        $DB=new SAMSDB();
         $num_rows=$DB->samsdb_query("UPDATE auth_param SET s_value='$ip' WHERE s_auth='ip' AND s_param='enabled' ");
         $num_rows=$DB->samsdb_query("UPDATE auth_param SET s_value='$adld' WHERE s_auth='adld' AND s_param='enabled' ");

trunk/php/src/configbuttom_3_import.php

@@ -282 +282 @@
         exit;
 
- $this->DB=new SAMSDB(&$SAMSConf);
+ $this->DB=new SAMSDB();
  $this->oldDB=new CREATESAMSDB("MySQL", "0", $hostname, $username, $pass, "squidctrl", "0");
 
@@ -306 +306 @@
  $this->pgcharset=pg_client_encoding($this->DB->link);
 
- if($SAMSConf->DB_ENGINE=="PostgreSQL")
+ if($SAMSConf->DB_ENGINE=="PostgreSQL"&&$this->sams1charset!=$this->pgcharset)
  {
-        $this->pgcharset=pg_client_encoding($this->DB->link);
-        if($this->sams1charset!=$this->pgcharset)
-        {
-                if($this->sams1charset=="KOI8-R")
-                {
-                        pg_set_client_encoding("KOI8");
-                }
+        if($this->sams1charset=="KOI8-R")
+        {
+                pg_set_client_encoding("KOI8");
         }
  }
+
 }
 

trunk/php/src/configbuttom_4_backup.php

@@ -11 +11 @@
   global $USERConf;
 
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);
@@ -18 +18 @@
                 exit;
 
+   if(isset($_GET["traffic"])) $traffic=$_GET["traffic"];
+
         $samsdb=array('auth_param', 'passwd', 'proxy', 'redirect',
         'sconfig', 'sconfig_time', 'sgroup', 'shablon', 'squiduser',
         'sysinfo', 'timerange', 'url', 'websettings');
+        $traffictable=array('squidcache', 'cachesum');
         $filename=strftime("sams2-%d%b%Y-%H-%M-%S.sql.gz");
 
@@ -50 +53 @@
                         }
                 }
+                if($traffic=="on")
+                {
+                        for($tcount=0;$tcount<count($traffictable);$tcount++)
+                        {
+                                echo "export table: ".$traffictable[$tcount]."<BR>";
+                                gzwrite($fout,"DELETE FROM ".$traffictable[$tcount].";\n");
+                                $QUERY="SELECT * FROM ".$traffictable[$tcount];
+                                $num_rows=$DB->samsdb_query_value($QUERY);
+                                while($row=$DB->samsdb_fetch_array())
+                                {
+                                        $export = "INSERT INTO ".$traffictable[$tcount]." VALUES(";
+                                        $a=0;
+                                        $a=ceil(count($row)/2);
+                                        for($i=0;$i<$a;$i++)
+                                        {
+                                                $export=$export."'".$row[$i]."'";
+                                                if($i<$a-1)
+                                                        $export=$export.",";
+                                        }
+                                        $export=$export.");";
+                                        gzwrite($fout,$export."\n");
+                                }
+                        }
+                }
                 gzclose($fout);
         }
@@ -74 +101 @@
                                 $export=$export.");";
                                 fwrite($fout,$export."\n");
+                        }
+                }
+                if($traffic=="on")
+                {
+                        for($tcount=0;$tcount<count($traffictable);$tcount++)
+                        {
+                                fwrite($fout,"DROP TABLE IF EXISTS `".$traffictable[$tcount]."`;\n");
+                                fwrite($fout,"CREATE TABLE `".$traffictable[$tcount]."`;\n");
+                                $QUERY="SELECT * FROM ".$traffictable[$tcount];
+                                $num_rows=$DB->samsdb_query_value($QUERY);
+                                while($row=$DB->samsdb_fetch_array())
+                                {
+                                        $export = "INSERT INTO ".$traffictable[$tcount]." VALUES(";
+                                        $a=count($row);
+                                        for($i=0;$i<$a;$i++)
+                                        {
+                                                $export=$export."'".$row[$i]."'";
+                                                if($i<$a-1)
+                                                        $export=$export.",";
+                                        }
+                                        $export=$export.");";
+                                        fwrite($fout,$export."\n");
+                                }
                         }
                 }
@@ -105 +155 @@
         print("<INPUT TYPE=\"HIDDEN\" NAME=\"function\" value=\"savebackup\">\n");
         print("<INPUT TYPE=\"HIDDEN\" NAME=\"filename\" value=\"configbuttom_4_backup.php\">\n");
-        print("<BR>$backupbuttom_1_savebase_SaveBackUpForm_2\n");
-        print("<TABLE>\n");
+        print("<BR>$backupbuttom_1_savebase_SaveBackUpForm_2:\n");
+        print("<P><TABLE>\n");
+        print("<TR><TD><P><INPUT TYPE=\"CHECKBOX\" NAME=\"traffic\"> Save traffic \n");
+        print("<TR><TD><P><INPUT TYPE=\"SUBMIT\" value=\"$backupbuttom_1_savebase_SaveBackUpForm_3\">\n");
         print("</TABLE>\n");
-        print("<BR><INPUT TYPE=\"SUBMIT\" value=\"$backupbuttom_1_savebase_SaveBackUpForm_3\">\n");
         print("</FORM>\n");
 

trunk/php/src/configbuttom_5_restore.php

@@ -12 +12 @@
   global $USERConf;
 
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);
@@ -29 +29 @@
                 if(strstr ( $QUERY, "#" ) == FALSE)
                 {
+                        echo "$QUERY<BR>";
                         $num_rows=$DB->samsdb_query($QUERY.";");
                 }
+                $count++;
         }
 
@@ -56 +58 @@
   print("<BR>$backupbuttom_2_loadbase_LoadBackUpForm_4\n");
   print("<FORM NAME=\"LOADBACKUP\" ENCTYPE=\"multipart/form-data\" ACTION=\"main.php?show=exe&function=loadbackup&filename=configbuttom_5_restore.php\" METHOD=POST>\n");
-  print("<INPUT TYPE=\"HIDDEN\" NAME=\"MAX_FILES_SIZE\" value=\"1048576\">\n");
+  print("<INPUT TYPE=\"HIDDEN\" NAME=\"MAX_FILES_SIZE\" value=\"10485760\">\n");
   print("<INPUT TYPE=\"FILE\" name=\"userfile\" value=\"$backupbuttom_2_loadbase_LoadBackUpForm_2\">\n");
   print("<BR><INPUT TYPE=\"SUBMIT\" value=\"load file and restore backup\">\n");

trunk/php/src/configbuttom_6_moveusertrafficdata.php

@@ -18 +18 @@
         {      exit;     }
 
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $sdate=$DATE->sdate();
   $edate=$DATE->edate();
@@ -47 +47 @@
         $lang="./lang/lang.$SAMSConf->LANG";
         require($lang);
-        $DB=new SAMSDB(&$SAMSConf);
+        $DB=new SAMSDB();
 
         if($USERConf->ToWebInterfaceAccess("C")!=1 )

trunk/php/src/configtray.php

@@ -96 +96 @@
 {
   global $SAMSConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
 
    PageTop("stat_48.jpg","System Information");

trunk/php/src/groupbuttom_0_prop.php

@@ -10 +10 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
 
   if($USERConf->ToWebInterfaceAccess("C")!=1)
@@ -33 +33 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";

trunk/php/src/groupbuttom_2_traffic.php

@@ -12 +12 @@
   global $SAMSConf;
   global $DATE;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   if($SAMSConf->LANG=="KOI8-R")
@@ -106 +106 @@
   global $SAMSConf;
   global $DATE;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";
@@ -149 +149 @@
         exit(0);
 
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $sdate=$DATE->sdate();
   $edate=$DATE->edate();

trunk/php/src/groupbuttom_9_delete.php

@@ -26 +26 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);
@@ -70 +70 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);

trunk/php/src/grouptray.php

@@ -10 +10 @@
   global $USERConf;
 
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
  if(isset($_GET["id"])) $id=$_GET["id"];
  if(isset($_GET["username"])) $users=$_GET["username"];
@@ -29 +29 @@
   global $USERConf;
 
-  $DB=new SAMSDB(&$SAMSConf);
-  $DB2=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
+  $DB2=new SAMSDB();
  
  if(isset($_GET["counter"])) $counter=$_GET["counter"];
@@ -65 +65 @@
   global $USERConf;
 
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);
@@ -247 +247 @@
   if($USERConf->ToWebInterfaceAccess("SC")==1 || ($USERConf->ToWebInterfaceAccess("G")==1 && $USERConf->s_group_id==$id ))
   {
-        $DB=new SAMSDB(&$SAMSConf);
+        $DB=new SAMSDB();
 
         $lang="./lang/lang.$SAMSConf->LANG";

trunk/php/src/ldap.php

@@ -43 +43 @@
     function Authenticate($user, $passwd)
     {
-        if (empty($this->usersrdn))
-            $binddn = $this->FindUserDN($user);
-        else
-            $binddn = "uid=".$user.",".$this->usersrdn.",".$this->base_dn;
-        $ldbind=$this->ld->bind($binddn,"$passwd");
+        $ldbind=$this->ld->bind("uid=$user,$this->usersrdn,$this->base_dn","$passwd");
         return($ldbind);
     }   
-
-    function FindUserDN($user)
-    {
-        $dn="";
-        $basedn=$this->base_dn;
-
-        if (is_null($this->usersfilter) || empty($this->usersfilter))
-            $filter = "(uid=$username)";
-        else
-            $filter="(&".$this->usersfilter."(uid=$username))";
-
-        $array=array('uid');
-        if($sr = $this->ld->searchSubtree($basedn,$filter,$array))
-        {
-            if ($entry = $sr->firstEntry()) 
-                $dn = $entry->getDN();
-        }
-        return($dn);
-    }
 
     function GetUsersData()
     {
         $userdata = array();
-        $basedn=$this->base_dn;
-        if (!empty($this->usersrdn))
-                $basedn=$this->usersrdn.",".$basedn;
-
+        $basedn="$this->usersrdn,$this->base_dn";
         $filter="$this->usersfilter";
         if (is_null($filter) || empty($filter)) {
@@ -108 +82 @@
     {
         $userdata = array();
-
-        $basedn=$this->base_dn;
-        if (!empty($this->usersrdn))
-                $basedn=$this->usersrdn.",".$basedn;
-
-        if (is_null($this->usersfilter) || empty($this->usersfilter))
-            $filter = "(uid=$username)";
-        else
-            $filter="(&".$this->usersfilter."(uid=$username))";
+        $basedn="uid=$username,$this->usersrdn,$this->base_dn";
+        $filter="(&$this->usersfilter(uid=$username))";
+        if (is_null($filter) || empty($filter)) {
+                $filter = "(cn=*)";
+        }
 
         $array=array($this->usernameattr,'uid');
@@ -173 +143 @@
     {
         $userdata = array();
-        $basedn=$this->base_dn;
-        if (!empty($this->usersrdn))
-                $basedn=$this->usersrdn.",".$basedn;
+        $basedn="$this->usersrdn,$this->base_dn";
         $array=array($this->usernameattr,'uid','gidNumber');
 

trunk/php/src/lffolder_2_squid.php

@@ -11 +11 @@
   global $USERConf;
 
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);

trunk/php/src/lffolder_4_z0_filedenied.php

@@ -11 +11 @@
   global $USERConf;
 
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);

trunk/php/src/lffolder_4_z0_redirect.php

@@ -11 +11 @@
   global $USERConf;
 
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);

trunk/php/src/lffolder_4_z0_subst.php

@@ -11 +11 @@
   global $USERConf;
 
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);

trunk/php/src/lffolder_4_z1_urldenied.php

@@ -12 +12 @@
   global $USERConf;
 
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);

trunk/php/src/lffolder_4_z2_url.php

@@ -11 +11 @@
   global $USERConf;
 
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);

trunk/php/src/lffolder_4_z3_urlallow.php

@@ -11 +11 @@
   global $USERConf;
 
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);

trunk/php/src/lffolder_4_z4_local.php

@@ -11 +11 @@
   global $USERConf;
 
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);

trunk/php/src/lffolder_5_z0_trange.php

@@ -11 +11 @@
   global $USERConf;
 
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);

trunk/php/src/lffolder_5_z1_shablon.php

@@ -11 +11 @@
   global $USERConf;
 
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);

trunk/php/src/lffolder_5_z20_delaypool.php

@@ -11 +11 @@
   global $USERConf;
 
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);

trunk/php/src/newgrpbuttom_5_addgroup.php

@@ -14 +14 @@
         exit;
 
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);

trunk/php/src/poolbuttom_1_prop.php

@@ -10 +10 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";
@@ -68 +68 @@
   global $POOLConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
 
   $lang="./lang/lang.$SAMSConf->LANG";

trunk/php/src/poolbuttom_9_delete.php

@@ -10 +10 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";

trunk/php/src/pooltray.php

@@ -10 +10 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";

trunk/php/src/proxybuttom_1_prop.php

@@ -11 +11 @@
   global $USERConf;
   global $PROXYConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);
@@ -92 +92 @@
   global $PROXYConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
 
   $files=array();

trunk/php/src/proxybuttom_2_reconfig.php

@@ -14 +14 @@
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
  
   if(isset($_GET["id"])) $cache=$_GET["id"];

trunk/php/src/proxybuttom_8_clear.php

@@ -11 +11 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
 
   

trunk/php/src/proxybuttom_9_delete.php

@@ -11 +11 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
 
   

trunk/php/src/proxybuttom_9_down.php

@@ -47 +47 @@
   if($USERConf->ToWebInterfaceAccess("C")==1 )
   {
-        $DB=new SAMSDB(&$SAMSConf);
+        $DB=new SAMSDB();
         PageTop("reconfig_48.jpg","Send command '$SAMSConf->SHUTDOWN' to proxy server");
 

trunk/php/src/proxytray.php

@@ -47 +47 @@
 
   $extrainfo="";
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $num_rows=$DB->samsdb_query("SELECT * FROM sysinfo WHERE s_status='1' AND s_proxy_id='$PROXYConf->s_proxy_id'");
 

trunk/php/src/redirbuttom_1_loadlist.php

@@ -10 +10 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);

trunk/php/src/redirbuttom_3_deletelist.php

@@ -10 +10 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);

trunk/php/src/redirlisttray.php

@@ -9 +9 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);
@@ -31 +31 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";
@@ -59 +59 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";
@@ -242 +242 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);
@@ -272 +272 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);
@@ -301 +301 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);
@@ -331 +331 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);
@@ -354 +354 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);
@@ -522 +522 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";

trunk/php/src/shablonbuttom_1_prop.php

@@ -11 +11 @@
   global $USERConf;
 
-  $DB=new SAMSDB(&$SAMSConf);
-  $DB2=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
+  $DB2=new SAMSDB();
   $sguardgroups=array("ads","aggressive","audio-video","drugs","gambling",
    "hacking","mail","porn","proxy","violence","warez");
@@ -87 +87 @@
   $credir=0;
 
-  $DB=new SAMSDB(&$SAMSConf);
-  $DB2=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
+  $DB2=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";
@@ -524 +524 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";
@@ -550 +550 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";

trunk/php/src/shablonbuttom_9_delete.php

@@ -10 +10 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";

trunk/php/src/shablonnew.php

@@ -10 +10 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";
@@ -56 +56 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";

trunk/php/src/shablontray.php

@@ -11 +11 @@
   global $SHABLONConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
 
   if($USERConf->ToWebInterfaceAccess("C")!=1 )
@@ -37 +37 @@
   global $SHABLONConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";

trunk/php/src/squidbuttom_4_addcache.php

@@ -15 +15 @@
         exit;
 
-  $DB=new SAMSDB(&$SAMSConf);
-  $DB2=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
+  $DB2=new SAMSDB();
 
  if(isset($_GET["cache"])) $cache=$_GET["cache"];
@@ -40 +40 @@
   global $USERConf;
 
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
 
 $delaypool=0;
@@ -116 +116 @@
   global $USERConf;
 
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);

trunk/php/src/sysplugconfigtray.php

@@ -9 +9 @@
 {
   global $SAMSConf;
-  $DB=new SAMSDB(&$SAMSConf);
-  $DB2=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
+  $DB2=new SAMSDB();
 
   $num_rows=$DB->samsdb_query_value("SELECT * FROM sysinfo");
@@ -32 +32 @@
 {
   global $SAMSConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $num_rows=$DB->samsdb_query_value("SELECT * FROM sysinfo");
 

trunk/php/src/trangebuttom_1_prop.php

@@ -10 +10 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";

trunk/php/src/trangebuttom_9_delete.php

@@ -10 +10 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";

trunk/php/src/trangetray.php

@@ -10 +10 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";

trunk/php/src/userbuttom_1_prop.php

@@ -11 +11 @@
   global $USERConf;
 
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $gauditor="";
   if(isset($_GET["id"])) $userid=$_GET["id"];
@@ -83 +83 @@
   global $SquidUSERConf;
 
-  $DB=new SAMSDB(&$SAMSConf);
-  $DB2=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
+  $DB2=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);

trunk/php/src/userbuttom_2_traffic.php

@@ -26 +26 @@
         }
 
-        $DB=new SAMSDB(&$SAMSConf);
+        $DB=new SAMSDB();
         $g = new chart;
         $lang="./lang/lang.$SAMSConf->LANG";
@@ -117 +117 @@
 //echo "id=$id $SquidUSERConf->s_user_id $SquidUSERConf->s_nick<BR>";
 //exit(0);
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
  
   $sdate=$DATE->sdate();

trunk/php/src/userbuttom_4_site.php

@@ -19 +19 @@
 
   require("reportsclass.php");
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";

trunk/php/src/userbuttom_5_clear.php

@@ -10 +10 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);
@@ -41 +41 @@
   global $SquidUSERConf;
 
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);

trunk/php/src/userbuttom_6_chpasswd.php

@@ -18 +18 @@
         if($USERConf->ToWebInterfaceAccess("AUC")==1 || ($USERConf->s_user_id == $SquidUSERConf->s_user_id && $USERConf->ToWebInterfaceAccess("W")==1 ) )
         {
-                $DB=new SAMSDB(&$SAMSConf);
+                $DB=new SAMSDB();
   
                 $lang="./lang/lang.$SAMSConf->LANG";
@@ -86 +86 @@
         print("<TABLE WIDTH=\"90%\">");
         print("<TR><TD><B>login:</B><TD>");
-        print("$USERConf->s_nick");
+        print("$SquidUSERConf->s_nick");
         print("<TR><TD><B>Password:</B><TD>");
         print("<BR><INPUT TYPE=\"PASSWORD\" NAME=\"passw1\" SIZE=30> \n");

trunk/php/src/userbuttom_9_delete.php

@@ -11 +11 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);

trunk/php/src/usersbuttom_1_useradd.php

@@ -95 +95 @@
   global $USERConf;
 
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);
@@ -213 +213 @@
   global $USERConf;
 
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);

trunk/php/src/usersbuttom_1_usersimport.php

@@ -10 +10 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";
@@ -85 +85 @@
         exit;
   
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
 
   PageTop("user.jpg","$authbuttom_1_usersimport_LoadFileForm_1");

trunk/php/src/usersbuttom_2_traffic.php

@@ -12 +12 @@
   global $SAMSConf;
   global $DATE;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   if($SAMSConf->LANG=="KOI8-R")
@@ -106 +106 @@
   global $SAMSConf;
   global $DATE;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";
@@ -146 +146 @@
         exit(0);
 
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $sdate=$DATE->sdate();
   $edate=$DATE->edate();

trunk/php/src/usersbuttom_3_site.php

@@ -11 +11 @@
   global $USERConf;
   require("reportsclass.php");
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";
@@ -31 +31 @@
   global $USERConf;
   require("reportsclass.php");
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";
@@ -129 +129 @@
 
   require("reportsclass.php");
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";

trunk/php/src/usersbuttom_4_percent.php

@@ -60 +60 @@
   global $SAMSConf;
   global $DATE;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $sdate=$DATE->sdate();
   $edate=$DATE->edate();
@@ -120 +120 @@
         }
 
-        $pie = new PieGraph(400, 250, $size);
+        $pie = new PieGraph(300, 200, $size);
         $pie->setColors($usercolors);
         // legends for the data
@@ -143 +143 @@
         exit(0);
 
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $sdate=$DATE->sdate();
   $edate=$DATE->edate();

trunk/php/src/usersbuttom_5_recalc.php

@@ -11 +11 @@
   global $USERConf;
 
-  $DB=new SAMSDB(&$SAMSConf);
-  $DB2=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
+  $DB2=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);

trunk/php/src/usersbuttom_6_clear.php

@@ -11 +11 @@
   global $USERConf;
 
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);

trunk/php/src/usersbuttom_91_test.php

@@ -4 +4 @@
 {
   global $SAMSConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";

trunk/php/src/userstray.php

@@ -9 +9 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
   if($USERConf->ToWebInterfaceAccess("C")!=1)
     exit(0);
@@ -74 +74 @@
   global $SAMSConf;
   global $USERConf;
-  $DB=new SAMSDB(&$SAMSConf);
-  $DB2=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
+  $DB2=new SAMSDB();
   
   $lang="./lang/lang.$SAMSConf->LANG";

trunk/php/src/usertray.php

@@ -50 +50 @@
 {
   global $SAMSConf;
-  $DB=new SAMSDB(&$SAMSConf);
-  $DB2=new SAMSDB(&$SAMSConf);
+  $DB=new SAMSDB();
+  $DB2=new SAMSDB();
   $lang="./lang/lang.$SAMSConf->LANG";
   require($lang);
@@ -92 +92 @@
   print("<TR>\n");
   print("<TD>\n");
+  print("<B>$usertray_UserForm_5: \n");
+  print("<TD>\n");
+  print("$row[s_soname]\n");
+  print("<TR>\n");
+  print("<TD>\n");
   print("<B>$usertray_UserForm_6: \n");
   print("<TD>\n");
   print("$row[s_family] \n");
-  print("<TR>\n");
-  print("<TD>\n");
-  print("<B>$usertray_UserForm_5: \n");
-  print("<TD>\n");
-  print("$row[s_soname]\n");