← All changes | css-js-toolbox.php +122 -227 trunk → 6.0.9 View file →

		@@ -1,55 +1,59 @@
1	1	<?php
2	2	/*
3	3	Plugin Name: CSS & JavaScript Toolbox
4		-Plugin URI: https://css-javascript-toolbox.com/
5		-Description: Easily add CSS, JavaScript, HTML and PHP code to unique CJT code blocks and assign them anywhere on your website.
6		-Version: 12.0.7
7		-Author: Wipeout Media
8		-Author URI: https://css-javascript-toolbox.com
9		-Text Domain: css-javascript-toolbox
10		-Domain Path: /locals/languages/
11		-License:
	4	+Plugin URI: http://css-javascript-toolbox.com/css-javascript-toolbox-free
	5	+Description: CJT Plugin for WordPress to easily add custom CSS and JavaScript to individual pages
	6	+Version: 6.0.9
	7	+Author: Wipeout Media
	8	+Author URI: http://css-javascript-toolbox.com/
12	9
13		-The Software is package as a WordPress¨ plugin. The PHP code associated with the Software is licensed under the GPL version 2.0 license (as found at http://www.gnu.org/licenses/gpl-2.0.txt GNU/GPLv2 or "GPLv2"). You may redistribute, repackage, and modify the PHP code as you see fit and as consistent with GPLv2.
	10	+Copyright (c) 2011, Wipeout Media.
	11	+This program is free software; you can redistribute it and/or
	12	+modify it under the terms of the GNU General Public License
	13	+as published by the Free Software Foundation; either version 2
	14	+of the License, or (at your option) any later version.
14	15
15		-The remaining portions of the Software ("Proprietary Portion"), which includes all images, cascading style sheets, and JavaScript are NOT licensed under GPLv2 and are considered proprietary to Licensor and are solely licensed under the remaining terms of this Agreement. The Proprietary Portion may not be redistributed, repackaged, or otherwise modified.
	16	+This program is distributed in the hope that it will be useful,
	17	+but WITHOUT ANY WARRANTY; without even the implied warranty of
	18	+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	19	+GNU General Public License for more details.
	20	+
	21	+You should have received a copy of the GNU General Public License
	22	+along with this program; if not, write to the Free Software
	23	+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
16	24	*/
17	25
18	26	// Disallow direct access.
19		-defined( 'ABSPATH' ) or die( 'Access denied' );
	27	+defined('ABSPATH') or die("Access denied");
20	28
21		-
22	29	/** * */
23		-define( 'CJTOOLBOX_PLUGIN_BASE', basename( dirname( __FILE__ ) ) . '/' . basename( __FILE__ ) );
	30	+define('CJTOOLBOX_PLUGIN_BASE', basename(dirname(__FILE__)) . '/' . basename(__FILE__));
24	31
25	32	/** * */
26		-define( 'CJTOOLBOX_PLUGIN_FILE', __FILE__ );
	33	+define('CJTOOLBOX_PLUGIN_FILE', __FILE__);
27	34
28	35	/** CJT Name */
29		-define( 'CJTOOLBOX_NAME', plugin_basename( dirname( __FILE__ ) ) );
	36	+define('CJTOOLBOX_NAME', plugin_basename(dirname(__FILE__)));
30	37
31	38	/** CJT Text Domain used for localize texts */
32		-define( 'CJTOOLBOX_TEXT_DOMAIN', CJTOOLBOX_NAME );
	39	+define('CJTOOLBOX_TEXT_DOMAIN', CJTOOLBOX_NAME);
33	40
34	41	/** */
35		-define( 'CJTOOLBOX_LANGUAGES', CJTOOLBOX_NAME . '/locals/languages/' );
	42	+define('CJTOOLBOX_LANGUAGES', CJTOOLBOX_NAME . '/locals/languages/');
36	43
37	44	/** CJT Absoulte path */
38		-define( 'CJTOOLBOX_PATH', dirname( __FILE__ ) );
	45	+define('CJTOOLBOX_PATH', dirname(__FILE__));
