alxarafe / alixar

dolibarr/htdocs/core/ajax/ajaxdirtree.php

Indentation +339 added lines, -339 removed lines

@@ -34,35 +34,35 @@ 
 
 if (! isset($mode) || $mode != 'noajax')    // For ajax call
 {
-	$res=@include '../../main.inc.php';
-	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-	include_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php';
-	include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
-	include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
+    $res=@include '../../main.inc.php';
+    include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+    include_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php';
+    include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
 
-	//if (GETPOST('preopened')) { $_GET['dir'] = $_POST['dir'] = '/bbb/'; }
+    //if (GETPOST('preopened')) { $_GET['dir'] = $_POST['dir'] = '/bbb/'; }
 
-	$openeddir = GETPOST('openeddir');
-	$modulepart= GETPOST('modulepart');
-	$selecteddir = jsUnEscape(GETPOST('dir'));        // relative path. We must decode using same encoding function used by javascript: escape()
+    $openeddir = GETPOST('openeddir');
+    $modulepart= GETPOST('modulepart');
+    $selecteddir = jsUnEscape(GETPOST('dir'));        // relative path. We must decode using same encoding function used by javascript: escape()
 
-	$preopened = GETPOST('preopened');
+    $preopened = GETPOST('preopened');
 
-	if ($selecteddir != '/') $selecteddir = preg_replace('/\/$/','',$selecteddir);    // We removed last '/' except if it is '/'
+    if ($selecteddir != '/') $selecteddir = preg_replace('/\/$/','',$selecteddir);    // We removed last '/' except if it is '/'
 }
 else    // For no ajax call
 {
-	//if (GETPOST('preopened')) { $_GET['dir'] = $_POST['dir'] = GETPOST('preopened'); }
+    //if (GETPOST('preopened')) { $_GET['dir'] = $_POST['dir'] = GETPOST('preopened'); }
 
-	$openeddir = GETPOST('openeddir');
-	$modulepart= GETPOST('modulepart');
-	$selecteddir = GETPOST('dir');
+    $openeddir = GETPOST('openeddir');
+    $modulepart= GETPOST('modulepart');
+    $selecteddir = GETPOST('dir');
 
-	$preopened = GETPOST('preopened');
+    $preopened = GETPOST('preopened');
 
-	if ($selecteddir != '/') $selecteddir = preg_replace('/\/$/','',$selecteddir);    // We removed last '/' except if it is '/'
-	if (empty($url)) $url=DOL_URL_ROOT.'/ecm/index.php';
+    if ($selecteddir != '/') $selecteddir = preg_replace('/\/$/','',$selecteddir);    // We removed last '/' except if it is '/'
+    if (empty($url)) $url=DOL_URL_ROOT.'/ecm/index.php';
 }
 
 // Load translation files required by the page
@@ -72,13 +72,13 @@ 
 $fullpathselecteddir='<none>';
 if ($modulepart == 'ecm')
 {
-	$fullpathselecteddir=$conf->ecm->dir_output.'/'.($selecteddir != '/' ? $selecteddir : '');
-	$fullpathpreopened=$conf->ecm->dir_output.'/'.($preopened != '/' ? $preopened : '');
+    $fullpathselecteddir=$conf->ecm->dir_output.'/'.($selecteddir != '/' ? $selecteddir : '');
+    $fullpathpreopened=$conf->ecm->dir_output.'/'.($preopened != '/' ? $preopened : '');
 }
 elseif ($modulepart == 'medias')
 {
-	$fullpathselecteddir=$dolibarr_main_data_root.'/medias/'.($selecteddir != '/' ? $selecteddir : '');
-	$fullpathpreopened=$dolibarr_main_data_root.'/medias/'.($preopened != '/' ? $preopened : '');
+    $fullpathselecteddir=$dolibarr_main_data_root.'/medias/'.($selecteddir != '/' ? $selecteddir : '');
+    $fullpathpreopened=$dolibarr_main_data_root.'/medias/'.($preopened != '/' ? $preopened : '');
 }
 
 
@@ -95,11 +95,11 @@ 
 // Check permissions
 if ($modulepart == 'ecm')
 {
-	if (! $user->rights->ecm->read) accessforbidden();
+    if (! $user->rights->ecm->read) accessforbidden();
 }
 elseif ($modulepart == 'medias')
 {
-	// Always allowed
+    // Always allowed
 }
 
 
@@ -109,7 +109,7 @@ 
 
 if (! isset($mode) || $mode != 'noajax')	// if ajax mode
 {
-	top_httphead();
+    top_httphead();
 }
 
 //print '<!-- selecteddir (relative dir we click on) = '.$selecteddir.', openeddir = '.$openeddir.', modulepart='.$modulepart.', preopened='.$preopened.' -->'."\n";
@@ -133,13 +133,13 @@ 
 
 if (! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))
 {
-	treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir, $modulepart, $websitekey, $pageid, $preopened, $fullpathpreopened);
+    treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir, $modulepart, $websitekey, $pageid, $preopened, $fullpathpreopened);
 
-	// TODO Find a solution to not output this code for each leaf we open
-	// Enable jquery handlers on new generated HTML objects (same code than into lib_footer.js.php)
-	// Because the content is reloaded by ajax call, we must also reenable some jquery hooks
-	print "\n<!-- JS CODE TO ENABLE Tooltips on all object with class classfortooltip (reload into ajaxdirtree) -->\n";
-	print '<script type="text/javascript">
+    // TODO Find a solution to not output this code for each leaf we open
+    // Enable jquery handlers on new generated HTML objects (same code than into lib_footer.js.php)
+    // Because the content is reloaded by ajax call, we must also reenable some jquery hooks
+    print "\n<!-- JS CODE TO ENABLE Tooltips on all object with class classfortooltip (reload into ajaxdirtree) -->\n";
+    print '<script type="text/javascript">
 	            	jQuery(document).ready(function () {
 	            		jQuery(".classfortooltip").tooltip({
 							show: { collision: "flipfit", effect:\'toggle\', delay:50 },
@@ -152,170 +152,170 @@ 
 	            	});
 	            	</script>';
 
-	// This ajax service is called only when a directory $selecteddir is opened but not when closed.
-	//print '<script language="javascript">';
-	//print "loadandshowpreview('".dol_escape_js($selecteddir)."');";
-	//print '</script>';
+    // This ajax service is called only when a directory $selecteddir is opened but not when closed.
+    //print '<script language="javascript">';
+    //print "loadandshowpreview('".dol_escape_js($selecteddir)."');";
+    //print '</script>';
 }
 
 
 if (empty($conf->use_javascript_ajax) || ! empty($conf->global->MAIN_ECM_DISABLE_JS))
 {
-	print '<ul class="ecmjqft">';
-
-	// Load full tree from database. We will use it to define nbofsubdir and nboffilesinsubdir
-	if (empty($sqltree)) $sqltree=$ecmdirstatic->get_full_arbo(0);    // Slow
-
-	// ----- This section will show a tree from a fulltree array -----
-	// $section must also be defined
-	// ----------------------------------------------------------------
-
-	// Define fullpathselected ( _x_y_z ) of $section parameter (!! not into ajaxdirtree)
-	$fullpathselected='';
-	foreach($sqltree as $key => $val)
-	{
-		//print $val['id']."-".$section."<br>";
-		if ($val['id'] == $section)
-		{
-			$fullpathselected=$val['fullpath'];
-			break;
-		}
-	}
-	//print "fullpathselected=".$fullpathselected."<br>";
-
-	// Update expandedsectionarray in session
-	$expandedsectionarray=array();
-	if (isset($_SESSION['dol_ecmexpandedsectionarray'])) $expandedsectionarray=explode(',',$_SESSION['dol_ecmexpandedsectionarray']);
-
-	if ($section && GETPOST('sectionexpand') == 'true')
-	{
-		// We add all sections that are parent of opened section
-		$pathtosection=explode('_',$fullpathselected);
-		foreach($pathtosection as $idcursor)
-		{
-			if ($idcursor && ! in_array($idcursor,$expandedsectionarray))	// Not already in array
-			{
-				$expandedsectionarray[]=$idcursor;
-			}
-		}
-		$_SESSION['dol_ecmexpandedsectionarray']=join(',',$expandedsectionarray);
-	}
-	if ($section && GETPOST('sectionexpand') == 'false')
-	{
-		// We removed all expanded sections that are child of the closed section
-		$oldexpandedsectionarray=$expandedsectionarray;
-		$expandedsectionarray=array();	// Reset
-		foreach($oldexpandedsectionarray as $sectioncursor)
-		{
-			// TODO is_in_subtree(fulltree,sectionparent,sectionchild) does nox exists. Enable or remove this...
-			//if ($sectioncursor && ! is_in_subtree($sqltree,$section,$sectioncursor)) $expandedsectionarray[]=$sectioncursor;
-		}
-		$_SESSION['dol_ecmexpandedsectionarray']=join(',',$expandedsectionarray);
-	}
-	//print $_SESSION['dol_ecmexpandedsectionarray'].'<br>';
-
-	$nbofentries=0;
-	$oldvallevel=0;
-	foreach($sqltree as $key => $val)
-	{
-
-		$ecmdirstatic->id=$val['id'];
-		$ecmdirstatic->ref=$val['label'];
-
-		// Refresh cache
-		if (preg_match('/refresh/i',$action))
-		{
-			$result=$ecmdirstatic->fetch($val['id']);
-			$ecmdirstatic->ref=$ecmdirstatic->label;
-
-			$result=$ecmdirstatic->refreshcachenboffile(0);
-			$val['cachenbofdoc']=$result;
-		}
-
-		//$fullpathparent=preg_replace('/(_[^_]+)$/i','',$val['fullpath']);
-
-		// Define showline
-		$showline=0;
-
-		// If directory is son of expanded directory, we show line
-		if (in_array($val['id_mere'],$expandedsectionarray)) $showline=4;
-		// If directory is brother of selected directory, we show line
-		elseif ($val['id'] != $section && $val['id_mere'] == $ecmdirstatic->motherof[$section]) $showline=3;
-		// If directory is parent of selected directory or is selected directory, we show line
-		elseif (preg_match('/'.$val['fullpath'].'_/i',$fullpathselected.'_')) $showline=2;
-		// If we are level one we show line
-		elseif ($val['level'] < 2) $showline=1;
-
-		if ($showline)
-		{
-			if (in_array($val['id'],$expandedsectionarray)) $option='indexexpanded';
-			else $option='indexnotexpanded';
-			//print $option;
-
-			print '<li class="directory collapsed">';
-
-			// Show tree graph pictos
-			$cpt=1;
-			while ($cpt < $sqltree[$key]['level'])
-			{
-				print ' &nbsp; &nbsp;';
-				$cpt++;
-			}
-			$resarray=tree_showpad($sqltree,$key,1);
-			$a=$resarray[0];
-			$nbofsubdir=$resarray[1];
-			$nboffilesinsubdir=$resarray[2];
-
-			// Show link
-			print $ecmdirstatic->getNomUrl(0,$option,32,'class="fmdirlia jqft ecmjqft"');
-
-			print '<div class="ecmjqft">';
-
-			// Nb of docs
-			print '<table class="nobordernopadding"><tr><td>';
-			print $val['cachenbofdoc'];
-			print '</td>';
-			print '<td align="left">';
-			if ($nbofsubdir && $nboffilesinsubdir) print '<font color="#AAAAAA">+'.$nboffilesinsubdir.'</font> ';
-			print '</td>';
-
-			// Info
-			print '<td align="center">';
-			$userstatic->id=$val['fk_user_c'];
-			$userstatic->lastname=$val['login_c'];
-			$htmltooltip='<b>'.$langs->trans("ECMSection").'</b>: '.$val['label'].'<br>';
-			$htmltooltip='<b>'.$langs->trans("Type").'</b>: '.$langs->trans("ECMSectionManual").'<br>';
-			$htmltooltip.='<b>'.$langs->trans("ECMCreationUser").'</b>: '.$userstatic->getNomUrl(1, '', false, 1).'<br>';
-			$htmltooltip.='<b>'.$langs->trans("ECMCreationDate").'</b>: '.dol_print_date($val['date_c'],"dayhour").'<br>';
-			$htmltooltip.='<b>'.$langs->trans("Description").'</b>: '.$val['description'].'<br>';
-			$htmltooltip.='<b>'.$langs->trans("ECMNbOfFilesInDir").'</b>: '.$val['cachenbofdoc'].'<br>';
-			if ($nbofsubdir) $htmltooltip.='<b>'.$langs->trans("ECMNbOfFilesInSubDir").'</b>: '.$nboffilesinsubdir;
-			else $htmltooltip.='<b>'.$langs->trans("ECMNbOfSubDir").'</b>: '.$nbofsubdir.'<br>';
-			print $form->textwithpicto('', $htmltooltip, 1, 'info');
-			print "</td>";
-
-			print '</tr></table>';
-
-			print '</div>';
-
-			print "</li>\n";
-		}
-
-		$oldvallevel=$val['level'];
-		$nbofentries++;
-	}
-
-	// If nothing to show
-	if ($nbofentries == 0)
-	{
-		print '<li class="directory collapsed">';
-		print '<div class="ecmjqft">';
-		print $langs->trans("ECMNoDirectoryYet");
-		print '</div>';
-		print "</li>\n";
-	}
-
-	print '</ul>';
+    print '<ul class="ecmjqft">';
+
+    // Load full tree from database. We will use it to define nbofsubdir and nboffilesinsubdir
+    if (empty($sqltree)) $sqltree=$ecmdirstatic->get_full_arbo(0);    // Slow
+
+    // ----- This section will show a tree from a fulltree array -----
+    // $section must also be defined
+    // ----------------------------------------------------------------
+
+    // Define fullpathselected ( _x_y_z ) of $section parameter (!! not into ajaxdirtree)
+    $fullpathselected='';
+    foreach($sqltree as $key => $val)
+    {
+        //print $val['id']."-".$section."<br>";
+        if ($val['id'] == $section)
+        {
+            $fullpathselected=$val['fullpath'];
+            break;
+        }
+    }
+    //print "fullpathselected=".$fullpathselected."<br>";
+
+    // Update expandedsectionarray in session
+    $expandedsectionarray=array();
+    if (isset($_SESSION['dol_ecmexpandedsectionarray'])) $expandedsectionarray=explode(',',$_SESSION['dol_ecmexpandedsectionarray']);
+
+    if ($section && GETPOST('sectionexpand') == 'true')
+    {
+        // We add all sections that are parent of opened section
+        $pathtosection=explode('_',$fullpathselected);
+        foreach($pathtosection as $idcursor)
+        {
+            if ($idcursor && ! in_array($idcursor,$expandedsectionarray))	// Not already in array
+            {
+                $expandedsectionarray[]=$idcursor;
+            }
+        }
+        $_SESSION['dol_ecmexpandedsectionarray']=join(',',$expandedsectionarray);
+    }
+    if ($section && GETPOST('sectionexpand') == 'false')
+    {
+        // We removed all expanded sections that are child of the closed section
+        $oldexpandedsectionarray=$expandedsectionarray;
+        $expandedsectionarray=array();	// Reset
+        foreach($oldexpandedsectionarray as $sectioncursor)
+        {
+            // TODO is_in_subtree(fulltree,sectionparent,sectionchild) does nox exists. Enable or remove this...
+            //if ($sectioncursor && ! is_in_subtree($sqltree,$section,$sectioncursor)) $expandedsectionarray[]=$sectioncursor;
+        }
+        $_SESSION['dol_ecmexpandedsectionarray']=join(',',$expandedsectionarray);
+    }
+    //print $_SESSION['dol_ecmexpandedsectionarray'].'<br>';
+
+    $nbofentries=0;
+    $oldvallevel=0;
+    foreach($sqltree as $key => $val)
+    {
+
+        $ecmdirstatic->id=$val['id'];
+        $ecmdirstatic->ref=$val['label'];
+
+        // Refresh cache
+        if (preg_match('/refresh/i',$action))
+        {
+            $result=$ecmdirstatic->fetch($val['id']);
+            $ecmdirstatic->ref=$ecmdirstatic->label;
+
+            $result=$ecmdirstatic->refreshcachenboffile(0);
+            $val['cachenbofdoc']=$result;
+        }
+
+        //$fullpathparent=preg_replace('/(_[^_]+)$/i','',$val['fullpath']);
+
+        // Define showline
+        $showline=0;
+
+        // If directory is son of expanded directory, we show line
+        if (in_array($val['id_mere'],$expandedsectionarray)) $showline=4;
+        // If directory is brother of selected directory, we show line
+        elseif ($val['id'] != $section && $val['id_mere'] == $ecmdirstatic->motherof[$section]) $showline=3;
+        // If directory is parent of selected directory or is selected directory, we show line
+        elseif (preg_match('/'.$val['fullpath'].'_/i',$fullpathselected.'_')) $showline=2;
+        // If we are level one we show line
+        elseif ($val['level'] < 2) $showline=1;
+
+        if ($showline)
+        {
+            if (in_array($val['id'],$expandedsectionarray)) $option='indexexpanded';
+            else $option='indexnotexpanded';
+            //print $option;
+
+            print '<li class="directory collapsed">';
+
+            // Show tree graph pictos
+            $cpt=1;
+            while ($cpt < $sqltree[$key]['level'])
+            {
+                print ' &nbsp; &nbsp;';
+                $cpt++;
+            }
+            $resarray=tree_showpad($sqltree,$key,1);
+            $a=$resarray[0];
+            $nbofsubdir=$resarray[1];
+            $nboffilesinsubdir=$resarray[2];
+
+            // Show link
+            print $ecmdirstatic->getNomUrl(0,$option,32,'class="fmdirlia jqft ecmjqft"');
+
+            print '<div class="ecmjqft">';
+
+            // Nb of docs
+            print '<table class="nobordernopadding"><tr><td>';
+            print $val['cachenbofdoc'];
+            print '</td>';
+            print '<td align="left">';
+            if ($nbofsubdir && $nboffilesinsubdir) print '<font color="#AAAAAA">+'.$nboffilesinsubdir.'</font> ';
+            print '</td>';
+
+            // Info
+            print '<td align="center">';
+            $userstatic->id=$val['fk_user_c'];
+            $userstatic->lastname=$val['login_c'];
+            $htmltooltip='<b>'.$langs->trans("ECMSection").'</b>: '.$val['label'].'<br>';
+            $htmltooltip='<b>'.$langs->trans("Type").'</b>: '.$langs->trans("ECMSectionManual").'<br>';
+            $htmltooltip.='<b>'.$langs->trans("ECMCreationUser").'</b>: '.$userstatic->getNomUrl(1, '', false, 1).'<br>';
+            $htmltooltip.='<b>'.$langs->trans("ECMCreationDate").'</b>: '.dol_print_date($val['date_c'],"dayhour").'<br>';
+            $htmltooltip.='<b>'.$langs->trans("Description").'</b>: '.$val['description'].'<br>';
+            $htmltooltip.='<b>'.$langs->trans("ECMNbOfFilesInDir").'</b>: '.$val['cachenbofdoc'].'<br>';
+            if ($nbofsubdir) $htmltooltip.='<b>'.$langs->trans("ECMNbOfFilesInSubDir").'</b>: '.$nboffilesinsubdir;
+            else $htmltooltip.='<b>'.$langs->trans("ECMNbOfSubDir").'</b>: '.$nbofsubdir.'<br>';
+            print $form->textwithpicto('', $htmltooltip, 1, 'info');
+            print "</td>";
+
+            print '</tr></table>';
+
+            print '</div>';
+
+            print "</li>\n";
+        }
+
+        $oldvallevel=$val['level'];
+        $nbofentries++;
+    }
+
+    // If nothing to show
+    if ($nbofentries == 0)
+    {
+        print '<li class="directory collapsed">';
+        print '<div class="ecmjqft">';
+        print $langs->trans("ECMNoDirectoryYet");
+        print '</div>';
+        print "</li>\n";
+    }
+
+    print '</ul>';
 }
 
 
@@ -340,156 +340,156 @@ 
  */
 function treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir, $modulepart, $websitekey, $pageid, $preopened, $fullpathpreopened, $depth=0)
 {
-	global $conf, $db, $langs, $form;
-	global $dolibarr_main_data_root;
-
-	$ecmdirstatic = new EcmDirectory($db);
-	$userstatic = new User($db);
-
-	if (file_exists($fullpathselecteddir))
-	{
-		$files = @scandir($fullpathselecteddir);
-
-		if (! empty($files))
-		{
-			natcasesort($files);
-			if (count($files) > 2)    /* The 2 accounts for . and .. */
-			{
-				echo '<ul class="ecmjqft" style="display: none;">'."\n";
-
-				// All dirs
-				foreach ($files as $file)    // $file can be '.', '..', or 'My dir' or 'My file'
-				{
-					if ($file == 'temp') continue;
-
-					$nbofsubdir=0;
-					$nboffilesinsubdir=0;
-
-					$val=array();
-
-					// Loop on all database entries (sqltree) to find the one matching the subdir found into dir to scan
-					foreach($sqltree as $key => $tmpval)
-					{
-						//print "-- key=".$key." - ".$tmpval['fullrelativename']." vs ".(($selecteddir != '/'?$selecteddir.'/':'').$file)."<br>\n";
-						if ($tmpval['fullrelativename'] == (($selecteddir != '/'?$selecteddir.'/':'').$file))		// We found equivalent record into database
-						{
-							$val=$tmpval;
-							$resarray=tree_showpad($sqltree,$key,1);
-
-							// Refresh cache for this subdir
-							if (isset($val['cachenbofdoc']) && $val['cachenbofdoc'] < 0)	// Cache is not up to date, so we update it for this directory t
-							{
-								$result=$ecmdirstatic->fetch($val['id']);
-								$ecmdirstatic->ref=$ecmdirstatic->label;
-
-								$result=$ecmdirstatic->refreshcachenboffile(0);
-								$val['cachenbofdoc']=$result;
-							}
-
-							$a=$resarray[0];
-							$nbofsubdir=$resarray[1];
-							$nboffilesinsubdir=$resarray[2];
-							break;
-						}
-					}
-
-					//print 'modulepart='.$modulepart.' fullpathselecteddir='.$fullpathselecteddir.' - val[fullrelativename] (in database)='.$val['fullrelativename'].' - val[id]='.$val['id'].' - is_dir='.dol_is_dir($fullpathselecteddir . $file).' - file='.$file."\n";
-					if ($file != '.' && $file != '..' && ((! empty($val['fullrelativename']) && $val['id'] >= 0) || dol_is_dir($fullpathselecteddir . (preg_match('/\/$/',$fullpathselecteddir)?'':'/') . $file)))
-					{
-						if (empty($val['fullrelativename']))	// If we did not find entry into database, but found a directory (dol_is_dir was ok at previous test)
-						{
-							$val['fullrelativename']=(($selecteddir && $selecteddir != '/')?$selecteddir.'/':'').$file;
-							$val['id']=0;
-							$val['label']=$file;
-							$val['description']='';
-							$nboffilesinsubdir=$langs->trans("Unknown");
-						}
-
-						$collapsedorexpanded='collapsed';
-						if (preg_match('/^'.preg_quote($val['fullrelativename'].'/', '/').'/', $preopened)) $collapsedorexpanded='expanded';
-						print '<li class="directory '.$collapsedorexpanded.'">';	// collapsed is opposite if expanded
-
-						print "<a class=\"fmdirlia jqft ecmjqft\" href=\"";
-						print "#";
-						print "\" rel=\"" . dol_escape_htmltag($val['fullrelativename'].'/') . "\" id=\"fmdirlia_id_".$val['id']."\"";
-						print " onClick=\"loadandshowpreview('".dol_escape_js($val['fullrelativename'])."',".$val['id'].")";
-						print "\">";
-						print dol_escape_htmltag($file);
-						print "</a>";
-
-						print '<div class="ecmjqft">';
-
-						print '<table class="nobordernopadding"><tr>';
-
-						/*print '<td align="left">';
+    global $conf, $db, $langs, $form;
+    global $dolibarr_main_data_root;
+
+    $ecmdirstatic = new EcmDirectory($db);
+    $userstatic = new User($db);
+
+    if (file_exists($fullpathselecteddir))
+    {
+        $files = @scandir($fullpathselecteddir);
+
+        if (! empty($files))
+        {
+            natcasesort($files);
+            if (count($files) > 2)    /* The 2 accounts for . and .. */
+            {
+                echo '<ul class="ecmjqft" style="display: none;">'."\n";
+
+                // All dirs
+                foreach ($files as $file)    // $file can be '.', '..', or 'My dir' or 'My file'
+                {
+                    if ($file == 'temp') continue;
+
+                    $nbofsubdir=0;
+                    $nboffilesinsubdir=0;
+
+                    $val=array();
+
+                    // Loop on all database entries (sqltree) to find the one matching the subdir found into dir to scan
+                    foreach($sqltree as $key => $tmpval)
+                    {
+                        //print "-- key=".$key." - ".$tmpval['fullrelativename']." vs ".(($selecteddir != '/'?$selecteddir.'/':'').$file)."<br>\n";
+                        if ($tmpval['fullrelativename'] == (($selecteddir != '/'?$selecteddir.'/':'').$file))		// We found equivalent record into database
+                        {
+                            $val=$tmpval;
+                            $resarray=tree_showpad($sqltree,$key,1);
+
+                            // Refresh cache for this subdir
+                            if (isset($val['cachenbofdoc']) && $val['cachenbofdoc'] < 0)	// Cache is not up to date, so we update it for this directory t
+                            {
+                                $result=$ecmdirstatic->fetch($val['id']);
+                                $ecmdirstatic->ref=$ecmdirstatic->label;
+
+                                $result=$ecmdirstatic->refreshcachenboffile(0);
+                                $val['cachenbofdoc']=$result;
+                            }
+
+                            $a=$resarray[0];
+                            $nbofsubdir=$resarray[1];
+                            $nboffilesinsubdir=$resarray[2];
+                            break;
+                        }
+                    }
+
+                    //print 'modulepart='.$modulepart.' fullpathselecteddir='.$fullpathselecteddir.' - val[fullrelativename] (in database)='.$val['fullrelativename'].' - val[id]='.$val['id'].' - is_dir='.dol_is_dir($fullpathselecteddir . $file).' - file='.$file."\n";
+                    if ($file != '.' && $file != '..' && ((! empty($val['fullrelativename']) && $val['id'] >= 0) || dol_is_dir($fullpathselecteddir . (preg_match('/\/$/',$fullpathselecteddir)?'':'/') . $file)))
+                    {
+                        if (empty($val['fullrelativename']))	// If we did not find entry into database, but found a directory (dol_is_dir was ok at previous test)
+                        {
+                            $val['fullrelativename']=(($selecteddir && $selecteddir != '/')?$selecteddir.'/':'').$file;
+                            $val['id']=0;
+                            $val['label']=$file;
+                            $val['description']='';
+                            $nboffilesinsubdir=$langs->trans("Unknown");
+                        }
+
+                        $collapsedorexpanded='collapsed';
+                        if (preg_match('/^'.preg_quote($val['fullrelativename'].'/', '/').'/', $preopened)) $collapsedorexpanded='expanded';
+                        print '<li class="directory '.$collapsedorexpanded.'">';	// collapsed is opposite if expanded
+
+                        print "<a class=\"fmdirlia jqft ecmjqft\" href=\"";
+                        print "#";
+                        print "\" rel=\"" . dol_escape_htmltag($val['fullrelativename'].'/') . "\" id=\"fmdirlia_id_".$val['id']."\"";
+                        print " onClick=\"loadandshowpreview('".dol_escape_js($val['fullrelativename'])."',".$val['id'].")";
+                        print "\">";
+                        print dol_escape_htmltag($file);
+                        print "</a>";
+
+                        print '<div class="ecmjqft">';
+
+                        print '<table class="nobordernopadding"><tr>';
+
+                        /*print '<td align="left">';
 						 print dol_escape_htmltag($file);
 						 print '</td>';*/
 
-						// Nb of docs
-						print '<td align="right">';
-						print (isset($val['cachenbofdoc']) && $val['cachenbofdoc']  >= 0)?$val['cachenbofdoc']:'&nbsp;';
-						print '</td>';
-						print '<td align="left">';
-						if ($nbofsubdir > 0  && $nboffilesinsubdir > 0) print '<font color="#AAAAAA">+'.$nboffilesinsubdir.'</font> ';
-						print '</td>';
-
-						// Edit link
-						print '<td align="right" width="18"><a href="';
-						print DOL_URL_ROOT.'/ecm/dir_card.php?module='.urlencode($modulepart).'&section='.$val['id'].'&relativedir='.urlencode($val['fullrelativename']);
-						print '&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid);
-						print '">'.img_edit($langs->trans("Edit").' - '.$langs->trans("View"), 0, 'class="valignmiddle opacitymedium"').'</a></td>';
-
-						// Add link
-						//print '<td align="right"><a href="'.DOL_URL_ROOT.'/ecm/dir_add_card.php?action=create&amp;catParent='.$val['id'].'">'.img_edit_add().'</a></td>';
-						//print '<td align="right" width="14">&nbsp;</td>';
-
-						// Info
-						if ($modulepart == 'ecm')
-						{
-							print '<td align="right" width="18">';
-							$userstatic->id=isset($val['fk_user_c'])?$val['fk_user_c']:0;
-							$userstatic->lastname=isset($val['login_c'])?$val['login_c']:0;
-							$htmltooltip='<b>'.$langs->trans("ECMSection").'</b>: '.$val['label'].'<br>';
-							$htmltooltip='<b>'.$langs->trans("Type").'</b>: '.$langs->trans("ECMSectionManual").'<br>';
-							$htmltooltip.='<b>'.$langs->trans("ECMCreationUser").'</b>: '.$userstatic->getNomUrl(1, '', false, 1).'<br>';
-							$htmltooltip.='<b>'.$langs->trans("ECMCreationDate").'</b>: '.(isset($val['date_c'])?dol_print_date($val['date_c'],"dayhour"):$langs->trans("NeedRefresh")).'<br>';
-							$htmltooltip.='<b>'.$langs->trans("Description").'</b>: '.$val['description'].'<br>';
-							$htmltooltip.='<b>'.$langs->trans("ECMNbOfFilesInDir").'</b>: '.((isset($val['cachenbofdoc']) && $val['cachenbofdoc'] >= 0)?$val['cachenbofdoc']:$langs->trans("NeedRefresh")).'<br>';
-							if ($nboffilesinsubdir > 0) $htmltooltip.='<b>'.$langs->trans("ECMNbOfFilesInSubDir").'</b>: '.$nboffilesinsubdir;
-							else $htmltooltip.='<b>'.$langs->trans("ECMNbOfSubDir").'</b>: '.($nbofsubdir >= 0 ? $nbofsubdir : $langs->trans("NeedRefresh")).'<br>';
-							print $form->textwithpicto('',$htmltooltip,1,"info");
-							print "</td>";
-						}
-
-						print "</tr></table>\n";
-						print '</div>';
-
-						//print 'selecteddir='.$selecteddir.' preopened='.$preopened.' $val[\'fullrelativename\']='.$val['fullrelativename']."<br>\n";
-						if (preg_match('/^'.preg_quote($val['fullrelativename'].'/', '/').'/', $preopened))
-						{
-							//print 'modulepart='.$modulepart.' fullpathselecteddir='.$fullpathselecteddir.' - val[fullrelativename] (in database)='.$val['fullrelativename'].' - val[id]='.$val['id'].' - is_dir='.dol_is_dir($fullpathselecteddir . $file).' - file='.$file."\n";
-							$newselecteddir = $val['fullrelativename'];
-							$newfullpathselecteddir='';
-							if ($modulepart == 'ecm')
-							{
-								$newfullpathselecteddir=$conf->ecm->dir_output.'/'.($val['fullrelativename'] != '/' ? $val['fullrelativename'] : '');
-							}
-							elseif ($modulepart == 'medias')
-							{
-								$newfullpathselecteddir=$dolibarr_main_data_root.'/medias/'.($val['fullrelativename'] != '/' ? $val['fullrelativename'] : '');
-							}
-
-							if ($newfullpathselecteddir) treeOutputForAbsoluteDir($sqltree, $newselecteddir, $newfullpathselecteddir, $modulepart, $websitekey, $pageid, $preopened, $fullpathpreopened, $depth+1);
-						}
-
-						print "</li>\n";
-					}
-				}
-
-				echo "</ul>\n";
-			}
-		}
-		else print "PermissionDenied";
-	}
+                        // Nb of docs
+                        print '<td align="right">';
+                        print (isset($val['cachenbofdoc']) && $val['cachenbofdoc']  >= 0)?$val['cachenbofdoc']:'&nbsp;';
+                        print '</td>';
+                        print '<td align="left">';
+                        if ($nbofsubdir > 0  && $nboffilesinsubdir > 0) print '<font color="#AAAAAA">+'.$nboffilesinsubdir.'</font> ';
+                        print '</td>';
+
+                        // Edit link
+                        print '<td align="right" width="18"><a href="';
+                        print DOL_URL_ROOT.'/ecm/dir_card.php?module='.urlencode($modulepart).'&section='.$val['id'].'&relativedir='.urlencode($val['fullrelativename']);
+                        print '&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid);
+                        print '">'.img_edit($langs->trans("Edit").' - '.$langs->trans("View"), 0, 'class="valignmiddle opacitymedium"').'</a></td>';
+
+                        // Add link
+                        //print '<td align="right"><a href="'.DOL_URL_ROOT.'/ecm/dir_add_card.php?action=create&amp;catParent='.$val['id'].'">'.img_edit_add().'</a></td>';
+                        //print '<td align="right" width="14">&nbsp;</td>';
+
+                        // Info
+                        if ($modulepart == 'ecm')
+                        {
+                            print '<td align="right" width="18">';
+                            $userstatic->id=isset($val['fk_user_c'])?$val['fk_user_c']:0;
+                            $userstatic->lastname=isset($val['login_c'])?$val['login_c']:0;
+                            $htmltooltip='<b>'.$langs->trans("ECMSection").'</b>: '.$val['label'].'<br>';
+                            $htmltooltip='<b>'.$langs->trans("Type").'</b>: '.$langs->trans("ECMSectionManual").'<br>';
+                            $htmltooltip.='<b>'.$langs->trans("ECMCreationUser").'</b>: '.$userstatic->getNomUrl(1, '', false, 1).'<br>';
+                            $htmltooltip.='<b>'.$langs->trans("ECMCreationDate").'</b>: '.(isset($val['date_c'])?dol_print_date($val['date_c'],"dayhour"):$langs->trans("NeedRefresh")).'<br>';
+                            $htmltooltip.='<b>'.$langs->trans("Description").'</b>: '.$val['description'].'<br>';
+                            $htmltooltip.='<b>'.$langs->trans("ECMNbOfFilesInDir").'</b>: '.((isset($val['cachenbofdoc']) && $val['cachenbofdoc'] >= 0)?$val['cachenbofdoc']:$langs->trans("NeedRefresh")).'<br>';
+                            if ($nboffilesinsubdir > 0) $htmltooltip.='<b>'.$langs->trans("ECMNbOfFilesInSubDir").'</b>: '.$nboffilesinsubdir;
+                            else $htmltooltip.='<b>'.$langs->trans("ECMNbOfSubDir").'</b>: '.($nbofsubdir >= 0 ? $nbofsubdir : $langs->trans("NeedRefresh")).'<br>';
+                            print $form->textwithpicto('',$htmltooltip,1,"info");
+                            print "</td>";
+                        }
+
+                        print "</tr></table>\n";
+                        print '</div>';
+
+                        //print 'selecteddir='.$selecteddir.' preopened='.$preopened.' $val[\'fullrelativename\']='.$val['fullrelativename']."<br>\n";
+                        if (preg_match('/^'.preg_quote($val['fullrelativename'].'/', '/').'/', $preopened))
+                        {
+                            //print 'modulepart='.$modulepart.' fullpathselecteddir='.$fullpathselecteddir.' - val[fullrelativename] (in database)='.$val['fullrelativename'].' - val[id]='.$val['id'].' - is_dir='.dol_is_dir($fullpathselecteddir . $file).' - file='.$file."\n";
+                            $newselecteddir = $val['fullrelativename'];
+                            $newfullpathselecteddir='';
+                            if ($modulepart == 'ecm')
+                            {
+                                $newfullpathselecteddir=$conf->ecm->dir_output.'/'.($val['fullrelativename'] != '/' ? $val['fullrelativename'] : '');
+                            }
+                            elseif ($modulepart == 'medias')
+                            {
+                                $newfullpathselecteddir=$dolibarr_main_data_root.'/medias/'.($val['fullrelativename'] != '/' ? $val['fullrelativename'] : '');
+                            }
+
+                            if ($newfullpathselecteddir) treeOutputForAbsoluteDir($sqltree, $newselecteddir, $newfullpathselecteddir, $modulepart, $websitekey, $pageid, $preopened, $fullpathpreopened, $depth+1);
+                        }
+
+                        print "</li>\n";
+                    }
+                }
+
+                echo "</ul>\n";
+            }
+        }
+        else print "PermissionDenied";
+    }
 }
 

