compatibility-php73 (#4)

* PHP7 convention : no more closing php tags

* cleanup of the changelog with markdown and adding v2.3 entry

* adding gitignore

* update version info

* update insert procedure to have the correct signature (PHP7)

.gitignore

@@ -0,0 +1,73 @@
+# Created by .ignore support plugin (hsz.mobi)
+### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+

admin/about.php

@@ -14,5 +14,4 @@
 include_once 'admin_header.php';
 
 $aboutObj = new icms_ipf_About();
-$aboutObj->render();
-?>
+$aboutObj->render();

admin/audio.php

@@ -85,5 +85,4 @@ function editaudio($audio_id = 0) {
 			break;
 	}
 	icms_cp_footer();
-}
-?>
+}

admin/category.php

@@ -97,5 +97,4 @@ function editcategory($category_id = 0) {
 			break;
 	}
 	icms_cp_footer();
-}
-?>
+}

admin/field.php

@@ -102,5 +102,4 @@ function editfield($field_id = 0) {
 			break;
 	}
 	icms_cp_footer();
-}
-?>
+}

admin/finduser.php

@@ -101,5 +101,4 @@
 		break;
 }
 
-icms_cp_footer();
-?>
+icms_cp_footer();

admin/permissions.php

@@ -57,5 +57,4 @@
 	}
 }
 $form->display();
-icms_cp_footer();
-?>
+icms_cp_footer();

admin/pictures.php

@@ -84,5 +84,4 @@ function editpictures($pictures_id = 0) {
 			break;
 	}
 	icms_cp_footer();
-}
-?>
+}

admin/regstep.php

@@ -90,5 +90,4 @@ function editregstep($regstep_id = 0) {
 			break;
 	}
 	icms_cp_footer();
-}
-?>
+}

admin/tribes.php

@@ -113,5 +113,4 @@ function mergetribes($tribes_id) {
 			break;
 	}
 	icms_cp_footer();
-}
-?>
+}

admin/tribeuser.php

@@ -86,5 +86,4 @@ function edittribeuser($tribeuser_id) {
 			break;
 	}
 	icms_cp_footer();
-}
-?>
+}

admin/videos.php

@@ -86,5 +86,4 @@ function editvideos($videos_id = 0) {
 			break;
 	}
 	icms_cp_footer();
-}
-?>
+}

admin/visibility.php

@@ -61,5 +61,4 @@
 
 $icmsAdminTpl->display("db:profile_admin_visibility.html");
 
-icms_cp_footer();
-?>
+icms_cp_footer();

audio.php

@@ -137,5 +137,4 @@ function editaudio($audioObj, $hideForm=false) {
 }
 $icmsTpl->assign('profile_category_path', _MD_PROFILE_AUDIOS);
 
-include_once 'footer.php';
-?>
+include_once 'footer.php';

blocks/blocks.php

@@ -105,5 +105,4 @@ function b_profile_usermenu_show($options) {
 	$block[$i]['url'] = ICMS_URL."/user.php?op=logout";
 
 	return $block;
-}
-?>
+}

class/Audio.php

@@ -107,5 +107,4 @@ public function toArray() {
 		$ret['audio_sender_link'] = $this->getAudioSender();
 		return $ret;
 	}
-}
-?>
+}

class/AudioHandler.php

@@ -128,5 +128,4 @@ protected function afterDelete(&$obj) {
 
 		return true;
 	}
-}
-?>
+}

class/Category.php

@@ -60,5 +60,4 @@ public function getCat_weightControl() {
 		$control = new icms_form_elements_Text('', 'cat_weight[]', 5, 4, $this->getVar('cat_weight'));
 		return $control->render();
 	}
-}
-?>
+}

class/CategoryHandler.php

@@ -37,5 +37,4 @@ protected function beforeDelete(&$obj) {
 		$obj->setErrors(sprintf(_AM_PROFILE_CATEGORY_NOTDELETED_FIELDS, $fields_count));
 		return false;
 	}
-}
-?>
+}

class/Configs.php

@@ -78,5 +78,4 @@ public function userCanEditAndDelete() {
 		if ($profile_isAdmin) return true;
 		return $this->getVar('config_uid', 'e') == icms::$user->getVar('uid');
 	}
-}
-?>
+}

class/ConfigsHandler.php

@@ -203,5 +203,4 @@ protected function afterSave(&$obj) {
 		}
 		return true;
 	}
-}
-?>
+}

class/Field.php

@@ -420,5 +420,4 @@ public function getField_weightControl() {
 		$control = new icms_form_elements_Text('', 'field_weight[]', 5, 4, $this->getVar('field_weight'));
 		return $control->render();
 	}
