alxarafe / alixar

dolibarr/htdocs/core/actions_fetchobject.inc.php

Indentation +21 added lines, -21 removed lines

@@ -30,25 +30,25 @@
 
 if (($id > 0 || (! empty($ref) && ! in_array($action, array('create', 'createtask', 'add')))) && (empty($cancel) || $id > 0))
 {
-	if (($id > 0 && is_numeric($id)) || ! empty($ref))	// To discard case when id is list of ids like '1,2,3...'
-	{
-	    $ret = $object->fetch($id, $ref);
-	    if ($ret > 0)
-	    {
-	        $object->fetch_thirdparty();
-	        $id = $object->id;
-	    }
-	    else
-	    {
-	    	if (empty($object->error) && ! count($object->errors))
-	    	{
-	    		if ($ret < 0)	// if $ret == 0, it means not found.
-	    		{
-	    			setEventMessages('Fetch on object (type '.get_class($object).') return an error without filling $object->error nor $object->errors', null, 'errors');
-	    		}
-	    	}
-	        else setEventMessages($object->error, $object->errors, 'errors');
-	        $action='';
-	    }
-	}
+    if (($id > 0 && is_numeric($id)) || ! empty($ref))	// To discard case when id is list of ids like '1,2,3...'
+    {
+        $ret = $object->fetch($id, $ref);
+        if ($ret > 0)
+        {
+            $object->fetch_thirdparty();
+            $id = $object->id;
+        }
+        else
+        {
+            if (empty($object->error) && ! count($object->errors))
+            {
+                if ($ret < 0)	// if $ret == 0, it means not found.
+                {
+                    setEventMessages('Fetch on object (type '.get_class($object).') return an error without filling $object->error nor $object->errors', null, 'errors');
+                }
+            }
+            else setEventMessages($object->error, $object->errors, 'errors');
+            $action='';
+        }
+    }
 }

dolibarr/htdocs/core/ajax/selectobject.php

Indentation +7 added lines, -7 removed lines

@@ -62,16 +62,16 @@
 $classpath=$InfoFieldList[1];
 if (! empty($classpath))
 {
-	dol_include_once($classpath);
-	if ($classname && class_exists($classname))
-	{
-		$objecttmp = new $classname($db);
-	}
+    dol_include_once($classpath);
+    if ($classname && class_exists($classname))
+    {
+        $objecttmp = new $classname($db);
+    }
 }
 if (! is_object($objecttmp))
 {
-	dol_syslog('Error bad param objectdesc', LOG_WARNING);
-	print 'Error bad param objectdesc';
+    dol_syslog('Error bad param objectdesc', LOG_WARNING);
+    print 'Error bad param objectdesc';
 }
 
 // When used from jQuery, the search term is added as GET param "term".

dolibarr/htdocs/core/ajax/loadinplace.php

Indentation +62 added lines, -62 removed lines

