Inspection of "Daily Inspection: Merge pull request #7563 from as..." - Dolibarr/dolibarr - Measure and Improve Code Quality continuously with Scrutinizer

Test Failed

Branch — develop (86e751)

by Laurent

created 2017-10-06 00:25 UTC

Status

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -108,12 +108,12 @@  discard block
 block discarded – undo
 // Complete long filename
 foreach ($filters as $key => $value)
 {
-    //if ($key == 'notolderthan')    $filename.='-notolderthan'.$value; This filter key is already added before and does not need to be in filename
+	//if ($key == 'notolderthan')    $filename.='-notolderthan'.$value; This filter key is already added before and does not need to be in filename
 	if ($key == 'year')            $filename.='-year'.$value;
-    if ($key == 'id')              $filename.='-id'.$value;
-    if ($key == 'idfrom')          $filename.='-idfrom'.$value;
-    if ($key == 'idto')            $filename.='-idto'.$value;
-    if ($key == 'project')         $filename.='-project'.$value;
+	if ($key == 'id')              $filename.='-id'.$value;
+	if ($key == 'idfrom')          $filename.='-idfrom'.$value;
+	if ($key == 'idto')            $filename.='-idto'.$value;
+	if ($key == 'project')         $filename.='-project'.$value;
 	if ($key == 'logina')	       $filename.='-logina'.$value;	// Author
 	if ($key == 'logint')	       $filename.='-logint'.$value;	// Assigned to
 }
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
 	$langs->load("main");
 	$langs->load("errors");
 	llxHeaderVierge();
-    print '<div class="error">'.$langs->trans("ErrorWrongValueForParameterX",'format').'</div>';
+	print '<div class="error">'.$langs->trans("ErrorWrongValueForParameterX",'format').'</div>';
 	llxFooterVierge();
 	exit;
 }
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
 		$result=readfile($outputfile);
 		if (! $result) print 'File '.$outputfile.' was empty.';
 
-	    //header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
+		//header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
 		exit;
 	}
 	else

Please login to merge, or discard this patch.

htdocs/public/members/public_card.php 1 patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -152,7 +152,7 @@
 block discarded – undo
 */
 function llxFooterVierge()
 {
-    printCommonFooter('public');
+	printCommonFooter('public');
 
 	print "</body>\n";
 	print "</html>\n";

Please login to merge, or discard this patch.

htdocs/public/members/public_list.php 1 patch

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -58,10 +58,10 @@  discard block
 block discarded – undo
 
 	header("Content-type: text/html; charset=".$conf->file->character_set_client);
 	print "<html>\n";
-    print "<head>\n";
-    print "<title>".$title."</title>\n";
-    if ($head) print $head."\n";
-    print "</head>\n";
+	print "<head>\n";
+	print "<title>".$title."</title>\n";
+	if ($head) print $head."\n";
+	print "</head>\n";
 	print '<body class="public_body">'."\n";
 }
 
@@ -72,9 +72,9 @@  discard block
 block discarded – undo
  */
 function llxFooterVierge()
 {
-    printCommonFooter('public');
+	printCommonFooter('public');
 
-    print "</body>\n";
+	print "</body>\n";
 	print "</html>\n";
 }
 

Please login to merge, or discard this patch.

htdocs/public/emailing/mailing-read.php 1 patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -77,7 +77,7 @@
 block discarded – undo
 
 	$resql=$db->query($sql);
 
-    //Update status communication of contact prospect
+	//Update status communication of contact prospect
 	$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=3 WHERE fk_stcomm != -1 AND rowid IN (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.tag = '".$db->escape($tag)."' AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)";
 	dol_syslog("public/emailing/mailing-read.php : Mail read contact : ".$sql, LOG_DEBUG);
 

Please login to merge, or discard this patch.

htdocs/public/emailing/mailing-unsubscribe.php 1 patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -87,7 +87,7 @@
 block discarded – undo
 	$resql=$db->query($sql);
 	if (! $resql) dol_print_error($db);
 
-    // Update status communication of contact prospect
+	// Update status communication of contact prospect
 	$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET no_email=1 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE tag = '".$db->escape($tag)."' AND source_type='contact' AND source_id is not null)";
 	dol_syslog("public/emailing/mailing-unsubscribe.php : Mail unsubcribe contact : ".$sql, LOG_DEBUG);
 

Please login to merge, or discard this patch.

htdocs/public/paybox/paymentok.php 1 patch

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -140,12 +140,12 @@  discard block
 block discarded – undo
 	$appli=constant('DOL_APPLICATION_TITLE');
 	if (! empty($conf->global->MAIN_APPLICATION_TITLE))
 	{
-	    $appli=$conf->global->MAIN_APPLICATION_TITLE;
-	    if (preg_match('/\d\.\d/', $appli))
-	    {
-	        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
-	    }
-	    else $appli.=" ".DOL_VERSION;
+		$appli=$conf->global->MAIN_APPLICATION_TITLE;
+		if (preg_match('/\d\.\d/', $appli))
+		{
+			if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+		}
+		else $appli.=" ".DOL_VERSION;
 	}
 	else $appli.=" ".DOL_VERSION;
 	
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
 	}
 	$content.="<br>\n";
 	$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":<br>\n";
-    $content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."<br>\n";
+	$content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."<br>\n";
 	$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
 	$content.="tag=".$fulltag."<br>\n";
 

Please login to merge, or discard this patch.

htdocs/public/demo/index.php 1 patch

Indentation +168 added lines, -168 removed lines patch added patch discarded remove patch

@@ -98,12 +98,12 @@  discard block
 block discarded – undo
 		'icon'=>DOL_URL_ROOT.'/public/demo/demo-profile-foundation.jpg',
 		'url'=>$url
 		),
-	    // All demo profile
-	    array('default'=>'0', 'key'=>'profdemoall','label'=>'ChooseYourDemoProfilMore',
+		// All demo profile
+		array('default'=>'0', 'key'=>'profdemoall','label'=>'ChooseYourDemoProfilMore',
 		'disablemodules'=>'adherent,don,externalsite,mailmanspip',
-	    //'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot9.png'
+		//'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot9.png'
 		'icon'=>DOL_URL_ROOT.'/public/demo/demo-profile-all.jpg'
-	    )
+		)
 	);
 
 
@@ -113,12 +113,12 @@  discard block
 block discarded – undo
 	// Not visible
 	$alwayshiddencheckedmodules=array('accounting','api','barcode','bookmark','clicktodial','comptabilite','cron','document','domain','externalrss','externalsite','fckeditor','geoipmaxmind','gravatar','label','ldap',
 									'mailmanspip','notification','oauth','syslog','user','webservices',
-	                                // Extended modules
-	                                'memcached','numberwords','zipautofillfr');
+									// Extended modules
+									'memcached','numberwords','zipautofillfr');
 	$alwayshiddenuncheckedmodules=array('ftp','hrm','webservicesclient','websites',
-	                                // Extended modules
-	                                'awstats','bittorrent','bootstrap','cabinetmed','cmcic','concatpdf','customfield','deplacement','dolicloud','filemanager','lightbox','mantis','monitoring','moretemplates','multicompany','nltechno','numberingpack','openstreetmap',
-	                                'ovh','phenix','phpsysinfo','pibarcode','postnuke','selectbank','skincoloreditor','submiteverywhere','survey','thomsonphonebook','topten','tvacerfa','voyage','webcalendar','webmail');
+									// Extended modules
+									'awstats','bittorrent','bootstrap','cabinetmed','cmcic','concatpdf','customfield','deplacement','dolicloud','filemanager','lightbox','mantis','monitoring','moretemplates','multicompany','nltechno','numberingpack','openstreetmap',
+									'ovh','phenix','phpsysinfo','pibarcode','postnuke','selectbank','skincoloreditor','submiteverywhere','survey','thomsonphonebook','topten','tvacerfa','voyage','webcalendar','webmail');
 }
 
 // Search modules
