Changeset 860
- Timestamp:
- May 8, 2019, 8:22:45 PM (5 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/.htaccess
r744 r860 3 3 deny from all 4 4 </Files> 5 6 <Files Query.log> 7 order allow,deny 8 deny from all 9 </Files> 10 11 RewriteEngine On 12 RewriteBase / 5 13 6 14 RewriteEngine On -
trunk/Modules/NetworkConfigRouterOS/Generators/DHCP.php
r817 r860 28 28 $Name = $Interface['DeviceName']; 29 29 if($Interface['Name'] != '') $Name .= '-'.$Interface['Name']; 30 $Items[] = array('mac-address' => $Interface['MAC'], 'address' => $Interface['LocalIP'], 'server' => $Server, 'comment' => $Name );30 $Items[] = array('mac-address' => $Interface['MAC'], 'address' => $Interface['LocalIP'], 'server' => $Server, 'comment' => $Name, 'lease-time' => '24h'); 31 31 } 32 32 -
trunk/Modules/NetworkConfigRouterOS/Generators/FirewallNAT.php
r781 r860 110 110 111 111 // Accept free-access clients 112 $Items[] = array('chain' => 'dstnat', 'dst-address' => '!10.145.0.0/16',113 'src-address-list' => 'free-access', 'in-interface' => $LocalInterface,114 'action' => 'accept', 'comment' => 'Free_access');112 //$Items[] = array('chain' => 'dstnat', 'dst-address' => '!10.145.0.0/16', 113 // 'src-address-list' => 'free-access', 'in-interface' => $LocalInterface, 114 // 'action' => 'accept', 'comment' => 'Free_access'); 115 115 // Redirect unregistred clients to free access activation page 116 $Items[] = array('chain' => 'dstnat', 'dst-address' => '!10.145.0.0/16',117 'src-address-list' => 'unregistred', 'in-interface' => $LocalInterface, 'protocol' => 'tcp',118 'action' => 'dst-nat', 'to-addresses' => '10.145.64.70', 'to-ports' => 8080, 'comment' => 'Redirect_unregistred');116 //$Items[] = array('chain' => 'dstnat', 'dst-address' => '!10.145.0.0/16', 117 // 'src-address-list' => 'unregistred', 'in-interface' => $LocalInterface, 'protocol' => 'tcp', 118 // 'action' => 'dst-nat', 'to-addresses' => '10.145.64.70', 'to-ports' => 8080, 'comment' => 'Redirect_unregistred'); 119 119 120 120 // Masquerade hosts without public ip -
trunk/Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php
r852 r860 65 65 } 66 66 } 67 echo("transakce\n"); 67 68 $this->Database->Transaction($Queries); 69 echo("done\n"); 68 70 69 71 // Set offline all interfaces which were not updated as online … … 90 92 } 91 93 $Queries[] = $this->Database->GetUpdate('NetworkDevice', '`LastOnline` < "'.TimeToMysqlDateTime($StartTime).'"', array('Online' => 0)); 94 echo("Transakce 2\n"); 92 95 $this->Database->Transaction($Queries); 96 echo("done\n"); 93 97 } 94 98 -
trunk/Modules/NetworkConfigRouterOS/NetworkConfigRouterOS.php
r818 r860 69 69 { 70 70 $IPAddress = GetRemoteAddress(); 71 if(IsInternetAddr($IPAddress)) 72 return('<p>Internet zdarma je dostupný pouze z vnitřní sítě.</p>'); 71 $Output = 'Vaše IP adresa je: '.$IPAddress.'<br/>'; 72 if(IsInternetAddr($IPAddress)) { 73 $Output .= '<p>Internet zdarma je dostupný pouze z vnitřní sítě.</p>'; 74 return($Output); 75 } 73 76 $Time = time(); 74 77 … … 99 102 } 100 103 } 101 $Output = '<div style="text-align:center;"><h3>Vítejte v síti ZděchovNET</h3></div>'; 102 //$Output .= 'Vaše adresa IP je: '.GetRemoteAddress().'<br/>'; 104 $Output .= '<div style="text-align:center;"><h3>Vítejte v síti ZděchovNET</h3></div>'; 103 105 $Output .= '<p>Pro přístup k Internetu zdarma sdílenou rychlostí 128/128 kbit/s klikněte na odkaz níže. 104 106 Internet bude zpřístupněn po dobu 24 hodin. Po uplynutí této doby je potřeba provést novou aktivaci.</p>'; -
trunk/Modules/NetworkConfigRouterOS/Routerboard.php
r854 r860 8 8 var $UserName; 9 9 var $Password; 10 var $PrivateKey = '~/.ssh/id_ dsa';10 var $PrivateKey = '~/.ssh/id_rsa'; 11 11 var $MaxBurstLineCount = 100; 12 12 var $Debug = false; … … 52 52 $Commands = str_replace('$', '\$', $Commands); 53 53 //$Commands = str_replace(' ', '\ ', $Commands); 54 $Command = $this->SSHPath.' -o ConnectTimeout='.$this->Timeout.' -l '.$this->UserName.' -o HostKeyAlgorithms=+ssh-dss -o KexAlgorithms=diffie-hellman-group14-sha1 -i '.$this->PrivateKey.' '.$this->HostName.' "'.$Commands.'"'; 54 if ($this->PrivateKey != '') $PrivKey = ' -i '.$this->PrivateKey; 55 else $PrivKey = ''; 56 57 $Command = $this->SSHPath.' -oBatchMode=no -o ConnectTimeout='.$this->Timeout.' -l '.$this->UserName. 58 $PrivKey.' '.$this->HostName.' "'.$Commands.'"'; 55 59 if($this->Debug) echo($Command); 56 60 $Output = array(); -
trunk/Modules/Portal/Portal.php
r858 r860 140 140 function MeteoPanel() 141 141 { 142 $Output = '<a href="http ://stat.zdechov.net/meteo/?Measure=28" title="Klikněte pro detailní informace a předpověď"><img src="http://www.zdechov.net/meteo/koliba.png" border="0" alt="Počasí - Meteostanice Zděchov" width="150" height="150" /></a>';142 $Output = '<a href="https://stat.zdechov.net/meteo/?Measure=28" title="Klikněte pro detailní informace a předpověď"><img src="https://www.zdechov.net/meteo/koliba.png" border="0" alt="Počasí - Meteostanice Zděchov" width="150" height="150" /></a>'; 143 143 return($Output); 144 144 } -
trunk/Modules/WebCam/WebCam.php
r854 r860 67 67 global $Config; 68 68 $Output = ''; 69 $Output .= '<a href="http://www.zdechov.net/kamery/?Id=5"><img alt="Koupaliště" width="140" height="79" src="http://www.zdechov.net/images/webcam/webcam5.jpg" /></a>'; 70 $Output .= '<a href="http://www.zdechov.net/kamery/?Id=1"><img alt="Webkamera školní hřiště" width="140" height="105" src="http://www.zdechov.net/images/webcam/webcam.jpg" /></a>'; 71 $Output .= '<a href="http://www.zdechov.net/kamery/?Id=2"><img alt="Webkamera střed obce obloha" width="140" height="105" src="http://www.zdechov.net/images/webcam/webcam2.jpg" /></a>'; 72 $Output .= '<a href="http://www.zdechov.net/kamery/?Id=3"><img alt="Skiareál, motokrosová grapa" width="140" height="79" src="http://www.zdechov.net/images/webcam/webcam3.jpg" /></a>'; 73 $Output .= '<a href="http://www.zdechov.net/kamery/?Id=4"><img alt="Fotbalové hřiště" width="140" height="79" src="http://www.zdechov.net/images/webcam/webcam4.jpg" /></a>'; 74 $Output .= '<a href="http://www.zdechov.net/kamery/?Id=6"><img alt="Lev výběh 1" width="140" height="79" src="http://www.zdechov.net/images/webcam/webcam6.jpg" /></a>'; 75 $Output .= '<a href="http://www.zdechov.net/kamery/?Id=7"><img alt="Lev výběh 2" width="140" height="79" src="http://www.zdechov.net/images/webcam/webcam7.jpg" /></a>'; 76 $Output .= '<a href="http://www.zdechov.net/kamery/?Id=8"><img alt="Lev domek" width="140" height="79" src="http://www.zdechov.net/images/webcam/webcam8.jpg" /></a>'; 69 $Output .= '<a href="//www.zdechov.net/kamery/?Id=5"><img alt="Koupaliště" width="140" height="79" src="//www.zdechov.net/images/webcam/webcam5.jpg" /></a>'; 70 $Output .= '<a href="//www.zdechov.net/kamery/?Id=1"><img alt="Webkamera školní hřiště" width="140" height="105" src="//www.zdechov.net/images/webcam/webcam.jpg" /></a>'; 71 $Output .= '<a href="//www.zdechov.net/kamery/?Id=2"><img alt="Webkamera střed obce obloha" width="140" height="105" src="//www.zdechov.net/images/webcam/webcam2.jpg" /></a>'; 72 $Output .= '<a href="//www.zdechov.net/kamery/?Id=3"><img alt="Skiareál, motokrosová grapa" width="140" height="79" src="//www.zdechov.net/images/webcam/webcam3.jpg" /></a>'; 73 $Output .= '<a href="//www.zdechov.net/kamery/?Id=4"><img alt="Fotbalové hřiště" width="140" height="79" src="//www.zdechov.net/images/webcam/webcam4.jpg" /></a>'; 77 74 return($Output); 78 75 }
Note:
See TracChangeset
for help on using the changeset viewer.