-}
-?>
+}

class/FieldHandler.php

@@ -59,8 +59,8 @@ public function getProfileFields(&$thisUser) {
 			$first_category = true;
 			for ($j = 0; $j < count($fields); $j++) {
 				$value = $fields[$j]->getOutputValue($thisUser, $profile);
-				if ($fields[$j]->getVar('field_show') && $fields[$j]->getVar('catid') == $categories[$i]->getVar('catid') && ($module->config['show_empty'] || trim($value) || $value == '0')) {;
-					if ($first_category) $rtn[$i]['title'] = $categories[$i]->getVar('cat_title');
+				if ($fields[$j]->getVar('field_show') && $fields[$j]->getVar('catid') == $categories[$i]->getVar('catid') && ($module->config['show_empty'] || trim($value) || $value == '0')) {
+                    if ($first_category) $rtn[$i]['title'] = $categories[$i]->getVar('cat_title');
 					$first_category = false;
 					$rtn[$i]['fields'][$j]['image'] = $fields[$j]->getImage();
 					$rtn[$i]['fields'][$j]['title'] = $fields[$j]->getVar('field_title');
@@ -98,7 +98,7 @@ public function &loadFields($force_update = false) {
 	 *
 	 * @return bool FALSE if failed, TRUE if already present and unchanged or successful
 	 */
-	public function insert(&$obj, $force = false) {
+	public function insert(&$obj, $force = false, $checkObject = true, $debug = false) {
 		$profile_handler = icms_getmodulehandler('profile', basename(dirname(dirname(__FILE__))), 'profile');
 
 		$obj->cleanVars();
@@ -295,5 +295,4 @@ protected function afterDelete(&$obj) {
 		if (!empty($imgUrl)) unlink($imgPath.$imgUrl);
 		return true;
 	}
-}
-?>
+}

class/Friendship.php

@@ -130,5 +130,4 @@ public function toArray() {
 		$ret['userCanEditAndDelete'] = $this->userCanEditAndDelete();
 		return $ret;
 	}
-}
-?>
+}

class/FriendshipHandler.php

@@ -125,5 +125,4 @@ public function getFriendship_statusArray() {
 	function userCanSubmit() {
 		return is_object(icms::$user);
 	}
-}
-?>
+}

class/Pictures.php

@@ -106,5 +106,4 @@ public function toArray() {
 		$ret['userCanEditAndDelete'] = $this->userCanEditAndDelete();
 		return $ret;
 	}
-}
-?>
+}

class/PicturesHandler.php

@@ -252,5 +252,4 @@ protected function afterDelete(&$obj) {
 
 		return true;
 	}
-}
-?>
+}

class/Profile.php

@@ -30,5 +30,4 @@ public function __construct($fields) {
 			}
 		}
 	}
-}
-?>
+}

class/ProfileHandler.php

@@ -59,7 +59,7 @@ public function &loadFields() {
 	 * @param bool $checkObject check if the object is dirty and clean the attributes
 	 * @return bool FALSE if failed, TRUE if already present and unchanged or successful
 	 */
-	public function insert(&$obj, $force = false, $checkObject = true) {
+	public function insert(&$obj, $force = false, $checkObject = true, $debug = false) {
 		$uservars = $this->getUserVars();
 		foreach ($uservars as $var) unset($obj->vars[$var]);
 		if (count($obj->vars) == 1) return true;
@@ -145,5 +145,4 @@ public function search($criteria, $searchvars) {
 
 		return array($users, $profiles, $count);
 	}
-}
-?>
+}

class/Regstep.php

@@ -70,5 +70,4 @@ public function getCustomStepSave(){
 	public function getCustomStepName(){
 		return $this->getVar('step_name');
 	}
-}
-?>
+}

class/RegstepHandler.php

@@ -30,7 +30,7 @@ public function __construct(&$db) {
 	 * @param bool $force
 	 * @return bool
 	 */
-	public function insert(&$obj, $force = false) {
+	public function insert(&$obj, $force = false, $checkObject = true, $debug = false) {
 		if (parent::insert($obj, $force)) {
 			if ($obj->getVar('step_save') == 1) return $this->updateAll('step_save', 0, new icms_db_criteria_Item('step_id', $obj->getVar('step_id'), "!="));
 			return true;
@@ -62,5 +62,4 @@ public function delete(&$obj, $force = false) {
 	public function getListForFields() {
 		return array_merge(array(0 => '---'), $this->getList());
 	}
-}
-?>
+}

class/Smartuser.php

@@ -58,7 +58,4 @@ function &getFields(){
 		}
 		return $fields_array;
 	}
-}
-
-
-?>
+}