Spacing +121 added lines, -121 removed lines

@@ -26,15 +26,15 @@ 
 // This script is called with a POST method.
 // Directory to scan (full path) is inside POST['dir'] and encode by js escape() if ajax is used or encoded by urlencode if mode=noajax
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
-if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); // Disables token renewal
+if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', '1');
+if (!defined('NOREQUIREHTML')) define('NOREQUIREHTML', '1');
+if (!defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1');
 
 
-if (! isset($mode) || $mode != 'noajax')    // For ajax call
+if (!isset($mode) || $mode != 'noajax')    // For ajax call
 {
-	$res=@include '../../main.inc.php';
+	$res = @include '../../main.inc.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php';
@@ -44,58 +44,58 @@ 
 	//if (GETPOST('preopened')) { $_GET['dir'] = $_POST['dir'] = '/bbb/'; }
 
 	$openeddir = GETPOST('openeddir');
-	$modulepart= GETPOST('modulepart');
-	$selecteddir = jsUnEscape(GETPOST('dir'));        // relative path. We must decode using same encoding function used by javascript: escape()
+	$modulepart = GETPOST('modulepart');
+	$selecteddir = jsUnEscape(GETPOST('dir')); // relative path. We must decode using same encoding function used by javascript: escape()
 
 	$preopened = GETPOST('preopened');
 
-	if ($selecteddir != '/') $selecteddir = preg_replace('/\/$/','',$selecteddir);    // We removed last '/' except if it is '/'
+	if ($selecteddir != '/') $selecteddir = preg_replace('/\/$/', '', $selecteddir); // We removed last '/' except if it is '/'
 }
 else    // For no ajax call
 {
 	//if (GETPOST('preopened')) { $_GET['dir'] = $_POST['dir'] = GETPOST('preopened'); }
 
 	$openeddir = GETPOST('openeddir');
-	$modulepart= GETPOST('modulepart');
+	$modulepart = GETPOST('modulepart');
 	$selecteddir = GETPOST('dir');
 
 	$preopened = GETPOST('preopened');
 
-	if ($selecteddir != '/') $selecteddir = preg_replace('/\/$/','',$selecteddir);    // We removed last '/' except if it is '/'
-	if (empty($url)) $url=DOL_URL_ROOT.'/ecm/index.php';
+	if ($selecteddir != '/') $selecteddir = preg_replace('/\/$/', '', $selecteddir); // We removed last '/' except if it is '/'
+	if (empty($url)) $url = DOL_URL_ROOT.'/ecm/index.php';
 }
 
 // Load translation files required by the page
 $langs->load("ecm");
 
 // Define fullpathselecteddir.
-$fullpathselecteddir='<none>';
+$fullpathselecteddir = '<none>';
 if ($modulepart == 'ecm')
 {
-	$fullpathselecteddir=$conf->ecm->dir_output.'/'.($selecteddir != '/' ? $selecteddir : '');
-	$fullpathpreopened=$conf->ecm->dir_output.'/'.($preopened != '/' ? $preopened : '');
+	$fullpathselecteddir = $conf->ecm->dir_output.'/'.($selecteddir != '/' ? $selecteddir : '');
+	$fullpathpreopened = $conf->ecm->dir_output.'/'.($preopened != '/' ? $preopened : '');
 }
 elseif ($modulepart == 'medias')
 {
-	$fullpathselecteddir=$dolibarr_main_data_root.'/medias/'.($selecteddir != '/' ? $selecteddir : '');
-	$fullpathpreopened=$dolibarr_main_data_root.'/medias/'.($preopened != '/' ? $preopened : '');
+	$fullpathselecteddir = $dolibarr_main_data_root.'/medias/'.($selecteddir != '/' ? $selecteddir : '');
+	$fullpathpreopened = $dolibarr_main_data_root.'/medias/'.($preopened != '/' ? $preopened : '');
 }
 
 
 // Security:
 // On interdit les remontees de repertoire ainsi que les pipe dans les noms de fichiers.
-if (preg_match('/\.\./',$fullpathselecteddir) || preg_match('/[<>|]/',$fullpathselecteddir))
+if (preg_match('/\.\./', $fullpathselecteddir) || preg_match('/[<>|]/', $fullpathselecteddir))
 {
     dol_syslog("Refused to deliver file ".$original_file);
     // Do no show plain path in shown error message
-    dol_print_error(0,$langs->trans("ErrorFileNameInvalid",GETPOST("file")));
+    dol_print_error(0, $langs->trans("ErrorFileNameInvalid", GETPOST("file")));
     exit;
 }
 
 // Check permissions
 if ($modulepart == 'ecm')
 {
-	if (! $user->rights->ecm->read) accessforbidden();
+	if (!$user->rights->ecm->read) accessforbidden();
 }
 elseif ($modulepart == 'medias')
 {
@@ -107,22 +107,22 @@ 
  * View
  */
 
-if (! isset($mode) || $mode != 'noajax')	// if ajax mode
+if (!isset($mode) || $mode != 'noajax')	// if ajax mode
 {
 	top_httphead();
 }
 
 //print '<!-- selecteddir (relative dir we click on) = '.$selecteddir.', openeddir = '.$openeddir.', modulepart='.$modulepart.', preopened='.$preopened.' -->'."\n";
-$userstatic=new User($db);
-$form=new Form($db);
+$userstatic = new User($db);
+$form = new Form($db);
 $ecmdirstatic = new EcmDirectory($db);
 
 // Load full tree of ECM module from database. We will use it to define nbofsubdir and nboffilesinsubdir
-if (empty($sqltree)) $sqltree=$ecmdirstatic->get_full_arbo(0);
+if (empty($sqltree)) $sqltree = $ecmdirstatic->get_full_arbo(0);
 
 // Try to find selected dir id into $sqltree and save it into $current_ecmdir_id
-$current_ecmdir_id=-1;
-foreach($sqltree as $keycursor => $val)
+$current_ecmdir_id = -1;
+foreach ($sqltree as $keycursor => $val)
 {
     //print $val['fullrelativename']." == ".$selecteddir;
     if ($val['fullrelativename'] == $selecteddir)
@@ -131,7 +131,7 @@ 
     }
 }
 
-if (! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))
+if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))
 {
 	treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir, $modulepart, $websitekey, $pageid, $preopened, $fullpathpreopened);
 
@@ -159,115 +159,115 @@ 
 }
 
 
