Skip to content

Commit

Permalink
1.5.100918
Browse files Browse the repository at this point in the history
  • Loading branch information
@dtouzeau
dtouzeau committed Oct 9, 2011
1 parent f502fdc commit 6033cb1
Show file tree
Hide file tree
Showing 297 changed files with 16,895 additions and 179 deletions.
28 changes: 28 additions & 0 deletions WHATSNEW
View file
@@ -1,6 +1,34 @@
1.5.100812:
======================================================================================

System Changes:
------------------------------------------------
1.5.100723: Fix some artica scripts overload the system.
1.5.100723: Improve the memory history.
1.5.100812: Allow to update automatically patchs
1.5.100812: Add a new section according patchs in the Artica update web page.
1.5.100918: Fix unable to create a correct UidNumber after 10000 number.

Messaging Changes:
-------------------------------------------------
1.5.100416: Add zarafaSharedStoreOnly Zarafa token support It allows to turn user to an non-active user
1.5.100416: Auto-fix Postfix error fatal: master_spawn: exec */postscreen: No such file or directory, The watchdog create a symbolic link to the right binary on the Postfix desired path
1.5.100918: Fix security hole on Zarafa: can have access to mailbox with a wrong password.
1.5.100918: The Zarafa contact importation task is disabled by default and has been modified in order to not overload the server.

FreeWebs changes:
------------------------------------------------
1.5.100420: Fix unable to modify the freeWeb Mysql database name to fix generated error "Error, the given value execeed: 16"
1.5.100812: Add possibility to add Server aliases for a Website.

Proxy changes:
------------------------------------------------
1.5.100420: Fix bungled config on missing manager acl.
1.5.100723: Improve Squid statistics.

Interface Changes:
------------------------------------------------
1.5.100918: Fix unable to open the bulk importation feature in the group section.

