Changeset 4786 for extensions/netinstall

Timestamp:

Jan 28, 2010, 11:07:16 PM (14 years ago)

Author:

patdenice

Message:

Ignore directory beginning by _

File:

• extensions/netinstall/trunk/piwigo-netinstall.php (modified) (1 diff)

extensions/netinstall/trunk/piwigo-netinstall.php

@@ -472 +472 @@
                                 $uz = new fileUnzip($dc_zip);
                                 $files = $uz->getList();
-                                if (count($files) == 0)
+                                if (!is_array($files) or count($files) == 0)
                                 {
                                         $msg[] = l10n('Invalid zip file.');
                                 }
-
-                                foreach ($files as $k => $v)
+                                else
                                 {
-                                        if ($v['is_dir'])
+                                        foreach ($files as $k => $v)
+                                        {
+                                                if ($v['is_dir'])
+                                                {
+                                                        continue;
+                                                }
+                                        if (preg_match('#^[^/]*/_data#', $k))
                                         {
                                                 continue;
                                         }
-                                        $t = preg_replace('#^[^/]*/#','./'.$dest.'/',$k);
-                                        $uz->unzip($k,$t);
+                                                $t = preg_replace('#^[^/]*/#','./'.$dest.'/',$k);
+                                                $uz->unzip($k,$t);
+                                        }
                                 }
                                 $uz->close;