Changeset 39

Timestamp:

Jan 31, 2008, 9:11:25 PM (17 years ago)

Author:

george

Message:

Opraveno: Různé chyby ve skriptech.

Location:

system

Files:

• backup/backup-move.php (modified) (1 diff)
• backup/do-backup.php (modified) (3 diffs)
• generators/dns.php (modified) (2 diffs)
• php.ini (deleted)
• statistic/known_mac.php (modified) (1 diff)
• traffic.log (deleted)

system/backup/backup-move.php

@@ -1 +1 @@
 <?php
-$i = 10; // Po�t z�oh
+$i = 10; // Počet záloh
 $path='/mnt/backup/';
 $file='backup';

system/backup/do-backup.php

@@ -1 +1 @@
 <?php
-include('../html/global.php');
+include('/a/html/global.php');
 $Database->select_db('backup');
 
 function mkdirrec($path,$mode) 
 {
-  if (!is_dir($path)) {
-    if (!@mkdir($path,$mode)) {
+  if (!is_dir($path)) 
+  {
+    if (!@mkdir($path,$mode)) 
+    {
       mkdirrec(dirname($path),$mode); mkdir($path,$mode);
     }
@@ -13 +15 @@
 
 $backup = '/tmp/backup';
-mkdirrec($backup,0777);
+mkdirrec($backup, 0777);
 
 // Nacti polozky z databaze
@@ -20 +22 @@
 while($Row = $DbResult->fetch_array()) array_push($Rows,$Row);
 
-while ($Row = array_shift($Rows)) {
+while ($Row = array_shift($Rows)) 
+{
   if ($Row['description']) echo('Zalohuji '.$Row['description']."\n");
   // Nacteni vyjimek
   $DbResult = $Database->query("SELECT * FROM items WHERE parent=".$Row['id']);
   $Exceptions = array();
-  while($Except = $DbResult->fetch_array()) $Exceptions[$Except['name']] = 1;
+  while($Except = $DbResult->fetch_array()) 
+    $Exceptions[$Except['name']] = 1;
   // Prochazeni slozek
   $root = $Row['name'];
-  if ($root[0]!='/') $root = '/'.$root;
-  if (!($recursive = (substr($root,strlen($root)-2,2)!='/*'))) $root = substr($root,0,strlen($root)-2);
+  if ($root[0] != '/') $root = '/'.$root;
+  if (!($recursive = (substr($root, strlen($root) - 2, 2) != '/*'))) $root = substr($root, 0, strlen($root) - 2);
   $paths = array('.');
   mkdirrec($backup.$root, 0700);
-  while ($folder = array_shift($paths)) {
-    $handle=opendir($root.'/'.$folder);
-    if ($folder!='.') {
+  while ($folder = array_shift($paths)) 
+  {
+    $handle = opendir($root.'/'.$folder);
+    if ($folder != '.') 
+    {
       mkdirrec($backup.$root.'/'.$folder, 0700);
-      $folder.='/';
-    } else $folder='';
-    while (false!==($file = readdir($handle))) {
-      if ($file != "." && $file != ".." && !(@$Exceptions[$folder.$file])) {
-        if (is_dir($root.'/'.$folder.$file)) {
-          if ($recursive) { array_push($paths,$folder.$file); }
-        } else {
+      $folder .= '/';
+    } else $folder = '';
+    while (false !== ($file = readdir($handle))) 
+    {
+      if ($file != "." && $file != ".." && !array_key_exists($folder.$file, $Exceptions)) 
+      {
+        if (is_dir($root.'/'.$folder.$file)) 
+        {
+          if ($recursive) array_push($paths, $folder.$file); 
+        } else 
+        {
           $ftype=filetype($root.'/'.$folder.$file);
-          if (($ftype=='file')||($ftype=='link')||($ftype=='')) exec('cp -u '.addslashes($root.'/'.$folder.$file).' '.addslashes($backup.$root.'/'.$folder.$file));
+          if (($ftype == 'file') || ($ftype == 'link') || ($ftype == '')) 
+          {
+            //echo('Kopiruju '.addslashes($root.'/'.$folder.$file).' na '.addslashes($backup.$root.'/'.$folder.$file)."\n");
+            exec('cp -u '.addslashes($root.'/'.$folder.$file).' '.addslashes($backup.$root.'/'.$folder.$file));
+          }
         }
       }

system/generators/dns.php

@@ -208 +208 @@
 fputs($File2, $Header);
 
-$Database->select('hosts','*','czfree_ip<>""');
-while($Row = $Database->fetch_array())
+$DbResult = $Database->select('hosts','*','czfree_ip<>""');
+while($Row = $DbResult->fetch_array())
 {
   $Data = strtolower($Row['name']);
@@ -221 +221 @@
 
 $DbResult = $Database->query("SELECT network_dns_alias.* FROM  `network_dns_alias` JOIN  `hosts`  ON network_dns_alias.target LIKE hosts.name AND hosts.czfree_ip != ''");
-while($Alias = $Database->fetch_array())
+while($Alias = $DbResult->fetch_array())
 {
   $Data = $Alias['name'];

system/statistic/known_mac.php

@@ -1 +1 @@
 <?php
-include_once('../html/global.php');
+include_once('../../html/global.php');
 $Database->select_db('statistic');