39	46
40	47	/** Dont use!! @deprecated */
41		-define( 'CJTOOLBOX_INCLUDE_PATH', CJTOOLBOX_PATH . '/framework' );
	48	+define('CJTOOLBOX_INCLUDE_PATH', CJTOOLBOX_PATH . '/framework');
42	49
43	50	/** Access Points path */
44		-define( 'CJTOOLBOX_ACCESS_POINTS', CJTOOLBOX_PATH . '/access.points' );
	51	+define('CJTOOLBOX_ACCESS_POINTS', CJTOOLBOX_PATH . '/access.points');
45	52
46	53	/** Frmaework path */
47	54	define('CJTOOLBOX_FRAMEWORK', CJTOOLBOX_INCLUDE_PATH); // Alias to include path!
48	55
49		-// Class Autoload Added @since 6.2.
50		-require 'autoload.inc.php';
51		-
52	56	// Import dependencies
53	57	require_once CJTOOLBOX_FRAMEWORK . '/php/includes.class.php';
54	58	require_once CJTOOLBOX_FRAMEWORK . '/events/definition.class.php';
55	59	require_once CJTOOLBOX_FRAMEWORK . '/events/events.class.php';
		@@ -57,361 +61,252 @@
57	61	require_once CJTOOLBOX_FRAMEWORK . '/events/hookable.interface.php';
58	62	require_once CJTOOLBOX_FRAMEWORK . '/events/hookable.class.php';
59	63
60	64	// Initialize events engine/system!
61		-CJTWordpressEvents::_init( array( 'hookType' => CJTWordpressEvents::HOOK_ACTION ) );
62		-CJTWordpressEvents::$paths[ 'subjects' ][ 'core' ] = CJTOOLBOX_FRAMEWORK . '/events/subjects';
63		-CJTWordpressEvents::$paths[ 'observers' ][ 'core' ] = CJTOOLBOX_FRAMEWORK . '/events/observers';
	65	+CJTWordpressEvents::__init(array('hookType' => CJTWordpressEvents::HOOK_ACTION));
	66	+CJTWordpressEvents::$paths['subjects']['core'] = CJTOOLBOX_FRAMEWORK . '/events/subjects';
	67	+CJTWordpressEvents::$paths['observers']['core'] = CJTOOLBOX_FRAMEWORK . '/events/observers';
