spip / SPIP

ecrire/iterateur/data.php

Braces +107 added lines, -69 removed lines

@@ -10,9 +10,13 @@ 
  *  Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne.   *
 \***************************************************************************/
 
-if (!defined('_ECRIRE_INC_VERSION')) return;
+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);
+}
 
 
 /**
@@ -117,10 +121,14 @@ 
 	 * @return
 	 */
 	protected function cache_get($cle) {
-		if (!$cle) return;
+		if (!$cle) {
+		    return;
+		}
 		# utiliser memoization si dispo
 		include_spip('inc/memoization');
-		if (!function_exists('cache_get')) return;
+		if (!function_exists('cache_get')) {
+		    return;
+		}
 		return cache_get($cle);
 	}
 
@@ -131,13 +139,17 @@ 
 	 * @return
 	 */
 	protected function cache_set($cle, $ttl, $valeur = null) {
-		if (!$cle) return;
+		if (!$cle) {
+		    return;
+		}
 		if (is_null($valeur)) {
 			$valeur = $this->tableau;
 		}
 		# utiliser memoization si dispo
 		include_spip('inc/memoization');
-		if (!function_exists('cache_set')) return;
+		if (!function_exists('cache_set')) {
+		    return;
+		}
 		return cache_set($cle,
 			array(
 				'data' => $valeur,
@@ -226,20 +238,23 @@ 
 		# 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];
 
 		# avons-nous un cache dispo ?
 		$cle = null;
-		if (is_string($src))
-			$cle = 'datasource_'.md5($this->command['sourcemode'].':'.var_export($this->command['source'],true));
+		if (is_string($src)) {
+					$cle = 'datasource_'.md5($this->command['sourcemode'].':'.var_export($this->command['source'],true));
+		}
 
 		$cache = $this->cache_get($cle);
-		if (isset($this->command['datacache']))
-			$ttl = intval($this->command['datacache']);
+		if (isset($this->command['datacache'])) {
+					$ttl = intval($this->command['datacache']);
+		}
 		if ($cache
 		AND ($cache['time'] + (isset($ttl) ? $ttl : $cache['ttl'])
 			> time())
@@ -248,11 +263,12 @@ 
 			AND autoriser('recalcul')
 		)) {
 			$this->tableau = $cache['data'];
-		}
-		else try {
+		} else {
+		    try {
 			# dommage que ca ne soit pas une option de yql_to_array...
 			if ($this->command['sourcemode'] == 'yql')
 				if (!isset($ttl)) $ttl = 3600;
+		}
 
 			if (isset($this->command['sourcemode'])
 			AND in_array($this->command['sourcemode'],
@@ -262,25 +278,34 @@ 
 				OR (is_string($a)
 				AND $a = str_replace('"', '"', $a) # fragile!
 				AND is_array($a = @unserialize($a)))
-				)
-					$this->tableau = $a;
-			}
-			else {
+				) {
+									$this->tableau = $a;
+				}
+			} else {
 				if (preg_match(',^https?://,', $src)) {
 					include_spip('inc/distant');
 					$u = recuperer_page($src, false, false, _DATA_SOURCE_MAX_SIZE);
-					if (!$u)
-						throw new Exception("404");
-					if (!isset($ttl)) $ttl = 24*3600;
+					if (!$u) {
+											throw new Exception("404");
+					}
+					if (!isset($ttl)) {
+					    $ttl = 24*3600;
+					}
 				} else if (@is_dir($src)) {
 					$u = $src;
-					if (!isset($ttl)) $ttl = 10;
+					if (!isset($ttl)) {
+					    $ttl = 10;
+					}
 				} else if (@is_readable($src) && @is_file($src)) {
 					$u = spip_file_get_contents($src);
-					if (!isset($ttl)) $ttl = 10;
+					if (!isset($ttl)) {
+					    $ttl = 10;
+					}
 				} else {
 					$u = $src;
-					if (!isset($ttl)) $ttl = 10;
+					if (!isset($ttl)) {
+					    $ttl = 10;
+					}
 				}
 				if (!$this->err
 				AND $g = charger_fonction($this->command['sourcemode'] . '_to_array', 'inc', true)) {
@@ -292,14 +317,15 @@ 
 				}
 			}
 
-			if (!is_array($this->tableau))
-				$this->err = true;
+			if (!is_array($this->tableau)) {
+							$this->err = true;
+			}
 
-			if (!$this->err AND isset($ttl) and $ttl>0)
-				$this->cache_set($cle, $ttl);
+			if (!$this->err AND isset($ttl) and $ttl>0) {
+							$this->cache_set($cle, $ttl);
+			}
 
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 			$e = $e->getMessage();
 			$err = sprintf("[%s, %s] $e",
 				$src,
@@ -348,10 +374,11 @@ 
 				$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']));
-		else
-			$enum = range(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']));
+		}
 		$this->tableau = $enum;
 	}
 
@@ -386,27 +413,30 @@ 
 			if (preg_match(',^\.?([/\w]+)( DESC)?$,iS', ltrim($tri, '/'), $r)) {
 				// tri par cle
 				if ($r[1] == 'cle'){
-					if (isset($r[2]) and $r[2])
-						krsort($this->tableau);
-					else
-						ksort($this->tableau);
+					if (isset($r[2]) and $r[2]) {
+											krsort($this->tableau);
+					} else {
+											ksort($this->tableau);
+					}
 				}
 				# {par hasard}
 				else if ($r[1] == 'alea') {
 					$k = array_keys($this->tableau);
 					shuffle($k);
 					$v = array();
-					foreach($k as $cle)
-						$v[$cle] = $this->tableau[$cle];
+					foreach($k as $cle) {
+											$v[$cle] = $this->tableau[$cle];
+					}
 					$this->tableau = $v;
-				}
-				else {
+				} else {
 					# {par valeur}
-					if ($r[1] == 'valeur')
-						$tv = '%s';
+					if ($r[1] == 'valeur') {
+											$tv = '%s';
+					}
 					# {par valeur/xx/yy} ??
-					else
-						$tv = 'table_valeur(%s, '.var_export($r[1],true).')';
+					else {
+											$tv = 'table_valeur(%s, '.var_export($r[1],true).')';
+					}
 					$sortfunc .= '
 					$a = '.sprintf($tv,'$aa').';
 					$b = '.sprintf($tv,'$bb').';
@@ -436,10 +466,11 @@ 
 			$vu = array();
 			foreach($this->tableau as $k => $v) {
 				$val = table_valeur($v, $fusion);
-				if (isset($vu[$val]))
-					unset($this->tableau[$k]);
-				else
-					$vu[$val] = true;
+				if (isset($vu[$val])) {
+									unset($this->tableau[$k]);
+				} else {
+									$vu[$val] = true;
+				}
 			}
 		}
 	}
@@ -474,8 +505,9 @@ 
 	 * @return void
 	 */
 	public function next(){
-		if ($this->valid())
-			list($this->cle, $this->valeur) = each($this->tableau);
+		if ($this->valid()) {
+					list($this->cle, $this->valeur) = each($this->tableau);
+		}
 	}
 
 	/**
@@ -483,8 +515,9 @@ 
 	 * @return int
 	 */
 	public function count() {
-		if (is_null($this->total))
-			$this->total = count($this->tableau);
+		if (is_null($this->total)) {
+					$this->total = count($this->tableau);
+		}
 	  return $this->total;
 	}
 }
@@ -568,8 +601,9 @@ 
 	$req = trim($v[2]);
 	if ($s = sql_query($req, $serveur)) {
 		$r = array();
-		while ($t = sql_fetch($s))
-			$r[] = $t;
+		while ($t = sql_fetch($s)) {
+					$r[] = $t;
+		}
 		return $r;
 	}
 	return false;
@@ -582,9 +616,10 @@ 
  */
 function inc_json_to_array_dist($u) {
 	if (is_array($json = json_decode($u))
-	OR is_object($json))
-		return (array) $json;
-}
+	OR is_object($json)) {
+			return (array) $json;
+	}
+	}
 
 /**
  * csv -> tableau
@@ -599,8 +634,9 @@ 
 	include_spip('inc/charsets');
 	foreach ($entete as $k => $v) {
 		$v = strtolower(preg_replace(',\W+,', '_', translitteration($v)));
-		foreach ($csv as &$item)
-			$item[$v] = &$item[$k];
+		foreach ($csv as &$item) {
+					$item[$v] = &$item[$k];
+		}
 	}
 	return $csv;
 }
@@ -612,8 +648,9 @@ 
  */
 function inc_rss_to_array_dist($u) {
 	include_spip('inc/syndic');
-	if (is_array($rss = analyser_backend($u)))
-		$tableau = $rss;
+	if (is_array($rss = analyser_backend($u))) {
+			$tableau = $rss;
+	}
 	return $tableau;
 }
 
@@ -681,8 +718,9 @@ 
 	$a = $glob($u);
 	foreach ($a as &$v) {
 		$b = (array) @stat($v);
-		foreach ($b as $k => $ignore)
-			if (is_numeric($k)) unset($b[$k]);
+		foreach ($b as $k => $ignore) {
+					if (is_numeric($k)) unset($b[$k]);
+		}
 		$b['file'] = preg_replace('`/$`','',$v) ;
 		$v = array_merge(
 			pathinfo($v),
@@ -704,14 +742,14 @@ 
 			$key .= '-'.uniqid();
 		}
 		$vars = get_object_vars($object->current());
-		if (isset($vars['@attributes']))
-			foreach($vars['@attributes'] as $k => $v)
+		if (isset($vars['@attributes'])) {
+					foreach($vars['@attributes'] as $k => $v)
 			$xml_array[$key][$k] = $v;
+		}
 		if($object->hasChildren()){
 			$xml_array[$key][] = XMLObjectToArray(
 				$object->current());
-		}
-		else{
+		} else{
 			$xml_array[$key][] = strval($object->current());
 		}
 	}