-if (empty($conf->use_javascript_ajax) || ! empty($conf->global->MAIN_ECM_DISABLE_JS))
+if (empty($conf->use_javascript_ajax) || !empty($conf->global->MAIN_ECM_DISABLE_JS))
 {
 	print '<ul class="ecmjqft">';
 
 	// Load full tree from database. We will use it to define nbofsubdir and nboffilesinsubdir
-	if (empty($sqltree)) $sqltree=$ecmdirstatic->get_full_arbo(0);    // Slow
+	if (empty($sqltree)) $sqltree = $ecmdirstatic->get_full_arbo(0); // Slow
 
 	// ----- This section will show a tree from a fulltree array -----
 	// $section must also be defined
 	// ----------------------------------------------------------------
 
 	// Define fullpathselected ( _x_y_z ) of $section parameter (!! not into ajaxdirtree)
-	$fullpathselected='';
-	foreach($sqltree as $key => $val)
+	$fullpathselected = '';
+	foreach ($sqltree as $key => $val)
 	{
 		//print $val['id']."-".$section."<br>";
 		if ($val['id'] == $section)
 		{
-			$fullpathselected=$val['fullpath'];
+			$fullpathselected = $val['fullpath'];
 			break;
 		}
 	}
 	//print "fullpathselected=".$fullpathselected."<br>";
 
 	// Update expandedsectionarray in session
-	$expandedsectionarray=array();
-	if (isset($_SESSION['dol_ecmexpandedsectionarray'])) $expandedsectionarray=explode(',',$_SESSION['dol_ecmexpandedsectionarray']);
+	$expandedsectionarray = array();
+	if (isset($_SESSION['dol_ecmexpandedsectionarray'])) $expandedsectionarray = explode(',', $_SESSION['dol_ecmexpandedsectionarray']);
 
 	if ($section && GETPOST('sectionexpand') == 'true')
 	{
 		// We add all sections that are parent of opened section
-		$pathtosection=explode('_',$fullpathselected);
-		foreach($pathtosection as $idcursor)
+		$pathtosection = explode('_', $fullpathselected);
+		foreach ($pathtosection as $idcursor)
 		{
-			if ($idcursor && ! in_array($idcursor,$expandedsectionarray))	// Not already in array
+			if ($idcursor && !in_array($idcursor, $expandedsectionarray))	// Not already in array
 			{
-				$expandedsectionarray[]=$idcursor;
+				$expandedsectionarray[] = $idcursor;
 			}
 		}
-		$_SESSION['dol_ecmexpandedsectionarray']=join(',',$expandedsectionarray);
+		$_SESSION['dol_ecmexpandedsectionarray'] = join(',', $expandedsectionarray);
 	}
 	if ($section && GETPOST('sectionexpand') == 'false')
 	{
 		// We removed all expanded sections that are child of the closed section
-		$oldexpandedsectionarray=$expandedsectionarray;
-		$expandedsectionarray=array();	// Reset
-		foreach($oldexpandedsectionarray as $sectioncursor)
+		$oldexpandedsectionarray = $expandedsectionarray;
+		$expandedsectionarray = array(); // Reset
+		foreach ($oldexpandedsectionarray as $sectioncursor)
 		{
 			// TODO is_in_subtree(fulltree,sectionparent,sectionchild) does nox exists. Enable or remove this...
 			//if ($sectioncursor && ! is_in_subtree($sqltree,$section,$sectioncursor)) $expandedsectionarray[]=$sectioncursor;
 		}
-		$_SESSION['dol_ecmexpandedsectionarray']=join(',',$expandedsectionarray);
+		$_SESSION['dol_ecmexpandedsectionarray'] = join(',', $expandedsectionarray);
 	}
 	//print $_SESSION['dol_ecmexpandedsectionarray'].'<br>';
 
-	$nbofentries=0;
-	$oldvallevel=0;
-	foreach($sqltree as $key => $val)
+	$nbofentries = 0;
+	$oldvallevel = 0;
+	foreach ($sqltree as $key => $val)
 	{
 
-		$ecmdirstatic->id=$val['id'];
-		$ecmdirstatic->ref=$val['label'];
+		$ecmdirstatic->id = $val['id'];
+		$ecmdirstatic->ref = $val['label'];
 
 		// Refresh cache
-		if (preg_match('/refresh/i',$action))
+		if (preg_match('/refresh/i', $action))
 		{
-			$result=$ecmdirstatic->fetch($val['id']);
-			$ecmdirstatic->ref=$ecmdirstatic->label;
+			$result = $ecmdirstatic->fetch($val['id']);
+			$ecmdirstatic->ref = $ecmdirstatic->label;
 
-			$result=$ecmdirstatic->refreshcachenboffile(0);
-			$val['cachenbofdoc']=$result;
+			$result = $ecmdirstatic->refreshcachenboffile(0);
+			$val['cachenbofdoc'] = $result;
 		}
 
 		//$fullpathparent=preg_replace('/(_[^_]+)$/i','',$val['fullpath']);
 
 		// Define showline
-		$showline=0;
+		$showline = 0;
 
 		// If directory is son of expanded directory, we show line
-		if (in_array($val['id_mere'],$expandedsectionarray)) $showline=4;
+		if (in_array($val['id_mere'], $expandedsectionarray)) $showline = 4;
 		// If directory is brother of selected directory, we show line
-		elseif ($val['id'] != $section && $val['id_mere'] == $ecmdirstatic->motherof[$section]) $showline=3;
+		elseif ($val['id'] != $section && $val['id_mere'] == $ecmdirstatic->motherof[$section]) $showline = 3;
 		// If directory is parent of selected directory or is selected directory, we show line
-		elseif (preg_match('/'.$val['fullpath'].'_/i',$fullpathselected.'_')) $showline=2;
+		elseif (preg_match('/'.$val['fullpath'].'_/i', $fullpathselected.'_')) $showline = 2;
 		// If we are level one we show line
-		elseif ($val['level'] < 2) $showline=1;
+		elseif ($val['level'] < 2) $showline = 1;
 
 		if ($showline)
 		{
-			if (in_array($val['id'],$expandedsectionarray)) $option='indexexpanded';
-			else $option='indexnotexpanded';
+			if (in_array($val['id'], $expandedsectionarray)) $option = 'indexexpanded';
+			else $option = 'indexnotexpanded';
 			//print $option;
 
 			print '<li class="directory collapsed">';
 
 			// Show tree graph pictos
-			$cpt=1;
+			$cpt = 1;
 			while ($cpt < $sqltree[$key]['level'])
 			{
 				print ' &nbsp; &nbsp;';
 				$cpt++;
 			}
-			$resarray=tree_showpad($sqltree,$key,1);
-			$a=$resarray[0];
-			$nbofsubdir=$resarray[1];
-			$nboffilesinsubdir=$resarray[2];
+			$resarray = tree_showpad($sqltree, $key, 1);
+			$a = $resarray[0];
+			$nbofsubdir = $resarray[1];
+			$nboffilesinsubdir = $resarray[2];
 
 			// Show link
-			print $ecmdirstatic->getNomUrl(0,$option,32,'class="fmdirlia jqft ecmjqft"');
+			print $ecmdirstatic->getNomUrl(0, $option, 32, 'class="fmdirlia jqft ecmjqft"');
 
 			print '<div class="ecmjqft">';
 
@@ -281,16 +281,16 @@ 
 
 			// Info
 			print '<td align="center">';
-			$userstatic->id=$val['fk_user_c'];
-			$userstatic->lastname=$val['login_c'];
-			$htmltooltip='<b>'.$langs->trans("ECMSection").'</b>: '.$val['label'].'<br>';
-			$htmltooltip='<b>'.$langs->trans("Type").'</b>: '.$langs->trans("ECMSectionManual").'<br>';
-			$htmltooltip.='<b>'.$langs->trans("ECMCreationUser").'</b>: '.$userstatic->getNomUrl(1, '', false, 1).'<br>';
-			$htmltooltip.='<b>'.$langs->trans("ECMCreationDate").'</b>: '.dol_print_date($val['date_c'],"dayhour").'<br>';
-			$htmltooltip.='<b>'.$langs->trans("Description").'</b>: '.$val['description'].'<br>';
-			$htmltooltip.='<b>'.$langs->trans("ECMNbOfFilesInDir").'</b>: '.$val['cachenbofdoc'].'<br>';
-			if ($nbofsubdir) $htmltooltip.='<b>'.$langs->trans("ECMNbOfFilesInSubDir").'</b>: '.$nboffilesinsubdir;
-			else $htmltooltip.='<b>'.$langs->trans("ECMNbOfSubDir").'</b>: '.$nbofsubdir.'<br>';
+			$userstatic->id = $val['fk_user_c'];
+			$userstatic->lastname = $val['login_c'];
+			$htmltooltip = '<b>'.$langs->trans("ECMSection").'</b>: '.$val['label'].'<br>';
+			$htmltooltip = '<b>'.$langs->trans("Type").'</b>: '.$langs->trans("ECMSectionManual").'<br>';
+			$htmltooltip .= '<b>'.$langs->trans("ECMCreationUser").'</b>: '.$userstatic->getNomUrl(1, '', false, 1).'<br>';
+			$htmltooltip .= '<b>'.$langs->trans("ECMCreationDate").'</b>: '.dol_print_date($val['date_c'], "dayhour").'<br>';
+			$htmltooltip .= '<b>'.$langs->trans("Description").'</b>: '.$val['description'].'<br>';
+			$htmltooltip .= '<b>'.$langs->trans("ECMNbOfFilesInDir").'</b>: '.$val['cachenbofdoc'].'<br>';
+			if ($nbofsubdir) $htmltooltip .= '<b>'.$langs->trans("ECMNbOfFilesInSubDir").'</b>: '.$nboffilesinsubdir;
+			else $htmltooltip .= '<b>'.$langs->trans("ECMNbOfSubDir").'</b>: '.$nbofsubdir.'<br>';
 			print $form->textwithpicto('', $htmltooltip, 1, 'info');
 			print "</td>";
 
@@ -301,7 +301,7 @@ 
 			print "</li>\n";
 		}
 
-		$oldvallevel=$val['level'];
+		$oldvallevel = $val['level'];
 		$nbofentries++;
 	}
 
@@ -320,7 +320,7 @@ 
 
 
 // Close db if mode is not noajax
-if ((! isset($mode) || $mode != 'noajax') && is_object($db)) $db->close();
+if ((!isset($mode) || $mode != 'noajax') && is_object($db)) $db->close();
 
 
 
@@ -338,7 +338,7 @@ 
  * @param	int		$depth					Depth
  * @return	void
  */
-function treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir, $modulepart, $websitekey, $pageid, $preopened, $fullpathpreopened, $depth=0)
+function treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir, $modulepart, $websitekey, $pageid, $preopened, $fullpathpreopened, $depth = 0)
 {
 	global $conf, $db, $langs, $form;
 	global $dolibarr_main_data_root;
@@ -350,7 +350,7 @@ 
 	{
 		$files = @scandir($fullpathselecteddir);
 
-		if (! empty($files))
+		if (!empty($files))
 		{
 			natcasesort($files);
 			if (count($files) > 2)    /* The 2 accounts for . and .. */
@@ -362,56 +362,56 @@ 
 				{
 					if ($file == 'temp') continue;
 
-					$nbofsubdir=0;
-					$nboffilesinsubdir=0;
+					$nbofsubdir = 0;
+					$nboffilesinsubdir = 0;
 
-					$val=array();
+					$val = array();
 
 					// Loop on all database entries (sqltree) to find the one matching the subdir found into dir to scan
-					foreach($sqltree as $key => $tmpval)
+					foreach ($sqltree as $key => $tmpval)
 					{
 						//print "-- key=".$key." - ".$tmpval['fullrelativename']." vs ".(($selecteddir != '/'?$selecteddir.'/':'').$file)."<br>\n";
-						if ($tmpval['fullrelativename'] == (($selecteddir != '/'?$selecteddir.'/':'').$file))		// We found equivalent record into database
+						if ($tmpval['fullrelativename'] == (($selecteddir != '/' ? $selecteddir.'/' : '').$file))		// We found equivalent record into database
 						{
-							$val=$tmpval;
-							$resarray=tree_showpad($sqltree,$key,1);
+							$val = $tmpval;
+							$resarray = tree_showpad($sqltree, $key, 1);
 
 							// Refresh cache for this subdir
 							if (isset($val['cachenbofdoc']) && $val['cachenbofdoc'] < 0)	// Cache is not up to date, so we update it for this directory t
 							{
-								$result=$ecmdirstatic->fetch($val['id']);
-								$ecmdirstatic->ref=$ecmdirstatic->label;
+								$result = $ecmdirstatic->fetch($val['id']);
+								$ecmdirstatic->ref = $ecmdirstatic->label;
 
-								$result=$ecmdirstatic->refreshcachenboffile(0);
-								$val['cachenbofdoc']=$result;
+								$result = $ecmdirstatic->refreshcachenboffile(0);
+								$val['cachenbofdoc'] = $result;
 							}
 
-							$a=$resarray[0];
-							$nbofsubdir=$resarray[1];
-							$nboffilesinsubdir=$resarray[2];
+							$a = $resarray[0];
+							$nbofsubdir = $resarray[1];
+							$nboffilesinsubdir = $resarray[2];
 							break;
 						}
 					}
 
 					//print 'modulepart='.$modulepart.' fullpathselecteddir='.$fullpathselecteddir.' - val[fullrelativename] (in database)='.$val['fullrelativename'].' - val[id]='.$val['id'].' - is_dir='.dol_is_dir($fullpathselecteddir . $file).' - file='.$file."\n";
-					if ($file != '.' && $file != '..' && ((! empty($val['fullrelativename']) && $val['id'] >= 0) || dol_is_dir($fullpathselecteddir . (preg_match('/\/$/',$fullpathselecteddir)?'':'/') . $file)))
+					if ($file != '.' && $file != '..' && ((!empty($val['fullrelativename']) && $val['id'] >= 0) || dol_is_dir($fullpathselecteddir.(preg_match('/\/$/', $fullpathselecteddir) ? '' : '/').$file)))
 					{
 						if (empty($val['fullrelativename']))	// If we did not find entry into database, but found a directory (dol_is_dir was ok at previous test)
 						{
-							$val['fullrelativename']=(($selecteddir && $selecteddir != '/')?$selecteddir.'/':'').$file;
-							$val['id']=0;
-							$val['label']=$file;
-							$val['description']='';
-							$nboffilesinsubdir=$langs->trans("Unknown");
+							$val['fullrelativename'] = (($selecteddir && $selecteddir != '/') ? $selecteddir.'/' : '').$file;
+							$val['id'] = 0;
+							$val['label'] = $file;
+							$val['description'] = '';
+							$nboffilesinsubdir = $langs->trans("Unknown");
 						}
 
-						$collapsedorexpanded='collapsed';
-						if (preg_match('/^'.preg_quote($val['fullrelativename'].'/', '/').'/', $preopened)) $collapsedorexpanded='expanded';
-						print '<li class="directory '.$collapsedorexpanded.'">';	// collapsed is opposite if expanded
+						$collapsedorexpanded = 'collapsed';
+						if (preg_match('/^'.preg_quote($val['fullrelativename'].'/', '/').'/', $preopened)) $collapsedorexpanded = 'expanded';
+						print '<li class="directory '.$collapsedorexpanded.'">'; // collapsed is opposite if expanded
 
 						print "<a class=\"fmdirlia jqft ecmjqft\" href=\"";
 						print "#";
-						print "\" rel=\"" . dol_escape_htmltag($val['fullrelativename'].'/') . "\" id=\"fmdirlia_id_".$val['id']."\"";
+						print "\" rel=\"".dol_escape_htmltag($val['fullrelativename'].'/')."\" id=\"fmdirlia_id_".$val['id']."\"";
 						print " onClick=\"loadandshowpreview('".dol_escape_js($val['fullrelativename'])."',".$val['id'].")";
 						print "\">";
 						print dol_escape_htmltag($file);
@@ -427,10 +427,10 @@ 
 
 						// Nb of docs
 						print '<td align="right">';
-						print (isset($val['cachenbofdoc']) && $val['cachenbofdoc']  >= 0)?$val['cachenbofdoc']:'&nbsp;';
+						print (isset($val['cachenbofdoc']) && $val['cachenbofdoc'] >= 0) ? $val['cachenbofdoc'] : '&nbsp;';
 						print '</td>';
 						print '<td align="left">';
-						if ($nbofsubdir > 0  && $nboffilesinsubdir > 0) print '<font color="#AAAAAA">+'.$nboffilesinsubdir.'</font> ';
+						if ($nbofsubdir > 0 && $nboffilesinsubdir > 0) print '<font color="#AAAAAA">+'.$nboffilesinsubdir.'</font> ';
 						print '</td>';
 
 						// Edit link
@@ -447,17 +447,17 @@ 
 						if ($modulepart == 'ecm')
 						{
 							print '<td align="right" width="18">';
-							$userstatic->id=isset($val['fk_user_c'])?$val['fk_user_c']:0;
-							$userstatic->lastname=isset($val['login_c'])?$val['login_c']:0;
-							$htmltooltip='<b>'.$langs->trans("ECMSection").'</b>: '.$val['label'].'<br>';
-							$htmltooltip='<b>'.$langs->trans("Type").'</b>: '.$langs->trans("ECMSectionManual").'<br>';
-							$htmltooltip.='<b>'.$langs->trans("ECMCreationUser").'</b>: '.$userstatic->getNomUrl(1, '', false, 1).'<br>';
-							$htmltooltip.='<b>'.$langs->trans("ECMCreationDate").'</b>: '.(isset($val['date_c'])?dol_print_date($val['date_c'],"dayhour"):$langs->trans("NeedRefresh")).'<br>';
-							$htmltooltip.='<b>'.$langs->trans("Description").'</b>: '.$val['description'].'<br>';
-							$htmltooltip.='<b>'.$langs->trans("ECMNbOfFilesInDir").'</b>: '.((isset($val['cachenbofdoc']) && $val['cachenbofdoc'] >= 0)?$val['cachenbofdoc']:$langs->trans("NeedRefresh")).'<br>';
-							if ($nboffilesinsubdir > 0) $htmltooltip.='<b>'.$langs->trans("ECMNbOfFilesInSubDir").'</b>: '.$nboffilesinsubdir;
-							else $htmltooltip.='<b>'.$langs->trans("ECMNbOfSubDir").'</b>: '.($nbofsubdir >= 0 ? $nbofsubdir : $langs->trans("NeedRefresh")).'<br>';
-							print $form->textwithpicto('',$htmltooltip,1,"info");
+							$userstatic->id = isset($val['fk_user_c']) ? $val['fk_user_c'] : 0;
+							$userstatic->lastname = isset($val['login_c']) ? $val['login_c'] : 0;
+							$htmltooltip = '<b>'.$langs->trans("ECMSection").'</b>: '.$val['label'].'<br>';
+							$htmltooltip = '<b>'.$langs->trans("Type").'</b>: '.$langs->trans("ECMSectionManual").'<br>';
+							$htmltooltip .= '<b>'.$langs->trans("ECMCreationUser").'</b>: '.$userstatic->getNomUrl(1, '', false, 1).'<br>';
+							$htmltooltip .= '<b>'.$langs->trans("ECMCreationDate").'</b>: '.(isset($val['date_c']) ?dol_print_date($val['date_c'], "dayhour") : $langs->trans("NeedRefresh")).'<br>';
+							$htmltooltip .= '<b>'.$langs->trans("Description").'</b>: '.$val['description'].'<br>';
+							$htmltooltip .= '<b>'.$langs->trans("ECMNbOfFilesInDir").'</b>: '.((isset($val['cachenbofdoc']) && $val['cachenbofdoc'] >= 0) ? $val['cachenbofdoc'] : $langs->trans("NeedRefresh")).'<br>';
+							if ($nboffilesinsubdir > 0) $htmltooltip .= '<b>'.$langs->trans("ECMNbOfFilesInSubDir").'</b>: '.$nboffilesinsubdir;
+							else $htmltooltip .= '<b>'.$langs->trans("ECMNbOfSubDir").'</b>: '.($nbofsubdir >= 0 ? $nbofsubdir : $langs->trans("NeedRefresh")).'<br>';
+							print $form->textwithpicto('', $htmltooltip, 1, "info");
 							print "</td>";
 						}
 
@@ -469,17 +469,17 @@ 
 						{
 							//print 'modulepart='.$modulepart.' fullpathselecteddir='.$fullpathselecteddir.' - val[fullrelativename] (in database)='.$val['fullrelativename'].' - val[id]='.$val['id'].' - is_dir='.dol_is_dir($fullpathselecteddir . $file).' - file='.$file."\n";
 							$newselecteddir = $val['fullrelativename'];
-							$newfullpathselecteddir='';
+							$newfullpathselecteddir = '';
 							if ($modulepart == 'ecm')
 							{
-								$newfullpathselecteddir=$conf->ecm->dir_output.'/'.($val['fullrelativename'] != '/' ? $val['fullrelativename'] : '');
+								$newfullpathselecteddir = $conf->ecm->dir_output.'/'.($val['fullrelativename'] != '/' ? $val['fullrelativename'] : '');
 							}
 							elseif ($modulepart == 'medias')
 							{
-								$newfullpathselecteddir=$dolibarr_main_data_root.'/medias/'.($val['fullrelativename'] != '/' ? $val['fullrelativename'] : '');
+								$newfullpathselecteddir = $dolibarr_main_data_root.'/medias/'.($val['fullrelativename'] != '/' ? $val['fullrelativename'] : '');
 							}
 
-							if ($newfullpathselecteddir) treeOutputForAbsoluteDir($sqltree, $newselecteddir, $newfullpathselecteddir, $modulepart, $websitekey, $pageid, $preopened, $fullpathpreopened, $depth+1);
+							if ($newfullpathselecteddir) treeOutputForAbsoluteDir($sqltree, $newselecteddir, $newfullpathselecteddir, $modulepart, $websitekey, $pageid, $preopened, $fullpathpreopened, $depth + 1);
 						}
 
 						print "</li>\n";

Braces +110 added lines, -44 removed lines

@@ -26,15 +26,26 @@ 
 // This script is called with a POST method.
 // Directory to scan (full path) is inside POST['dir'] and encode by js escape() if ajax is used or encoded by urlencode if mode=noajax
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
-if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL',1);
+}
+// Disables token renewal
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+if (! defined('NOREQUIREHTML')) {
+    define('NOREQUIREHTML','1');
+}
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
 
 
-if (! isset($mode) || $mode != 'noajax')    // For ajax call
+if (! isset($mode) || $mode != 'noajax') {
+    // For ajax call
 {
 	$res=@include '../../main.inc.php';
+}
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php';
@@ -49,9 +60,11 @@ 
 
 	$preopened = GETPOST('preopened');
 
-	if ($selecteddir != '/') $selecteddir = preg_replace('/\/$/','',$selecteddir);    // We removed last '/' except if it is '/'
-}
-else    // For no ajax call
+	if ($selecteddir != '/') {
+	    $selecteddir = preg_replace('/\/$/','',$selecteddir);
+	}
+	// We removed last '/' except if it is '/'
+} else    // For no ajax call
 {
 	//if (GETPOST('preopened')) { $_GET['dir'] = $_POST['dir'] = GETPOST('preopened'); }
 
@@ -61,9 +74,14 @@ 
 
 	$preopened = GETPOST('preopened');
 
-	if ($selecteddir != '/') $selecteddir = preg_replace('/\/$/','',$selecteddir);    // We removed last '/' except if it is '/'
-	if (empty($url)) $url=DOL_URL_ROOT.'/ecm/index.php';
-}
+	if ($selecteddir != '/') {
+	    $selecteddir = preg_replace('/\/$/','',$selecteddir);
+	}
+	// We removed last '/' except if it is '/'
+	if (empty($url)) {
+	    $url=DOL_URL_ROOT.'/ecm/index.php';
+	}
+	}
 
 // Load translation files required by the page
 $langs->load("ecm");
@@ -74,8 +92,7 @@ 
 {
 	$fullpathselecteddir=$conf->ecm->dir_output.'/'.($selecteddir != '/' ? $selecteddir : '');
 	$fullpathpreopened=$conf->ecm->dir_output.'/'.($preopened != '/' ? $preopened : '');
-}
-elseif ($modulepart == 'medias')
+} elseif ($modulepart == 'medias')
 {
 	$fullpathselecteddir=$dolibarr_main_data_root.'/medias/'.($selecteddir != '/' ? $selecteddir : '');
 	$fullpathpreopened=$dolibarr_main_data_root.'/medias/'.($preopened != '/' ? $preopened : '');
@@ -95,9 +112,10 @@ 
 // Check permissions
 if ($modulepart == 'ecm')
 {
-	if (! $user->rights->ecm->read) accessforbidden();
-}
-elseif ($modulepart == 'medias')
+	if (! $user->rights->ecm->read) {
+	    accessforbidden();
+	}
+	} elseif ($modulepart == 'medias')
 {
 	// Always allowed
 }
@@ -107,10 +125,12 @@ 
  * View
  */
 
-if (! isset($mode) || $mode != 'noajax')	// if ajax mode
+if (! isset($mode) || $mode != 'noajax') {
+    // if ajax mode
 {
 	top_httphead();
 }
+}
 
 //print '<!-- selecteddir (relative dir we click on) = '.$selecteddir.', openeddir = '.$openeddir.', modulepart='.$modulepart.', preopened='.$preopened.' -->'."\n";
 $userstatic=new User($db);
@@ -118,7 +138,9 @@ 
 $ecmdirstatic = new EcmDirectory($db);
 
 // Load full tree of ECM module from database. We will use it to define nbofsubdir and nboffilesinsubdir
-if (empty($sqltree)) $sqltree=$ecmdirstatic->get_full_arbo(0);
+if (empty($sqltree)) {
+    $sqltree=$ecmdirstatic->get_full_arbo(0);
+}
 
 // Try to find selected dir id into $sqltree and save it into $current_ecmdir_id
 $current_ecmdir_id=-1;
@@ -164,7 +186,10 @@ 
 	print '<ul class="ecmjqft">';
 
 	// Load full tree from database. We will use it to define nbofsubdir and nboffilesinsubdir
-	if (empty($sqltree)) $sqltree=$ecmdirstatic->get_full_arbo(0);    // Slow
+	if (empty($sqltree)) {
+	    $sqltree=$ecmdirstatic->get_full_arbo(0);
+	}
+	// Slow
 
 	// ----- This section will show a tree from a fulltree array -----
 	// $section must also be defined
@@ -185,7 +210,9 @@ 
 
 	// Update expandedsectionarray in session
 	$expandedsectionarray=array();
-	if (isset($_SESSION['dol_ecmexpandedsectionarray'])) $expandedsectionarray=explode(',',$_SESSION['dol_ecmexpandedsectionarray']);
+	if (isset($_SESSION['dol_ecmexpandedsectionarray'])) {
+	    $expandedsectionarray=explode(',',$_SESSION['dol_ecmexpandedsectionarray']);
+	}
 
 	if ($section && GETPOST('sectionexpand') == 'true')
 	{
@@ -193,10 +220,12 @@ 
 		$pathtosection=explode('_',$fullpathselected);
 		foreach($pathtosection as $idcursor)
 		{
-			if ($idcursor && ! in_array($idcursor,$expandedsectionarray))	// Not already in array
+			if ($idcursor && ! in_array($idcursor,$expandedsectionarray)) {
+			    // Not already in array
 			{
 				$expandedsectionarray[]=$idcursor;
 			}
+			}
 		}
 		$_SESSION['dol_ecmexpandedsectionarray']=join(',',$expandedsectionarray);
 	}
@@ -238,18 +267,29 @@ 
 		$showline=0;
 
 		// If directory is son of expanded directory, we show line
-		if (in_array($val['id_mere'],$expandedsectionarray)) $showline=4;
+		if (in_array($val['id_mere'],$expandedsectionarray)) {
+		    $showline=4;
+		}
 		// If directory is brother of selected directory, we show line
-		elseif ($val['id'] != $section && $val['id_mere'] == $ecmdirstatic->motherof[$section]) $showline=3;
+		elseif ($val['id'] != $section && $val['id_mere'] == $ecmdirstatic->motherof[$section]) {
+		    $showline=3;
+		}
 		// If directory is parent of selected directory or is selected directory, we show line
-		elseif (preg_match('/'.$val['fullpath'].'_/i',$fullpathselected.'_')) $showline=2;
+		elseif (preg_match('/'.$val['fullpath'].'_/i',$fullpathselected.'_')) {
+		    $showline=2;
+		}
 		// If we are level one we show line
-		elseif ($val['level'] < 2) $showline=1;
+		elseif ($val['level'] < 2) {
+		    $showline=1;
+		}
 
 		if ($showline)
 		{
-			if (in_array($val['id'],$expandedsectionarray)) $option='indexexpanded';
-			else $option='indexnotexpanded';
+			if (in_array($val['id'],$expandedsectionarray)) {
+			    $option='indexexpanded';
+			} else {
+			    $option='indexnotexpanded';
+			}
 			//print $option;
 
 			print '<li class="directory collapsed">';
@@ -276,7 +316,9 @@ 
 			print $val['cachenbofdoc'];
 			print '</td>';
 			print '<td align="left">';
-			if ($nbofsubdir && $nboffilesinsubdir) print '<font color="#AAAAAA">+'.$nboffilesinsubdir.'</font> ';
+			if ($nbofsubdir && $nboffilesinsubdir) {
+			    print '<font color="#AAAAAA">+'.$nboffilesinsubdir.'</font> ';
+			}
 			print '</td>';
 
 			// Info
@@ -289,8 +331,11 @@ 
 			$htmltooltip.='<b>'.$langs->trans("ECMCreationDate").'</b>: '.dol_print_date($val['date_c'],"dayhour").'<br>';
 			$htmltooltip.='<b>'.$langs->trans("Description").'</b>: '.$val['description'].'<br>';
 			$htmltooltip.='<b>'.$langs->trans("ECMNbOfFilesInDir").'</b>: '.$val['cachenbofdoc'].'<br>';
-			if ($nbofsubdir) $htmltooltip.='<b>'.$langs->trans("ECMNbOfFilesInSubDir").'</b>: '.$nboffilesinsubdir;
-			else $htmltooltip.='<b>'.$langs->trans("ECMNbOfSubDir").'</b>: '.$nbofsubdir.'<br>';
+			if ($nbofsubdir) {
+			    $htmltooltip.='<b>'.$langs->trans("ECMNbOfFilesInSubDir").'</b>: '.$nboffilesinsubdir;
+			} else {
+			    $htmltooltip.='<b>'.$langs->trans("ECMNbOfSubDir").'</b>: '.$nbofsubdir.'<br>';
+			}
 			print $form->textwithpicto('', $htmltooltip, 1, 'info');
 			print "</td>";
 
@@ -320,7 +365,9 @@ 
 
 
 // Close db if mode is not noajax
-if ((! isset($mode) || $mode != 'noajax') && is_object($db)) $db->close();
+if ((! isset($mode) || $mode != 'noajax') && is_object($db)) {
+    $db->close();
+}
 
 
 
@@ -353,14 +400,18 @@ 
 		if (! empty($files))
 		{
 			natcasesort($files);
-			if (count($files) > 2)    /* The 2 accounts for . and .. */
+			if (count($files) > 2) {
+			    /* The 2 accounts for . and .. */
 			{
 				echo '<ul class="ecmjqft" style="display: none;">'."\n";
+			}
 
 				// All dirs
-				foreach ($files as $file)    // $file can be '.', '..', or 'My dir' or 'My file'
+				foreach ($files as $file) {
+				    // $file can be '.', '..', or 'My dir' or 'My file'
 				{
 					if ($file == 'temp') continue;
+				}
 
 					$nbofsubdir=0;
 					$nboffilesinsubdir=0;
@@ -371,15 +422,19 @@ 
 					foreach($sqltree as $key => $tmpval)
 					{
 						//print "-- key=".$key." - ".$tmpval['fullrelativename']." vs ".(($selecteddir != '/'?$selecteddir.'/':'').$file)."<br>\n";
-						if ($tmpval['fullrelativename'] == (($selecteddir != '/'?$selecteddir.'/':'').$file))		// We found equivalent record into database
+						if ($tmpval['fullrelativename'] == (($selecteddir != '/'?$selecteddir.'/':'').$file)) {
+						    // We found equivalent record into database
 						{
 							$val=$tmpval;
+						}
 							$resarray=tree_showpad($sqltree,$key,1);
 
 							// Refresh cache for this subdir
-							if (isset($val['cachenbofdoc']) && $val['cachenbofdoc'] < 0)	// Cache is not up to date, so we update it for this directory t
+							if (isset($val['cachenbofdoc']) && $val['cachenbofdoc'] < 0) {
+							    // Cache is not up to date, so we update it for this directory t
 							{
 								$result=$ecmdirstatic->fetch($val['id']);
+							}
 								$ecmdirstatic->ref=$ecmdirstatic->label;
 
 								$result=$ecmdirstatic->refreshcachenboffile(0);
@@ -396,9 +451,11 @@ 
 					//print 'modulepart='.$modulepart.' fullpathselecteddir='.$fullpathselecteddir.' - val[fullrelativename] (in database)='.$val['fullrelativename'].' - val[id]='.$val['id'].' - is_dir='.dol_is_dir($fullpathselecteddir . $file).' - file='.$file."\n";
 					if ($file != '.' && $file != '..' && ((! empty($val['fullrelativename']) && $val['id'] >= 0) || dol_is_dir($fullpathselecteddir . (preg_match('/\/$/',$fullpathselecteddir)?'':'/') . $file)))
 					{
-						if (empty($val['fullrelativename']))	// If we did not find entry into database, but found a directory (dol_is_dir was ok at previous test)
+						if (empty($val['fullrelativename'])) {
+						    // If we did not find entry into database, but found a directory (dol_is_dir was ok at previous test)
 						{
 							$val['fullrelativename']=(($selecteddir && $selecteddir != '/')?$selecteddir.'/':'').$file;
+						}
 							$val['id']=0;
 							$val['label']=$file;
 							$val['description']='';
@@ -406,7 +463,9 @@ 
 						}
 
 						$collapsedorexpanded='collapsed';
-						if (preg_match('/^'.preg_quote($val['fullrelativename'].'/', '/').'/', $preopened)) $collapsedorexpanded='expanded';
+						if (preg_match('/^'.preg_quote($val['fullrelativename'].'/', '/').'/', $preopened)) {
+						    $collapsedorexpanded='expanded';
+						}
 						print '<li class="directory '.$collapsedorexpanded.'">';	// collapsed is opposite if expanded
 
 						print "<a class=\"fmdirlia jqft ecmjqft\" href=\"";
@@ -430,7 +489,9 @@ 
 						print (isset($val['cachenbofdoc']) && $val['cachenbofdoc']  >= 0)?$val['cachenbofdoc']:'&nbsp;';
 						print '</td>';
 						print '<td align="left">';
-						if ($nbofsubdir > 0  && $nboffilesinsubdir > 0) print '<font color="#AAAAAA">+'.$nboffilesinsubdir.'</font> ';
+						if ($nbofsubdir > 0  && $nboffilesinsubdir > 0) {
+						    print '<font color="#AAAAAA">+'.$nboffilesinsubdir.'</font> ';
+						}
 						print '</td>';
 
 						// Edit link
@@ -455,8 +516,11 @@ 
 							$htmltooltip.='<b>'.$langs->trans("ECMCreationDate").'</b>: '.(isset($val['date_c'])?dol_print_date($val['date_c'],"dayhour"):$langs->trans("NeedRefresh")).'<br>';
 							$htmltooltip.='<b>'.$langs->trans("Description").'</b>: '.$val['description'].'<br>';
 							$htmltooltip.='<b>'.$langs->trans("ECMNbOfFilesInDir").'</b>: '.((isset($val['cachenbofdoc']) && $val['cachenbofdoc'] >= 0)?$val['cachenbofdoc']:$langs->trans("NeedRefresh")).'<br>';
-							if ($nboffilesinsubdir > 0) $htmltooltip.='<b>'.$langs->trans("ECMNbOfFilesInSubDir").'</b>: '.$nboffilesinsubdir;
-							else $htmltooltip.='<b>'.$langs->trans("ECMNbOfSubDir").'</b>: '.($nbofsubdir >= 0 ? $nbofsubdir : $langs->trans("NeedRefresh")).'<br>';
+							if ($nboffilesinsubdir > 0) {
+							    $htmltooltip.='<b>'.$langs->trans("ECMNbOfFilesInSubDir").'</b>: '.$nboffilesinsubdir;
+							} else {
+							    $htmltooltip.='<b>'.$langs->trans("ECMNbOfSubDir").'</b>: '.($nbofsubdir >= 0 ? $nbofsubdir : $langs->trans("NeedRefresh")).'<br>';
+							}
 							print $form->textwithpicto('',$htmltooltip,1,"info");
 							print "</td>";
 						}
@@ -473,13 +537,14 @@ 
 							if ($modulepart == 'ecm')
 							{
 								$newfullpathselecteddir=$conf->ecm->dir_output.'/'.($val['fullrelativename'] != '/' ? $val['fullrelativename'] : '');
-							}
-							elseif ($modulepart == 'medias')
+							} elseif ($modulepart == 'medias')
 							{
 								$newfullpathselecteddir=$dolibarr_main_data_root.'/medias/'.($val['fullrelativename'] != '/' ? $val['fullrelativename'] : '');
 							}
 
-							if ($newfullpathselecteddir) treeOutputForAbsoluteDir($sqltree, $newselecteddir, $newfullpathselecteddir, $modulepart, $websitekey, $pageid, $preopened, $fullpathpreopened, $depth+1);
+							if ($newfullpathselecteddir) {
+							    treeOutputForAbsoluteDir($sqltree, $newselecteddir, $newfullpathselecteddir, $modulepart, $websitekey, $pageid, $preopened, $fullpathpreopened, $depth+1);
+							}
 						}
 
 						print "</li>\n";
@@ -488,8 +553,9 @@ 
 
 				echo "</ul>\n";
 			}
+		} else {
+		    print "PermissionDenied";
 		}
-		else print "PermissionDenied";
 	}
 }
 

dolibarr/htdocs/core/ajax/ajaxdirpreview.php

Indentation +99 added lines, -99 removed lines

@@ -56,9 +56,9 @@ 
     if (! $sortorder) $sortorder="ASC";
     if (! $sortfield) $sortfield="name";
 
-	$rootdirfordoc = $conf->ecm->dir_output;
+    $rootdirfordoc = $conf->ecm->dir_output;
 
-	$upload_dir = dirname(str_replace("../", "/", $rootdirfordoc.'/'.$file));
+    $upload_dir = dirname(str_replace("../", "/", $rootdirfordoc.'/'.$file));
 
     $ecmdir = new EcmDirectory($db);
     $result=$ecmdir->fetch($section);
@@ -70,9 +70,9 @@ 
 }
 else    // For no ajax call
 {
-	$rootdirfordoc = $conf->ecm->dir_output;
+    $rootdirfordoc = $conf->ecm->dir_output;
 
-	$ecmdir = new EcmDirectory($db);
+    $ecmdir = new EcmDirectory($db);
     $relativepath='';
     if ($section > 0)
     {
@@ -85,19 +85,19 @@ 
 
         $relativepath=$ecmdir->getRelativePath();	// Example   'mydir/'
     }
-	elseif (GETPOST('section_dir'))
-	{
-		$relativepath=GETPOST('section_dir');
-	}
-	//var_dump($section.'-'.GETPOST('section_dir').'-'.$relativepath);
+    elseif (GETPOST('section_dir'))
+    {
+        $relativepath=GETPOST('section_dir');
+    }
+    //var_dump($section.'-'.GETPOST('section_dir').'-'.$relativepath);
 
-	$upload_dir = $rootdirfordoc.'/'.$relativepath;
+    $upload_dir = $rootdirfordoc.'/'.$relativepath;
 }
 
 if (empty($url))
 {
-	if (GETPOSTISSET('website')) $url=DOL_URL_ROOT.'/website/index.php';
-	else $url=DOL_URL_ROOT.'/ecm/index.php';
+    if (GETPOSTISSET('website')) $url=DOL_URL_ROOT.'/website/index.php';
+    else $url=DOL_URL_ROOT.'/ecm/index.php';
 }
 
 // Load translation files required by the page
@@ -121,11 +121,11 @@ 
 // Check permissions
 if ($modulepart == 'ecm')
 {
-	if (! $user->rights->ecm->read) accessforbidden();
+    if (! $user->rights->ecm->read) accessforbidden();
 }
 if ($modulepart == 'medias')
 {
-	// Always allowed
+    // Always allowed
 }
 
 
@@ -143,7 +143,7 @@ 
 
 if (! isset($mode) || $mode != 'noajax')
 {
-	// Ajout directives pour resoudre bug IE
+    // Ajout directives pour resoudre bug IE
     header('Cache-Control: Public, must-revalidate');
     header('Pragma: public');
 
@@ -210,7 +210,7 @@ 
     else if ($module == 'user') $upload_dir = $conf->user->dir_output;
     // Auto area for expense report
     else if ($module == 'expensereport') $upload_dir = $conf->expensereport->dir_output;
-	// Auto area for holiday
+    // Auto area for holiday
     else if ($module == 'holiday') $upload_dir = $conf->holiday->dir_output;
 
     // Automatic list
@@ -233,9 +233,9 @@ 
     // Manual list
     else
     {
-    	if ($module == 'medias')
-    	{
-    		/*
+        if ($module == 'medias')
+        {
+            /*
     		   $_POST is array like
     		  'token' => string '062380e11b7dcd009d07318b57b71750' (length=32)
 			  'action' => string 'file_manager' (length=12)
@@ -246,66 +246,66 @@ 
 			  'max_file_size' => string '2097152' (length=7)
 			  'sendit' => string 'Envoyer fichier' (length=15)
     		 */
-    		$relativepath=GETPOST('file','alpha')?GETPOST('file','alpha'):GETPOST('section_dir','alpha');
-    		if ($relativepath && $relativepath!= '/') $relativepath.='/';
-    		$upload_dir = $dolibarr_main_data_root.'/'.$module.'/'.$relativepath;
-    		if (GETPOSTISSET('website') || GETPOSTISSET('file_manager'))
-	    	{
-	    		$param.='&file_manager=1';
-	    		if (!preg_match('/website=/',$param)) $param.='&website='.urlencode(GETPOST('website','alpha'));
-	    		if (!preg_match('/pageid=/',$param)) $param.='&pageid='.urlencode(GETPOST('pageid','int'));
-	    		//if (!preg_match('/backtopage=/',$param)) $param.='&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid);
-	    	}
-    	}
-    	else
-    	{
-        	$relativepath=$ecmdir->getRelativePath();
-        	$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
-    	}
+            $relativepath=GETPOST('file','alpha')?GETPOST('file','alpha'):GETPOST('section_dir','alpha');
+            if ($relativepath && $relativepath!= '/') $relativepath.='/';
+            $upload_dir = $dolibarr_main_data_root.'/'.$module.'/'.$relativepath;
+            if (GETPOSTISSET('website') || GETPOSTISSET('file_manager'))
+            {
+                $param.='&file_manager=1';
+                if (!preg_match('/website=/',$param)) $param.='&website='.urlencode(GETPOST('website','alpha'));
+                if (!preg_match('/pageid=/',$param)) $param.='&pageid='.urlencode(GETPOST('pageid','int'));
+                //if (!preg_match('/backtopage=/',$param)) $param.='&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid);
+            }
+        }
+        else
+        {
+            $relativepath=$ecmdir->getRelativePath();
+            $upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
+        }
 
         // If $section defined with value 0
-		if (($section === '0' || empty($section)) && ($module != 'medias'))
+        if (($section === '0' || empty($section)) && ($module != 'medias'))
         {
             $filearray=array();
         }
         else
         {
-        	$filearray=dol_dir_list($upload_dir,"files",0,'',array('^\.','(\.meta|_preview.*\.png)$','^temp$','^CVS$'),$sortfield, $sorting,1);
+            $filearray=dol_dir_list($upload_dir,"files",0,'',array('^\.','(\.meta|_preview.*\.png)$','^temp$','^CVS$'),$sortfield, $sorting,1);
         }
 
         if ($section)
         {
             $param.='&section='.$section;
-        	if (isset($search_doc_ref) && $search_doc_ref != '') $param.='&search_doc_ref='.$search_doc_ref;
+            if (isset($search_doc_ref) && $search_doc_ref != '') $param.='&search_doc_ref='.$search_doc_ref;
 
             $textifempty = $langs->trans('NoFileFound');
         }
         else if ($section === '0')
         {
-        	if ($module == 'ecm') $textifempty='<br><div align="center"><font class="warning">'.$langs->trans("DirNotSynchronizedSyncFirst").'</font></div><br>';
-        	else $textifempty = $langs->trans('NoFileFound');
+            if ($module == 'ecm') $textifempty='<br><div align="center"><font class="warning">'.$langs->trans("DirNotSynchronizedSyncFirst").'</font></div><br>';
+            else $textifempty = $langs->trans('NoFileFound');
         }
         else $textifempty=($showonrightsize=='featurenotyetavailable'?$langs->trans("FeatureNotYetAvailable"):$langs->trans("ECMSelectASection"));
 
-    	if ($module == 'medias')
-    	{
-    		$useinecm = 2;
-    		$modulepart='medias';
-        	$perm=($user->rights->website->write || $user->rights->emailing->creer);
-        	$title='none';
-    	}
-    	else
-    	{
-    		$useinecm = 1;
-    		$modulepart='ecm';
-        	$perm=$user->rights->ecm->upload;
-        	$title='';	// Use default
-    	}
-
-    	// When we show list of files for ECM files, $filearray contains file list, and directory is defined with modulepart + section into $param
-    	// When we show list of files for a directory, $filearray ciontains file list, and directory is defined with modulepart + $relativepath
-    	//var_dump("title=".$title." modulepart=".$modulepart." useinecm=".$useinecm." perm=".$perm." relativepath=".$relativepath." param=".$param." url=".$url);
-		$formfile->list_of_documents($filearray, '', $modulepart, $param, 1, $relativepath, $perm, $useinecm, $textifempty, $maxlengthname, $title, $url, 0, $perm);
+        if ($module == 'medias')
+        {
+            $useinecm = 2;
+            $modulepart='medias';
+            $perm=($user->rights->website->write || $user->rights->emailing->creer);
+            $title='none';
+        }
+        else
+        {
+            $useinecm = 1;
+            $modulepart='ecm';
+            $perm=$user->rights->ecm->upload;
+            $title='';	// Use default
+        }
+
+        // When we show list of files for ECM files, $filearray contains file list, and directory is defined with modulepart + section into $param
+        // When we show list of files for a directory, $filearray ciontains file list, and directory is defined with modulepart + $relativepath
+        //var_dump("title=".$title." modulepart=".$modulepart." useinecm=".$useinecm." perm=".$perm." relativepath=".$relativepath." param=".$param." url=".$url);
+        $formfile->list_of_documents($filearray, '', $modulepart, $param, 1, $relativepath, $perm, $useinecm, $textifempty, $maxlengthname, $title, $url, 0, $perm);
     }
 }
 
