iNew configuration variable delete old logs - loglifetime

diff --git a/admin/config.html b/admin/config.html
index 0473e0cc39466a2eb7019adeec9e8931d068b051..5e18f5a62dd7ef637127afb7fb500315ec70209f 100644 (file)
--- a/admin/config.html
+++ b/admin/config.html
@@ -1,73 +1,73 @@
-<FORM METHOD="post" action="config.php" NAME="form">
+<form method="post" action="config.php" name="form">
 
-<TABLE cellpadding=9 cellspacing=0 >
-<TR VALIGN=TOP>
-       <TD ALIGN=RIGHT><P>lang:</TD>
-       <TD>
+<table cellpadding=9 cellspacing=0 >
+<tr valign=top>
+       <td align=right><p>lang:</td>
+       <td>
     <? choose_from_menu (get_list_of_languages(), "lang", $config->lang, "", "", ""); ?>
-    </TD>
-    <TD>
+    </td>
+    <td>
     <? print_string("configlang") ?>
-    </TD>
-</TR>
-<TR VALIGN=TOP>
-       <TD ALIGN=RIGHT><P>langdir:</TD>
-       <TD>
+    </td>
+</tr>
+<tr valign=top>
+       <td align=right><p>langdir:</td>
+       <td>
     <? unset($options);
        $options["LTR"] = get_string("langltr");
        $options["RTL"] = get_string("langrtl");
 
        choose_from_menu ($options, "langdir", $config->langdir, "", "", "");
     ?>
-    </TD>
-    <TD>
+    </td>
+    <td>
     <? print_string("configlangdir") ?>
-    </TD>
-</TR>
-<TR VALIGN=TOP>
-       <TD ALIGN=RIGHT><P>locale:</TD>
-       <TD>
-    <INPUT NAME=locale TYPE=text SIZE=10 VALUE="<?=$config->locale?>">
-    </TD>
-    <TD>
+    </td>
+</tr>
+<tr valign=top>
+       <td align=right><p>locale:</td>
+       <td>
+    <input name=locale type=text size=10 value="<?=$config->locale?>">
+    </td>
+    <td>
     <? print_string("configlocale") ?>
-    </TD>
-</TR>
+    </td>
+</tr>
 <tr valign=top>
-       <td align=right><P>country:</td>
+       <td align=right><p>country:</td>
        <td><? choose_from_menu ($COUNTRIES, "country", $config->country, get_string("selectacountry"), "", "") ?>
        </td>
-    <TD>
+    <td>
     <? print_string("configcountry") ?>
-    </TD>
-</tr>
-<TR VALIGN=TOP>
-       <TD ALIGN=RIGHT><P>smtphosts:</TD>
-       <TD>
-    <INPUT NAME=smtphosts TYPE=text SIZE=30 VALUE="<?=$config->smtphosts?>">
-    </TD>
-    <TD>
+    </td>
+</tr>
+<tr valign=top>
+       <td align=right><p>smtphosts:</td>
+       <td>
+    <input name=smtphosts type=text size=30 value="<?=$config->smtphosts?>">
+    </td>
+    <td>
     <? print_string("configsmtphosts") ?>
-    </TD>
-</TR>
-<TR VALIGN=TOP>
-       <TD ALIGN=RIGHT><P>smtpuser:</TD>
-       <TD>
-    <INPUT NAME=smtpuser TYPE=text SIZE=10 VALUE="<?=$config->smtpuser?>">
-    </TD>
-    <TD ROWSPAN=2>
+    </td>
+</tr>
+<tr valign=top>
+       <td align=right><p>smtpuser:</td>
+       <td>
+    <input name=smtpuser type=text size=10 value="<?=$config->smtpuser?>">
+    </td>
+    <td rowspan=2>
     <? print_string("configsmtpuser") ?>
-    </TD>
-</TR>
-<TR VALIGN=TOP>
-       <TD ALIGN=RIGHT><P>smtppass:</TD>
-       <TD>
-    <INPUT NAME=smtppass TYPE=text SIZE=10 VALUE="<?=$config->smtppass?>">
-    </TD>
+    </td>
+</tr>
+<tr valign=top>
+       <td align=right><p>smtppass:</td>
+       <td>
+    <input name=smtppass type=text size=10 value="<?=$config->smtppass?>">
+    </td>
 </TR>
-<TR VALIGN=TOP>
-       <TD ALIGN=RIGHT><P>gdversion:</TD>
-       <TD>
+<tr valign=top>
+       <td align=right><p>gdversion:</td>
+       <td>
     <? unset($options);
        $options[0] = get_string("gdnot");
        $options[1] = get_string("gd1");
@@ -77,27 +77,27 @@
 
        choose_from_menu ($options, "gdversion", $installed, "", "", "");
     ?>