// http://os.tekco.com/mod_choke/README
http://sourceforge.net/projects/modcidrlookup/
Expand Down
7 changes: 7 additions & 0 deletions admin.index.status-infos.php
View file
Expand Up @@ -20,6 +20,13 @@ function page(){

$page=CurrentPageName();
$tpl=new templates();
$sock=new sockets();

$datas=base64_decode($sock->getFrameWork("status.php?cpu-check-nx=yes"));
if($datas<>null){NotifyAdmin("system-32.png","CPU Infos !",$datas,null);}



$q=new mysql();
$sql="SELECT * FROM adminevents WHERE enabled=1 ORDER BY zDate DESC LIMIT 0,50";
$results=$q->QUERY_SQL($sql,"artica_events");
Expand Down
Binary file modified bin/artica-install
View file
Binary file not shown.
98 changes: 49 additions & 49 deletions bin/src/artica-install/artica_install.lpi
View file
Expand Up @@ -12,7 +12,7 @@
<MainUnit Value="0"/>
<TargetFileExt Value=""/>
<Title Value="artica-install"/>
<ActiveEditorIndexAtStart Value="7"/>
<ActiveEditorIndexAtStart Value="0"/>
</General>
<VersionInfo>
<ProjectVersion Value=""/>
Expand All @@ -34,8 +34,8 @@
<Filename Value="artica_install.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="artica_install"/>
<CursorPos X="36" Y="1411"/>
<TopLine Value="1394"/>
<CursorPos X="4" Y="212"/>
<TopLine Value="169"/>
<EditorIndex Value="0"/>
<UsageCount Value="200"/>
<Bookmarks Count="1">
Expand All @@ -56,7 +56,7 @@
<Filename Value="global_conf.pas"/>
<UnitName Value="global_conf"/>
<CursorPos X="1" Y="5886"/>
<TopLine Value="5845"/>
<TopLine Value="5869"/>
<EditorIndex Value="7"/>
<UsageCount Value="100"/>
<Bookmarks Count="1">
Expand Down Expand Up @@ -765,8 +765,8 @@
<Filename Value="zarafa_server.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="zarafa_server"/>
<CursorPos X="10" Y="12"/>
<TopLine Value="1"/>
<CursorPos X="25" Y="87"/>
<TopLine Value="52"/>
<EditorIndex Value="6"/>
<UsageCount Value="200"/>
<Loaded Value="True"/>
Expand Down Expand Up @@ -1184,123 +1184,123 @@
<JumpHistory Count="30" HistoryIndex="29">
<Position1>
<Filename Value="squid.pas"/>
<Caret Line="1091" Column="26" TopLine="1057"/>
<Caret Line="1367" Column="23" TopLine="1333"/>
</Position1>
<Position2>
<Filename Value="squid.pas"/>
<Caret Line="1328" Column="17" TopLine="1294"/>
<Caret Line="1372" Column="18" TopLine="1333"/>
</Position2>
<Position3>
<Filename Value="squid.pas"/>
<Caret Line="1342" Column="20" TopLine="1294"/>
<Caret Line="1" Column="1" TopLine="1"/>
</Position3>
<Position4>
<Filename Value="squid.pas"/>
<Caret Line="1352" Column="23" TopLine="1294"/>
<Caret Line="1111" Column="5" TopLine="1074"/>
</Position4>
<Position5>
<Filename Value="squid.pas"/>
<Caret Line="1361" Column="18" TopLine="1294"/>
<Filename Value="global_conf.pas"/>
<Caret Line="36" Column="4" TopLine="19"/>
</Position5>
<Position6>
<Filename Value="squid.pas"/>
<Caret Line="1367" Column="23" TopLine="1333"/>
<Filename Value="global_conf.pas"/>
<Caret Line="1" Column="1" TopLine="1"/>
</Position6>
<Position7>
<Filename Value="squid.pas"/>
<Caret Line="1372" Column="18" TopLine="1333"/>
<Filename Value="global_conf.pas"/>
<Caret Line="17" Column="92" TopLine="1"/>
</Position7>
<Position8>
<Filename Value="squid.pas"/>
<Caret Line="1" Column="1" TopLine="1"/>
<Filename Value="global_conf.pas"/>
<Caret Line="98" Column="26" TopLine="64"/>
</Position8>
<Position9>
<Filename Value="squid.pas"/>
<Caret Line="1111" Column="5" TopLine="1074"/>
<Filename Value="global_conf.pas"/>
<Caret Line="664" Column="27" TopLine="630"/>
</Position9>
<Position10>
<Filename Value="global_conf.pas"/>
<Caret Line="36" Column="4" TopLine="19"/>
<Caret Line="3134" Column="49" TopLine="3100"/>
</Position10>
<Position11>
<Filename Value="global_conf.pas"/>
<Caret Line="1" Column="1" TopLine="1"/>
<Caret Line="5891" Column="52" TopLine="5857"/>
</Position11>
<Position12>
<Filename Value="global_conf.pas"/>
<Caret Line="17" Column="92" TopLine="1"/>
<Caret Line="5900" Column="1" TopLine="4140"/>
</Position12>
<Position13>
<Filename Value="global_conf.pas"/>
<Caret Line="98" Column="26" TopLine="64"/>
<Caret Line="1" Column="1" TopLine="1"/>
</Position13>
<Position14>
<Filename Value="global_conf.pas"/>
<Caret Line="664" Column="27" TopLine="630"/>
<Caret Line="2800" Column="65" TopLine="2766"/>
</Position14>
<Position15>
<Filename Value="global_conf.pas"/>
<Caret Line="3134" Column="49" TopLine="3100"/>
<Caret Line="2802" Column="87" TopLine="2766"/>
</Position15>
<Position16>
<Filename Value="global_conf.pas"/>
<Caret Line="5891" Column="52" TopLine="5857"/>
<Caret Line="5702" Column="41" TopLine="5668"/>
</Position16>
<Position17>
<Filename Value="global_conf.pas"/>
<Caret Line="5900" Column="1" TopLine="4140"/>
<Filename Value="zarafa_server.pas"/>
<Caret Line="337" Column="23" TopLine="284"/>
</Position17>
<Position18>
<Filename Value="global_conf.pas"/>
<Filename Value="zarafa_server.pas"/>
<Caret Line="1" Column="1" TopLine="1"/>
</Position18>
<Position19>
<Filename Value="global_conf.pas"/>
<Caret Line="2800" Column="65" TopLine="2766"/>
<Filename Value="zarafa_server.pas"/>
<Caret Line="73" Column="22" TopLine="39"/>
</Position19>
<Position20>
<Filename Value="global_conf.pas"/>
<Caret Line="2802" Column="87" TopLine="2766"/>
<Filename Value="zarafa_server.pas"/>
<Caret Line="357" Column="1" TopLine="324"/>
</Position20>
<Position21>
<Filename Value="global_conf.pas"/>
<Caret Line="5702" Column="41" TopLine="5668"/>
<Filename Value="zarafa_server.pas"/>
<Caret Line="342" Column="29" TopLine="287"/>
</Position21>
<Position22>
<Filename Value="zarafa_server.pas"/>
<Caret Line="337" Column="23" TopLine="284"/>
<Caret Line="1" Column="1" TopLine="1"/>
</Position22>
<Position23>
<Filename Value="zarafa_server.pas"/>
<Caret Line="1" Column="1" TopLine="1"/>
<Caret Line="652" Column="82" TopLine="629"/>
</Position23>
<Position24>
<Filename Value="zarafa_server.pas"/>
<Caret Line="73" Column="22" TopLine="39"/>
<Caret Line="1" Column="12" TopLine="1"/>
</Position24>
<Position25>
<Filename Value="zarafa_server.pas"/>
<Caret Line="357" Column="1" TopLine="324"/>
<Filename Value="global_conf.pas"/>
<Caret Line="5736" Column="124" TopLine="5691"/>
</Position25>
<Position26>
<Filename Value="zarafa_server.pas"/>
<Caret Line="342" Column="29" TopLine="287"/>
<Caret Line="296" Column="36" TopLine="273"/>
</Position26>
<Position27>
<Filename Value="zarafa_server.pas"/>
<Caret Line="1" Column="1" TopLine="1"/>
<Caret Line="16" Column="53" TopLine="1"/>
</Position27>
<Position28>
<Filename Value="zarafa_server.pas"/>
<Caret Line="652" Column="82" TopLine="629"/>
<Filename Value="artica_install.pas"/>
<Caret Line="1411" Column="36" TopLine="1377"/>
</Position28>
<Position29>
<Filename Value="zarafa_server.pas"/>
<Caret Line="1" Column="12" TopLine="1"/>
<Filename Value="artica_install.pas"/>
<Caret Line="1" Column="1" TopLine="1"/>
</Position29>
<Position30>
<Filename Value="global_conf.pas"/>
<Caret Line="5736" Column="124" TopLine="5691"/>
<Filename Value="artica_install.pas"/>
<Caret Line="19" Column="53" TopLine="1"/>
</Position30>
</JumpHistory>
</ProjectOptions>
Expand Down
5 changes: 5 additions & 0 deletions bin/src/artica-install/artica_install.pas
View file
Expand Up @@ -207,6 +207,11 @@
halt(0);
end;

if Paramstr(1)='--zarafa-reconfigure' then begin
zZarafa:=tzarafa_server.CReate(SYS);
zZarafa.server_cfg();
end;

if Paramstr(1)='--tomcat-version' then begin
ztomcat:=ttomcat.Create(SYS);
writeln(ztomcat.VERSION());
Expand Down
10 changes: 8 additions & 2 deletions bin/src/artica-install/zarafa_server.pas
View file
Expand Up @@ -19,7 +19,7 @@ tzarafa_server=class
SYS:TSystem;
artica_path:string;
ldap:topenldap;
procedure server_cfg();


function SPOOLER_BIN_PATH():string;
function INDEXER_BIN_PATH():string;
Expand Down Expand Up @@ -84,6 +84,7 @@ tzarafa_server=class
procedure SERVER_START();
procedure SERVER_STOP();
function IS_LDAP_ACTIVE():boolean;
procedure server_cfg();
END;

implementation
Expand Down Expand Up @@ -381,9 +382,14 @@ procedure tzarafa_server.server_cfg();
logs.DebugLogs('Starting zarafa..............: Zarafa-server store attachments in "'+ZarafaStoreOutsidePath+'"');
try ForceDirectories('ZarafaStoreOutsidePath') except logs.DebugLogs('Starting zarafa..............: Fatal error while creating Zarafa attachments path') end;
end;

if ZarafaWebNTLM=1 then begin
logs.DebugLogs('Starting zarafa..............: Zarafa-server NTLM Mode is enabled');
fpsystem(SYS.LOCATE_PHP5_BIN()+ ' /usr/share/artica-postfix/exec.freeweb.php --apache-user');
APACHE_SRC_ACCOUNT:=SYS.GET_INFO('APACHE_SRC_ACCOUNT');

end else begin
logs.DebugLogs('Starting zarafa..............: Zarafa-server NTLM Mode is disabled');
end;
l:=Tstringlist.Create;
l.add('server_bind = '+ZarafaServerListenIP);
l.add('server_hostname = '+SYS.HOSTNAME_g());
Expand Down
13 changes: 13 additions & 0 deletions css.php
View file
@@ -0,0 +1,13 @@
<?php
if(!isset($_GET["template"])){die();}

$template=$_GET["template"];
$page=$_GET["page"];

foreach (glob("ressources/templates/$template/css/*.css") as $filename) {
//$datas=@file_get_contents("$filename");
//$datas=str_replace("\n", " ", $datas);
$css[]=$datas;
}
//header("Content-type: text/css");
echo @implode("\n", $css);
2 changes: 1 addition & 1 deletion default.js
View file
Expand Up @@ -1342,7 +1342,7 @@ function AnimateDiv(id){
var animated="/img/wait_verybig.gif";
if(!document.getElementById(id)){return;}
if(document.getElementById("LoadAjaxPicture")){animated=document.getElementById("LoadAjaxPicture").value;}
document.getElementById(id).innerHTML='<div style="width:100%;background-color:white;height:auto"><center><img src="'+animated+'"></center></div>';
document.getElementById(id).innerHTML='<div style="width:100%;height:auto"><center><img src="'+animated+'"></center></div>';
}

function YahooWin(width,uri,title,waitfor,pos){
Expand Down

0 comments on commit 6033cb1

Please sign in to comment.