Changeset 1237153 for css-javascript-toolbox

Timestamp:

09/03/2015 11:54:49 AM (11 years ago)

Author:

wipeoutmedia

Message:

Version 8.0.4

Location:

css-javascript-toolbox/trunk

Files:

• access.points/extensions.accesspoint.php (modified) (1 diff)
• access.points/main (added)
• access.points/main.accesspoint.php (modified) (2 diffs)
• access.points/main/8.0.4-AdminNotice.html (added)
• autoload.inc.php (modified) (1 diff)
• composer.json (added)
• controllers/auto-upgrade.php (modified) (2 diffs)
• controllers/setup.php (modified) (2 diffs)
• css-js-toolbox.php (modified) (1 diff)
• framework/CJTStoreUpdate.class.php (added)
• framework/ServicesAPI (added)
• framework/ServicesAPI/Exceptions.class.php (added)
• framework/ServicesAPI/Module.class.php (added)
• framework/ServicesAPI/Services.class.php (added)
• framework/ServicesAPI/Store.php (added)
• framework/extensions/extensions.class.php (modified) (3 diffs)
• framework/third-party (deleted)
• models/setup.php (modified) (1 diff)
• readme.txt (modified) (3 diffs)
• vendor (added)
• vendor/autoload.php (added)
• vendor/composer (added)
• vendor/composer/ClassLoader.php (added)
• vendor/composer/autoload_classmap.php (added)
• vendor/composer/autoload_namespaces.php (added)
• vendor/composer/autoload_psr4.php (added)
• vendor/composer/autoload_real.php (added)
• views/blocks/block/tmpl/codefile/codefile.html.tmpl (modified) (1 diff)
• views/blocks/block/tmpl/edit.html.tmpl (modified) (1 diff)
• views/blocks/manager/tmpl/blocks.html.tmpl (modified) (1 diff)
• views/blocks/manager/tmpl/help/intro.html.tmpl (modified) (2 diffs)
• views/setup/activation-form/public/js/default/default.js (modified) (1 diff)

css-javascript-toolbox/trunk/access.points/extensions.accesspoint.php

@@ -20 +20 @@
     * 
     */
-    const PLUGINS_PAGE_SEARCH_TERM = 'CJT-Extension';
+    const PLUGINS_PAGE_SEARCH_TERM = 'css-javascript-toolbox';
     
     /**

css-javascript-toolbox/trunk/access.points/main.accesspoint.php

@@ -36 +36 @@
     * 
     */
+    public function _adminNotice() {
+        # Initialize
+        static $displayed = 0;
+        
+        # Display only for admins
+        if ( ! current_user_can( 'administrator' ) ) {
+            return;
+        }
+        
+        # Dismiss if dimisssed
+        if( isset( $_GET[ 'cjtgp-dismiss-803-notice' ] ) ) {
+            update_user_meta( get_current_user_id(), 'cjtgp-dismiss-803-notice', true );
+        }
+        # Exit if dismissed
+        if ( get_user_meta( get_current_user_id(), 'cjtgp-dismiss-803-notice' ) ) {
+            return;
+        }
+        # Admin notices might run twice!!
+        if( ! $displayed ) {
+            # Don't display again
+            $displayed = true;
+            # Display notice
+            require __DIR__ . DIRECTORY_SEPARATOR . 'main' . DIRECTORY_SEPARATOR . '8.0.4-AdminNotice.html';
+        }
+    }
+
+    /**
+    * put your comment there...
+    * 
+    */
     protected function doListen() {
         // Register uninstall hook!
@@ -45 +75 @@
         // used to run the plugin!
         add_action('plugins_loaded', array(&$this, 'main'));
+        # Admin NOTICE
+        add_action( 'admin_notices', array( $this, '_adminNotice' ) );
     }
     

css-javascript-toolbox/trunk/autoload.inc.php

@@ -24 +24 @@
 $map->offsetSet('CJTAccessPoint', 'framework/access-points/access-point.class.php');
 $map->offsetSet('CJTPageAccessPoint', 'framework/access-points/page.class.php');
+
+
+# Composer Autoloads (All the above autoloads is deprecated and will be revmoed later)
+require 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';

css-javascript-toolbox/trunk/controllers/auto-upgrade.php

@@ -31 +31 @@
         // license key!
         $activeLicenses = $model->getStatedLicenses();
