Changeset 292 for trunk


Ignore:
Timestamp:
Oct 2, 2010, 4:49:35 PM (14 years ago)
Author:
george
Message:
  • Upraveno: Odkazy na novou webkameru. * Aktualizace: Speedtest.
Location:
trunk
Files:
6 added
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/database.php

    r229 r292  
    1515       
    1616          if($Config['Web']['ShowSQLQuery'] == true)
    17             echo('<div style="border-bottom-width: 1px; border-bottom-style: solid; padding-bottom: 3px; padding-top: 3px; font-size: 12px; font-family: Arial;">'.$Query.'</div>');
     17            echo('<div style="border-bottom-width: 1px; border-bottom-style: solid; padding-bottom: 3px; padding-top: 3px; font-size: 12px; font-family: Arial;">'.$Query.'</div>'."\n");
    1818          $Result = parent::query($Query);
    1919    if(($this->error != '') and ($Config['Web']['ShowSQLError'] == true))

  • trunk/finance/finance.php

    r275 r292  
    4848    foreach($this->Tariffs as $Index => $Tariff)
    4949    {
    50       $DbResult = $this->Database->select('Member', 'COUNT(*)', 'InternetTariff'.$Column[$Period].'Month='.$Index);
     50      $DbResult = $this->Database->select('Member', 'COUNT(*)', 'InternetTariff'.$Column[$Period].'Month='.$Index.' AND (BillingPeriod > 1)');
    5151      $Row = $DbResult->fetch_row();
    5252      $this->Tariffs[$Index]['MemberCount'] = $Row[0];

  • trunk/jidelna/tisk.php

    r170 r292  
    1414
    1515//echo('Dnes je '.HumanDate(date('Y-m-d')).'<br>');
    16 echo('<table height="99%" width="100%" align="center" border="1" cellspacing="0" cellpadding="3">');
     16echo('<table height="99%" width="100%" align="center" border="0" cellspacing="0" cellpadding="3">');
    1717$Date = explode('-', $_GET['date']);
    1818echo('<tr><td style="border-bottom-style: solid; border-bottom-color: black; border-bottom-width: 2;" colspan="2">
    … …  
    4242$DbResult = $Database->select('MealsInfo','*');
    4343$Row = $DbResult->fetch_array();
    44 echo('<tr><td style="border-top-style: solid; border-top-color: black; border-top-width: 2;" colspan="2"><table cellspacing="0" cellpadding="0" width="100%"><tr><td width="50%"><strong>JÍDLA PŘIPRAVIL: BAROŇOVÁ L.</strong></td>
     44echo('<tr><td style="border-top-style: solid; border-top-color: black; border-top-width: 2;" colspan="2"><table cellspacing="0" cellpadding="0" width="100%"><tr><td width="50%"><strong>JÍDLA PŘIPRAVILA: Matochová</strong></td>
    4545<td align="right"><strong>PROVOZOVATEL:</strong></td></tr></table>
    4646<br>

  • trunk/system/generators/firewall_nat.php

    r291 r292  
    9797$Items[] = array('chain' => 'inet-out', 'action' => 'src-nat', 'to-addresses' => '77.92.221.106', 'comment' => 'Default_NAT');
    9898// Redirect DNS port
    99 //$Items[] = array('chain' => 'dstnat', 'dst-address' => '212.111.4.174', 'protocol' => 'tcp', 'dst-port' => 53, 'in-interface' => $InetInterface, 'action' => 'dst-nat', 'to-addresses' => '10.145.64.8', 'to-ports' => 53, 'comment' => 'DNS_redirection_UDP');
    100 //$Items[] = array('chain' => 'dstnat', 'dst-address' => '212.111.4.174', 'protocol' => 'udp', 'dst-port' => 53, 'in-interface' => $InetInterface, 'action' => 'dst-nat', 'to-addresses' => '10.145.64.8', 'to-ports' => 53, 'comment' => 'DNS_redirection_UDP');
     99$Items[] = array('chain' => 'dstnat', 'dst-address' => '212.111.4.174', 'protocol' => 'tcp', 'dst-port' => 53, 'in-interface' => $InetInterface, 'action' => 'dst-nat', 'to-addresses' => '10.145.64.8', 'to-ports' => 53, 'comment' => 'DNS_redirection_TCP');
     100$Items[] = array('chain' => 'dstnat', 'dst-address' => '212.111.4.174', 'protocol' => 'udp', 'dst-port' => 53, 'in-interface' => $InetInterface, 'action' => 'dst-nat', 'to-addresses' => '10.145.64.8', 'to-ports' => 53, 'comment' => 'DNS_redirection_UDP');
    101101
    102102//print_r($Items);

  • trunk/webcam/webcam.php

    r148 r292  
    88  {
    99    global $Config;
    10     return('<a href="'.$this->System->Config['Web']['RootFolder'].'/webcam/"><img alt="Webkamera školní hřiště" width="140" height="105" src="'.$this->System->Config['Web']['RootFolder'].'/webcam/'.$this->ImageFileName.'" /></a>');
     10 //   return('<a href="'.$this->System->Config['Web']['RootFolder'].'/webcam/"><img alt="Webkamera školní hřiště" width="140" height="105" src="'.$this->System->Config['Web']['RootFolder'].'/webcam/'.$this->ImageFileName.'" /></a>');
     11    return('<a href="http://www.zdechov.net/kamery/"><img alt="Webkamera školní hřiště" width="140" height="105" src="http://www.zdechov.net/images/webcam/webcam.jpg" /></a>');
    1112  }
    1213}

  • trunk/webcam/webcam_refresh.php

    r245 r292  
    88  if((time() - $Config['Web']['WebcamRefresh']) >= $ModifyTime)
    99  {
    10     $Output = shell_exec('wget "http://kamera-stred/Webcam.jpg?MobilePass='.$Config['Web']['WebcamPassword'].'&V=2&Q=2&B=2&U=0" -O webcam_cache.jpg -T '.($Config['Web']['WebcamRefresh'] - 1));
     10//    $Output = shell_exec('wget "http://kamera-stred/Webcam.jpg?MobilePass='.$Config['Web']['WebcamPassword'].'&V=2&Q=2&B=2&U=0" -O webcam_cache.jpg -T '.($Config['Web']['WebcamRefresh']).' --limit-rate=200k');
     11    $Output = shell_exec('wget "http://kamera-knihovna/cgi-bin/viewer/video.jpg" -O webcam_cache.jpg -T '.($Config['Web']['WebcamRefresh']).' --limit-rate=200k');
     12   
    1113    if((strpos($Output, 'failed') === false) and (strpos($Output, 'error') === false))
    1214      shell_exec('mv -f webcam_cache.jpg webcam.jpg');
Note: See TracChangeset for help on using the changeset viewer.