64	68
65	69	/**
66	70	* CJT Plugin interface.
67		-*
	71	+*
68	72	* The CJT Plugin is maximum deferred.
69	73	* All functionality here is just to detect if the request should be processed!
70		-*
	74	+*
71	75	* The main class is located css-js-toolbox.class.php cssJSToolbox class
72	76	* The plugin is fully developed using Model-View-Controller design pattern.
73		-*
	77	+*
74	78	* access.points directory has all the entry points that processed by the Plugin.
75		-*
	79	+*
76	80	* @package CJT
77	81	* @author Ahmed Said
78	82	* @version 6
79	83	*/
80		-class CJTPlugin extends CJTHookableClass
81		-{
	84	+class CJTPlugin extends CJTHookableClass {
82	85
83	86	/**
84		- *
	87	+ *
85	88	*/
86		- const DB_VERSION = '1.7';
87		-
88		- /**
89		- * Minimum PHP version required to run the plugin.
90		- *
91		- * @var string
92		- */
93		- CONST ENV_PHP_MIN_VERSION = '7.4';
94		-
	89	+ const DB_VERSION = '1.0-CE';
	90	+
95	91	/**
96		- *
	92	+ *
97	93	*/
98		- const FW_Version = '5.0';
99		-
	94	+ const VERSION = '6.0 CE' ;
	95	+
100	96	/**
101		- *
	97	+ *
102	98	*/
103		- const VERSION = '12.0.7';
104		-
105		- /**
106		- *
107		- */
108	99	const DB_VERSION_OPTION_NAME = 'cjtoolbox_db_version';
109	100
110	101	/**
111		- *
	102	+ *
112	103	*/
113	104	const PLUGIN_REQUEST_ID = 'cjtoolbox';
114		-
	105	+
115	106	/**
116	107	* put your comment there...
117		- *
	108	+ *
118	109	* @var mixed
119	110	*/
120	111	protected $accessPoints;
121		-
	112	+
122	113	/**
123	114	* put your comment there...
124		- *
	115	+ *
125	116	* @var mixed
126	117	*/
127	118	protected $extensions;
128		-
	119	+
129	120	/**
130	121	* put your comment there...
131		- *
	122	+ *
132	123	* @var mixed
133	124	*/
134	125	protected $installed;
135		-
	126	+
136	127	/**
137	128	* put your comment there...
138		- *
	129	+ *
139	130	* @var CJTPlugin
140	131	*/
141	132	protected static $instance;
142		-
	133	+
143	134	/**
144	135	* put your comment there...
145		- *
	136	+ *
146	137	* @var mixed
147	138	*/
148	139	protected $mainAC;
149		-
	140	+
150	141	/**
151	142	* put your comment there...
152		- *
	143	+ *
153	144	* @var mixed
154	145	*/
155		- protected $onloaddbversion = array( 'parameters' => array( 'dbVersion' ) );
156		-
	146	+ protected $onloaddbversion = array('parameters' => array('dbVersion'));
	147	+
157	148	/**
158	149	* put your comment there...
159		- *
	150	+ *
160	151	* @var mixed
161	152	*/
162		- protected $onimportcontroller = array( 'parameters' => array( 'file' ) );
163		-
	153	+ protected $onimportbasefile = array('parameters' => array('file'));
	154	+
164	155	/**
165	156	* put your comment there...
166		- *
	157	+ *
167	158	* @var mixed
168	159	*/
169		- protected $onimportmodel = array( 'parameters' => array( 'file' ) );
170		-
	160	+ protected $onimportcontroller = array('parameters' => array('file'));
	161	+
171	162	/**
172	163	* put your comment there...
173		- *
	164	+ *
174	165	* @var mixed
175	166	*/
176		- protected $onload = array( 'parameters' => array( 'instance' ) );
177		-
	167	+ protected $onimportmodel = array('parameters' => array('file'));
	168	+
178	169	/**
179	170	* put your comment there...
180		- *
	171	+ *
181	172	*/
182		- protected function __construct()
183		- {
	173	+ protected function __construct() {
184	174	// Hookable!
185	175	parent::__construct();
186		-
187	176	// Allow access points to utilize from CJTPlugin functionality
188	177	// even if the call is recursive inside getInstance/construct methods!!!
189		- self::$instance = $this;
190		-
191		- // Installation version
192		- $dbVersion = $this->onloaddbversion( get_option( self::DB_VERSION_OPTION_NAME ) );
193		- $this->installed = ( ( $dbVersion ) == self::DB_VERSION );
194		-
	178	+ self::$instance = $this;
	179	+ // Read vars!
	180	+ $dbVersion = $this->onloaddbversion(get_option(self::DB_VERSION_OPTION_NAME));
	181	+ $this->installed = (($dbVersion) == self::DB_VERSION);
195	182	// Load plugin and all installed extensions!.
196	183	$this->load();
197	184	$this->loadExtensions();
198		-
199	185	// Run MAIN access point!
200	186	$this->main();
201	187	}
202		-
	188	+
203	189	/**
204	190	* put your comment there...
205		- *
	191	+ *
206	192	*/
207		- public function & extensions()
208		- {
209		- return $this->extensions;
	193	+ public function extensions() {
	194	+ return $this->extensions;
210	195	}
211		-
	196	+
212	197	/**
213	198	* put your comment there...
214		- *
	199	+ *
215	200	*/
216		- public function getAccessPoint( $name )
217		- {
218		- return $this->accessPoints[ $name ];
	201	+ public function getAccessPoint($name) {
	202	+ return $this->accessPoints[$name];
219	203	}
220		-
	204	+
221	205	/**
222	206	* put your comment there...
223		- *
	207	+ *
224	208	*/
225		- public static function getInstance()
226		- {
227		-
228		- if ( ! self::$instance )
229		- {
	209	+ public static function getInstance() {
	210	+ if (!self::$instance) {
230	211	self::$instance = new CJTPlugin();
231	212	}
232		-
233	213	return self::$instance;
234	214	}
235		-
236		- /**
237		- * Check the PHP version and register an admin notice when it is too old.
238		- *
239		- * @return bool TRUE when the environment can run the plugin.
240		- */
241		- public static function isCompatibleEnvironment()
242		- {
243		-
244		- if ( version_compare( PHP_VERSION, self::ENV_PHP_MIN_VERSION, '<' ) )
245		- {
246		- add_action( 'admin_notices', 'cjtIncompatiblePHPNotice' );
247		-
248		- return false;
249		- }
250		-
251		- return true;
252		- }
	215	+
253	216	/**
254	217	* put your comment there...
255		- *
	218	+ *
256	219	*/
257		- public function isInstalled()
258		- {
259		- return $this->installed;
	220	+ public function isInstalled() {
	221	+ return $this->installed;
260	222	}
261		-
	223	+
262	224	/**
263	225	* put your comment there...
264		- *
	226	+ *
265	227	*/
266		- public function listen()
267		- {
	228	+ public function listen() {
268	229	// For now we've only admin access points! Future versions might has something changed!
269		- if ( is_admin() )
270		- {
271		-
	230	+ if (is_admin()) {
272	231	// Import access points core classes.
273	232	require_once 'framework/access-points/page.class.php';
274	233	require_once 'framework/access-points/directory-spider.class.php';
275		-
276	234	// Get access points!
277		- $accessPoints = CJTAccessPointsDirectorySpider::getInstance( 'CJT', CJTOOLBOX_ACCESS_POINTS );
278		-
	235	+ $accessPoints = CJTAccessPointsDirectorySpider::getInstance('CJT', CJTOOLBOX_ACCESS_POINTS);
279	236	// For every access point create instance and LISTEN to the request!
280		- foreach ( $accessPoints as $name => $info )
281		- {
	237	+ foreach ($accessPoints as $name => $info) {
282	238	/**
283	239	* @var CJTAccessPoint
284	240	*/
285		- $this->accessPoints[ $name ] = $point = $accessPoints->point()->listen();
286		-
	241	+ $this->accessPoints[$name] = $point = $accessPoints->point()->listen();
287	242	// We need to do some work with there is a connected access point.
288		- $point->onconnected = array( & $this, 'onconnected' );
289		-
	243	+ $point->onconnected = array(&$this, 'onconnected');
290	244	}
291		-
292	245	}
293		-
	246	+ // Chaining!
294	247	return $this;
295	248	}
296		-
	249	+
297	250	/**
298	251	* put your comment there...
299		- *
	252	+ *
300	253	*/
301		- protected function load()
302		- {
	254	+ protected function load() {
303	255	// Bootstrap the Plugin!
	256	+ require_once $this->onimportbasefile('css-js-toolbox.class.php');
304	257	cssJSToolbox::getInstance();
305		-
306	258	// Load MVC framework core!
307		- require_once $this->onimportmodel( CJTOOLBOX_MVC_FRAMEWOK . '/model.inc.php' );
308		- require_once $this->onimportcontroller( CJTOOLBOX_MVC_FRAMEWOK . '/controller.inc.php' );
309		-
	259	+ require_once $this->onimportmodel(CJTOOLBOX_MVC_FRAMEWOK . '/model.inc.php');
	260	+ require_once $this->onimportcontroller(CJTOOLBOX_MVC_FRAMEWOK . '/controller.inc.php');
	261	+ // Chaining!
310	262	return $this;
311	263	}
312		-
	264	+
313	265	/**
314	266	* put your comment there...
315		- *
	267	+ *
316	268	*/
317		- protected function loadExtensions()
318		- {
	269	+ protected function loadExtensions() {
319	270	// Load extensions lib!
320	271	require_once 'framework/extensions/extensions.class.php';
321		-
322	272	$this->extensions = new CJTExtensions();
	273	+ // Load all extensions!
323	274	$this->extensions->load();
324		-
	275	+ // Chaining!
325	276	return $this;
326	277	}
327		-
	278	+
328	279	/**
329	280	* Run MAIN access point!
330		- *
	281	+ *
331	282	* @return $this
332	283	*/
333		- protected function main()
334		- {
335		- // Fire laod event
336		- $this->onload( $this );
337		-
	284	+ protected function main() {
338	285	// Access point base class is a dependency!
339	286	require_once 'framework/access-points/access-point.class.php';
340		-
341	287	// Run Main Acces Point!
342	288	include_once 'access.points/main.accesspoint.php';
343		-
344	289	$this->mainAC = new CJTMainAccessPoint();
345	290	$this->mainAC->listen();
346	291	}
347		-
	292	+
348	293	/**
349		- * Called When any In-Listen-State (ILS) Access point is
	294	+ * Called When any In-Listen-State (ILS) Access point is
350	295	* connected (called by Wordpress hooking system).
351		- *
	296	+ *
352	297	* @return boolean TRUE.
353	298	*/
354		- public function onconnected( $observer, $state )
355		- {
356		- // Always connect the access point!
	299	+ public function onconnected($observer, $state) {
	300	+ // In all cases that we'll process the request load the localization file.
	301	+ load_plugin_textdomain(CJTOOLBOX_TEXT_DOMAIN, false, CJTOOLBOX_LANGUAGES);
	302	+ // Always connet the access point!
357	303	return $state;
358	304	}
359		-
	305	+
360	306	}// End Class
361	307
362		-/**
363		-* Admin notice shown when the site runs an unsupported PHP version.
364		-*/
365		-function cjtIncompatiblePHPNotice()
366		-{ ?>
367		- <div class="notice notice-error">
368		- <p><strong>CJT</strong>: CSS &amp; JavaScript Toolbox needs PHP version <?php echo esc_html( CJTPlugin::ENV_PHP_MIN_VERSION ); ?> or greater to operate properly. Please ask your hosting provider to update the PHP version.<br>
369		- Current PHP Version: <strong><?php echo esc_html( phpversion() ); ?></strong>
370		- </p>
371		- </div>
372		-<?php }
373		-
374		-// Dont run if environment (e.g PHP version) is incomaptible
375		-if ( ! CJTPlugin::isCompatibleEnvironment() )
376		-{
377		- return;
378		-}
379		-
380	308	// Initialize events!
381		-CJTPlugin::define( 'CJTPlugin', array( 'hookType' => CJTWordpressEvents::HOOK_FILTER ) );
	309	+CJTPlugin::define('CJTPlugin', array('hookType' => CJTWordpressEvents::HOOK_FILTER));
382	310
383	311	// Let's Go!
384		-CJTPlugin::getInstance();
385		-
386		-add_action( 'upgrader_process_complete', 'upgradeCheck',10, 2 );
387		-
388		-function upgradeCheck( $upgrader_object, $options ) {
389		- // Bulk plugin updates are the only case we care about. Bail early on
390		- // everything else so we never touch the DB on unrelated upgrades.
391		- if ( ! isset( $options['action'], $options['type'] ) ) {
392		- return;
393		- }
394		-
395		- if ( $options['action'] !== 'update' || $options['type'] !== 'plugin' ) {
396		- return;
397		- }
398		-
399		- if ( empty( $options['plugins'] ) || ! is_array( $options['plugins'] ) ) {
400		- return;
401		- }
402		-
403		- if ( ! in_array( plugin_basename( __FILE__ ), $options['plugins'], true ) ) {
404		- return;
405		- }
406		-
407		- // Only ever record this once.
408		- if ( ! empty( get_option( '__existing_cjt_user' ) ) ) {
409		- return;
410		- }
411		-
412		- global $wpdb;
413		- $table_name = $wpdb->base_prefix . 'cjtoolbox_blocks';
414		- $query = $wpdb->prepare( 'SHOW TABLES LIKE %s', $wpdb->esc_like( $table_name ) );
415		-
416		- update_option( '__existing_cjt_user', $wpdb->get_var( $query ) === $table_name ? 'true' : 'false' );
417		-}
	312	+CJTPlugin::getInstance();