@@ -139,61 +139,61 @@  discard block
 block discarded – undo
 
 foreach ($modulesdir as $dir)
 {
-    // Charge tableaux modules, nom, numero, orders depuis repertoire dir
-    $handle=@opendir($dir);
-    if (is_resource($handle))
-    {
-        while (($file = readdir($handle))!==false)
-        {
-            //print "$i ".$file."\n<br>";
-            if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod'  && substr($file, dol_strlen($file) - 10) == '.class.php')
-            {
-                $modName = substr($file, 0, dol_strlen($file) - 10);
-
-                if ($modName)
-                {
-		            try
-		            {
-                        include_once $dir.$file;
-                        $objMod = new $modName($db);
-
-                        if ($objMod->numero > 0)
-                        {
-                            $j = $objMod->numero;
-                        }
-                        else
-                        {
-                            $j = 1000 + $i;
-                        }
-
-                        $modulequalified=1;
-
-                        // We discard modules according to features level (PS: if module is activated we always show it)
-                        $const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',get_class($objMod)));
-                        if ($objMod->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2 && empty($conf->global->$const_name)) $modulequalified=0;
-                        if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && empty($conf->global->$const_name)) $modulequalified=0;
-
-                        if ($modulequalified)
-                        {
-                            $modules[$i] = $objMod;
-                            $filename[$i]= $modName;
-                            $orders[$i]  = $objMod->family."_".$j;   // Tri par famille puis numero module
-                            //print "x".$modName." ".$orders[$i]."\n<br>";
-       						if (isset($categ[$objMod->special])) $categ[$objMod->special]++;					// Array of all different modules categories
-       			            else $categ[$objMod->special]=1;
-                            $dirmod[$i] = $dirroot;
-                            $j++;
-                            $i++;
-                        }
-		            }
-                    catch(Exception $e)
-                    {
-                        dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
-                    }
-                }
-            }
-        }
-    }
+	// Charge tableaux modules, nom, numero, orders depuis repertoire dir
+	$handle=@opendir($dir);
+	if (is_resource($handle))
+	{
+		while (($file = readdir($handle))!==false)
+		{
+			//print "$i ".$file."\n<br>";
+			if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod'  && substr($file, dol_strlen($file) - 10) == '.class.php')
+			{
+				$modName = substr($file, 0, dol_strlen($file) - 10);
+
+				if ($modName)
+				{
+					try
+					{
+						include_once $dir.$file;
+						$objMod = new $modName($db);
+
+						if ($objMod->numero > 0)
+						{
+							$j = $objMod->numero;
+						}
+						else
+						{
+							$j = 1000 + $i;
+						}
+
+						$modulequalified=1;
+
+						// We discard modules according to features level (PS: if module is activated we always show it)
+						$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',get_class($objMod)));
+						if ($objMod->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2 && empty($conf->global->$const_name)) $modulequalified=0;
+						if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && empty($conf->global->$const_name)) $modulequalified=0;
+
+						if ($modulequalified)
+						{
+							$modules[$i] = $objMod;
+							$filename[$i]= $modName;
+							$orders[$i]  = $objMod->family."_".$j;   // Tri par famille puis numero module
+							//print "x".$modName." ".$orders[$i]."\n<br>";
+	   						if (isset($categ[$objMod->special])) $categ[$objMod->special]++;					// Array of all different modules categories
+	   						else $categ[$objMod->special]=1;
+							$dirmod[$i] = $dirroot;
+							$j++;
+							$i++;
+						}
+					}
+					catch(Exception $e)
+					{
+						dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
+					}
+				}
+			}
+		}
+	}
 }
 
 asort($orders);
@@ -211,32 +211,32 @@  discard block
 block discarded – undo
 	// If we disable modules using a profile choice
 	if (GETPOST("demochoice"))
 	{
-    	foreach ($demoprofiles as $profilearray)
-    	{
-    		if ($profilearray['key'] == GETPOST("demochoice"))
-    		{
-    			$disablestring=$profilearray['disablemodules'];
-    			break;
-    		}
-    	}
+		foreach ($demoprofiles as $profilearray)
+		{
+			if ($profilearray['key'] == GETPOST("demochoice"))
+			{
+				$disablestring=$profilearray['disablemodules'];
+				break;
+			}
+		}
 	}
 	// If we disable modules using personalized list
 	foreach($modules as $val)
 	{
-	    $modulekeyname=strtolower($val->name);
-	    if (empty($_POST[$modulekeyname]) && empty($val->always_enabled) && ! in_array($modulekeyname,$alwayscheckedmodules))
-	    {
-	        $disablestring.=$modulekeyname.',';
-	        if ($modulekeyname=='propale') $disablestring.='propal,';
-	    }
+		$modulekeyname=strtolower($val->name);
+		if (empty($_POST[$modulekeyname]) && empty($val->always_enabled) && ! in_array($modulekeyname,$alwayscheckedmodules))
+		{
+			$disablestring.=$modulekeyname.',';
+			if ($modulekeyname=='propale') $disablestring.='propal,';
+		}
 	}
 
-    // Do redirect to login page
+	// Do redirect to login page
 	if ($disablestring)
 	{
 		if (GETPOST('urlfrom')) $url.=(preg_match('/\?/',$url)?'&amp;':'?').'urlfrom='.urlencode(GETPOST('urlfrom','alpha'));
 		$url.=(preg_match('/\?/',$url)?'&amp;':'?').'disablemodules='.$disablestring;
-        //var_dump($url);exit;
+		//var_dump($url);exit;
 		header("Location: ".$url);
 		exit;
 	}
