← All changes | css-js-toolbox.php +120 -218 trunk → 8.0 View file →

		@@ -1,48 +1,45 @@
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/
	4	+Plugin URI: http://css-javascript-toolbox.com/
	5	+Description: CJT Plugin for WordPress to easily add custom CSS and JavaScript to individual pages
	6	+Version: 8.0
	7	+Author: Wipeout Media
	8	+Author URI: http://css-javascript-toolbox.com
11	9	License:
12	10
13	11	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.
14	12
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.
	13	+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	14	*/
17	15
18	16	// Disallow direct access.
19		-defined( 'ABSPATH' ) or die( 'Access denied' );
	17	+defined('ABSPATH') or die("Access denied");
20	18
21		-
22	19	/** * */
23		-define( 'CJTOOLBOX_PLUGIN_BASE', basename( dirname( __FILE__ ) ) . '/' . basename( __FILE__ ) );
	20	+define('CJTOOLBOX_PLUGIN_BASE', basename(dirname(__FILE__)) . '/' . basename(__FILE__));
24	21
25	22	/** * */
26		-define( 'CJTOOLBOX_PLUGIN_FILE', __FILE__ );
	23	+define('CJTOOLBOX_PLUGIN_FILE', __FILE__);
27	24
28	25	/** CJT Name */
29		-define( 'CJTOOLBOX_NAME', plugin_basename( dirname( __FILE__ ) ) );
	26	+define('CJTOOLBOX_NAME', plugin_basename(dirname(__FILE__)));
30	27
31	28	/** CJT Text Domain used for localize texts */
32		-define( 'CJTOOLBOX_TEXT_DOMAIN', CJTOOLBOX_NAME );
	29	+define('CJTOOLBOX_TEXT_DOMAIN', CJTOOLBOX_NAME);
33	30
34	31	/** */
35		-define( 'CJTOOLBOX_LANGUAGES', CJTOOLBOX_NAME . '/locals/languages/' );
	32	+define('CJTOOLBOX_LANGUAGES', CJTOOLBOX_NAME . '/locals/languages/');
36	33
37	34	/** CJT Absoulte path */
38		-define( 'CJTOOLBOX_PATH', dirname( __FILE__ ) );
	35	+define('CJTOOLBOX_PATH', dirname(__FILE__));
39	36
40	37	/** Dont use!! @deprecated */
41		-define( 'CJTOOLBOX_INCLUDE_PATH', CJTOOLBOX_PATH . '/framework' );
	38	+define('CJTOOLBOX_INCLUDE_PATH', CJTOOLBOX_PATH . '/framework');
42	39
43	40	/** Access Points path */
44		-define( 'CJTOOLBOX_ACCESS_POINTS', CJTOOLBOX_PATH . '/access.points' );
	41	+define('CJTOOLBOX_ACCESS_POINTS', CJTOOLBOX_PATH . '/access.points');
45	42
46	43	/** Frmaework path */
47	44	define('CJTOOLBOX_FRAMEWORK', CJTOOLBOX_INCLUDE_PATH); // Alias to include path!
48	45
		@@ -57,361 +54,266 @@
57	54	require_once CJTOOLBOX_FRAMEWORK . '/events/hookable.interface.php';
58	55	require_once CJTOOLBOX_FRAMEWORK . '/events/hookable.class.php';
59	56
60	57	// 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';
	58	+CJTWordpressEvents::__init(array('hookType' => CJTWordpressEvents::HOOK_ACTION));
	59	+CJTWordpressEvents::$paths['subjects']['core'] = CJTOOLBOX_FRAMEWORK . '/events/subjects';
	60	+CJTWordpressEvents::$paths['observers']['core'] = CJTOOLBOX_FRAMEWORK . '/events/observers';
