Skip to content

Commit 1618a56

Browse files
committed
Revert "restoring 3.0.1"
This reverts commit df5b038.
1 parent 518e654 commit 1618a56

File tree

949 files changed

+3359
-2831
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

949 files changed

+3359
-2831
lines changed

CHANGELOG.md

+50-96
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,50 @@
1-
* Removed references to fixPagination JS function (search.js, media_modal.ctp element)
2-
* Changed core adaptcms version to 3.0.1
3-
* Updated to cakephp 2.3.8
4-
* Changed appcontroller component/helpers to load from configure, added configuration file and updated installer to update the file instead of the json stuff.
5-
* Fixed save draft bug in articles, media modal js overlap.
6-
* Active and last_run field added for cron, along with updating permissions for the cron index and adding cron admin_test permission. Last run is updated whenever a cron runs fine. If a cron is unable to run, it sets itself to inactive and won't run unless someone runs a test and it works now or the active flag is set. A test method is also in. Fixed on the cron admin index dropdowns and text updated.
7-
* Added vendor for parsing markdown, used in available data for templates and possibly other things such as install docs.
8-
* Documentation functionality for templates. Looks under view_docs folder for specified file. (ex. /app/View_Docs/Articles/view.md - will load into tab the contents of this) Applied to Templates (edit) and Pages (add/edit).
9-
* Fixed bug with theme refresh. (added blank template if array was empty - no new templates)
10-
* Did template documentation on articles (view/tag), categories (view), pages (home/others), layouts (default)
11-
* Updated install sql to not set default time for created/modified
12-
* Updated all appropriate views to not render created/modified hidden input.
13-
* Admin > Templates > List of Themes :: fixed
14-
* Admin > Templates > No uninstall link if theme has no API data :: fixed
15-
* Upgrade Plugin/Upgrade Theme now looks for an array of versions inside the upgrade key in their respective json files. Then inside that you can specify text and/or sql files. This allows upgrading of multiple versions, easily. Docs on adaptcms.com also updated. (not pushed yet)
16-
* sluggable behavior and applied to all applicable models
17-
* comments cleaned up in controllers
18-
* paginate deprecated - replaced with Paginator->settings (for defining conditions) and Paginator->paginate('model') in place of paginate('model')
19-
* defining properties in comments, defined variables in appcontroller
20-
* plugin settings check if value is more than 20 characters and has a space in it, shows textbox
21-
* test fixtures for permissions, users, start on links controller unit test
22-
* plugin > links > submit link (permissions, action, view, sql and testing)
23-
* plugin > links > model validation updated
24-
* plugin > analytics > component caching issues fixed
25-
* plugin > analytics > tracking status check done
26-
* Minor bug fixes, UsersController
27-
* profile > articles (says newest, but was ordering by default id asc, changed to created desc)
28-
* converted default style into bootstrap 3.0
29-
* created united theme
30-
* polls list (permissions, action, view)
31-
* updated polls model and refactored 'canVote' and poll model
32-
* created helper 'View', first function is 'pluginExists' for an easy way to see if a plugin exists and is installed.
33-
* refactored relations for polls model, renamed fields to remove 'plugin_' prefix
34-
* refactored afterFind for polls model, so it calculates percentage in there instead of view
35-
* updated admin css and updated left menu to get it working with new accordion in bootstrap (now 'collapse')
36-
* polls admin edit poll - vote breakdown/stats
37-
* plugin > support tickets > fixed bug with ticket model
38-
* articles fixed route (so if only slug applied, will work - not recommended for duplicates)
39-
* fixed links on main admin page for articles/users
40-
* admin > comments > index/edit/delete/restore done
41-
* comments - author name, email + website fields added (already had them in mysql). session is set if you use them/update them also.
42-
* fixed components plugin install bug
43-
* created sample plugin, repo and added to api website
44-
* fixed bug on theme install, field_type was not updated and broke gaming theme
45-
* updated categories view to match homepage
46-
* created sample theme, repo and added to api website
47-
* font awesome upgraded from 3.1 - 3.2.1
48-
* article admin add/edit, if image field, modal images sorted by created descending
49-
* admin > files > import folder
50-
* admin > files > edit - bug fixed in js
51-
* admin > files > upload - changed thumb size to match media frontend, 390 x 230added a zoom crop for the top left
52-
* admin > files > upload - added libraries when uploading file
53-
* media > index - now shows newest file in library
54-
* admin > files > upload - for adding folder, multiple, single or edit :: can adjust zoom level for thumbnail
55-
* view comment - edit/delete link and icons, updated permissions so it can do permission check on actions
56-
* custom fields for comments - affects article view page, comment post and comment edit in admin
57-
* cut user profile page queries by a good 20-30%
58-
* update custom fields for users - uses field types
59-
* updated field types - file (ouputs full url) and added multi-dropdown (does list - ex. PC, 360, Wii)
60-
* admin > fields > import - bug fixed with field type/field options populating
61-
* Ajax return element helper in appcontroller
62-
* removed ajax_order method in fields controller, replacing with no ajax and a model function to update order
63-
* fixed description popover on field order
64-
* delete behavior sets model order to created descending if not set
65-
* removed slug method from appcontroller (method exists in appmodel and behavior)
66-
* When editing role, permission categories display plugin name if applicable
67-
* CakePHP upgraded to 2.4.0
68-
* Model > Roles - Set dependent to true on users/permissions, so associated records are removed upon deletion of a role.
69-
* Model > Users - Fixed relationship with message, will delete messages related to deleted user record correctly.
70-
* Admin > Users > Change User - Refactored to use new ajax response method, switched name to have admin_ prefix, cleaned up/refactoring and fixed some bugs with the JS.
71-
* Users > Ajax Check User - Refactored with new ajax response method.
72-
* Users > Ajax Quick Search - Refactored with new ajax response method, added permissions.
73-
* Blocks > Admin Ajax Get Model - Refactored with new ajax response method.
74-
* Comments > AJAX Post - Refactored with new ajax response method.
75-
* Delete behavior part 1 - articles, comments, pages, fields, articles, blocks, categories, users, roles
76-
* Delete behavior part 2 - cron, files, field types, media, menus, forum categories (adaptbb plugin), forums (adaptbb plugin), google maps (plugin), links (plugin), ticket categories/tickets (support ticket plugin), settings/setting values, templates, themes
77-
* More Ajax Response update - adaptbb forum categories/posts/forums, polls ajax actions, template actions
78-
* Updated AJAX Order for fields, adaptbb forums, adaptbb forum categories - removed AJAX functionality. (unnecessary)
79-
* Plugin > Links > Model Validation :: Fixed validation so image url doesn't have to be entered in.
80-
* Admin > Themes - Add :: Fixed a few errors when adding a theme.
81-
* Admin > Themes - Actions :: Fixed bug when after adding a theme, didn't show edit/delete. (showed uninstall and edit)
82-
* Model > Templates :: getFolders function, was returning files on first level - this is fixed.
83-
* Admin > Templates - Add/Edit :: If no label entered, title (besides extension) is used.
84-
* Admin > Templates - Add/Edit :: If .ctp is not entered, is automatically added to end of template title.
85-
* Admin > Templates - Index :: Update view for templates/themes so you can see trash items for both at same time.
86-
* Admin > Notify user of impending session expire, open link to prolong without losing data. (using noty jquery
87-
* Core - Changed sessions from php to cake (this enabled continued sessions...if session time is 30 minutes long and you go to a page at 6:00 pm and 6:15 pm, your session won't expire until 6:45 pm instead of 6:30 pm)
88-
* Users > Login :: Redirect to homepage with flash error if you are already logged in.
89-
* Admin > Notify Login Ajax :: Started on ajax that fires off request to login and if it doesn't find a login form, fires off notify msg saying access denied. Otherwise, it shows login form. If you login successfully, success message shown and a new token is fetched for the field you are on. (done)
90-
* Installer updated
91-
* tinyMCE upgraded from 4.0.1 to 4.0.6
92-
* jquery-ui upgraded from 1.9.2 to 1.10.3
93-
* fancybox upgraded from 2.1.3 to 2.1.5
94-
* Media > View :: Updated fancybox with new look, added thumbnail support to popup. (looks better overall)
95-
* Codemirror upgraded from 3.0.2 to 3.16. Used their compressor so 238kb down to 130kb.
96-
* Appletouch icon added
1+
* Bug :: Admin > Categories > Edit > Related Fields - Not showing field type.
2+
* Bug :: Admin > Templates > Default Theme - Setting ID instead of name, fixed.
3+
* New Template Engine
4+
* Template Re-Organization
5+
* Search re-code in Angular
6+
* Elements (most) switched to new template engine
7+
* Finished plugin frontend templates/elements transferred to new engine
8+
* Routes List in Admin Tools
9+
* Admin Ajax Related add changed to update. (handles adding and removing single related articles) JS side of things updated so as soon as you click on one or click to delete one, the article is updated.
10+
* Added disabled status for plugin index - easier to see what are active and what aren’t based on name of plugin.
11+
* Refresh Themes callback after installing/un-installing plugin.
12+
* New Plugin > Contact Form
13+
* New Plugin > Article Ratings
14+
* Bug :: Plugin permissions > not saving correctly
15+
* Bug :: Plugin - Polls > Can vote method should not include user_id where condition if user is not logged in.
16+
* Bugs :: Misc admin add/edit block fixes, removed old code.
17+
* Blocks > Order By Options > New functionality to have a “getBlockOrderByOptions” in your model and return a key/value pair of order by options.
18+
* Bug :: Get Block Data - needed proper setter/getters, was running too many queries.
19+
* Plugin > Article Ratings - Added “Your Rating” functionality.
20+
* Plugin > Polls - Start/end date.
21+
* Plugin > Polls - Attach to article. Now inserted in main article data on article view page. (just call $article[‘Polls’] and loop through the polls or if there is one poll attached, call - {{ article['Polls'][0] }} to render the form/results)
22+
* Model > Article > Bug Fix
23+
* Search > XSS Security Bug fixed - http://packetstormsecurity.com/files/123585/adaptcms301-xss.txt
24+
* View Docs > Renamed *.md to glob.md, due to windows issue.
25+
* Tools > OneCMS Converter
26+
* Upgrade After Method option (3.0.2 moves non-theme templates)
27+
* CakePHP, TinyMCE, CodeMirror, jQuery BlockUI, html5, jQuery Smooth Scroll updated to newest versions.
28+
* Upgrade After Method for 3.0.2 - now moves files/folders for installed/non-installed themes as well.
29+
* Bug :: 5 min/2min timer - when i click on 5 min timer notice, it should also reset 2 min timer.
30+
* Model > Behavior > Delete Behavior - Updated beforeFind to exclude Comment model when deleting, was throwing error.
31+
* Admin Bug Hunting - Categories, Fields, Articles, Comments, Pages, Blocks
32+
* Frontend Bug Hunting - Edit Profile, View Profile, Homepage, Category View, Article View, Comment Post/View, View Page
33+
* Caching Views - The cached views from cake are not rendering the tags from adaptcmsview - added cachedispatcher and cachehelper to get block data and parse for tags, before writing cache.
34+
* Events - Bug fixed in ArticleRatings/Polls, have to make sure plugin is loaded before attaching event.
35+
* Templates - Fixed issue when deleting a template for a theme. (path was wrong)
36+
* Uninstall Plugin - Templates are removed now upon uninstalling a plugin.
37+
* Bug Fix :: Flash message response when refreshing theme or updating default.
38+
* Fix :: Adjusted redirect, model update.
39+
* Fix :: When uninstalling theme, it checks to see if the current theme is the same and if so, re-sets back to default.
40+
* Theme Update :: Gaming layout updated to new template system/routing.
41+
* BUG FIX :: Flash messages - not appearing in admin with cache enabled.
42+
* BUG FIX :: Flash messages not appearing on frontend, nocache areas being cached. (session flash problem was strictly with logout, fixed...fixed view helper not getting routes)
43+
* DONE :: Frontend Bug Hunting - Registration/login/logout
44+
* DONE :: Plugin Bug Hunting (add/edit/delete/view asset, install/uninstall all plugins, settings, permissions)
45+
* DONE :: Theme Bug Hunting -
46+
* DONE :: Admin Bug Hunting - Templates (mess around with adding/editing templates to default theme and custom theme), Themes (add/edit/delete theme files for custom and created themes)
47+
* DONE :: Documentation - Plugins (creating a plugin, advanced configuration, basic management), Roles, Users, System (dev setting in core - miscellaneous, events)
48+
* DONE :: Theme Bug Hunting - Test installation/uninstall of custom themes and any areas they affect, are working correctly. (already know templates are deleted upon uninstall correctly)
49+
* DONE :: View Docs - Update with new template system tags.
50+
* Bug :: Major caching issue, block data was being cached (for everyone).

UPGRADE.md

+43-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,44 @@
1-
3.0 - 3.0.1
1+
3.0.1 - 3.0.2
2+
-----------
3+
4+
####Step 1
5+
6+
After you are logged in as an admin, access the installer at <strong>http://yoursite.com/install</strong> and upload the following directories/files to your site and overwriting what is on your sever currently:
7+
8+
* lib/
9+
* vendors/
10+
* app/Config/routes.php
11+
* app/Config/core.php
12+
* app/Config/configuration.php
13+
* app/Config/bootstrap.php
14+
* app/Routing/
15+
* app/Model/
16+
* app/Controller/
17+
* app/View_Docs/
18+
* app/webroot/installer/
19+
* app/webroot/js/
20+
* app/webroot/css/
21+
* app/webroot/font/
22+
* app/webroot/img/
23+
* app/webroot/libraries/
24+
* app/View/Elements/
25+
* app/View/Helper/
26+
* app/View/Admin/
27+
* app/View/Frontend/
28+
29+
At this point you can also update your plugins that reside in <strong>app/Plugin</strong> and <strong>app/Old_Plugins</strong>. Make sure to bring in the contents of each plugins
30+
folder, except the <strong>Config</strong> folder, so that your configuration settings (if the plugin has them) are not reset. You can also overwrite <strong>app/View/Themed</strong> and <strong>app/View/Old_Themed</strong> if you haven't made changes to your themes.
31+
32+
Then refresh the install page and click on "Upgrade from 3.0.1".
33+
34+
####Step 2
35+
36+
After SQL is inserted, the CMS will move files and folders over - including installed and non-installed themes. If you are running a theme, please check the documentation for the new folder/file structure - otherwise, the default theme will be automatically used. That's it! Please keep in mind a few template changing notes:
37+
38+
* Your layout is now located at - app/View/Frontend/layout.ctp
39+
* For category view templates, the variable $article for a list of articles has changed to $articles
40+
41+
3.0 - 3.0.2
242
-----------
343

444
####Step 1
@@ -12,10 +52,10 @@ your server currently:
1252

1353
* lib/
1454
* vendors/
15-
* app/View_Docs
1655
* app/Config/routes.php
1756
* app/Config/configuration.php
1857
* app/Model/
58+
* app/Controller/
1959
* app/View_Docs/
2060
* app/webroot/installer/
2161
* app/webroot/js/
@@ -24,7 +64,6 @@ your server currently:
2464
* app/webroot/img/
2565
* app/webroot/folder_upload/
2666
* app/webroot/libraries/
27-
* app/Controller/ (except - AppController.php)
2867

2968
####Step 3
3069

@@ -39,7 +78,6 @@ At this point you can also update your plugins that reside in <strong>app/Plugin
3978
folder, except the <strong>Config</strong> folder, so that your configuration settings (if the plugin has them) are not reset. Then from the folders above, bring only the
4079
following files:
4180

42-
* app/Controller/AppController.php
4381
* app/View/Articles/admin_index.ctp
4482
* app/View/Articles/admin_add.ctp
4583
* app/View/Articles/admin_edit.ctp
@@ -57,4 +95,4 @@ following files:
5795
If you see an Internal Error when visiting your homepage, that means that you have the Polls and/or the Links plugin installed and they need to be updated. Go into the admin and click on
5896
<strong>Manage Plugins</strong>, then click on Upgrade from the actions dropdown by Polls and Links. Run through the upgrader for both and you should be all set.
5997

60-
Enjoy!
98+
Now follow the steps above.

lib/Cake/Cache/Cache.php

100755100644
+1-1
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ public static function settings($name = 'default') {
533533
* @throws CacheException
534534
*/
535535
public static function groupConfigs($group = null) {
536-
if ($group == null) {
536+
if ($group === null) {
537537
return self::$_groups;
538538
}
539539
if (isset(self::$_groups[$group])) {

lib/Cake/Cache/CacheEngine.php

100755100644
File mode changed.

lib/Cake/Cache/Engine/ApcEngine.php

100755100644
-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
/**
33
* APC storage engine for cache.
44
*
5-
*
6-
* PHP 5
7-
*
85
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
96
* Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
107
*

lib/Cake/Cache/Engine/FileEngine.php

100755100644
+19-8
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
*
77
* You can configure a FileEngine cache, using Cache::config()
88
*
9-
* PHP 5
10-
*
119
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
1210
* Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
1311
*
@@ -44,7 +42,7 @@ class FileEngine extends CacheEngine {
4442
*
4543
* - path = absolute path to cache directory, default => CACHE
4644
* - prefix = string prefix for filename, default => cake_
47-
* - lock = enable file locking on write, default => false
45+
* - lock = enable file locking on write, default => true
4846
* - serialize = serialize the data, default => true
4947
*
5048
* @var array
@@ -210,7 +208,10 @@ public function delete($key) {
210208
}
211209
$path = $this->_File->getRealPath();
212210
$this->_File = null;
213-
return unlink($path);
211+
212+
//@codingStandardsIgnoreStart
213+
return @unlink($path);
214+
//@codingStandardsIgnoreEnd
214215
}
215216

216217
/**
@@ -289,9 +290,12 @@ protected function _clearDirectory($path, $now, $threshold) {
289290
}
290291
}
291292
if ($file->isFile()) {
292-
$_path = $file->getRealPath();
293+
$filePath = $file->getRealPath();
293294
$file = null;
294-
unlink($_path);
295+
296+
//@codingStandardsIgnoreStart
297+
@unlink($filePath);
298+
//@codingStandardsIgnoreEnd
295299
}
296300
}
297301
}
@@ -409,9 +413,16 @@ public function clearGroup($group) {
409413
$contents = new RecursiveIteratorIterator($directoryIterator, RecursiveIteratorIterator::CHILD_FIRST);
410414
foreach ($contents as $object) {
411415
$containsGroup = strpos($object->getPathName(), DS . $group . DS) !== false;
412-
$hasPrefix = strpos($object->getBaseName(), $this->settings['prefix']) === 0;
416+
$hasPrefix = true;
417+
if (strlen($this->settings['prefix']) !== 0) {
418+
$hasPrefix = strpos($object->getBaseName(), $this->settings['prefix']) === 0;
419+
}
413420
if ($object->isFile() && $containsGroup && $hasPrefix) {
414-
unlink($object->getPathName());
421+
$path = $object->getPathName();
422+
$object = null;
423+
//@codingStandardsIgnoreStart
424+
@unlink($path);
425+
//@codingStandardsIgnoreEnd
415426
}
416427
}
417428
return true;

lib/Cake/Cache/Engine/MemcacheEngine.php

100755100644
-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
/**
33
* Memcache storage engine for cache
44
*
5-
*
6-
* PHP 5
7-
*
85
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
96
* Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
107
*

lib/Cake/Cache/Engine/RedisEngine.php

100755100644
+1-6
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
/**
33
* Redis storage engine for cache
44
*
5-
*
6-
* PHP 5
7-
*
85
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
96
* Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
107
*
@@ -39,7 +36,7 @@ class RedisEngine extends CacheEngine {
3936
* - server = string URL or ip to the Redis server host
4037
* - port = integer port number to the Redis server (default: 6379)
4138
* - timeout = float timeout in seconds (default: 0)
42-
* - persistent = bool Connects to the Redis server with a persistent connection (default: true)
39+
* - persistent = boolean Connects to the Redis server with a persistent connection (default: true)
4340
*
4441
* @var array
4542
*/
@@ -213,8 +210,6 @@ public function clearGroup($group) {
213210

214211
/**
215212
* Disconnects from the redis server
216-
*
217-
* @return void
218213
*/
219214
public function __destruct() {
220215
if (!$this->settings['persistent']) {

lib/Cake/Cache/Engine/WincacheEngine.php

100755100644
-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
*
55
* Supports wincache 1.1.0 and higher.
66
*
7-
* PHP 5
8-
*
97
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
108
* Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
119
*

lib/Cake/Cache/Engine/XcacheEngine.php

100755100644
-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
/**
33
* Xcache storage engine for cache.
44
*
5-
* PHP 5
6-
*
75
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
86
* Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
97
*

lib/Cake/Config/cacert.pem

100755100644
File mode changed.

0 commit comments

Comments
 (0)