-        // Import EDD updater Class!
-        cssJSToolbox::import('framework:third-party:easy-digital-download:auto-upgrade.class.php');
         // Activate Automatic upgrade for all activated licenses/components!
         foreach ($activeLicenses as $name => $state) {
@@ -44 +42 @@
                     // Initializingn vars for a single state/component!
                     $pluginFile = ABSPATH . PLUGINDIR . '/' . $state['component']['pluginBase'];
-                    // Stop using Cached Data as it causes issue, always 
-                    // get fresh plugin data.
-                    $plugin = get_plugin_data($pluginFile);
                     $license =& $state['license'];
-                    // Edd API parameter to be send along with he check!
-                    $requestParams= array(
-                        'version' => $plugin['Version'],
-                        'author' => $plugin['AuthorName'],
-                        'license' => $license['key'],
-                        'item_name' => $name,
-                    );
                     // Set EDD Automatic Updater!
-                    $updated = new CJT_EDD_SL_Plugin_Updater($cjtWebServer, $pluginFile, $requestParams);
+                    try {
+                        CJTStoreUpdate::autoUpgrade( $name, $license[ 'key' ], $pluginFile );   
+                    }
+                    catch ( CJTServicesAPICallException $exception ) {
+                        die( 'CJT AUTO-UPGRADE EXCAPTION!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!' );
+                    }
                 }
             }

css-javascript-toolbox/trunk/controllers/setup.php

