Dolibarr / dolibarr

htdocs/projet/element.php

Spacing +1 added lines, -1 removed lines

@@ -215,7 +215,7 @@
 if (!empty($_SESSION['pageforbacktolist']) && !empty($_SESSION['pageforbacktolist']['project'])) {
 	$tmpurl = $_SESSION['pageforbacktolist']['project'];
 	$tmpurl = preg_replace('/__SOCID__/', $object->socid, $tmpurl);
-	$linkback = '<a href="'.$tmpurl.(preg_match('/\?/', $tmpurl) ? '&' : '?'). 'restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.$tmpurl.(preg_match('/\?/', $tmpurl) ? '&' : '?').'restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 } else {
 	$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 }

htdocs/modulebuilder/index.php

Spacing +74 added lines, -74 removed lines

@@ -74,12 +74,12 @@ 
 $modulename = dol_sanitizeFileName(GETPOST('modulename', 'alpha'));
 $objectname = dol_sanitizeFileName(GETPOST('objectname', 'alpha'));
 $dicname = dol_sanitizeFileName(GETPOST('dicname', 'alpha'));
-$editorname= GETPOST('editorname', 'alpha');
-$editorurl= GETPOST('editorurl', 'alpha');
-$version= GETPOST('version', 'alpha');
-$family= GETPOST('family', 'alpha');
-$picto= GETPOST('idpicto', 'alpha');
-$idmodule= GETPOST('idmodule', 'alpha');
+$editorname = GETPOST('editorname', 'alpha');
+$editorurl = GETPOST('editorurl', 'alpha');
+$version = GETPOST('version', 'alpha');
+$family = GETPOST('family', 'alpha');
+$picto = GETPOST('idpicto', 'alpha');
+$idmodule = GETPOST('idmodule', 'alpha');
 
 // Security check
 if (!isModEnabled('modulebuilder')) {
@@ -249,7 +249,7 @@ 
 
 		// Copy last html.formsetup.class.php' to backport folder
 		$tryToCopyFromSetupClass = true;
-		$backportDest = $destdir .'/backport/v16/core/class';
+		$backportDest = $destdir.'/backport/v16/core/class';
 		$backportFileSrc = DOL_DOCUMENT_ROOT.'/core/class/html.formsetup.class.php';
 		$backportFileDest = $backportDest.'/html.formsetup.class.php';
 		$result = dol_mkdir($backportDest);
@@ -387,7 +387,7 @@ 
 
 		clearstatcache(true);
 		if (function_exists('opcache_invalidate')) {
-			opcache_reset();	// remove the include cache hell !
+			opcache_reset(); // remove the include cache hell !
 		}
 
 		header("Location: ".$_SERVER["PHP_SELF"].'?module='.$modulename);
@@ -1290,7 +1290,7 @@ 
 			}
 			$rights = $moduleobj->rights;
 			$moduledescriptorfile = $destdir.'/core/modules/mod'.$module.'.class.php';
-			$checkComment=checkExistComment($moduledescriptorfile, 1);
+			$checkComment = checkExistComment($moduledescriptorfile, 1);
 			if ($checkComment < 0) {
 				setEventMessages($langs->trans("WarningCommentNotFound", $langs->trans("Permissions"), "mod".$module."class.php"), null, 'warnings');
 			} else {
@@ -1456,7 +1456,7 @@ 
 			}
 		}
 			$menus = $moduleobj->menu;