@@ -321,37 +321,37 @@ 
 
 if ($useajax || $action == 'delete')
 {
-	$urlfile='';
-	if ($action == 'delete') $urlfile=GETPOST('urlfile','alpha');
-
-	if (empty($section_dir)) $section_dir=GETPOST("file","alpha");
-	$section_id=$section;
-
-	require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
-	$useglobalvars=1;
-	$form = new Form($db);
-	$formquestion['urlfile']=array('type'=>'hidden','value'=>$urlfile,'name'=>'urlfile');				// We must always put field, even if empty because it is fille by javascript later
-	$formquestion['section']=array('type'=>'hidden','value'=>$section,'name'=>'section');				// We must always put field, even if empty because it is fille by javascript later
-	$formquestion['section_id']=array('type'=>'hidden','value'=>$section_id,'name'=>'section_id');		// We must always put field, even if empty because it is fille by javascript later
-	$formquestion['section_dir']=array('type'=>'hidden','value'=>$section_dir,'name'=>'section_dir');	// We must always put field, even if empty because it is fille by javascript later
-	if (! empty($action) && $action == 'file_manager')	$formquestion['file_manager']=array('type'=>'hidden','value'=>1,'name'=>'file_manager');
-	if (! empty($websitekey))							$formquestion['website']=array('type'=>'hidden','value'=>$websitekey,'name'=>'website');
-	if (! empty($pageid) && $pageid > 0)				$formquestion['pageid']=array('type'=>'hidden','value'=>$pageid,'name'=>'pageid');
-
-	print $form->formconfirm($url,$langs->trans("DeleteFile"),$langs->trans("ConfirmDeleteFile"),'confirm_deletefile',$formquestion,"no",($useajax?'deletefile':0));
+    $urlfile='';
+    if ($action == 'delete') $urlfile=GETPOST('urlfile','alpha');
+
+    if (empty($section_dir)) $section_dir=GETPOST("file","alpha");
+    $section_id=$section;
+
+    require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+    $useglobalvars=1;
+    $form = new Form($db);
+    $formquestion['urlfile']=array('type'=>'hidden','value'=>$urlfile,'name'=>'urlfile');				// We must always put field, even if empty because it is fille by javascript later
+    $formquestion['section']=array('type'=>'hidden','value'=>$section,'name'=>'section');				// We must always put field, even if empty because it is fille by javascript later
+    $formquestion['section_id']=array('type'=>'hidden','value'=>$section_id,'name'=>'section_id');		// We must always put field, even if empty because it is fille by javascript later
+    $formquestion['section_dir']=array('type'=>'hidden','value'=>$section_dir,'name'=>'section_dir');	// We must always put field, even if empty because it is fille by javascript later
+    if (! empty($action) && $action == 'file_manager')	$formquestion['file_manager']=array('type'=>'hidden','value'=>1,'name'=>'file_manager');
+    if (! empty($websitekey))							$formquestion['website']=array('type'=>'hidden','value'=>$websitekey,'name'=>'website');
+    if (! empty($pageid) && $pageid > 0)				$formquestion['pageid']=array('type'=>'hidden','value'=>$pageid,'name'=>'pageid');
+
+    print $form->formconfirm($url,$langs->trans("DeleteFile"),$langs->trans("ConfirmDeleteFile"),'confirm_deletefile',$formquestion,"no",($useajax?'deletefile':0));
 }
 
 if ($useajax)
 {
-	print '<script type="text/javascript">';
-
-	// Enable jquery handlers on new generated HTML objects (same code than into lib_footer.js.php)
-	// Because the content is reloaded by ajax call, we must also reenable some jquery hooks
-	// Wrapper to manage document_preview
-	if ($conf->browser->layout != 'phone')
-	{
-		print "\n/* JS CODE TO ENABLE document_preview */\n";
-		print '
+    print '<script type="text/javascript">';
+
+    // Enable jquery handlers on new generated HTML objects (same code than into lib_footer.js.php)
+    // Because the content is reloaded by ajax call, we must also reenable some jquery hooks
+    // Wrapper to manage document_preview
+    if ($conf->browser->layout != 'phone')
+    {
+        print "\n/* JS CODE TO ENABLE document_preview */\n";
+        print '
                 jQuery(document).ready(function () {
 			        jQuery(".documentpreview").click(function () {
             		    console.log("We click on preview for element with href="+$(this).attr(\'href\')+" mime="+$(this).attr(\'mime\'));
@@ -360,19 +360,19 @@ 
         			});
         		});
            ' . "\n";
-	}
-
-	// Enable jquery handlers button to delete files
-	print 'jQuery(document).ready(function() {'."\n";
-	print '  jQuery(".deletefilelink").click(function(e) { '."\n";
-	print '    console.log("We click on button with class deletefilelink, param='.$param.', we set urlfile to "+jQuery(this).attr("rel"));'."\n";
-	print '    jQuery("#urlfile").val(jQuery(this).attr("rel"));'."\n";
-	//print '    jQuery("#section_dir").val(\'aaa\');'."\n";
-	print '    jQuery("#dialog-confirm-deletefile").dialog("open");'."\n";
-	print '    return false;'."\n";
-	print '  });'."\n";
-	print '});'."\n";
-	print '</script>'."\n";
+    }
+
+    // Enable jquery handlers button to delete files
+    print 'jQuery(document).ready(function() {'."\n";
+    print '  jQuery(".deletefilelink").click(function(e) { '."\n";
+    print '    console.log("We click on button with class deletefilelink, param='.$param.', we set urlfile to "+jQuery(this).attr("rel"));'."\n";
+    print '    jQuery("#urlfile").val(jQuery(this).attr("rel"));'."\n";
+    //print '    jQuery("#section_dir").val(\'aaa\');'."\n";
+    print '    jQuery("#dialog-confirm-deletefile").dialog("open");'."\n";
+    print '    return false;'."\n";
+    print '  });'."\n";
+    print '});'."\n";
+    print '</script>'."\n";
 }
 
 // Close db if mode is not noajax

Spacing +85 added lines, -85 removed lines

@@ -27,42 +27,42 @@ 
  * 				ajaxdirpreview.php?mode=nojs&action=preview&module=ecm&section=0&file=xxx
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
-if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); // Disables token renewal
+if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', '1');
+if (!defined('NOREQUIREHTML')) define('NOREQUIREHTML', '1');
+if (!defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1');
 
-if (! isset($mode) || $mode != 'noajax')    // For ajax call
+if (!isset($mode) || $mode != 'noajax')    // For ajax call
 {
     require_once '../../main.inc.php';
     require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
     require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
 
-    $action=GETPOST('action','aZ09');
-    $file=urldecode(GETPOST('file','alpha'));
-    $section=GETPOST("section",'alpha');
-    $module=GETPOST("module",'alpha');
-    $urlsource=GETPOST("urlsource",'alpha');
-    $search_doc_ref=GETPOST('search_doc_ref','alpha');
+    $action = GETPOST('action', 'aZ09');
+    $file = urldecode(GETPOST('file', 'alpha'));
+    $section = GETPOST("section", 'alpha');
+    $module = GETPOST("module", 'alpha');
+    $urlsource = GETPOST("urlsource", 'alpha');
+    $search_doc_ref = GETPOST('search_doc_ref', 'alpha');
 
-    $sortfield = GETPOST("sortfield",'alpha');
-    $sortorder = GETPOST("sortorder",'alpha');
-    $page = GETPOST("page",'int');
+    $sortfield = GETPOST("sortfield", 'alpha');
+    $sortorder = GETPOST("sortorder", 'alpha');
+    $page = GETPOST("page", 'int');
     if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
     $offset = $conf->liste_limit * $page;
     $pageprev = $page - 1;
     $pagenext = $page + 1;
-    if (! $sortorder) $sortorder="ASC";
-    if (! $sortfield) $sortfield="name";
+    if (!$sortorder) $sortorder = "ASC";
+    if (!$sortfield) $sortfield = "name";
 
 	$rootdirfordoc = $conf->ecm->dir_output;
 
 	$upload_dir = dirname(str_replace("../", "/", $rootdirfordoc.'/'.$file));
 
     $ecmdir = new EcmDirectory($db);
-    $result=$ecmdir->fetch($section);
-    if (! $result > 0)
+    $result = $ecmdir->fetch($section);
+    if (!$result > 0)
     {
         //dol_print_error($db,$ecmdir->error);
         //exit;
@@ -73,21 +73,21 @@ 
 	$rootdirfordoc = $conf->ecm->dir_output;
 
 	$ecmdir = new EcmDirectory($db);
-    $relativepath='';
+    $relativepath = '';
     if ($section > 0)
     {
-        $result=$ecmdir->fetch($section);
-        if (! $result > 0)
+        $result = $ecmdir->fetch($section);
+        if (!$result > 0)
         {
-            dol_print_error($db,$ecmdir->error);
+            dol_print_error($db, $ecmdir->error);
             exit;
         }
 
-        $relativepath=$ecmdir->getRelativePath();	// Example   'mydir/'
+        $relativepath = $ecmdir->getRelativePath(); // Example   'mydir/'
     }
 	elseif (GETPOST('section_dir'))
 	{
-		$relativepath=GETPOST('section_dir');
+		$relativepath = GETPOST('section_dir');
 	}
 	//var_dump($section.'-'.GETPOST('section_dir').'-'.$relativepath);
 
@@ -96,12 +96,12 @@ 
 
 if (empty($url))
 {
-	if (GETPOSTISSET('website')) $url=DOL_URL_ROOT.'/website/index.php';
-	else $url=DOL_URL_ROOT.'/ecm/index.php';
+	if (GETPOSTISSET('website')) $url = DOL_URL_ROOT.'/website/index.php';
+	else $url = DOL_URL_ROOT.'/ecm/index.php';
 }
 
 // Load translation files required by the page
-$langs->loadLangs(array("ecm","companies","other"));
+$langs->loadLangs(array("ecm", "companies", "other"));
 
 // Security check
 if ($user->societe_id > 0) $socid = $user->societe_id;
@@ -110,18 +110,18 @@ 
 
 // Security:
 // On interdit les remontees de repertoire ainsi que les pipe dans les noms de fichiers.
-if (preg_match('/\.\./',$upload_dir) || preg_match('/[<>|]/',$upload_dir))
+if (preg_match('/\.\./', $upload_dir) || preg_match('/[<>|]/', $upload_dir))
 {
     dol_syslog("Refused to deliver file ".$upload_dir);
     // Do no show plain path in shown error message
-    dol_print_error(0,$langs->trans("ErrorFileNameInvalid",$upload_dir));
+    dol_print_error(0, $langs->trans("ErrorFileNameInvalid", $upload_dir));
     exit;
 }
 
 // Check permissions
 if ($modulepart == 'ecm')
 {
-	if (! $user->rights->ecm->read) accessforbidden();
+	if (!$user->rights->ecm->read) accessforbidden();
 }
 if ($modulepart == 'medias')
 {
@@ -141,7 +141,7 @@ 
  * View
  */
 
-if (! isset($mode) || $mode != 'noajax')
+if (!isset($mode) || $mode != 'noajax')
 {
 	// Ajout directives pour resoudre bug IE
     header('Cache-Control: Public, must-revalidate');
@@ -150,10 +150,10 @@ 
     top_httphead();
 }
 
-$type='directory';
+$type = 'directory';
 
 // This test if file exists should be useless. We keep it to find bug more easily
-if (! dol_is_dir($upload_dir))
+if (!dol_is_dir($upload_dir))
 {
 //	dol_mkdir($upload_dir);
 /*    $langs->load("install");
@@ -164,19 +164,19 @@ 
 print '<!-- ajaxdirpreview type='.$type.' -->'."\n";
 //print '<!-- Page called with mode='.dol_escape_htmltag(isset($mode)?$mode:'').' type='.dol_escape_htmltag($type).' module='.dol_escape_htmltag($module).' url='.dol_escape_htmltag($url).' '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
-$param=($sortfield?'&sortfield='.$sortfield:'').($sortorder?'&sortorder='.$sortorder:'');
-if (! empty($websitekey)) $param.='&website='.$websitekey;
-if (! empty($pageid))     $param.='&pageid='.$pageid;
+$param = ($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '');
+if (!empty($websitekey)) $param .= '&website='.$websitekey;
+if (!empty($pageid))     $param .= '&pageid='.$pageid;
 
 
 // Dir scan
 if ($type == 'directory')
 {
-    $formfile=new FormFile($db);
+    $formfile = new FormFile($db);
 
-    $maxlengthname=40;
-    $excludefiles = array('^SPECIMEN\.pdf$','^\.','(\.meta|_preview.*\.png)$','^temp$','^payments$','^CVS$','^thumbs$');
-    $sorting = (strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC);
+    $maxlengthname = 40;
+    $excludefiles = array('^SPECIMEN\.pdf$', '^\.', '(\.meta|_preview.*\.png)$', '^temp$', '^payments$', '^CVS$', '^thumbs$');
+    $sorting = (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC);
 
     // Right area. If module is defined here, we are in automatic ecm.
     $automodules = array('company', 'invoice', 'invoice_supplier', 'propal', 'supplier_proposal', 'order', 'order_supplier', 'contract', 'product', 'tax', 'project', 'fichinter', 'user', 'expensereport', 'holiday');
@@ -216,19 +216,19 @@ 
     // Automatic list
     if (in_array($module, $automodules))
     {
-        $param.='&module='.$module;
-        if (isset($search_doc_ref) && $search_doc_ref != '') $param.='&search_doc_ref='.$search_doc_ref;
+        $param .= '&module='.$module;
+        if (isset($search_doc_ref) && $search_doc_ref != '') $param .= '&search_doc_ref='.$search_doc_ref;
 
-        $textifempty=($section?$langs->trans("NoFileFound"):($showonrightsize=='featurenotyetavailable'?$langs->trans("FeatureNotYetAvailable"):$langs->trans("NoFileFound")));
+        $textifempty = ($section ? $langs->trans("NoFileFound") : ($showonrightsize == 'featurenotyetavailable' ? $langs->trans("FeatureNotYetAvailable") : $langs->trans("NoFileFound")));
 
-        if ($module == 'company') $excludefiles[]='^contact$';   // The subdir 'contact' contains files of contacts with no id of thirdparty.
+        if ($module == 'company') $excludefiles[] = '^contact$'; // The subdir 'contact' contains files of contacts with no id of thirdparty.
 
-        $filter=preg_quote($search_doc_ref, '/');
-        $filearray=dol_dir_list($upload_dir, "files", 1, $filter, $excludefiles, $sortfield, $sorting,1);
+        $filter = preg_quote($search_doc_ref, '/');
+        $filearray = dol_dir_list($upload_dir, "files", 1, $filter, $excludefiles, $sortfield, $sorting, 1);
 
-        $perm=$user->rights->ecm->upload;
+        $perm = $user->rights->ecm->upload;
 
-        $formfile->list_of_autoecmfiles($upload_dir,$filearray,$module,$param,1,'',$perm,1,$textifempty,$maxlengthname,$url,1);
+        $formfile->list_of_autoecmfiles($upload_dir, $filearray, $module, $param, 1, '', $perm, 1, $textifempty, $maxlengthname, $url, 1);
     }
     // Manual list
     else
@@ -246,60 +246,60 @@ 
 			  'max_file_size' => string '2097152' (length=7)
 			  'sendit' => string 'Envoyer fichier' (length=15)
     		 */
-    		$relativepath=GETPOST('file','alpha')?GETPOST('file','alpha'):GETPOST('section_dir','alpha');
-    		if ($relativepath && $relativepath!= '/') $relativepath.='/';
+    		$relativepath = GETPOST('file', 'alpha') ?GETPOST('file', 'alpha') : GETPOST('section_dir', 'alpha');
+    		if ($relativepath && $relativepath != '/') $relativepath .= '/';
     		$upload_dir = $dolibarr_main_data_root.'/'.$module.'/'.$relativepath;
     		if (GETPOSTISSET('website') || GETPOSTISSET('file_manager'))
 	    	{
-	    		$param.='&file_manager=1';
-	    		if (!preg_match('/website=/',$param)) $param.='&website='.urlencode(GETPOST('website','alpha'));
-	    		if (!preg_match('/pageid=/',$param)) $param.='&pageid='.urlencode(GETPOST('pageid','int'));
+	    		$param .= '&file_manager=1';
+	    		if (!preg_match('/website=/', $param)) $param .= '&website='.urlencode(GETPOST('website', 'alpha'));
+	    		if (!preg_match('/pageid=/', $param)) $param .= '&pageid='.urlencode(GETPOST('pageid', 'int'));
 	    		//if (!preg_match('/backtopage=/',$param)) $param.='&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid);
 	    	}
     	}
     	else
     	{
-        	$relativepath=$ecmdir->getRelativePath();
+        	$relativepath = $ecmdir->getRelativePath();
         	$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
     	}
 
         // If $section defined with value 0
 		if (($section === '0' || empty($section)) && ($module != 'medias'))
         {
-            $filearray=array();
+            $filearray = array();
         }
         else
         {
-        	$filearray=dol_dir_list($upload_dir,"files",0,'',array('^\.','(\.meta|_preview.*\.png)$','^temp$','^CVS$'),$sortfield, $sorting,1);
+        	$filearray = dol_dir_list($upload_dir, "files", 0, '', array('^\.', '(\.meta|_preview.*\.png)$', '^temp$', '^CVS$'), $sortfield, $sorting, 1);
         }
 
         if ($section)
         {
-            $param.='&section='.$section;
-        	if (isset($search_doc_ref) && $search_doc_ref != '') $param.='&search_doc_ref='.$search_doc_ref;
+            $param .= '&section='.$section;
+        	if (isset($search_doc_ref) && $search_doc_ref != '') $param .= '&search_doc_ref='.$search_doc_ref;
 
             $textifempty = $langs->trans('NoFileFound');
         }
         else if ($section === '0')
         {
-        	if ($module == 'ecm') $textifempty='<br><div align="center"><font class="warning">'.$langs->trans("DirNotSynchronizedSyncFirst").'</font></div><br>';
+        	if ($module == 'ecm') $textifempty = '<br><div align="center"><font class="warning">'.$langs->trans("DirNotSynchronizedSyncFirst").'</font></div><br>';
         	else $textifempty = $langs->trans('NoFileFound');
         }
-        else $textifempty=($showonrightsize=='featurenotyetavailable'?$langs->trans("FeatureNotYetAvailable"):$langs->trans("ECMSelectASection"));
+        else $textifempty = ($showonrightsize == 'featurenotyetavailable' ? $langs->trans("FeatureNotYetAvailable") : $langs->trans("ECMSelectASection"));
 
     	if ($module == 'medias')
     	{
     		$useinecm = 2;
-    		$modulepart='medias';
-        	$perm=($user->rights->website->write || $user->rights->emailing->creer);
-        	$title='none';
+    		$modulepart = 'medias';
+        	$perm = ($user->rights->website->write || $user->rights->emailing->creer);
+        	$title = 'none';
     	}
     	else
     	{
     		$useinecm = 1;
-    		$modulepart='ecm';
-        	$perm=$user->rights->ecm->upload;
-        	$title='';	// Use default
+    		$modulepart = 'ecm';
+        	$perm = $user->rights->ecm->upload;
+        	$title = ''; // Use default
     	}
 
     	// When we show list of files for ECM files, $filearray contains file list, and directory is defined with modulepart + section into $param
@@ -312,33 +312,33 @@ 
 
 
 // Bottom of page
-$useajax=1;
-if (! empty($conf->dol_use_jmobile)) $useajax=0;
-if (empty($conf->use_javascript_ajax)) $useajax=0;
-if (! empty($conf->global->MAIN_ECM_DISABLE_JS)) $useajax=0;
+$useajax = 1;
+if (!empty($conf->dol_use_jmobile)) $useajax = 0;
+if (empty($conf->use_javascript_ajax)) $useajax = 0;
+if (!empty($conf->global->MAIN_ECM_DISABLE_JS)) $useajax = 0;
 
 //$param.=($param?'?':'').(preg_replace('/^&/','',$param));
 
 if ($useajax || $action == 'delete')
 {
-	$urlfile='';
-	if ($action == 'delete') $urlfile=GETPOST('urlfile','alpha');
+	$urlfile = '';
+	if ($action == 'delete') $urlfile = GETPOST('urlfile', 'alpha');
 
-	if (empty($section_dir)) $section_dir=GETPOST("file","alpha");
-	$section_id=$section;
+	if (empty($section_dir)) $section_dir = GETPOST("file", "alpha");
+	$section_id = $section;
 
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
-	$useglobalvars=1;
+	$useglobalvars = 1;
 	$form = new Form($db);
-	$formquestion['urlfile']=array('type'=>'hidden','value'=>$urlfile,'name'=>'urlfile');				// We must always put field, even if empty because it is fille by javascript later
-	$formquestion['section']=array('type'=>'hidden','value'=>$section,'name'=>'section');				// We must always put field, even if empty because it is fille by javascript later
-	$formquestion['section_id']=array('type'=>'hidden','value'=>$section_id,'name'=>'section_id');		// We must always put field, even if empty because it is fille by javascript later
-	$formquestion['section_dir']=array('type'=>'hidden','value'=>$section_dir,'name'=>'section_dir');	// We must always put field, even if empty because it is fille by javascript later
-	if (! empty($action) && $action == 'file_manager')	$formquestion['file_manager']=array('type'=>'hidden','value'=>1,'name'=>'file_manager');
-	if (! empty($websitekey))							$formquestion['website']=array('type'=>'hidden','value'=>$websitekey,'name'=>'website');
-	if (! empty($pageid) && $pageid > 0)				$formquestion['pageid']=array('type'=>'hidden','value'=>$pageid,'name'=>'pageid');
-
-	print $form->formconfirm($url,$langs->trans("DeleteFile"),$langs->trans("ConfirmDeleteFile"),'confirm_deletefile',$formquestion,"no",($useajax?'deletefile':0));
+	$formquestion['urlfile'] = array('type'=>'hidden', 'value'=>$urlfile, 'name'=>'urlfile'); // We must always put field, even if empty because it is fille by javascript later
+	$formquestion['section'] = array('type'=>'hidden', 'value'=>$section, 'name'=>'section'); // We must always put field, even if empty because it is fille by javascript later
+	$formquestion['section_id'] = array('type'=>'hidden', 'value'=>$section_id, 'name'=>'section_id'); // We must always put field, even if empty because it is fille by javascript later
+	$formquestion['section_dir'] = array('type'=>'hidden', 'value'=>$section_dir, 'name'=>'section_dir'); // We must always put field, even if empty because it is fille by javascript later
+	if (!empty($action) && $action == 'file_manager')	$formquestion['file_manager'] = array('type'=>'hidden', 'value'=>1, 'name'=>'file_manager');
+	if (!empty($websitekey))							$formquestion['website'] = array('type'=>'hidden', 'value'=>$websitekey, 'name'=>'website');
+	if (!empty($pageid) && $pageid > 0)				$formquestion['pageid'] = array('type'=>'hidden', 'value'=>$pageid, 'name'=>'pageid');
+
+	print $form->formconfirm($url, $langs->trans("DeleteFile"), $langs->trans("ConfirmDeleteFile"), 'confirm_deletefile', $formquestion, "no", ($useajax ? 'deletefile' : 0));
 }
 
 if ($useajax)
@@ -376,4 +376,4 @@ 
 }
 
 // Close db if mode is not noajax
-if ((! isset($mode) || $mode != 'noajax') && is_object($db)) $db->close();
+if ((!isset($mode) || $mode != 'noajax') && is_object($db)) $db->close();

Braces +145 added lines, -60 removed lines

@@ -27,14 +27,25 @@ 
  * 				ajaxdirpreview.php?mode=nojs&action=preview&module=ecm&section=0&file=xxx
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
-if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL',1);
+}
+// Disables token renewal
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+if (! defined('NOREQUIREHTML')) {
+    define('NOREQUIREHTML','1');
+}
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
 
-if (! isset($mode) || $mode != 'noajax')    // For ajax call
+if (! isset($mode) || $mode != 'noajax') {
+    // For ajax call
 {
     require_once '../../main.inc.php';
+}
     require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
     require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
@@ -53,8 +64,12 @@ 
     $offset = $conf->liste_limit * $page;
     $pageprev = $page - 1;
     $pagenext = $page + 1;
-    if (! $sortorder) $sortorder="ASC";
-    if (! $sortfield) $sortfield="name";
+    if (! $sortorder) {
+        $sortorder="ASC";
+    }
+    if (! $sortfield) {
+        $sortfield="name";
+    }
 
 	$rootdirfordoc = $conf->ecm->dir_output;
 
@@ -67,8 +82,7 @@ 
         //dol_print_error($db,$ecmdir->error);
         //exit;
     }
-}
-else    // For no ajax call
+} else    // For no ajax call
 {
 	$rootdirfordoc = $conf->ecm->dir_output;
 
@@ -84,8 +98,7 @@ 
         }
 
         $relativepath=$ecmdir->getRelativePath();	// Example   'mydir/'
-    }
-	elseif (GETPOST('section_dir'))
+    } elseif (GETPOST('section_dir'))
 	{
 		$relativepath=GETPOST('section_dir');
 	}
