Changeset 12802

Timestamp:

Dec 29, 2011, 6:48:16 AM (12 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

Location:

trunk

Files:

• admin/include/updates.class.php (modified) (6 diffs)
• feed.php (modified) (1 diff)
• i.php (modified) (1 diff)
• include/common.inc.php (modified) (1 diff)
• include/config_default.inc.php (modified) (2 diffs)
• include/constants.php (modified) (1 diff)
• include/dblayer/functions_pdo-sqlite.inc.php (modified) (1 diff)
• include/dblayer/functions_sqlite.inc.php (modified) (1 diff)
• include/functions_mail.inc.php (modified) (1 diff)
• include/template.class.php (modified) (8 diffs)
• install.php (modified) (2 diffs)
• install/db/112-database.php (added)
• install/db/94-database.php (modified) (2 diffs)
• local/combined (deleted)

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.'));
         }

trunk/feed.php

@@ -194 +194 @@
 }
 
-$fileName= $conf['local_data_dir'].'/tmp';
+$fileName= PHPWG_ROOT_PATH.$conf['data_location'].'tmp';
 mkgetdir($fileName); // just in case
 $fileName.='/feed.xml';

trunk/i.php

@@ -27 +27 @@
 
 defined('PWG_LOCAL_DIR') or define('PWG_LOCAL_DIR', 'local/');
-defined('PWG_DERIVATIVE_DIR') or define('PWG_DERIVATIVE_DIR', PWG_LOCAL_DIR.'i/');
+defined('PWG_DERIVATIVE_DIR') or define('PWG_DERIVATIVE_DIR', $conf['data_location'].'i/');
 
 function trigger_action() {}

trunk/include/common.inc.php

@@ -89 +89 @@
 include(PHPWG_ROOT_PATH . 'include/config_default.inc.php');
 @include(PHPWG_ROOT_PATH. 'local/config/config.inc.php');
+if (!isset($conf['local_data_dir'])) $conf['local_data_dir'] = realpath(PHPWG_ROOT_PATH.$conf['data_location']); // temp 2.4 for backward compatibility
+
 defined('PWG_LOCAL_DIR') or define('PWG_LOCAL_DIR', 'local/');
 

trunk/include/config_default.inc.php

@@ -720 +720 @@
 $conf['light_slideshow'] = true;
 
-// the local data directory is used to store data such as compiled templates
-// or other plugin variables etc
-$conf['local_data_dir'] = dirname(dirname(__FILE__)).'/_data';
+// the local data directory is used to store data such as compiled templates,
+// plugin variables, combined css/javascript or resized images. Beware of
+// mandatory trailing slash.
+$conf['data_location'] = '_data/';
 
 // where should the API/UploadForm add photos? This path must be relative to
@@ -757 +758 @@
 $conf['derivative_url_style']=0;
 
-$conf['chmod_value']=0777;
-
+$conf['chmod_value']= substr_compare(PHP_SAPI, 'apa', 0, 3)==0 ? 0777 : 0755;
 ?>

trunk/include/constants.php

@@ -28 +28 @@
 
 define('PHPWG_THEMES_PATH', $conf['themes_dir'].'/');
-defined('PWG_COMBINED_DIR') or define('PWG_COMBINED_DIR', PWG_LOCAL_DIR.'combined/');
-defined('PWG_DERIVATIVE_DIR') or define('PWG_DERIVATIVE_DIR', PWG_LOCAL_DIR.'i/');
+defined('PWG_COMBINED_DIR') or define('PWG_COMBINED_DIR', $conf['data_location'].'combined/');
+defined('PWG_DERIVATIVE_DIR') or define('PWG_DERIVATIVE_DIR', $conf['data_location'].'i/');
 
 // Required versions

trunk/include/dblayer/functions_pdo-sqlite.inc.php

@@ -38 +38 @@
   global $conf;
 
-  $db_file = sprintf('sqlite:%s/%s.db', $conf['local_data_dir'], $database);
+  $db_file = sprintf('sqlite:%s/%s.db', PHPWG_ROOT_PATH.$conf['data_location'], $database);
 
   $link = new PDO($db_file);

trunk/include/dblayer/functions_sqlite.inc.php

@@ -38 +38 @@
   global $conf;
 
-  $db_file = sprintf('%s/%s.db', $conf['local_data_dir'], $database);
+  $db_file = sprintf('%s/%s.db', PHPWG_ROOT_PATH.$conf['data_location'], $database);
 
   if (script_basename()=='install') 

trunk/include/functions_mail.inc.php

