Changeset 12802 for trunk/admin/include

Timestamp:

Dec 29, 2011, 6:48:16 AM (13 years ago)

Author:

rvelices

Message:

fetaure 2542 replace $conflocal_data_dir with $confdata_location and move combined files and image derivatives from local to _data

File:

• trunk/admin/include/updates.class.php (modified) (6 diffs)

trunk/admin/include/updates.class.php

@@ -317 +317 @@
     include(PHPWG_ROOT_PATH.'admin/include/mysqldump.php');
 
-    $path = $conf['local_data_dir'].'/update';
+    $path = PHPWG_ROOT_PATH.$conf['data_location'].'update';
 
     if (@mkgetdir($path)
@@ -351 +351 @@
 
       @readfile($backupFile);
-      self::deltree($conf['local_data_dir'].'/update');
+      self::deltree(PHPWG_ROOT_PATH.$conf['data_location'].'update');
       exit();
     }
@@ -387 +387 @@
     if (empty($page['errors']))
     {
-      $path = $conf['local_data_dir'].'/update';
+      $path = PHPWG_ROOT_PATH.$conf['data_location'].'update';
       $filename = $path.'/'.$code.'.zip';
       @mkgetdir($path);
@@ -450 +450 @@
           {
             self::process_obsolete_list($obsolete_list);
-            self::deltree($conf['local_data_dir'].'/update');
+            self::deltree(PHPWG_ROOT_PATH.$conf['data_location'].'update');
             invalidate_user_cache(true);
             $template->delete_compiled_templates();
@@ -466 +466 @@
           else
           {
-            file_put_contents($conf['local_data_dir'].'/update/log_error.txt', $error);
-            $relative_path = trim(str_replace(dirname(dirname(dirname(dirname(__FILE__)))), '', $conf['local_data_dir']), '/\\');
+            file_put_contents(PHPWG_ROOT_PATH.$conf['data_location'].'update/log_error.txt', $error);
             array_push(
               $page['errors'],
               sprintf(
                 l10n('An error has occured during extract. Please check files permissions of your piwigo installation.<br><a href="%s">Click here to show log error</a>.'),
-                PHPWG_ROOT_PATH.$relative_path.'/update/log_error.txt'
+                get_root_url().$conf['data_location'].'update/log_error.txt'
               )
             );
@@ -479 +478 @@
         else
         {
-          self::deltree($conf['local_data_dir'].'/update');
+          self::deltree(PHPWG_ROOT_PATH.$conf['data_location'].'update');
           array_push($page['errors'], l10n('An error has occured during upgrade.'));
         }