Changeset 1861

Show
Ignore:
Timestamp:
06/26/07 14:16:19 (11 months ago)
Author:
benjamin
Message:

PReparation Etch + debugs (see changelog)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • alternc-awstats/trunk/bureau/admin/aws_add.php

    r1789 r1861  
    9292$pub=$aws->get_view_public($id); 
    9393if($pub == 0) { 
    94   echo "<option value=0>Oui</option><option value=1>Non</option>"; 
     94  echo "<option selected=\"selected\" value=\"0\">"._("Yes")."</option><option value=\"1\">"._("No")."</option>"; 
    9595} else { 
    96   echo "<option value=1>Non</option><option value=0>Oui</option>"; 
     96  echo "<option selected=\"selected\" value=\"1\">"._("No")."</option><option value=\"0\">"._("Yes")."</option>"; 
    9797} 
    9898?> 

  • alternc-awstats/trunk/bureau/class/m_aws.php

    r1785 r1861  
    293293    } 
    294294    // Parse the hostaliases array (it should contains valid domains) 
    295     foreach($hostaliases as $ho) { 
    296       if (!in_array($hostname,$r) || $hostname=="") { 
    297         $err->raise("aws",3); // This hostname does not exist 
    298         return false; 
    299       } 
    300       $ha .= "$ho "; 
    301     } 
    302      
     295        if (is_array($hostaliases)) { 
     296                foreach($hostaliases as $ho) { 
     297                        if (!in_array($hostname,$r) || $hostname=="") { 
     298                                $err->raise("aws",3); // This hostname does not exist 
     299                                return false; 
     300                        } 
     301                        $ha .= "$ho "; 
     302                } 
     303    } 
     304 
    303305    if ($quota->cancreate("aws")) { 
    304306      $db->query("INSERT INTO aws (hostname,uid,hostaliases,public) VALUES ('$hostname','$cuid','$ha','$public')"); 
    …… 
    357359      $db->next_record(); 
    358360      $pub=$db->f("public"); 
    359     } 
     361    } else { 
     362          $pub=1; 
     363        } 
    360364    return $pub; 
    361365  } 

  • alternc-awstats/trunk/debian/changelog

    r1786 r1861  
     1alternc-awstats (0.5) testing; urgency=low 
     2 
     3  * on php5 : Warning: Invalid argument supplied for foreach() in /var/alternc/bureau/class/m_aws.php on line 295 
     4  * Default should be "not public" 
     5  * Corrected dependency on php(4|5)-cli 
     6  * AlternC-Etch compatibility 
     7 
     8 -- Benjamin Sonntag <benjamin@alternc.org>  Thu, 26 Jun 2007 13:25:00 +0700 
     9 
    110alternc-awstats (0.4.1) stable; urgency=low 
    211 

  • alternc-awstats/trunk/debian/control

    r1077 r1861  
    1010Section: admin 
    1111Architecture: all 
    12 Depends: alternc (>=0.9.4), awstats (>=6.1-1), debconf, php4-cli 
     12Depends: alternc (>=0.9.6), awstats (>=6.1-1), debconf, php5-cli | php4-cli 
    1313Suggests: apachemerge 
    1414Description: Awstats statistics module for AlternC