Commit Graph

56 Commits

Author SHA1 Message Date
Luke Towers 47b2aa0f15
Fix safeMode triggering unnecessarily
Fixes a long standing issue where when safe mode is enabled and the line endings present in the templates differed from the line endings used by the user's browser it would cause safe mode to prevent saving any changes (even when those changes did not include real changes to the code property) because the user's browser would "helpfully" change the original line endings to the line endings of the browser before sending it back to the server.
2021-01-15 14:54:31 -06:00
Ben Thomson 5d3d4ad0b2
Merge branch 'develop' into wip/laravel-5.9 2020-01-18 21:00:40 +08:00
Marc Jauvin 864816f7f2 Make CMS object code editor read-only in safe mode (#4769)
Adds a dismissable message to the CMS object code editor indicating that the PHP code section of a CMS object cannot be edited when `cms.enableSafeMode` is `true` (or when debugging is disabled if `null`).

Credit to @mjauvin.
2019-12-09 21:05:50 +08:00
Ben Thomson 7e3136564f
Merge branch 'develop' into wip/laravel-5.9 2019-11-21 23:18:25 +08:00
Ben Thomson a59d3b83eb Code quality clean up (#4449)
Credit to @bennothommo
2019-07-18 08:50:37 -06:00
Luke Towers 1aff1e0a1e Changed calls to the Cache to use DateTime instances instead of integers representing minutes as 5.8 changed integers into meaning seconds instead. 2019-06-12 02:33:26 -06:00
Luke Towers c86bec7f08 Replace deprecated Twig class references, refs: #4209. 2019-03-27 13:15:17 -06:00
Nathan van der Werf 77b6f07291 Modify conditions to use elvis operators 2018-08-15 18:53:11 +02:00
Nathan van der Werf 3a918ad200 Remove "null" assignments 2018-08-15 18:33:24 +02:00
viamage 7ffb79a5fd Fix typo (#3326)
Fixed typo, added CmsCompoundObject::getComponentProperties method test. Credit to @viamage
2017-12-27 13:31:34 -06:00
Samuel Georges 5555b98799 Fixes deprecated Twig API
Refs https://github.com/kriswallsmith/assetic/pull/819
2017-07-26 22:16:52 +10:00
Quezler cc17b679f1 Code dusting (#2826)
Code cleaning according to PSR-2 w/ exemptions (mostly dust).
2017-04-24 21:38:19 +10:00
Samuel Georges 51ac144049 Moves CMS components to directory where they belong
Improve inline docs
2017-03-16 07:00:39 +11:00
Samuel Georges c704ddcdf0 md5 is faster than crc32 in PHP apparently
Reference https://3v4l.org/2MAUr
2017-02-23 07:40:04 +11:00
Samuel Georges 462c9cd4e8 Introduce theme logging + log settings
CmsObject changes can now be tracked (disabled by default)
Request logging is now disabled by default (security vector)
2017-02-08 05:44:04 +11:00
Samuel Georges a5acbc7bff Add before/after events for component::onRun 2016-04-27 05:44:32 +10:00
Samuel Georges 87a4de40de Address serialize/unserialize issues
This will require a cache clear for the combiner
Ref https://davidwalsh.name/php-serialize-unserialize-issues
2016-04-16 08:22:31 +10:00
Pásztor Gábor 40269cb6e2 Clean up 2016-03-29 14:55:25 +02:00
Samuel Georges 3cac52afd4 Default is null, not false 2016-03-25 10:42:14 +11:00
Samuel Georges f1aa720086 Create a safe mode to disable code field in the CMS
Fixes #1756
2016-03-25 10:05:04 +11:00
Samuel Georges fad028bc40 Add local cmsObject.fillViewBagArray event
Tidy up some inline docs
2016-03-19 13:22:08 +11:00
Samuel Georges 792b7fed2a Fixes CmsException on bad INI
No need for Cms SectionParser.php anymore
2016-03-19 10:30:42 +11:00
Samuel Georges 045d186960 Finishing porting old functionality
- Add validation to Cms Objects
- Add local viewBag logic
- Implement new initCacheItem process
- Implement getter for viewBag/settings properties
2016-03-17 19:25:50 +11:00
Samuel Georges 24a620e890 Convert CmsObject and CmsCompoundObject to use Halcyon
getFullPath -> getFilePath
2016-03-12 15:32:16 +11:00
Samuel Georges 91d3d4dbde Swap FileHelper methods for new Ini parser 2015-10-03 07:30:11 +10:00
Samuel Georges 0f215785f3 Rollback the idea of using $visible on CmsCompoundObjects
This feature should be reserved for serializing the object (in future maybe) rather than defining visible properties, these should be relaxed.
2015-07-25 11:07:36 +10:00
Samuel Georges 8c6a58981e Roll back the changes from #852 in the name of KISS
The page vars are just that, view variables, if used incorrectly (relaxed) they can leech out
2015-06-17 18:50:51 +10:00
Samuel Georges 9e6d0a660c Simplify visibleViewBag + visibleSettings
hidden -> is_hidden
2015-06-05 17:24:27 +10:00
Samuel Georges dbba9349ab Adds a method for defining which settings and viewBag properties should be visible as native ones 2015-06-04 19:16:35 +10:00
Samuel Georges 297ac65ce6 Alternative fix to #1050 2015-04-11 10:59:27 +10:00
Łukasz Biały 4212386b37 fixes iteration overriding argument name, caused bug where properties of another component where returned if cache was empty 2015-04-07 13:12:20 +02:00
Samuel Georges a324f01678 CmsCompoundObject::hasComponent() now resolves registered codes for comparison 2015-03-07 20:28:17 +11:00
Samuel Georges 4c29c5080d Clean up, get front and backends operational again 2015-02-05 19:47:20 +11:00
Samuel Georges beb818efa5 Merge branch 'develop' into laravel5
Conflicts:
	modules/cms/classes/CmsCompoundObject.php
	modules/system/ServiceProvider.php
2015-02-04 19:35:55 +11:00
Samuel Georges ab128301e8 Minor 2015-02-02 00:24:05 +11:00
Samuel Georges b1b700368f Radical reorg of some classes 2015-01-28 11:49:54 +11:00
alekseybobkov 802f96f10e Refactoring of the view bag support code 2014-11-03 20:50:18 -08:00
Sam Georges c83797231d Subsequent expressions are on a new line (see developer guide > PSR exceptions) 2014-11-01 12:00:45 +11:00
Sam Georges 4ac6469200 Original data does not exist for new objects 2014-10-23 08:11:11 +11:00
Stefan Talen 509e7d2a12 Fixing issues with files in modules/cms 2014-10-18 12:03:48 +02:00
Stefan Talen 347dff7e75 Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2
Conflicts:
	modules/backend/behaviors/RelationController.php
	modules/backend/classes/WidgetManager.php
	modules/cms/classes/CmsCompoundObject.php
	modules/cms/twig/Extension.php
	modules/cms/twig/PlaceholderNode.php
	modules/cms/widgets/TemplateList.php
2014-10-18 11:07:17 +02:00
alekseybobkov 12175b29db Multiple updates in the back-end widgets and styles 2014-10-16 20:47:23 -07:00
Stefan Talen 230a7377cf Updating files in modules/cms 2014-10-11 14:33:40 +02:00
Stefan Talen 61cf1ad710 Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2
Conflicts:
	modules/backend/behaviors/FormController.php
	modules/backend/classes/AuthManager.php
	modules/backend/lang/fa/lang.php
	modules/backend/widgets/Form.php
	modules/cms/classes/CmsCompoundObject.php
	modules/cms/classes/ComponentHelpers.php
	modules/cms/formwidgets/Components.php
2014-10-11 11:58:20 +02:00
alekseybobkov 0b8af1f505 Merge branch 'develop' into static-pages-support 2014-10-10 22:27:01 -07:00
alekseybobkov 8339323870 Fixes the bug where finding a component by class name is not possible if the component has an alias 2014-10-10 21:20:46 -07:00
Stefan Talen 202e8869b1 Updating modules/cms/classes 2014-10-11 01:22:03 +02:00
alekseybobkov 26e8d5bda5 Minor updates in the back-end UI 2014-10-05 22:21:03 -07:00
alekseybobkov 6b42055184 Fixes in the rich editor, improved the content block rendering code, minor fixes in the popover and form styling. 2014-09-27 23:28:38 -07:00
alekseybobkov 9f4fa49068 Fixes a bug where saving a content block from the CMS back-end creates an empty [components] section in the file settings area. 2014-09-06 21:52:42 -07:00