@@ -96,15 +109,20 @@ 
 
 if (empty($url))
 {
-	if (GETPOSTISSET('website')) $url=DOL_URL_ROOT.'/website/index.php';
-	else $url=DOL_URL_ROOT.'/ecm/index.php';
-}
+	if (GETPOSTISSET('website')) {
+	    $url=DOL_URL_ROOT.'/website/index.php';
+	} else {
+	    $url=DOL_URL_ROOT.'/ecm/index.php';
+	}
+	}
 
 // Load translation files required by the page
 $langs->loadLangs(array("ecm","companies","other"));
 
 // Security check
-if ($user->societe_id > 0) $socid = $user->societe_id;
+if ($user->societe_id > 0) {
+    $socid = $user->societe_id;
+}
 
 //print 'xxx'.$upload_dir;
 
@@ -121,8 +139,10 @@ 
 // Check permissions
 if ($modulepart == 'ecm')
 {
-	if (! $user->rights->ecm->read) accessforbidden();
-}
+	if (! $user->rights->ecm->read) {
+	    accessforbidden();
+	}
+	}
 if ($modulepart == 'medias')
 {
 	// Always allowed
@@ -165,8 +185,12 @@ 
 //print '<!-- Page called with mode='.dol_escape_htmltag(isset($mode)?$mode:'').' type='.dol_escape_htmltag($type).' module='.dol_escape_htmltag($module).' url='.dol_escape_htmltag($url).' '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 $param=($sortfield?'&sortfield='.$sortfield:'').($sortorder?'&sortorder='.$sortorder:'');
-if (! empty($websitekey)) $param.='&website='.$websitekey;
-if (! empty($pageid))     $param.='&pageid='.$pageid;
+if (! empty($websitekey)) {
+    $param.='&website='.$websitekey;
+}
+if (! empty($pageid)) {
+    $param.='&pageid='.$pageid;
+}
 
 
 // Dir scan
@@ -183,45 +207,80 @@ 
 
     // TODO change for multicompany sharing
     // Auto area for suppliers invoices
-    if ($module == 'company') $upload_dir = $conf->societe->dir_output;
+    if ($module == 'company') {
+        $upload_dir = $conf->societe->dir_output;
+    }
     // Auto area for suppliers invoices
-    else if ($module == 'invoice') $upload_dir = $conf->facture->dir_output;
+    else if ($module == 'invoice') {
+        $upload_dir = $conf->facture->dir_output;
+    }
     // Auto area for suppliers invoices
-    else if ($module == 'invoice_supplier') $upload_dir = $conf->fournisseur->facture->dir_output;
+    else if ($module == 'invoice_supplier') {
+        $upload_dir = $conf->fournisseur->facture->dir_output;
+    }
     // Auto area for customers proposal
-    else if ($module == 'propal') $upload_dir = $conf->propal->dir_output;
+    else if ($module == 'propal') {
+        $upload_dir = $conf->propal->dir_output;
+    }
     // Auto area for suppliers proposal
-    else if ($module == 'supplier_proposal') $upload_dir = $conf->supplier_proposal->dir_output;
+    else if ($module == 'supplier_proposal') {
+        $upload_dir = $conf->supplier_proposal->dir_output;
+    }
     // Auto area for customers orders
-    else if ($module == 'order') $upload_dir = $conf->commande->dir_output;
+    else if ($module == 'order') {
+        $upload_dir = $conf->commande->dir_output;
+    }
     // Auto area for suppliers orders
-    else if ($module == 'order_supplier') $upload_dir = $conf->fournisseur->commande->dir_output;
+    else if ($module == 'order_supplier') {
+        $upload_dir = $conf->fournisseur->commande->dir_output;
+    }
     // Auto area for suppliers invoices
-    else if ($module == 'contract') $upload_dir = $conf->contrat->dir_output;
+    else if ($module == 'contract') {
+        $upload_dir = $conf->contrat->dir_output;
+    }
     // Auto area for products
-    else if ($module == 'product') $upload_dir = $conf->product->dir_output;
+    else if ($module == 'product') {
+        $upload_dir = $conf->product->dir_output;
+    }
     // Auto area for suppliers invoices
-    else if ($module == 'tax') $upload_dir = $conf->tax->dir_output;
+    else if ($module == 'tax') {
+        $upload_dir = $conf->tax->dir_output;
+    }
     // Auto area for projects
-    else if ($module == 'project') $upload_dir = $conf->projet->dir_output;
+    else if ($module == 'project') {
+        $upload_dir = $conf->projet->dir_output;
+    }
     // Auto area for interventions
-    else if ($module == 'fichinter') $upload_dir = $conf->ficheinter->dir_output;
+    else if ($module == 'fichinter') {
+        $upload_dir = $conf->ficheinter->dir_output;
+    }
     // Auto area for users
-    else if ($module == 'user') $upload_dir = $conf->user->dir_output;
+    else if ($module == 'user') {
+        $upload_dir = $conf->user->dir_output;
+    }
     // Auto area for expense report
-    else if ($module == 'expensereport') $upload_dir = $conf->expensereport->dir_output;
+    else if ($module == 'expensereport') {
+        $upload_dir = $conf->expensereport->dir_output;
+    }
 	// Auto area for holiday
-    else if ($module == 'holiday') $upload_dir = $conf->holiday->dir_output;
+    else if ($module == 'holiday') {
+        $upload_dir = $conf->holiday->dir_output;
+    }
 
     // Automatic list
     if (in_array($module, $automodules))
     {
         $param.='&module='.$module;
-        if (isset($search_doc_ref) && $search_doc_ref != '') $param.='&search_doc_ref='.$search_doc_ref;
+        if (isset($search_doc_ref) && $search_doc_ref != '') {
+            $param.='&search_doc_ref='.$search_doc_ref;
+        }
 
         $textifempty=($section?$langs->trans("NoFileFound"):($showonrightsize=='featurenotyetavailable'?$langs->trans("FeatureNotYetAvailable"):$langs->trans("NoFileFound")));
 
-        if ($module == 'company') $excludefiles[]='^contact$';   // The subdir 'contact' contains files of contacts with no id of thirdparty.
+        if ($module == 'company') {
+            $excludefiles[]='^contact$';
+        }
+        // The subdir 'contact' contains files of contacts with no id of thirdparty.
 
         $filter=preg_quote($search_doc_ref, '/');
         $filearray=dol_dir_list($upload_dir, "files", 1, $filter, $excludefiles, $sortfield, $sorting,1);
@@ -247,17 +306,22 @@ 
 			  'sendit' => string 'Envoyer fichier' (length=15)
     		 */
     		$relativepath=GETPOST('file','alpha')?GETPOST('file','alpha'):GETPOST('section_dir','alpha');
-    		if ($relativepath && $relativepath!= '/') $relativepath.='/';
+    		if ($relativepath && $relativepath!= '/') {
+    		    $relativepath.='/';
+    		}
     		$upload_dir = $dolibarr_main_data_root.'/'.$module.'/'.$relativepath;
     		if (GETPOSTISSET('website') || GETPOSTISSET('file_manager'))
 	    	{
 	    		$param.='&file_manager=1';
-	    		if (!preg_match('/website=/',$param)) $param.='&website='.urlencode(GETPOST('website','alpha'));
-	    		if (!preg_match('/pageid=/',$param)) $param.='&pageid='.urlencode(GETPOST('pageid','int'));
+	    		if (!preg_match('/website=/',$param)) {
+	    		    $param.='&website='.urlencode(GETPOST('website','alpha'));
+	    		}
+	    		if (!preg_match('/pageid=/',$param)) {
+	    		    $param.='&pageid='.urlencode(GETPOST('pageid','int'));
+	    		}
 	    		//if (!preg_match('/backtopage=/',$param)) $param.='&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid);
 	    	}
-    	}
-    	else
+    	} else
     	{
         	$relativepath=$ecmdir->getRelativePath();
         	$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
@@ -267,8 +331,7 @@ 
 		if (($section === '0' || empty($section)) && ($module != 'medias'))
         {
             $filearray=array();
-        }
-        else
+        } else
         {
         	$filearray=dol_dir_list($upload_dir,"files",0,'',array('^\.','(\.meta|_preview.*\.png)$','^temp$','^CVS$'),$sortfield, $sorting,1);
         }
