A large, but relatively minor update to remove unnecessary PHP4 glue …

…code which used a conditional check to do something PHP5 already does. Primarily all the old subsytems and the forms/controls had this old sytle code. This method is no longer necessary, hence the purpose of the include_once/require_once. [exponentcms#261 state:resolved milestone:'Release Candidate 2']
karamdeep-singh · Aug 1, 2011 · 1892bac · 1892bac
1 parent aaee8b9
commit 1892bac
Show file tree

Hide file tree

Showing 170 changed files with 616 additions and 388 deletions.
diff --git a/cron/send_reminders.php b/cron/send_reminders.php
@@ -78,8 +78,10 @@
 	// $viewparams = array("type"=>"byday", "range"=>"week");
 // }
 
-if (!defined("SYS_DATETIME")) include_once(BASE . "subsystems/datetime.php");
-if (!defined('SYS_SORTING')) include_once(BASE . 'subsystems/sorting.php');
+//if (!defined("SYS_DATETIME")) include_once(BASE . "subsystems/datetime.php");
+include_once(BASE . "subsystems/datetime.php");
+//if (!defined('SYS_SORTING')) include_once(BASE . 'subsystems/sorting.php');
+include_once(BASE . 'subsystems/sorting.php');
 
 if (!function_exists("exponent_sorting_byEventStartAscending")) {
 	function exponent_sorting_byEventStartAscending($a,$b) {
@@ -394,7 +396,8 @@ function exponent_sorting_byEventStartAscending($a,$b) {
 	"From"=>$from = $config->email_from_reminder,
 	"Reply-to"=>$reply = $config->email_reply_reminder
 	);
-if (!defined("SYS_USERS")) require_once(BASE . "subsystems/users.php");
+//if (!defined("SYS_USERS")) require_once(BASE . "subsystems/users.php");
+require_once(BASE . "subsystems/users.php");
 
 // set up the html message
 $template->assign("showdetail",$config->email_showdetail);

diff --git a/datatypes/calendar.php b/datatypes/calendar.php
@@ -24,8 +24,9 @@ static function form($object) {
 
 		$i18n = exponent_lang_loadFile('datatypes/calendar.php');
 
-		if (!defined('SYS_FORMS')) require_once(BASE.'subsystems/forms.php');
-		exponent_forms_initialize();
+//		if (!defined('SYS_FORMS')) require_once(BASE.'subsystems/forms.php');
+		require_once(BASE.'subsystems/forms.php');
+//		exponent_forms_initialize();
 
 		$form = new form();
 		if (!isset($object->id)) {
@@ -75,7 +76,8 @@ static function form($object) {
 			$template = new template('calendarmodule','_recur_dates');
 			global $db;
 			$eventdates = $db->selectObjects('eventdate','event_id='.$object->id);
-			if (!defined('SYS_SORTING')) require_once(BASE.'subsystems/sorting.php');
+//			if (!defined('SYS_SORTING')) require_once(BASE.'subsystems/sorting.php');
+			require_once(BASE.'subsystems/sorting.php');
 			if (!function_exists('exponent_sorting_byDateAscending')) {
 				function exponent_sorting_byDateAscending($a,$b) {
 					return ($a->date > $b->date ? 1 : -1);
@@ -103,8 +105,9 @@ function exponent_sorting_byDateAscending($a,$b) {
 	}
 
 	static function update($values,$object) {
-		if (!defined('SYS_FORMS')) require_once(BASE.'subsystems/forms.php');
-		exponent_forms_initialize();
+//		if (!defined('SYS_FORMS')) require_once(BASE.'subsystems/forms.php');
+		require_once(BASE.'subsystems/forms.php');
+//		exponent_forms_initialize();
 
 		$object->title = $values['title'];
 

diff --git a/datatypes/calendarmodule_config.php b/datatypes/calendarmodule_config.php
@@ -22,8 +22,9 @@ class calendarmodule_config {
 	function form($object) {
 		$i18n = exponent_lang_loadFile('datatypes/calendarmodule_config.php');
 
-		if (!defined('SYS_FORMS')) require_once(BASE.'subsystems/forms.php');
-		exponent_forms_initialize();
+//		if (!defined('SYS_FORMS')) require_once(BASE.'subsystems/forms.php');
+		require_once(BASE.'subsystems/forms.php');
+//		exponent_forms_initialize();
 
 		global $db;
 		$tag_collections = $db->selectObjects("tag_collections");

diff --git a/datatypes/database_importer.php b/datatypes/database_importer.php
@@ -23,8 +23,9 @@ function form() {
 
 		exponent_lang_loadDictionary('modules','database');
 
-		if (!defined('SYS_FORMS')) require_once(BASE.'subsystems/forms.php');
-		exponent_forms_initialize();
+//		if (!defined('SYS_FORMS')) require_once(BASE.'subsystems/forms.php');
+		require_once(BASE.'subsystems/forms.php');
+//		exponent_forms_initialize();
 
 		$form = new form();
 		//Form is created to collect information from the user

diff --git a/datatypes/file.php b/datatypes/file.php
@@ -22,8 +22,9 @@ class file {
 	static function update($name,$dest,$object,$destname = null,$force=false) {
 		$i18n = exponent_lang_loadFile('datatypes/file.php');
 
-		if (!defined('SYS_FILES')) include_once(BASE.'subsystems/files.php');
-
+//		if (!defined('SYS_FILES')) include_once(BASE.'subsystems/files.php');
+		include_once(BASE.'subsystems/files.php');
+
 		// Get the filename, if it was passed in the update() call.  Otherwise, fallback
 		if ($destname == null) {
 			$object->filename = $_FILES[$name]['name'];

diff --git a/datatypes/file_collection.php b/datatypes/file_collection.php
@@ -22,8 +22,9 @@ class file_collection {
 	function form($object) {
 		$i18n = exponent_lang_loadFile('datatypes/file_collection.php');
 
-		if (!defined('SYS_FORMS')) require_once(BASE.'subsystems/forms.php');
-		exponent_forms_initialize();
+//		if (!defined('SYS_FORMS')) require_once(BASE.'subsystems/forms.php');
+		require_once(BASE.'subsystems/forms.php');
+//		exponent_forms_initialize();
 
 		$form = new form();
 		if (!isset($object->id)) {

diff --git a/datatypes/formbuilder_form.php b/datatypes/formbuilder_form.php
@@ -23,10 +23,12 @@ static function form($object) {
 		$i18n = exponent_lang_loadFile('datatypes/formbuilder_form.php');
 
 		global $db;
-		if (!defined('SYS_FORMS')) require_once(BASE.'subsystems/forms.php');
-		if (!defined('SYS_USERS')) require_once(BASE.'subsystems/users.php');
+//		if (!defined('SYS_FORMS')) require_once(BASE.'subsystems/forms.php');
+//		if (!defined('SYS_USERS')) require_once(BASE.'subsystems/users.php');
+		require_once(BASE.'subsystems/forms.php');
+		require_once(BASE.'subsystems/users.php');
 		//global $user;
-		exponent_forms_initialize();
+//		exponent_forms_initialize();
 
 		$form = new form();
 		if (!isset($object->id)) {
@@ -125,8 +127,9 @@ static function update($values,$object) {
 	static function updateTable($object) {
 		global $db;
 
-		if (!defined('SYS_FORMS')) require_once(BASE.'subsystems/forms.php');
-		exponent_forms_initialize();
+//		if (!defined('SYS_FORMS')) require_once(BASE.'subsystems/forms.php');
+		require_once(BASE.'subsystems/forms.php');
+//		exponent_forms_initialize();
 		if ($object->is_saved == 1) {
 			$datadef =  array(
 				'id'=>array(

diff --git a/datatypes/formbuilder_report.php b/datatypes/formbuilder_report.php
@@ -23,8 +23,9 @@ static function form($object) {
 		$i18n = exponent_lang_loadFile('datatypes/formbuilder_report.php');
 
 		global $db;
-		if (!defined('SYS_FORMS')) require_once(BASE.'subsystems/forms.php');
-		exponent_forms_initialize();
+//		if (!defined('SYS_FORMS')) require_once(BASE.'subsystems/forms.php');
+		require_once(BASE.'subsystems/forms.php');
+//		exponent_forms_initialize();
 
 		$form = new form();
 		if (!isset($object->id)) {
@@ -77,8 +78,9 @@ static function form($object) {
 	}
 
 	static function update($values, $object) {
-		if (!defined('SYS_FORMS')) require_once(BASE.'subsystems/forms.php');
-		exponent_forms_initialize();
+//		if (!defined('SYS_FORMS')) require_once(BASE.'subsystems/forms.php');
+		require_once(BASE.'subsystems/forms.php');
+//		exponent_forms_initialize();
 		$object->name = $values['name'];
 		$object->description = $values['description'];
 		$object->text = htmleditorcontrol::parseData('text',$values);

diff --git a/datatypes/poll_answer.php b/datatypes/poll_answer.php
@@ -34,8 +34,9 @@
 
 class poll_answer {
 	static function form($object) {
-		if (!defined('SYS_FORMS')) require_once(BASE.'subsystems/forms.php');
-		exponent_forms_initialize();
+//		if (!defined('SYS_FORMS')) require_once(BASE.'subsystems/forms.php');
+		require_once(BASE.'subsystems/forms.php');
+//		exponent_forms_initialize();
 
 		$form = new form();
 		if (!isset($object->id)) {

diff --git a/datatypes/poll_question.php b/datatypes/poll_question.php
@@ -34,8 +34,9 @@
 
 class poll_question {
 	static function form($object) {
-		if (!defined('SYS_FORMS')) require_once(BASE.'subsystems/forms.php');
-		exponent_forms_initialize();
+//		if (!defined('SYS_FORMS')) require_once(BASE.'subsystems/forms.php');
+		require_once(BASE.'subsystems/forms.php');
+//		exponent_forms_initialize();
 
 		$form = new form();
 		if (!isset($object->id)) {

diff --git a/datatypes/section.php b/datatypes/section.php
@@ -74,7 +74,8 @@ function _commonForm(&$object) {
 			if (count($sections) && $object->parent >= 0) {
 				// Initialize the sorting subsystem so that we can order the sections
 				// by rank, ascending, and get the proper ordering.
-				if (!defined('SYS_SORTING')) require_once(BASE.'subsystems/sorting.php');
+//				if (!defined('SYS_SORTING')) require_once(BASE.'subsystems/sorting.php');
+				require_once(BASE.'subsystems/sorting.php');
 				usort($sections,'exponent_sorting_byRankAscending');
 
 				// Generate the Position dropdown array.
@@ -107,8 +108,9 @@ static function moveStandaloneForm($object = null) {
 		$i18n = exponent_lang_loadFile('datatypes/section.php');
 
 		// Initialize the forms subsystem for use.
-		if (!defined('SYS_FORMS')) require_once(BASE.'subsystems/forms.php');
-		exponent_forms_initialize();
+//		if (!defined('SYS_FORMS')) require_once(BASE.'subsystems/forms.php');
+		require_once(BASE.'subsystems/forms.php');
+//		exponent_forms_initialize();
 
 		$form = section::_commonForm($object);
 		// the name and sef_name are already set in the stand-alone page
@@ -121,7 +123,8 @@ static function moveStandaloneForm($object = null) {
 			$standalones[$s->id] = $s->name;
 		}
 
-		if (!defined('SYS_SORTING')) include_once(BASE.'subsystems/sorting.php');
+//		if (!defined('SYS_SORTING')) include_once(BASE.'subsystems/sorting.php');
+		include_once(BASE.'subsystems/sorting.php');
 		$form->register('page',$i18n['standalone_page'],new dropdowncontrol(0,$standalones));
 		$form->register('submit','',new buttongroupcontrol($i18n['save'],'',$i18n['cancel']));
 		return $form;
@@ -142,8 +145,9 @@ static function form($object = null) {
 		$i18n = exponent_lang_loadFile('datatypes/section.php');
 
 		// Initialize the forms subsystem for use.
-		if (!defined('SYS_FORMS')) require_once(BASE.'subsystems/forms.php');
-		exponent_forms_initialize();
+//		if (!defined('SYS_FORMS')) require_once(BASE.'subsystems/forms.php');
+		require_once(BASE.'subsystems/forms.php');
+//		exponent_forms_initialize();
 
 		// Grab the basic form that all page types share
 		// This has the name and positional dropdowns registered.
@@ -192,8 +196,9 @@ static function externalAliasForm($object = null) {
 		$i18n = exponent_lang_loadFile('datatypes/section.php');
 
 		// Initialize the forms subsystem for use.
-		if (!defined('SYS_FORMS')) require_once(BASE.'subsystems/forms.php');
-		exponent_forms_initialize();
+//		if (!defined('SYS_FORMS')) require_once(BASE.'subsystems/forms.php');
+		require_once(BASE.'subsystems/forms.php');
+//		exponent_forms_initialize();
 
 		// Grab the basic form that all page types share
 		// This has the name and positional dropdowns registered.
@@ -232,8 +237,9 @@ static function internalAliasForm($object = null) {
 		$i18n = exponent_lang_loadFile('datatypes/section.php');
 
 		// Initialize the forms subsystem for use.
-		if (!defined('SYS_FORMS')) require_once(BASE.'subsystems/forms.php');
-		exponent_forms_initialize();
+//		if (!defined('SYS_FORMS')) require_once(BASE.'subsystems/forms.php');
+		require_once(BASE.'subsystems/forms.php');
+//		exponent_forms_initialize();
 
 		// Initialization
 		if (!isset($object->id)) {
@@ -275,8 +281,9 @@ static function pagesetForm($object = null) {
 		$i18n = exponent_lang_loadFile('datatypes/section.php');
 
 		// Initialize the forms subsystem for use.
-		if (!defined('SYS_FORMS')) require_once(BASE.'subsystems/forms.php');
-		exponent_forms_initialize();
+//		if (!defined('SYS_FORMS')) require_once(BASE.'subsystems/forms.php');
+		require_once(BASE.'subsystems/forms.php');
+//		exponent_forms_initialize();
 
 		// Grab the basic form that all page types share
 		// This has the name and positional dropdowns registered.

diff --git a/datatypes/section_template.php b/datatypes/section_template.php
@@ -22,8 +22,9 @@ class section_template {
 	static function form($object = null) {
 		$i18n = exponent_lang_loadFile('datatypes/section_template.php');
 
-		if (!defined('SYS_FORMS')) require_once(BASE.'subsystems/forms.php');
-		exponent_forms_initialize();
+//		if (!defined('SYS_FORMS')) require_once(BASE.'subsystems/forms.php');
+		require_once(BASE.'subsystems/forms.php');
+//		exponent_forms_initialize();
 
 		$form = new form();
 		if (!isset($object->id)) {
@@ -49,7 +50,8 @@ static function form($object = null) {
 			$sections = $db->selectObjects('section_template','parent='.$object->parent);
 
 			if (count($sections)) {
-				if (!defined('SYS_SORTING')) require_once(BASE.'subsystems/sorting.php');
+//				if (!defined('SYS_SORTING')) require_once(BASE.'subsystems/sorting.php');
+				require_once(BASE.'subsystems/sorting.php');
 				usort($sections,'exponent_sorting_byRankAscending');
 
 				$dd = array($i18n['position_top']);

diff --git a/datatypes/simplepollmodule_config.php b/datatypes/simplepollmodule_config.php
@@ -34,8 +34,9 @@
 
 class simplepollmodule_config {
 	function form($object) {
-		if (!defined('SYS_FORMS')) require_once(BASE.'subsystems/forms.php');
-		exponent_forms_initialize();
+//		if (!defined('SYS_FORMS')) require_once(BASE.'subsystems/forms.php');
+		require_once(BASE.'subsystems/forms.php');
+//		exponent_forms_initialize();
 
 		$form = new form();
 		if (!isset($object->id)) {

diff --git a/edit_page.php b/edit_page.php
@@ -26,7 +26,8 @@
 include_once('exponent.php');
 if (!defined("EXPONENT")) exit("");
 
-if (!defined('SYS_THEME')) include_once(BASE.'subsystems/theme.php');
+//if (!defined('SYS_THEME')) include_once(BASE.'subsystems/theme.php');
+include_once(BASE.'subsystems/theme.php');
 
 $id = -1;
 if (isset($_GET['sitetemplate_id'])) {

diff --git a/exponent.php b/exponent.php
@@ -38,7 +38,8 @@
 exponent_sessions_initialize();
 
 // Initialize the theme subsystem
-if (!defined('SYS_THEME')) require_once(BASE.'subsystems/theme.php');
+//if (!defined('SYS_THEME')) require_once(BASE.'subsystems/theme.php');
+require_once(BASE.'subsystems/theme.php');
 
 // Initialize the language subsystem
 require_once(BASE.'subsystems/lang.php');
@@ -70,7 +71,8 @@
 require_once(BASE.'subsystems/permissions.php');
 
 // Initialize the Flow/History Subsystem.
-if (!defined('SYS_FLOW')) require_once(BASE.'subsystems/flow.php');
+//if (!defined('SYS_FLOW')) require_once(BASE.'subsystems/flow.php');
+require_once(BASE.'subsystems/flow.php');
 /**
  * the browsing history object
  * @global expHistory $history
@@ -82,7 +84,8 @@
 require_once(BASE.'subsystems/users.php');
 
 // Initialize the javascript subsystem
-if (!defined('SYS_JAVASCRIPT')) require_once(BASE.'subsystems/javascript.php');
+//if (!defined('SYS_JAVASCRIPT')) require_once(BASE.'subsystems/javascript.php');
+require_once(BASE.'subsystems/javascript.php');
 
 // Initialize the MVC framework
 require_once(BASE.'framework/core/expFramework.php');

diff --git a/framework/core/datatypes/expFile.php b/framework/core/datatypes/expFile.php
@@ -353,7 +353,8 @@ public static function fileUpload( $_postName = null,
                                        $_destDir  = null
                                       ) {
 
-        if (!defined('SYS_FILES')) include_once(BASE.'subsystems/files.php');
+//        if (!defined('SYS_FILES')) include_once(BASE.'subsystems/files.php');
+        include_once(BASE.'subsystems/files.php');
 
         // Make sure something was sent first off...
         if ( ( !isset($_SERVER['CONTENT_TYPE'] )) ||

diff --git a/framework/core/datatypes/expRss.php b/framework/core/datatypes/expRss.php
@@ -63,7 +63,8 @@ public function beforeSave() {
 
     public function getFeedItems() {
 //        if (!defined('SYS_RSS')) include_once('core_rss.php');
-        if (!defined('SYS_RSS')) require_once(BASE.'external/feedcreator.class.php');
+//        if (!defined('SYS_RSS')) require_once(BASE.'external/feedcreator.class.php');
+        require_once(BASE.'external/feedcreator.class.php');
 
         // get all the feeds available to this expRss object
         $feeds = $this->getFeeds();