Changeset 16071 for extensions/flickr2piwigo/maintain.inc.php

Timestamp:

Jun 27, 2012, 1:53:21 AM (12 years ago)

Author:

mistic100

Message:

code cleanup, don't ask username anymore (prohibit importing photos from another account)

File:

• extensions/flickr2piwigo/maintain.inc.php (modified) (3 diffs)

extensions/flickr2piwigo/maintain.inc.php

@@ -7 +7 @@
     'api_key' => null,
     'secret_key' => null,
-    'username' => null,
     ))
   );
-  
+
 
 function plugin_install() 
 {
   global $conf;
+  
   conf_update_param('flickr2piwigo', flickr2piwigo_default_config);
+  
   mkdir($conf['data_location'].'flickr_cache/', 0755);
 }
@@ -30 +31 @@
   if (!file_exists($conf['data_location'].'flickr_cache/'))
   {
-    mdir($conf['data_location'].'flickr_cache/', 0755);
+    mkdir($conf['data_location'].'flickr_cache/', 0755);
   }
 }
@@ -37 +38 @@
 {
   pwg_query('DELETE FROM `'. CONFIG_TABLE .'` WHERE param = "flickr2piwigo" LIMIT 1;');
+  
+  rrmdir($conf['data_location'].'flickr_cache/');
 }
 
+function rrmdir($dir)
+{
+  if (!is_dir($dir))
+  {
+    return false;
+  }
+  $dir = rtrim($dir, '/');
+  $objects = scandir($dir);
+  $return = true;
+  
+  foreach ($objects as $object)
+  {
+    if ($object !== '.' && $object !== '..')
+    {
+      $path = $dir.'/'.$object;
+      if (filetype($path) == 'dir') 
+      {
+        $return = $return && rrmdir($path); 
+      }
+      else 
+      {
+        $return = $return && @unlink($path);
+      }
+    }
+  }
+  
+  return $return && @rmdir($dir);
+} 
+
 ?>