Changeset 3237:f77fcf59c4b7

Timestamp:

03/27/16 11:37:23 (9 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Parents:

3233:88beb660cdd0 (diff), 3236:b55d50fc4301 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 2.9.1

Location:

inc

Files:

• dbschema/upgrade.php (modified) (1 diff)
• prepend.php (modified) (2 diffs)

inc/dbschema/upgrade.php

@@ -540 +540 @@
           }
 
+          if (version_compare($version,'2.10','<='))
+          {
+               @unlink(DC_ROOT.'/'.'admin/js/jsUpload/vendor/jquery.ui.widget.js');
+               @rmdir(DC_ROOT.'/'.'admin/js/jsUpload/vendor');
+          }
+
           $core->setVersion('core',DC_VERSION);
           $core->blogDefaults();

inc/prepend.php

@@ -142 +142 @@
 # Constants
 define('DC_ROOT',path::real(dirname(__FILE__).'/..'));
-define('DC_VERSION','2.9.1');
+define('DC_VERSION','2.10-dev');
 define('DC_DIGESTS',dirname(__FILE__).'/digests');
 define('DC_L10N_ROOT',dirname(__FILE__).'/../locales');
@@ -189 +189 @@
 if (!defined('DC_ALLOW_MULTI_MODULES')) {
      define('DC_ALLOW_MULTI_MODULES',false);
+}
+
+if (!defined('DC_CRYPT_ALGO')) {
+     define('DC_CRYPT_ALGO','sha1');    // As in Dotclear 2.9 and previous
+} else {
+     // Check length of cryptographic algorithm result and exit if less than 40 characters long
+     if (strlen(crypt::hmac(DC_MASTER_KEY,DC_VENDOR_NAME,DC_CRYPT_ALGO)) < 40) {
+          if (!defined('DC_CONTEXT_ADMIN')) {
+               exit('Site temporarily unavailable');
+          } else {
+               exit(DC_CRYPT_ALGO.' cryptographic algorithm configured is not strong enough, please change it.');
+          }
+     }
 }