-    </TD>
-    <TD>
+    </td>
+    <td>
     <? print_string("configgdversion") ?>
-    </TD>
-</TR>
-<TR VALIGN=TOP>
-    <TD ALIGN=RIGHT><P>htmleditor:</TD>
-    <TD>
+    </td>
+</tr>
+<tr valign=top>
+    <td align=right><p>htmleditor:</td>
+    <td>
     <? unset($options);
        $options[0] = get_string("allownot");
        $options[1] = get_string("allow");
        choose_from_menu ($options, "htmleditor", $config->htmleditor, "", "", "");
     ?>
-    </TD>
-    <TD>
+    </td>
+    <td>
     <? print_string("confightmleditor") ?>
-    </TD>
-</TR>
-<TR VALIGN=TOP>
-       <TD ALIGN=RIGHT><P>maxeditingtime:</TD>
-       <TD>
+    </td>
+</tr>
+<tr valign=top>
+       <td align=right><p>maxeditingtime:</td>
+       <td>
     <? unset($options);
        $options[3600] = get_string("numminutes", "", 60);
        $options[2700] = get_string("numminutes", "", 45);
@@ -108,14 +108,14 @@
 
        choose_from_menu ($options, "maxeditingtime", $config->maxeditingtime, "", "", "");
     ?>
-    </TD>
-    <TD>
+    </td>
+    <td>
     <? print_string("configmaxeditingtime") ?>
-    </TD>
-</TR>
-<TR VALIGN=TOP>
-       <TD ALIGN=RIGHT><P>longtimenosee:</TD>
-       <TD>
+    </td>
+</tr>
+<tr valign=top>
+       <td align=right><p>longtimenosee:</td>
+       <td>
     <? unset($options);
        $options[1000] = get_string("numdays", "", 1000);
        $options[365]  = get_string("numdays", "", 365);
@@ -131,14 +131,35 @@
 
        choose_from_menu ($options, "longtimenosee", $config->longtimenosee, "", "", "");
     ?>
-    </TD>
-    <TD>
+    </td>
+    <td>
     <? print_string("configlongtimenosee") ?>
-    </TD>
-</TR>
-<TR VALIGN=TOP>
-       <TD ALIGN=RIGHT><P>sessiontimeout:</TD>
-       <TD>
+    </td>
+</tr>
+<tr valign=top>
+       <td align=right><p>loglifetime:</td>
+       <td>
+    <? unset($options);
+       $options[0]    = get_string("saveall");
+       $options[1000] = get_string("numdays", "", 1000);
+       $options[365]  = get_string("numdays", "", 365);
+       $options[180]  = get_string("numdays", "", 180);
+       $options[150]  = get_string("numdays", "", 150);
+       $options[120]  = get_string("numdays", "", 120);
+       $options[90]   = get_string("numdays", "", 90);
+       $options[60]   = get_string("numdays", "", 60);
+       $options[30]   = get_string("numdays", "", 30);
+
+       choose_from_menu ($options, "loglifetime", $config->loglifetime, "", "", "");
+    ?>
+    </td>
+    <td>
+    <? print_string("configloglifetime") ?>
+    </td>
+</tr>
+<tr valign=top>
+       <td align=right><p>sessiontimeout:</td>
+       <td>
     <? unset($options);
        $options[14400] = get_string("numhours", "", 4);
        $options[10800] = get_string("numhours", "", 3);
@@ -152,32 +173,32 @@
 
        choose_from_menu ($options, "sessiontimeout", $config->sessiontimeout, "", "", "");
     ?>
-    </TD>
-    <TD>
+    </td>
+    <td>
     <? print_string("configsessiontimeout") ?>
-    </TD>
-</TR>
-<TR VALIGN=TOP>
-       <TD ALIGN=RIGHT><P>zip:</TD>
-       <TD>
-    <INPUT name=zip TYPE=text SIZE=30 VALUE="<?=$config->zip?>">
-    </TD>
-    <TD>
+    </td>
+</tr>
+<tr valign=top>
+       <td align=right><p>zip:</td>
+       <td>
+    <input name=zip type=text size=30 value="<?=$config->zip?>">
+    </td>
+    <td>
     <? print_string("configzip") ?>
-    </TD>
-</TR>
-<TR VALIGN=TOP>
-       <TD ALIGN=RIGHT><P>unzip:</TD>
-       <TD>
-    <INPUT name=unzip TYPE=text SIZE=30 VALUE="<?=$config->unzip?>">
-    </TD>
-    <TD>
+    </td>
+</tr>
+<tr valign=top>
+       <td align=right><p>unzip:</td>
+       <td>
+    <input name=unzip type=text size=30 value="<?=$config->unzip?>">
+    </td>
+    <td>
     <? print_string("configunzip") ?>
