Introduction de $boucle->from_type pour assigner le type du jointure (INNER,LEFT,RIGHT).

		'"), # SELECT

		' . calculer_from($boucle) .

		', # FROM

		' . calculer_from_type($boucle) .

		', # FROM	type jointure	

		' . calculer_dump_array($boucle->where) .

		', # WHERE

		' . calculer_dump_join($boucle->join)

  return 'array(' . substr($res,1) . ')';

}

// http://doc.spip.org/@calculer_from_type

function calculer_from_type(&$boucle)

{

  $res = "";

  foreach($boucle->from_type as $k => $v) $res .= ",'$k' => '$v'";

  return 'array(' . substr($res,1) . ')';

}

// http://doc.spip.org/@calculer_order

function calculer_order(&$boucle)

{

// http://doc.spip.org/@calculer_select

function calculer_select ($select = array(), $from = array(), 

			$from_type = array(),

      $where = array(), $join=array(),

			$groupby = array(), $orderby = array(), $limit = '',

			$having=array(), $table = '', $id = '', $serveur='') {

		OR calculer_jointnul($cle, $select)

		OR calculer_jointnul($cle, $join)

		OR calculer_jointnul($cle, $where))

			$sfrom = "\n\tINNER JOIN " . $from[$cle] . " AS $cle ON $t.$c=$cle.$c" . $sfrom;

      $sfrom = "\n\t".(isset($from_type[$cle])?$from_type[$cle]:"INNER")." JOIN " . $from[$cle] . " AS $cle ON $t.$c=$cle.$c" . $sfrom;

		else { unset($join[$k]);}

		unset($from[$cle]);

	}

	// champs pour la construction de la requete SQL

	var $select = array();

	var $from = array();

	var $from_type = array();

	var $where = array();

	var $join = array();

	var $having = array();