@@ -792 +792 @@
 {
     global $conf, $user, $lang_info;
-    $dir = $conf['local_data_dir'].'/tmp';
+    $dir = PHPWG_ROOT_PATH.$conf['data_location'].'tmp';
     if ( mkgetdir( $dir,  MKGETDIR_DEFAULT&~MKGETDIR_DIE_ON_ERROR) )
     {

trunk/include/template.class.php

@@ -60 +60 @@
     $this->smarty->force_compile = $conf['template_force_compile'];
 
-    if (!isset($conf['local_data_dir_checked']))
-    {
-      mkgetdir($conf['local_data_dir'], MKGETDIR_DEFAULT&~MKGETDIR_DIE_ON_ERROR);
-      if (!is_writable($conf['local_data_dir']))
+    if (!isset($conf['data_dir_checked']))
+    {
+      $dir = PHPWG_ROOT_PATH.$conf['data_location'];
+      mkgetdir($dir, MKGETDIR_DEFAULT&~MKGETDIR_DIE_ON_ERROR);
+      if (!is_writable($dir))
       {
         load_language('admin.lang');
@@ -69 +70 @@
           sprintf(
             l10n('Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'),
-            basename($conf['local_data_dir'])
+            $conf['data_location']
             ),
           l10n('an error happened'),
@@ -76 +77 @@
       }
       if (function_exists('pwg_query')) {
-        conf_update_param('local_data_dir_checked', 'true');
+        conf_update_param('data_dir_checked', 1);
       }
     }
@@ -82 +83 @@
     if (!isset($conf['combined_dir_checked']))
     {
-      mkgetdir(PWG_COMBINED_DIR, MKGETDIR_DEFAULT&~MKGETDIR_DIE_ON_ERROR);
-      if (!is_writable(PWG_COMBINED_DIR))
+      $dir = PHPWG_ROOT_PATH.PWG_COMBINED_DIR;
+      mkgetdir($dir, MKGETDIR_DEFAULT&~MKGETDIR_DIE_ON_ERROR);
+      if (!is_writable($dir))
       {
         load_language('admin.lang');
@@ -96 +98 @@
       }
       if (function_exists('pwg_query')) {
-        conf_update_param('combined_dir_checked', 'true');
-      }
-    }
-
-
-    $compile_dir = $conf['local_data_dir'].'/templates_c';
+        conf_update_param('combined_dir_checked', 1);
+      }
+    }
+
+
+    $compile_dir = PHPWG_ROOT_PATH.$conf['data_location'].'templates_c';
     mkgetdir( $compile_dir );
 
@@ -1182 +1184 @@
 final class FileCombiner
 {
-  const OUT_SUB_DIR = PWG_COMBINED_DIR;
   private $type; // js or css
   private $files = array();
@@ -1194 +1195 @@
   static function clear_combined_files()
   {
-    $dir = opendir(PHPWG_ROOT_PATH.self::OUT_SUB_DIR);
+    $dir = opendir(PHPWG_ROOT_PATH.PWG_COMBINED_DIR);
     while ($file = readdir($dir))
     {
       if ( get_extension($file)=='js' || get_extension($file)=='css')
-        unlink(PHPWG_ROOT_PATH.self::OUT_SUB_DIR.$file);
+        unlink(PHPWG_ROOT_PATH.PWG_COMBINED_DIR.$file);
     }
     closedir($dir);
@@ -1243 +1244 @@
 
     $file = base_convert(crc32($key),10,36);
-    $file = self::OUT_SUB_DIR . $file . '.' . $this->type;
+    $file = PWG_COMBINED_DIR . $file . '.' . $this->type;
 
     $exists = file_exists( PHPWG_ROOT_PATH . $file );

trunk/install.php

@@ -111 +111 @@
 
 // download database config file if exists
-if (!empty($_GET['dl']) && file_exists($conf['local_data_dir'].'/pwg_'.$_GET['dl']))
-{
-  $filename = $conf['local_data_dir'].'/pwg_'.$_GET['dl'];
+if (!empty($_GET['dl']) && file_exists(PHPWG_ROOT_PATH.$conf['data_location'].'pwg_'.$_GET['dl']))
+{
+  $filename = PHPWG_ROOT_PATH.$conf['data_location'].'pwg_'.$_GET['dl'];
   header('Cache-Control: no-cache, must-revalidate');
   header('Pragma: no-cache');
@@ -282 +282 @@
     {
       $tmp_filename = md5(uniqid(time()));
-      $fh = @fopen( $conf['local_data_dir'] . '/pwg_' . $tmp_filename, 'w' );
+      $fh = @fopen( PHPWG_ROOT_PATH.$conf['data_location'] . 'pwg_' . $tmp_filename, 'w' );
       @fputs($fh, $file_content, strlen($file_content));
       @fclose($fh);

trunk/install/db/94-database.php

@@ -61 +61 @@
 
 // save configuration for a future use by the Community plugin
-$backup_filepath = $conf['local_data_dir'].'/plugins/core_user_upload_to_community.php';
+$backup_filepath = PHPWG_ROOT_PATH.$conf['data_location'].'plugins/core_user_upload_to_community.php';
 $save_conf = true;
 if (is_dir(dirname($backup_filepath)))
@@ -70 +70 @@
   }
 }
-elseif (!is_writable($conf['local_data_dir']))
+elseif (!is_writable( PHPWG_ROOT_PATH.$conf['data_location'] ))
 {
   $save_conf = false;