64	61
65	62	/**
66	63	* CJT Plugin interface.
67		-*
	64	+*
68	65	* The CJT Plugin is maximum deferred.
69	66	* All functionality here is just to detect if the request should be processed!
70		-*
	67	+*
71	68	* The main class is located css-js-toolbox.class.php cssJSToolbox class
72	69	* The plugin is fully developed using Model-View-Controller design pattern.
73		-*
	70	+*
74	71	* access.points directory has all the entry points that processed by the Plugin.
75		-*
	72	+*
76	73	* @package CJT
77	74	* @author Ahmed Said
78	75	* @version 6
79	76	*/
80		-class CJTPlugin extends CJTHookableClass
81		-{
	77	+class CJTPlugin extends CJTHookableClass {
82	78
83	79	/**
84		- *
	80	+ *
85	81	*/
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		-
	82	+ const DB_VERSION = '1.6';
	83	+
95	84	/**
96		- *
	85	+ *
97	86	*/
98		- const FW_Version = '5.0';
99		-
	87	+ const FW_Version = '4.0';
	88	+
100	89	/**
101		- *
	90	+ *
102	91	*/
103		- const VERSION = '12.0.7';
104		-
	92	+ const VERSION = '8.0' ;
	93	+
105	94	/**
106		- *
	95	+ *
107	96	*/
108	97	const DB_VERSION_OPTION_NAME = 'cjtoolbox_db_version';
109	98
110	99	/**
111		- *
	100	+ *
112	101	*/
113	102	const PLUGIN_REQUEST_ID = 'cjtoolbox';
114		-
	103	+
115	104	/**
116	105	* put your comment there...
117		- *
	106	+ *
118	107	* @var mixed
119	108	*/
120	109	protected $accessPoints;
121		-
	110	+
122	111	/**
123	112	* put your comment there...
124		- *
	113	+ *
125	114	* @var mixed
126	115	*/
127	116	protected $extensions;
128		-
	117	+
129	118	/**
130	119	* put your comment there...
131		- *
	120	+ *
132	121	* @var mixed
133	122	*/
134	123	protected $installed;
135		-
	124	+
136	125	/**
137	126	* put your comment there...
138		- *
	127	+ *
139	128	* @var CJTPlugin
140	129	*/
141	130	protected static $instance;
142		-
	131	+
143	132	/**
144	133	* put your comment there...
145		- *
	134	+ *
146	135	* @var mixed
147	136	*/
148	137	protected $mainAC;
149		-
	138	+
150	139	/**
151	140	* put your comment there...
152		- *
	141	+ *
153	142	* @var mixed
154	143	*/
155		- protected $onloaddbversion = array( 'parameters' => array( 'dbVersion' ) );
156		-
	144	+ protected $onloaddbversion = array('parameters' => array('dbVersion'));
	145	+
157	146	/**
158	147	* put your comment there...
159		- *
	148	+ *
160	149	* @var mixed
161	150	*/
162		- protected $onimportcontroller = array( 'parameters' => array( 'file' ) );
163		-
	151	+ protected $onimportbasefile = array('parameters' => array('file'));
	152	+
164	153	/**
165	154	* put your comment there...
166		- *
	155	+ *
167	156	* @var mixed
168	157	*/
169		- protected $onimportmodel = array( 'parameters' => array( 'file' ) );
170		-
	158	+ protected $onimportcontroller = array('parameters' => array('file'));
	159	+
171	160	/**
172	161	* put your comment there...
173		- *
	162	+ *
174	163	* @var mixed
175	164	*/
176		- protected $onload = array( 'parameters' => array( 'instance' ) );
	165	+ protected $onimportmodel = array('parameters' => array('file'));
	166	+
	167	+ /**
	168	+ * put your comment there...
	169	+ *
	170	+ * @var mixed
	171	+ */
	172	+ protected $onload = array('parameters' => array('instance'));
177	173
178	174	/**
179	175	* put your comment there...
180		- *
	176	+ *
181	177	*/
182		- protected function __construct()
183		- {
	178	+ protected function __construct() {
184	179	// Hookable!
185	180	parent::__construct();
186		-
187	181	// Allow access points to utilize from CJTPlugin functionality
188	182	// 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		-
	183	+ self::$instance = $this;
	184	+ // Read vars!
	185	+ $dbVersion = $this->onloaddbversion(get_option(self::DB_VERSION_OPTION_NAME));
	186	+ $this->installed = (($dbVersion) == self::DB_VERSION);
195	187	// Load plugin and all installed extensions!.
196	188	$this->load();
197	189	$this->loadExtensions();
198		-
199	190	// Run MAIN access point!
200	191	$this->main();
201	192	}
202		-
	193	+
203	194	/**
204	195	* put your comment there...
205		- *
	196	+ *
206	197	*/
207		- public function & extensions()
208		- {
209		- return $this->extensions;
	198	+ public function & extensions() {
	199	+ return $this->extensions;
210	200	}
211		-
	201	+
212	202	/**
213	203	* put your comment there...
214		- *
	204	+ *
215	205	*/
216		- public function getAccessPoint( $name )
217		- {
218		- return $this->accessPoints[ $name ];
	206	+ public function getAccessPoint($name) {
	207	+ return $this->accessPoints[$name];
219	208	}
220		-
	209	+
221	210	/**
222	211	* put your comment there...
223		- *
	212	+ *
224	213	*/
225		- public static function getInstance()
226		- {
227		-
228		- if ( ! self::$instance )
229		- {
	214	+ public static function getInstance() {
	215	+ if (!self::$instance) {
230	216	self::$instance = new CJTPlugin();
231	217	}
232		-
233	218	return self::$instance;
234	219	}
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		- }
	220	+
253	221	/**
254	222	* put your comment there...
255		- *
	223	+ *
256	224	*/
257		- public function isInstalled()
258		- {
259		- return $this->installed;
	225	+ public function isInstalled() {
	226	+ return $this->installed;
260	227	}
261		-
	228	+
262	229	/**
263	230	* put your comment there...
264		- *
	231	+ *
265	232	*/
266		- public function listen()
267		- {
	233	+ public function listen() {
268	234	// For now we've only admin access points! Future versions might has something changed!
269		- if ( is_admin() )
270		- {
271		-
	235	+ if (is_admin()) {
272	236	// Import access points core classes.
273	237	require_once 'framework/access-points/page.class.php';
274	238	require_once 'framework/access-points/directory-spider.class.php';
275		-
276	239	// Get access points!
277		- $accessPoints = CJTAccessPointsDirectorySpider::getInstance( 'CJT', CJTOOLBOX_ACCESS_POINTS );
278		-
	240	+ $accessPoints = CJTAccessPointsDirectorySpider::getInstance('CJT', CJTOOLBOX_ACCESS_POINTS);
279	241	// For every access point create instance and LISTEN to the request!
280		- foreach ( $accessPoints as $name => $info )
281		- {
	242	+ foreach ($accessPoints as $name => $info) {
282	243	/**
283	244	* @var CJTAccessPoint
284	245	*/
285		- $this->accessPoints[ $name ] = $point = $accessPoints->point()->listen();
286		-
	246	+ $this->accessPoints[$name] = $point = $accessPoints->point()->listen();
287	247	// We need to do some work with there is a connected access point.
288		- $point->onconnected = array( & $this, 'onconnected' );
289		-
	248	+ $point->onconnected = array(&$this, 'onconnected');
290	249	}
291		-
292	250	}
293		-
	251	+ // Chaining!
294	252	return $this;
295	253	}
296		-
	254	+
297	255	/**
298	256	* put your comment there...
299		- *
	257	+ *
300	258	*/
301		- protected function load()
302		- {
	259	+ protected function load() {
303	260	// Bootstrap the Plugin!
	261	+ require_once $this->onimportbasefile('css-js-toolbox.class.php');
304	262	cssJSToolbox::getInstance();
305		-
306	263	// 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		-
	264	+ require_once $this->onimportmodel(CJTOOLBOX_MVC_FRAMEWOK . '/model.inc.php');
	265	+ require_once $this->onimportcontroller(CJTOOLBOX_MVC_FRAMEWOK . '/controller.inc.php');
	266	+ // Chaining!
310	267	return $this;
311	268	}
312		-
	269	+
313	270	/**
314	271	* put your comment there...
315		- *
	272	+ *
316	273	*/
317		- protected function loadExtensions()
318		- {
	274	+ protected function loadExtensions() {
319	275	// Load extensions lib!
320	276	require_once 'framework/extensions/extensions.class.php';
321		-
322	277	$this->extensions = new CJTExtensions();
	278	+ // Load all extensions!
323	279	$this->extensions->load();
324		-
	280	+ // Chaining!
325	281	return $this;
326	282	}
327		-
	283	+
328	284	/**
329	285	* Run MAIN access point!
330		- *
	286	+ *
331	287	* @return $this
332	288	*/
333		- protected function main()
334		- {
	289	+ protected function main() {
335	290	// Fire laod event
336		- $this->onload( $this );
337		-
	291	+ $this->onload($this);
338	292	// Access point base class is a dependency!
339	293	require_once 'framework/access-points/access-point.class.php';
340		-
341	294	// Run Main Acces Point!
342	295	include_once 'access.points/main.accesspoint.php';
343		-
344	296	$this->mainAC = new CJTMainAccessPoint();
345	297	$this->mainAC->listen();
346	298	}
347		-
	299	+
348	300	/**
349		- * Called When any In-Listen-State (ILS) Access point is
	301	+ * Called When any In-Listen-State (ILS) Access point is
350	302	* connected (called by Wordpress hooking system).
351		- *
	303	+ *
352	304	* @return boolean TRUE.
353	305	*/
354		- public function onconnected( $observer, $state )
355		- {
356		- // Always connect the access point!
	306	+ public function onconnected($observer, $state) {
	307	+ // In all cases that we'll process the request load the localization file.
	308	+ load_plugin_textdomain(CJTOOLBOX_TEXT_DOMAIN, false, CJTOOLBOX_LANGUAGES);
	309	+ // Always connet the access point!
357	310	return $state;
358	311	}
359		-
	312	+
360	313	}// End Class
361	314
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	315	// Initialize events!
381		-CJTPlugin::define( 'CJTPlugin', array( 'hookType' => CJTWordpressEvents::HOOK_FILTER ) );
	316	+CJTPlugin::define('CJTPlugin', array('hookType' => CJTWordpressEvents::HOOK_FILTER));
382	317
383	318	// 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		-}
	319	+CJTPlugin::getInstance();