Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed issue #13606 : Unable to reset manually single asset Dev: hash function use for whole path, then global var set here Dev: generatePath is used path by path Fixed issue #13497 : Editor screen can be loaded without css after save Dev: moving global reset to only this template Dev: less time to generate assets Fixed issue #13596: template assets is not resetted when update config Dev: need to do it if user add a file in TemplateConfiguration_files_* Dev: do it only for global theme (?) Dev: move injectglobalsettings to LSYii_Application Dev: maybe create a now function to set all config ? Dev: Fix installmer and move all set configs part to one function Dev: usage of DB for asset version number Dev: hash solution for indexed pk in DB Dev: oups on phpdoc Dev: same other improvment than other pull request Dev: broken update … remove test line ;)
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,20 +15,6 @@ | |
| */ | ||
| //Ensure script is not run directly, avoid path disclosure | ||
| //if (!isset($homedir) || isset($_REQUEST['$homedir'])) {die("Cannot run this script directly");} | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong. 
Shnoulle
Author
Collaborator
|
||
|
|
||
| /** | ||
| * Returns a global setting | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| <?php if (!defined('BASEPATH')) {exit('No direct script access allowed');} | ||
| /* | ||
| * LimeSurvey | ||
| * Copyright (C) 2018 The LimeSurvey Project Team / Carsten Schmitz | ||
| * All rights reserved. | ||
| * License: GNU/GPL License v3 or later, see LICENSE.php | ||
| * LimeSurvey is free software. This version may have been modified pursuant | ||
| * to the GNU General Public License, and as distributed it includes or | ||
| * is derivative of works licensed under the GNU General Public License or | ||
| * other free or open source software licenses. | ||
| * See COPYRIGHT.php for copyright notices and details. | ||
| * | ||
| */ | ||
|
|
||
| /** | ||
| * Class AssetVersion | ||
| * | ||
| * @property string $hash identifier of path | ||
| * @property string $path for reminder | ||
| * @property integer $version number | ||
| */ | ||
| class AssetVersion extends LSActiveRecord | ||
| { | ||
| /** | ||
| * @inheritdoc | ||
| */ | ||
| public static function model($class = __CLASS__) | ||
| { | ||
| return parent::model($class); | ||
| } | ||
|
|
||
| /** | ||
| * @inheritdoc | ||
| */ | ||
| public function init() | ||
| { | ||
| $this->path = ""; | ||
| $this->version = 0; | ||
| } | ||
| /** @inheritdoc */ | ||
| public function tableName() | ||
| { | ||
| return '{{asset_version}}'; | ||
| } | ||
|
|
||
| /** @inheritdoc */ | ||
| public function primaryKey() | ||
| { | ||
| return array('path'); | ||
| } | ||
|
|
||
| /** @inheritdoc */ | ||
| public function rules() | ||
| { | ||
| return array( | ||
| array('hash', 'required'), | ||
| array('path', 'required'), | ||
| array('version', 'required'), | ||
| array('version', 'numerical', 'integerOnly'=>true), | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * get current assetVersion | ||
| * @param string $path | ||
| * @return integer | ||
| */ | ||
| public static function getAssetVersion($path) | ||
| { | ||
| if(Yii::app()->getConfig('DBVersion') < 349) { | ||
| return 0; | ||
| } | ||
| $hash = hash('sha256', $path); | ||
| $oAssetVersion = self::model()->findByPk($hash); | ||
| if(!$oAssetVersion) { | ||
| return 0; | ||
| } | ||
| return $oAssetVersion->version; | ||
| } | ||
|
|
||
| /** | ||
| * increment (and create if needed) asset version number | ||
| * @param string $path | ||
| * @return integer (current version) | ||
| */ | ||
| public static function incrementAssetVersion($path) | ||
| { | ||
| if(Yii::app()->getConfig('DBVersion') < 349) { | ||
| return 0; | ||
| } | ||
| $hash = hash('sha256', $path); | ||
| $oAssetVersion = self::model()->findByPk($hash); | ||
| if(!$oAssetVersion) { | ||
| $oAssetVersion = new self; | ||
| $oAssetVersion->hash = $hash; | ||
| $oAssetVersion->path = $path; | ||
| $oAssetVersion->version = 0; | ||
| } | ||
| $oAssetVersion->version++; | ||
| $oAssetVersion->save(); // Not need to test : can break rules. DB error can happen ? | ||
| return $oAssetVersion->version; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This basically destroyed the globalsetting and we had to remove it!
Globalsetting were saved but not reloaded because of this.