1.4.061020

VERSION

@@ -1 +1 @@
-1.4.060619
+1.4.061020

WHATSNEW

@@ -1,17 +1,23 @@
-1.4.060401:
+1.4.061013:
 ========================================================================================
 
 System Changes
 -------------------------------------------------
 1.4.060313: Adding possibility to set maximum php processes that could be executed at the same time.
-Fix unable to set domainname 
-Improve settings virtuals IP addresses
+1.4.060823: Fix unable to set domainname 
+1.4.060823: Improve settings virtuals IP addresses.
+1.4.061013: Fix OpenVPN section minors bugs.
+1.4.061013: Fix user can have access to the main admin interface
 
 Messaging Changes:
 -----------------------------------------------
 1.4.060313: Fix unable to open ISP macros under messaging feature.
 1.4.060401: Fix demime error before backup mails. This cause illimited stored mysql error files in /var/log/artica-postfix that cause crash server. 
 
+Proxy Changes:
+-------------------------------------------------
+1.4.060823: Enable C-ICAP has the main urls filtering engine.
+
 
 
 1.4.053118:

admin.index.php

@@ -356,6 +356,9 @@ function page($usersmenus){
 }
 
 
+
+
+
 $html="	
 <script language=\"JavaScript\">       
 var timerID  = null;
@@ -488,9 +491,11 @@ function CheckDaemon(){
 
 
 if($users->KASPERSKY_SMTP_APPLIANCE){
-	$title=$tpl->_ENGINE_parse_body("<span style='color:#005447'>{WELCOME}</span> <span style='font-size:13px;color:#005447'>For Kaspersky Appliance</span>&nbsp;|&nbsp;<span style='font-size:12px'>{$hash["displayName"]} - <span style='text-transform:lowercase'>$usersmenus->hostname</span></span>");
+	$title=$tpl->_ENGINE_parse_body("<span style='color:#005447'>{WELCOME}</span> <span style='font-size:13px;color:#005447'>For Kaspersky SMTP Appliance</span>&nbsp;|&nbsp;<span style='font-size:12px'>{$hash["displayName"]} - <span style='text-transform:lowercase'>$usersmenus->hostname</span></span>");
+}
+if($users->KASPERSKY_WEB_APPLIANCE){
+	$title=$tpl->_ENGINE_parse_body("<span style='color:#005447'>{WELCOME}</span> <span style='font-size:13px;color:#005447'>For Kaspersky Web Appliance</span>&nbsp;|&nbsp;<span style='font-size:12px'>{$hash["displayName"]} - <span style='text-transform:lowercase'>$usersmenus->hostname</span></span>");
 }
-
 
 $tpl=new template_users($title,$html,$_SESSION,0,0,0,$cfg);
 error_log(basename(__FILE__)." ".__FUNCTION__.'() line '. __LINE__);

admin.tabs.php

@@ -373,9 +373,18 @@ function admin_index(){
 	var x_LeftInfos= function (obj) {
 		var tempvalue=obj.responseText;
 		document.getElementById('left_status').innerHTML=tempvalue;
-		}			
+		setTimeout(\"SatusInfos();\",500);
+		}
+
+		
+	function SatusInfos(){
+		if(document.getElementById('page-index-squid-status')){
+			LoadAjax('page-index-squid-status','squid.index.php?page-index-squid-status=yes');
+		}
+	}
+		
 
-		function RightInfos(){
+	function RightInfos(){
 			var counter=1;
 			if(document.getElementById('counter')){counter=document.getElementById('counter').value;}
 			var XHR = new XHRConnection();
@@ -390,8 +399,9 @@ function LeftInfos(){
 			var XHR = new XHRConnection();
 			XHR.appendData('status','left');
 			document.getElementById('left_status').innerHTML='<center><img src=img/wait_verybig.gif></center>';
+			
 			XHR.sendAndLoad('admin.index.php', 'GET',x_LeftInfos);	
-			}
+	 }
 			
 	RightInfos();			
 </script>";

bin/src/artica-cgi/backup/parsehttp.pas.bak

@@ -1319,12 +1319,6 @@ RegExpr.expression:='^MailBoxRemoteSync:(.+)';
     end;
 
 
-     RegExpr.expression:='ChangeHostName:(.+)';
-     if RegExpr.Exec(uri) then begin
-         GLOBAL_INI.SYSTEM_NETWORKS_SET_HOSTNAME(RegExpr.Match[1]);
-         exit(true);
-     end;
-
 
 
    RegExpr.expression:='install_app:(.+)';

bin/src/artica-cgi/parsehttp.pas

@@ -898,20 +898,7 @@ function Tparsehttp.ParseUri(uri:string):boolean;
   end;
 
 
-RegExpr.expression:='^OpenVPNServerLogs';
-  if RegExpr.Exec(uri) then begin
-     tmpstr:=logs.FILE_TEMP();
-     fpsystem('/usr/bin/tail -n 500 /var/log/openvpn/openvpn.log >'+ tmpstr + ' 2>&1');
-     FileData.Add(logs.ReadFromFile(tmpstr));
-     logs.DeleteFile(tmpstr);
-     exit(true);
-  end;
 
-RegExpr.expression:='^OpenVPNServerSessions';
-  if RegExpr.Exec(uri) then begin
-     FileData.Add(logs.ReadFromFile('/var/log/openvpn/openvpn-status.log'));
-     exit(true);
-  end;
 RegExpr.expression:='^OpenVPNStatus';
    if RegExpr.Exec(uri) then begin
       openvpn:=Topenvpn.Create(SYS);

bin/src/artica-install/artica_cron.pas

@@ -182,6 +182,8 @@ procedure tcron.START();
      processNumber:=6;
      if cpunum<4 then processNumber:=4;
   end;
+  if processNumber>4 then processNumber:=4;
+
   SYS.SET_INFO('systemForkProcessesNumber',IntToStr(processNumber))
 
 end else begin
@@ -520,7 +522,7 @@ procedure tcron.Save_processes();
       if length(backup_command)>0 then begin
           l.Add(backup_command);
       end;
-      l.Add('@'+Nicet+nolog+',lavg1('+IntToStr(systemMaxOverloaded)+')  10s '+cmdnice+SYS.LOCATE_PHP5_BIN()+ ' ' +artica_path+'/exec.parse-orders.php');
+      l.Add('@'+Nicet+nolog+',lavg1('+IntToStr(systemMaxOverloaded)+') 10s '+cmdnice+SYS.LOCATE_PHP5_BIN()+ ' ' +artica_path+'/exec.parse-orders.php');
       l.Add('@'+Nicet+nolog+',lavg1('+IntToStr(systemMaxOverloaded)+') 12s '+cmdnice+SYS.LOCATE_PHP5_BIN()+ ' ' +artica_path+'/exec.executor.php --group10s');
       l.Add('@'+Nicet+nolog+',lavg1('+IntToStr(systemMaxOverloaded)+') 30s '+cmdnice+SYS.LOCATE_PHP5_BIN()+ ' ' +artica_path+'/exec.executor.php --group30s');