@@ -61 +61 @@
     protected function licenseAction() {
         // Read request parameters!
-        $action = $_REQUEST['eddAction'];
+        $action = $_REQUEST['licenseAction'];
         $state['component'] = $_REQUEST['component'];
         $state['license'] = $_REQUEST['license'];
@@ -67 +67 @@
         $model =& $this->model;
         // Request EDD through EDD SL APIs!
-        $state['response'] = $model->dispatchEddCall($action, $state['component'], $state['license']);
-        // Standarize response object! As check and activate responde by 'valid' and 'invalid' and deactivate responde
-        // by deactivated and faild we then need to make them all likce check and activate!
-        if (($action == 'deactivate') && ($state['response']['license'] != 'error')) {
-            $map = array('deactivated' => 'valid', 'failed' => 'invalid');
-            $deactivateResponseState = $state['response']['license'];
-            $state['response']['license'] = $map[$deactivateResponseState];
-        }
+        $state['response'] = $model->dispatchLicenseAction($action, $state['component'], $state['license']);
         // Cahe only if the request is 'activate' or 'deactivate' and the returned state is valid or 'deactivated! respectively.
         if (($action != 'check') && ($state['response']['license'] == 'valid')) {
-            // We need to standarize the response object so the access will be always the same
-            // EDD return 'deactivated' and 'valid' with the success request using 'deactivate' and 'activate' repectively!
-            // Use valid instead of deactivate!
-            if ($action == 'deactivate') {
-                $state['response']['license'] = 'valid';
-            }
             $state['action'] = $model->cacheState($state['component'], $action, $state);
         }

css-javascript-toolbox/trunk/css-js-toolbox.php

@@ -4 +4 @@
 Plugin URI: http://css-javascript-toolbox.com/
 Description: CJT Plugin for WordPress to easily add custom CSS and JavaScript to individual pages
-Version: 8.0.3
+Version: 8.0.4
 Author: Wipeout Media 
 Author URI: http://css-javascript-toolbox.com

css-javascript-toolbox/trunk/framework/extensions/extensions.class.php

@@ -25 +25 @@
     * 
     */
-    const PREFIX = 'cjte-';
+    const PREFIXS = 'cjte-,css-javascript-toolbox-';
     
     /**
@@ -163 +163 @@
     * @return CJTExtensions
     */
-    public function __construct($prefix = self::PREFIX, $loadMethod = self::LOAD_METHOD) {
+    public function __construct($prefix = self::PREFIXS, $loadMethod = self::LOAD_METHOD) {
         // Hookable!
         parent::__construct();
         // Initializing!
-        $this->prefix = $prefix;
+        $this->prefix = explode( ',', $prefix );
         $this->loadMethod = $loadMethod;
     }
@@ -204 +204 @@
                 $pluginName = basename($pluginDir);
                 // Any plugin with our prefix is a CJT extension!
-                if (strpos($pluginName, $this->prefix) === 0) {
+                if ( ( strpos( $pluginName, $this->prefix[0] ) === 0 ) || 
+                         ( strpos( $pluginName, $this->prefix[1] ) === 0 ) ) {
                     // CJT Extsnsion must has the definition XML file!
                     // First try for Edition-Specific file

css-javascript-toolbox/trunk/models/setup.php

@@ -68 +68 @@
     * @param mixed $license
     */
-    public function dispatchEddCall($action, $component, $license) {
-        // Activating License key thorugh EDD APIs!     
-        $request['edd_action'] = "{$action}_license";
-        $request['item_name'] = urlencode($component['name']);
-        $request['license'] = $license['key'];
-        /* CJT Extra Fields For EDD */
-        //$request['CJTEFFEDD_licenseName'] = $license['name'];
-        // Request the server!
-        $response = wp_remote_get(add_query_arg($request, cssJSToolbox::getCJTWebSiteURL()));
-        // We need only the JSON object returned by EDD APIs.
-        $response = @json_decode(wp_remote_retrieve_body($response), true);
-        // If request error compaitble the response object to be used!
-        if (!$response) {
+    public function dispatchLicenseAction($action, $component, $license) {
+        # Get Plugin File from component base name
+        $pluginFile = WP_PLUGIN_DIR . $component[ 'pluginBase' ];
+        # Get CJT Store object
+        $store = new CJTStore( $component [ 'name' ], $license[ 'key' ], $pluginFile );
+        # Build method name from the given action
+        $methodName = "{$action}License";
+        try {
+            # Call requested method
+            $result = $store->$methodName( $license[ 'name' ] );
+            # Build response object locally
+            # The structure is taken from EDD license extension as it was used here
+            # when the plugin is orignally developed
+            if ( $result ) { // Success operation
+                $response['license'] = 'valid';
+            }
+            else { // Operation faild
+                $response['license'] = 'invalid';
+            }
+        }
+        catch ( CJTServicesAPICallException $exception ) {
+            // If request error compaitble the response object to be used!  
             $response = array('license' => 'error', 'component' => $component['name']);
         }

css-javascript-toolbox/trunk/readme.txt

@@ -7 +7 @@
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Requires at least: 3.9
-Tested up to: 4.1
-Stable tag: 8.0.3
+Tested up to: 4.3
+Stable tag: 8.0.4
 
 Easily add custom CSS, JavaScript, HTML and PHP code to unique CJT code blocks and assign them wherever you want.
 
 == Description ==
-= We need your support =
-Your purchase of CJTe Developer will assist us in the continued development of all CJT plugins on WordPress.org.
-
-This project is 100% developed and maintained by only two people since the very start in August 2011. We have plenty of [feature ideas that we want to include](http://css-javascript-toolbox.com/development/request), and this can only be possible with funding.
-
-If you would like to learn more about the additional benefits, please click: [CJTe Developer](http://css-javascript-toolbox.com/cjte-developer).
-
-= About =
+= Update Notice =
+After a long hiatus in development, we have decided to focus our entire efforts on our new premium extension plugin called [CSS & JavaScript Toolbox PLUS](http://css-javascript-toolbox.com/css-javascript-toolbox-plus/), which is designed to work with and UPGRADE the free version. Unfortunately we will be moving many features from the free version into the premium. 
+
+= What does this mean? =
+For the next update (not this one), we will be removing features from CSS & JavaScript Toolbox Free including: 
+- Custom Posts
+- Categories
+- Auxiliary assignments (e.g. entire website, website backend, etc)
+- Advanced assignments (i.e. URLs and Expressions)
+- Code Files 
+- Code Templates
+- Template Lookup System
+- Packages 
+
+If you rely on the features above, then you can do one of two things:
+
+1) Stay on [CSS & JavaScript Toolbox Free v8.0.3](https://downloads.wordpress.org/plugin/css-javascript-toolbox.8.0.3.zip), and when the next update arrives, DO NOT UPDATE!!!
+
+OR
+
+2) Purchase our premium extension plugin: [CSS & JavaScript Toolbox PLUS](http://css-javascript-toolbox.com/css-javascript-toolbox-plus/)
+
+Of course if you have already updated, you can use FTP to rollback to the earlier version by manually overwriting the css-javascript-toolbox folder with: [CSS & JavaScript Toolbox Free v8.0.3](https://downloads.wordpress.org/plugin/css-javascript-toolbox.8.0.3.zip)
+
+= Why purchase PLUS? =
+[CSS & JavaScript Toolbox PLUS](http://css-javascript-toolbox.com/css-javascript-toolbox-plus/) is our new premium plugin, which will now take up all our time and efforts. It will also contain all of the above features - PLUS these features below:
+- Editor Themes
+- Editor Toolbox
+- Editor Menu Tools
+- Code Auto Completion (CAC)
+- Import Export Tool
+- Block Widget Linker
+- PLUS more
+
+We intend to give PLUS a complete makeover, including: 
+- code optimisation and bug fixes
+- 100% compatibility with the the latest WordPress
+- a faster and more powerful core
+- full codebase documentation
+- and eventually a brand new flat responsive user interface
+
+= About the CSS & JavaScript Toolbox Plugin =
 CSS & JavaScript Toolbox (or CJT) is a powerful code management plugin that gives you the tools to easily and safely modify or extend the functionality and appearance of your WordPress-powered website.
 
@@ -34 +68 @@
 CJT code blocks can be assigned to pages, posts, custom posts, categories, URLs, expressions, and practically anywhere you want on your website. Code block shortcodes can also provide you with further placement accuracy.
 
-= Want more features for free? =
-Get CJT extension plugins that provide more features such as:
-
-- [Advanced Theme Editor](https://wordpress.org/plugins/cjte-advanced-theme-editor)
-- [Advanced Plugins Editor](https://wordpress.org/plugins/cjte-advanced-plugins-editor)
-- [WP Core Editor](https://wordpress.org/plugins/cjte-wp-core-editor)
-
-= Want to add script plugins? =
-Get script plugins that can be installed on your website running CJT:
-
-- [Image Zoomer](https://wordpress.org/plugins/cjte-image-zoomer/)
-- [Black & White Image Effect](https://wordpress.org/plugins/cjte-black-white-image-effect/)
-
 = Support Us =
-Thank you for your interest in CSS & JavaScript Toolbox. 
-Please support us by:
-
-- Joining in with the voting and discussion on [new CJT feature ideas](http://css-javascript-toolbox.com/development/request).
-- Providing a [feedback review and rating](http://wordpress.org/support/view/plugin-reviews/css-javascript-toolbox) on WordPress.org
-- Spreading the word and recommending CJT to others.
+The CSS & JavaScript Toolbox project is 100% developed and maintained by only two people since the very beginnings in August 2011. We have plenty of feature ideas that we want to introduce and this can only be possible with funding.
+
+You can also support us by providing a [feedback review and rating](http://wordpress.org/support/view/plugin-reviews/css-javascript-toolbox) on WordPress.org, and spreading the word and recommending CJT to others.
 
 = Follow the Developments =
@@ -347 +365 @@
 == Credits ==
     
-Copyright © 2013, Wipeout Media.
+Copyright © 2015, Wipeout Media.
 
 This program is free software; you can redistribute it and/or

css-javascript-toolbox/trunk/views/blocks/block/tmpl/codefile/codefile.html.tmpl

@@ -41 +41 @@
     <li class="separator"></li>
     <li class="quick-toolbar">
-        <input type="checkbox" class="select-code-file"> | 
+        <input type="checkbox" class="select-code-file" /> | 
         <a class="edit" href="#"><?php echo cssJSToolbox::getText('Edit') ?></a>
     </li>

css-javascript-toolbox/trunk/views/blocks/block/tmpl/edit.html.tmpl

@@ -8 +8 @@
 ?>
         <div class="cjt-toolbox edit-block-name">
-            <input type="text" class="block-name" value="" maxlength="50">
+            <input type="text" class="block-name" value="" maxlength="50" />
             <div class="icons-group">
                 <a class="cjt-tb-link cancel" title="<?php echo cssJSToolbox::getText('Cancel editing code block title') ?>"></a>

css-javascript-toolbox/trunk/views/blocks/manager/tmpl/blocks.html.tmpl

@@ -14 +14 @@
 <?php require CJTOOLBOX_VIEWS_PATH . '/blocks/block/tmpl/codefile/codefile.html.tmpl' ?>
     <div id="custom-icon" class="icon32 blocks-icon32"></div>
-    <h2><?php echo cssJSToolbox::getText('CSS & Javascript Toolbox') ?></h2>
-    <span id="support-us"><?php echo cssJSToolbox::getText('Support us by purchasing') ?>: <a target="_blank" href="http://css-javascript-toolbox.com/cjte-developer/">CJTe Developer</a></span>
+    <h2 class="cjt-main-title"><?php echo htmlentities( cssJSToolbox::getText('CSS & Javascript Toolbox') ) ?><?php echo apply_filters( 'cjt_after_main_title', '' ) ?></h2>
+    
+    <?php ob_start(); ?>
+    <span id="support-us"><?php echo cssJSToolbox::getText('Support us by purchasing') ?>: <a target="_blank" href="http://css-javascript-toolbox.com/css-javascript-toolbox-plus/"><?php echo htmlentities( cssJSToolbox::getText('CSS & Javascript Toolbox PLUS') ) ?></a></span>
+    <?php echo apply_filters( 'cjt_main_titlt_supportus_link', ob_get_clean() ); ?>
+    
     <div id="cjt-banner-bar-right">
         <span class="cjt-banner-link">
-            <a target="_blank" href="http://<?php echo cssJSToolbox::CJT_WEB_SITE_DOMAIN ?>/support/"><?php echo cssJSToolbox::getText('Support Forum') ?></a>&nbsp;&nbsp;|&nbsp;&nbsp;
             <a target="_blank" href="http://<?php echo cssJSToolbox::CJT_WEB_SITE_DOMAIN ?>/documentation/"><?php echo cssJSToolbox::getText('Online Documentation') ?></a>
         </span>

css-javascript-toolbox/trunk/views/blocks/manager/tmpl/help/intro.html.tmpl

@@ -8 +8 @@
 ?>
 
-<h2><?php echo cssJSToolbox::getText('Welcome to the CSS & JavaScript Toolbox dashboard') ?></h2>
+<h2><?php echo htmlentities( cssJSToolbox::getText('Welcome to the CSS & JavaScript Toolbox dashboard') ) ?></h2>
 <p><?php echo cssJSToolbox::getText('Since you do not have any code blocks active, you can either: create a new code block or create a new code template.') ?></p>
 <h4><?php echo cssJSToolbox::getText('Create a new Code Block') ?></h4>
@@ -15 +15 @@
 <p><?php echo cssJSToolbox::getText('You can create code templates when you click into the Code Template Manager.  To find this, hover over the icon showing a small cog over pages, and a tooltip should say Code Template Manager.  Press this and if you have chosen to install the Template Samples, you will notice them sitting in there ready to be used.  If you want to create a code template from scratch, click the Create Template button.  Here you can choose a name for your code template, select a code language type (i.e. CSS, JavaScript, HTML, PHP), choose whether the template is in Draft or Published state, and then write your code.  You have other tabs that allow you to write a Description, add Keywords and Version number, etc.  Once you are happy with your code template, you can click the Save button') ?></p>
 <h4><?php echo cssJSToolbox::getText('Embedding or Linking a Code Templates') ?></h4>
-<p> <?php echo cssJSToolbox::getText('Code Templates can be either embedded or linked into your code blocks.  To see all your code templates, you have to click the Template Lookup icon by hovering over the icon with the open/closed angled brackets.  A popup will appear showing you code templates in the form of users and they are:') ?></p>
+<p> <?php echo cssJSToolbox::getText('Code Templates can be either embedded or linked into your code blocks.  To see all your code templates, you have to click the Template Lookup icon by hovering over the icon with the open|closed angled brackets.  A popup will appear showing you code templates in the form of users and they are:') ?></p>
 <ol>
     <li><?php echo cssJSToolbox::getText('WordPress:  default code templates that are packaged with WordPress') ?></li>

css-javascript-toolbox/trunk/views/setup/activation-form/public/js/default/default.js

@@ -97 +97 @@
             progress.inputs = this.activationForm.find('input').prop('disabled', 'disabled').addClass('disabled');
             // Pass licene action along out with the form data!
-            var request = $.extend(formData, {eddAction : this.todo});
+            var request = $.extend(formData, {licenseAction : this.todo});
             // Requesing server!
             var action = this.action ? this.action : 'license';