@@ -304,49 +304,49 @@  discard block
 block discarded – undo
 {
 	if ($profilearray['default'] >= 0)
 	{
-	    //print $profilearray['lang'];
-	    if (! empty($profilearray['lang'])) $langs->load($profilearray['lang']);
+		//print $profilearray['lang'];
+		if (! empty($profilearray['lang'])) $langs->load($profilearray['lang']);
 
 		$url=$_SERVER["PHP_SELF"].'?action=gotodemo';
 		$urlwithmod=$url.'&amp;demochoice='.$profilearray['key'];
 		// Should work with DOL_URL_ROOT='' or DOL_URL_ROOT='/dolibarr'
 		//print "xx".$_SERVER["PHP_SELF"].' '.DOL_URL_ROOT.'<br>';
 
-        $urlfrom=preg_replace('/^'.preg_quote(DOL_URL_ROOT,'/').'/i','',$_SERVER["PHP_SELF"]);
+		$urlfrom=preg_replace('/^'.preg_quote(DOL_URL_ROOT,'/').'/i','',$_SERVER["PHP_SELF"]);
 		//print $urlfrom;
 
 		if (! empty($profilearray['url']))
 		{
-		    $urlwithmod=$profilearray['url'];
-		    $urlwithmod=$urlwithmod.(preg_match('/\?/',$urlwithmod)?'&amp;':'?').'urlfrom='.urlencode($urlfrom);
-		    if (! empty($profilearray['disablemodules']))
-		    {
-		          $urlwithmod=$urlwithmod.(preg_match('/\?/',$urlwithmod)?'&amp;':'?').'disablemodules='.$profilearray['disablemodules'];
-		    }
+			$urlwithmod=$profilearray['url'];
+			$urlwithmod=$urlwithmod.(preg_match('/\?/',$urlwithmod)?'&amp;':'?').'urlfrom='.urlencode($urlfrom);
+			if (! empty($profilearray['disablemodules']))
+			{
+				  $urlwithmod=$urlwithmod.(preg_match('/\?/',$urlwithmod)?'&amp;':'?').'disablemodules='.$profilearray['disablemodules'];
+			}
 		}
 
 		if (empty($profilearray['url']))
 		{
-		    print '<div class="clearboth"></div>';
+			print '<div class="clearboth"></div>';
 		}
 
 		print '<form method="POST" class="valigntop inline-block" name="form'.$profilearray['key'].'" action="'.$_SERVER["PHP_SELF"].'#a1'.$profilearray['key'].'">'."\n";
 		print '<input type="hidden" name="action" value="gotodemo">'."\n";
-        print '<input type="hidden" name="urlfrom" value="'.dol_escape_htmltag($urlfrom).'">'."\n";
-        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
-        print '<input type="hidden" name="username" value="demo">'."\n";
-        print '<input type="hidden" name="dol_hide_topmenu" value="'.$conf->dol_hide_topmenu.'">'."\n";
-        print '<input type="hidden" name="dol_hide_leftmenu" value="'.$conf->dol_hide_leftmenu.'">'."\n";
-        print '<input type="hidden" name="dol_optimize_smallscreen" value="'.$conf->dol_optimize_smallscreen.'">'."\n";
-        print '<input type="hidden" name="dol_no_mouse_hover" value="'.$conf->dol_no_mouse_hover.'">'."\n";
-        print '<input type="hidden" name="dol_use_jmobile" value="'.$conf->dol_use_jmobile.'">'."\n";
+		print '<input type="hidden" name="urlfrom" value="'.dol_escape_htmltag($urlfrom).'">'."\n";
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
+		print '<input type="hidden" name="username" value="demo">'."\n";
+		print '<input type="hidden" name="dol_hide_topmenu" value="'.$conf->dol_hide_topmenu.'">'."\n";
+		print '<input type="hidden" name="dol_hide_leftmenu" value="'.$conf->dol_hide_leftmenu.'">'."\n";
+		print '<input type="hidden" name="dol_optimize_smallscreen" value="'.$conf->dol_optimize_smallscreen.'">'."\n";
+		print '<input type="hidden" name="dol_no_mouse_hover" value="'.$conf->dol_no_mouse_hover.'">'."\n";
+		print '<input type="hidden" name="dol_use_jmobile" value="'.$conf->dol_use_jmobile.'">'."\n";
 
-        print '<div summary="Dolibarr online demonstration for profile '.$profilearray['label'].'" class="center inline-block CTable CTableRow'.($i%2==0?'1':'0').'" style="width: 346px;">'."\n";
+		print '<div summary="Dolibarr online demonstration for profile '.$profilearray['label'].'" class="center inline-block CTable CTableRow'.($i%2==0?'1':'0').'" style="width: 346px;">'."\n";
 
 
-        print '<div id="a1'.$profilearray['key'].'" class="demobox '.(empty($profilearray['url'])?'modulelineshow cursorpointer':'nomodulelines').'">';
+		print '<div id="a1'.$profilearray['key'].'" class="demobox '.(empty($profilearray['url'])?'modulelineshow cursorpointer':'nomodulelines').'">';
 
-        print '<a href="'.$urlwithmod.'" class="'.(empty($profilearray['url'])?'modulelineshow':'nomodulelines').'">';
+		print '<a href="'.$urlwithmod.'" class="'.(empty($profilearray['url'])?'modulelineshow':'nomodulelines').'">';
 		print '<div style="padding: 10px;">';
 
 		print '<img class="demothumb" src="'.$profilearray['icon'].'" alt="Demo '.$profilearray['label'].'">';
@@ -354,69 +354,69 @@  discard block
 block discarded – undo
 		print '<div class="clearboth"></div>';
 
 		print '<div class="demothumbtext">';
-    	print $langs->trans($profilearray['label']);
-    	print '</div>';
+		print $langs->trans($profilearray['label']);
+		print '</div>';
 
-    	print '</div>';
-    	print '</a>';
+		print '</div>';
+		print '</a>';
 
 
-        // Modules (a profile you must choose modules)
-        if (empty($profilearray['url']))
-        {
-    		print '<div id="tr1'.$profilearray['key'].'" class="moduleline hidden" style="margin-left: 8px; margin-right: 8px; text-align: justify; font-size:14px; line-height: 130%; padding-bottom: 8px">';
-
-    		print $langs->trans("ThisIsListOfModules").'<br><br>';
-
-    		print '<div class="csscolumns">';
-
-    		$listofdisabledmodules=explode(',',$profilearray['disablemodules']);
-    		$j=0;
-    		$nbcolsmod=empty($conf->dol_optimize_smallscreen)?4:3;
-    		//var_dump($modules);
-    		foreach($orders as $index => $key) // Loop on qualified (enabled) modules
-    		{
-    			//print $index.' '.$key;
-    			$val = $modules[$index];
-    		    $modulekeyname=strtolower($val->name);
-
-    		    $modulequalified=1;
-                if (! empty($val->always_enabled) || in_array($modulekeyname,$alwayshiddenuncheckedmodules)) $modulequalified=0;
-                if ($val->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2 && ! $conf->global->$const_name) $modulequalified=0;
-                if ($val->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && ! $conf->global->$const_name) $modulequalified=0;
-                if (! $modulequalified) continue;
-
-                if (in_array($modulekeyname,$alwayshiddencheckedmodules))
-                {
-                    print "\n".'<!-- Module '.$modulekeyname.' hidden and always checked -->';
-                    print '<input type="hidden" name="'.$modulekeyname.'" value="1">';
-                }
-                else
-                {
-                    $modulo=($j % $nbcolsmod);
-        		    //if ($modulo == 0) print '<tr>';
-                    print '<!-- id='.$val->numero.' -->';
-                    print '<div class="nowrap">';
-                    print '<input type="checkbox" class="checkbox" name="'.$modulekeyname.'" value="1"';
-                    if (in_array($modulekeyname,$alwaysuncheckedmodules)) print ' disabled';
-                    if (! in_array($modulekeyname,$alwaysuncheckedmodules)  && (! in_array($modulekeyname,$listofdisabledmodules) || in_array($modulekeyname,$alwayscheckedmodules))) print ' checked';
-                    print '> <div class="inline-block demomaxoveflow">'.$val->getName().'</div><br>';
-                    print '</div>';
-                    //if ($modulo == ($nbcolsmod - 1)) print '</tr>';
-                    $j++;
-                }
-    		}
-
-    		print '</div>';
-
-		    print '<br><div class="center">';
-		    print '<input type="submit" value=" &nbsp; &nbsp; '.$langs->trans("Start").' &nbsp; &nbsp; " class="button">';
-		    print '</div>';
-
-		    print '</div>';
-        }
+		// Modules (a profile you must choose modules)
+		if (empty($profilearray['url']))
+		{
+			print '<div id="tr1'.$profilearray['key'].'" class="moduleline hidden" style="margin-left: 8px; margin-right: 8px; text-align: justify; font-size:14px; line-height: 130%; padding-bottom: 8px">';
+
+			print $langs->trans("ThisIsListOfModules").'<br><br>';
+
+			print '<div class="csscolumns">';
+
+			$listofdisabledmodules=explode(',',$profilearray['disablemodules']);
+			$j=0;
+			$nbcolsmod=empty($conf->dol_optimize_smallscreen)?4:3;
+			//var_dump($modules);
+			foreach($orders as $index => $key) // Loop on qualified (enabled) modules
+			{
+				//print $index.' '.$key;
+				$val = $modules[$index];
+				$modulekeyname=strtolower($val->name);
+
+				$modulequalified=1;
+				if (! empty($val->always_enabled) || in_array($modulekeyname,$alwayshiddenuncheckedmodules)) $modulequalified=0;
+				if ($val->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2 && ! $conf->global->$const_name) $modulequalified=0;
+				if ($val->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && ! $conf->global->$const_name) $modulequalified=0;
+				if (! $modulequalified) continue;
+
+				if (in_array($modulekeyname,$alwayshiddencheckedmodules))
+				{
+					print "\n".'<!-- Module '.$modulekeyname.' hidden and always checked -->';
+					print '<input type="hidden" name="'.$modulekeyname.'" value="1">';
+				}
+				else
+				{
+					$modulo=($j % $nbcolsmod);
+					//if ($modulo == 0) print '<tr>';
+					print '<!-- id='.$val->numero.' -->';
+					print '<div class="nowrap">';
+					print '<input type="checkbox" class="checkbox" name="'.$modulekeyname.'" value="1"';
+					if (in_array($modulekeyname,$alwaysuncheckedmodules)) print ' disabled';
+					if (! in_array($modulekeyname,$alwaysuncheckedmodules)  && (! in_array($modulekeyname,$listofdisabledmodules) || in_array($modulekeyname,$alwayscheckedmodules))) print ' checked';
+					print '> <div class="inline-block demomaxoveflow">'.$val->getName().'</div><br>';
+					print '</div>';
+					//if ($modulo == ($nbcolsmod - 1)) print '</tr>';
+					$j++;
+				}
+			}
+
+			print '</div>';
+
+			print '<br><div class="center">';
+			print '<input type="submit" value=" &nbsp; &nbsp; '.$langs->trans("Start").' &nbsp; &nbsp; " class="button">';
+			print '</div>';
+
+			print '</div>';
+		}
 
-        print '</div></div>';
+		print '</div></div>';
 		print '</form>'."\n";
 
 		$i++;
@@ -465,13 +465,13 @@  discard block
 block discarded – undo
  */
 function llxHeaderVierge($title, $head = "")
 {
-    global $user, $conf, $langs;
+	global $user, $conf, $langs;
 
-    top_httphead();
+	top_httphead();
 
-    top_htmlhead($head,$title,0,0,array(),array('public/demo/demo.css'));
+	top_htmlhead($head,$title,0,0,array(),array('public/demo/demo.css'));
 
-    print '<body class="demobody"><div class="demobackgrounddiv">'."\n";
+	print '<body class="demobody"><div class="demobackgrounddiv">'."\n";
 }
 
 /**
@@ -481,10 +481,10 @@  discard block
 block discarded – undo
  */
 function llxFooterVierge()
 {
-    printCommonFooter('public');
+	printCommonFooter('public');
 
-    print "\n";
-    print "</div></body>\n";
-    print "</html>\n";
+	print "\n";
+	print "</div></body>\n";
+	print "</html>\n";
 }
 

Please login to merge, or discard this patch.

htdocs/public/opensurvey/studs.php 1 patch

Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -245,13 +245,13 @@
 block discarded – undo
 
 if (empty($object->ref))     // For survey, id is a hex string
 {
-    $langs->load("errors");
-    print $langs->trans("ErrorRecordNotFound");
+	$langs->load("errors");
+	print $langs->trans("ErrorRecordNotFound");
 
-    llxFooterSurvey();
+	llxFooterSurvey();
 
-    $db->close();
-    exit();
+	$db->close();
+	exit();
 }
 
 // Define format of choices

Please login to merge, or discard this patch.

htdocs/public/test/test_arrays.php 1 patch

Indentation +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -55,9 +55,9 @@  discard block
 block discarded – undo
 }
 else
 {
-    $arraycss=array();
-    $arrayjs=array();
-    /*
+	$arraycss=array();
+	$arrayjs=array();
+	/*
 	$arraycss=array('/includes/jquery/plugins/datatables/media/css/jquery.dataTables.css',
 			'/includes/jquery/plugins/datatables/extensions/Buttons/css/buttons.dataTables.min.css',
 			'/includes/jquery/plugins/datatables/extensions/ColReorder/css/colReorder.dataTables.min.css'
@@ -214,12 +214,12 @@  discard block
 block discarded – undo
 
 if (! empty($moreforfilter))
 {
-    print '<div class="liste_titre liste_titre_bydiv centpercent">';
-    print $moreforfilter;
-    $parameters=array();
-    $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-    print '</div>';
+	print '<div class="liste_titre liste_titre_bydiv centpercent">';
+	print $moreforfilter;
+	$parameters=array();
+	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	print '</div>';
 }
 
 ?>
@@ -252,12 +252,12 @@  discard block
 block discarded – undo
 $(document).ready(function(){
     $('#idtableexample2').dataTable( {
     	<?php
-    	if ($optioncss=='print') {
-    	 	print '\'dom\': \'lfrtip\',';
-    	} else {
-    		print '\'dom\': \'Blfrtip\',';
-    	}
-    	?>
+		if ($optioncss=='print') {
+		 	print '\'dom\': \'lfrtip\',';
+		} else {
+			print '\'dom\': \'Blfrtip\',';
+		}
+		?>
     	"colReorder": true,
 		'buttons': [
 		          'colvis','copy', 'csv', 'excel', 'pdf', 'print'

Please login to merge, or discard this patch.

		@@ -152,7 +152,7 @@
		block discarded – undo
152	152	*/
153	153	function llxFooterVierge()
154	154	{
155		- printCommonFooter('public');
	155	+ printCommonFooter('public');
156	156
157	157	print "</body>\n";
158	158	print "</html>\n";

		@@ -87,7 +87,7 @@
		block discarded – undo
87	87	$resql=$db->query($sql);
88	88	if (! $resql) dol_print_error($db);
89	89
90		- // Update status communication of contact prospect
	90	+ // Update status communication of contact prospect
91	91	$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET no_email=1 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE tag = '".$db->escape($tag)."' AND source_type='contact' AND source_id is not null)";
92	92	dol_syslog("public/emailing/mailing-unsubscribe.php : Mail unsubcribe contact : ".$sql, LOG_DEBUG);
93	93

		@@ -140,12 +140,12 @@ discard block
		block discarded – undo
140	140	$appli=constant('DOL_APPLICATION_TITLE');
141	141	if (! empty($conf->global->MAIN_APPLICATION_TITLE))
142	142	{
143		- $appli=$conf->global->MAIN_APPLICATION_TITLE;
144		- if (preg_match('/\d\.\d/', $appli))
145		- {
146		- if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")"; // If new title contains a version that is different than core
147		- }
148		- else $appli.=" ".DOL_VERSION;
	143	+ $appli=$conf->global->MAIN_APPLICATION_TITLE;
	144	+ if (preg_match('/\d\.\d/', $appli))
	145	+ {
	146	+ if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")"; // If new title contains a version that is different than core
	147	+ }
	148	+ else $appli.=" ".DOL_VERSION;
149	149	}
150	150	else $appli.=" ".DOL_VERSION;
151	151
		@@ -167,7 +167,7 @@ discard block
		block discarded – undo
167	167	}
168	168	$content.="<br>\n";
169	169	$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":<br>\n";
170		- $content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."<br>\n";
	170	+ $content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."<br>\n";
171	171	$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
172	172	$content.="tag=".$fulltag."<br>\n";
173	173

		@@ -245,13 +245,13 @@
		block discarded – undo
245	245
246	246	if (empty($object->ref)) // For survey, id is a hex string
247	247	{
248		- $langs->load("errors");
249		- print $langs->trans("ErrorRecordNotFound");
	248	+ $langs->load("errors");
	249	+ print $langs->trans("ErrorRecordNotFound");
250	250
251		- llxFooterSurvey();
	251	+ llxFooterSurvey();
252	252
253		- $db->close();
254		- exit();
	253	+ $db->close();
	254	+ exit();
255	255	}
256	256
257	257	// Define format of choices

		@@ -108,12 +108,12 @@ discard block
		block discarded – undo
108	108	// Complete long filename
109	109	foreach ($filters as $key => $value)
110	110	{
111		- //if ($key == 'notolderthan') $filename.='-notolderthan'.$value; This filter key is already added before and does not need to be in filename
	111	+ //if ($key == 'notolderthan') $filename.='-notolderthan'.$value; This filter key is already added before and does not need to be in filename
112	112	if ($key == 'year') $filename.='-year'.$value;
113		- if ($key == 'id') $filename.='-id'.$value;
114		- if ($key == 'idfrom') $filename.='-idfrom'.$value;
115		- if ($key == 'idto') $filename.='-idto'.$value;
116		- if ($key == 'project') $filename.='-project'.$value;
	113	+ if ($key == 'id') $filename.='-id'.$value;
	114	+ if ($key == 'idfrom') $filename.='-idfrom'.$value;
	115	+ if ($key == 'idto') $filename.='-idto'.$value;
	116	+ if ($key == 'project') $filename.='-project'.$value;
117	117	if ($key == 'logina') $filename.='-logina'.$value; // Author
118	118	if ($key == 'logint') $filename.='-logint'.$value; // Assigned to
119	119	}
		@@ -127,7 +127,7 @@ discard block
		block discarded – undo
127	127	$langs->load("main");
128	128	$langs->load("errors");
129	129	llxHeaderVierge();
130		- print '<div class="error">'.$langs->trans("ErrorWrongValueForParameterX",'format').'</div>';
	130	+ print '<div class="error">'.$langs->trans("ErrorWrongValueForParameterX",'format').'</div>';
131	131	llxFooterVierge();
132	132	exit;
133	133	}
		@@ -162,7 +162,7 @@ discard block
		block discarded – undo
