diff --git a/classes/Tools/ToolsManager.php b/classes/Tools/ToolsManager.php index 5d196ced..23b20bba 100755 --- a/classes/Tools/ToolsManager.php +++ b/classes/Tools/ToolsManager.php @@ -232,6 +232,15 @@ function ( $setting, $oldValue = null, $newValue = null ) { Tracker::trackSettings(); } } ); + if ( !defined( 'PHP_MAJOR_VERSION' ) || PHP_MAJOR_VERSION < 7 ) { + NoticeManager::instance()->displayAdminNotice( + 'warning', + 'Media Cloud will stop supporting PHP 5 in the next major release of Media Cloud. You should contact your hosting provider about upgrading.', + true, + 'media-cloud-php-56-warning', + 30 + ); + } } protected function setup() diff --git a/classes/Wizard/Config/Field.php b/classes/Wizard/Config/Field.php index 3ce1e534..4481c104 100755 --- a/classes/Wizard/Config/Field.php +++ b/classes/Wizard/Config/Field.php @@ -115,7 +115,7 @@ function description() { /** * @return mixed|null */ - function default() { + function defaultValue() { return $this->default; } diff --git a/classes/Wizard/Config/Group.php b/classes/Wizard/Config/Group.php index a6853d99..e38f14ec 100755 --- a/classes/Wizard/Config/Group.php +++ b/classes/Wizard/Config/Group.php @@ -61,7 +61,7 @@ public function introView() { /** * @return string|null */ - public function class() { + public function groupClass() { return $this->class; } diff --git a/classes/Wizard/Config/Option.php b/classes/Wizard/Config/Option.php index 18520f85..32498069 100755 --- a/classes/Wizard/Config/Option.php +++ b/classes/Wizard/Config/Option.php @@ -87,7 +87,7 @@ public function next() { /** * @return string|null */ - public function class() { + public function optionClass() { return $this->class; } diff --git a/classes/Wizard/Config/Section.php b/classes/Wizard/Config/Section.php index 440ff9ed..02b261b0 100755 --- a/classes/Wizard/Config/Section.php +++ b/classes/Wizard/Config/Section.php @@ -71,7 +71,7 @@ public function id() { /** * @return string|null */ - public function class() { + public function sectionClass() { return $this->class; } diff --git a/classes/Wizard/Config/Step.php b/classes/Wizard/Config/Step.php index d6621bf3..18ca840b 100755 --- a/classes/Wizard/Config/Step.php +++ b/classes/Wizard/Config/Step.php @@ -156,7 +156,7 @@ function type() { /** * @return string|null */ - function class() { + function stepClass() { return $this->class; } @@ -226,7 +226,7 @@ function next() { /** * @return string|null */ - function return() { + function returnLink() { return $this->return; } diff --git a/ilab-media-tools.php b/ilab-media-tools.php index 1c8417e5..7386e135 100755 --- a/ilab-media-tools.php +++ b/ilab-media-tools.php @@ -5,7 +5,7 @@ Plugin URI: https://github.com/interfacelab/ilab-media-tools Description: Automatically upload media to Amazon S3 and integrate with Imgix, a real-time image processing CDN. Boosts site performance and simplifies workflows. Author: interfacelab -Version: 3.3.2 +Version: 3.3.3 Author URI: http://interfacelab.io */ // Copyright (c) 2016 Interfacelab LLC. All rights reserved. @@ -93,7 +93,7 @@ } // Version Defines -define( 'MEDIA_CLOUD_VERSION', '3.3.2' ); +define( 'MEDIA_CLOUD_VERSION', '3.3.3' ); define( 'MEDIA_CLOUD_INFO_VERSION', '1.0.0' ); // Directory defines define( 'ILAB_TOOLS_DIR', dirname( __FILE__ ) ); diff --git a/readme.txt b/readme.txt index 147eeb18..4db537e6 100755 --- a/readme.txt +++ b/readme.txt @@ -108,6 +108,10 @@ No, I'm just one very enthusiastic customer. == Changelog == += 3.3.3 = + +* Fixes for PHP 5.6 - people, it's time to upgrade to PHP 7.x! + = 3.3.2 = * Fix for illegal offset error warning diff --git a/views/wizard/section.blade.php b/views/wizard/section.blade.php index c3f11271..d7853163 100755 --- a/views/wizard/section.blade.php +++ b/views/wizard/section.blade.php @@ -1,6 +1,6 @@ -
+
@foreach($section->steps() as $step) @include('wizard.steps.'.$step->type(), ['step' => $step, 'stepIndex' => $loop->index]) @endforeach diff --git a/views/wizard/steps/form-fields/checkbox.blade.php b/views/wizard/steps/form-fields/checkbox.blade.php index 2a6041c0..50fd9848 100755 --- a/views/wizard/steps/form-fields/checkbox.blade.php +++ b/views/wizard/steps/form-fields/checkbox.blade.php @@ -1,7 +1,7 @@
- @include('base/fields/checkbox', ['name' => $field->name(), 'value' => $field->default(), 'description' => '', 'conditions' => null]) + @include('base/fields/checkbox', ['name' => $field->name(), 'value' => $field->defaultValue(), 'description' => '', 'conditions' => null])
{{ $field->title() }} diff --git a/views/wizard/steps/form-fields/hidden.blade.php b/views/wizard/steps/form-fields/hidden.blade.php index 87fce38e..414c823c 100755 --- a/views/wizard/steps/form-fields/hidden.blade.php +++ b/views/wizard/steps/form-fields/hidden.blade.php @@ -1,2 +1,2 @@ - + diff --git a/views/wizard/steps/form-fields/number.blade.php b/views/wizard/steps/form-fields/number.blade.php index c658095c..5e3bc97f 100755 --- a/views/wizard/steps/form-fields/number.blade.php +++ b/views/wizard/steps/form-fields/number.blade.php @@ -1,5 +1,5 @@
- required() ? 'required' : ''}}> + required() ? 'required' : ''}}>
diff --git a/views/wizard/steps/form-fields/password.blade.php b/views/wizard/steps/form-fields/password.blade.php index 7ab663aa..ec167e09 100755 --- a/views/wizard/steps/form-fields/password.blade.php +++ b/views/wizard/steps/form-fields/password.blade.php @@ -4,5 +4,5 @@
- required() ? 'required' : ''}}> + required() ? 'required' : ''}}>
diff --git a/views/wizard/steps/form-fields/select.blade.php b/views/wizard/steps/form-fields/select.blade.php index f52d732d..e9f8fd77 100755 --- a/views/wizard/steps/form-fields/select.blade.php +++ b/views/wizard/steps/form-fields/select.blade.php @@ -1,9 +1,9 @@
- @foreach($field->options() as $value => $name) - + @endforeach
diff --git a/views/wizard/steps/form-fields/text-field.blade.php b/views/wizard/steps/form-fields/text-field.blade.php index 30889aa1..968762b5 100755 --- a/views/wizard/steps/form-fields/text-field.blade.php +++ b/views/wizard/steps/form-fields/text-field.blade.php @@ -1,5 +1,5 @@
- required() ? 'required' : ''}}> + required() ? 'required' : ''}}>
diff --git a/views/wizard/steps/form.blade.php b/views/wizard/steps/form.blade.php index 90f4a0e4..70bc3de7 100755 --- a/views/wizard/steps/form.blade.php +++ b/views/wizard/steps/form.blade.php @@ -1,6 +1,6 @@ -
next())) data-next="{{$step->next()}}" @endif @if(!empty($step->return())) data-return="{{$step->return() ? 'true' : 'false'}}" @endif> +
next())) data-next="{{$step->next()}}" @endif @if(!empty($step->returnLink())) data-return="{{$step->returnLink() ? 'true' : 'false'}}" @endif>
@if(!empty($step->introView()))
diff --git a/views/wizard/steps/intro.blade.php b/views/wizard/steps/intro.blade.php index a0a86514..e0780b1a 100755 --- a/views/wizard/steps/intro.blade.php +++ b/views/wizard/steps/intro.blade.php @@ -1,6 +1,6 @@ -
next())) data-next="{{$step->next()}}" @endif @if(!empty($step->return())) data-return="{{$step->return() ? 'true' : 'false'}}" @endif> +
next())) data-next="{{$step->next()}}" @endif @if(!empty($step->returnLink())) data-return="{{$step->returnLink() ? 'true' : 'false'}}" @endif>
@if(!empty($step->introView()))
diff --git a/views/wizard/steps/next.blade.php b/views/wizard/steps/next.blade.php index a0a86514..e0780b1a 100755 --- a/views/wizard/steps/next.blade.php +++ b/views/wizard/steps/next.blade.php @@ -1,6 +1,6 @@ -
next())) data-next="{{$step->next()}}" @endif @if(!empty($step->return())) data-return="{{$step->return() ? 'true' : 'false'}}" @endif> +
next())) data-next="{{$step->next()}}" @endif @if(!empty($step->returnLink())) data-return="{{$step->returnLink() ? 'true' : 'false'}}" @endif>
@if(!empty($step->introView()))
diff --git a/views/wizard/steps/select.blade.php b/views/wizard/steps/select.blade.php index cfd1cb6a..3d86be36 100755 --- a/views/wizard/steps/select.blade.php +++ b/views/wizard/steps/select.blade.php @@ -1,6 +1,6 @@ -
next())) data-next="{{$step->next()}}" @endif @if(!empty($step->return())) data-return="{{$step->return() ? 'true' : 'false'}}" @endif> +
next())) data-next="{{$step->next()}}" @endif @if(!empty($step->returnLink())) data-return="{{$step->returnLink() ? 'true' : 'false'}}" @endif> @foreach($step->groups() as $group)