@@ -276,16 +339,21 @@ 
         if ($section)
         {
             $param.='&section='.$section;
-        	if (isset($search_doc_ref) && $search_doc_ref != '') $param.='&search_doc_ref='.$search_doc_ref;
+        	if (isset($search_doc_ref) && $search_doc_ref != '') {
+        	    $param.='&search_doc_ref='.$search_doc_ref;
+        	}
 
             $textifempty = $langs->trans('NoFileFound');
-        }
-        else if ($section === '0')
+        } else if ($section === '0')
         {
-        	if ($module == 'ecm') $textifempty='<br><div align="center"><font class="warning">'.$langs->trans("DirNotSynchronizedSyncFirst").'</font></div><br>';
-        	else $textifempty = $langs->trans('NoFileFound');
+        	if ($module == 'ecm') {
+        	    $textifempty='<br><div align="center"><font class="warning">'.$langs->trans("DirNotSynchronizedSyncFirst").'</font></div><br>';
+        	} else {
+        	    $textifempty = $langs->trans('NoFileFound');
+        	}
+        } else {
+            $textifempty=($showonrightsize=='featurenotyetavailable'?$langs->trans("FeatureNotYetAvailable"):$langs->trans("ECMSelectASection"));
         }
-        else $textifempty=($showonrightsize=='featurenotyetavailable'?$langs->trans("FeatureNotYetAvailable"):$langs->trans("ECMSelectASection"));
 
     	if ($module == 'medias')
     	{
@@ -293,8 +361,7 @@ 
     		$modulepart='medias';
         	$perm=($user->rights->website->write || $user->rights->emailing->creer);
         	$title='none';
-    	}
-    	else
+    	} else
     	{
     		$useinecm = 1;
     		$modulepart='ecm';
@@ -313,18 +380,28 @@ 
 
 // Bottom of page
 $useajax=1;
-if (! empty($conf->dol_use_jmobile)) $useajax=0;
-if (empty($conf->use_javascript_ajax)) $useajax=0;
-if (! empty($conf->global->MAIN_ECM_DISABLE_JS)) $useajax=0;
+if (! empty($conf->dol_use_jmobile)) {
+    $useajax=0;
+}
+if (empty($conf->use_javascript_ajax)) {
+    $useajax=0;
+}
+if (! empty($conf->global->MAIN_ECM_DISABLE_JS)) {
+    $useajax=0;
+}
 
 //$param.=($param?'?':'').(preg_replace('/^&/','',$param));
 
 if ($useajax || $action == 'delete')
 {
 	$urlfile='';
-	if ($action == 'delete') $urlfile=GETPOST('urlfile','alpha');
+	if ($action == 'delete') {
+	    $urlfile=GETPOST('urlfile','alpha');
+	}
 
-	if (empty($section_dir)) $section_dir=GETPOST("file","alpha");
+	if (empty($section_dir)) {
+	    $section_dir=GETPOST("file","alpha");
+	}
 	$section_id=$section;
 
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
@@ -334,9 +411,15 @@ 
 	$formquestion['section']=array('type'=>'hidden','value'=>$section,'name'=>'section');				// We must always put field, even if empty because it is fille by javascript later
 	$formquestion['section_id']=array('type'=>'hidden','value'=>$section_id,'name'=>'section_id');		// We must always put field, even if empty because it is fille by javascript later
 	$formquestion['section_dir']=array('type'=>'hidden','value'=>$section_dir,'name'=>'section_dir');	// We must always put field, even if empty because it is fille by javascript later
-	if (! empty($action) && $action == 'file_manager')	$formquestion['file_manager']=array('type'=>'hidden','value'=>1,'name'=>'file_manager');
-	if (! empty($websitekey))							$formquestion['website']=array('type'=>'hidden','value'=>$websitekey,'name'=>'website');
-	if (! empty($pageid) && $pageid > 0)				$formquestion['pageid']=array('type'=>'hidden','value'=>$pageid,'name'=>'pageid');
+	if (! empty($action) && $action == 'file_manager') {
+	    $formquestion['file_manager']=array('type'=>'hidden','value'=>1,'name'=>'file_manager');
+	}
+	if (! empty($websitekey)) {
+	    $formquestion['website']=array('type'=>'hidden','value'=>$websitekey,'name'=>'website');
+	}
+	if (! empty($pageid) && $pageid > 0) {
+	    $formquestion['pageid']=array('type'=>'hidden','value'=>$pageid,'name'=>'pageid');
+	}
 
 	print $form->formconfirm($url,$langs->trans("DeleteFile"),$langs->trans("ConfirmDeleteFile"),'confirm_deletefile',$formquestion,"no",($useajax?'deletefile':0));
 }
@@ -376,4 +459,6 @@ 
 }
 
 // Close db if mode is not noajax
-if ((! isset($mode) || $mode != 'noajax') && is_object($db)) $db->close();
+if ((! isset($mode) || $mode != 'noajax') && is_object($db)) {
+    $db->close();
+}

dolibarr/htdocs/core/ajax/constantonoff.php

Indentation +13 added lines, -13 removed lines

@@ -49,19 +49,19 @@
 // Registering the location of boxes
 if (! empty($action) && ! empty($name))
 {
-	$entity = GETPOST('entity','int');
-	$value = (GETPOST('value')?GETPOST('value'):1);
+    $entity = GETPOST('entity','int');
+    $value = (GETPOST('value')?GETPOST('value'):1);
 
-	if ($user->admin)
-	{
-		if ($action == 'set')
-		{
-			dolibarr_set_const($db, $name, $value, 'chaine', 0, '', $entity);
-		}
-		else if ($action == 'del')
-		{
-			dolibarr_del_const($db, $name, $entity);
-		}
-	}
+    if ($user->admin)
+    {
+        if ($action == 'set')
+        {
+            dolibarr_set_const($db, $name, $value, 'chaine', 0, '', $entity);
+        }
+        else if ($action == 'del')
+        {
+            dolibarr_del_const($db, $name, $entity);
+        }
+    }
 }
 

Braces +20 added lines, -8 removed lines

@@ -20,12 +20,25 @@ 
  *       \brief      File to set or del an on/off constant
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL','1');
+}
+// Disables token renewal
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+if (! defined('NOREQUIREHTML')) {
+    define('NOREQUIREHTML','1');
+}
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
+if (! defined('NOREQUIRESOC')) {
+    define('NOREQUIRESOC','1');
+}
+if (! defined('NOREQUIRETRAN')) {
+    define('NOREQUIRETRAN','1');
+}
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
@@ -60,8 +73,7 @@ 
 		if ($action == 'set')
 		{
 			dolibarr_set_const($db, $name, $value, 'chaine', 0, '', $entity);
-		}
-		else if ($action == 'del')
+		} else if ($action == 'del')
 		{
 			dolibarr_del_const($db, $name, $entity);
 		}

Spacing +12 added lines, -12 removed lines