162	162	$result=readfile($outputfile);
163	163	if (! $result) print 'File '.$outputfile.' was empty.';
164	164
165		- //header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
	165	+ //header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
166	166	exit;
167	167	}
168	168	else

		@@ -58,10 +58,10 @@ discard block
		block discarded – undo
58	58
59	59	header("Content-type: text/html; charset=".$conf->file->character_set_client);
60	60	print "<html>\n";
61		- print "<head>\n";
62		- print "<title>".$title."</title>\n";
63		- if ($head) print $head."\n";
64		- print "</head>\n";
	61	+ print "<head>\n";
	62	+ print "<title>".$title."</title>\n";
	63	+ if ($head) print $head."\n";
	64	+ print "</head>\n";
65	65	print '<body class="public_body">'."\n";
66	66	}
67	67
		@@ -72,9 +72,9 @@ discard block
		block discarded – undo
72	72	*/
73	73	function llxFooterVierge()
74	74	{
75		- printCommonFooter('public');
	75	+ printCommonFooter('public');
76	76
77		- print "</body>\n";
	77	+ print "</body>\n";
78	78	print "</html>\n";
79	79	}
80	80

		@@ -77,7 +77,7 @@
		block discarded – undo
77	77
78	78	$resql=$db->query($sql);
79	79
80		- //Update status communication of contact prospect
	80	+ //Update status communication of contact prospect
