Changeset 19832

Timestamp:

Jan 5, 2013, 11:28:38 AM (12 years ago)

Author:

mistic100

Message:

make sure temp folder is created on the right place

Location:

extensions/pbase2piwigo

Files:

• include/functions.inc.php (modified) (2 diffs)
• main.inc.php (modified) (2 diffs)
• maintain.inc.php (modified) (4 diffs)

extensions/pbase2piwigo/include/functions.inc.php

@@ -346 +346 @@
       
       curl_setopt($ch, CURLOPT_URL, $src);
-      curl_setopt($ch, CURLOPT_HEADER, 0);
+      curl_setopt($ch, CURLOPT_HEADER, false);
       curl_setopt($ch, CURLOPT_HTTPHEADER, array("Accept-language: en"));
       curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)');
@@ -365 +365 @@
       }
       
-      if (($out = curl_exec($ch)) === false)
+      $out = curl_exec($ch);
+      curl_close($ch);
+      
+      if ($out === false)
       {
         return 'file_error';
       }
-      
-      curl_close($ch);
-      
-      if (!$return)
+      else if (!$return)
       {
         fclose($newf);

extensions/pbase2piwigo/main.inc.php

@@ -13 +13 @@
 global $conf;
 
-define('PBASE_PATH', PHPWG_PLUGINS_PATH . basename(dirname(__FILE__)) . '/');
-define('PBASE_ADMIN', get_root_url() . 'admin.php?page=plugin-' . basename(dirname(__FILE__)));
-define('PBASE_FS_CACHE', $conf['data_location'].'pbase_cache/');
+define('PBASE_PATH',     PHPWG_PLUGINS_PATH . basename(dirname(__FILE__)) . '/');
+define('PBASE_ADMIN',    get_root_url() . 'admin.php?page=plugin-' . basename(dirname(__FILE__)));
+define('PBASE_FS_CACHE', PHPWG_ROOT_PATH . $conf['data_location'] . 'pbase_cache/');
+
 
 if (defined('IN_ADMIN'))
@@ -31 +32 @@
 }
 
+
 include_once(PBASE_PATH . 'include/ws_functions.inc.php');
 

extensions/pbase2piwigo/maintain.inc.php

@@ -1 +1 @@
 <?php
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
-
-define(
-  'pbase2piwigo_default_config', 
-  serialize(array(
-    ))
-  );
 
 
@@ -13 +7 @@
   global $conf;
   
-  // conf_update_param('pbase2piwigo', pbase2piwigo_default_config);
-  
-  mkdir($conf['data_location'].'pbase_cache/', 0755);
+  mkgetdir(PHPWG_ROOT_PATH . $conf['data_location'] . 'pbase_cache/', MKGETDIR_DEFAULT&~MKGETDIR_DIE_ON_ERROR);
 }
 
@@ -21 +13 @@
 {
   global $conf;
-
-  // if (empty($conf['pbase2piwigo']))
-  // {
-    // conf_update_param('pbase2piwigo', pbase2piwigo_default_config);
-  // }
   
-  if (!file_exists($conf['data_location'].'pbase_cache/'))
+  if (!file_exists(PHPWG_ROOT_PATH . $conf['data_location'] . 'pbase_cache/'))
   {
-    mkdir($conf['data_location'].'pbase_cache/', 0755);
+    mkgetdir(PHPWG_ROOT_PATH . $conf['data_location'] . 'pbase_cache/', MKGETDIR_DEFAULT&~MKGETDIR_DIE_ON_ERROR);
   }
 }
@@ -35 +22 @@
 function plugin_uninstall() 
 {
-  // pwg_query('DELETE FROM `'. CONFIG_TABLE .'` WHERE param = "pbase2piwigo" LIMIT 1;');
+  global $conf;
   
-  rrmdir($conf['data_location'].'pbase_cache/');
+  rrmdir(PHPWG_ROOT_PATH . $conf['data_location'] . 'pbase_cache/');
 }