@@ -20,21 +20,21 @@ 
  *       \brief      File to set or del an on/off constant
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
+if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
+if (!defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
-$action=GETPOST('action','alpha');
-$name=GETPOST('name','alpha');
+$action = GETPOST('action', 'alpha');
+$name = GETPOST('name', 'alpha');
 
 /*
  * View
@@ -50,10 +50,10 @@ 
 //print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Registering the location of boxes
-if (! empty($action) && ! empty($name))
+if (!empty($action) && !empty($name))
 {
-	$entity = GETPOST('entity','int');
-	$value = (GETPOST('value')?GETPOST('value'):1);
+	$entity = GETPOST('entity', 'int');
+	$value = (GETPOST('value') ?GETPOST('value') : 1);
 
 	if ($user->admin)
 	{

dolibarr/htdocs/core/ajax/ziptown.php

Indentation +57 added lines, -57 removed lines

@@ -53,31 +53,31 @@ 
 // Generation of list of zip-town
 if (! empty($_GET['zipcode']) || ! empty($_GET['town']))
 {
-	$return_arr = array();
-	$formcompany = new FormCompany($db);
-
-	// Define filter on text typed
-	$zipcode = $_GET['zipcode']?$_GET['zipcode']:'';
-	$town = $_GET['town']?$_GET['town']:'';
-
-	if (! empty($conf->global->MAIN_USE_ZIPTOWN_DICTIONNARY))   // Use zip-town table
-	{
-    	$sql = "SELECT z.rowid, z.zip, z.town, z.fk_county, z.fk_pays as fk_country";
-    	$sql.= ", c.rowid as fk_country, c.code as country_code, c.label as country";
-    	$sql.= ", d.rowid as fk_county, d.code_departement as county_code, d.nom as county";
-    	$sql.= " FROM ".MAIN_DB_PREFIX."c_ziptown as z";
-    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX ."c_departements as d ON z.fk_county = d.rowid";
-    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r ON d.fk_region = r.code_region,";
-    	$sql.= " ".MAIN_DB_PREFIX."c_country as c";
-    	$sql.= " WHERE z.fk_pays = c.rowid";
-    	$sql.= " AND z.active = 1 AND c.active = 1";
-    	if ($zipcode) $sql.=" AND z.zip LIKE '" . $db->escape($zipcode) . "%'";
-    	if ($town)    $sql.=" AND z.town LIKE '%" . $db->escape($town) . "%'";
-    	$sql.= " ORDER BY z.zip, z.town";
+    $return_arr = array();
+    $formcompany = new FormCompany($db);
+
+    // Define filter on text typed
+    $zipcode = $_GET['zipcode']?$_GET['zipcode']:'';
+    $town = $_GET['town']?$_GET['town']:'';
+
+    if (! empty($conf->global->MAIN_USE_ZIPTOWN_DICTIONNARY))   // Use zip-town table
+    {
+        $sql = "SELECT z.rowid, z.zip, z.town, z.fk_county, z.fk_pays as fk_country";
+        $sql.= ", c.rowid as fk_country, c.code as country_code, c.label as country";
+        $sql.= ", d.rowid as fk_county, d.code_departement as county_code, d.nom as county";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_ziptown as z";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX ."c_departements as d ON z.fk_county = d.rowid";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r ON d.fk_region = r.code_region,";
+        $sql.= " ".MAIN_DB_PREFIX."c_country as c";
+        $sql.= " WHERE z.fk_pays = c.rowid";
+        $sql.= " AND z.active = 1 AND c.active = 1";
+        if ($zipcode) $sql.=" AND z.zip LIKE '" . $db->escape($zipcode) . "%'";
+        if ($town)    $sql.=" AND z.town LIKE '%" . $db->escape($town) . "%'";
+        $sql.= " ORDER BY z.zip, z.town";
         $sql.= $db->plimit(100); // Avoid pb with bad criteria
-	}
-	else                                               // Use table of third parties
-	{
+    }
+    else                                               // Use table of third parties
+    {
         $sql = "SELECT DISTINCT s.zip, s.town, s.fk_departement as fk_county, s.fk_pays as fk_country";
         $sql.= ", c.code as country_code, c.label as country";
         $sql.= ", d.code_departement as county_code , d.nom as county";
@@ -89,45 +89,45 @@ 
         if ($town)    $sql.= " s.town LIKE '%" . $db->escape($town) . "%'";
         $sql.= " ORDER BY s.fk_pays, s.zip, s.town";
         $sql.= $db->plimit(100); // Avoid pb with bad criteria
-	}
+    }
 
     //print $sql;
-	$resql=$db->query($sql);
-	//var_dump($db);
-	if ($resql)
-	{
-		while ($row = $db->fetch_array($resql))
-		{
-			$country = $row['fk_country']?($langs->transnoentitiesnoconv('Country'.$row['country_code'])!='Country'.$row['country_code']?$langs->transnoentitiesnoconv('Country'.$row['country_code']):$row['country']):'';
-			$county = $row['fk_county']?($langs->transnoentitiesnoconv($row['county_code'])!=$row['county_code']?$langs->transnoentitiesnoconv($row['county_code']):($row['county']!='-'?$row['county']:'')):'';
-
-			$row_array['label'] = $row['zip'].' '.$row['town'];
-			$row_array['label'] .= ($county || $country)?' (':'';
+    $resql=$db->query($sql);
+    //var_dump($db);
+    if ($resql)
+    {
+        while ($row = $db->fetch_array($resql))
+        {
+            $country = $row['fk_country']?($langs->transnoentitiesnoconv('Country'.$row['country_code'])!='Country'.$row['country_code']?$langs->transnoentitiesnoconv('Country'.$row['country_code']):$row['country']):'';
+            $county = $row['fk_county']?($langs->transnoentitiesnoconv($row['county_code'])!=$row['county_code']?$langs->transnoentitiesnoconv($row['county_code']):($row['county']!='-'?$row['county']:'')):'';
+
+            $row_array['label'] = $row['zip'].' '.$row['town'];
+            $row_array['label'] .= ($county || $country)?' (':'';
             $row_array['label'] .= $county;
-			$row_array['label'] .= ($county && $country?' - ':'');
+            $row_array['label'] .= ($county && $country?' - ':'');
             $row_array['label'] .= $country;
             $row_array['label'] .= ($county || $country)?')':'';
             if ($zipcode)
-			{
-				$row_array['value'] = $row['zip'];
-				$row_array['town'] = $row['town'];
-			}
-			if ($town)
-			{
-				$row_array['value'] = $row['town'];
-				$row_array['zipcode'] = $row['zip'];
-			}
-			$row_array['selectcountry_id'] = $row['fk_country'];
-			$row_array['state_id'] = $row['fk_county'];
-
-			// TODO Use a cache here to avoid to make select_state in each pass (this make a SQL and lot of logs)
-			$row_array['states'] = $formcompany->select_state('',$row['fk_country'],'');
-
-			array_push($return_arr,$row_array);
-		}
-	}
-
-	echo json_encode($return_arr);
+            {
+                $row_array['value'] = $row['zip'];
+                $row_array['town'] = $row['town'];
+            }
+            if ($town)
+            {
+                $row_array['value'] = $row['town'];
+                $row_array['zipcode'] = $row['zip'];
+            }
+            $row_array['selectcountry_id'] = $row['fk_country'];
+            $row_array['state_id'] = $row['fk_county'];
+
+            // TODO Use a cache here to avoid to make select_state in each pass (this make a SQL and lot of logs)
+            $row_array['states'] = $formcompany->select_state('',$row['fk_country'],'');
+
+            array_push($return_arr,$row_array);
+        }
+    }
+
+    echo json_encode($return_arr);
 }
 else
 {

Braces +36 added lines, -15 removed lines

@@ -22,12 +22,25 @@ 
  *       \brief     File to return Ajax response on zipcode or town request
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL',1);
+}
+// Disables token renewal
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+if (! defined('NOREQUIREHTML')) {
+    define('NOREQUIREHTML','1');
+}
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
+if (! defined('NOREQUIRESOC')) {
+    define('NOREQUIRESOC','1');
+}
+if (! defined('NOCSRFCHECK')) {
+    define('NOCSRFCHECK','1');
+}
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
@@ -63,9 +76,11 @@ 
 	$zipcode = $_GET['zipcode']?$_GET['zipcode']:'';
 	$town = $_GET['town']?$_GET['town']:'';
 
-	if (! empty($conf->global->MAIN_USE_ZIPTOWN_DICTIONNARY))   // Use zip-town table
+	if (! empty($conf->global->MAIN_USE_ZIPTOWN_DICTIONNARY)) {
+	    // Use zip-town table
 	{
     	$sql = "SELECT z.rowid, z.zip, z.town, z.fk_county, z.fk_pays as fk_country";
+	}
     	$sql.= ", c.rowid as fk_country, c.code as country_code, c.label as country";
     	$sql.= ", d.rowid as fk_county, d.code_departement as county_code, d.nom as county";
     	$sql.= " FROM ".MAIN_DB_PREFIX."c_ziptown as z";
@@ -74,12 +89,15 @@ 
     	$sql.= " ".MAIN_DB_PREFIX."c_country as c";
     	$sql.= " WHERE z.fk_pays = c.rowid";
     	$sql.= " AND z.active = 1 AND c.active = 1";
-    	if ($zipcode) $sql.=" AND z.zip LIKE '" . $db->escape($zipcode) . "%'";
-    	if ($town)    $sql.=" AND z.town LIKE '%" . $db->escape($town) . "%'";
+    	if ($zipcode) {
+    	    $sql.=" AND z.zip LIKE '" . $db->escape($zipcode) . "%'";
+    	}
+    	if ($town) {
+    	    $sql.=" AND z.town LIKE '%" . $db->escape($town) . "%'";
+    	}
     	$sql.= " ORDER BY z.zip, z.town";
         $sql.= $db->plimit(100); // Avoid pb with bad criteria
-	}
-	else                                               // Use table of third parties
+	} else                                               // Use table of third parties
 	{
         $sql = "SELECT DISTINCT s.zip, s.town, s.fk_departement as fk_county, s.fk_pays as fk_country";
         $sql.= ", c.code as country_code, c.label as country";
@@ -88,8 +106,12 @@ 
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX ."c_departements as d ON s.fk_departement = d.rowid";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid';
         $sql.= " WHERE";
-        if ($zipcode) $sql.= " s.zip LIKE '".$db->escape($zipcode)."%'";
-        if ($town)    $sql.= " s.town LIKE '%" . $db->escape($town) . "%'";
+        if ($zipcode) {
+            $sql.= " s.zip LIKE '".$db->escape($zipcode)."%'";
+        }
+        if ($town) {
+            $sql.= " s.town LIKE '%" . $db->escape($town) . "%'";
+        }
         $sql.= " ORDER BY s.fk_pays, s.zip, s.town";
         $sql.= $db->plimit(100); // Avoid pb with bad criteria
 	}
@@ -131,8 +153,7 @@ 
 	}
 
 	echo json_encode($return_arr);
-}
-else
+} else
 {
 
 }

Spacing +42 added lines, -42 removed lines

@@ -22,17 +22,17 @@ 
  *       \brief     File to return Ajax response on zipcode or town request
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); // Disables token renewal
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
+if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
+if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 
 
@@ -50,66 +50,66 @@ 
 
 //print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
-dol_syslog("GET is ".join(',',$_GET).', MAIN_USE_ZIPTOWN_DICTIONNARY='.(empty($conf->global->MAIN_USE_ZIPTOWN_DICTIONNARY)?'':$conf->global->MAIN_USE_ZIPTOWN_DICTIONNARY));
+dol_syslog("GET is ".join(',', $_GET).', MAIN_USE_ZIPTOWN_DICTIONNARY='.(empty($conf->global->MAIN_USE_ZIPTOWN_DICTIONNARY) ? '' : $conf->global->MAIN_USE_ZIPTOWN_DICTIONNARY));
 //var_dump($_GET);
 
 // Generation of list of zip-town
-if (! empty($_GET['zipcode']) || ! empty($_GET['town']))
+if (!empty($_GET['zipcode']) || !empty($_GET['town']))
 {
 	$return_arr = array();
 	$formcompany = new FormCompany($db);
 
 	// Define filter on text typed
-	$zipcode = $_GET['zipcode']?$_GET['zipcode']:'';
-	$town = $_GET['town']?$_GET['town']:'';
+	$zipcode = $_GET['zipcode'] ? $_GET['zipcode'] : '';
+	$town = $_GET['town'] ? $_GET['town'] : '';
 
-	if (! empty($conf->global->MAIN_USE_ZIPTOWN_DICTIONNARY))   // Use zip-town table
+	if (!empty($conf->global->MAIN_USE_ZIPTOWN_DICTIONNARY))   // Use zip-town table
 	{
     	$sql = "SELECT z.rowid, z.zip, z.town, z.fk_county, z.fk_pays as fk_country";
-    	$sql.= ", c.rowid as fk_country, c.code as country_code, c.label as country";
-    	$sql.= ", d.rowid as fk_county, d.code_departement as county_code, d.nom as county";
-    	$sql.= " FROM ".MAIN_DB_PREFIX."c_ziptown as z";
-    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX ."c_departements as d ON z.fk_county = d.rowid";
-    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r ON d.fk_region = r.code_region,";
-    	$sql.= " ".MAIN_DB_PREFIX."c_country as c";
-    	$sql.= " WHERE z.fk_pays = c.rowid";
-    	$sql.= " AND z.active = 1 AND c.active = 1";
-    	if ($zipcode) $sql.=" AND z.zip LIKE '" . $db->escape($zipcode) . "%'";
-    	if ($town)    $sql.=" AND z.town LIKE '%" . $db->escape($town) . "%'";
-    	$sql.= " ORDER BY z.zip, z.town";
-        $sql.= $db->plimit(100); // Avoid pb with bad criteria
+    	$sql .= ", c.rowid as fk_country, c.code as country_code, c.label as country";
+    	$sql .= ", d.rowid as fk_county, d.code_departement as county_code, d.nom as county";
+    	$sql .= " FROM ".MAIN_DB_PREFIX."c_ziptown as z";
+    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d ON z.fk_county = d.rowid";
+    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r ON d.fk_region = r.code_region,";
+    	$sql .= " ".MAIN_DB_PREFIX."c_country as c";
+    	$sql .= " WHERE z.fk_pays = c.rowid";
+    	$sql .= " AND z.active = 1 AND c.active = 1";
+    	if ($zipcode) $sql .= " AND z.zip LIKE '".$db->escape($zipcode)."%'";
+    	if ($town)    $sql .= " AND z.town LIKE '%".$db->escape($town)."%'";
+    	$sql .= " ORDER BY z.zip, z.town";
+        $sql .= $db->plimit(100); // Avoid pb with bad criteria
 	}
 	else                                               // Use table of third parties
 	{
         $sql = "SELECT DISTINCT s.zip, s.town, s.fk_departement as fk_county, s.fk_pays as fk_country";
-        $sql.= ", c.code as country_code, c.label as country";
-        $sql.= ", d.code_departement as county_code , d.nom as county";
-        $sql.= " FROM ".MAIN_DB_PREFIX.'societe as s';
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX ."c_departements as d ON s.fk_departement = d.rowid";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid';
-        $sql.= " WHERE";
-        if ($zipcode) $sql.= " s.zip LIKE '".$db->escape($zipcode)."%'";
-        if ($town)    $sql.= " s.town LIKE '%" . $db->escape($town) . "%'";
-        $sql.= " ORDER BY s.fk_pays, s.zip, s.town";
-        $sql.= $db->plimit(100); // Avoid pb with bad criteria
+        $sql .= ", c.code as country_code, c.label as country";
+        $sql .= ", d.code_departement as county_code , d.nom as county";
+        $sql .= " FROM ".MAIN_DB_PREFIX.'societe as s';
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d ON s.fk_departement = d.rowid";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid';
+        $sql .= " WHERE";
+        if ($zipcode) $sql .= " s.zip LIKE '".$db->escape($zipcode)."%'";
+        if ($town)    $sql .= " s.town LIKE '%".$db->escape($town)."%'";
+        $sql .= " ORDER BY s.fk_pays, s.zip, s.town";
+        $sql .= $db->plimit(100); // Avoid pb with bad criteria
 	}
 
     //print $sql;
-	$resql=$db->query($sql);
+	$resql = $db->query($sql);
 	//var_dump($db);
 	if ($resql)
 	{
 		while ($row = $db->fetch_array($resql))
 		{
-			$country = $row['fk_country']?($langs->transnoentitiesnoconv('Country'.$row['country_code'])!='Country'.$row['country_code']?$langs->transnoentitiesnoconv('Country'.$row['country_code']):$row['country']):'';
-			$county = $row['fk_county']?($langs->transnoentitiesnoconv($row['county_code'])!=$row['county_code']?$langs->transnoentitiesnoconv($row['county_code']):($row['county']!='-'?$row['county']:'')):'';
+			$country = $row['fk_country'] ? ($langs->transnoentitiesnoconv('Country'.$row['country_code']) != 'Country'.$row['country_code'] ? $langs->transnoentitiesnoconv('Country'.$row['country_code']) : $row['country']) : '';
+			$county = $row['fk_county'] ? ($langs->transnoentitiesnoconv($row['county_code']) != $row['county_code'] ? $langs->transnoentitiesnoconv($row['county_code']) : ($row['county'] != '-' ? $row['county'] : '')) : '';
 
 			$row_array['label'] = $row['zip'].' '.$row['town'];
-			$row_array['label'] .= ($county || $country)?' (':'';
+			$row_array['label'] .= ($county || $country) ? ' (' : '';
             $row_array['label'] .= $county;
-			$row_array['label'] .= ($county && $country?' - ':'');
+			$row_array['label'] .= ($county && $country ? ' - ' : '');
             $row_array['label'] .= $country;
-            $row_array['label'] .= ($county || $country)?')':'';
+            $row_array['label'] .= ($county || $country) ? ')' : '';
             if ($zipcode)
 			{
 				$row_array['value'] = $row['zip'];
@@ -124,9 +124,9 @@ 
 			$row_array['state_id'] = $row['fk_county'];
 
 			// TODO Use a cache here to avoid to make select_state in each pass (this make a SQL and lot of logs)
-			$row_array['states'] = $formcompany->select_state('',$row['fk_country'],'');
+			$row_array['states'] = $formcompany->select_state('', $row['fk_country'], '');
 
-			array_push($return_arr,$row_array);
+			array_push($return_arr, $row_array);
 		}
 	}
 

dolibarr/htdocs/core/ajax/row.php

Indentation +23 added lines, -23 removed lines

@@ -43,34 +43,34 @@
 
 // Registering the location of boxes
 if ((! empty($_POST['roworder'])) && (! empty($_POST['table_element_line']))
-	&& (! empty($_POST['fk_element'])) && (! empty($_POST['element_id'])))
+    && (! empty($_POST['fk_element'])) && (! empty($_POST['element_id'])))
 {
-	$roworder=GETPOST('roworder','alpha',2);
-	$table_element_line=GETPOST('table_element_line','alpha',2);
-	$fk_element=GETPOST('fk_element','alpha',2);
-	$element_id=GETPOST('element_id','int',2);
+    $roworder=GETPOST('roworder','alpha',2);
+    $table_element_line=GETPOST('table_element_line','alpha',2);
+    $fk_element=GETPOST('fk_element','alpha',2);
+    $element_id=GETPOST('element_id','int',2);
 
-	dol_syslog("AjaxRow roworder=".$roworder." table_element_line=".$table_element_line." fk_element=".$fk_element." element_id=".$element_id, LOG_DEBUG);
+    dol_syslog("AjaxRow roworder=".$roworder." table_element_line=".$table_element_line." fk_element=".$fk_element." element_id=".$element_id, LOG_DEBUG);
 
-	$rowordertab = explode(',',$roworder);
-	$newrowordertab = array();
-	foreach($rowordertab as $value)
-	{
-		if (! empty($value)) $newrowordertab[] = $value;
-	}
+    $rowordertab = explode(',',$roworder);
+    $newrowordertab = array();
+    foreach($rowordertab as $value)
+    {
+        if (! empty($value)) $newrowordertab[] = $value;
+    }
 
-	$row=new GenericObject($db);
-	$row->table_element_line = $table_element_line;
-	$row->fk_element = $fk_element;
-	$row->id = $element_id;
+    $row=new GenericObject($db);
+    $row->table_element_line = $table_element_line;
+    $row->fk_element = $fk_element;
+    $row->id = $element_id;
 
-	$row->line_ajaxorder($newrowordertab);		// This update field rank or position in table row->table_element_line
+    $row->line_ajaxorder($newrowordertab);		// This update field rank or position in table row->table_element_line
 
-	// Reorder line to have position of children lines sharing same counter than parent lines
-	// This should be useless because there is no need to have children sharing same counter than parent, but well, it's cleaner into database.
-	if (in_array($fk_element,array('fk_facture','fk_propal','fk_commande')))
-	{
-		$result=$row->line_order(true);
-	}
+    // Reorder line to have position of children lines sharing same counter than parent lines
+    // This should be useless because there is no need to have children sharing same counter than parent, but well, it's cleaner into database.
+    if (in_array($fk_element,array('fk_facture','fk_propal','fk_commande')))
+    {
+        $result=$row->line_order(true);
+    }
 }
 

Braces +22 added lines, -7 removed lines

@@ -22,12 +22,25 @@ 
  *                   This ajax page is called when doing an up or down drag and drop.
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disable token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL','1');
+}
+// Disable token renewal
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+if (! defined('NOREQUIREHTML')) {
+    define('NOREQUIREHTML','1');
+}
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
+if (! defined('NOREQUIRESOC')) {
+    define('NOREQUIRESOC','1');
+}
+if (! defined('NOREQUIRETRAN')) {
+    define('NOREQUIRETRAN','1');
+}
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
@@ -59,7 +72,9 @@ 
 	$newrowordertab = array();
 	foreach($rowordertab as $value)
 	{
-		if (! empty($value)) $newrowordertab[] = $value;
+		if (! empty($value)) {
+		    $newrowordertab[] = $value;
+		}
 	}
 
 	$row=new GenericObject($db);

Spacing +20 added lines, -20 removed lines

@@ -22,17 +22,17 @@ 
  *                   This ajax page is called when doing an up or down drag and drop.
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disable token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disable token renewal
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
+if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
+if (!defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
 
 
@@ -45,35 +45,35 @@ 
 print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Registering the location of boxes
-if ((! empty($_POST['roworder'])) && (! empty($_POST['table_element_line']))
-	&& (! empty($_POST['fk_element'])) && (! empty($_POST['element_id'])))
+if ((!empty($_POST['roworder'])) && (!empty($_POST['table_element_line']))
+	&& (!empty($_POST['fk_element'])) && (!empty($_POST['element_id'])))
 {
-	$roworder=GETPOST('roworder','alpha',2);
-	$table_element_line=GETPOST('table_element_line','alpha',2);
-	$fk_element=GETPOST('fk_element','alpha',2);
-	$element_id=GETPOST('element_id','int',2);
+	$roworder = GETPOST('roworder', 'alpha', 2);
+	$table_element_line = GETPOST('table_element_line', 'alpha', 2);
+	$fk_element = GETPOST('fk_element', 'alpha', 2);
+	$element_id = GETPOST('element_id', 'int', 2);
 
 	dol_syslog("AjaxRow roworder=".$roworder." table_element_line=".$table_element_line." fk_element=".$fk_element." element_id=".$element_id, LOG_DEBUG);
 
-	$rowordertab = explode(',',$roworder);
+	$rowordertab = explode(',', $roworder);
 	$newrowordertab = array();
-	foreach($rowordertab as $value)
+	foreach ($rowordertab as $value)
 	{
-		if (! empty($value)) $newrowordertab[] = $value;
+		if (!empty($value)) $newrowordertab[] = $value;
 	}
 
-	$row=new GenericObject($db);
+	$row = new GenericObject($db);
 	$row->table_element_line = $table_element_line;
 	$row->fk_element = $fk_element;
 	$row->id = $element_id;
 
-	$row->line_ajaxorder($newrowordertab);		// This update field rank or position in table row->table_element_line
+	$row->line_ajaxorder($newrowordertab); // This update field rank or position in table row->table_element_line
 
 	// Reorder line to have position of children lines sharing same counter than parent lines
 	// This should be useless because there is no need to have children sharing same counter than parent, but well, it's cleaner into database.
-	if (in_array($fk_element,array('fk_facture','fk_propal','fk_commande')))
+	if (in_array($fk_element, array('fk_facture', 'fk_propal', 'fk_commande')))
 	{
-		$result=$row->line_order(true);
+		$result = $row->line_order(true);
 	}
 }
 

dolibarr/htdocs/core/ajax/security.php

Indentation +5 added lines, -5 removed lines

@@ -42,11 +42,11 @@
 // Registering the location of boxes
 if (isset($_GET['action']) && ! empty($_GET['action']))
 {
-	if ($_GET['action'] == 'getrandompassword' && $user->admin)
-	{
+    if ($_GET['action'] == 'getrandompassword' && $user->admin)
+    {
         require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-	    $generic = $_GET['generic'] ? true : false;
-		echo getRandomPassword($generic);
-	}
+        $generic = $_GET['generic'] ? true : false;
+        echo getRandomPassword($generic);
+    }
 }
 

Braces +19 added lines, -6 removed lines

@@ -21,12 +21,25 @@
  *                   like key to use into URL to protect them.
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL','1');
+}
+// Disables token renewal
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+if (! defined('NOREQUIREHTML')) {
+    define('NOREQUIREHTML','1');
+}
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
+if (! defined('NOREQUIRESOC')) {
+    define('NOREQUIRESOC','1');
+}
+if (! defined('NOREQUIRETRAN')) {
+    define('NOREQUIRETRAN','1');
+}
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>

Spacing +8 added lines, -8 removed lines

@@ -21,17 +21,17 @@ 
  *                   like key to use into URL to protect them.
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
+if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
+if (!defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
 /*
  * View
@@ -43,7 +43,7 @@ 
 //print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Registering the location of boxes
-if (isset($_GET['action']) && ! empty($_GET['action']))
+if (isset($_GET['action']) && !empty($_GET['action']))
 {
 	if ($_GET['action'] == 'getrandompassword' && $user->admin)
 	{

dolibarr/htdocs/core/ajax/selectsearchbox.php

Indentation +24 added lines, -24 removed lines

@@ -35,11 +35,11 @@ 
     $res=@include '../../main.inc.php';
     if ($res == 'ERROR_NOT_LOGGED')
     {
-    	$langs->load("other");
-    	$arrayresult['jumptologin']=array('img'=>'object_generic', 'label'=>$langs->trans("JumpToLogin"), 'text'=>'<span class="fa fa-sign-in"></span> '.$langs->trans("JumpToLogin"), 'url'=>DOL_URL_ROOT.'/index.php');
-    	print json_encode($arrayresult);
-    	if (is_object($db)) $db->close();
-    	exit;
+        $langs->load("other");
+        $arrayresult['jumptologin']=array('img'=>'object_generic', 'label'=>$langs->trans("JumpToLogin"), 'text'=>'<span class="fa fa-sign-in"></span> '.$langs->trans("JumpToLogin"), 'url'=>DOL_URL_ROOT.'/index.php');
+        print json_encode($arrayresult);
+        if (is_object($db)) $db->close();
+        exit;
     }
 }
 
@@ -56,85 +56,85 @@ 
 
 if (! empty($conf->adherent->enabled) && empty($conf->global->MAIN_SEARCHFORM_ADHERENT_DISABLED) && $user->rights->adherent->lire)
 {
-	$arrayresult['searchintomember']=array('position'=>8, 'shortcut'=>'M', 'img'=>'object_user', 'label'=>$langs->trans("SearchIntoMembers", $search_boxvalue), 'text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoMembers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/adherents/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintomember']=array('position'=>8, 'shortcut'=>'M', 'img'=>'object_user', 'label'=>$langs->trans("SearchIntoMembers", $search_boxvalue), 'text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoMembers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/adherents/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 
 if ((( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)) && empty($conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED) && $user->rights->societe->lire)
 {
-	$arrayresult['searchintothirdparty']=array('position'=>10, 'shortcut'=>'T', 'img'=>'object_company', 'label'=>$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'text'=>img_picto('','object_company').' '.$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/societe/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintothirdparty']=array('position'=>10, 'shortcut'=>'T', 'img'=>'object_company', 'label'=>$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'text'=>img_picto('','object_company').' '.$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/societe/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 
 if (! empty($conf->societe->enabled) && empty($conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED) && $user->rights->societe->lire)
 {
-	$arrayresult['searchintocontact']=array('position'=>15, 'shortcut'=>'A', 'img'=>'object_contact', 'label'=>$langs->trans("SearchIntoContacts", $search_boxvalue), 'text'=>img_picto('','object_contact').' '.$langs->trans("SearchIntoContacts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contact/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintocontact']=array('position'=>15, 'shortcut'=>'A', 'img'=>'object_contact', 'label'=>$langs->trans("SearchIntoContacts", $search_boxvalue), 'text'=>img_picto('','object_contact').' '.$langs->trans("SearchIntoContacts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contact/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 
 if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! empty($conf->service->enabled) && $user->rights->service->lire))
 && empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE_DISABLED))
 {
-	$arrayresult['searchintoproduct']=array('position'=>30, 'shortcut'=>'P', 'img'=>'object_product', 'label'=>$langs->trans("SearchIntoProductsOrServices", $search_boxvalue),'text'=>img_picto('','object_product').' '.$langs->trans("SearchIntoProductsOrServices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/product/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintoproduct']=array('position'=>30, 'shortcut'=>'P', 'img'=>'object_product', 'label'=>$langs->trans("SearchIntoProductsOrServices", $search_boxvalue),'text'=>img_picto('','object_product').' '.$langs->trans("SearchIntoProductsOrServices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/product/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 
 if (! empty($conf->projet->enabled) && empty($conf->global->MAIN_SEARCHFORM_PROJECT_DISABLED) && $user->rights->projet->lire)
 {
-	$arrayresult['searchintoprojects']=array('position'=>40, 'shortcut'=>'Q', 'img'=>'object_projectpub', 'label'=>$langs->trans("SearchIntoProjects", $search_boxvalue), 'text'=>img_picto('','object_projectpub').' '.$langs->trans("SearchIntoProjects", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/list.php'.($search_boxvalue?'?search_all='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintoprojects']=array('position'=>40, 'shortcut'=>'Q', 'img'=>'object_projectpub', 'label'=>$langs->trans("SearchIntoProjects", $search_boxvalue), 'text'=>img_picto('','object_projectpub').' '.$langs->trans("SearchIntoProjects", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/list.php'.($search_boxvalue?'?search_all='.urlencode($search_boxvalue):''));
 }
 if (! empty($conf->projet->enabled) && empty($conf->global->MAIN_SEARCHFORM_TASK_DISABLED) && $user->rights->projet->lire)
 {
-	$arrayresult['searchintotasks']=array('position'=>45, 'img'=>'object_task', 'label'=>$langs->trans("SearchIntoTasks", $search_boxvalue), 'text'=>img_picto('','object_task').' '.$langs->trans("SearchIntoTasks", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/tasks/list.php'.($search_boxvalue?'?search_all='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintotasks']=array('position'=>45, 'img'=>'object_task', 'label'=>$langs->trans("SearchIntoTasks", $search_boxvalue), 'text'=>img_picto('','object_task').' '.$langs->trans("SearchIntoTasks", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/tasks/list.php'.($search_boxvalue?'?search_all='.urlencode($search_boxvalue):''));
 }
 
 if (! empty($conf->propal->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_PROPAL_DISABLED) && $user->rights->propal->lire)
 {
-	$arrayresult['searchintopropal']=array('position'=>60, 'img'=>'object_propal', 'label'=>$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'text'=>img_picto('','object_propal').' '.$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/comm/propal/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintopropal']=array('position'=>60, 'img'=>'object_propal', 'label'=>$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'text'=>img_picto('','object_propal').' '.$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/comm/propal/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 if (! empty($conf->commande->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_ORDER_DISABLED) && $user->rights->commande->lire)
 {
-	$arrayresult['searchintoorder']=array('position'=>70, 'img'=>'object_order', 'label'=>$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'text'=>img_picto('','object_order').' '.$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/commande/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintoorder']=array('position'=>70, 'img'=>'object_order', 'label'=>$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'text'=>img_picto('','object_order').' '.$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/commande/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 if (! empty($conf->expedition->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_SHIPMENT_DISABLED) && $user->rights->expedition->lire)
 {
-	$arrayresult['searchintoshipment']=array('position'=>80, 'img'=>'object_sending', 'label'=>$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'text'=>img_picto('','object_sending').' '.$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expedition/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintoshipment']=array('position'=>80, 'img'=>'object_sending', 'label'=>$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'text'=>img_picto('','object_sending').' '.$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expedition/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 if (! empty($conf->facture->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_INVOICE_DISABLED) && $user->rights->facture->lire)
 {
-	$arrayresult['searchintoinvoice']=array('position'=>90, 'img'=>'object_bill', 'label'=>$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'text'=>img_picto('','object_bill').' '.$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/compta/facture/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintoinvoice']=array('position'=>90, 'img'=>'object_bill', 'label'=>$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'text'=>img_picto('','object_bill').' '.$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/compta/facture/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 
 if (! empty($conf->supplier_proposal->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_PROPAL_DISABLED) && $user->rights->supplier_proposal->lire)
 {
-	$arrayresult['searchintosupplierpropal']=array('position'=>100, 'img'=>'object_propal', 'label'=>$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'text'=>img_picto('','object_propal').' '.$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/supplier_proposal/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintosupplierpropal']=array('position'=>100, 'img'=>'object_propal', 'label'=>$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'text'=>img_picto('','object_propal').' '.$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/supplier_proposal/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 if (! empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_ORDER_DISABLED) && $user->rights->fournisseur->commande->lire)
 {
-	$arrayresult['searchintosupplierorder']=array('position'=>110, 'img'=>'object_order', 'label'=>$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'text'=>img_picto('','object_order').' '.$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/commande/list.php'.($search_boxvalue?'?search_all='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintosupplierorder']=array('position'=>110, 'img'=>'object_order', 'label'=>$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'text'=>img_picto('','object_order').' '.$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/commande/list.php'.($search_boxvalue?'?search_all='.urlencode($search_boxvalue):''));
 }
 if (! empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED) && $user->rights->fournisseur->facture->lire)
 {
-	$arrayresult['searchintosupplierinvoice']=array('position'=>120, 'img'=>'object_bill', 'label'=>$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'text'=>img_picto('','object_bill').' '.$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/facture/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintosupplierinvoice']=array('position'=>120, 'img'=>'object_bill', 'label'=>$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'text'=>img_picto('','object_bill').' '.$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/facture/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 
 if (! empty($conf->contrat->enabled) && empty($conf->global->MAIN_SEARCHFORM_CONTRACT_DISABLED) && $user->rights->contrat->lire)
 {
-	$arrayresult['searchintocontract']=array('position'=>130, 'img'=>'object_contract', 'label'=>$langs->trans("SearchIntoContracts", $search_boxvalue), 'text'=>img_picto('','object_contract').' '.$langs->trans("SearchIntoContracts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contrat/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintocontract']=array('position'=>130, 'img'=>'object_contract', 'label'=>$langs->trans("SearchIntoContracts", $search_boxvalue), 'text'=>img_picto('','object_contract').' '.$langs->trans("SearchIntoContracts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contrat/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 if (! empty($conf->ficheinter->enabled) && empty($conf->global->MAIN_SEARCHFORM_FICHINTER_DISABLED) && $user->rights->ficheinter->lire)
 {
-	$arrayresult['searchintointervention']=array('position'=>140, 'img'=>'object_intervention', 'label'=>$langs->trans("SearchIntoInterventions", $search_boxvalue), 'text'=>img_picto('','object_intervention').' '.$langs->trans("SearchIntoInterventions", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fichinter/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintointervention']=array('position'=>140, 'img'=>'object_intervention', 'label'=>$langs->trans("SearchIntoInterventions", $search_boxvalue), 'text'=>img_picto('','object_intervention').' '.$langs->trans("SearchIntoInterventions", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fichinter/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 
 // HR
 if (! empty($conf->user->enabled) && empty($conf->global->MAIN_SEARCHFORM_USER_DISABLED) && $user->rights->user->user->lire)
 {
-	$arrayresult['searchintouser']=array('position'=>200, 'shortcut'=>'U', 'img'=>'object_user', 'label'=>$langs->trans("SearchIntoUsers", $search_boxvalue), 'text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoUsers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/user/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintouser']=array('position'=>200, 'shortcut'=>'U', 'img'=>'object_user', 'label'=>$langs->trans("SearchIntoUsers", $search_boxvalue), 'text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoUsers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/user/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 if (! empty($conf->expensereport->enabled) && empty($conf->global->MAIN_SEARCHFORM_EXPENSEREPORT_DISABLED) && $user->rights->expensereport->lire)
 {
-	$arrayresult['searchintoexpensereport']=array('position'=>210, 'img'=>'object_trip', 'label'=>$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'text'=>img_picto('','object_trip').' '.$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm'.($search_boxvalue?'&sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintoexpensereport']=array('position'=>210, 'img'=>'object_trip', 'label'=>$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'text'=>img_picto('','object_trip').' '.$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm'.($search_boxvalue?'&sall='.urlencode($search_boxvalue):''));
 }
 if (! empty($conf->holiday->enabled) && empty($conf->global->MAIN_SEARCHFORM_HOLIDAY_DISABLED) && $user->rights->holiday->read)
 {
-	$arrayresult['searchintoleaves']=array('position'=>220, 'img'=>'object_holiday', 'label'=>$langs->trans("SearchIntoLeaves", $search_boxvalue), 'text'=>img_picto('','object_holiday').' '.$langs->trans("SearchIntoLeaves", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/holiday/list.php?mainmenu=hrm'.($search_boxvalue?'&sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintoleaves']=array('position'=>220, 'img'=>'object_holiday', 'label'=>$langs->trans("SearchIntoLeaves", $search_boxvalue), 'text'=>img_picto('','object_holiday').' '.$langs->trans("SearchIntoLeaves", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/holiday/list.php?mainmenu=hrm'.($search_boxvalue?'&sall='.urlencode($search_boxvalue):''));
 }
 
 
@@ -151,7 +151,7 @@ 
 $reshook=$hookmanager->executeHooks('addSearchEntry',$parameters);
 if (empty($reshook))
 {
-	$arrayresult=array_merge($arrayresult, $hookmanager->resArray);
+    $arrayresult=array_merge($arrayresult, $hookmanager->resArray);
 }
 else $arrayresult=$hookmanager->resArray;
 

Spacing +53 added lines, -53 removed lines

@@ -24,19 +24,19 @@ 
 
 // This script is called with a POST method or as an include.
 
-if (! isset($usedbyinclude) || empty($usedbyinclude))
+if (!isset($usedbyinclude) || empty($usedbyinclude))
 {
-    if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
-    if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-    if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-    if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-    if (! defined('NOREDIRECTBYMAINTOLOGIN')) define('NOREDIRECTBYMAINTOLOGIN','1');
+    if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); // Disables token renewal
+    if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
+    if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
+    if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+    if (!defined('NOREDIRECTBYMAINTOLOGIN')) define('NOREDIRECTBYMAINTOLOGIN', '1');
 
-    $res=@include '../../main.inc.php';
+    $res = @include '../../main.inc.php';
     if ($res == 'ERROR_NOT_LOGGED')
     {
     	$langs->load("other");
-    	$arrayresult['jumptologin']=array('img'=>'object_generic', 'label'=>$langs->trans("JumpToLogin"), 'text'=>'<span class="fa fa-sign-in"></span> '.$langs->trans("JumpToLogin"), 'url'=>DOL_URL_ROOT.'/index.php');
+    	$arrayresult['jumptologin'] = array('img'=>'object_generic', 'label'=>$langs->trans("JumpToLogin"), 'text'=>'<span class="fa fa-sign-in"></span> '.$langs->trans("JumpToLogin"), 'url'=>DOL_URL_ROOT.'/index.php');
     	print json_encode($arrayresult);
     	if (is_object($db)) $db->close();
     	exit;
@@ -48,93 +48,93 @@ 
 //global $hookmanager;
 $hookmanager->initHooks(array('searchform'));
 
-$search_boxvalue=GETPOST('q', 'none');
+$search_boxvalue = GETPOST('q', 'none');
 
-$arrayresult=array();
+$arrayresult = array();
 
 // Define $searchform
 
-if (! empty($conf->adherent->enabled) && empty($conf->global->MAIN_SEARCHFORM_ADHERENT_DISABLED) && $user->rights->adherent->lire)
+if (!empty($conf->adherent->enabled) && empty($conf->global->MAIN_SEARCHFORM_ADHERENT_DISABLED) && $user->rights->adherent->lire)
 {
-	$arrayresult['searchintomember']=array('position'=>8, 'shortcut'=>'M', 'img'=>'object_user', 'label'=>$langs->trans("SearchIntoMembers", $search_boxvalue), 'text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoMembers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/adherents/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+	$arrayresult['searchintomember'] = array('position'=>8, 'shortcut'=>'M', 'img'=>'object_user', 'label'=>$langs->trans("SearchIntoMembers", $search_boxvalue), 'text'=>img_picto('', 'object_user').' '.$langs->trans("SearchIntoMembers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/adherents/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
 
-if ((( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)) && empty($conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED) && $user->rights->societe->lire)
+if (((!empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || !empty($conf->fournisseur->enabled)) && empty($conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED) && $user->rights->societe->lire)
 {
-	$arrayresult['searchintothirdparty']=array('position'=>10, 'shortcut'=>'T', 'img'=>'object_company', 'label'=>$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'text'=>img_picto('','object_company').' '.$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/societe/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+	$arrayresult['searchintothirdparty'] = array('position'=>10, 'shortcut'=>'T', 'img'=>'object_company', 'label'=>$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'text'=>img_picto('', 'object_company').' '.$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/societe/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
 
-if (! empty($conf->societe->enabled) && empty($conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED) && $user->rights->societe->lire)
+if (!empty($conf->societe->enabled) && empty($conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED) && $user->rights->societe->lire)
 {
-	$arrayresult['searchintocontact']=array('position'=>15, 'shortcut'=>'A', 'img'=>'object_contact', 'label'=>$langs->trans("SearchIntoContacts", $search_boxvalue), 'text'=>img_picto('','object_contact').' '.$langs->trans("SearchIntoContacts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contact/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+	$arrayresult['searchintocontact'] = array('position'=>15, 'shortcut'=>'A', 'img'=>'object_contact', 'label'=>$langs->trans("SearchIntoContacts", $search_boxvalue), 'text'=>img_picto('', 'object_contact').' '.$langs->trans("SearchIntoContacts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contact/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
 
-if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! empty($conf->service->enabled) && $user->rights->service->lire))
+if (((!empty($conf->product->enabled) && $user->rights->produit->lire) || (!empty($conf->service->enabled) && $user->rights->service->lire))
 && empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE_DISABLED))
 {
-	$arrayresult['searchintoproduct']=array('position'=>30, 'shortcut'=>'P', 'img'=>'object_product', 'label'=>$langs->trans("SearchIntoProductsOrServices", $search_boxvalue),'text'=>img_picto('','object_product').' '.$langs->trans("SearchIntoProductsOrServices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/product/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+	$arrayresult['searchintoproduct'] = array('position'=>30, 'shortcut'=>'P', 'img'=>'object_product', 'label'=>$langs->trans("SearchIntoProductsOrServices", $search_boxvalue), 'text'=>img_picto('', 'object_product').' '.$langs->trans("SearchIntoProductsOrServices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/product/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
 
-if (! empty($conf->projet->enabled) && empty($conf->global->MAIN_SEARCHFORM_PROJECT_DISABLED) && $user->rights->projet->lire)
+if (!empty($conf->projet->enabled) && empty($conf->global->MAIN_SEARCHFORM_PROJECT_DISABLED) && $user->rights->projet->lire)
 {
-	$arrayresult['searchintoprojects']=array('position'=>40, 'shortcut'=>'Q', 'img'=>'object_projectpub', 'label'=>$langs->trans("SearchIntoProjects", $search_boxvalue), 'text'=>img_picto('','object_projectpub').' '.$langs->trans("SearchIntoProjects", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/list.php'.($search_boxvalue?'?search_all='.urlencode($search_boxvalue):''));
+	$arrayresult['searchintoprojects'] = array('position'=>40, 'shortcut'=>'Q', 'img'=>'object_projectpub', 'label'=>$langs->trans("SearchIntoProjects", $search_boxvalue), 'text'=>img_picto('', 'object_projectpub').' '.$langs->trans("SearchIntoProjects", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
-if (! empty($conf->projet->enabled) && empty($conf->global->MAIN_SEARCHFORM_TASK_DISABLED) && $user->rights->projet->lire)
+if (!empty($conf->projet->enabled) && empty($conf->global->MAIN_SEARCHFORM_TASK_DISABLED) && $user->rights->projet->lire)
 {
-	$arrayresult['searchintotasks']=array('position'=>45, 'img'=>'object_task', 'label'=>$langs->trans("SearchIntoTasks", $search_boxvalue), 'text'=>img_picto('','object_task').' '.$langs->trans("SearchIntoTasks", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/tasks/list.php'.($search_boxvalue?'?search_all='.urlencode($search_boxvalue):''));
+	$arrayresult['searchintotasks'] = array('position'=>45, 'img'=>'object_task', 'label'=>$langs->trans("SearchIntoTasks", $search_boxvalue), 'text'=>img_picto('', 'object_task').' '.$langs->trans("SearchIntoTasks", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/tasks/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
 
-if (! empty($conf->propal->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_PROPAL_DISABLED) && $user->rights->propal->lire)
+if (!empty($conf->propal->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_PROPAL_DISABLED) && $user->rights->propal->lire)
 {
-	$arrayresult['searchintopropal']=array('position'=>60, 'img'=>'object_propal', 'label'=>$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'text'=>img_picto('','object_propal').' '.$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/comm/propal/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+	$arrayresult['searchintopropal'] = array('position'=>60, 'img'=>'object_propal', 'label'=>$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'text'=>img_picto('', 'object_propal').' '.$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/comm/propal/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
-if (! empty($conf->commande->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_ORDER_DISABLED) && $user->rights->commande->lire)
+if (!empty($conf->commande->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_ORDER_DISABLED) && $user->rights->commande->lire)
 {
-	$arrayresult['searchintoorder']=array('position'=>70, 'img'=>'object_order', 'label'=>$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'text'=>img_picto('','object_order').' '.$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/commande/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+	$arrayresult['searchintoorder'] = array('position'=>70, 'img'=>'object_order', 'label'=>$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'text'=>img_picto('', 'object_order').' '.$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/commande/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
-if (! empty($conf->expedition->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_SHIPMENT_DISABLED) && $user->rights->expedition->lire)
+if (!empty($conf->expedition->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_SHIPMENT_DISABLED) && $user->rights->expedition->lire)
 {
-	$arrayresult['searchintoshipment']=array('position'=>80, 'img'=>'object_sending', 'label'=>$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'text'=>img_picto('','object_sending').' '.$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expedition/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+	$arrayresult['searchintoshipment'] = array('position'=>80, 'img'=>'object_sending', 'label'=>$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'text'=>img_picto('', 'object_sending').' '.$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expedition/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
-if (! empty($conf->facture->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_INVOICE_DISABLED) && $user->rights->facture->lire)
+if (!empty($conf->facture->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_INVOICE_DISABLED) && $user->rights->facture->lire)
 {
-	$arrayresult['searchintoinvoice']=array('position'=>90, 'img'=>'object_bill', 'label'=>$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'text'=>img_picto('','object_bill').' '.$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/compta/facture/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+	$arrayresult['searchintoinvoice'] = array('position'=>90, 'img'=>'object_bill', 'label'=>$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'text'=>img_picto('', 'object_bill').' '.$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/compta/facture/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
 
-if (! empty($conf->supplier_proposal->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_PROPAL_DISABLED) && $user->rights->supplier_proposal->lire)
+if (!empty($conf->supplier_proposal->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_PROPAL_DISABLED) && $user->rights->supplier_proposal->lire)
 {
-	$arrayresult['searchintosupplierpropal']=array('position'=>100, 'img'=>'object_propal', 'label'=>$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'text'=>img_picto('','object_propal').' '.$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/supplier_proposal/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+	$arrayresult['searchintosupplierpropal'] = array('position'=>100, 'img'=>'object_propal', 'label'=>$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'text'=>img_picto('', 'object_propal').' '.$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/supplier_proposal/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
-if (! empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_ORDER_DISABLED) && $user->rights->fournisseur->commande->lire)
+if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_ORDER_DISABLED) && $user->rights->fournisseur->commande->lire)
 {
-	$arrayresult['searchintosupplierorder']=array('position'=>110, 'img'=>'object_order', 'label'=>$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'text'=>img_picto('','object_order').' '.$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/commande/list.php'.($search_boxvalue?'?search_all='.urlencode($search_boxvalue):''));
+	$arrayresult['searchintosupplierorder'] = array('position'=>110, 'img'=>'object_order', 'label'=>$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'text'=>img_picto('', 'object_order').' '.$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/commande/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
-if (! empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED) && $user->rights->fournisseur->facture->lire)
+if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED) && $user->rights->fournisseur->facture->lire)
 {
-	$arrayresult['searchintosupplierinvoice']=array('position'=>120, 'img'=>'object_bill', 'label'=>$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'text'=>img_picto('','object_bill').' '.$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/facture/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+	$arrayresult['searchintosupplierinvoice'] = array('position'=>120, 'img'=>'object_bill', 'label'=>$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'text'=>img_picto('', 'object_bill').' '.$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/facture/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
 
-if (! empty($conf->contrat->enabled) && empty($conf->global->MAIN_SEARCHFORM_CONTRACT_DISABLED) && $user->rights->contrat->lire)
+if (!empty($conf->contrat->enabled) && empty($conf->global->MAIN_SEARCHFORM_CONTRACT_DISABLED) && $user->rights->contrat->lire)
 {
-	$arrayresult['searchintocontract']=array('position'=>130, 'img'=>'object_contract', 'label'=>$langs->trans("SearchIntoContracts", $search_boxvalue), 'text'=>img_picto('','object_contract').' '.$langs->trans("SearchIntoContracts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contrat/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+	$arrayresult['searchintocontract'] = array('position'=>130, 'img'=>'object_contract', 'label'=>$langs->trans("SearchIntoContracts", $search_boxvalue), 'text'=>img_picto('', 'object_contract').' '.$langs->trans("SearchIntoContracts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contrat/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
-if (! empty($conf->ficheinter->enabled) && empty($conf->global->MAIN_SEARCHFORM_FICHINTER_DISABLED) && $user->rights->ficheinter->lire)
+if (!empty($conf->ficheinter->enabled) && empty($conf->global->MAIN_SEARCHFORM_FICHINTER_DISABLED) && $user->rights->ficheinter->lire)
 {
-	$arrayresult['searchintointervention']=array('position'=>140, 'img'=>'object_intervention', 'label'=>$langs->trans("SearchIntoInterventions", $search_boxvalue), 'text'=>img_picto('','object_intervention').' '.$langs->trans("SearchIntoInterventions", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fichinter/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+	$arrayresult['searchintointervention'] = array('position'=>140, 'img'=>'object_intervention', 'label'=>$langs->trans("SearchIntoInterventions", $search_boxvalue), 'text'=>img_picto('', 'object_intervention').' '.$langs->trans("SearchIntoInterventions", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fichinter/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
 
 // HR
-if (! empty($conf->user->enabled) && empty($conf->global->MAIN_SEARCHFORM_USER_DISABLED) && $user->rights->user->user->lire)
+if (!empty($conf->user->enabled) && empty($conf->global->MAIN_SEARCHFORM_USER_DISABLED) && $user->rights->user->user->lire)
 {
-	$arrayresult['searchintouser']=array('position'=>200, 'shortcut'=>'U', 'img'=>'object_user', 'label'=>$langs->trans("SearchIntoUsers", $search_boxvalue), 'text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoUsers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/user/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+	$arrayresult['searchintouser'] = array('position'=>200, 'shortcut'=>'U', 'img'=>'object_user', 'label'=>$langs->trans("SearchIntoUsers", $search_boxvalue), 'text'=>img_picto('', 'object_user').' '.$langs->trans("SearchIntoUsers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/user/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
-if (! empty($conf->expensereport->enabled) && empty($conf->global->MAIN_SEARCHFORM_EXPENSEREPORT_DISABLED) && $user->rights->expensereport->lire)
+if (!empty($conf->expensereport->enabled) && empty($conf->global->MAIN_SEARCHFORM_EXPENSEREPORT_DISABLED) && $user->rights->expensereport->lire)
 {
-	$arrayresult['searchintoexpensereport']=array('position'=>210, 'img'=>'object_trip', 'label'=>$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'text'=>img_picto('','object_trip').' '.$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm'.($search_boxvalue?'&sall='.urlencode($search_boxvalue):''));
+	$arrayresult['searchintoexpensereport'] = array('position'=>210, 'img'=>'object_trip', 'label'=>$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'text'=>img_picto('', 'object_trip').' '.$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm'.($search_boxvalue ? '&sall='.urlencode($search_boxvalue) : ''));
 }
-if (! empty($conf->holiday->enabled) && empty($conf->global->MAIN_SEARCHFORM_HOLIDAY_DISABLED) && $user->rights->holiday->read)
+if (!empty($conf->holiday->enabled) && empty($conf->global->MAIN_SEARCHFORM_HOLIDAY_DISABLED) && $user->rights->holiday->read)
 {
-	$arrayresult['searchintoleaves']=array('position'=>220, 'img'=>'object_holiday', 'label'=>$langs->trans("SearchIntoLeaves", $search_boxvalue), 'text'=>img_picto('','object_holiday').' '.$langs->trans("SearchIntoLeaves", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/holiday/list.php?mainmenu=hrm'.($search_boxvalue?'&sall='.urlencode($search_boxvalue):''));
+	$arrayresult['searchintoleaves'] = array('position'=>220, 'img'=>'object_holiday', 'label'=>$langs->trans("SearchIntoLeaves", $search_boxvalue), 'text'=>img_picto('', 'object_holiday').' '.$langs->trans("SearchIntoLeaves", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/holiday/list.php?mainmenu=hrm'.($search_boxvalue ? '&sall='.urlencode($search_boxvalue) : ''));
 }
 
 
@@ -147,25 +147,25 @@ 
 */
 
 // Execute hook addSearchEntry
-$parameters=array('search_boxvalue'=>$search_boxvalue, 'arrayresult'=>$arrayresult);
-$reshook=$hookmanager->executeHooks('addSearchEntry',$parameters);
+$parameters = array('search_boxvalue'=>$search_boxvalue, 'arrayresult'=>$arrayresult);
+$reshook = $hookmanager->executeHooks('addSearchEntry', $parameters);
 if (empty($reshook))
 {
-	$arrayresult=array_merge($arrayresult, $hookmanager->resArray);
+	$arrayresult = array_merge($arrayresult, $hookmanager->resArray);
 }
-else $arrayresult=$hookmanager->resArray;
+else $arrayresult = $hookmanager->resArray;
 
 // This allow to keep a search entry to the top
-if(! empty($conf->global->DEFAULT_SEARCH_INTO_MODULE)) {
+if (!empty($conf->global->DEFAULT_SEARCH_INTO_MODULE)) {
     $key = 'searchinto'.$conf->global->DEFAULT_SEARCH_INTO_MODULE;
-    if(array_key_exists($key, $arrayresult)) $arrayresult[$key]['position'] = -10;
+    if (array_key_exists($key, $arrayresult)) $arrayresult[$key]['position'] = -10;
 }
 
 // Sort on position
 $arrayresult = dol_sort_array($arrayresult, 'position');
 
 // Print output if called by ajax or do nothing (var $arrayresult will be used) if called by an include
-if (! isset($usedbyinclude) || empty($usedbyinclude))
+if (!isset($usedbyinclude) || empty($usedbyinclude))
 {
     print json_encode($arrayresult);
     if (is_object($db)) $db->close();

Braces +29 added lines, -11 removed lines

@@ -26,11 +26,22 @@ 
 
 if (! isset($usedbyinclude) || empty($usedbyinclude))
 {
-    if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
-    if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-    if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-    if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-    if (! defined('NOREDIRECTBYMAINTOLOGIN')) define('NOREDIRECTBYMAINTOLOGIN','1');
+    if (! defined('NOTOKENRENEWAL')) {
+        define('NOTOKENRENEWAL',1);
+    }
+    // Disables token renewal
+    if (! defined('NOREQUIREMENU')) {
+        define('NOREQUIREMENU','1');
+    }
+    if (! defined('NOREQUIREHTML')) {
+        define('NOREQUIREHTML','1');
+    }
+    if (! defined('NOREQUIREAJAX')) {
+        define('NOREQUIREAJAX','1');
+    }
+    if (! defined('NOREDIRECTBYMAINTOLOGIN')) {
+        define('NOREDIRECTBYMAINTOLOGIN','1');
+    }
 
     $res=@include '../../main.inc.php';
     if ($res == 'ERROR_NOT_LOGGED')
@@ -38,7 +49,9 @@ 
     	$langs->load("other");
     	$arrayresult['jumptologin']=array('img'=>'object_generic', 'label'=>$langs->trans("JumpToLogin"), 'text'=>'<span class="fa fa-sign-in"></span> '.$langs->trans("JumpToLogin"), 'url'=>DOL_URL_ROOT.'/index.php');
     	print json_encode($arrayresult);
-    	if (is_object($db)) $db->close();
+    	if (is_object($db)) {
+    	    $db->close();
+    	}
     	exit;
     }
 }
@@ -152,14 +165,17 @@ 
 if (empty($reshook))
 {
 	$arrayresult=array_merge($arrayresult, $hookmanager->resArray);
+} else {
+    $arrayresult=$hookmanager->resArray;
 }
-else $arrayresult=$hookmanager->resArray;
 
 // This allow to keep a search entry to the top
 if(! empty($conf->global->DEFAULT_SEARCH_INTO_MODULE)) {
     $key = 'searchinto'.$conf->global->DEFAULT_SEARCH_INTO_MODULE;
-    if(array_key_exists($key, $arrayresult)) $arrayresult[$key]['position'] = -10;
-}
+    if(array_key_exists($key, $arrayresult)) {
+        $arrayresult[$key]['position'] = -10;
+    }
+    }
 
 // Sort on position
 $arrayresult = dol_sort_array($arrayresult, 'position');
@@ -168,6 +184,8 @@ 
 if (! isset($usedbyinclude) || empty($usedbyinclude))
 {
     print json_encode($arrayresult);
-    if (is_object($db)) $db->close();
-}
+    if (is_object($db)) {
+        $db->close();
+    }
+    }
 