81	81	$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=3 WHERE fk_stcomm != -1 AND rowid IN (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.tag = '".$db->escape($tag)."' AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)";
82	82	dol_syslog("public/emailing/mailing-read.php : Mail read contact : ".$sql, LOG_DEBUG);
83	83

		@@ -98,12 +98,12 @@ discard block
		block discarded – undo
98	98	'icon'=>DOL_URL_ROOT.'/public/demo/demo-profile-foundation.jpg',
99	99	'url'=>$url
100	100	),
101		- // All demo profile
102		- array('default'=>'0', 'key'=>'profdemoall','label'=>'ChooseYourDemoProfilMore',
	101	+ // All demo profile
	102	+ array('default'=>'0', 'key'=>'profdemoall','label'=>'ChooseYourDemoProfilMore',
103	103	'disablemodules'=>'adherent,don,externalsite,mailmanspip',
104		- //'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot9.png'
	104	+ //'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot9.png'
105	105	'icon'=>DOL_URL_ROOT.'/public/demo/demo-profile-all.jpg'
106		- )
	106	+ )
107	107	);
108	108
109	109
		@@ -113,12 +113,12 @@ discard block
		block discarded – undo
113	113	// Not visible
114	114	$alwayshiddencheckedmodules=array('accounting','api','barcode','bookmark','clicktodial','comptabilite','cron','document','domain','externalrss','externalsite','fckeditor','geoipmaxmind','gravatar','label','ldap',
115	115	'mailmanspip','notification','oauth','syslog','user','webservices',
116		- // Extended modules
117		- 'memcached','numberwords','zipautofillfr');
	116	+ // Extended modules
	117	+ 'memcached','numberwords','zipautofillfr');
118	118	$alwayshiddenuncheckedmodules=array('ftp','hrm','webservicesclient','websites',
119		- // Extended modules
120		- 'awstats','bittorrent','bootstrap','cabinetmed','cmcic','concatpdf','customfield','deplacement','dolicloud','filemanager','lightbox','mantis','monitoring','moretemplates','multicompany','nltechno','numberingpack','openstreetmap',
121		- 'ovh','phenix','phpsysinfo','pibarcode','postnuke','selectbank','skincoloreditor','submiteverywhere','survey','thomsonphonebook','topten','tvacerfa','voyage','webcalendar','webmail');
	119	+ // Extended modules
	120	+ 'awstats','bittorrent','bootstrap','cabinetmed','cmcic','concatpdf','customfield','deplacement','dolicloud','filemanager','lightbox','mantis','monitoring','moretemplates','multicompany','nltechno','numberingpack','openstreetmap',
	121	+ 'ovh','phenix','phpsysinfo','pibarcode','postnuke','selectbank','skincoloreditor','submiteverywhere','survey','thomsonphonebook','topten','tvacerfa','voyage','webcalendar','webmail');