-    </TD>
-</TR>
-<TR VALIGN=TOP>
-       <TD ALIGN=RIGHT><P>slasharguments:</TD>
-       <TD>
+    </td>
+</tr>
+<tr valign=top>
+       <td align=right><p>slasharguments:</td>
+       <td>
     <? unset($options);
        $options[0] = "file.php?file=/pic.jpg";
        $options[1] = "file.php/pic.jpg";
@@ -186,59 +207,59 @@
 
        choose_from_menu ($options, "slasharguments", $config->slasharguments, "", "", "");
     ?>
-    </TD>
-    <TD>
+    </td>
+    <td>
     <? print_string("configslasharguments") ?>
-    </TD>
-</TR>
-<TR VALIGN=TOP>
-       <TD ALIGN=RIGHT><P>proxyhost:</TD>
-       <TD>
-    <INPUT name=proxyhost TYPE=text SIZE=30 VALUE="<?=$config->proxyhost?>">
-    </TD>
-    <TD ROWSPAN=2>
+    </td>
+</tr>
+<tr valign=top>
+       <td align=right><p>proxyhost:</td>
+       <td>
+    <input name=proxyhost type=text size=30 value="<?=$config->proxyhost?>">
+    </td>
+    <td rowspan=2>
     <? print_string("configproxyhost") ?>
-    </TD>
-</TR>
-<TR VALIGN=TOP>
-       <TD ALIGN=RIGHT><P>proxyport:</TD>
-       <TD>
-    <INPUT name=proxyport TYPE=text SIZE=5 VALUE="<?=$config->proxyport?>">
-    </TD>
+    </td>
 </TR>
-<TR VALIGN=TOP>
-       <TD ALIGN=RIGHT><P>debug:</TD>
-       <TD>
+<tr valign=top>
+       <td align=right><p>proxyport:</td>
+       <td>
+    <input name=proxyport type=text size=5 value="<?=$config->proxyport?>">
+    </td>
+</tr>
+<tr valign=top>
+       <td align=right><p>debug:</td>
+       <td>
     <? unset($options);
        $options[7]  = get_string("no");
        $options[15] = get_string("yes");
 
        choose_from_menu ($options, "debug", $config->debug, "", "", "");
     ?>
-    </TD>
-    <TD>
+    </td>
+    <td>
     <? print_string("configdebug") ?>
-    </TD>
-</TR>
-<TR VALIGN=TOP>
-       <TD ALIGN=RIGHT><P>framename:</TD>
-       <TD>
+    </td>
+</tr>
+<tr valign=top>
+       <td align=right><p>framename:</td>
+       <td>
     <? if (empty($config->framename)) {
            $config->framename = "_top";
        }
     ?>
-    <INPUT NAME=framename TYPE=text SIZE=15 VALUE="<?=$config->framename?>">
-    </TD>
-    <TD>
+    <input name=framename type=text size=15 value="<?=$config->framename?>">
+    </td>
+    <td>
     <? print_string("configframename") ?>
-    </TD>
-</TR>
+    </td>
+</tr>
 
 
-<TR>
-    <TD COLSPAN=3 ALIGN=CENTER>
-       <INPUT TYPE="submit" VALUE="<? print_string("savechanges") ?>"></TD>
-</TR>
-</TABLE>
+<tr>
+    <td colspan=3 align=center>
+       <input type="submit" value="<? print_string("savechanges") ?>"></td>
+</tr>
+</table>
 
-</FORM>
+</form>

diff --git a/lib/defaults.php b/lib/defaults.php
index 66211b785374d475d394dfbb81ffe946f663fb2e..c050dc789b3fc38c9aa7921d029d10735a6f4a6d 100644 (file)
--- a/lib/defaults.php
+++ b/lib/defaults.php
@@ -14,6 +14,7 @@
        "smtppass"         => "",
        "gdversion"        =>  1,
        "longtimenosee"    =>  100,
+       "loglifetime"      =>  0,
        "zip"              => "",
        "unzip"            => "",
        "slasharguments"   =>  1,

diff --git a/version.php b/version.php
index 06a6e187bcebaa792c189f7c8e6c777bad986f81..9b34b2d35d42acad97d328d8a929f0d80776562c 100644 (file)
--- a/version.php
+++ b/version.php
@@ -5,7 +5,7 @@
 // database to determine whether upgrades should
 // be performed (see lib/db/*.php)
 
-$version = 2003042700;   // The current version is a date (YYYYMMDDXX)
+$version = 2003042701;   // The current version is a date (YYYYMMDDXX)
 
 $release = "1.0.9 development";  // User-friendly version number