@@ -48,7 +48,7 @@ |
||
| 48 | 48 | $headers = ""; |
| 49 | 49 | if (isset($page['entetes']) and count($page['entetes'])) { |
| 50 | 50 | foreach ($page['entetes'] as $k => $v) { |
| 51 | - $headers .= (strlen($v) ? "$k: $v" : $k) . "\n"; |
|
| 51 | + $headers .= (strlen($v) ? "$k: $v" : $k)."\n"; |
|
| 52 | 52 | } |
| 53 | 53 | } |
| 54 | 54 | |
@@ -70,7 +70,7 @@ |
||
| 70 | 70 | |
| 71 | 71 | $cherche2 = array( |
| 72 | 72 | '/([^-\n]|^)--([^-]|$)/S', |
| 73 | - ',(' . _PROTOCOLES_STD . ')~((://[^"\'\s\[\]\}\)<>]+)~([?]))?,S', |
|
| 73 | + ',('._PROTOCOLES_STD.')~((://[^"\'\s\[\]\}\)<>]+)~([?]))?,S', |
|
| 74 | 74 | '/~/' |
| 75 | 75 | ); |
| 76 | 76 | $remplace2 = array( |
@@ -73,5 +73,5 @@ |
||
| 73 | 73 | return ''; |
| 74 | 74 | } |
| 75 | 75 | |
| 76 | - return generer_url_action('logout', "logout=public&url=" . rawurlencode($cible ? $cible : self('&'))); |
|
| 76 | + return generer_url_action('logout', "logout=public&url=".rawurlencode($cible ? $cible : self('&'))); |
|
| 77 | 77 | } |
@@ -99,9 +99,9 @@ discard block |
||
| 99 | 99 | include_spip('inc/lang'); |
| 100 | 100 | |
| 101 | 101 | if ($GLOBALS['spip_lang'] <> $default) { |
| 102 | - $opt = lang_select($default); # et remplace |
|
| 102 | + $opt = lang_select($default); # et remplace |
|
| 103 | 103 | if ($GLOBALS['spip_lang'] <> $default) { |
| 104 | - $default = ''; # annule tout choix par defaut |
|
| 104 | + $default = ''; # annule tout choix par defaut |
|
| 105 | 105 | if ($opt) { |
| 106 | 106 | lang_select(); |
| 107 | 107 | } |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | |
| 111 | 111 | # lien a partir de / |
| 112 | 112 | $cible = parametre_url(self(), 'lang', '', '&'); |
| 113 | - $post = generer_url_action('converser', 'redirect=' . rawurlencode($cible), '&'); |
|
| 113 | + $post = generer_url_action('converser', 'redirect='.rawurlencode($cible), '&'); |
|
| 114 | 114 | |
| 115 | 115 | return array( |
| 116 | 116 | 'formulaires/menu_lang', |
@@ -84,7 +84,7 @@ |
||
| 84 | 84 | "A.email != '' AND L.id_objet=$id"); |
| 85 | 85 | foreach ($s as $row) { |
| 86 | 86 | if (email_valide($row['email'])) { |
| 87 | - $r .= ', ' . $row['email']; |
|
| 87 | + $r .= ', '.$row['email']; |
|
| 88 | 88 | } |
| 89 | 89 | } |
| 90 | 90 | $args[2] = substr($r, 2); |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | $credentials_ldap = array('ldap_dn' => $dn, 'ldap_password' => $pass); |
| 69 | 69 | |
| 70 | 70 | // Si l'utilisateur figure deja dans la base, y recuperer les infos |
| 71 | - $r = sql_fetsel("*", "spip_auteurs", "login=" . sql_quote($login) . " AND source='ldap'", '', '', '', '', $serveur); |
|
| 71 | + $r = sql_fetsel("*", "spip_auteurs", "login=".sql_quote($login)." AND source='ldap'", '', '', '', '', $serveur); |
|
| 72 | 72 | |
| 73 | 73 | if ($r) { |
| 74 | 74 | return array_merge($r, $credentials_ldap); |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | if ($r) { |
| 92 | 92 | return array_merge( |
| 93 | 93 | $credentials_ldap, |
| 94 | - sql_fetsel("*", "spip_auteurs", "id_auteur=" . intval($r), '', '', '', '', $serveur) |
|
| 94 | + sql_fetsel("*", "spip_auteurs", "id_auteur=".intval($r), '', '', '', '', $serveur) |
|
| 95 | 95 | ); |
| 96 | 96 | } |
| 97 | 97 | |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | $connexion = spip_connect($serveur); |
| 121 | 121 | if (!is_array($connexion['ldap'])) { |
| 122 | 122 | if ($connexion['authentification']['ldap']) { |
| 123 | - $f = _DIR_CONNECT . $connexion['authentification']['ldap']; |
|
| 123 | + $f = _DIR_CONNECT.$connexion['authentification']['ldap']; |
|
| 124 | 124 | unset($GLOBALS['ldap_link']); |
| 125 | 125 | if (is_readable($f)) { |
| 126 | 126 | include_once($f); |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | |
| 169 | 169 | $ldap_link = isset($ldap['link']) ? $ldap['link'] : null; |
| 170 | 170 | $ldap_base = isset($ldap['base']) ? $ldap['base'] : null; |
| 171 | - $desc = isset($ldap['attributes']) && $ldap['attributes'] ? $ldap['attributes'] : $GLOBALS['ldap_attributes'] ; |
|
| 171 | + $desc = isset($ldap['attributes']) && $ldap['attributes'] ? $ldap['attributes'] : $GLOBALS['ldap_attributes']; |
|
| 172 | 172 | |
| 173 | 173 | $logins = is_array($desc['login']) ? $desc['login'] : array($desc['login']); |
| 174 | 174 | |
@@ -333,7 +333,7 @@ discard block |
||
| 333 | 333 | if (!ldap_bind($link, $dn, session_get('ldap_password'))) { |
| 334 | 334 | return false; |
| 335 | 335 | } |
| 336 | - $encoded_pass = "{MD5}" . base64_encode(pack("H*", md5($new_pass))); |
|
| 336 | + $encoded_pass = "{MD5}".base64_encode(pack("H*", md5($new_pass))); |
|
| 337 | 337 | $success = ldap_mod_replace($link, $dn, array('userPassword' => $encoded_pass)); |
| 338 | 338 | |
| 339 | 339 | return $success; |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | |
| 39 | 39 | // numerotons les occurences d'un meme prefix |
| 40 | 40 | $versions[$info['prefix']] = isset($versions[$info['prefix']]) ? $versions[$info['prefix']] + 1 : ''; |
| 41 | - $id = $info['prefix'] . $versions[$info['prefix']]; |
|
| 41 | + $id = $info['prefix'].$versions[$info['prefix']]; |
|
| 42 | 42 | |
| 43 | 43 | $class = $class_li; |
| 44 | 44 | $class .= $actif ? " actif" : ""; |
@@ -55,15 +55,15 @@ discard block |
||
| 55 | 55 | $prefix = $info['prefix']; |
| 56 | 56 | $dir = "$dir_plugins$plug_file/lang/$prefix"; |
| 57 | 57 | $desc = plugin_propre($info['description'], $dir); |
| 58 | - $url_stat = parametre_url($url_page, "plugin", $dir_plugins . $plug_file); |
|
| 58 | + $url_stat = parametre_url($url_page, "plugin", $dir_plugins.$plug_file); |
|
| 59 | 59 | |
| 60 | - $s .= "<strong class='nom'>" . typo($info['nom']) . "</strong>"; |
|
| 61 | - $s .= " <span class='version'>" . $info['version'] . "</span>"; |
|
| 62 | - $s .= " <span class='etat'> - " . plugin_etat_en_clair($info['etat']) . "</span>"; |
|
| 60 | + $s .= "<strong class='nom'>".typo($info['nom'])."</strong>"; |
|
| 61 | + $s .= " <span class='version'>".$info['version']."</span>"; |
|
| 62 | + $s .= " <span class='etat'> - ".plugin_etat_en_clair($info['etat'])."</span>"; |
|
| 63 | 63 | $s .= "</div>"; |
| 64 | 64 | |
| 65 | 65 | if ($erreur) { |
| 66 | - $s .= "<div class='erreur'>" . join('<br >', $info['erreur']) . "</div>"; |
|
| 66 | + $s .= "<div class='erreur'>".join('<br >', $info['erreur'])."</div>"; |
|
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | $s .= "</li>"; |
@@ -122,7 +122,7 @@ |
||
| 122 | 122 | if (isset($arbre['erreur'])) { |
| 123 | 123 | $ret['erreur'] = $arbre['erreur']; |
| 124 | 124 | if ($plug) { |
| 125 | - spip_log("infos_plugin $plug " . @join(' ', $arbre['erreur'])); |
|
| 125 | + spip_log("infos_plugin $plug ".@join(' ', $arbre['erreur'])); |
|
| 126 | 126 | } |
| 127 | 127 | } |
| 128 | 128 | |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | static $filecache = ''; |
| 38 | 38 | |
| 39 | 39 | if ($cache === '') { |
| 40 | - $filecache = _DIR_TMP . "plugin_xml_cache.gz"; |
|
| 40 | + $filecache = _DIR_TMP."plugin_xml_cache.gz"; |
|
| 41 | 41 | if (is_file($filecache)) { |
| 42 | 42 | lire_fichier($filecache, $contenu); |
| 43 | 43 | $cache = unserialize($contenu); |
@@ -90,8 +90,8 @@ discard block |
||
| 90 | 90 | |
| 91 | 91 | |
| 92 | 92 | function plugins_get_infos_un($plug, $reload, $dir, &$cache) { |
| 93 | - if (!is_readable($file = "$dir$plug/" . ($desc = "paquet") . ".xml")) { |
|
| 94 | - if (!is_readable($file = "$dir$plug/" . ($desc = "plugin") . ".xml")) { |
|
| 93 | + if (!is_readable($file = "$dir$plug/".($desc = "paquet").".xml")) { |
|
| 94 | + if (!is_readable($file = "$dir$plug/".($desc = "plugin").".xml")) { |
|
| 95 | 95 | return false; |
| 96 | 96 | } |
| 97 | 97 | } |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | return false; |
| 119 | 119 | } |
| 120 | 120 | |
| 121 | - $f = charger_fonction('infos_' . $desc, 'plugins'); |
|
| 121 | + $f = charger_fonction('infos_'.$desc, 'plugins'); |
|
| 122 | 122 | $ret = $f($texte, $plug, $dir); |
| 123 | 123 | $ret['filemtime'] = $time; |
| 124 | 124 | $ret['md5_file'] = $md5; |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | if (isset($ret['prefix']) and $ret['prefix'] == 'spip') { |
| 129 | 129 | $ret['procure']['php'] = array('nom' => 'php', 'version' => phpversion()); |
| 130 | 130 | foreach (get_loaded_extensions() as $ext) { |
| 131 | - $ret['procure']['php:' . $ext] = array('nom' => 'php:' . $ext, 'version' => phpversion($ext)); |
|
| 131 | + $ret['procure']['php:'.$ext] = array('nom' => 'php:'.$ext, 'version' => phpversion($ext)); |
|
| 132 | 132 | } |
| 133 | 133 | } |
| 134 | 134 | $diff = ($ret != $pcache); |