Changeset 812

Timestamp:

Mar 9, 2016, 8:36:25 AM (9 years ago)

Author:

chronos

Message:

• Added: Setup also base DNS name.

Location:

trunk/Modules

Files:

• Finance/Finance.php (modified) (1 diff)
• Finance/Import.php (modified) (1 diff)
• NetworkConfigLinux/Generators/DNS.php (modified) (5 diffs)
• WebCam/WebCam.php (modified) (1 diff)

trunk/Modules/Finance/Finance.php

@@ -567 +567 @@
       'Items' => array(
         'DocumentLine' => array('Type' => 'TDocumentLine', 'Caption' => 'Dokladová řada', 'Default' => ''),
-        'BillCode' => array('Type' => 'TDocumentLineCode', 'Caption' => 'Kód', 'Default' => ''),
+        'BillCode' => array('Type' => 'TDocumentLineCode', 'Caption' => 'Kód', 'Default' => '', 'Null' => true),
         'Subject' => array('Type' => 'TSubject', 'Caption' => 'Subjekt', 'Default' => ''),
         'ValidFrom' => array('Type' => 'Date', 'Caption' => 'Platnost od', 'Default' => ''),

trunk/Modules/Finance/Import.php

@@ -61 +61 @@
     //print_r($Data);
 
-    if($Header != $Data[0]) $Output = 'Nekompatibilní struktura CSV';
+    if($Header != $Data[0]) {
+      $Output = 'Nekompatibilní struktura CSV';
+      print_r($Header);
+      print_r($Data[0]);
+    }
     else
     {

trunk/Modules/NetworkConfigLinux/Generators/DNS.php

@@ -39 +39 @@
           $MailServer.".\tIN\tSPF\t\"v=spf1 a -all\"\n";
     }
+
+    // Base server
+    $Output .= "@\tIN\tCNAME\t".strtolower($DNS['BaseServer'])."\n";
 
     // IPv4 host list
@@ -174 +177 @@
         'MailServer' => array('centrala.'.$BaseDomain),
         'NameServer' => array('centrala.'.$BaseDomain, 'mozek.'.$BaseDomain),
+        'BaseServer' => 'centrala.'.$BaseDomain,
         'ReverseNameServer' => array('centrala.'.$BaseDomain, 'mozek.'.$BaseDomain),
         'Host' => array(),
@@ -239 +243 @@
         'MailServer' => array('centrala.'.$BaseDomain),
         'NameServer' => array('gw-hajda.inext.cz', 'ns0.xname.org', 'ns2.afraid.org'),
+        'BaseServer' => 'centrala.'.$BaseDomain,
         'ReverseNameServer' => array('gw-hajda.inext.cz', 'inext.inext.cz'),
         'Host' => array(),
@@ -280 +285 @@
         'MailServer' => array('centrala.'.$BaseDomain),
         'NameServer' => array('centrala.'.$BaseDomain, 'mozek'.$BaseDomain),
+        'BaseServer' => 'centrala.'.$BaseDomain,
         'ReverseNameServer' => array('centrala.'.$BaseDomain, 'mozek.'.$BaseDomain),
         'Host' => array(),
@@ -321 +327 @@
         'MailServer' => array('centrala.'.$BaseDomain),
         'NameServer' => array('centrala.'.$BaseDomain, 'mozek.'.$BaseDomain),
+        'BaseServer' => 'centrala.'.$BaseDomain,
         'ReverseNameServer' => array('centrala.'.$BaseDomain, 'mozek.'.$BaseDomain),
         'Host' => array(),

trunk/Modules/WebCam/WebCam.php

@@ -67 +67 @@
     global $Config;
     $Output = '';
-    $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>';
+    $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>';
+    $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>';
     $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>';
     $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>';