[Dehs-devel] r84 - in trunk: . www

[atomo64-guest at alioth.debian.org]

Author: atomo64-guest
Date: 2007-12-18 20:49:31 +0000 (Tue, 18 Dec 2007)
New Revision: 84

Modified:
   trunk/dehs_pg.php
   trunk/www/stats.html
Log:
dehs_pg.php: 
* fixed a problem where the deversionmangled value was kept empty
* added missing braces to the wwiz-generated watch files in the file extensions part
* tha watch wizard now uses passive FTP by default
www/stats.html: removed hr

Modified: trunk/dehs_pg.php
===================================================================
--- trunk/dehs_pg.php	2007-12-17 02:12:19 UTC (rev 83)
+++ trunk/dehs_pg.php	2007-12-18 20:49:31 UTC (rev 84)
@@ -447,7 +447,7 @@
         $uscan_res=uscan_foo($res_array['name'],$res_array['version'],$res_array['watch']);
         #print $uscan_res[0] . "\n Name => $res_array[name]\n";
         $version=$res_array[version];
-        $dversionmangled=$res_array['dversionmangled'];
+        $dversionmangled=$res_array['version'];
         print "\rVersion=>" . $uscan_res[3];
         if ($uscan_res[3]!=null) $version=$uscan_res[3];
         if ($uscan_res[5]!=null && $uscan_res[5] != vers_conv($res_array['version'])) $dversionmangled=$uscan_res[5];
@@ -656,6 +656,7 @@
 
     if ($exts != '') {
         $opts[] = 'uversionmangle=s/\.(' . substr($exts, 0, -1) . ')$//i';
+        $exts = '(' . $exts . ')';
     }
 
     foreach ($watchFileDversionMangle as $dvmangler) {
@@ -667,6 +668,8 @@
         $opts[] = 'dversionmangle=s/[-.+~]?(' . substr($dvmanglers, 0, -1) . ')(.*)$//i';
     }
 
+    $opts[] = 'pasv';
+
     if (is_array($opts)) {
         $_opts = '';
         foreach ($opts as $opt) {
@@ -777,7 +780,6 @@
 
                     $tWatch = array_merge($defs, $tWatch);
 
-
                     $watch = sprintf($watchFormat, $tWatch['url'], $tWatch['space'], $tWatch['name'], $exts, $opts);
 
                     $uscan_res=uscan_foo($res_array['name'] ,$res_array['version'],$watch);

Modified: trunk/www/stats.html
===================================================================
--- trunk/www/stats.html	2007-12-17 02:12:19 UTC (rev 83)
+++ trunk/www/stats.html	2007-12-18 20:49:31 UTC (rev 84)
@@ -14,9 +14,6 @@
 <?php $title='Overall DEHS statistics'; define('PBAR', true); include("menu.inc"); ?><br>
   <table class="invisiblebox">
     <tr>
-	  <td colspan="2"><hr class="ruler" /></td>
-	</tr>
-    <tr>
       <td><img src="/dehs-day.png" alt="daily graph" width="493"  height="331"/></td>
       <td><img src="/dehs-week.png" alt="weekly graph" width="493"  height="331"/></td>
     </tr>