spip / SPIP

ecrire/inc/surligne.php

Spacing +3 added lines, -3 removed lines

@@ -39,17 +39,17 @@
 
 	$ref = $_SERVER['HTTP_REFERER'];
 	//avoid a js injection
-	if ($surcharge_surligne){
+	if ($surcharge_surligne) {
 		$surcharge_surligne = preg_replace(",(?<!\\\\)((?:(?>\\\\){2})*)('),", "$1\\\\$2", $surcharge_surligne);
 		$surcharge_surligne = str_replace("\\", "\\\\", $surcharge_surligne);
-		if ($GLOBALS['meta']['charset']=='utf-8'){
+		if ($GLOBALS['meta']['charset'] == 'utf-8') {
 			include_spip('inc/charsets');
 			if (!is_utf8($surcharge_surligne)) $surcharge_surligne = utf8_encode($surcharge_surligne);
 		}
 		$surcharge_surligne = preg_replace(',\*$,', '', trim($surcharge_surligne)); # supprimer un * final
 	}
 	foreach ($surlignejs_engines as $engine)
-		if ($surcharge_surligne || (preg_match($engine[0], $ref) && preg_match($engine[1], $ref))){
+		if ($surcharge_surligne || (preg_match($engine[0], $ref) && preg_match($engine[1], $ref))) {
 
 			//good referrer found or var_recherche is not null
 			include_spip('inc/filtres');

ecrire/inc/envoyer_mail.php

Spacing +21 added lines, -21 removed lines

@@ -27,14 +27,14 @@ 
 
 	if ($GLOBALS['meta']['charset'] <> 'utf-8') {
 		$t = str_replace(
-			array("&#8217;","&#8220;","&#8221;"),
-			array("'",      '"',      '"'),
+			array("&#8217;", "&#8220;", "&#8221;"),
+			array("'", '"', '"'),
 		$t);
 	}
 
 	$t = str_replace(
 		array("&mdash;", "&endash;"),
-		array("--","-" ),
+		array("--", "-"),
 	$t);
 
 	return $t;
@@ -83,12 +83,12 @@ 
 		$email_envoi = $destinataire;
 	}
 
-	if (is_array($corps)){
+	if (is_array($corps)) {
 		$texte = $corps['texte'];
-		$from = (isset($corps['from'])?$corps['from']:$from);
-		$headers = (isset($corps['headers'])?$corps['headers']:$headers);
+		$from = (isset($corps['from']) ? $corps['from'] : $from);
+		$headers = (isset($corps['headers']) ? $corps['headers'] : $headers);
 		if (is_array($headers))
-			$headers = implode("\n",$headers);
+			$headers = implode("\n", $headers);
 		$parts = "";
 		if ($corps['pieces_jointes'] AND function_exists('mail_embarquer_pieces_jointes'))
 			$parts = mail_embarquer_pieces_jointes($corps['pieces_jointes']);
@@ -99,7 +99,7 @@ 
 
 	// ceci est la RegExp NO_REAL_NAME faisant hurler SpamAssassin
 	if (preg_match('/^["\s]*\<?\S+\@\S+\>?\s*$/', $from))
-		$from .= ' (' . str_replace(')','', translitteration(str_replace('@', ' at ', $from))) . ')';
+		$from .= ' ('.str_replace(')', '', translitteration(str_replace('@', ' at ', $from))).')';
 
 	// nettoyer les &eacute; &#8217, &emdash; etc...
 	// les 'cliquer ici' etc sont a eviter;  voir:
@@ -117,24 +117,24 @@ 
 		mb_internal_encoding('utf-8');
 	}
 
-	if (function_exists('wordwrap') && (preg_match(',multipart/mixed,',$headers) == 0))
+	if (function_exists('wordwrap') && (preg_match(',multipart/mixed,', $headers) == 0))
 		$texte = wordwrap($texte);
 
 	list($headers, $texte) = mail_normaliser_headers($headers, $from, $destinataire, $texte, $parts);
 
 	if (_OS_SERVEUR == 'windows') {
-		$texte = preg_replace ("@\r*\n@","\r\n", $texte);
-		$headers = preg_replace ("@\r*\n@","\r\n", $headers);
-		$sujet = preg_replace ("@\r*\n@","\r\n", $sujet);
+		$texte = preg_replace("@\r*\n@", "\r\n", $texte);
+		$headers = preg_replace("@\r*\n@", "\r\n", $headers);
+		$sujet = preg_replace("@\r*\n@", "\r\n", $sujet);
 	}
 
-	spip_log("mail $destinataire\n$sujet\n$headers",'mails');
+	spip_log("mail $destinataire\n$sujet\n$headers", 'mails');
 	// mode TEST : forcer l'email
 	if (defined('_TEST_EMAIL_DEST')) {
 		if (!_TEST_EMAIL_DEST)
 			return false;
 		else {
-			$texte = "Dest : $destinataire\r\n" . $texte;
+			$texte = "Dest : $destinataire\r\n".$texte;
 			$destinataire = _TEST_EMAIL_DEST;
 		}
 	}
@@ -142,7 +142,7 @@ 
 	return @mail($destinataire, $sujet, $texte, $headers);
 }
 
-function mail_normaliser_headers($headers, $from, $to, $texte, $parts="")
+function mail_normaliser_headers($headers, $from, $to, $texte, $parts = "")
 {
 	$charset = $GLOBALS['meta']['charset'];
 
@@ -155,15 +155,15 @@ 
 
 	// calculer un identifiant unique
 	preg_match('/@\S+/', $from, $domain);
-	$uniq = rand() . '_' . md5($to . $texte) . $domain[0];
+	$uniq = rand().'_'.md5($to.$texte).$domain[0];
 
 	// Si multi-part, s'en servir comme borne ...
 	if ($parts) {
-		$texte = "--$uniq\n$type\n" . $texte ."\n";
+		$texte = "--$uniq\n$type\n".$texte."\n";
 		foreach ($parts as $part) {
-			$n = strlen($part[1]) . ($part[0] ? "\n" : '');
+			$n = strlen($part[1]).($part[0] ? "\n" : '');
 			$e = join("\n", $part[0]);
-			$texte .= "\n--$uniq\nContent-Length: $n$e\n\n" . $part[1];
+			$texte .= "\n--$uniq\nContent-Length: $n$e\n\n".$part[1];
 		}
 		$texte .= "\n\n--$uniq--\n";
 		// Si boundary n'est pas entre guillemets,
@@ -173,11 +173,11 @@ 
 
 	// .. et s'en servir pour plaire a SpamAssassin
 
-	$mid = 'Message-Id: <' . $uniq . ">";
+	$mid = 'Message-Id: <'.$uniq.">";
 
 	// indispensable pour les sites qui collent d'office From: serveur-http
 	// sauf si deja mis par l'envoyeur
-	$rep = (strpos($headers,"Reply-To:")!==FALSE) ? '' : "Reply-To: $from\n";
+	$rep = (strpos($headers, "Reply-To:") !== FALSE) ? '' : "Reply-To: $from\n";
 
 	// Nettoyer les en-tetes envoyees
 	// Ajouter le \n final

ecrire/inc/math.php

Spacing +14 added lines, -14 removed lines

@@ -37,8 +37,8 @@ 
 
 	// Regarder dans le repertoire local des images TeX et blocs MathML
 	if (!@is_dir($dir_tex = _DIR_VAR.'cache-TeX/'))
-		@mkdir ($dir_tex, _SPIP_CHMOD);
-	$fichier = $dir_tex .md5(trim($tex)).$ext;
+		@mkdir($dir_tex, _SPIP_CHMOD);
+	$fichier = $dir_tex.md5(trim($tex)).$ext;
 	
 
 	if (!@file_exists($fichier)) {
@@ -46,7 +46,7 @@ 
 		if ($server) {
 			spip_log($url = $server.'?'.rawurlencode($tex));
 			include_spip('inc/distant');
-			recuperer_page($url,$fichier);
+			recuperer_page($url, $fichier);
 		}
 	}
 
@@ -57,7 +57,7 @@ 
 
 		// MathML
 		if ($traiter_math == 'mathml') {
-			return join(file("$fichier"),"");
+			return join(file("$fichier"), "");
 		}
 
 		// TeX
@@ -76,35 +76,35 @@ 
 
 // Fonction appelee par propre() s'il repere un mode <math>
 // http://doc.spip.org/@traiter_math
-function traiter_math($letexte, $source='') {
+function traiter_math($letexte, $source = '') {
 
 	$texte_a_voir = $letexte;
 	while (($debut = strpos($texte_a_voir, "<math>")) !== false) {
-		if (!$fin = strpos($texte_a_voir,"</math>"))
+		if (!$fin = strpos($texte_a_voir, "</math>"))
 			$fin = strlen($texte_a_voir);
 
 		$texte_debut = substr($texte_a_voir, 0, $debut);
 		$texte_milieu = substr($texte_a_voir,
-			$debut+strlen("<math>"), $fin-$debut-strlen("<math>"));
+			$debut + strlen("<math>"), $fin - $debut - strlen("<math>"));
 		$texte_fin = substr($texte_a_voir,
-			$fin+strlen("</math>"), strlen($texte_a_voir));
+			$fin + strlen("</math>"), strlen($texte_a_voir));
 
 		// Les doubles $$x^2$$ en mode 'div'
-		while((preg_match(",[$][$]([^$]+)[$][$],",$texte_milieu, $regs))) {
+		while ((preg_match(",[$][$]([^$]+)[$][$],", $texte_milieu, $regs))) {
 			$echap = "\n<p class=\"spip\" style=\"text-align: center;\">".produire_image_math($regs[1])."</p>\n";
 			$pos = strpos($texte_milieu, $regs[0]);
-			$texte_milieu = substr($texte_milieu,0,$pos)
+			$texte_milieu = substr($texte_milieu, 0, $pos)
 				. code_echappement($echap, $source)
-				. substr($texte_milieu,$pos+strlen($regs[0]));
+				. substr($texte_milieu, $pos + strlen($regs[0]));
 		}
 
 		// Les simples $x^2$ en mode 'span'
-		while((preg_match(",[$]([^$]+)[$],",$texte_milieu, $regs))) {
+		while ((preg_match(",[$]([^$]+)[$],", $texte_milieu, $regs))) {
 			$echap = produire_image_math($regs[1]);
 			$pos = strpos($texte_milieu, $regs[0]);
-			$texte_milieu = substr($texte_milieu,0,$pos)
+			$texte_milieu = substr($texte_milieu, 0, $pos)
 				. code_echappement($echap, $source)
-				. substr($texte_milieu,$pos+strlen($regs[0]));
+				. substr($texte_milieu, $pos + strlen($regs[0]));
 		}
 
 		$texte_a_voir = $texte_debut.$texte_milieu.$texte_fin;

ecrire/inc/chercher_logo.php

Spacing +4 added lines, -4 removed lines

@@ -13,15 +13,15 @@ 
 if (!defined('_ECRIRE_INC_VERSION')) return;
 
 // http://doc.spip.org/@inc_chercher_logo_dist
-function inc_chercher_logo_dist($id, $_id_objet, $mode='on') {
+function inc_chercher_logo_dist($id, $_id_objet, $mode = 'on') {
 	global $formats_logos;
 	# attention au cas $id = '0' pour LOGO_SITE_SPIP : utiliser intval()
 
 	$type = type_du_logo($_id_objet);
-	$nom = $type . $mode . intval($id);
+	$nom = $type.$mode.intval($id);
 
 	foreach ($formats_logos as $format) {
-		if (@file_exists($d = (_DIR_LOGOS . $nom . '.' . $format))) {
+		if (@file_exists($d = (_DIR_LOGOS.$nom.'.'.$format))) {
 			return array($d, _DIR_LOGOS, $nom, $format, @filemtime($d));
 		}
 	}
@@ -33,7 +33,7 @@ 
 function type_du_logo($_id_objet) {
 	return isset($GLOBALS['table_logos'][$_id_objet])
 		? $GLOBALS['table_logos'][$_id_objet]
-		: objet_type(preg_replace(',^id_,','',$_id_objet));
+		: objet_type(preg_replace(',^id_,', '', $_id_objet));
 }
 
 // Exceptions standards (historique)

ecrire/inc/pclzip.php

Spacing +282 added lines, -282 removed lines

@@ -35,7 +35,7 @@ 
 
   // ----- Constants
   if (!defined('PCLZIP_READ_BLOCK_SIZE')) {
-    define( 'PCLZIP_READ_BLOCK_SIZE', 2048 );
+    define('PCLZIP_READ_BLOCK_SIZE', 2048);
   }
   
   // ----- File list separator
@@ -49,7 +49,7 @@ 
   //define( 'PCLZIP_SEPARATOR', ' ' );
   // Recommanded values for smart separation of filenames.
   if (!defined('PCLZIP_SEPARATOR')) {
-    define( 'PCLZIP_SEPARATOR', ',' );
+    define('PCLZIP_SEPARATOR', ',');
   }
 
   // ----- Error configuration
@@ -58,7 +58,7 @@ 
   //     you must ensure that you have included PclError library.
   // [2,...] : reserved for futur use
   if (!defined('PCLZIP_ERROR_EXTERNAL')) {
-    define( 'PCLZIP_ERROR_EXTERNAL', 0 );
+    define('PCLZIP_ERROR_EXTERNAL', 0);
   }
 
   // ----- Optional static temporary directory
@@ -71,7 +71,7 @@ 
   // define( 'PCLZIP_TEMPORARY_DIR', '/temp/' );
   // define( 'PCLZIP_TEMPORARY_DIR', 'C:/Temp/' );
   if (!defined('PCLZIP_TEMPORARY_DIR')) {
-    define( 'PCLZIP_TEMPORARY_DIR', '' );
+    define('PCLZIP_TEMPORARY_DIR', '');
   }
 
   // ----- Optional threshold ratio for use of temporary files
@@ -83,7 +83,7 @@ 
   //       Samples :
   // define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.5 );
   if (!defined('PCLZIP_TEMPORARY_FILE_RATIO')) {
-    define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.47 );
+    define('PCLZIP_TEMPORARY_FILE_RATIO', 0.47);
   }
 
 // --------------------------------------------------------------------------------
@@ -108,72 +108,72 @@ 
   //  -12 : Unable to rename file (rename)
   //  -13 : Invalid header checksum
   //  -14 : Invalid archive size
-  define( 'PCLZIP_ERR_USER_ABORTED', 2 );
-  define( 'PCLZIP_ERR_NO_ERROR', 0 );
-  define( 'PCLZIP_ERR_WRITE_OPEN_FAIL', -1 );
-  define( 'PCLZIP_ERR_READ_OPEN_FAIL', -2 );
-  define( 'PCLZIP_ERR_INVALID_PARAMETER', -3 );
-  define( 'PCLZIP_ERR_MISSING_FILE', -4 );
-  define( 'PCLZIP_ERR_FILENAME_TOO_LONG', -5 );
-  define( 'PCLZIP_ERR_INVALID_ZIP', -6 );
-  define( 'PCLZIP_ERR_BAD_EXTRACTED_FILE', -7 );
-  define( 'PCLZIP_ERR_DIR_CREATE_FAIL', -8 );
-  define( 'PCLZIP_ERR_BAD_EXTENSION', -9 );
-  define( 'PCLZIP_ERR_BAD_FORMAT', -10 );
-  define( 'PCLZIP_ERR_DELETE_FILE_FAIL', -11 );
-  define( 'PCLZIP_ERR_RENAME_FILE_FAIL', -12 );
-  define( 'PCLZIP_ERR_BAD_CHECKSUM', -13 );
-  define( 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP', -14 );
-  define( 'PCLZIP_ERR_MISSING_OPTION_VALUE', -15 );
-  define( 'PCLZIP_ERR_INVALID_OPTION_VALUE', -16 );
-  define( 'PCLZIP_ERR_ALREADY_A_DIRECTORY', -17 );
-  define( 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION', -18 );
-  define( 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION', -19 );
-  define( 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE', -20 );
-  define( 'PCLZIP_ERR_DIRECTORY_RESTRICTION', -21 );
+  define('PCLZIP_ERR_USER_ABORTED', 2);
+  define('PCLZIP_ERR_NO_ERROR', 0);
+  define('PCLZIP_ERR_WRITE_OPEN_FAIL', -1);
+  define('PCLZIP_ERR_READ_OPEN_FAIL', -2);
+  define('PCLZIP_ERR_INVALID_PARAMETER', -3);
+  define('PCLZIP_ERR_MISSING_FILE', -4);
+  define('PCLZIP_ERR_FILENAME_TOO_LONG', -5);
+  define('PCLZIP_ERR_INVALID_ZIP', -6);
+  define('PCLZIP_ERR_BAD_EXTRACTED_FILE', -7);
+  define('PCLZIP_ERR_DIR_CREATE_FAIL', -8);
+  define('PCLZIP_ERR_BAD_EXTENSION', -9);
+  define('PCLZIP_ERR_BAD_FORMAT', -10);
+  define('PCLZIP_ERR_DELETE_FILE_FAIL', -11);
+  define('PCLZIP_ERR_RENAME_FILE_FAIL', -12);
+  define('PCLZIP_ERR_BAD_CHECKSUM', -13);
+  define('PCLZIP_ERR_INVALID_ARCHIVE_ZIP', -14);
+  define('PCLZIP_ERR_MISSING_OPTION_VALUE', -15);
+  define('PCLZIP_ERR_INVALID_OPTION_VALUE', -16);
+  define('PCLZIP_ERR_ALREADY_A_DIRECTORY', -17);
+  define('PCLZIP_ERR_UNSUPPORTED_COMPRESSION', -18);
+  define('PCLZIP_ERR_UNSUPPORTED_ENCRYPTION', -19);
+  define('PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE', -20);
+  define('PCLZIP_ERR_DIRECTORY_RESTRICTION', -21);
 
   // ----- Options values
-  define( 'PCLZIP_OPT_PATH', 77001 );
-  define( 'PCLZIP_OPT_ADD_PATH', 77002 );
-  define( 'PCLZIP_OPT_REMOVE_PATH', 77003 );
-  define( 'PCLZIP_OPT_REMOVE_ALL_PATH', 77004 );
-  define( 'PCLZIP_OPT_SET_CHMOD', 77005 );
-  define( 'PCLZIP_OPT_EXTRACT_AS_STRING', 77006 );
-  define( 'PCLZIP_OPT_NO_COMPRESSION', 77007 );
-  define( 'PCLZIP_OPT_BY_NAME', 77008 );
-  define( 'PCLZIP_OPT_BY_INDEX', 77009 );
-  define( 'PCLZIP_OPT_BY_EREG', 77010 );
-  define( 'PCLZIP_OPT_BY_PREG', 77011 );
-  define( 'PCLZIP_OPT_COMMENT', 77012 );
-  define( 'PCLZIP_OPT_ADD_COMMENT', 77013 );
-  define( 'PCLZIP_OPT_PREPEND_COMMENT', 77014 );
-  define( 'PCLZIP_OPT_EXTRACT_IN_OUTPUT', 77015 );
-  define( 'PCLZIP_OPT_REPLACE_NEWER', 77016 );
-  define( 'PCLZIP_OPT_STOP_ON_ERROR', 77017 );
+  define('PCLZIP_OPT_PATH', 77001);
+  define('PCLZIP_OPT_ADD_PATH', 77002);
+  define('PCLZIP_OPT_REMOVE_PATH', 77003);
+  define('PCLZIP_OPT_REMOVE_ALL_PATH', 77004);
+  define('PCLZIP_OPT_SET_CHMOD', 77005);
+  define('PCLZIP_OPT_EXTRACT_AS_STRING', 77006);
+  define('PCLZIP_OPT_NO_COMPRESSION', 77007);
+  define('PCLZIP_OPT_BY_NAME', 77008);
+  define('PCLZIP_OPT_BY_INDEX', 77009);
+  define('PCLZIP_OPT_BY_EREG', 77010);
+  define('PCLZIP_OPT_BY_PREG', 77011);
+  define('PCLZIP_OPT_COMMENT', 77012);
+  define('PCLZIP_OPT_ADD_COMMENT', 77013);
+  define('PCLZIP_OPT_PREPEND_COMMENT', 77014);
+  define('PCLZIP_OPT_EXTRACT_IN_OUTPUT', 77015);
+  define('PCLZIP_OPT_REPLACE_NEWER', 77016);
+  define('PCLZIP_OPT_STOP_ON_ERROR', 77017);
   // Having big trouble with crypt. Need to multiply 2 long int
   // which is not correctly supported by PHP ...
   //define( 'PCLZIP_OPT_CRYPT', 77018 );
-  define( 'PCLZIP_OPT_EXTRACT_DIR_RESTRICTION', 77019 );
-  define( 'PCLZIP_OPT_TEMP_FILE_THRESHOLD', 77020 );
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD', 77020 ); // alias
-  define( 'PCLZIP_OPT_TEMP_FILE_ON', 77021 );
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_ON', 77021 ); // alias
-  define( 'PCLZIP_OPT_TEMP_FILE_OFF', 77022 );
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_OFF', 77022 ); // alias
+  define('PCLZIP_OPT_EXTRACT_DIR_RESTRICTION', 77019);
+  define('PCLZIP_OPT_TEMP_FILE_THRESHOLD', 77020);
+  define('PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD', 77020); // alias
+  define('PCLZIP_OPT_TEMP_FILE_ON', 77021);
+  define('PCLZIP_OPT_ADD_TEMP_FILE_ON', 77021); // alias
+  define('PCLZIP_OPT_TEMP_FILE_OFF', 77022);
+  define('PCLZIP_OPT_ADD_TEMP_FILE_OFF', 77022); // alias
   
   // ----- File description attributes
-  define( 'PCLZIP_ATT_FILE_NAME', 79001 );
-  define( 'PCLZIP_ATT_FILE_NEW_SHORT_NAME', 79002 );
-  define( 'PCLZIP_ATT_FILE_NEW_FULL_NAME', 79003 );
-  define( 'PCLZIP_ATT_FILE_MTIME', 79004 );
-  define( 'PCLZIP_ATT_FILE_CONTENT', 79005 );
-  define( 'PCLZIP_ATT_FILE_COMMENT', 79006 );
+  define('PCLZIP_ATT_FILE_NAME', 79001);
+  define('PCLZIP_ATT_FILE_NEW_SHORT_NAME', 79002);
+  define('PCLZIP_ATT_FILE_NEW_FULL_NAME', 79003);
+  define('PCLZIP_ATT_FILE_MTIME', 79004);
+  define('PCLZIP_ATT_FILE_CONTENT', 79005);
+  define('PCLZIP_ATT_FILE_COMMENT', 79006);
 
   // ----- Call backs values
-  define( 'PCLZIP_CB_PRE_EXTRACT', 78001 );
-  define( 'PCLZIP_CB_POST_EXTRACT', 78002 );
-  define( 'PCLZIP_CB_PRE_ADD', 78003 );
-  define( 'PCLZIP_CB_POST_ADD', 78004 );
+  define('PCLZIP_CB_PRE_EXTRACT', 78001);
+  define('PCLZIP_CB_POST_EXTRACT', 78002);
+  define('PCLZIP_CB_PRE_ADD', 78003);
+  define('PCLZIP_CB_POST_ADD', 78004);
   /* For futur use
   define( 'PCLZIP_CB_PRE_LIST', 78005 );
   define( 'PCLZIP_CB_POST_LIST', 78006 );
@@ -278,7 +278,7 @@ 
   // --------------------------------------------------------------------------------
   function create($p_filelist)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Reset the error handler
     $this->privErrorReset();
@@ -304,7 +304,7 @@ 
 
         // ----- Parse the options
         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',
+                                            array(PCLZIP_OPT_REMOVE_PATH => 'optional',
                                                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
                                                    PCLZIP_OPT_ADD_PATH => 'optional',
                                                    PCLZIP_CB_PRE_ADD => 'optional',
@@ -390,7 +390,7 @@ 
     
     // ----- For each file in the list check the attributes
     $v_supported_attributes
-    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
+    = array(PCLZIP_ATT_FILE_NAME => 'mandatory'
              ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
              ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
              ,PCLZIP_ATT_FILE_MTIME => 'optional'
@@ -461,7 +461,7 @@ 
   // --------------------------------------------------------------------------------
   function add($p_filelist)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Reset the error handler
     $this->privErrorReset();
@@ -487,7 +487,7 @@ 
 
         // ----- Parse the options
         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',
+                                            array(PCLZIP_OPT_REMOVE_PATH => 'optional',
                                                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
                                                    PCLZIP_OPT_ADD_PATH => 'optional',
                                                    PCLZIP_CB_PRE_ADD => 'optional',
@@ -573,7 +573,7 @@ 
     
     // ----- For each file in the list check the attributes
     $v_supported_attributes
-    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
+    = array(PCLZIP_ATT_FILE_NAME => 'mandatory'
              ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
              ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
              ,PCLZIP_ATT_FILE_MTIME => 'optional'
@@ -650,7 +650,7 @@ 
   // --------------------------------------------------------------------------------
   function listContent()
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Reset the error handler
     $this->privErrorReset();
@@ -707,7 +707,7 @@ 
   // --------------------------------------------------------------------------------
   function extract()
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Reset the error handler
     $this->privErrorReset();
@@ -740,7 +740,7 @@ 
 
         // ----- Parse the options
         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_PATH => 'optional',
+                                            array(PCLZIP_OPT_PATH => 'optional',
                                                    PCLZIP_OPT_REMOVE_PATH => 'optional',
                                                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
                                                    PCLZIP_OPT_ADD_PATH => 'optional',
@@ -864,7 +864,7 @@ 
   //function extractByIndex($p_index, options...)
   function extractByIndex($p_index)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Reset the error handler
     $this->privErrorReset();
@@ -901,7 +901,7 @@ 
 
         // ----- Parse the options
         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_PATH => 'optional',
+                                            array(PCLZIP_OPT_PATH => 'optional',
                                                    PCLZIP_OPT_REMOVE_PATH => 'optional',
                                                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
                                                    PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
@@ -971,10 +971,10 @@ 
     // ----- Trick
     // Here I want to reuse extractByRule(), so I need to parse the $p_index
     // with privParseOptions()
-    $v_arg_trick = array (PCLZIP_OPT_BY_INDEX, $p_index);
+    $v_arg_trick = array(PCLZIP_OPT_BY_INDEX, $p_index);
     $v_options_trick = array();
     $v_result = $this->privParseOptions($v_arg_trick, sizeof($v_arg_trick), $v_options_trick,
-                                        array (PCLZIP_OPT_BY_INDEX => 'optional' ));
+                                        array(PCLZIP_OPT_BY_INDEX => 'optional'));
     if ($v_result != 1) {
         return 0;
     }
@@ -1013,7 +1013,7 @@ 
   // --------------------------------------------------------------------------------
   function delete()
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Reset the error handler
     $this->privErrorReset();
@@ -1036,10 +1036,10 @@ 
 
       // ----- Parse the options
       $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                        array (PCLZIP_OPT_BY_NAME => 'optional',
+                                        array(PCLZIP_OPT_BY_NAME => 'optional',
                                                PCLZIP_OPT_BY_EREG => 'optional',
                                                PCLZIP_OPT_BY_PREG => 'optional',
-                                               PCLZIP_OPT_BY_INDEX => 'optional' ));
+                                               PCLZIP_OPT_BY_INDEX => 'optional'));
       if ($v_result != 1) {
           return 0;
       }
@@ -1293,9 +1293,9 @@ 
   // Description :
   // Parameters :
   // --------------------------------------------------------------------------------
-  function errorName($p_with_code=false)
+  function errorName($p_with_code = false)
   {
-    $v_name = array ( PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR',
+    $v_name = array(PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR',
                       PCLZIP_ERR_WRITE_OPEN_FAIL => 'PCLZIP_ERR_WRITE_OPEN_FAIL',
                       PCLZIP_ERR_READ_OPEN_FAIL => 'PCLZIP_ERR_READ_OPEN_FAIL',
                       PCLZIP_ERR_INVALID_PARAMETER => 'PCLZIP_ERR_INVALID_PARAMETER',
@@ -1339,7 +1339,7 @@ 
   // Description :
   // Parameters :
   // --------------------------------------------------------------------------------
-  function errorInfo($p_full=false)
+  function errorInfo($p_full = false)
   {
     if (PCLZIP_ERROR_EXTERNAL == 1) {
       return(PclErrorString());
@@ -1378,7 +1378,7 @@ 
   //   true on success,
   //   false on error, the error code is set.
   // --------------------------------------------------------------------------------
-  function privCheckFormat($p_level=0)
+  function privCheckFormat($p_level = 0)
   {
     $v_result = true;
 
@@ -1431,13 +1431,13 @@ 
   //   1 on success.
   //   0 on failure.
   // --------------------------------------------------------------------------------
-  function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options=false)
+  function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options = false)
   {
-    $v_result=1;
+    $v_result = 1;
     
     // ----- Read the options
-    $i=0;
-    while ($i<$p_size) {
+    $i = 0;
+    while ($i < $p_size) {
 
       // ----- Check if the option is supported
       if (!isset($v_requested_options[$p_options_list[$i]])) {
@@ -1455,7 +1455,7 @@ 
         case PCLZIP_OPT_REMOVE_PATH :
         case PCLZIP_OPT_ADD_PATH :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1464,13 +1464,13 @@ 
           }
 
           // ----- Get the value
-          $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
+          $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i + 1], FALSE);
           $i++;
         break;
 
         case PCLZIP_OPT_TEMP_FILE_THRESHOLD :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
             return PclZip::errorCode();
           }
@@ -1482,14 +1482,14 @@ 
           }
           
           // ----- Check the value
-          $v_value = $p_options_list[$i+1];
-          if ((!is_integer($v_value)) || ($v_value<0)) {
+          $v_value = $p_options_list[$i + 1];
+          if ((!is_integer($v_value)) || ($v_value < 0)) {
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Integer expected for option '".PclZipUtilOptionText($p_options_list[$i])."'");
             return PclZip::errorCode();
           }
 
           // ----- Get the value (and convert it in bytes)
-          $v_result_list[$p_options_list[$i]] = $v_value*1048576;
+          $v_result_list[$p_options_list[$i]] = $v_value * 1048576;
           $i++;
         break;
 
@@ -1520,7 +1520,7 @@ 
 
         case PCLZIP_OPT_EXTRACT_DIR_RESTRICTION :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1529,9 +1529,9 @@ 
           }
 
           // ----- Get the value
-          if (   is_string($p_options_list[$i+1])
-              && ($p_options_list[$i+1] != '')) {
-            $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
+          if (is_string($p_options_list[$i + 1])
+              && ($p_options_list[$i + 1] != '')) {
+            $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i + 1], FALSE);
             $i++;
           }
           else {
@@ -1541,7 +1541,7 @@ 
         // ----- Look for options that request an array of string for value
         case PCLZIP_OPT_BY_NAME :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1550,11 +1550,11 @@ 
           }
 
           // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i+1];
+          if (is_string($p_options_list[$i + 1])) {
+              $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i + 1];
           }
-          else if (is_array($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+          else if (is_array($p_options_list[$i + 1])) {
+              $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
           }
           else {
             // ----- Error log
@@ -1574,7 +1574,7 @@ 
         case PCLZIP_OPT_BY_PREG :
         //case PCLZIP_OPT_CRYPT :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1583,8 +1583,8 @@ 
           }
 
           // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+          if (is_string($p_options_list[$i + 1])) {
+              $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
           }
           else {
             // ----- Error log
@@ -1601,7 +1601,7 @@ 
         case PCLZIP_OPT_ADD_COMMENT :
         case PCLZIP_OPT_PREPEND_COMMENT :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE,
 			                     "Missing parameter value for option '"
@@ -1613,8 +1613,8 @@ 
           }
 
           // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+          if (is_string($p_options_list[$i + 1])) {
+              $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
           }
           else {
             // ----- Error log
@@ -1632,7 +1632,7 @@ 
         // ----- Look for options that request an array of index
         case PCLZIP_OPT_BY_INDEX :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1642,19 +1642,19 @@ 
 
           // ----- Get the value
           $v_work_list = array();
-          if (is_string($p_options_list[$i+1])) {
+          if (is_string($p_options_list[$i + 1])) {
 
               // ----- Remove spaces
-              $p_options_list[$i+1] = strtr($p_options_list[$i+1], ' ', '');
+              $p_options_list[$i + 1] = strtr($p_options_list[$i + 1], ' ', '');
 
               // ----- Parse items
-              $v_work_list = explode(",", $p_options_list[$i+1]);
+              $v_work_list = explode(",", $p_options_list[$i + 1]);
           }
-          else if (is_integer($p_options_list[$i+1])) {
-              $v_work_list[0] = $p_options_list[$i+1].'-'.$p_options_list[$i+1];
+          else if (is_integer($p_options_list[$i + 1])) {
+              $v_work_list[0] = $p_options_list[$i + 1].'-'.$p_options_list[$i + 1];
           }
-          else if (is_array($p_options_list[$i+1])) {
-              $v_work_list = $p_options_list[$i+1];
+          else if (is_array($p_options_list[$i + 1])) {
+              $v_work_list = $p_options_list[$i + 1];
           }
           else {
             // ----- Error log
@@ -1668,9 +1668,9 @@ 
           // each index item in the list must be a couple with a start and
           // an end value : [0,3], [5-5], [8-10], ...
           // ----- Check the format of each item
-          $v_sort_flag=false;
-          $v_sort_value=0;
-          for ($j=0; $j<sizeof($v_work_list); $j++) {
+          $v_sort_flag = false;
+          $v_sort_value = 0;
+          for ($j = 0; $j < sizeof($v_work_list); $j++) {
               // ----- Explode the item
               $v_item_list = explode("-", $v_work_list[$j]);
               $v_size_item_list = sizeof($v_item_list);
@@ -1700,7 +1700,7 @@ 
 
               // ----- Look for list sort
               if ($v_result_list[$p_options_list[$i]][$j]['start'] < $v_sort_value) {
-                  $v_sort_flag=true;
+                  $v_sort_flag = true;
 
                   // ----- TBC : An automatic sort should be writen ...
                   // ----- Error log
@@ -1734,7 +1734,7 @@ 
         // ----- Look for options that request an octal value
         case PCLZIP_OPT_SET_CHMOD :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1743,7 +1743,7 @@ 
           }
 
           // ----- Get the value
-          $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+          $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
           $i++;
         break;
 
@@ -1759,7 +1759,7 @@ 
         case PCLZIP_CB_POST_LIST :
         */
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1768,7 +1768,7 @@ 
           }
 
           // ----- Get the value
-          $v_function_name = $p_options_list[$i+1];
+          $v_function_name = $p_options_list[$i + 1];
 
           // ----- Check that the value is a valid existing function
           if (!function_exists($v_function_name)) {
@@ -1800,7 +1800,7 @@ 
 
     // ----- Look for mandatory options
     if ($v_requested_options !== false) {
-      for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
+      for ($key = reset($v_requested_options); $key = key($v_requested_options); $key = next($v_requested_options)) {
         // ----- Look for mandatory option
         if ($v_requested_options[$key] == 'mandatory') {
           // ----- Look if present
@@ -1833,7 +1833,7 @@ 
   // --------------------------------------------------------------------------------
   function privOptionDefaultThreshold(&$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
     
     if (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
         || isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) {
@@ -1845,16 +1845,16 @@ 
     $v_memory_limit = trim($v_memory_limit);
     $last = strtolower(substr($v_memory_limit, -1));
  
-    if($last == 'g')
+    if ($last == 'g')
         //$v_memory_limit = $v_memory_limit*1024*1024*1024;
-        $v_memory_limit = $v_memory_limit*1073741824;
-    if($last == 'm')
+        $v_memory_limit = $v_memory_limit * 1073741824;
+    if ($last == 'm')
         //$v_memory_limit = $v_memory_limit*1024*1024;
-        $v_memory_limit = $v_memory_limit*1048576;
-    if($last == 'k')
-        $v_memory_limit = $v_memory_limit*1024;
+        $v_memory_limit = $v_memory_limit * 1048576;
+    if ($last == 'k')
+        $v_memory_limit = $v_memory_limit * 1024;
             
-    $p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit*PCLZIP_TEMPORARY_FILE_RATIO);
+    $p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit * PCLZIP_TEMPORARY_FILE_RATIO);
     
 
     // ----- Sanity check : No threshold if value lower than 1M
@@ -1875,9 +1875,9 @@ 
   //   1 on success.
   //   0 on failure.
   // --------------------------------------------------------------------------------
-  function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options=false)
+  function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options = false)
   {
-    $v_result=1;
+    $v_result = 1;
     
     // ----- For each file in the list check the attributes
     foreach ($p_file_list as $v_key => $v_value) {
@@ -1970,7 +1970,7 @@ 
 
       // ----- Look for mandatory options
       if ($v_requested_options !== false) {
-        for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
+        for ($key = reset($v_requested_options); $key = key($v_requested_options); $key = next($v_requested_options)) {
           // ----- Look for mandatory option
           if ($v_requested_options[$key] == 'mandatory') {
             // ----- Look if present
@@ -2006,13 +2006,13 @@ 
   // --------------------------------------------------------------------------------
   function privFileDescrExpand(&$p_filedescr_list, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
     
     // ----- Create a result list
     $v_result_list = array();
     
     // ----- Look each entry
-    for ($i=0; $i<sizeof($p_filedescr_list); $i++) {
+    for ($i = 0; $i < sizeof($p_filedescr_list); $i++) {
       
       // ----- Get filedescr
       $v_descr = $p_filedescr_list[$i];
@@ -2131,7 +2131,7 @@ 
   // --------------------------------------------------------------------------------
   function privCreate($p_filedescr_list, &$p_result_list, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
     $v_list_detail = array();
     
     // ----- Magic quotes trick
@@ -2166,7 +2166,7 @@ 
   // --------------------------------------------------------------------------------
   function privAdd($p_filedescr_list, &$p_result_list, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
     $v_list_detail = array();
 
     // ----- Look if the archive exists or is empty
@@ -2183,7 +2183,7 @@ 
     $this->privDisableMagicQuotes();
 
     // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
+    if (($v_result = $this->privOpenFd('rb')) != 1)
     {
       // ----- Magic quotes trick
       $this->privSwapBackMagicQuotes();
@@ -2264,7 +2264,7 @@ 
     }
 
     // ----- Create the Central Dir files header
-    for ($i=0, $v_count=0; $i<sizeof($v_header_list); $i++)
+    for ($i = 0, $v_count = 0; $i < sizeof($v_header_list); $i++)
     {
       // ----- Create the file header
       if ($v_header_list[$i]['status'] == 'ok') {
@@ -2297,10 +2297,10 @@ 
     }
 
     // ----- Calculate the size of the central header
-    $v_size = @ftell($this->zip_fd)-$v_offset;
+    $v_size = @ftell($this->zip_fd) - $v_offset;
 
     // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_count+$v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1)
+    if (($v_result = $this->privWriteCentralHeader($v_count + $v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1)
     {
       // ----- Reset the file list
       unset($v_header_list);
@@ -2345,7 +2345,7 @@ 
   // --------------------------------------------------------------------------------
   function privOpenFd($p_mode)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Look if already open
     if ($this->zip_fd != 0)
@@ -2379,7 +2379,7 @@ 
   // --------------------------------------------------------------------------------
   function privCloseFd()
   {
-    $v_result=1;
+    $v_result = 1;
 
     if ($this->zip_fd != 0)
       @fclose($this->zip_fd);
@@ -2406,7 +2406,7 @@ 
 //  function privAddList($p_list, &$p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_options)
   function privAddList($p_filedescr_list, &$p_result_list, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Add the files
     $v_header_list = array();
@@ -2420,7 +2420,7 @@ 
     $v_offset = @ftell($this->zip_fd);
 
     // ----- Create the Central Dir files header
-    for ($i=0,$v_count=0; $i<sizeof($v_header_list); $i++)
+    for ($i = 0, $v_count = 0; $i < sizeof($v_header_list); $i++)
     {
       // ----- Create the file header
       if ($v_header_list[$i]['status'] == 'ok') {
@@ -2442,7 +2442,7 @@ 
     }
 
     // ----- Calculate the size of the central header
-    $v_size = @ftell($this->zip_fd)-$v_offset;
+    $v_size = @ftell($this->zip_fd) - $v_offset;
 
     // ----- Create the central dir footer
     if (($v_result = $this->privWriteCentralHeader($v_count, $v_size, $v_offset, $v_comment)) != 1)
@@ -2470,14 +2470,14 @@ 
   // --------------------------------------------------------------------------------
   function privAddFileList($p_filedescr_list, &$p_result_list, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
     $v_header = array();
 
     // ----- Recuperate the current number of elt in list
     $v_nb = sizeof($p_result_list);
 
     // ----- Loop on the files
-    for ($j=0; ($j<sizeof($p_filedescr_list)) && ($v_result==1); $j++) {
+    for ($j = 0; ($j < sizeof($p_filedescr_list)) && ($v_result == 1); $j++) {
       // ----- Format the filename
       $p_filedescr_list[$j]['filename']
       = PclZipUtilTranslateWinPath($p_filedescr_list[$j]['filename'], false);
@@ -2490,7 +2490,7 @@ 
       }
 
       // ----- Check the filename
-      if (   ($p_filedescr_list[$j]['type'] != 'virtual_file')
+      if (($p_filedescr_list[$j]['type'] != 'virtual_file')
           && (!file_exists($p_filedescr_list[$j]['filename']))) {
         PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$p_filedescr_list[$j]['filename']."' does not exist");
         return PclZip::errorCode();
@@ -2500,10 +2500,10 @@ 
       // or a dir with all its path removed
 //      if (   (is_file($p_filedescr_list[$j]['filename']))
 //          || (   is_dir($p_filedescr_list[$j]['filename'])
-      if (   ($p_filedescr_list[$j]['type'] == 'file')
+      if (($p_filedescr_list[$j]['type'] == 'file')
           || ($p_filedescr_list[$j]['type'] == 'virtual_file')
-          || (   ($p_filedescr_list[$j]['type'] == 'folder')
-              && (   !isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])
+          || (($p_filedescr_list[$j]['type'] == 'folder')
+              && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])
                   || !$p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))
           ) {
 
@@ -2532,7 +2532,7 @@ 
   // --------------------------------------------------------------------------------
   function privAddFile($p_filedescr, &$p_header, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
     
     // ----- Working variable
     $p_filename = $p_filedescr['filename'];
@@ -2577,13 +2577,13 @@ 
     $p_header['index'] = -1;
 
     // ----- Look for regular file
-    if ($p_filedescr['type']=='file') {
+    if ($p_filedescr['type'] == 'file') {
       $p_header['external'] = 0x00000000;
       $p_header['size'] = filesize($p_filename);
     }
     
     // ----- Look for regular folder
-    else if ($p_filedescr['type']=='folder') {
+    else if ($p_filedescr['type'] == 'folder') {
       $p_header['external'] = 0x00000010;
       $p_header['mtime'] = filemtime($p_filename);
       $p_header['size'] = filesize($p_filename);
@@ -2658,10 +2658,10 @@ 
       // ----- Look for a file
       if ($p_filedescr['type'] == 'file') {
         // ----- Look for using temporary file to zip
-        if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) 
+        if ((!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) 
             && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
                 || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-                    && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_header['size'])) ) ) {
+                    && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_header['size'])))) {
           $v_result = $this->privAddFileUsingTempFile($p_filedescr, $p_header, $p_options);
           if ($v_result < PCLZIP_ERR_NO_ERROR) {
             return $v_result;
@@ -2761,7 +2761,7 @@ 
         // ----- Set the file properties
         $p_header['size'] = 0;
         //$p_header['external'] = 0x41FF0010;   // Value for a folder : to be checked
-        $p_header['external'] = 0x00000010;   // Value for a folder : to be checked
+        $p_header['external'] = 0x00000010; // Value for a folder : to be checked
 
         // ----- Call the header generation
         if (($v_result = $this->privWriteFileHeader($p_header)) != 1)
@@ -2805,7 +2805,7 @@ 
   // --------------------------------------------------------------------------------
   function privAddFileUsingTempFile($p_filedescr, &$p_header, &$p_options)
   {
-    $v_result=PCLZIP_ERR_NO_ERROR;
+    $v_result = PCLZIP_ERR_NO_ERROR;
     
     // ----- Working variable
     $p_filename = $p_filedescr['filename'];
@@ -2859,7 +2859,7 @@ 
     $v_data_header['os'] = bin2hex($v_data_header['os']);
 
     // ----- Read the gzip file footer
-    @fseek($v_file_compressed, filesize($v_gzip_temp_name)-8);
+    @fseek($v_file_compressed, filesize($v_gzip_temp_name) - 8);
     $v_binary_data = @fread($v_file_compressed, 8);
     $v_data_footer = unpack('Vcrc/Vcompressed_size', $v_binary_data);
 
@@ -2867,7 +2867,7 @@ 
     $p_header['compression'] = ord($v_data_header['cm']);
     //$p_header['mtime'] = $v_data_header['mtime'];
     $p_header['crc'] = $v_data_footer['crc'];
-    $p_header['compressed_size'] = filesize($v_gzip_temp_name)-18;
+    $p_header['compressed_size'] = filesize($v_gzip_temp_name) - 18;
 
     // ----- Close the file
     @fclose($v_file_compressed);
@@ -2917,7 +2917,7 @@ 
   // --------------------------------------------------------------------------------
   function privCalculateStoredFilename(&$p_filedescr, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
     
     // ----- Working variables
     $p_filename = $p_filedescr['filename'];
@@ -2974,14 +2974,14 @@ 
         if (substr($p_remove_dir, -1) != '/')
           $p_remove_dir .= "/";
 
-        if (   (substr($p_filename, 0, 2) == "./")
+        if ((substr($p_filename, 0, 2) == "./")
             || (substr($p_remove_dir, 0, 2) == "./")) {
             
-          if (   (substr($p_filename, 0, 2) == "./")
+          if ((substr($p_filename, 0, 2) == "./")
               && (substr($p_remove_dir, 0, 2) != "./")) {
             $p_remove_dir = "./".$p_remove_dir;
           }
-          if (   (substr($p_filename, 0, 2) != "./")
+          if ((substr($p_filename, 0, 2) != "./")
               && (substr($p_remove_dir, 0, 2) == "./")) {
             $p_remove_dir = substr($p_remove_dir, 2);
           }
@@ -3029,15 +3029,15 @@ 
   // --------------------------------------------------------------------------------
   function privWriteFileHeader(&$p_header)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Store the offset position of the file
     $p_header['offset'] = ftell($this->zip_fd);
 
     // ----- Transform UNIX mtime to DOS format mdate/mtime
     $v_date = getdate($p_header['mtime']);
-    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
+    $v_mtime = ($v_date['hours'] << 11) + ($v_date['minutes'] << 5) + $v_date['seconds'] / 2;
+    $v_mdate = (($v_date['year'] - 1980) << 9) + ($v_date['mon'] << 5) + $v_date['mday'];
 
     // ----- Packed data
     $v_binary_data = pack("VvvvvvVVVvv", 0x04034b50,
@@ -3074,7 +3074,7 @@ 
   // --------------------------------------------------------------------------------
   function privWriteCentralFileHeader(&$p_header)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // TBC
     //for(reset($p_header); $key = key($p_header); next($p_header)) {
@@ -3082,8 +3082,8 @@ 
 
     // ----- Transform UNIX mtime to DOS format mdate/mtime
     $v_date = getdate($p_header['mtime']);
-    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
+    $v_mtime = ($v_date['hours'] << 11) + ($v_date['minutes'] << 5) + $v_date['seconds'] / 2;
+    $v_mdate = (($v_date['year'] - 1980) << 9) + ($v_date['mon'] << 5) + $v_date['mday'];
 
 
     // ----- Packed data
@@ -3127,7 +3127,7 @@ 
   // --------------------------------------------------------------------------------
   function privWriteCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Packed data
     $v_binary_data = pack("VvvvvVVv", 0x06054b50, 0, 0, $p_nb_entries,
@@ -3156,7 +3156,7 @@ 
   // --------------------------------------------------------------------------------
   function privList(&$p_list)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Magic quotes trick
     $this->privDisableMagicQuotes();
@@ -3196,7 +3196,7 @@ 
     }
 
     // ----- Read each entry
-    for ($i=0; $i<$v_central_dir['entries']; $i++)
+    for ($i = 0; $i < $v_central_dir['entries']; $i++)
     {
       // ----- Read the file header
       if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
@@ -3243,7 +3243,7 @@ 
   // --------------------------------------------------------------------------------
   function privConvertHeader2FileInfo($p_header, &$p_info)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Get the interesting attributes
     $v_temp_path = PclZipUtilPathReduction($p_header['filename']);
@@ -3254,7 +3254,7 @@ 
     $p_info['compressed_size'] = $p_header['compressed_size'];
     $p_info['mtime'] = $p_header['mtime'];
     $p_info['comment'] = $p_header['comment'];
-    $p_info['folder'] = (($p_header['external']&0x00000010)==0x00000010);
+    $p_info['folder'] = (($p_header['external'] & 0x00000010) == 0x00000010);
     $p_info['index'] = $p_header['index'];
     $p_info['status'] = $p_header['status'];
     $p_info['crc'] = $p_header['crc'];
@@ -3282,16 +3282,16 @@ 
   // --------------------------------------------------------------------------------
   function privExtractByRule(&$p_file_list, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Magic quotes trick
     $this->privDisableMagicQuotes();
 
     // ----- Check the path
-    if (   ($p_path == "")
-	    || (   (substr($p_path, 0, 1) != "/")
+    if (($p_path == "")
+	    || ((substr($p_path, 0, 1) != "/")
 		    && (substr($p_path, 0, 3) != "../")
-			&& (substr($p_path,1,2)!=":/")))
+			&& (substr($p_path, 1, 2) != ":/")))
       $p_path = "./".$p_path;
 
     // ----- Reduce the path last (and duplicated) '/'
@@ -3300,7 +3300,7 @@ 
       // ----- Look for the path end '/'
       while (substr($p_path, -1) == "/")
       {
-        $p_path = substr($p_path, 0, strlen($p_path)-1);
+        $p_path = substr($p_path, 0, strlen($p_path) - 1);
       }
     }
 
@@ -3334,7 +3334,7 @@ 
 
     // ----- Read each entry
     $j_start = 0;
-    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
+    for ($i = 0, $v_nb_extracted = 0; $i < $v_central_dir['entries']; $i++)
     {
 
       // ----- Read next Central dir entry
@@ -3373,17 +3373,17 @@ 
       $v_extract = false;
 
       // ----- Look for extract by name rule
-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
+      if ((isset($p_options[PCLZIP_OPT_BY_NAME]))
           && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
 
           // ----- Look if the filename is in the list
-          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_extract); $j++) {
+          for ($j = 0; ($j < sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_extract); $j++) {
 
               // ----- Look for a directory
               if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
 
                   // ----- Look if the directory is in the filename path
-                  if (   (strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
+                  if ((strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
                       && (substr($v_header['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
                       $v_extract = true;
                   }
@@ -3408,7 +3408,7 @@ 
       */
 
       // ----- Look for extract by preg rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
+      else if ((isset($p_options[PCLZIP_OPT_BY_PREG]))
                && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
 
           if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header['stored_filename'])) {
@@ -3417,20 +3417,20 @@ 
       }
 
       // ----- Look for extract by index rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
+      else if ((isset($p_options[PCLZIP_OPT_BY_INDEX]))
                && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
           
           // ----- Look if the index is in the list
-          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {
+          for ($j = $j_start; ($j < sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {
 
-              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
+              if (($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i <= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
                   $v_extract = true;
               }
-              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
+              if ($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
+                  $j_start = $j + 1;
               }
 
-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
+              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start'] > $i) {
                   break;
               }
           }
@@ -3442,14 +3442,14 @@ 
       }
 
 	  // ----- Check compression method
-	  if (   ($v_extract)
-	      && (   ($v_header['compression'] != 8)
+	  if (($v_extract)
+	      && (($v_header['compression'] != 8)
 		      && ($v_header['compression'] != 0))) {
           $v_header['status'] = 'unsupported_compression';
 
           // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+          if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
 
               $this->privSwapBackMagicQuotes();
               
@@ -3467,8 +3467,8 @@ 
           $v_header['status'] = 'unsupported_encryption';
 
           // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+          if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
 
               $this->privSwapBackMagicQuotes();
 
@@ -3549,7 +3549,7 @@ 
           }
         }
         // ----- Look for extraction in standard output
-        elseif (   (isset($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT]))
+        elseif ((isset($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT]))
 		        && ($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) {
           // ----- Extracting the file in standard output
           $v_result1 = $this->privExtractFileInOutput($v_header, $p_options);
@@ -3622,7 +3622,7 @@ 
   // --------------------------------------------------------------------------------
   function privExtractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Read the file header
     if (($v_result = $this->privReadFileHeader($v_header)) != 1)
@@ -3640,7 +3640,7 @@ 
     // ----- Look for all path to remove
     if ($p_remove_all_path == true) {
         // ----- Look for folder entry that not need to be extracted
-        if (($p_entry['external']&0x00000010)==0x00000010) {
+        if (($p_entry['external'] & 0x00000010) == 0x00000010) {
 
             $p_entry['status'] = "filtered";
 
@@ -3742,8 +3742,8 @@ 
         // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
         // For historical reason first PclZip implementation does not stop
         // when this kind of error occurs.
-        if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+        if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
 
             PclZip::privErrorLog(PCLZIP_ERR_ALREADY_A_DIRECTORY,
 			                     "Filename '".$p_entry['filename']."' is "
@@ -3762,8 +3762,8 @@ 
         // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
         // For historical reason first PclZip implementation does not stop
         // when this kind of error occurs.
-        if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+        if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
 
             PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
 			                     "Filename '".$p_entry['filename']."' exists "
@@ -3777,8 +3777,8 @@ 
       else if (filemtime($p_entry['filename']) > $p_entry['mtime'])
       {
         // ----- Change the file status
-        if (   (isset($p_options[PCLZIP_OPT_REPLACE_NEWER]))
-		    && ($p_options[PCLZIP_OPT_REPLACE_NEWER]===true)) {
+        if ((isset($p_options[PCLZIP_OPT_REPLACE_NEWER]))
+		    && ($p_options[PCLZIP_OPT_REPLACE_NEWER] === true)) {
 	  	  }
 		    else {
             $p_entry['status'] = "newer_exist";
@@ -3786,8 +3786,8 @@ 
             // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
             // For historical reason first PclZip implementation does not stop
             // when this kind of error occurs.
-            if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		        && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+            if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+		        && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
 
                 PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
 			             "Newer version of '".$p_entry['filename']."' exists "
@@ -3803,14 +3803,14 @@ 
 
     // ----- Check the directory availability and create it if necessary
     else {
-      if ((($p_entry['external']&0x00000010)==0x00000010) || (substr($p_entry['filename'], -1) == '/'))
+      if ((($p_entry['external'] & 0x00000010) == 0x00000010) || (substr($p_entry['filename'], -1) == '/'))
         $v_dir_to_check = $p_entry['filename'];
       else if (!strstr($p_entry['filename'], "/"))
         $v_dir_to_check = "";
       else
         $v_dir_to_check = dirname($p_entry['filename']);
 
-        if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external']&0x00000010)==0x00000010))) != 1) {
+        if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external'] & 0x00000010) == 0x00000010))) != 1) {
   
           // ----- Change the file status
           $p_entry['status'] = "path_creation_fail";
@@ -3826,7 +3826,7 @@ 
     if ($p_entry['status'] == 'ok') {
 
       // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010))
+      if (!(($p_entry['external'] & 0x00000010) == 0x00000010))
       {
         // ----- Look for not compressed file
         if ($p_entry['compression'] == 0) {
@@ -3875,10 +3875,10 @@ 
 
 
           // ----- Look for using temporary file to unzip
-          if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) 
+          if ((!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) 
               && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
                   || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-                      && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_entry['size'])) ) ) {
+                      && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_entry['size'])))) {
             $v_result = $this->privExtractFileUsingTempFile($p_entry, $p_options);
             if ($v_result < PCLZIP_ERR_NO_ERROR) {
               return $v_result;
@@ -3973,7 +3973,7 @@ 
   // --------------------------------------------------------------------------------
   function privExtractFileUsingTempFile(&$p_entry, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
         
     // ----- Creates a temporary file
     $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
@@ -4049,7 +4049,7 @@ 
   // --------------------------------------------------------------------------------
   function privExtractFileInOutput(&$p_entry, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Read the file header
     if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
@@ -4098,7 +4098,7 @@ 
     if ($p_entry['status'] == 'ok') {
 
       // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
+      if (!(($p_entry['external'] & 0x00000010) == 0x00000010)) {
         // ----- Look for not compressed file
         if ($p_entry['compressed_size'] == $p_entry['size']) {
 
@@ -4161,7 +4161,7 @@ 
   // --------------------------------------------------------------------------------
   function privExtractFileAsString(&$p_entry, &$p_string, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Read the file header
     $v_header = array();
@@ -4212,7 +4212,7 @@ 
     if ($p_entry['status'] == 'ok') {
 
       // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
+      if (!(($p_entry['external'] & 0x00000010) == 0x00000010)) {
         // ----- Look for not compressed file
   //      if ($p_entry['compressed_size'] == $p_entry['size'])
         if ($p_entry['compression'] == 0) {
@@ -4284,7 +4284,7 @@ 
   // --------------------------------------------------------------------------------
   function privReadFileHeader(&$p_header)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Read the 4 bytes signature
     $v_binary_data = @fread($this->zip_fd, 4);
@@ -4348,7 +4348,7 @@ 
       // ----- Extract time
       $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
       $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
+      $v_seconde = ($p_header['mtime'] & 0x001F) * 2;
 
       // ----- Extract date
       $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
@@ -4387,7 +4387,7 @@ 
   // --------------------------------------------------------------------------------
   function privReadCentralFileHeader(&$p_header)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Read the 4 bytes signature
     $v_binary_data = @fread($this->zip_fd, 4);
@@ -4451,7 +4451,7 @@ 
       // ----- Extract time
       $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
       $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
+      $v_seconde = ($p_header['mtime'] & 0x001F) * 2;
 
       // ----- Extract date
       $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
@@ -4495,7 +4495,7 @@ 
   // --------------------------------------------------------------------------------
   function privCheckFileHeaders(&$p_local_header, &$p_central_header)
   {
-    $v_result=1;
+    $v_result = 1;
 
   	// ----- Check the static values
   	// TBC
@@ -4532,7 +4532,7 @@ 
   // --------------------------------------------------------------------------------
   function privReadEndCentralDir(&$p_central_dir)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Go to the end of the zip file
     $v_size = filesize($this->zipname);
@@ -4550,8 +4550,8 @@ 
     // in this case the end of central dir is at 22 bytes of the file end
     $v_found = 0;
     if ($v_size > 26) {
-      @fseek($this->zip_fd, $v_size-22);
-      if (($v_pos = @ftell($this->zip_fd)) != ($v_size-22))
+      @fseek($this->zip_fd, $v_size - 22);
+      if (($v_pos = @ftell($this->zip_fd)) != ($v_size - 22))
       {
         // ----- Error log
         PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
@@ -4577,8 +4577,8 @@ 
       $v_maximum_size = 65557; // 0xFFFF + 22;
       if ($v_maximum_size > $v_size)
         $v_maximum_size = $v_size;
-      @fseek($this->zip_fd, $v_size-$v_maximum_size);
-      if (@ftell($this->zip_fd) != ($v_size-$v_maximum_size))
+      @fseek($this->zip_fd, $v_size - $v_maximum_size);
+      if (@ftell($this->zip_fd) != ($v_size - $v_maximum_size))
       {
         // ----- Error log
         PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
@@ -4599,7 +4599,7 @@ 
         //$v_bytes = ($v_bytes << 8) | Ord($v_byte);
         // Note we mask the old value down such that once shifted we can never end up with more than a 32bit number 
         // Otherwise on systems where we have 64bit integers the check below for the magic number will fail. 
-        $v_bytes = ( ($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte); 
+        $v_bytes = (($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte); 
 
         // ----- Compare the bytes
         if ($v_bytes == 0x504b0506)
@@ -4689,11 +4689,11 @@ 
   // --------------------------------------------------------------------------------
   function privDeleteByRule(&$p_result_list, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
     $v_list_detail = array();
 
     // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
+    if (($v_result = $this->privOpenFd('rb')) != 1)
     {
       // ----- Return
       return $v_result;
@@ -4729,7 +4729,7 @@ 
     // ----- Read each entry
     $v_header_list = array();
     $j_start = 0;
-    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
+    for ($i = 0, $v_nb_extracted = 0; $i < $v_central_dir['entries']; $i++)
     {
 
       // ----- Read the file header
@@ -4750,21 +4750,21 @@ 
       $v_found = false;
 
       // ----- Look for extract by name rule
-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
+      if ((isset($p_options[PCLZIP_OPT_BY_NAME]))
           && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
 
           // ----- Look if the filename is in the list
-          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_found); $j++) {
+          for ($j = 0; ($j < sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_found); $j++) {
 
               // ----- Look for a directory
               if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
 
                   // ----- Look if the directory is in the filename path
-                  if (   (strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
+                  if ((strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
                       && (substr($v_header_list[$v_nb_extracted]['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
                       $v_found = true;
                   }
-                  elseif (   (($v_header_list[$v_nb_extracted]['external']&0x00000010)==0x00000010) /* Indicates a folder */
+                  elseif ((($v_header_list[$v_nb_extracted]['external'] & 0x00000010) == 0x00000010) /* Indicates a folder */
                           && ($v_header_list[$v_nb_extracted]['stored_filename'].'/' == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
                       $v_found = true;
                   }
@@ -4789,7 +4789,7 @@ 
       */
 
       // ----- Look for extract by preg rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
+      else if ((isset($p_options[PCLZIP_OPT_BY_PREG]))
                && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
 
           if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
@@ -4798,20 +4798,20 @@ 
       }
 
       // ----- Look for extract by index rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
+      else if ((isset($p_options[PCLZIP_OPT_BY_INDEX]))
                && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
 
           // ----- Look if the index is in the list
-          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_found); $j++) {
+          for ($j = $j_start; ($j < sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_found); $j++) {
 
-              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
+              if (($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i <= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
                   $v_found = true;
               }
-              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
+              if ($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
+                  $j_start = $j + 1;
               }
 
-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
+              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start'] > $i) {
                   break;
               }
           }
@@ -4849,11 +4849,11 @@ 
         }
 
         // ----- Look which file need to be kept
-        for ($i=0; $i<sizeof($v_header_list); $i++) {
+        for ($i = 0; $i < sizeof($v_header_list); $i++) {
 
             // ----- Calculate the position of the header
             @rewind($this->zip_fd);
-            if (@fseek($this->zip_fd,  $v_header_list[$i]['offset'])) {
+            if (@fseek($this->zip_fd, $v_header_list[$i]['offset'])) {
                 // ----- Close the zip file
                 $this->privCloseFd();
                 $v_temp_zip->privCloseFd();
@@ -4912,7 +4912,7 @@ 
         $v_offset = @ftell($v_temp_zip->zip_fd);
 
         // ----- Re-Create the Central Dir files header
-        for ($i=0; $i<sizeof($v_header_list); $i++) {
+        for ($i = 0; $i < sizeof($v_header_list); $i++) {
             // ----- Create the file header
             if (($v_result = $v_temp_zip->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
                 $v_temp_zip->privCloseFd();
@@ -4935,7 +4935,7 @@ 
         }
 
         // ----- Calculate the size of the central header
-        $v_size = @ftell($v_temp_zip->zip_fd)-$v_offset;
+        $v_size = @ftell($v_temp_zip->zip_fd) - $v_offset;
 
         // ----- Create the central dir footer
         if (($v_result = $v_temp_zip->privWriteCentralHeader(sizeof($v_header_list), $v_size, $v_offset, $v_comment)) != 1) {
@@ -4997,15 +4997,15 @@ 
   //    1 : OK
   //   -1 : Unable to create directory
   // --------------------------------------------------------------------------------
-  function privDirCheck($p_dir, $p_is_dir=false)
+  function privDirCheck($p_dir, $p_is_dir = false)
   {
     $v_result = 1;
 
 
     // ----- Remove the final '/'
-    if (($p_is_dir) && (substr($p_dir, -1)=='/'))
+    if (($p_is_dir) && (substr($p_dir, -1) == '/'))
     {
-      $p_dir = substr($p_dir, 0, strlen($p_dir)-1);
+      $p_dir = substr($p_dir, 0, strlen($p_dir) - 1);
     }
 
     // ----- Check the directory availability
@@ -5054,7 +5054,7 @@ 
   // --------------------------------------------------------------------------------
   function privMerge(&$p_archive_to_add)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Look if the archive_to_add exists
     if (!is_file($p_archive_to_add->zipname))
@@ -5079,7 +5079,7 @@ 
     }
 
     // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
+    if (($v_result = $this->privOpenFd('rb')) != 1)
     {
       // ----- Return
       return $v_result;
@@ -5097,7 +5097,7 @@ 
     @rewind($this->zip_fd);
 
     // ----- Open the archive_to_add file
-    if (($v_result=$p_archive_to_add->privOpenFd('rb')) != 1)
+    if (($v_result = $p_archive_to_add->privOpenFd('rb')) != 1)
     {
       $this->privCloseFd();
 
@@ -5181,7 +5181,7 @@ 
     $v_comment = $v_central_dir['comment'].' '.$v_central_dir_to_add['comment'];
 
     // ----- Calculate the size of the (new) central header
-    $v_size = @ftell($v_zip_temp_fd)-$v_offset;
+    $v_size = @ftell($v_zip_temp_fd) - $v_offset;
 
     // ----- Swap the file descriptor
     // Here is a trick : I swap the temporary fd with the zip fd, in order to use
@@ -5191,7 +5191,7 @@ 
     $v_zip_temp_fd = $v_swap;
 
     // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_central_dir['entries']+$v_central_dir_to_add['entries'], $v_size, $v_offset, $v_comment)) != 1)
+    if (($v_result = $this->privWriteCentralHeader($v_central_dir['entries'] + $v_central_dir_to_add['entries'], $v_size, $v_offset, $v_comment)) != 1)
     {
       $this->privCloseFd();
       $p_archive_to_add->privCloseFd();
@@ -5239,7 +5239,7 @@ 
   // --------------------------------------------------------------------------------
   function privDuplicate($p_archive_filename)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Look if the $p_archive_filename exists
     if (!is_file($p_archive_filename))
@@ -5253,7 +5253,7 @@ 
     }
 
     // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('wb')) != 1)
+    if (($v_result = $this->privOpenFd('wb')) != 1)
     {
       // ----- Return
       return $v_result;
@@ -5297,7 +5297,7 @@ 
   // Description :
   // Parameters :
   // --------------------------------------------------------------------------------
-  function privErrorLog($p_error_code=0, $p_error_string='')
+  function privErrorLog($p_error_code = 0, $p_error_string = '')
   {
     if (PCLZIP_ERROR_EXTERNAL == 1) {
       PclError($p_error_code, $p_error_string);
@@ -5334,10 +5334,10 @@ 
   // --------------------------------------------------------------------------------
   function privDisableMagicQuotes()
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Look if function exists
-    if (   (!function_exists("get_magic_quotes_runtime"))
+    if ((!function_exists("get_magic_quotes_runtime"))
 	    || (!function_exists("set_magic_quotes_runtime"))) {
       return $v_result;
 	}
@@ -5368,10 +5368,10 @@ 
   // --------------------------------------------------------------------------------
   function privSwapBackMagicQuotes()
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Look if function exists
-    if (   (!function_exists("get_magic_quotes_runtime"))
+    if ((!function_exists("get_magic_quotes_runtime"))
 	    || (!function_exists("set_magic_quotes_runtime"))) {
       return $v_result;
 	}
@@ -5412,7 +5412,7 @@ 
 
       // ----- Study directories from last to first
       $v_skip = 0;
-      for ($i=sizeof($v_list)-1; $i>=0; $i--) {
+      for ($i = sizeof($v_list) - 1; $i >= 0; $i--) {
         // ----- Look for current path
         if ($v_list[$i] == ".") {
           // ----- Ignore this directory
@@ -5433,7 +5433,7 @@ 
 		    }
 		  }
 		  // ----- Last '/' i.e. indicates a directory
-		  else if ($i == (sizeof($v_list)-1)) {
+		  else if ($i == (sizeof($v_list) - 1)) {
             $v_result = $v_list[$i];
 		  }
 		  // ----- Double '/' inside the path
@@ -5448,7 +5448,7 @@ 
 		    $v_skip--;
 		  }
 		  else {
-            $v_result = $v_list[$i].($i!=(sizeof($v_list)-1)?"/".$v_result:"");
+            $v_result = $v_list[$i].($i != (sizeof($v_list) - 1) ? "/".$v_result : "");
 		  }
         }
       }
@@ -5487,12 +5487,12 @@ 
     $v_result = 1;
     
     // ----- Look for path beginning by ./
-    if (   ($p_dir == '.')
-        || ((strlen($p_dir) >=2) && (substr($p_dir, 0, 2) == './'))) {
+    if (($p_dir == '.')
+        || ((strlen($p_dir) >= 2) && (substr($p_dir, 0, 2) == './'))) {
       $p_dir = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_dir, 1);
     }
-    if (   ($p_path == '.')
-        || ((strlen($p_path) >=2) && (substr($p_path, 0, 2) == './'))) {
+    if (($p_path == '.')
+        || ((strlen($p_path) >= 2) && (substr($p_path, 0, 2) == './'))) {
       $p_path = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_path, 1);
     }
 
@@ -5518,7 +5518,7 @@ 
       }
 
       // ----- Compare the items
-      if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ( $v_list_path[$j] != ''))  {
+      if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ($v_list_path[$j] != '')) {
         $v_result = 0;
       }
 
@@ -5559,11 +5559,11 @@ 
   //             3 : src & dest gzip
   // Return Values :
   // --------------------------------------------------------------------------------
-  function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode=0)
+  function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode = 0)
   {
     $v_result = 1;
 
-    if ($p_mode==0)
+    if ($p_mode == 0)
     {
       while ($p_size != 0)
       {
@@ -5573,7 +5573,7 @@ 
         $p_size -= $v_read_size;
       }
     }
-    else if ($p_mode==1)
+    else if ($p_mode == 1)
     {
       while ($p_size != 0)
       {
@@ -5583,7 +5583,7 @@ 
         $p_size -= $v_read_size;
       }
     }
-    else if ($p_mode==2)
+    else if ($p_mode == 2)
     {
       while ($p_size != 0)
       {
@@ -5593,7 +5593,7 @@ 
         $p_size -= $v_read_size;
       }
     }
-    else if ($p_mode==3)
+    else if ($p_mode == 3)
     {
       while ($p_size != 0)
       {
@@ -5657,7 +5657,7 @@ 
     $v_list = get_defined_constants();
     for (reset($v_list); $v_key = key($v_list); next($v_list)) {
 	    $v_prefix = substr($v_key, 0, 10);
-	    if ((   ($v_prefix == 'PCLZIP_OPT')
+	    if ((($v_prefix == 'PCLZIP_OPT')
            || ($v_prefix == 'PCLZIP_CB_')
            || ($v_prefix == 'PCLZIP_ATT'))
 	        && ($v_list[$v_key] == $p_option)) {
@@ -5682,15 +5682,15 @@ 
   // Return Values :
   //   The path translated.
   // --------------------------------------------------------------------------------
-  function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter=true)
+  function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter = true)
   {
     if (stristr(php_uname(), 'windows')) {
       // ----- Look for potential disk letter
       if (($p_remove_disk_letter) && (($v_position = strpos($p_path, ':')) != false)) {
-          $p_path = substr($p_path, $v_position+1);
+          $p_path = substr($p_path, $v_position + 1);
       }
       // ----- Change potential windows directory separator
-      if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
+      if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0, 1) == '\\')) {
           $p_path = strtr($p_path, '\\', '/');
       }
     }

ecrire/inc/rubriques.php

Spacing +64 added lines, -64 removed lines

@@ -47,26 +47,26 @@ 
  * @return bool
  *     true si le statut change effectivement
 **/
-function calculer_rubriques_if ($id_rubrique, $modifs, $statut_ancien='', $postdate = false)
+function calculer_rubriques_if($id_rubrique, $modifs, $statut_ancien = '', $postdate = false)
 {
 	$neuf = false;
 	if ($statut_ancien == 'publie') {
 		if (isset($modifs['statut'])
 			OR isset($modifs['id_rubrique'])
-			OR ($postdate AND strtotime($postdate)>time()))
+			OR ($postdate AND strtotime($postdate) > time()))
 			$neuf |= depublier_branche_rubrique_if($id_rubrique);
 		// ne publier que si c'est pas un postdate, ou si la date n'est pas dans le futur
-		if ($postdate){
+		if ($postdate) {
 			calculer_prochain_postdate(true);
-			$neuf |= (strtotime($postdate)<=time()); // par securite
+			$neuf |= (strtotime($postdate) <= time()); // par securite
 		}
 		elseif (isset($modifs['id_rubrique']))
 			$neuf |= publier_branche_rubrique($modifs['id_rubrique']);
 	}
-	elseif ($modifs['statut']=='publie'){
-		if ($postdate){
+	elseif ($modifs['statut'] == 'publie') {
+		if ($postdate) {
 			calculer_prochain_postdate(true);
-			$neuf |= (strtotime($postdate)<=time()); // par securite
+			$neuf |= (strtotime($postdate) <= time()); // par securite
 		}
 		else
 			$neuf |= publier_branche_rubrique($id_rubrique);
@@ -121,14 +121,14 @@ 
  * @return bool
  *     true si le statut change effectivement
  */
-function depublier_branche_rubrique_if($id_rubrique){
+function depublier_branche_rubrique_if($id_rubrique) {
 	$date = date('Y-m-d H:i:s'); // figer la date
 
 	#	spip_log("depublier_branche_rubrique($id_rubrique ?");
 	$id_pred = $id_rubrique;
 	while ($id_pred) {
 
-		if (!depublier_rubrique_if($id_pred,$date))
+		if (!depublier_rubrique_if($id_pred, $date))
 			return $id_pred != $id_rubrique;
 		// passer au parent si on a depublie
 		$r = sql_fetsel("id_parent", "spip_rubriques", "id_rubrique=$id_pred");
@@ -149,27 +149,27 @@ 
  * @return bool
  *    true si la rubrique a été dépubliée
  */
-function depublier_rubrique_if($id_rubrique,$date=null){
+function depublier_rubrique_if($id_rubrique, $date = null) {
 	if (is_null($date)) {
 		$date = date('Y-m-d H:i:s');
 	}
 	$postdates = ($GLOBALS['meta']["post_dates"] == "non") ?
 		" AND date <= ".sql_quote($date) : '';
 
-	if (!$id_rubrique=intval($id_rubrique))
+	if (!$id_rubrique = intval($id_rubrique))
 		return false;
 
 	// verifier qu'elle existe et est bien publiee
-	$r = sql_fetsel('id_rubrique,statut','spip_rubriques',"id_rubrique=$id_rubrique");
-	if (!$r OR $r['statut']!=='publie')
+	$r = sql_fetsel('id_rubrique,statut', 'spip_rubriques', "id_rubrique=$id_rubrique");
+	if (!$r OR $r['statut'] !== 'publie')
 		return false;
 
 	// On met le nombre de chaque type d'enfants dans un tableau
 	// Le type de l'objet est au pluriel
 	$compte = array(
-		'articles' => sql_countsel("spip_articles",  "id_rubrique=$id_rubrique AND statut='publie'$postdates"),
-		'rubriques' => sql_countsel("spip_rubriques",  "id_parent=$id_rubrique AND statut='publie'"),
-		'documents' => sql_countsel("spip_documents_liens",  "id_objet=$id_rubrique AND objet='rubrique'")
+		'articles' => sql_countsel("spip_articles", "id_rubrique=$id_rubrique AND statut='publie'$postdates"),
+		'rubriques' => sql_countsel("spip_rubriques", "id_parent=$id_rubrique AND statut='publie'"),
+		'documents' => sql_countsel("spip_documents_liens", "id_objet=$id_rubrique AND objet='rubrique'")
 	);
 	
 	// On passe le tableau des comptes dans un pipeline pour que les plugins puissent ajouter (ou retirer) des enfants
@@ -186,7 +186,7 @@ 
 	);
 	
 	// S'il y a au moins un enfant de n'importe quoi, on ne dépublie pas
-	foreach($compte as $objet => $n)
+	foreach ($compte as $objet => $n)
 		if ($n)
 			return false;
 
@@ -267,7 +267,7 @@ 
 		$continuer = false;
 		$r = sql_select("R.id_rubrique AS id, max(A.date_tmp) AS date_h", "spip_rubriques AS R, spip_rubriques AS A", "R.id_rubrique = A.id_parent AND (R.date_tmp < A.date_tmp OR R.statut_tmp<>'publie') AND A.statut_tmp='publie' ", "R.id_rubrique");
 		while ($row = sql_fetch($r)) {
-		  sql_updateq('spip_rubriques', array('statut_tmp'=>'publie', 'date_tmp'=>$row['date_h']),"id_rubrique=".$row['id']);
+		  sql_updateq('spip_rubriques', array('statut_tmp'=>'publie', 'date_tmp'=>$row['date_h']), "id_rubrique=".$row['id']);
 			$continuer = true;
 		}
 	} while ($continuer);
@@ -290,7 +290,7 @@ 
 	// Profondeur 0
 	// Toutes les rubriques racines sont de profondeur 0
 	// et fixer les id_secteur des rubriques racines
-	sql_update('spip_rubriques', array('id_secteur'=>'id_rubrique','profondeur'=>0), "id_parent=0");
+	sql_update('spip_rubriques', array('id_secteur'=>'id_rubrique', 'profondeur'=>0), "id_parent=0");
 	// Toute rubrique non racine est de profondeur >0
 	sql_updateq('spip_rubriques', array('profondeur'=>1), "id_parent<>0 AND profondeur=0");
 
@@ -318,21 +318,21 @@ 
 			"A.id_rubrique AS id, R.id_secteur AS id_secteur, R.profondeur+1 as profondeur",
 			"spip_rubriques AS A JOIN spip_rubriques AS R ON A.id_parent = R.id_rubrique",
 			"R.profondeur=".intval($prof)." AND (A.id_secteur <> R.id_secteur OR A.profondeur > R.profondeur+1)",
-		  "","R.id_secteur","0,100")){
+		  "", "R.id_secteur", "0,100")) {
 
 			$id_secteur = null;
 			$ids = array();
 			while ($row = array_shift($rows)) {
-				if ($row['id_secteur']!==$id_secteur){
+				if ($row['id_secteur'] !== $id_secteur) {
 					if (count($ids))
-						sql_updateq("spip_rubriques", array("id_secteur" => $id_secteur,'profondeur' => $prof+1), sql_in('id_rubrique',$ids));
+						sql_updateq("spip_rubriques", array("id_secteur" => $id_secteur, 'profondeur' => $prof + 1), sql_in('id_rubrique', $ids));
 					$id_secteur = $row['id_secteur'];
 					$ids = array();
 				}
 				$ids[] = $row['id'];
 			}
 			if (count($ids))
-				sql_updateq("spip_rubriques", array("id_secteur" => $id_secteur,'profondeur' => $prof+1), sql_in('id_rubrique',$ids));
+				sql_updateq("spip_rubriques", array("id_secteur" => $id_secteur, 'profondeur' => $prof + 1), sql_in('id_rubrique', $ids));
 		}
 
 
@@ -342,16 +342,16 @@ 
 			AND $rows = sql_allfetsel(
 			"id_rubrique as id",
 			"spip_rubriques",
-			"profondeur=".intval($prof+1)." AND id_parent NOT IN (".sql_get_select("zzz.id_rubrique","spip_rubriques AS zzz","zzz.profondeur=".intval($prof)).")",'','','0,100')){
-			$rows = array_map('reset',$rows);
-			sql_updateq("spip_rubriques", array('profondeur' => $prof+2), sql_in("id_rubrique",$rows));
+			"profondeur=".intval($prof + 1)." AND id_parent NOT IN (".sql_get_select("zzz.id_rubrique", "spip_rubriques AS zzz", "zzz.profondeur=".intval($prof)).")", '', '', '0,100')) {
+			$rows = array_map('reset', $rows);
+			sql_updateq("spip_rubriques", array('profondeur' => $prof + 2), sql_in("id_rubrique", $rows));
 		}
 
 		// ici on a fini de valider $prof+1, toutes les rubriques de prondeur 0 a $prof+1 sont OK
 		// si pas de rubrique a profondeur $prof+1 pas la peine de continuer
 		// si il reste des rubriques non vues, c'est une branche morte ou reference circulaire (base foireuse)
 		// on arrete les frais
-		if (sql_countsel("spip_rubriques","profondeur=".intval($prof+1))){
+		if (sql_countsel("spip_rubriques", "profondeur=".intval($prof + 1))) {
 			$prof++;
 			$continuer = true;
 		}
@@ -360,9 +360,9 @@ 
 
 	// loger si la table des rubriques semble foireuse
 	// et mettre un id_secteur=0 sur ces rubriques pour eviter toute selection par les boucles
-	if (sql_countsel("spip_rubriques","profondeur>".intval($prof+1))){
-		spip_log("Les rubriques de profondeur>".($prof+1)." semblent suspectes (branches morte ou reference circulaire dans les parents)",_LOG_CRITIQUE);
-		sql_update("spip_rubriques",array('id_secteur'=>0),"profondeur>".intval($prof+1));
+	if (sql_countsel("spip_rubriques", "profondeur>".intval($prof + 1))) {
+		spip_log("Les rubriques de profondeur>".($prof + 1)." semblent suspectes (branches morte ou reference circulaire dans les parents)", _LOG_CRITIQUE);
+		sql_update("spip_rubriques", array('id_secteur'=>0), "profondeur>".intval($prof + 1));
 	}
 
 	// reparer les articles
@@ -373,7 +373,7 @@ 
 	}
 
 	// avertir les plugins qui peuvent faire leur mises a jour egalement
-	pipeline('trig_propager_les_secteurs','');
+	pipeline('trig_propager_les_secteurs', '');
 }
 
 
@@ -431,7 +431,7 @@ 
 	}
 	
 	// avertir les plugins qui peuvent faire leur mises a jour egalement
-	pipeline('trig_calculer_langues_rubriques','');
+	pipeline('trig_calculer_langues_rubriques', '');
 }
 
 
@@ -447,7 +447,7 @@ 
  * @return string
  *    Liste des langues utilisées séparées par des virgules
 **/
-function calculer_langues_utilisees ($serveur='') {
+function calculer_langues_utilisees($serveur = '') {
 	include_spip('public/interfaces');
 	include_spip('public/compiler');
 	include_spip('public/composer');
@@ -457,14 +457,14 @@ 
 
 	include_spip('base/objets');
 	$tables = lister_tables_objets_sql();
-	$trouver_table = charger_fonction('trouver_table','base');
+	$trouver_table = charger_fonction('trouver_table', 'base');
 
-	foreach(array_keys($tables) as $t){
-		$desc = $trouver_table($t,$serveur);
+	foreach (array_keys($tables) as $t) {
+		$desc = $trouver_table($t, $serveur);
 		// c'est une table avec des langues
 		if ($desc['exist']
 		  AND isset($desc['field']['lang'])
-			AND isset($desc['field']['langue_choisie'])){
+			AND isset($desc['field']['langue_choisie'])) {
 
 			$boucle = new Boucle();
 			$boucle->show = $desc;
@@ -477,12 +477,12 @@ 
 			$boucle = pipeline('pre_boucle', $boucle);
 			
 			if (isset($desc['statut'])
-		    AND $desc['statut']){
+		    AND $desc['statut']) {
 				instituer_boucle($boucle, false);
-				$res = calculer_select($boucle->select,$boucle->from,$boucle->from_type,$boucle->where,$boucle->join,$boucle->group,$boucle->order,$boucle->limit,$boucle->having,$desc['table_objet'],$desc['table_objet'],$serveur);
+				$res = calculer_select($boucle->select, $boucle->from, $boucle->from_type, $boucle->where, $boucle->join, $boucle->group, $boucle->order, $boucle->limit, $boucle->having, $desc['table_objet'], $desc['table_objet'], $serveur);
 			}
 			else
-				$res = sql_select(implode(',',$boucle->select),$boucle->from);
+				$res = sql_select(implode(',', $boucle->select), $boucle->from);
 			while ($row = sql_fetch($res)) {
 				$langues[$row['lang']] = 1;
 			}
@@ -491,7 +491,7 @@ 
 
 	$langues = array_filter(array_keys($langues));
 	sort($langues);
-	$langues = join(',',$langues);
+	$langues = join(',', $langues);
 	spip_log("langues utilisees: $langues");
 	return $langues;
 }
@@ -507,7 +507,7 @@ 
  * @param string|int|array $generation
  * @return string
  */
-function calcul_branche ($generation) {return calcul_branche_in($generation);}
+function calcul_branche($generation) {return calcul_branche_in($generation); }
 
 /**
  * Calcul d'une branche de rubrique
@@ -523,7 +523,7 @@ 
  *     incluant les rubriques noeuds et toutes leurs descendances
  */
 function calcul_branche_in($id) {
-	$calcul_branche_in = charger_fonction('calcul_branche_in','inc');
+	$calcul_branche_in = charger_fonction('calcul_branche_in', 'inc');
 	return $calcul_branche_in($id);
 }
 
@@ -541,8 +541,8 @@ 
  *     Liste des identifiants séparés par des virgules,
  *     incluant les rubriques transmises et toutes leurs parentées
  */
-function calcul_hierarchie_in($id, $tout=true) {
-	$calcul_hierarchie_in = charger_fonction('calcul_hierarchie_in','inc');
+function calcul_hierarchie_in($id, $tout = true) {
+	$calcul_hierarchie_in = charger_fonction('calcul_hierarchie_in', 'inc');
 	return $calcul_hierarchie_in($id, $tout);
 }
 
@@ -565,7 +565,7 @@ 
 	static $b = array();
 
 	// normaliser $id qui a pu arriver comme un array, comme un entier, ou comme une chaine NN,NN,NN
-	if (!is_array($id)) $id = explode(',',$id);
+	if (!is_array($id)) $id = explode(',', $id);
 	$id = join(',', array_map('intval', $id));
 	if (isset($b[$id]))
 		return $b[$id];
@@ -579,14 +579,14 @@ 
 	while ($maxiter-- AND $filles = sql_allfetsel(
 					'id_rubrique',
 					'spip_rubriques',
-					sql_in('id_parent', $r) ." AND ". sql_in('id_rubrique', $r, 'NOT')
+					sql_in('id_parent', $r)." AND ".sql_in('id_rubrique', $r, 'NOT')
 					)) {
 		$r = join(',', array_map('reset', $filles));
-		$branche .= ',' . $r;
+		$branche .= ','.$r;
 	}
 
 	# securite pour ne pas plomber la conso memoire sur les sites prolifiques
-	if (strlen($branche)<10000)
+	if (strlen($branche) < 10000)
 		$b[$id] = $branche;
 	return $branche;
 }
@@ -607,16 +607,16 @@ 
  *     Liste des identifiants séparés par des virgules,
  *     incluant les rubriques transmises et toutes leurs parentées
  */
-function inc_calcul_hierarchie_in_dist($id, $tout=true) {
+function inc_calcul_hierarchie_in_dist($id, $tout = true) {
 	static $b = array();
 
 	// normaliser $id qui a pu arriver comme un array, comme un entier, ou comme une chaine NN,NN,NN
-	if (!is_array($id)) $id = explode(',',$id);
+	if (!is_array($id)) $id = explode(',', $id);
 	$id = join(',', array_map('intval', $id));
 
 	if (isset($b[$id])) {
 		// Notre branche commence par la rubrique de depart si $tout=true
-		return $tout ? (strlen($b[$id]) ? $b[$id] . ",$id" : $id) : $b[$id];
+		return $tout ? (strlen($b[$id]) ? $b[$id].",$id" : $id) : $b[$id];
 	}
 
 	$hier = "";
@@ -628,14 +628,14 @@ 
 	while ($maxiter-- AND $parents = sql_allfetsel(
 			'id_parent',
 			'spip_rubriques',
-			sql_in('id_rubrique', $ids_nouveaux_parents) ." AND ". sql_in('id_parent',$hier,'NOT')
+			sql_in('id_rubrique', $ids_nouveaux_parents)." AND ".sql_in('id_parent', $hier, 'NOT')
 		  )) {
 		$ids_nouveaux_parents = join(',', array_map('reset', $parents));
-		$hier = $ids_nouveaux_parents.(strlen($hier)?','.$hier:'');
+		$hier = $ids_nouveaux_parents.(strlen($hier) ? ','.$hier : '');
 	}
 
 	# securite pour ne pas plomber la conso memoire sur les sites prolifiques
-	if (strlen($hier)<10000) {
+	if (strlen($hier) < 10000) {
 		$b[$id] = $hier;
 	}
 
@@ -657,7 +657,7 @@ 
  *     true pour affecter le statut des rubriques concernées.
  * @return void
 **/
-function calculer_prochain_postdate($check= false) {
+function calculer_prochain_postdate($check = false) {
 	include_spip('base/abstract_sql');
 	if ($check) {
 		$postdates = ($GLOBALS['meta']["post_dates"] == "non") ?
@@ -668,15 +668,15 @@ 
 		while ($row = sql_fetch($r))
 			publier_branche_rubrique($row['id']);
 
-		pipeline('trig_calculer_prochain_postdate','');
+		pipeline('trig_calculer_prochain_postdate', '');
 	}
 
 	$t = sql_fetsel("date", "spip_articles", "statut='publie' AND date > ".sql_quote(date('Y-m-d H:i:s')), "", "date", "1");
 	
 	if ($t) {
-		$t =  $t['date'];
+		$t = $t['date'];
 		if (!isset($GLOBALS['meta']['date_prochain_postdate'])
-			OR $t<>$GLOBALS['meta']['date_prochain_postdate']){
+			OR $t <> $GLOBALS['meta']['date_prochain_postdate']) {
 			ecrire_meta('date_prochain_postdate', strtotime($t));
 			ecrire_meta('derniere_modif', time());
 		}
@@ -709,16 +709,16 @@ 
  * @return int
  *     Identifiant de la rubrique la plus profonde.
  */
-function creer_rubrique_nommee($titre, $id_parent=0, $serveur='') {
+function creer_rubrique_nommee($titre, $id_parent = 0, $serveur = '') {
 
 	// eclater l'arborescence demandee
 	// echapper les </multi> et autres balises fermantes html
-	$titre = preg_replace(",</([a-z][^>]*)>,ims","<@\\1>",$titre);
+	$titre = preg_replace(",</([a-z][^>]*)>,ims", "<@\\1>", $titre);
 	$arbo = explode('/', preg_replace(',^/,', '', $titre));
 	include_spip('base/abstract_sql');
 	foreach ($arbo as $titre) {
 		// retablir les </multi> et autres balises fermantes html
-		$titre = preg_replace(",<@([a-z][^>]*)>,ims","</\\1>",$titre);
+		$titre = preg_replace(",<@([a-z][^>]*)>,ims", "</\\1>", $titre);
 		$r = sql_getfetsel("id_rubrique", "spip_rubriques", "titre = ".sql_quote($titre)." AND id_parent=".intval($id_parent),
 		$groupby = array(), $orderby = array(), $limit = '', $having = array(), $serveur);
 		if ($r !== NULL) {
@@ -728,7 +728,7 @@ 
 				'titre' => $titre,
 				'id_parent' => $id_parent,
 				'statut' => 'prive')
-				,$desc=array(), $serveur);
+				,$desc = array(), $serveur);
 			if ($id_parent > 0) {
 				$data = sql_fetsel("id_secteur,lang", "spip_rubriques", "id_rubrique=$id_parent",
 				$groupby = array(), $orderby = array(), $limit = '', $having = array(), $serveur);
@@ -739,7 +739,7 @@ 
 				$lang = $GLOBALS['meta']['langue_site'];
 			}
 
-			sql_updateq('spip_rubriques', array('id_secteur'=>$id_secteur, "lang"=>$lang), "id_rubrique=$id_rubrique", $desc='', $serveur);
+			sql_updateq('spip_rubriques', array('id_secteur'=>$id_secteur, "lang"=>$lang), "id_rubrique=$id_rubrique", $desc = '', $serveur);
 
 			// pour la recursion
 			$id_parent = $id_rubrique;

ecrire/inc/traduire.php

Spacing +20 added lines, -20 removed lines

@@ -22,12 +22,12 @@ 
  * @param <type> $dirname
  * @return <type>
  */
-function find_langs_in_path ($file, $dirname='lang') {
-	static $dirs=array();
+function find_langs_in_path($file, $dirname = 'lang') {
+	static $dirs = array();
 	$liste = array();
-	foreach(creer_chemin() as $dir) {
-		if (!isset($dirs[$a = $dir . $dirname]))
-			$dirs[$a] = (is_dir($a) || !$a) ;
+	foreach (creer_chemin() as $dir) {
+		if (!isset($dirs[$a = $dir.$dirname]))
+			$dirs[$a] = (is_dir($a) || !$a);
 		if ($dirs[$a]) {
 			if (is_readable($a .= $file)) {
 				$liste[] = $a;
@@ -48,18 +48,18 @@ 
 	if ($f = ($module == 'local'
 		? find_in_path($module.$lang.'.php', 'lang/')
 		: find_langs_in_path($module.$lang.'.php', 'lang/')))
-		return is_array($f)?$f:array($f);
+		return is_array($f) ? $f : array($f);
 
 	// 2) directement dans le chemin (old style, uniquement pour local)
 	return (($module == 'local') OR strpos($module, '/'))
-		? (($f = find_in_path($module.$lang. '.php')) ? array($f):false)
+		? (($f = find_in_path($module.$lang.'.php')) ? array($f) : false)
 		: false;
 }
 
 // http://doc.spip.org/@charger_langue
 function charger_langue($lang, $module = 'spip') {
 	if ($lang AND $fichiers_lang = chercher_module_lang($module, $lang)) {
-		$GLOBALS['idx_lang']='i18n_'.$module.'_'.$lang;
+		$GLOBALS['idx_lang'] = 'i18n_'.$module.'_'.$lang;
 		include(array_shift($fichiers_lang));
 		surcharger_langue($fichiers_lang);
 	} else {
@@ -72,7 +72,7 @@ 
 			$fichiers_lang = chercher_module_lang($module, _LANGUE_PAR_DEFAUT);
 
 		if ($fichiers_lang) {
-			$GLOBALS['idx_lang']='i18n_'.$module.'_' .$l;
+			$GLOBALS['idx_lang'] = 'i18n_'.$module.'_'.$l;
 			include(array_shift($fichiers_lang));
 			surcharger_langue($fichiers_lang);
 			$GLOBALS['i18n_'.$module.'_'.$lang]
@@ -92,7 +92,7 @@ 
 
 	if (!is_array($fichiers)) $fichiers = array($fichiers);
 	if (!count($fichiers)) return;
-	foreach($fichiers as $fichier){
+	foreach ($fichiers as $fichier) {
 		if (!isset($surcharges[$fichier])) {
 			$idx_lang_normal = $GLOBALS['idx_lang'];
 			$GLOBALS['idx_lang'] = $GLOBALS['idx_lang'].'@temporaire';
@@ -103,7 +103,7 @@ 
 		}
 		if (is_array($surcharges[$fichier])) {
 			$GLOBALS[$GLOBALS['idx_lang']] = array_merge(
-				(array)$GLOBALS[$GLOBALS['idx_lang']],
+				(array) $GLOBALS[$GLOBALS['idx_lang']],
 				$surcharges[$fichier]
 			);
 		}
@@ -122,14 +122,14 @@ 
 		return $deja_vu[$lang][$ori];
 
 	// modules demandes explicitement <xxx|yyy|zzz:code> cf MODULES_IDIOMES
-	if (strpos($ori,':')) {
-		list($modules,$code) = explode(':',$ori,2);
+	if (strpos($ori, ':')) {
+		list($modules, $code) = explode(':', $ori, 2);
 		$modules = explode('|', $modules);
 		$ori_complet = $ori;
 	} else {
 		$modules = array('spip', 'ecrire');
 		$code = $ori;
-		$ori_complet = implode('|', $modules) . ':' . $ori;
+		$ori_complet = implode('|', $modules).':'.$ori;
 	}
 
 	$text = '';
@@ -144,7 +144,7 @@ 
 			// -- on cherche (lang/)local_xx.php ...
 			if (!isset($local['local_'.$lang])) {
 				// redéfinir la langue en cours pour les surcharges (chercher_langue a pu le changer)
-				$GLOBALS['idx_lang']= $var;
+				$GLOBALS['idx_lang'] = $var;
 				$local['local_'.$lang] = chercher_module_lang('local', $lang);
 			}
 			if ($local['local_'.$lang])
@@ -179,7 +179,7 @@ 
 	}
 
 	// Supprimer la mention <NEW> ou <MODIF>
-	if (substr($text,0,1) === '<')
+	if (substr($text, 0, 1) === '<')
 		$text = str_replace(array('<NEW>', '<MODIF>'), array(), $text);
 
 	// Si on n'est pas en utf-8, la chaine peut l'etre...
@@ -187,13 +187,13 @@ 
 	if ($GLOBALS['meta']['charset'] !== 'utf-8'
 	AND preg_match(',[\x7f-\xff],S', $text)) {
 		include_spip('inc/charsets');
-		$text = charset2unicode($text,'utf-8');
+		$text = charset2unicode($text, 'utf-8');
 	}
 
 	if (_request('var_mode') == 'traduction') {
-		if ($text)  {
-			$classe = 'debug-traduction' . ($module_retenu == 'ecrire' ? '-prive' : '');
-			$text = '<span lang=' . $langue_retenue . ' class=' . $classe . ' title=' . $ori_complet . '(' . $langue_retenue . ')>' . $text . '</span>';
+		if ($text) {
+			$classe = 'debug-traduction'.($module_retenu == 'ecrire' ? '-prive' : '');
+			$text = '<span lang='.$langue_retenue.' class='.$classe.' title='.$ori_complet.'('.$langue_retenue.')>'.$text.'</span>';
 			$text = str_replace(
 						array("$module_retenu:", "$module_retenu|"),
 						array("*$module_retenu*:", "*$module_retenu*|"),

ecrire/inc/pipelines.php

Spacing +16 added lines, -16 removed lines

@@ -41,7 +41,7 @@ 
  * @param string $texte    Contenu qui sera inséré dans le head HTML
  * @return string          Contenu qui sera inséré dans le head HTML
 **/
-function f_jQuery ($texte) {
+function f_jQuery($texte) {
 	$x = '';
 	$jquery_plugins = pipeline('jquery_plugins',
 		array(
@@ -73,7 +73,7 @@ 
  * @param string $texte   Contenu de la page envoyée au navigateur
  * @return string         Contenu de la page envoyée au navigateur
 **/
-function f_surligne ($texte) {
+function f_surligne($texte) {
 	if (!$GLOBALS['html']) return $texte;
 	$rech = _request('var_recherche');
 	if (!$rech
@@ -85,7 +85,7 @@ 
 	if (isset($_SERVER['HTTP_REFERER'])) {
 		$_SERVER['HTTP_REFERER'] = preg_replace(',[^\w\,/#&;-]+,', ' ', $_SERVER['HTTP_REFERER']);
 	}
-	if ($rech){
+	if ($rech) {
 		$rech = preg_replace(',[^\w\,/#&;-]+,', ' ', $rech);
 	}
 
@@ -103,7 +103,7 @@ 
  * @param string $texte   Contenu de la page envoyée au navigateur
  * @return string         Contenu de la page envoyée au navigateur
  **/
-function f_tidy ($texte) {
+function f_tidy($texte) {
 	/**
 	 * Indentation à faire ?
 	 *
@@ -117,7 +117,7 @@ 
 	AND strlen($texte)
 	AND !headers_sent()) {
 		# Compatibilite ascendante
-		if (!is_string($xhtml)) $xhtml ='tidy';
+		if (!is_string($xhtml)) $xhtml = 'tidy';
 
 		if (!$f = charger_fonction($xhtml, 'inc', true)) {
 			spip_log("tidy absent, l'indenteur SPIP le remplace");
@@ -150,8 +150,8 @@ 
 	    || ($pos = stripos($texte, '<body>'))
 	    || ($pos = 0);
 
-	if (false === strpos(substr($texte, 0,$pos), '<!-- insert_head -->')) {
-		$insert = "\n".pipeline('insert_head','<!-- f_insert_head -->')."\n";
+	if (false === strpos(substr($texte, 0, $pos), '<!-- insert_head -->')) {
+		$insert = "\n".pipeline('insert_head', '<!-- f_insert_head -->')."\n";
 		$texte = substr_replace($texte, $insert, $pos, 0);
 	}
 
@@ -167,7 +167,7 @@ 
  * @param string $texte   Contenu de la page envoyée au navigateur
  * @return string         Contenu de la page envoyée au navigateur
 **/
-function f_admin ($texte) {
+function f_admin($texte) {
 	if (defined('_VAR_PREVIEW') AND _VAR_PREVIEW AND $GLOBALS['html']) {
 		include_spip('inc/filtres'); // pour http_img_pack
 		$x = "<div class='spip-previsu' "
@@ -184,8 +184,8 @@ 
 		include_spip('public/admin');
 		$texte = affiche_boutons_admin($texte);
 	}
-	if (_request('var_mode')=='noajax'){
-		$texte = preg_replace(',(class=[\'"][^\'"]*)ajax([^\'"]*[\'"]),Uims',"\\1\\2",$texte);
+	if (_request('var_mode') == 'noajax') {
+		$texte = preg_replace(',(class=[\'"][^\'"]*)ajax([^\'"]*[\'"]),Uims', "\\1\\2", $texte);
 	}
 	return $texte;
 }
@@ -216,12 +216,12 @@ 
  * @param string $texte   Contenu de la page envoyée au navigateur
  * @return string         Contenu de la page envoyée au navigateur
  */
-function f_queue(&$texte){
+function f_queue(&$texte) {
 
 	// eviter une inclusion si rien a faire
-	if (_request('action')=='cron'
-		OR queue_sleep_time_to_next_job()>0
-	  OR defined('_DEBUG_BLOCK_QUEUE')){
+	if (_request('action') == 'cron'
+		OR queue_sleep_time_to_next_job() > 0
+	  OR defined('_DEBUG_BLOCK_QUEUE')) {
 		return $texte;
 	}
 
@@ -234,8 +234,8 @@ 
 		return $texte;
 
 	// inserer avant le </body> fermant si on peut, a la fin de la page sinon
-	if (($p=strpos($texte,'</body>'))!==FALSE)
-		$texte = substr($texte,0,$p).$code.substr($texte,$p);
+	if (($p = strpos($texte, '</body>')) !== FALSE)
+		$texte = substr($texte, 0, $p).$code.substr($texte, $p);
 	else
 		$texte .= $code;
 

ecrire/inc/pipelines_ecrire.php

Spacing +52 added lines, -52 removed lines

@@ -33,7 +33,7 @@ 
  * @param string $texte    Contenu qui sera inséré dans le head HTML
  * @return string          Contenu complété des scripts javascripts, dont jQuery
 **/
-function f_jQuery_prive ($texte) {
+function f_jQuery_prive($texte) {
 	$x = '';
 	$jquery_plugins = pipeline('jquery_plugins',
 		array(
@@ -50,9 +50,9 @@ 
 		if ($script = find_in_path($script))
 			$x .= "\n<script src=\"$script\" type=\"text/javascript\"></script>\n";
 	// inserer avant le premier script externe ou a la fin
-	if (preg_match(",<script[^><]*src=,",$texte,$match)
-	  AND $p = strpos($texte,$match[0])){
-	  $texte = substr_replace($texte,$x,$p,0);
+	if (preg_match(",<script[^><]*src=,", $texte, $match)
+	  AND $p = strpos($texte, $match[0])) {
+	  $texte = substr_replace($texte, $x, $p, 0);
 	}
 	else
 		$texte .= $x;
@@ -68,22 +68,22 @@ 
  * @param string $texte
  * @return string
  */
-function affichage_final_prive_title_auto($texte){
-	if (strpos($texte,'<title>')===false
+function affichage_final_prive_title_auto($texte) {
+	if (strpos($texte, '<title>') === false
 	  AND
 			(preg_match(",<h1[^>]*>(.+)</h1>,Uims", $texte, $match)
 		   OR preg_match(",<h[23][^>]*>(.+)</h[23]>,Uims", $texte, $match))
 		AND $match = textebrut(trim($match[1]))
-		AND ($p = strpos($texte,'<head>'))!==FALSE) {
+		AND ($p = strpos($texte, '<head>')) !== FALSE) {
 		if (!$nom_site_spip = textebrut(typo($GLOBALS['meta']["nom_site"])))
-			$nom_site_spip=  _T('info_mon_site_spip');
+			$nom_site_spip = _T('info_mon_site_spip');
 
 		$titre = "<title>["
 			. $nom_site_spip
-			. "] ". $match
+			. "] ".$match
 		  ."</title>";
 
-		$texte = substr_replace($texte, $titre, $p+6,0);
+		$texte = substr_replace($texte, $titre, $p + 6, 0);
 	}
 	return $texte;
 }
@@ -95,9 +95,9 @@ 
 	$args = $flux['args'];
 	$type = $args['type'];
 	unset($args['row']);
-	if (!trouver_fond($type,"prive/objets/infos/"))
+	if (!trouver_fond($type, "prive/objets/infos/"))
 		$type = 'objet';
-	$flux['data'] .= recuperer_fond("prive/objets/infos/$type",$args);
+	$flux['data'] .= recuperer_fond("prive/objets/infos/$type", $args);
 	return $flux;
 }
 
@@ -116,57 +116,57 @@ 
  * @return array
  */
 function f_afficher_blocs_ecrire($flux) {
-	static $o=array();
-	if (is_string($fond=$flux['args']['fond'])) {
+	static $o = array();
+	if (is_string($fond = $flux['args']['fond'])) {
 		$exec = isset($flux['args']['contexte']['exec']) ? $flux['args']['contexte']['exec'] : _request('exec');
-		if (!isset($o[$exec])){
+		if (!isset($o[$exec])) {
 			$o[$exec] = trouver_objet_exec($exec);
 		}
 		// cas particulier
-		if ($exec=="infos_perso"){
+		if ($exec == "infos_perso") {
 			$flux['args']['contexte']['id_auteur'] = $GLOBALS['visiteur_session']['id_auteur'];
 		}
-		$typepage = (isset($flux['args']['contexte']['type-page'])?$flux['args']['contexte']['type-page']:$exec);
-		if ($fond == "prive/squelettes/navigation/$typepage"){
-			$flux['data']['texte'] = pipeline('affiche_gauche',array('args'=>$flux['args']['contexte'],'data'=>$flux['data']['texte']));
+		$typepage = (isset($flux['args']['contexte']['type-page']) ? $flux['args']['contexte']['type-page'] : $exec);
+		if ($fond == "prive/squelettes/navigation/$typepage") {
+			$flux['data']['texte'] = pipeline('affiche_gauche', array('args'=>$flux['args']['contexte'], 'data'=>$flux['data']['texte']));
 		}
-		elseif ($fond=="prive/squelettes/extra/$typepage") {
+		elseif ($fond == "prive/squelettes/extra/$typepage") {
 			include_spip('inc/presentation_mini');
-			$flux['data']['texte'] = pipeline('affiche_droite',array('args'=>$flux['args']['contexte'],'data'=>$flux['data']['texte'])).liste_objets_bloques($exec,$flux['args']['contexte']);
+			$flux['data']['texte'] = pipeline('affiche_droite', array('args'=>$flux['args']['contexte'], 'data'=>$flux['data']['texte'])).liste_objets_bloques($exec, $flux['args']['contexte']);
 		}
-		elseif ($fond=="prive/squelettes/hierarchie/$typepage" AND $o[$exec]) {
+		elseif ($fond == "prive/squelettes/hierarchie/$typepage" AND $o[$exec]) {
 			// id non defini sur les formulaire de nouveaux objets
 			$id = isset($flux['args']['contexte'][$o[$exec]['id_table_objet']]) ? intval($flux['args']['contexte'][$o[$exec]['id_table_objet']]) : 0;
-			$flux['data']['texte'] = pipeline('affiche_hierarchie',array('args'=>array('objet'=>$o[$exec]['type'],'id_objet'=>$id),'data'=>$flux['data']['texte']));
+			$flux['data']['texte'] = pipeline('affiche_hierarchie', array('args'=>array('objet'=>$o[$exec]['type'], 'id_objet'=>$id), 'data'=>$flux['data']['texte']));
 		}
-		elseif ($fond=="prive/squelettes/contenu/$typepage"){
-			if (!strpos($flux['data']['texte'],"<!--affiche_milieu-->"))
-				$flux['data']['texte'] = preg_replace(',<div id=["\']wysiwyg,',"<!--affiche_milieu-->\\0",$flux['data']['texte']);
+		elseif ($fond == "prive/squelettes/contenu/$typepage") {
+			if (!strpos($flux['data']['texte'], "<!--affiche_milieu-->"))
+				$flux['data']['texte'] = preg_replace(',<div id=["\']wysiwyg,', "<!--affiche_milieu-->\\0", $flux['data']['texte']);
 			if ($o[$exec]
 				AND $objet = $o[$exec]['type']
 			  AND $o[$exec]['edition'] == false
-			  AND $id = intval($flux['args']['contexte'][$o[$exec]['id_table_objet']])){
+			  AND $id = intval($flux['args']['contexte'][$o[$exec]['id_table_objet']])) {
 				// inserer le formulaire de traduction
-				$flux['data']['texte'] = str_replace("<!--affiche_milieu-->",recuperer_fond('prive/objets/editer/traductions',array('objet'=>$objet,'id_objet'=>$id))."<!--affiche_milieu-->",$flux['data']['texte']);
-				$flux['data']['texte'] = pipeline('afficher_fiche_objet',array(
+				$flux['data']['texte'] = str_replace("<!--affiche_milieu-->", recuperer_fond('prive/objets/editer/traductions', array('objet'=>$objet, 'id_objet'=>$id))."<!--affiche_milieu-->", $flux['data']['texte']);
+				$flux['data']['texte'] = pipeline('afficher_fiche_objet', array(
 																						'args'=>array(
 																							'contexte'=>$flux['args']['contexte'],
 																							'type'=>$objet,
 																							'id'=>$id),
 																						'data'=>$flux['data']['texte']));
 			}
-			$flux['data']['texte'] = pipeline('affiche_milieu',array('args'=>$flux['args']['contexte'],'data'=>$flux['data']['texte']));
+			$flux['data']['texte'] = pipeline('affiche_milieu', array('args'=>$flux['args']['contexte'], 'data'=>$flux['data']['texte']));
 		}
-		elseif ($fond=="prive/squelettes/inclure/pied"){
-			$flux['data']['texte'] = pipeline('affiche_pied',array('args'=>$flux['args']['contexte'],'data'=>$flux['data']['texte']));
+		elseif ($fond == "prive/squelettes/inclure/pied") {
+			$flux['data']['texte'] = pipeline('affiche_pied', array('args'=>$flux['args']['contexte'], 'data'=>$flux['data']['texte']));
 		}
-		elseif (strncmp($fond,"prive/objets/contenu/",21)==0
-			AND $objet=basename($fond)
-			AND $objet==substr($fond,21)
+		elseif (strncmp($fond, "prive/objets/contenu/", 21) == 0
+			AND $objet = basename($fond)
+			AND $objet == substr($fond, 21)
 			AND isset($o[$objet]) 
 			AND $o[$objet]) {
 				$id = intval($flux['args']['contexte'][$o[$exec]['id_table_objet']]);
-				$flux['data']['texte'] = pipeline('afficher_contenu_objet',array('args'=>array('type'=>$objet,'id_objet'=>$id,'contexte'=>$flux['args']['contexte']),'data'=>$flux['data']['texte']));
+				$flux['data']['texte'] = pipeline('afficher_contenu_objet', array('args'=>array('type'=>$objet, 'id_objet'=>$id, 'contexte'=>$flux['args']['contexte']), 'data'=>$flux['data']['texte']));
 		}
 	}
 
@@ -178,17 +178,17 @@ 
  * @param string $flux
  * @return string
  */
-function f_queue_affiche_milieu($flux){
+function f_queue_affiche_milieu($flux) {
 	$args = $flux['args'];
 	$res = "";
-	foreach($args as $key=>$arg){
-		if (preg_match(",^id_,",$key) AND is_numeric($arg) AND $arg=intval($arg)){
+	foreach ($args as $key=>$arg) {
+		if (preg_match(",^id_,", $key) AND is_numeric($arg) AND $arg = intval($arg)) {
 			$objet = preg_replace(',^id_,', '', $key);
-			$res .= recuperer_fond('modeles/object_jobs_list',array('id_objet'=>$arg,'objet'=>$objet),array('ajax'=>true));
+			$res .= recuperer_fond('modeles/object_jobs_list', array('id_objet'=>$arg, 'objet'=>$objet), array('ajax'=>true));
 		}
 	}
 	if ($res)
-		$flux['data'] = $res . $flux['data'];
+		$flux['data'] = $res.$flux['data'];
 
 	return $flux;
 }
@@ -203,23 +203,23 @@ 
  *   nom de la page testee
  * @return array|bool
  */
-function trouver_objet_exec($exec){
-	static $objet_exec=array();
+function trouver_objet_exec($exec) {
+	static $objet_exec = array();
 	if (!$exec) return false;
 	// cas particulier
-	if ($exec=="infos_perso"){
+	if ($exec == "infos_perso") {
 		$exec = "auteur";
-		set_request('id_auteur',$GLOBALS['visiteur_session']['id_auteur']);
+		set_request('id_auteur', $GLOBALS['visiteur_session']['id_auteur']);
 	}
-	if (!isset($objet_exec[$exec])){
-		$objet_exec[$exec]=false;
+	if (!isset($objet_exec[$exec])) {
+		$objet_exec[$exec] = false;
 		$infos = lister_tables_objets_sql();
-		foreach($infos as $t=>$info){
-			if ($exec==$info['url_edit'] AND $info['editable']){
-				return $objet_exec[$exec] = array('edition'=>$exec==$info['url_voir']?'':true,'table_objet_sql'=>$t,'table'=>$info['table_objet'],'type'=>$info['type'],'id_table_objet'=>id_table_objet($info['type']));
+		foreach ($infos as $t=>$info) {
+			if ($exec == $info['url_edit'] AND $info['editable']) {
+				return $objet_exec[$exec] = array('edition'=>$exec == $info['url_voir'] ? '' : true, 'table_objet_sql'=>$t, 'table'=>$info['table_objet'], 'type'=>$info['type'], 'id_table_objet'=>id_table_objet($info['type']));
 			}
-			if ($exec==$info['url_voir']){
-				return $objet_exec[$exec] = array('edition'=>false,'table_objet_sql'=>$t,'table'=>$info['table_objet'],'type'=>$info['type'],'id_table_objet'=>id_table_objet($info['type']));
+			if ($exec == $info['url_voir']) {
+				return $objet_exec[$exec] = array('edition'=>false, 'table_objet_sql'=>$t, 'table'=>$info['table_objet'], 'type'=>$info['type'], 'id_table_objet'=>id_table_objet($info['type']));
 			}
 		}
 	}