dolibarr/htdocs/core/ajax/fileupload.php

Indentation +3 added lines, -3 removed lines

@@ -51,14 +51,14 @@
 header('Access-Control-Allow-Headers: X-File-Name, X-File-Type, X-File-Size');
 
 switch ($_SERVER['REQUEST_METHOD']) {
-	case 'OPTIONS':
-		break;
+    case 'OPTIONS':
+        break;
     case 'HEAD':
     case 'GET':
         $upload_handler->get();
         break;
     case 'POST':
-    	if (isset($_REQUEST['_method']) && $_REQUEST['_method'] === 'DELETE') {
+        if (isset($_REQUEST['_method']) && $_REQUEST['_method'] === 'DELETE') {
             $upload_handler->delete();
         } else {
             $upload_handler->post();

Braces +14 added lines, -4 removed lines

@@ -21,10 +21,20 @@
  *       \brief      File to return Ajax response on file upload
  */
 
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
+if (! defined('NOCSRFCHECK')) {
+    define('NOCSRFCHECK','1');
+}
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL','1');
+}
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+// If there is no menu to show
+if (! defined('NOREQUIREHTML')) {
+    define('NOREQUIREHTML','1');
+}
+// If we don't need to load the html.form.class.php
 
 
 

Spacing +8 added lines, -8 removed lines

@@ -21,16 +21,16 @@ 
  *       \brief      File to return Ajax response on file upload
  */
 
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
+if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no menu to show
+if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
 
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/fileupload.class.php';
 
 error_reporting(E_ALL | E_STRICT);
@@ -39,11 +39,11 @@ 
 //print_r($_GET);
 //print 'upload_dir='.GETPOST('upload_dir');
 
-$fk_element = GETPOST('fk_element','int');
-$element = GETPOST('element','alpha');
+$fk_element = GETPOST('fk_element', 'int');
+$element = GETPOST('element', 'alpha');
 
 
-$upload_handler = new FileUpload(null,$fk_element,$element);
+$upload_handler = new FileUpload(null, $fk_element, $element);
 
 header('Pragma: no-cache');
 header('Cache-Control: no-store, no-cache, must-revalidate');

dolibarr/htdocs/core/ajax/bankconciliate.php

Indentation +8 added lines, -8 removed lines

@@ -49,8 +49,8 @@ 
 
 if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $action == 'dvnext')
 {
-	// Increase date
-	$al = new AccountLine($db);
+    // Increase date
+    $al = new AccountLine($db);
     $al->datev_next(GETPOST('rowid','int'));
     $al->fetch(GETPOST('rowid','int'));
 
@@ -61,8 +61,8 @@ 
 
 if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $action == 'dvprev')
 {
-	// Decrease date
-	$al =new AccountLine($db);
+    // Decrease date
+    $al =new AccountLine($db);
     $al->datev_previous(GETPOST('rowid','int'));
     $al->fetch(GETPOST('rowid','int'));
 
@@ -73,8 +73,8 @@ 
 
 if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $action == 'donext')
 {
-	// Increase date
-	$al = new AccountLine($db);
+    // Increase date
+    $al = new AccountLine($db);
     $al->dateo_next(GETPOST('rowid','int'));
     $al->fetch(GETPOST('rowid','int'));
 
@@ -85,8 +85,8 @@ 
 
 if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $action == 'doprev')
 {
-	// Decrease date
-	$al =new AccountLine($db);
+    // Decrease date
+    $al =new AccountLine($db);
     $al->dateo_previous(GETPOST('rowid','int'));
     $al->fetch(GETPOST('rowid','int'));
 

Braces +16 added lines, -5 removed lines

@@ -20,11 +20,22 @@
  *       \brief      File to set data for bank concilation
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL','1');
+}
+// Disables token renewal
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+if (! defined('NOREQUIREHTML')) {
+    define('NOREQUIREHTML','1');
+}
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
+if (! defined('NOREQUIRESOC')) {
+    define('NOREQUIRESOC','1');
+}
 //if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');    // Required to know date format for dol_print_date
 
 

Spacing +21 added lines, -21 removed lines

@@ -20,21 +20,21 @@ 
  *       \brief      File to set data for bank concilation
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
+if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
 //if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');    // Required to know date format for dol_print_date
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
-$action=GETPOST('action','aZ09');
+$action = GETPOST('action', 'aZ09');
 
 
 /*
@@ -54,10 +54,10 @@ 
 {
 	// Increase date
 	$al = new AccountLine($db);
-    $al->datev_next(GETPOST('rowid','int'));
-    $al->fetch(GETPOST('rowid','int'));
+    $al->datev_next(GETPOST('rowid', 'int'));
+    $al->fetch(GETPOST('rowid', 'int'));
 
-    print '<span>'.dol_print_date($db->jdate($al->datev),"day").'</span>';
+    print '<span>'.dol_print_date($db->jdate($al->datev), "day").'</span>';
 
     exit;
 }
@@ -65,11 +65,11 @@ 
 if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $action == 'dvprev')
 {
 	// Decrease date
-	$al =new AccountLine($db);
-    $al->datev_previous(GETPOST('rowid','int'));
-    $al->fetch(GETPOST('rowid','int'));
+	$al = new AccountLine($db);
+    $al->datev_previous(GETPOST('rowid', 'int'));
+    $al->fetch(GETPOST('rowid', 'int'));
 
-    print '<span>'.dol_print_date($db->jdate($al->datev),"day").'</span>';
+    print '<span>'.dol_print_date($db->jdate($al->datev), "day").'</span>';
 
     exit;
 }
@@ -78,10 +78,10 @@ 
 {
 	// Increase date
 	$al = new AccountLine($db);
-    $al->dateo_next(GETPOST('rowid','int'));
-    $al->fetch(GETPOST('rowid','int'));
+    $al->dateo_next(GETPOST('rowid', 'int'));
+    $al->fetch(GETPOST('rowid', 'int'));
 
-    print '<span>'.dol_print_date($db->jdate($al->dateo),"day").'</span>';
+    print '<span>'.dol_print_date($db->jdate($al->dateo), "day").'</span>';
 
     exit;
 }
@@ -89,11 +89,11 @@ 
 if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $action == 'doprev')
 {
 	// Decrease date
-	$al =new AccountLine($db);
-    $al->dateo_previous(GETPOST('rowid','int'));
-    $al->fetch(GETPOST('rowid','int'));
+	$al = new AccountLine($db);
+    $al->dateo_previous(GETPOST('rowid', 'int'));
+    $al->fetch(GETPOST('rowid', 'int'));
 
-    print '<span>'.dol_print_date($db->jdate($al->dateo),"day").'</span>';
+    print '<span>'.dol_print_date($db->jdate($al->dateo), "day").'</span>';
 
     exit;
 }