Index: /trunk/php/src/userbuttom_6_chpasswd.php
===================================================================
--- /trunk/php/src/userbuttom_6_chpasswd.php (revision 673)
+++ /trunk/php/src/userbuttom_6_chpasswd.php (revision 716)
@@ -106,7 +106,7 @@
   require($lang);
 
-	if(	$USERConf->ToWebInterfaceAccess("AUC")==1 || ($USERConf->s_user_id == $SquidUSERConf->s_user_id && $USERConf->ToWebInterfaceAccess("W")==1 ))
+	if($USERConf->ToWebInterfaceAccess("AUC")==1 || ($USERConf->s_user_id == $SquidUSERConf->s_user_id && $USERConf->ToWebInterfaceAccess("W")==1 ))
 	{
-		if(strtolower($USERConf->s_auth)=='adld' || strtolower($USERConf->s_auth)=='ldap') 
+		if(strtolower($SquidUSERConf->s_auth)=='adld' || strtolower($SquidUSERConf->s_auth)=='ldap') 
 			return(0);
 		GraphButton("main.php?show=exe&function=chuserpasswdform&filename=userbuttom_6_chpasswd.php&id=$SquidUSERConf->s_user_id","basefrm","userpasswd_32.jpg","userpasswd_48.jpg"," $userbuttom_6_chpasswd_userbuttom_6_chpasswd_1");
Index: /trunk/php/src/authldapbuttom_3_importfromldap.php
===================================================================
--- /trunk/php/src/authldapbuttom_3_importfromldap.php (revision 691)
+++ /trunk/php/src/authldapbuttom_3_importfromldap.php (revision 716)
@@ -158,5 +158,5 @@
 				if($clrdate=="")
 					$clrdate="1980-01-01";
-				$DB->samsdb_query("INSERT INTO shablon ( s_name, s_quote, s_auth, s_period, s_clrdate, s_alldenied, 	s_shablon_id2 ) VALUES ( '$addgroupname[$i]', '$defaulttraf', 'ADLD', '$period', '$clrdate', '0', '-1' ) ");
+				$DB->samsdb_query("INSERT INTO shablon ( s_name, s_quote, s_auth, s_period, s_clrdate, s_alldenied, 	s_shablon_id2 ) VALUES ( '$addgroupname[$i]', '$defaulttraf', 'ldap', '$period', '$clrdate', '0', '-1' ) ");
 				$DB->samsdb_query_value("SELECT s_shablon_id FROM shablon WHERE s_name='$addgroupname[$i]' ");
 				$row=$DB->samsdb_fetch_array();
Index: /trunk/php/src/authntlmbuttom_3_importfromntlm.php
===================================================================
--- /trunk/php/src/authntlmbuttom_3_importfromntlm.php (revision 696)
+++ /trunk/php/src/authntlmbuttom_3_importfromntlm.php (revision 716)
@@ -161,5 +161,5 @@
 				if($clrdate=="")
 					$clrdate="1980-01-01";
-				$DB->samsdb_query("INSERT INTO shablon ( s_name, s_quote, s_auth, s_period, s_clrdate, s_alldenied, 	s_shablon_id2 ) VALUES ( '$addgroupname[$i]', '$defaulttraf', 'ADLD', '$period', '$clrdate', '0', '-1' ) ");
+				$DB->samsdb_query("INSERT INTO shablon ( s_name, s_quote, s_auth, s_period, s_clrdate, s_alldenied, 	s_shablon_id2 ) VALUES ( '$addgroupname[$i]', '$defaulttraf', 'ntlm', '$period', '$clrdate', '0', '-1' ) ");
 				$DB->samsdb_query_value("SELECT s_shablon_id FROM shablon WHERE s_name='$addgroupname[$i]' ");
 				$row=$DB->samsdb_fetch_array();
@@ -272,5 +272,5 @@
 		$num_rows=$DB->samsdb_query_value($QUERY);
 		if($num_rows==0)
-			print("<OPTION VALUE=\"$a[$i]\"> $a[$i] $num_rows\n");
+			print("<OPTION VALUE=\"$a[$i]\"> $a[$i]\n");
 
 	}
Index: /trunk/php/src/grouptray.php
===================================================================
--- /trunk/php/src/grouptray.php (revision 650)
+++ /trunk/php/src/grouptray.php (revision 716)
@@ -123,5 +123,5 @@
 	        $traffic=$row['s_size'];
             if($row['s_quote']*$SAMSConf->KBSIZE*$SAMSConf->KBSIZE>=$traffic||$row['s_quote']<=0)
-               $gif="puser.gif";
+               $gif="user_active.png";
             else
                if($row['s_quote']>0)
Index: /trunk/php/src/authadldbuttom_3_importfromad.php
===================================================================
--- /trunk/php/src/authadldbuttom_3_importfromad.php (revision 691)
+++ /trunk/php/src/authadldbuttom_3_importfromad.php (revision 716)
@@ -172,5 +172,5 @@
 					$clrdate="1980-01-01";
 
-				$DB->samsdb_query("INSERT INTO shablon ( s_name, s_quote, s_auth, s_period, s_clrdate, s_alldenied, 	s_shablon_id2 ) VALUES ( '$addgroupname[$i]', '$defaulttraf', 'ADLD', '$period', '$clrdate', '0', '-1' ) ");
+				$DB->samsdb_query("INSERT INTO shablon ( s_name, s_quote, s_auth, s_period, s_clrdate, s_alldenied, 	s_shablon_id2 ) VALUES ( '$addgroupname[$i]', '$defaulttraf', 'adld', '$period', '$clrdate', '0', '-1' ) ");
 				$DB->samsdb_query_value("SELECT s_shablon_id FROM shablon WHERE s_name='$addgroupname[$i]' ");
 				$row=$DB->samsdb_fetch_array();
Index: /trunk/php/authclass.php
===================================================================
--- /trunk/php/authclass.php (revision 690)
+++ /trunk/php/authclass.php (revision 716)
@@ -306,5 +306,5 @@
 //	$aaa=ExecuteShellScript("bin/testwbinfopasswd", $e);
 //	$aaa=ExecuteShellScript("bin/testwbinfopasswd", $e);
-	$aaa=ntlm_auth ($this->UserName,$password,$SAMSConf->WBINFOPATH);
+	$aaa=ntlm_auth($this->UserName,$password,$SAMSConf->WBINFOPATH);
 //	if(stristr($aaa,"authentication succeeded" )!=false||stristr($aaa,"NT_STATUS_OK" )!=false)
 	if(stristr($aaa,"OK" )!=false||stristr($aaa,"ERR" )!=true)
@@ -417,5 +417,6 @@
    1 => array("pipe", "w")  // stdout is a pipe that the child will write to
 );
-$ntlm_auth = proc_open("bin/ntlm_auth ".$path, $descriptorspec, $pipes);
+//$ntlm_auth = proc_open("bin/ntlm_auth ".$path, $descriptorspec, $pipes);
+$ntlm_auth = proc_open("bin/testwbinfopasswd ".$path, $descriptorspec, $pipes);
 if (is_resource($ntlm_auth)) {
     // $pipes now looks like this: