spip / SPIP

ecrire/iterateur/data.php

Spacing +41 added lines, -41 removed lines

@@ -12,7 +12,7 @@ 
 
 if (!defined('_ECRIRE_INC_VERSION')) return;
 
-if (!defined('_DATA_SOURCE_MAX_SIZE')) define('_DATA_SOURCE_MAX_SIZE',2*1048576);
+if (!defined('_DATA_SOURCE_MAX_SIZE')) define('_DATA_SOURCE_MAX_SIZE', 2 * 1048576);
 
 
 /**
@@ -86,8 +86,8 @@ 
 	 * @param  $command
 	 * @param array $info
 	 */
-	public function __construct($command, $info=array()) {
-		$this->type='DATA';
+	public function __construct($command, $info = array()) {
+		$this->type = 'DATA';
 		$this->command = $command;
 		$this->info = $info;
 
@@ -189,7 +189,7 @@ 
 		// Si a ce stade on n'a pas de table, il y a un bug
 		if (!is_array($this->tableau)) {
 			$this->err = true;
-			spip_log("erreur datasource ".var_export($command,true));
+			spip_log("erreur datasource ".var_export($command, true));
 		}
 
 		// {datapath query.results}
@@ -226,8 +226,8 @@ 
 		# l'objet en cache ; cf plugins/icalendar
 		# perf : pas de fonction table_to_array ! (table est deja un array)
 		if (isset($this->command['sourcemode'])
-		  AND !in_array($this->command['sourcemode'],array('table', 'array', 'tableau')))
-			charger_fonction($this->command['sourcemode'] . '_to_array', 'inc', true);
+		  AND !in_array($this->command['sourcemode'], array('table', 'array', 'tableau')))
+			charger_fonction($this->command['sourcemode'].'_to_array', 'inc', true);
 
 		# le premier argument peut etre un array, une URL etc.
 		$src = $this->command['source'][0];
@@ -235,7 +235,7 @@ 
 		# avons-nous un cache dispo ?
 		$cle = null;
 		if (is_string($src))
-			$cle = 'datasource_'.md5($this->command['sourcemode'].':'.var_export($this->command['source'],true));
+			$cle = 'datasource_'.md5($this->command['sourcemode'].':'.var_export($this->command['source'], true));
 
 		$cache = $this->cache_get($cle);
 		if (isset($this->command['datacache']))
@@ -271,7 +271,7 @@ 
 					$u = recuperer_page($src, false, false, _DATA_SOURCE_MAX_SIZE);
 					if (!$u)
 						throw new Exception("404");
-					if (!isset($ttl)) $ttl = 24*3600;
+					if (!isset($ttl)) $ttl = 24 * 3600;
 				} else if (@is_dir($src)) {
 					$u = $src;
 					if (!isset($ttl)) $ttl = 10;
@@ -283,10 +283,10 @@ 
 					if (!isset($ttl)) $ttl = 10;
 				}
 				if (!$this->err
-				AND $g = charger_fonction($this->command['sourcemode'] . '_to_array', 'inc', true)) {
+				AND $g = charger_fonction($this->command['sourcemode'].'_to_array', 'inc', true)) {
 					$args = $this->command['source'];
 					$args[0] = $u;
-					if (is_array($a = call_user_func_array($g,$args))) {
+					if (is_array($a = call_user_func_array($g, $args))) {
 						$this->tableau = $a;
 					}
 				}
@@ -295,7 +295,7 @@ 
 			if (!is_array($this->tableau))
 				$this->err = true;
 
-			if (!$this->err AND isset($ttl) and $ttl>0)
+			if (!$this->err AND isset($ttl) and $ttl > 0)
 				$this->cache_set($cle, $ttl);
 
 		}
@@ -348,10 +348,10 @@ 
 				$this->command['enum'] = $this->command['enum'][0];
 			}
 		}
-		if (count($this->command['enum'])>=3)
-			$enum = range(array_shift($this->command['enum']),array_shift($this->command['enum']),array_shift($this->command['enum']));
+		if (count($this->command['enum']) >= 3)
+			$enum = range(array_shift($this->command['enum']), array_shift($this->command['enum']), array_shift($this->command['enum']));
 		else
-			$enum = range(array_shift($this->command['enum']),array_shift($this->command['enum']));
+			$enum = range(array_shift($this->command['enum']), array_shift($this->command['enum']));
 		$this->tableau = $enum;
 	}
 
@@ -363,7 +363,7 @@ 
 	**/
 	protected function select_datapath() {
 		list(,$base) = each($this->command['datapath']);
-		if (strlen($base = ltrim(trim($base),"/"))) {
+		if (strlen($base = ltrim(trim($base), "/"))) {
 			$this->tableau = table_valeur($this->tableau, $base);
 			if (!is_array($this->tableau)) {
 				$this->tableau = array();
@@ -381,11 +381,11 @@ 
 	protected function select_orderby() {
 		$sortfunc = '';
 		$aleas = 0;
-		foreach($this->command['orderby'] as $tri) {
+		foreach ($this->command['orderby'] as $tri) {
 			// virer le / initial pour les criteres de la forme {par /xx}
 			if (preg_match(',^\.?([/\w]+)( DESC)?$,iS', ltrim($tri, '/'), $r)) {
 				// tri par cle
-				if ($r[1] == 'cle'){
+				if ($r[1] == 'cle') {
 					if (isset($r[2]) and $r[2])
 						krsort($this->tableau);
 					else
@@ -396,7 +396,7 @@ 
 					$k = array_keys($this->tableau);
 					shuffle($k);
 					$v = array();
-					foreach($k as $cle)
+					foreach ($k as $cle)
 						$v[$cle] = $this->tableau[$cle];
 					$this->tableau = $v;
 				}
@@ -406,10 +406,10 @@ 
 						$tv = '%s';
 					# {par valeur/xx/yy} ??
 					else
-						$tv = 'table_valeur(%s, '.var_export($r[1],true).')';
+						$tv = 'table_valeur(%s, '.var_export($r[1], true).')';
 					$sortfunc .= '
-					$a = '.sprintf($tv,'$aa').';
-					$b = '.sprintf($tv,'$bb').';
+					$a = '.sprintf($tv, '$aa').';
+					$b = '.sprintf($tv, '$bb').';
 					if ($a <> $b)
 						return ($a ' . ((isset($r[2]) and $r[2]) ? '>' : '<').' $b) ? -1 : 1;';
 				}
@@ -434,7 +434,7 @@ 
 		// virer le / initial pour les criteres de la forme {fusion /xx}
 		if (strlen($fusion = ltrim($this->command['groupby'][0], '/'))) {
 			$vu = array();
-			foreach($this->tableau as $k => $v) {
+			foreach ($this->tableau as $k => $v) {
 				$val = table_valeur($v, $fusion);
 				if (isset($vu[$val]))
 					unset($this->tableau[$k]);
@@ -449,7 +449,7 @@ 
 	 * L'iterateur est-il encore valide ?
 	 * @return bool
 	 */
-	public function valid(){
+	public function valid() {
 		return !is_null($this->cle);
 	}
 
@@ -473,7 +473,7 @@ 
 	 * Passer a la valeur suivante
 	 * @return void
 	 */
-	public function next(){
+	public function next() {
 		if ($this->valid())
 			list($this->cle, $this->valeur) = each($this->tableau);
 	}
@@ -529,14 +529,14 @@ 
  * @return   array
  *
  */
-function inc_object_to_array( $object ) {
-    if( !is_object( $object ) && !is_array( $object ) ) {
+function inc_object_to_array($object) {
+    if (!is_object($object) && !is_array($object)) {
         return $object;
     }
-    if( is_object( $object ) ) {
-        $object = get_object_vars( $object );
+    if (is_object($object)) {
+        $object = get_object_vars($object);
     }
-    return array_map( 'inc_object_to_array', $object );
+    return array_map('inc_object_to_array', $object);
 }
 
 /**
@@ -593,8 +593,8 @@ 
  */
 function inc_csv_to_array_dist($u) {
 	include_spip('inc/csv');
-	list($entete,$csv) = analyse_csv($u);
-	array_unshift($csv,$entete);
+	list($entete, $csv) = analyse_csv($u);
+	array_unshift($csv, $entete);
 
 	include_spip('inc/charsets');
 	foreach ($entete as $k => $v) {
@@ -645,9 +645,9 @@ 
  * @return bool|array
  * @throws Exception
  */
-function inc_yaml_to_array_dist($u){
+function inc_yaml_to_array_dist($u) {
 	include_spip('inc/yaml-mini');
-	if (!function_exists("yaml_decode")){
+	if (!function_exists("yaml_decode")) {
 		throw new Exception('YAML: impossible de trouver la fonction yaml_decode');
 		return false;
 	}
@@ -665,7 +665,7 @@ 
  * @param int $limit
  * @return array|bool
  */
-function inc_pregfiles_to_array_dist($dir, $regexp=-1, $limit=10000) {
+function inc_pregfiles_to_array_dist($dir, $regexp = -1, $limit = 10000) {
 	return (array) preg_files($dir, $regexp, $limit);
 }
 
@@ -683,7 +683,7 @@ 
 		$b = (array) @stat($v);
 		foreach ($b as $k => $ignore)
 			if (is_numeric($k)) unset($b[$k]);
-		$b['file'] = preg_replace('`/$`','',$v) ;
+		$b['file'] = preg_replace('`/$`', '', $v);
 		$v = array_merge(
 			pathinfo($v),
 			$b
@@ -697,21 +697,21 @@ 
  * @param Object $object
  * @return array|bool
  */
-function XMLObjectToArray($object){
+function XMLObjectToArray($object) {
 	$xml_array = array();
-	for( $object->rewind(); $object->valid(); $object->next() ) {
-		if(array_key_exists($key = $object->key(), $xml_array)){
+	for ($object->rewind(); $object->valid(); $object->next()) {
+		if (array_key_exists($key = $object->key(), $xml_array)) {
 			$key .= '-'.uniqid();
 		}
 		$vars = get_object_vars($object->current());
 		if (isset($vars['@attributes']))
-			foreach($vars['@attributes'] as $k => $v)
+			foreach ($vars['@attributes'] as $k => $v)
 			$xml_array[$key][$k] = $v;
-		if($object->hasChildren()){
+		if ($object->hasChildren()) {
 			$xml_array[$key][] = XMLObjectToArray(
 				$object->current());
 		}
-		else{
+		else {
 			$xml_array[$key][] = strval($object->current());
 		}
 	}