122	122	}
123	123
124	124	// Search modules
		@@ -139,61 +139,61 @@ discard block
		block discarded – undo
139	139
140	140	foreach ($modulesdir as $dir)
141	141	{
142		- // Charge tableaux modules, nom, numero, orders depuis repertoire dir
143		- $handle=@opendir($dir);
144		- if (is_resource($handle))
145		- {
146		- while (($file = readdir($handle))!==false)
147		- {
148		- //print "$i ".$file."\n<br>";
149		- if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php')
150		- {
151		- $modName = substr($file, 0, dol_strlen($file) - 10);
152		-
153		- if ($modName)
154		- {
155		- try
156		- {
157		- include_once $dir.$file;
158		- $objMod = new $modName($db);
159		-
160		- if ($objMod->numero > 0)
161		- {
162		- $j = $objMod->numero;
163		- }
164		- else
165		- {
166		- $j = 1000 + $i;
167		- }
168		-
169		- $modulequalified=1;
170		-
171		- // We discard modules according to features level (PS: if module is activated we always show it)
172		- $const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',get_class($objMod)));
173		- if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && empty($conf->global->$const_name)) $modulequalified=0;
174		- if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && empty($conf->global->$const_name)) $modulequalified=0;
175		-
176		- if ($modulequalified)
177		- {
178		- $modules[$i] = $objMod;
179		- $filename[$i]= $modName;
180		- $orders[$i] = $objMod->family."_".$j; // Tri par famille puis numero module
181		- //print "x".$modName." ".$orders[$i]."\n<br>";
182		- if (isset($categ[$objMod->special])) $categ[$objMod->special]++; // Array of all different modules categories
183		- else $categ[$objMod->special]=1;
184		- $dirmod[$i] = $dirroot;
185		- $j++;
186		- $i++;
187		- }
188		- }
189		- catch(Exception $e)
190		- {
191		- dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
192		- }
193		- }
194		- }
195		- }
196		- }
	142	+ // Charge tableaux modules, nom, numero, orders depuis repertoire dir
	143	+ $handle=@opendir($dir);
	144	+ if (is_resource($handle))
	145	+ {
	146	+ while (($file = readdir($handle))!==false)
	147	+ {
	148	+ //print "$i ".$file."\n<br>";
	149	+ if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php')
	150	+ {
	151	+ $modName = substr($file, 0, dol_strlen($file) - 10);
	152	+
	153	+ if ($modName)
	154	+ {
	155	+ try
	156	+ {
	157	+ include_once $dir.$file;
	158	+ $objMod = new $modName($db);
	159	+
	160	+ if ($objMod->numero > 0)
	161	+ {
	162	+ $j = $objMod->numero;
	163	+ }
	164	+ else
	165	+ {
	166	+ $j = 1000 + $i;
	167	+ }
	168	+
	169	+ $modulequalified=1;
	170	+
	171	+ // We discard modules according to features level (PS: if module is activated we always show it)
	172	+ $const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',get_class($objMod)));
	173	+ if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && empty($conf->global->$const_name)) $modulequalified=0;
	174	+ if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && empty($conf->global->$const_name)) $modulequalified=0;
	175	+
	176	+ if ($modulequalified)
	177	+ {
	178	+ $modules[$i] = $objMod;
	179	+ $filename[$i]= $modName;
	180	+ $orders[$i] = $objMod->family."_".$j; // Tri par famille puis numero module
	181	+ //print "x".$modName." ".$orders[$i]."\n<br>";
	182	+ if (isset($categ[$objMod->special])) $categ[$objMod->special]++; // Array of all different modules categories
	183	+ else $categ[$objMod->special]=1;
	184	+ $dirmod[$i] = $dirroot;
	185	+ $j++;
	186	+ $i++;
	187	+ }
	188	+ }
	189	+ catch(Exception $e)
	190	+ {
	191	+ dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
	192	+ }
	193	+ }
	194	+ }
	195	+ }
	196	+ }
197	197	}
198	198
199	199	asort($orders);
		@@ -211,32 +211,32 @@ discard block
		block discarded – undo
211	211	// If we disable modules using a profile choice
212	212	if (GETPOST("demochoice"))
213	213	{
214		- foreach ($demoprofiles as $profilearray)
215		- {
216		- if ($profilearray['key'] == GETPOST("demochoice"))
217		- {
218		- $disablestring=$profilearray['disablemodules'];
219		- break;
220		- }
221		- }
	214	+ foreach ($demoprofiles as $profilearray)
	215	+ {
	216	+ if ($profilearray['key'] == GETPOST("demochoice"))
	217	+ {
	218	+ $disablestring=$profilearray['disablemodules'];
	219	+ break;
	220	+ }
	221	+ }
222	222	}
223	223	// If we disable modules using personalized list
224	224	foreach($modules as $val)
225	225	{
226		- $modulekeyname=strtolower($val->name);
227		- if (empty($_POST[$modulekeyname]) && empty($val->always_enabled) && ! in_array($modulekeyname,$alwayscheckedmodules))
228		- {
229		- $disablestring.=$modulekeyname.',';
230		- if ($modulekeyname=='propale') $disablestring.='propal,';
231		- }
	226	+ $modulekeyname=strtolower($val->name);
	227	+ if (empty($_POST[$modulekeyname]) && empty($val->always_enabled) && ! in_array($modulekeyname,$alwayscheckedmodules))
	228	+ {
	229	+ $disablestring.=$modulekeyname.',';
	230	+ if ($modulekeyname=='propale') $disablestring.='propal,';
	231	+ }
232	232	}
233	233
234		- // Do redirect to login page
	234	+ // Do redirect to login page
235	235	if ($disablestring)
236	236	{
237	237	if (GETPOST('urlfrom')) $url.=(preg_match('/\?/',$url)?'&':'?').'urlfrom='.urlencode(GETPOST('urlfrom','alpha'));
238	238	$url.=(preg_match('/\?/',$url)?'&':'?').'disablemodules='.$disablestring;
239		- //var_dump($url);exit;
	239	+ //var_dump($url);exit;
240	240	header("Location: ".$url);
241	241	exit;
242	242	}
		@@ -304,49 +304,49 @@ discard block
		block discarded – undo