@@ -44,72 +44,72 @@
 // Load original field value
 if (! empty($field) && ! empty($element) && ! empty($table_element) && ! empty($fk_element))
 {
-	$ext_element	= GETPOST('ext_element','alpha');
-	$field			= substr($field, 8); // remove prefix val_
-	$type			= GETPOST('type','alpha');
-	$loadmethod		= (GETPOST('loadmethod','alpha') ? GETPOST('loadmethod','alpha') : 'getValueFrom');
+    $ext_element	= GETPOST('ext_element','alpha');
+    $field			= substr($field, 8); // remove prefix val_
+    $type			= GETPOST('type','alpha');
+    $loadmethod		= (GETPOST('loadmethod','alpha') ? GETPOST('loadmethod','alpha') : 'getValueFrom');
 
-	if ($element != 'order_supplier' && $element != 'invoice_supplier' && preg_match('/^([^_]+)_([^_]+)/i',$element,$regs))
-	{
-		$element = $regs[1];
-		$subelement = $regs[2];
-	}
+    if ($element != 'order_supplier' && $element != 'invoice_supplier' && preg_match('/^([^_]+)_([^_]+)/i',$element,$regs))
+    {
+        $element = $regs[1];
+        $subelement = $regs[2];
+    }
 
-	if ($element == 'propal') $element = 'propale';
-	else if ($element == 'fichinter') $element = 'ficheinter';
-	else if ($element == 'product') $element = 'produit';
-	else if ($element == 'member') $element = 'adherent';
-	else if ($element == 'order_supplier') {
-		$element = 'fournisseur';
-		$subelement = 'commande';
-	}
-	else if ($element == 'invoice_supplier') {
-		$element = 'fournisseur';
-		$subelement = 'facture';
-	}
+    if ($element == 'propal') $element = 'propale';
+    else if ($element == 'fichinter') $element = 'ficheinter';
+    else if ($element == 'product') $element = 'produit';
+    else if ($element == 'member') $element = 'adherent';
+    else if ($element == 'order_supplier') {
+        $element = 'fournisseur';
+        $subelement = 'commande';
+    }
+    else if ($element == 'invoice_supplier') {
+        $element = 'fournisseur';
+        $subelement = 'facture';
+    }
 
-	if ($user->rights->$element->lire || $user->rights->$element->read
-	|| (isset($subelement) && ($user->rights->$element->$subelement->lire || $user->rights->$element->$subelement->read))
-	|| ($element == 'payment' && $user->rights->facture->lire)
-	|| ($element == 'payment_supplier' && $user->rights->fournisseur->facture->lire))
-	{
-		if ($type == 'select')
-		{
-			$methodname	= 'load_cache_'.$loadmethod;
-			$cachename = 'cache_'.GETPOST('loadmethod','alpha');
+    if ($user->rights->$element->lire || $user->rights->$element->read
+    || (isset($subelement) && ($user->rights->$element->$subelement->lire || $user->rights->$element->$subelement->read))
+    || ($element == 'payment' && $user->rights->facture->lire)
+    || ($element == 'payment_supplier' && $user->rights->fournisseur->facture->lire))
+    {
+        if ($type == 'select')
+        {
+            $methodname	= 'load_cache_'.$loadmethod;
+            $cachename = 'cache_'.GETPOST('loadmethod','alpha');
 
-			$form = new Form($db);
-			if (method_exists($form, $methodname))
-			{
-				$ret = $form->$methodname();
-				if ($ret > 0) echo json_encode($form->$cachename);
-			}
-			else if (! empty($ext_element))
-			{
-				$module = $subelement = $ext_element;
-				if (preg_match('/^([^_]+)_([^_]+)/i',$ext_element,$regs))
-				{
-					$module = $regs[1];
-					$subelement = $regs[2];
-				}
+            $form = new Form($db);
+            if (method_exists($form, $methodname))
+            {
+                $ret = $form->$methodname();
+                if ($ret > 0) echo json_encode($form->$cachename);
+            }
+            else if (! empty($ext_element))
+            {
+                $module = $subelement = $ext_element;
+                if (preg_match('/^([^_]+)_([^_]+)/i',$ext_element,$regs))
+                {
+                    $module = $regs[1];
+                    $subelement = $regs[2];
+                }
 
-				dol_include_once('/'.$module.'/class/actions_'.$subelement.'.class.php');
-				$classname = 'Actions'.ucfirst($subelement);
-				$object = new $classname($db);
-				$ret = $object->$methodname($fk_element);
-				if ($ret > 0) echo json_encode($object->$cachename);
-			}
-		}
-		else
-		{
-			$object = new GenericObject($db);
-			$value=$object->$loadmethod($table_element, $fk_element, $field);
-			echo $value;
-		}
-	}
-	else
-	{
-		echo $langs->transnoentities('NotEnoughPermissions');
-	}
+                dol_include_once('/'.$module.'/class/actions_'.$subelement.'.class.php');
+                $classname = 'Actions'.ucfirst($subelement);
+                $object = new $classname($db);
+                $ret = $object->$methodname($fk_element);
+                if ($ret > 0) echo json_encode($object->$cachename);
+            }
+        }
+        else
+        {
+            $object = new GenericObject($db);
+            $value=$object->$loadmethod($table_element, $fk_element, $field);
+            echo $value;
+        }
+    }
+    else
+    {
+        echo $langs->transnoentities('NotEnoughPermissions');
+    }
 }
 

dolibarr/htdocs/core/ajax/getaccountcurrency.php

Indentation +14 added lines, -14 removed lines

@@ -39,19 +39,19 @@
 // Load original field value
 if (! empty($id))
 {
-	require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-	$account=new Account($db);
-	$result = $account->fetch($id);
-	if ($result<0) {
-		$return['value']	= '';
-		$return['num']		= $result;
-		$return['error']	= $account->errors[0];
-	} else {
-		$return['value']	= $account->currency_code;
-		$return['num']		= $result;
-		$return['error']	= '';
-	}
-
-	echo json_encode($return);
+    require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+    $account=new Account($db);
+    $result = $account->fetch($id);
+    if ($result<0) {
+        $return['value']	= '';
+        $return['num']		= $result;
+        $return['error']	= $account->errors[0];
+    } else {
+        $return['value']	= $account->currency_code;
+        $return['num']		= $result;
+        $return['error']	= '';
+    }
+
+    echo json_encode($return);
 }
 

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";
+    }
 }
 

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

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);
+        }
+    }
 }
 

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
 {

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);
+    }
 }