-			$counter = 0 ;
+			$counter = 0;
 		foreach ($menus as $menu) {
 			if ($menu['leftmenu'] == strtolower($objectname)) {
 				$counter++;
@@ -1601,7 +1601,7 @@ 
 		} else {
 			createNewDictionnary($module, $moduledescriptorfile, $newdicname, $dictionaries);
 			if (function_exists('opcache_invalidate')) {
-				opcache_reset();	// remove the include cache hell !
+				opcache_reset(); // remove the include cache hell !
 			}
 			clearstatcache(true);
 			header("Location: ".DOL_URL_ROOT.'/modulebuilder/index.php?tab=dictionaries&module='.$module.($forceddirread ? '@'.$dirread : ''));
@@ -1675,7 +1675,7 @@ 
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Type")), null, 'errors');
 		}
 
-		if (!$error && !GETPOST('regenerateclasssql')&& !GETPOST('regeneratemissing')) {
+		if (!$error && !GETPOST('regenerateclasssql') && !GETPOST('regeneratemissing')) {
 			$addfieldentry = array(
 				'name'=>GETPOST('propname', 'aZ09'),
 				'label'=>GETPOST('proplabel', 'alpha'),
@@ -1690,7 +1690,7 @@ 
 				'isameasure'=>GETPOST('propisameasure', 'int'),
 				'comment'=>GETPOST('propcomment', 'alpha'),
 				'help'=>GETPOST('prophelp', 'alpha'),
-				'css'=>GETPOST('propcss', 'alpha'),        // Can be 'maxwidth500 widthcentpercentminusxx' for example
+				'css'=>GETPOST('propcss', 'alpha'), // Can be 'maxwidth500 widthcentpercentminusxx' for example
 				'cssview'=>GETPOST('propcssview', 'alpha'),
 				'csslist'=>GETPOST('propcsslist', 'alpha'),
 				'default'=>GETPOST('propdefault', 'restricthtml'),
@@ -1841,7 +1841,7 @@ 
 
 			clearstatcache(true);
 			if (function_exists('opcache_invalidate')) {
-				opcache_reset();	// remove the include cache hell !
+				opcache_reset(); // remove the include cache hell !
 			}
 
 			header("Location: ".$_SERVER["PHP_SELF"].'?module=deletemodule');
@@ -1933,7 +1933,7 @@ 
 
 			clearstatcache(true);
 			if (function_exists('opcache_invalidate')) {
-				opcache_reset();	// remove the include cache hell !
+				opcache_reset(); // remove the include cache hell !
 			}
 			$resultko = 0;
 			foreach ($filetodelete as $tmpfiletodelete) {
@@ -2010,11 +2010,11 @@ 
 	}
 
 	if (!empty(GETPOST('dictionnarykey'))) {
-		$newdicname = $dicts['tabname'][GETPOST('dictionnarykey')-1];
+		$newdicname = $dicts['tabname'][GETPOST('dictionnarykey') - 1];
 	}
 
 	//chercher la table dicname
-	$query = "SHOW TABLES LIKE '" . MAIN_DB_PREFIX.strtolower($newdicname) . "'";
+	$query = "SHOW TABLES LIKE '".MAIN_DB_PREFIX.strtolower($newdicname)."'";
 	$checkTable = $db->query($query);
 	if ($checkTable && $db->num_rows($checkTable) <= 0) {
 		$error++;
@@ -2055,7 +2055,7 @@ 
 			setEventMessages($langs->trans("WarningCommentNotFound", $langs->trans("Dictionaries"), "mod".$module."class.php"), null, 'warnings');
 		} else {
 			if (function_exists('opcache_invalidate')) {
-				opcache_reset();	// remove the include cache hell !
+				opcache_reset(); // remove the include cache hell !
 			}
 			clearstatcache(true);
 			header("Location: ".DOL_URL_ROOT.'/modulebuilder/index.php?tab=dictionaries&module='.$module.($forceddirread ? '@'.$dirread : ''));
@@ -2064,7 +2064,7 @@ 
 	}
 }
 if ($dirins && $action == 'updatedictionary' && GETPOST('dictionnarykey')) {
-	$keydict = GETPOST('dictionnarykey') - 1 ;
+	$keydict = GETPOST('dictionnarykey') - 1;
 
 	$pathtofile = $listofmodules[strtolower($module)]['moduledescriptorrelpath'];
 	$destdir = $dirins.'/'.strtolower($module);
@@ -2098,7 +2098,7 @@ 
 				setEventMessages($langs->trans("DictionaryNameUpdated", ucfirst(GETPOST('tablib'))), null);
 			}
 			if (function_exists('opcache_invalidate')) {
-				opcache_reset();	// remove the include cache hell !
+				opcache_reset(); // remove the include cache hell !
 			}
 			clearstatcache(true);
 			header("Location: ".DOL_URL_ROOT.'/modulebuilder/index.php?tab=dictionaries&module='.$module.($forceddirread ? '@'.$dirread : ''));
@@ -2218,13 +2218,13 @@ 
 
 	//check existing object permission
 	$counter = 0;
-	$permsForObject =array();
+	$permsForObject = array();
 	$permissions = $moduleobj->rights;
 	$allObject = array();
 
 	$countPerms = count($permissions);
 
-	for ($i =0; $i<$countPerms; $i++) {
+	for ($i = 0; $i < $countPerms; $i++) {
 		if ($permissions[$i][4] == $objectForPerms) {
 			$counter++;
 			if (count($permsForObject) < 3) {
@@ -2236,7 +2236,7 @@ 
 
 	// check if label of object already exists
 	$countPermsObj = count($permsForObject);
-	for ($j = 0; $j<$countPermsObj; $j++) {
+	for ($j = 0; $j < $countPermsObj; $j++) {
 		if (in_array($crud, $permsForObject[$j])) {
 			$error++;
 			setEventMessages($langs->trans("ErrorExistingPermission", $langs->transnoentities($crud), $langs->transnoentities($objectForPerms)), null, 'errors');
@@ -2273,7 +2273,7 @@ 
 
 		clearstatcache(true);
 		if (function_exists('opcache_invalidate')) {
-			opcache_reset();	// remove the include cache hell !
+			opcache_reset(); // remove the include cache hell !
 		}
 		header("Location: ".DOL_URL_ROOT.'/modulebuilder/index.php?tab=permissions&module='.$module);
 		exit;
@@ -2282,7 +2282,7 @@ 
 
 
 // Update permission
-if ($dirins && GETPOST('action') == 'update_right' && GETPOST('modifyright')&& empty($cancel)) {
+if ($dirins && GETPOST('action') == 'update_right' && GETPOST('modifyright') && empty($cancel)) {
 	$error = 0;
 	// load class and check if right exist
 	$pathtofile = $listofmodules[strtolower($module)]['moduledescriptorrelpath'];
@@ -2325,21 +2325,21 @@ 
 	}
 
 	$permissions = $moduleobj->rights;
-	$key =(int) GETPOST('counter')-1;
+	$key = (int) GETPOST('counter') - 1;
 	//get permission want to delete from permissions array
 	$x1 = $permissions[$key][1];
 	$x2 = $permissions[$key][4];
 	$x3 = $permissions[$key][5];
 		//check existing object permission
 		$counter = 0;
-		$permsForObject =array();
+		$permsForObject = array();
 		$permissions = $moduleobj->rights;
 		$firstRight = 0;
 		$existRight = 0;
 		$allObject = array();
 
 		$countPerms = count($permissions);
-	for ($i =0; $i<$countPerms; $i++) {
+	for ($i = 0; $i < $countPerms; $i++) {
 		if ($permissions[$i][4] == $objectForPerms) {
 			$counter++;
 			if (count($permsForObject) < 3) {
@@ -2351,7 +2351,7 @@ 
 
 	if ($label != $x1 && $crud != $x3) {
 		$countPermsObj = count($permsForObject);
-		for ($j = 0; $j<$countPermsObj; $j++) {
+		for ($j = 0; $j < $countPermsObj; $j++) {
 			if (in_array($label, $permsForObject[$j])) {
 				$error++;
 				setEventMessages($langs->trans("ErrorExistingPermission", $langs->transnoentities($label), $langs->transnoentities($objectForPerms)), null, 'errors');
@@ -2379,7 +2379,7 @@ 
 			setEventMessages($langs->trans('PermissionUpdatedSuccesfuly'), null);
 			clearstatcache(true);
 			if (function_exists('opcache_invalidate')) {
-				opcache_reset();	// remove the include cache hell !
+				opcache_reset(); // remove the include cache hell !
 			}
 			header("Location: ".DOL_URL_ROOT.'/modulebuilder/index.php?tab=permissions&module='.$module);
 			exit;
@@ -2403,7 +2403,7 @@ 
 	}
 
 	$permissions = $moduleobj->rights;
-	$key = (int) GETPOST('permskey', 'int')-1;
+	$key = (int) GETPOST('permskey', 'int') - 1;
 
 	if (!$error) {
 		// check if module is enabled
@@ -2429,7 +2429,7 @@ 
 
 			clearstatcache(true);
 			if (function_exists('opcache_invalidate')) {
-				opcache_reset();	// remove the include cache hell !
+				opcache_reset(); // remove the include cache hell !
 			}
 
 			header("Location: ".DOL_URL_ROOT.'/modulebuilder/index.php?tab=permissions&module='.$module);
@@ -2598,7 +2598,7 @@ 
 
 		clearstatcache(true);
 		if (function_exists('opcache_invalidate')) {
-			opcache_reset();	// remove the include cache hell !
+			opcache_reset(); // remove the include cache hell !
 		}
 
 		setEventMessages($langs->trans('MenuDeletedSuccessfuly'), null);
@@ -2654,7 +2654,7 @@ 
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Url")), null, 'errors');
 	}
 	if (!empty(GETPOST('target'))) {
-		$targets = array('_blank','_self','_parent','_top','');
+		$targets = array('_blank', '_self', '_parent', '_top', '');
 		if (!in_array(GETPOST('target'), $targets)) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldValue", $langs->transnoentities("target")), null, 'errors');
@@ -2688,7 +2688,7 @@ 
 	 $objects = dolGetListOfObjectClasses($destdir);
 
 	if (GETPOST('type', 'alpha') == 'left') {
-		if (empty(GETPOST('leftmenu')) && count($objects) >0) {
+		if (empty(GETPOST('leftmenu')) && count($objects) > 0) {
 			$error++;
 			setEventMessages($langs->trans("ErrorCoherenceMenu", $langs->transnoentities("leftmenu"), $langs->transnoentities("type")), null, 'errors');
 		}
@@ -2751,7 +2751,7 @@ 
 
 // modify a menu
 if ($dirins && $action == "modify_menu" && GETPOST('menukey', 'int') && GETPOST('tabobj')) {
-	$objectname =  GETPOST('tabobj');
+	$objectname = GETPOST('tabobj');
 	$dirins = $listofmodules[strtolower($module)]['moduledescriptorrootpath'];
 	$destdir = $dirins.'/'.strtolower($module);
 	$objects = dolGetListOfObjectClasses($destdir);
@@ -2836,7 +2836,7 @@ 
 					}
 					if ($result < 0) {
 						setEventMessages($langs->trans('ErrorMenuExistValue'), null, 'errors');
-						header("Location: ".$_SERVER["PHP_SELF"].'?action=editmenu&token='.newToken().'&menukey='.urlencode($key+1).'&tab='.urlencode($tab).'&module='.urlencode($module).'&tabobj='.($key+1));
+						header("Location: ".$_SERVER["PHP_SELF"].'?action=editmenu&token='.newToken().'&menukey='.urlencode($key + 1).'&tab='.urlencode($tab).'&module='.urlencode($module).'&tabobj='.($key + 1));
 						exit;
 					}
 					setEventMessages($langs->trans('MenuUpdatedSuccessfuly'), null);
@@ -3865,16 +3865,16 @@ 
 						// Define path for sql file
 						$pathtosql = strtolower($module).'/sql/llx_'.strtolower($module).'_'.strtolower($tabobj).'-'.strtolower($module).'.sql';
 						$result = dol_buildpath($pathtosql);
-						if (! dol_is_file($result)) {
+						if (!dol_is_file($result)) {
 							$pathtosql = strtolower($module).'/sql/llx_'.strtolower($module).'_'.strtolower($tabobj).'.sql';
 							$result = dol_buildpath($pathtosql);
-							if (! dol_is_file($result)) {
+							if (!dol_is_file($result)) {
 								$pathtosql = 'install/mysql/tables/llx_'.strtolower($module).'_'.strtolower($tabobj).'-'.strtolower($module).'.sql';
 								$result = dol_buildpath($pathtosql);
-								if (! dol_is_file($result)) {
+								if (!dol_is_file($result)) {
 									$pathtosql = 'install/mysql/tables/llx_'.strtolower($module).'-'.strtolower($module).'.sql';
 									$result = dol_buildpath($pathtosql);
-									if (! dol_is_file($result)) {
+									if (!dol_is_file($result)) {
 										$pathtosql = 'install/mysql/tables/llx_'.strtolower($module).'.sql';
 										$pathtosqlextra = 'install/mysql/tables/llx_'.strtolower($module).'_extrafields.sql';
 										$result = dol_buildpath($pathtosql);
@@ -3893,7 +3893,7 @@ 
 						$pathtosqlroot = preg_replace('/\/llx_.*$/', '', $pathtosql);
 
 						$pathtosqlkey   = preg_replace('/\.sql$/', '.key.sql', $pathtosql);
-						$pathtosqlextrakey   = preg_replace('/\.sql$/', '.key.sql', $pathtosqlextra);
+						$pathtosqlextrakey = preg_replace('/\.sql$/', '.key.sql', $pathtosqlextra);
 
 						$pathtolib      = strtolower($module).'/lib/'.strtolower($module).'.lib.php';
 						$pathtoobjlib   = strtolower($module).'/lib/'.strtolower($module).'_'.strtolower($tabobj).'.lib.php';
@@ -3952,7 +3952,7 @@ 
 
 						// API file
 						print '<br>';
-						print '<span class="fa fa-file-o"></span> '.$langs->trans("ApiClassFile").' : <strong class="wordbreak">'.(dol_is_file($realpathtoapi) ? '' : '<strike><span class="opacitymedium">').preg_replace('/^'.strtolower($module).'\//', '', $pathtoapi).(dol_is_file($realpathtoapi)?'':'</span></strike>').'</strong>';
+						print '<span class="fa fa-file-o"></span> '.$langs->trans("ApiClassFile").' : <strong class="wordbreak">'.(dol_is_file($realpathtoapi) ? '' : '<strike><span class="opacitymedium">').preg_replace('/^'.strtolower($module).'\//', '', $pathtoapi).(dol_is_file($realpathtoapi) ? '' : '</span></strike>').'</strong>';
 						if (dol_is_file($realpathtoapi)) {
 							$file = file_get_contents($realpathtoapi);
 							if (preg_match('/var '.$tabobj.'\s+([^\s]*)\s/ims', $file, $objs)) {
@@ -3973,7 +3973,7 @@ 
 						}
 						// PHPUnit
 						print '<br>';
-						print '<span class="fa fa-file-o"></span> '.$langs->trans("TestClassFile").' : <strong class="wordbreak">'.(dol_is_file($realpathtophpunit) ? '' : '<strike><span class="opacitymedium">').preg_replace('/^'.strtolower($module).'\//', '', $pathtophpunit).(dol_is_file($realpathtophpunit)?'':'</span></strike>').'</strong>';
+						print '<span class="fa fa-file-o"></span> '.$langs->trans("TestClassFile").' : <strong class="wordbreak">'.(dol_is_file($realpathtophpunit) ? '' : '<strike><span class="opacitymedium">').preg_replace('/^'.strtolower($module).'\//', '', $pathtophpunit).(dol_is_file($realpathtophpunit) ? '' : '</span></strike>').'</strong>';
 						if (dol_is_file($realpathtophpunit)) {
 							print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.urlencode($tab).'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format=php&file='.urlencode($pathtophpunit).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 							print ' ';
@@ -4189,26 +4189,26 @@ 
 									$propname = $propkey;
 									$proplabel = $propval['label'];
 									$proptype = $propval['type'];
-									$proparrayofkeyval = !empty($propval['arrayofkeyval'])?$propval['arrayofkeyval']:'';
+									$proparrayofkeyval = !empty($propval['arrayofkeyval']) ? $propval['arrayofkeyval'] : '';
 									$propnotnull = !empty($propval['notnull']) ? $propval['notnull'] : '0';
-									$propdefault = !empty($propval['default'])?$propval['default']:'';
-									$propindex = !empty($propval['index'])?$propval['index']:'';
-									$propforeignkey = !empty($propval['foreignkey'])?$propval['foreignkey']:'';
+									$propdefault = !empty($propval['default']) ? $propval['default'] : '';
+									$propindex = !empty($propval['index']) ? $propval['index'] : '';
+									$propforeignkey = !empty($propval['foreignkey']) ? $propval['foreignkey'] : '';
 									$propposition = $propval['position'];
 									$propenabled = $propval['enabled'];
 									$propvisible = $propval['visible'];
-									$propnoteditable = !empty($propval['noteditable'])?$propval['noteditable']:0;
-									$propalwayseditable = !empty($propval['alwayseditable'])?$propval['alwayseditable']:0;
-									$propsearchall = !empty($propval['searchall'])?$propval['searchall']:0;
-									$propisameasure = !empty($propval['isameasure'])?$propval['isameasure']:0;
-									$propcss = !empty($propval['css'])?$propval['css']:'';
-									$propcssview = !empty($propval['cssview'])?$propval['cssview']:'';
-									$propcsslist = !empty($propval['csslist'])?$propval['csslist']:'';
-									$prophelp = !empty($propval['help'])?$propval['help']:'';
-									$propshowoncombobox = !empty($propval['showoncombobox'])?$propval['showoncombobox']:0;
+									$propnoteditable = !empty($propval['noteditable']) ? $propval['noteditable'] : 0;
+									$propalwayseditable = !empty($propval['alwayseditable']) ? $propval['alwayseditable'] : 0;
+									$propsearchall = !empty($propval['searchall']) ? $propval['searchall'] : 0;
+									$propisameasure = !empty($propval['isameasure']) ? $propval['isameasure'] : 0;
+									$propcss = !empty($propval['css']) ? $propval['css'] : '';
+									$propcssview = !empty($propval['cssview']) ? $propval['cssview'] : '';
+									$propcsslist = !empty($propval['csslist']) ? $propval['csslist'] : '';
+									$prophelp = !empty($propval['help']) ? $propval['help'] : '';
+									$propshowoncombobox = !empty($propval['showoncombobox']) ? $propval['showoncombobox'] : 0;
 									//$propdisabled=$propval['disabled'];
-									$propvalidate = !empty($propval['validate'])?$propval['validate']:0;
-									$propcomment = !empty($propval['comment'])?$propval['comment']:'';
+									$propvalidate = !empty($propval['validate']) ? $propval['validate'] : 0;
+									$propcomment = !empty($propval['comment']) ? $propval['comment'] : '';
 
 									print '<tr class="oddeven">';
 
@@ -4583,14 +4583,14 @@ 
 					$i = 0;
 					$maxi = count($dicts['tabname']);
 					while ($i < $maxi) {
-						if ($action == 'editdict' && $i == (int) GETPOST('dictionnarykey', 'int')-1) {
+						if ($action == 'editdict' && $i == (int) GETPOST('dictionnarykey', 'int') - 1) {
 							print '<tr class="oddeven">';
 							print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 							print '<input type="hidden" name="token" value="'.newToken().'">';
 							print '<input type="hidden" name="tab" value="dictionaries">';
 							print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module).'">';
 							print '<input type="hidden" name="action" value="updatedictionary">';
-							print '<input type="hidden" name="dictionnarykey" value="'.($i+1).'">';
+							print '<input type="hidden" name="dictionnarykey" value="'.($i + 1).'">';
 
 							print '<td class="tdsticky tdstickygray">';
 							print ($i + 1);
@@ -4686,8 +4686,8 @@ 
 							print '</td>';
 
 							print '<td class="center tdstickyright tdstickyghostwhite">';
-							print '<a class="editfielda reposition marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=editdict&token='.newToken().'&dictionnarykey='.urlencode($i+1).'&tab='.urlencode($tab).'&module='.urlencode($module).'">'.img_edit().'</a>';
-							print '<a class="marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=deletedict&token='.newToken().'&dictionnarykey='.urlencode($i+1).'&tab='.urlencode($tab).'&module='.urlencode($module).'">'.img_delete().'</a>';
+							print '<a class="editfielda reposition marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=editdict&token='.newToken().'&dictionnarykey='.urlencode($i + 1).'&tab='.urlencode($tab).'&module='.urlencode($module).'">'.img_edit().'</a>';
+							print '<a class="marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=deletedict&token='.newToken().'&dictionnarykey='.urlencode($i + 1).'&tab='.urlencode($tab).'&module='.urlencode($module).'">'.img_delete().'</a>';
 							print '</td>';
 
 							print '</tr>';
@@ -4856,7 +4856,7 @@ 
 				print_liste_field_titre("", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder, 'center ', $langs->trans(''));
 
 				print "</tr>\n";
-				$r = count($menus)+1;
+				$r = count($menus) + 1;
 				// for adding menu on module
 				print '<tr>';
 				print '<td class="center"><input type="hidden" readonly class="center maxwidth50" name="propenabled" value="#"></td>';
@@ -4879,7 +4879,7 @@ 
 				print '<td class="center"><input id="leftmenu" type="text" class="left maxwidth" name="leftmenu" value="'.dol_escape_htmltag(GETPOST('leftmenu', 'alpha')).'"></td>';
 				print '<td class="left"><input id="url" type="text" class="left maxwidth" name="url" value="'.dol_escape_htmltag(GETPOST('url', 'alpha')).'"></td>';
 				print '<td class="left"><input type="text" class="left maxwidth" name="langs" value="'.strtolower($module).'@'.strtolower($module).'" readonly></td>';
-				print '<td class="center"><input type="text" class="center maxwidth50 tdstickygray" name="position" value="'.(1000+$r).'" readonly></td>';
+				print '<td class="center"><input type="text" class="center maxwidth50 tdstickygray" name="position" value="'.(1000 + $r).'" readonly></td>';
 				print '<td class="center">';
 				print '<select class="center maxwidth" name="enabled">';
 				print '<option value="1" selected>'.$langs->trans("Show").'</option>';
@@ -4917,7 +4917,7 @@ 
 						$propMainmenu = !empty($menu['mainmenu']) ? $menu['mainmenu'] : GETPOST('mainmenu');
 						$propLeftmenu = !empty($menu['leftmenu']) ? $menu['leftmenu'] : GETPOST('leftmenu');
 						$propUrl = !empty($menu['url']) ? $menu['url'] : GETPOST('url', 'alpha');
-						$propPerms = !empty($menu['perms']) ?  $menu['perms'] : GETPOST('perms');
+						$propPerms = !empty($menu['perms']) ? $menu['perms'] : GETPOST('perms');
 						$propUser = !empty($menu['user']) ? $menu['user'] : GETPOST('user');
 						$propTarget = !empty($menu['target']) ? $menu['target'] : GETPOST('target');
 						$propEnabled = !empty($menu['enabled']) ? $menu['enabled'] : GETPOST('enabled');
@@ -4967,7 +4967,7 @@ 
 							print '<td class="left"><input type="text" class="left maxwidth" name="leftmenu" value="'.dol_escape_htmltag($propLeftmenu).'" readonly></td>';
 							print '<td class="left"><input type="text" class="left maxwidth" name="url" value="'.dol_escape_htmltag($propUrl).'"></td>';
 							print '<td class="left"><input type="text" class="left maxwidth" name="langs" value="'.strtolower($module).'@'.strtolower($module).'" readonly></td>';
-							print '<td class="center"><input type="text" class="center maxwidth50 tdstickygray" name="position" value="'.(1000+$r-1).'" readonly></td>';
+							print '<td class="center"><input type="text" class="center maxwidth50 tdstickygray" name="position" value="'.(1000 + $r - 1).'" readonly></td>';
 							print '<td class="left">';
 							print '<select class="center maxwidth" name="enabled">';
 							print '<option selected value="'.dol_escape_htmltag($propEnabled).'">'.(dol_escape_htmltag($propEnabled) == '' ? $langs->trans('Hide') : $langs->trans('Show')).'</option>';
@@ -5058,7 +5058,7 @@ 
 							if (strpos($menu['perms'], "\$user->hasRight") !== 0) {
 								print '';
 							} else {
-								print (dol_escape_htmltag($langs->trans($crud[$valPerms])) );
+								print (dol_escape_htmltag($langs->trans($crud[$valPerms])));
 							}
 							print '</td>';
 
@@ -5080,7 +5080,7 @@ 
 							print '<td class="center tdstickyright tdstickyghostwhite">';
 							if ($menu['titre'] != 'Module'.$module.'Name') {
 									print '<a class="editfielda reposition marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=editmenu&token='.newToken().'&menukey='.urlencode($i).'&tab='.urlencode($tab).'&module='.urlencode($module).'&tabobj='.urlencode($tabobj).'">'.img_edit().'</a>';
-									print '<a class="marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=deletemenu&token='.newToken().'&menukey='.urlencode($i-1).'&tab='.urlencode($tab).'&module='.urlencode($module).'&tabobj='.urlencode($tabobj).'">'.img_delete().'</a>';
+									print '<a class="marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=deletemenu&token='.newToken().'&menukey='.urlencode($i - 1).'&tab='.urlencode($tab).'&module='.urlencode($module).'&tabobj='.urlencode($tabobj).'">'.img_delete().'</a>';
 							}
 							print '</td>';
 						}
@@ -5106,7 +5106,7 @@ 
 						}
 					  });
 
-					var groupedRights = ' . $groupedRights_json . ';
+					var groupedRights = ' . $groupedRights_json.';
 					var objectsSelect = $("select[id=\'objects\']");
 					var permsSelect = $("select[id=\'perms\']");
 				
@@ -5177,7 +5177,7 @@ 
 			$dir = $dirread.'/'.$modulelowercase.'/class';
 			$listofobject = dol_dir_list($dir, 'files', 0, '\.class\.php$');
 			$objects = array('myobject');
-			$reg =array();
+			$reg = array();
 			foreach ($listofobject as $fileobj) {
 				$tmpcontent = file_get_contents($fileobj['fullname']);
 				if (preg_match('/class\s+([^\s]*)\s+extends\s+CommonObject/ims', $tmpcontent, $reg)) {
@@ -5328,7 +5328,7 @@ 
 							if (in_array($perm[5], array('lire', 'read', 'creer', 'write', 'effacer', 'delete'))) {
 								print dol_escape_htmltag(ucfirst($perm[4]));
 							} else {
-								print '';	// No particular object
+								print ''; // No particular object
 							}
 							print '</td>';
 
@@ -6165,9 +6165,9 @@ 
 
 						print '<td>';
 						if ($tabName[0] === "+") {
-							print '<span class="badge badge-status4 badge-status">' . dol_escape_htmltag($tabName) . '</span>';
+							print '<span class="badge badge-status4 badge-status">'.dol_escape_htmltag($tabName).'</span>';
 						} else {
-							print '<span class="badge badge-status8 badge-status">' . dol_escape_htmltag($tabName) . '</span>';
+							print '<span class="badge badge-status8 badge-status">'.dol_escape_htmltag($tabName).'</span>';
 						}
 						print '</td>';
 

htdocs/core/lib/modulebuilder.lib.php

Spacing +51 added lines, -51 removed lines

@@ -270,22 +270,22 @@ 
 	// Edit .sql file
 	if ($moduletype == 'internal') {
 		$pathoffiletoeditsrc = '/../install/mysql/tables/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql';
-		if (! dol_is_file($readdir.$pathoffiletoeditsrc)) {
+		if (!dol_is_file($readdir.$pathoffiletoeditsrc)) {
 			$pathoffiletoeditsrc = '/../install/mysql/tables/llx_'.strtolower($module).'_'.strtolower($objectname).'-'.strtolower($module).'.sql';
-			if (! dol_is_file($readdir.$pathoffiletoeditsrc)) {
+			if (!dol_is_file($readdir.$pathoffiletoeditsrc)) {
 				$pathoffiletoeditsrc = '/../install/mysql/tables/llx_'.strtolower($module).'-'.strtolower($module).'.sql';
-				if (! dol_is_file($readdir.$pathoffiletoeditsrc)) {
+				if (!dol_is_file($readdir.$pathoffiletoeditsrc)) {
 					$pathoffiletoeditsrc = '/../install/mysql/tables/llx_'.strtolower($module).'.sql';
 				}
 			}
 		}
 	} else {
 		$pathoffiletoeditsrc = '/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql';
-		if (! dol_is_file($readdir.$pathoffiletoeditsrc)) {
+		if (!dol_is_file($readdir.$pathoffiletoeditsrc)) {
 			$pathoffiletoeditsrc = '/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'-'.strtolower($module).'.sql';
-			if (! dol_is_file($readdir.$pathoffiletoeditsrc)) {
+			if (!dol_is_file($readdir.$pathoffiletoeditsrc)) {
 				$pathoffiletoeditsrc = '/sql/llx_'.strtolower($module).'-'.strtolower($module).'.sql';
-				if (! dol_is_file($readdir.$pathoffiletoeditsrc)) {
+				if (!dol_is_file($readdir.$pathoffiletoeditsrc)) {
 					$pathoffiletoeditsrc = '/sql/llx_'.strtolower($module).'.sql';
 				}
 			}
@@ -442,7 +442,7 @@ 
 			$objects[$fileobj['fullname']] = $objectnameloop;
 		}
 	}
-	if (count($objects)>0) {
+	if (count($objects) > 0) {
 		return $objects;
 	}
 
@@ -552,12 +552,12 @@ 
 			}
 		}
 	} elseif ($action == -2 && !empty($objectname) && !empty($module)) {
-		$key= null;
+		$key = null;
 		$right = null;
 		$objectOfRights = array();
 		//check if object already declared in rights file
 		foreach ($permissions as $right) {
-			$objectOfRights[]= $right[4];
+			$objectOfRights[] = $right[4];
 		}
 		if (in_array(strtolower($objectname), $objectOfRights)) {
 			$error++;
@@ -584,7 +584,7 @@ 
 	if (!$error) {
 		// prepare permissions array
 		$count_perms = count($permissions);
-		for ($i = 0;$i<$count_perms;$i++) {
+		for ($i = 0; $i < $count_perms; $i++) {
 			$permissions[$i][0] = "\$this->rights[\$r][0] = \$this->numero . sprintf('%02d', \$r + 1)";
 			$permissions[$i][1] = "\$this->rights[\$r][1] = '".$permissions[$i][1]."'";
 			$permissions[$i][4] = "\$this->rights[\$r][4] = '".$permissions[$i][4]."'";
@@ -604,7 +604,7 @@ 
 
 
 		// parcourir les objets
-		$o=0;
+		$o = 0;
 		foreach ($permissions as &$object) {
 			// récupérer la permission de l'objet
 			$p = 1;
@@ -699,7 +699,7 @@ 
 {
 
 	// stock all properties in array
-	$attributesUnique = array ('type','label', 'enabled', 'position', 'notnull', 'visible', 'noteditable', 'index', 'default' , 'foreignkey', 'arrayofkeyval', 'alwayseditable','validate', 'searchall','comment', 'isameasure', 'css', 'cssview','csslist', 'help', 'showoncombobox','picto' );
+	$attributesUnique = array('type', 'label', 'enabled', 'position', 'notnull', 'visible', 'noteditable', 'index', 'default', 'foreignkey', 'arrayofkeyval', 'alwayseditable', 'validate', 'searchall', 'comment', 'isameasure', 'css', 'cssview', 'csslist', 'help', 'showoncombobox', 'picto');
 
 	$start = "public \$fields=array(";
 	$end = ");";
@@ -729,7 +729,7 @@ 
 	foreach ($attributesUnique as $attUnique) {
 		$table .= "|".$attUnique;
 	}
-	$table .="\n";
+	$table .= "\n";
 	$valuesModif = array();
 	foreach ($keys as $string) {
 		$string = trim($string, "'");
@@ -769,8 +769,8 @@ 
 				$valuesModif[$attUnique] = $values[$attUnique];
 			}
 		}
-		$table .= "|*" . $field[0] . "*|";
-		$table .= implode("|", $valuesModif) . "\n";
+		$table .= "|*".$field[0]."*|";
+		$table .= implode("|", $valuesModif)."\n";
 	}
 
 	// end table
@@ -779,7 +779,7 @@ 
 
 	//write in file
 	$writeInFile = dolReplaceInFile($destfile, array('== DATA SPECIFICATIONS' => $table));
-	if ($writeInFile<0) {
+	if ($writeInFile < 0) {
 		return -1;
 	}
 	return 1;
@@ -798,13 +798,13 @@ 
 	$start = "== Table of fields and their properties for object *".ucfirst($objectname)."* : ";
 	$end = "__ end table for object ".ucfirst($objectname);
 	$str = file_get_contents($file);
-	$search = '/' . preg_quote($start, '/') . '(.*?)' . preg_quote($end, '/') . '/s';
+	$search = '/'.preg_quote($start, '/').'(.*?)'.preg_quote($end, '/').'/s';
 	$new_contents = preg_replace($search, '', $str);
 	file_put_contents($file, $new_contents);
 
 	//perms If Exist
 	$perms = "|*".strtolower($objectname)."*|";
-	$search_pattern_perms = '/' . preg_quote($perms, '/') . '.*?\n/';
+	$search_pattern_perms = '/'.preg_quote($perms, '/').'.*?\n/';
 	$new_contents = preg_replace($search_pattern_perms, '', $new_contents);
 	file_put_contents($file, $new_contents);
 }
@@ -860,7 +860,7 @@ 
 	$string = "[options='header',grid=rows,width=60%,caption=Organisation]\n";
 	$string .= "|===\n";
 	// header for table
-	$header = array($langs->trans('Objects'),$langs->trans('Permission'));
+	$header = array($langs->trans('Objects'), $langs->trans('Permission'));
 	foreach ($header as $h) {
 		$string .= "|".$h;
 	}
@@ -887,7 +887,7 @@ 
 	foreach ($permissions as $key => $element) {
 		$element = str_replace(" '", '', $element);
 		$element = trim($element, "'");
-		$permsN[] = substr($element, strpos($element, "=")+1);
+		$permsN[] = substr($element, strpos($element, "=") + 1);
 	}
 	array_pop($permsN);
 
@@ -917,7 +917,7 @@ 
 	// end table
 	$string .= "\n|===\n";
 	$write = dolReplaceInFile($destfile, array('__DATA_PERMISSIONS__'=> $string));
-	if ($write<0) {
+	if ($write < 0) {
 		return -1;
 	}
 	return 1;
@@ -946,26 +946,26 @@ 
 		if (strpos($lineContent, $varcomented) !== false) {
 			$lineContent = '';
 			foreach ($objects as $object) {
-				$lineContent .= "\t * @var ".$object." \$".strtolower($object)." {@type ".$object."}". PHP_EOL;
+				$lineContent .= "\t * @var ".$object." \$".strtolower($object)." {@type ".$object."}".PHP_EOL;
 			}
 			//var_dump($lineContent);exit;
 		}
 		if (strpos($lineContent, $props) !== false) {
 			$lineContent = '';
 			foreach ($objects as $object) {
-				$lineContent .= "\tpublic \$".strtolower($object).";". PHP_EOL;
+				$lineContent .= "\tpublic \$".strtolower($object).";".PHP_EOL;
 			}
 		}
 		if (strpos($lineContent, $constructObj) !== false) {
 			$lineContent = '';
 			foreach ($objects as $object) {
-				$lineContent .= "\t\t\$this->".strtolower($object)." = new ".$object."(\$this->db);". PHP_EOL;
+				$lineContent .= "\t\t\$this->".strtolower($object)." = new ".$object."(\$this->db);".PHP_EOL;
 			}
 		}
 		if (strpos($lineContent, $includeClass) !== false) {
 			$lineContent = '';
 			foreach ($objects as $object) {
-				$lineContent .= "dol_include_once('/".strtolower($modulename)."/class/".strtolower($object).".class.php');". PHP_EOL;
+				$lineContent .= "dol_include_once('/".strtolower($modulename)."/class/".strtolower($object).".class.php');".PHP_EOL;
 			}
 		}
 	}
@@ -975,10 +975,10 @@ 
 	//add methods for each object
 	$allContent = getFromFile($file, '/*begin methods CRUD*/', '/*end methods CRUD*/');
 	foreach ($objects as $object) {
-		$contentReplaced =str_replace(["myobject","MyObject"], [strtolower($object),$object], $allContent);
+		$contentReplaced = str_replace(["myobject", "MyObject"], [strtolower($object), $object], $allContent);
 		dolReplaceInFile($file, array('/*end methods CRUD*/' => '/*CRUD FOR '.strtoupper($object).'*/'."\n".$contentReplaced."\n\t".'/*END CRUD FOR '.strtoupper($object).'*/'."\n\t".'/*end methods CRUD*/'));
 	}
-	dolReplaceInFile($file, array($allContent => '','MyModule' => ucfirst($modulename)));
+	dolReplaceInFile($file, array($allContent => '', 'MyModule' => ucfirst($modulename)));
 	return 1;
 }
 
@@ -1039,7 +1039,7 @@ 
  */
 function reWriteAllMenus($file, $menus, $menuWantTo, $key, $action)
 {
-	$errors =0;
+	$errors = 0;
 	$counter = 0;
 	if (!file_exists($file)) {
 		return -1;
@@ -1052,7 +1052,7 @@ 
 		array_push($menus, $menuWantTo);
 	} elseif ($action == 2 && !empty($key) && !empty($menuWantTo)) {
 		// update right from permissions array
-		$urlCounter=0;
+		$urlCounter = 0;
 		// check if the values already exists
 		foreach ($menus as $index => $menu) {
 			if ($index !== $key) {
@@ -1098,20 +1098,20 @@ 
 				$val_actuel = $menu;
 				$next_val = $menus[$index + 1];
 				$str_menu .= $start."\n";
-				$str_menu.= "\t\t\$this->menu[\$r++]=array(\n";
-				$str_menu.= "\t\t\t 'fk_menu' =>'".$menu['fk_menu']."',\n";
-				$str_menu.= "\t\t\t 'type' =>'".$menu['type']."',\n";
-				$str_menu.= "\t\t\t 'titre' =>'".$menu['titre']."',\n";
-				$str_menu.= "\t\t\t 'mainmenu' =>'".$menu['mainmenu']."',\n";
-				$str_menu.= "\t\t\t 'leftmenu' =>'".$menu['leftmenu']."',\n";
-				$str_menu.= "\t\t\t 'url' =>'".$menu['url']."',\n";
-				$str_menu.= "\t\t\t 'langs' =>'".$menu['langs']."',\n";
-				$str_menu.= "\t\t\t 'position' =>".$menu['position'].",\n";
-				$str_menu.= "\t\t\t 'enabled' =>'".$menu['enabled']."',\n";
-				$str_menu.= "\t\t\t 'perms' =>'".$menu['perms']."',\n";
-				$str_menu.= "\t\t\t 'target' =>'".$menu['target']."',\n";
-				$str_menu.= "\t\t\t 'user' =>".$menu['user'].",\n";
-				$str_menu.= "\t\t);\n";
+				$str_menu .= "\t\t\$this->menu[\$r++]=array(\n";
+				$str_menu .= "\t\t\t 'fk_menu' =>'".$menu['fk_menu']."',\n";
+				$str_menu .= "\t\t\t 'type' =>'".$menu['type']."',\n";
+				$str_menu .= "\t\t\t 'titre' =>'".$menu['titre']."',\n";
+				$str_menu .= "\t\t\t 'mainmenu' =>'".$menu['mainmenu']."',\n";
+				$str_menu .= "\t\t\t 'leftmenu' =>'".$menu['leftmenu']."',\n";
+				$str_menu .= "\t\t\t 'url' =>'".$menu['url']."',\n";
+				$str_menu .= "\t\t\t 'langs' =>'".$menu['langs']."',\n";
+				$str_menu .= "\t\t\t 'position' =>".$menu['position'].",\n";
+				$str_menu .= "\t\t\t 'enabled' =>'".$menu['enabled']."',\n";
+				$str_menu .= "\t\t\t 'perms' =>'".$menu['perms']."',\n";
+				$str_menu .= "\t\t\t 'target' =>'".$menu['target']."',\n";
+				$str_menu .= "\t\t\t 'user' =>".$menu['user'].",\n";
+				$str_menu .= "\t\t);\n";
 
 				if ($val_actuel['leftmenu'] !== $next_val['leftmenu']) {
 					$str_menu .= $end."\n";
@@ -1148,21 +1148,21 @@ 
 		$dicData .= "\t\t\t'$key'=>";
 
 		if ($key === 'tabcond') {
-			$conditions = array_map(function ($val) use ($module) {
+			$conditions = array_map(function($val) use ($module) {
 				return ($val === true || $val === false) ? "isModEnabled('$module')" : $val;
 			}, $value);
-			$dicData .= "array(" . implode(",", $conditions) . ")";
+			$dicData .= "array(".implode(",", $conditions).")";
 		} elseif ($key === 'tabhelp') {
 			$helpItems = array();
 			foreach ($value as $key => $helpValue) {
 				$helpItems[] = "array('code'=>\$langs->trans('".$helpValue['code']."'), 'field2' => 'field2tooltip')";
 			}
-			$dicData .= "array(" . implode(",", $helpItems) . ")";
+			$dicData .= "array(".implode(",", $helpItems).")";
 		} else {
 			if (is_array($value)) {
-				$dicData .= "array(" . implode(",", array_map(function ($val) {
+				$dicData .= "array(".implode(",", array_map(function($val) {
 					return "'$val'";
-				}, $value)) . ")";
+				}, $value)).")";
 			} else {
 				$dicData .= "'$value'";
 			}
@@ -1228,7 +1228,7 @@ 
 		}
 	}
 	// check if tablename exist in Database and create it if not
-	$query = "SHOW TABLES LIKE '" . MAIN_DB_PREFIX.strtolower($namedic) . "'";
+	$query = "SHOW TABLES LIKE '".MAIN_DB_PREFIX.strtolower($namedic)."'";
 	$checkTable = $db->query($query);
 	if ($checkTable && $db->num_rows($checkTable) > 0) {
 		setEventMessages($langs->trans("ErrorTableExist", $namedic), null, 'errors');
@@ -1336,9 +1336,9 @@ 
 
 	foreach ($allFilesAndDirs as $item) {
 		if ($item != '.' && $item != '..') {
-			if ($type == 1 && is_file($path . DIRECTORY_SEPARATOR . $item) && strpos($item, '.back') === false) {
+			if ($type == 1 && is_file($path.DIRECTORY_SEPARATOR.$item) && strpos($item, '.back') === false) {
 				$count++;
-			} elseif ($type == 2 && is_dir($path . DIRECTORY_SEPARATOR . $item)) {
+			} elseif ($type == 2 && is_dir($path.DIRECTORY_SEPARATOR.$item)) {
 				$count++;
 			}
 		}

htdocs/core/lib/website.lib.php

Spacing +3 added lines, -3 removed lines

@@ -77,7 +77,7 @@ 
 {
 	$str = str_replace('<?=', '<?php', $str);
 	$str = str_replace('<?php', '__LTINTPHP__', $str);
-	$str = str_replace('<?', '<?php', $str);			// replace the short_open_tag. It is recommended to set this is Off in php.ini
+	$str = str_replace('<?', '<?php', $str); // replace the short_open_tag. It is recommended to set this is Off in php.ini
 	$str = str_replace('__LTINTPHP__', '<?php', $str);
 
 	$newstr = '';
@@ -458,7 +458,7 @@ 
 			$sql .= " lastaccess = '".$db->idate(dol_now('gmt'), 'gmt')."'";
 			$sql .= " WHERE rowid = ".((int) $websiteid);
 			$resql = $db->query($sql);
-			if (! $resql) {
+			if (!$resql) {
 				return -1;
 			}
 		}
@@ -871,7 +871,7 @@ 
 		$hashtags = trim(join(' #', array_map('trim', explode(',', $websitepage->keywords))));
 
 		// Open Graph
-		$out .= '<meta name="og:type" content="website">'."\n";	// TODO If blogpost, use type article
+		$out .= '<meta name="og:type" content="website">'."\n"; // TODO If blogpost, use type article
 		$out .= '<meta name="og:title" content="'.$websitepage->title.'">'."\n";
 		if ($websitepage->image) {
 			$out .= '<meta name="og:image" content="'.$website->virtualhost.$image.'">'."\n";