304	304	{
305	305	if ($profilearray['default'] >= 0)
306	306	{
307		- //print $profilearray['lang'];
308		- if (! empty($profilearray['lang'])) $langs->load($profilearray['lang']);
	307	+ //print $profilearray['lang'];
	308	+ if (! empty($profilearray['lang'])) $langs->load($profilearray['lang']);
309	309
310	310	$url=$_SERVER["PHP_SELF"].'?action=gotodemo';
311	311	$urlwithmod=$url.'&demochoice='.$profilearray['key'];
312	312	// Should work with DOL_URL_ROOT='' or DOL_URL_ROOT='/dolibarr'
313	313	//print "xx".$_SERVER["PHP_SELF"].' '.DOL_URL_ROOT.'<br>';
314	314
315		- $urlfrom=preg_replace('/^'.preg_quote(DOL_URL_ROOT,'/').'/i','',$_SERVER["PHP_SELF"]);
	315	+ $urlfrom=preg_replace('/^'.preg_quote(DOL_URL_ROOT,'/').'/i','',$_SERVER["PHP_SELF"]);
316	316	//print $urlfrom;
317	317
318	318	if (! empty($profilearray['url']))
319	319	{
320		- $urlwithmod=$profilearray['url'];
321		- $urlwithmod=$urlwithmod.(preg_match('/\?/',$urlwithmod)?'&':'?').'urlfrom='.urlencode($urlfrom);
322		- if (! empty($profilearray['disablemodules']))
323		- {
324		- $urlwithmod=$urlwithmod.(preg_match('/\?/',$urlwithmod)?'&':'?').'disablemodules='.$profilearray['disablemodules'];
325		- }
	320	+ $urlwithmod=$profilearray['url'];
	321	+ $urlwithmod=$urlwithmod.(preg_match('/\?/',$urlwithmod)?'&':'?').'urlfrom='.urlencode($urlfrom);
	322	+ if (! empty($profilearray['disablemodules']))
	323	+ {
	324	+ $urlwithmod=$urlwithmod.(preg_match('/\?/',$urlwithmod)?'&':'?').'disablemodules='.$profilearray['disablemodules'];
	325	+ }
326	326	}
327	327
328	328	if (empty($profilearray['url']))
329	329	{
330		- print '<div class="clearboth"></div>';
	330	+ print '<div class="clearboth"></div>';
331	331	}
332	332
333	333	print '<form method="POST" class="valigntop inline-block" name="form'.$profilearray['key'].'" action="'.$_SERVER["PHP_SELF"].'#a1'.$profilearray['key'].'">'."\n";
334	334	print '<input type="hidden" name="action" value="gotodemo">'."\n";
335		- print '<input type="hidden" name="urlfrom" value="'.dol_escape_htmltag($urlfrom).'">'."\n";
336		- print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
337		- print '<input type="hidden" name="username" value="demo">'."\n";
338		- print '<input type="hidden" name="dol_hide_topmenu" value="'.$conf->dol_hide_topmenu.'">'."\n";
339		- print '<input type="hidden" name="dol_hide_leftmenu" value="'.$conf->dol_hide_leftmenu.'">'."\n";
340		- print '<input type="hidden" name="dol_optimize_smallscreen" value="'.$conf->dol_optimize_smallscreen.'">'."\n";
341		- print '<input type="hidden" name="dol_no_mouse_hover" value="'.$conf->dol_no_mouse_hover.'">'."\n";
342		- print '<input type="hidden" name="dol_use_jmobile" value="'.$conf->dol_use_jmobile.'">'."\n";
	335	+ print '<input type="hidden" name="urlfrom" value="'.dol_escape_htmltag($urlfrom).'">'."\n";
	336	+ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
	337	+ print '<input type="hidden" name="username" value="demo">'."\n";
	338	+ print '<input type="hidden" name="dol_hide_topmenu" value="'.$conf->dol_hide_topmenu.'">'."\n";
	339	+ print '<input type="hidden" name="dol_hide_leftmenu" value="'.$conf->dol_hide_leftmenu.'">'."\n";
	340	+ print '<input type="hidden" name="dol_optimize_smallscreen" value="'.$conf->dol_optimize_smallscreen.'">'."\n";
	341	+ print '<input type="hidden" name="dol_no_mouse_hover" value="'.$conf->dol_no_mouse_hover.'">'."\n";
	342	+ print '<input type="hidden" name="dol_use_jmobile" value="'.$conf->dol_use_jmobile.'">'."\n";
343	343
344		- print '<div summary="Dolibarr online demonstration for profile '.$profilearray['label'].'" class="center inline-block CTable CTableRow'.($i%2==0?'1':'0').'" style="width: 346px;">'."\n";
	344	+ print '<div summary="Dolibarr online demonstration for profile '.$profilearray['label'].'" class="center inline-block CTable CTableRow'.($i%2==0?'1':'0').'" style="width: 346px;">'."\n";
345	345
346	346
347		- print '<div id="a1'.$profilearray['key'].'" class="demobox '.(empty($profilearray['url'])?'modulelineshow cursorpointer':'nomodulelines').'">';
	347	+ print '<div id="a1'.$profilearray['key'].'" class="demobox '.(empty($profilearray['url'])?'modulelineshow cursorpointer':'nomodulelines').'">';
348	348
349		- print '<a href="'.$urlwithmod.'" class="'.(empty($profilearray['url'])?'modulelineshow':'nomodulelines').'">';
	349	+ print '<a href="'.$urlwithmod.'" class="'.(empty($profilearray['url'])?'modulelineshow':'nomodulelines').'">';
350	350	print '<div style="padding: 10px;">';
351	351
352	352	print '<img class="demothumb" src="'.$profilearray['icon'].'" alt="Demo '.$profilearray['label'].'">';
		@@ -354,69 +354,69 @@ discard block
		block discarded – undo
354	354	print '<div class="clearboth"></div>';
355	355
356	356	print '<div class="demothumbtext">';
357		- print $langs->trans($profilearray['label']);
358		- print '</div>';
	357	+ print $langs->trans($profilearray['label']);
	358	+ print '</div>';
359	359
360		- print '</div>';
361		- print '</a>';
	360	+ print '</div>';
	361	+ print '</a>';
362	362
363	363
364		- // Modules (a profile you must choose modules)
365		- if (empty($profilearray['url']))
366		- {
367		- print '<div id="tr1'.$profilearray['key'].'" class="moduleline hidden" style="margin-left: 8px; margin-right: 8px; text-align: justify; font-size:14px; line-height: 130%; padding-bottom: 8px">';
368		-
369		- print $langs->trans("ThisIsListOfModules").'<br><br>';
370		-
371		- print '<div class="csscolumns">';
372		-
373		- $listofdisabledmodules=explode(',',$profilearray['disablemodules']);
374		- $j=0;
375		- $nbcolsmod=empty($conf->dol_optimize_smallscreen)?4:3;
376		- //var_dump($modules);
377		- foreach($orders as $index => $key) // Loop on qualified (enabled) modules
378		- {
379		- //print $index.' '.$key;
380		- $val = $modules[$index];
381		- $modulekeyname=strtolower($val->name);
382		-
383		- $modulequalified=1;
384		- if (! empty($val->always_enabled) \|\| in_array($modulekeyname,$alwayshiddenuncheckedmodules)) $modulequalified=0;
385		- if ($val->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && ! $conf->global->$const_name) $modulequalified=0;
386		- if ($val->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && ! $conf->global->$const_name) $modulequalified=0;
387		- if (! $modulequalified) continue;
388		-
389		- if (in_array($modulekeyname,$alwayshiddencheckedmodules))
390		- {
391		- print "\n".'<!-- Module '.$modulekeyname.' hidden and always checked -->';
392		- print '<input type="hidden" name="'.$modulekeyname.'" value="1">';
393		- }
394		- else
395		- {
396		- $modulo=($j % $nbcolsmod);
397		- //if ($modulo == 0) print '<tr>';
398		- print '<!-- id='.$val->numero.' -->';
399		- print '<div class="nowrap">';
400		- print '<input type="checkbox" class="checkbox" name="'.$modulekeyname.'" value="1"';
401		- if (in_array($modulekeyname,$alwaysuncheckedmodules)) print ' disabled';
402		- if (! in_array($modulekeyname,$alwaysuncheckedmodules) && (! in_array($modulekeyname,$listofdisabledmodules) \|\| in_array($modulekeyname,$alwayscheckedmodules))) print ' checked';
403		- print '> <div class="inline-block demomaxoveflow">'.$val->getName().'</div><br>';
404		- print '</div>';
405		- //if ($modulo == ($nbcolsmod - 1)) print '</tr>';
406		- $j++;
407		- }
408		- }
409		-
410		- print '</div>';
411		-
412		- print '<br><div class="center">';
413		- print '<input type="submit" value="     '.$langs->trans("Start").'     " class="button">';
414		- print '</div>';
415		-
416		- print '</div>';
417		- }
	364	+ // Modules (a profile you must choose modules)
	365	+ if (empty($profilearray['url']))
	366	+ {
	367	+ print '<div id="tr1'.$profilearray['key'].'" class="moduleline hidden" style="margin-left: 8px; margin-right: 8px; text-align: justify; font-size:14px; line-height: 130%; padding-bottom: 8px">';
	368	+
	369	+ print $langs->trans("ThisIsListOfModules").'<br><br>';
	370	+
	371	+ print '<div class="csscolumns">';
	372	+
	373	+ $listofdisabledmodules=explode(',',$profilearray['disablemodules']);
	374	+ $j=0;
	375	+ $nbcolsmod=empty($conf->dol_optimize_smallscreen)?4:3;
	376	+ //var_dump($modules);
	377	+ foreach($orders as $index => $key) // Loop on qualified (enabled) modules
	378	+ {
	379	+ //print $index.' '.$key;
	380	+ $val = $modules[$index];
	381	+ $modulekeyname=strtolower($val->name);
	382	+
	383	+ $modulequalified=1;
	384	+ if (! empty($val->always_enabled) \|\| in_array($modulekeyname,$alwayshiddenuncheckedmodules)) $modulequalified=0;
	385	+ if ($val->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && ! $conf->global->$const_name) $modulequalified=0;
	386	+ if ($val->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && ! $conf->global->$const_name) $modulequalified=0;
	387	+ if (! $modulequalified) continue;
	388	+
	389	+ if (in_array($modulekeyname,$alwayshiddencheckedmodules))
	390	+ {
	391	+ print "\n".'<!-- Module '.$modulekeyname.' hidden and always checked -->';
	392	+ print '<input type="hidden" name="'.$modulekeyname.'" value="1">';
	393	+ }
	394	+ else
	395	+ {
	396	+ $modulo=($j % $nbcolsmod);
	397	+ //if ($modulo == 0) print '<tr>';
	398	+ print '<!-- id='.$val->numero.' -->';
	399	+ print '<div class="nowrap">';
	400	+ print '<input type="checkbox" class="checkbox" name="'.$modulekeyname.'" value="1"';
	401	+ if (in_array($modulekeyname,$alwaysuncheckedmodules)) print ' disabled';
	402	+ if (! in_array($modulekeyname,$alwaysuncheckedmodules) && (! in_array($modulekeyname,$listofdisabledmodules) \|\| in_array($modulekeyname,$alwayscheckedmodules))) print ' checked';
	403	+ print '> <div class="inline-block demomaxoveflow">'.$val->getName().'</div><br>';
	404	+ print '</div>';
	405	+ //if ($modulo == ($nbcolsmod - 1)) print '</tr>';
	406	+ $j++;
	407	+ }
	408	+ }
	409	+
	410	+ print '</div>';
	411	+
	412	+ print '<br><div class="center">';
	413	+ print '<input type="submit" value="     '.$langs->trans("Start").'     " class="button">';
	414	+ print '</div>';
	415	+
	416	+ print '</div>';
	417	+ }
418	418
419		- print '</div></div>';
	419	+ print '</div></div>';
420	420	print '</form>'."\n";
421	421
422	422	$i++;
		@@ -465,13 +465,13 @@ discard block
		block discarded – undo
465	465	*/
466	466	function llxHeaderVierge($title, $head = "")
467	467	{
468		- global $user, $conf, $langs;
	468	+ global $user, $conf, $langs;
469	469
470		- top_httphead();
	470	+ top_httphead();
471	471
472		- top_htmlhead($head,$title,0,0,array(),array('public/demo/demo.css'));
	472	+ top_htmlhead($head,$title,0,0,array(),array('public/demo/demo.css'));
473	473
474		- print '<body class="demobody"><div class="demobackgrounddiv">'."\n";
	474	+ print '<body class="demobody"><div class="demobackgrounddiv">'."\n";
475	475	}
476	476
477	477	/**
		@@ -481,10 +481,10 @@ discard block
		block discarded – undo
481	481	*/
482	482	function llxFooterVierge()
483	483	{
484		- printCommonFooter('public');
	484	+ printCommonFooter('public');
485	485
486		- print "\n";
487		- print "</div></body>\n";
488		- print "</html>\n";
	486	+ print "\n";
	487	+ print "</div></body>\n";
	488	+ print "</html>\n";
489	489	}
490	490

		@@ -55,9 +55,9 @@ discard block
		block discarded – undo
55	55	}
56	56	else
57	57	{
58		- $arraycss=array();
59		- $arrayjs=array();
60		- /*
	58	+ $arraycss=array();
	59	+ $arrayjs=array();
	60	+ /*
61	61	$arraycss=array('/includes/jquery/plugins/datatables/media/css/jquery.dataTables.css',
62	62	'/includes/jquery/plugins/datatables/extensions/Buttons/css/buttons.dataTables.min.css',
63	63	'/includes/jquery/plugins/datatables/extensions/ColReorder/css/colReorder.dataTables.min.css'
		@@ -214,12 +214,12 @@ discard block
		block discarded – undo
214	214
215	215	if (! empty($moreforfilter))
216	216	{
217		- print '<div class="liste_titre liste_titre_bydiv centpercent">';
218		- print $moreforfilter;
219		- $parameters=array();
220		- $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters); // Note that $action and $object may have been modified by hook
221		- print $hookmanager->resPrint;
222		- print '</div>';
	217	+ print '<div class="liste_titre liste_titre_bydiv centpercent">';
	218	+ print $moreforfilter;
	219	+ $parameters=array();
	220	+ $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters); // Note that $action and $object may have been modified by hook
	221	+ print $hookmanager->resPrint;
	222	+ print '</div>';
223	223	}
224	224
225	225	?>
		@@ -252,12 +252,12 @@ discard block
		block discarded – undo
252	252	$(document).ready(function(){
253	253	$('#idtableexample2').dataTable( {
254	254	<?php
255		- if ($optioncss=='print') {
256		- print '\'dom\': \'lfrtip\',';
257		- } else {
258		- print '\'dom\': \'Blfrtip\',';
259		- }
260		- ?>
	255	+ if ($optioncss=='print') {
	256	+ print '\'dom\': \'lfrtip\',';
	257	+ } else {
	258	+ print '\'dom\': \'Blfrtip\',';
	259	+ }
	260	+ ?>
261	261	"colReorder": true,
262	262	'buttons': [
263	263	'colvis','copy', 'csv', 'excel', 'pdf', 'print'

Dolibarr / dolibarr

Branch — develop (86e751)

Status

Category

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

Indentation +168 added lines, -168 removed lines patch added patch discarded remove patch

Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

Indentation +15 added lines, -15 removed lines patch added patch discarded remove patch