Changeset 3260:cf9f7abdac2e

Timestamp:

07/01/16 11:54:57 (8 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Add /var directory, closes #236 (until further needs)

Files:

• Makefile (modified) (2 diffs)
• admin/index.php (modified) (1 diff)
• inc/config.php.in (modified) (1 diff)
• inc/dbschema/upgrade.php (modified) (1 diff)
• inc/load_var_file.php (added)
• inc/prepend.php (modified) (1 diff)
• inc/public/prepend.php (modified) (1 diff)

Makefile

@@ -25 +25 @@
             ./$(DC)/features ./$(DC)/travis ./$(DC)/behat.yml.dist ./$(DC)/composer.*
 
-     ## Create cache, db, plugins and public folders
-     mkdir ./$(DC)/cache ./$(DC)/db ./$(DC)/plugins ./$(DC)/public ./$(DC)/themes
+     ## Create cache, var, db, plugins, themes and public folders
+     mkdir ./$(DC)/cache ./$(DC)/var ./$(DC)/db ./$(DC)/plugins ./$(DC)/themes ./$(DC)/public
      cp -p inc/.htaccess ./$(DC)/cache/
+     cp -p inc/.htaccess ./$(DC)/var/
      cp -p inc/.htaccess ./$(DC)/db/
      cp -p inc/.htaccess ./$(DC)/plugins/
@@ -73 +74 @@
      ## Create digest
      cd $(DC) && ( \
-          md5sum `find . -type f -not -path "./inc/digest" -not -path "./cache/*" -not -path "./db/*" -not -path ./CHANGELOG` \
+          md5sum `find . -type f -not -path "./inc/digest" -not -path "./cache/*" -not -path "./var/*" -not -path "./db/*" -not -path ./CHANGELOG` \
           > inc/digests \
      )

admin/index.php

@@ -13 +13 @@
 if (!empty($_GET['pf'])) {
      require dirname(__FILE__).'/../inc/load_plugin_file.php';
+     exit;
+}
+
+if (!empty($_GET['vf'])) {
+     require dirname(__FILE__).'/../inc/load_var_file.php';
      exit;
 }

inc/config.php.in

@@ -52 +52 @@
 define('DC_TPL_CACHE',path::real(dirname(__FILE__).'/..').'/cache');
 
+// Var directory
+define('DC_VAR',path::real(dirname(__FILE__).'/..').'/var');
+
 
 // If you have PATH_INFO issue, uncomment following lines

inc/dbschema/upgrade.php

@@ -544 +544 @@
                @unlink(DC_ROOT.'/'.'admin/js/jsUpload/vendor/jquery.ui.widget.js');
                @rmdir(DC_ROOT.'/'.'admin/js/jsUpload/vendor');
+
+               # Create new var directory
+               @files::makeDir(DC_VAR);
           }
 

inc/prepend.php

@@ -197 +197 @@
      if (strlen(crypt::hmac(DC_MASTER_KEY,DC_VENDOR_NAME,DC_CRYPT_ALGO)) < 40) {
           if (!defined('DC_CONTEXT_ADMIN')) {
-               exit('Site temporarily unavailable');
+               __error('Server error','Site temporarily unavailable');
           } else {
-               exit(DC_CRYPT_ALGO.' cryptographic algorithm configured is not strong enough, please change it.');
-          }
+               __error('Dotclear error',DC_CRYPT_ALGO.' cryptographic algorithm configured is not strong enough, please change it.');
+          }
+          exit;
+     }
+}
+
+if (!defined('DC_VAR')) {
+     define('DC_VAR',path::real(dirname(__FILE__).'/..').'/var');
+}
+// Check existence of var directory
+if (!is_dir(DC_VAR)) {
+     // Try to create it
+     @files::makeDir(DC_VAR);
+     if (!is_dir(DC_VAR)) {
+          // Admin must create it
+          if (!defined('DC_CONTEXT_ADMIN')) {
+               __error('Server error','Site temporarily unavailable');
+          } else {
+               __error('Dotclear error',DC_VAR.' directory does not exist. Please create it.');
+          }
+          exit;
      }
 }

inc/public/prepend.php

@@ -13 +13 @@
 if (!empty($_GET['pf'])) {
      require dirname(__FILE__).'/../load_plugin_file.php';
+     exit;
+}
+
+if (!empty($_GET['vf'])) {
+     require dirname(__FILE__).'/../load_var_file.php';
      exit;
 }