Changeset 93639 in spip-zone
- Timestamp:
- Dec 13, 2015, 2:37:43 PM (5 years ago)
- Location:
- _core_/plugins/dump
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
_core_/plugins/dump/action/restaurer.php
r93610 r93639 44 44 $status_file = _DIR_TMP . basename($status_file) . ".txt"; 45 45 if (!lire_fichier($status_file, $status) 46 OR!$status = unserialize($status)46 or !$status = unserialize($status) 47 47 ) { 48 48 … … 66 66 67 67 } 68 69 ?> -
_core_/plugins/dump/action/sauvegarder.php
r93610 r93639 41 41 42 42 $status_file = $arg; 43 $redirect = parametre_url(generer_action_auteur('sauvegarder', $status_file), "step", intval(_request('step') +1),43 $redirect = parametre_url(generer_action_auteur('sauvegarder', $status_file), "step", intval(_request('step') + 1), 44 44 '&'); 45 45 … … 62 62 } 63 63 } 64 65 ?> -
_core_/plugins/dump/action/telecharger_dump.php
r93610 r93639 33 33 if ( 34 34 file_exists($file) 35 ANDautoriser('webmestre')35 and autoriser('webmestre') 36 36 ) { 37 37 … … 63 63 exit; 64 64 } 65 66 ?> -
_core_/plugins/dump/base/restaurer.php
r93610 r93639 28 28 $status_file = _DIR_TMP . basename($status_file) . ".txt"; 29 29 if (!lire_fichier($status_file, $status) 30 OR!$status = unserialize($status)30 or !$status = unserialize($status) 31 31 ) { 32 32 } else { 33 $redirect = parametre_url(generer_action_auteur('restaurer', _DUMP_STATUS_FILE), "step", intval(_request('step') +1),33 $redirect = parametre_url(generer_action_auteur('restaurer', _DUMP_STATUS_FILE), "step", intval(_request('step') + 1), 34 34 '&'); 35 35 … … 39 39 $timeout = 30; 40 40 } // parions sur une valeur tellement courante ... 41 $max_time = time() +$timeout/2;41 $max_time = time() + $timeout / 2; 42 42 43 43 include_spip('inc/minipres'); … … 49 49 echo(install_debut_html($titre)); 50 50 // script de rechargement auto sur timeout 51 echo http_script("window.setTimeout('location.href=\"" . $redirect . "\";'," . ($timeout *1000) . ")");51 echo http_script("window.setTimeout('location.href=\"" . $redirect . "\";'," . ($timeout * 1000) . ")"); 52 52 echo "<div style='text-align: left'>\n"; 53 53 … … 65 65 ); 66 66 if ($desc = sql_getfetsel('valeur', 'spip_meta', "nom='dump_structure_temp'", '', '', '', '', 'dump') 67 AND$desc = unserialize($desc)67 and $desc = unserialize($desc) 68 68 ) { 69 69 $options['desc_tables_dest'] = $desc; … … 97 97 } 98 98 } 99 100 101 ?> -
_core_/plugins/dump/connect/dump.php
r93610 r93639 26 26 } 27 27 } 28 29 ?> -
_core_/plugins/dump/exec/base_restaurer.php
r93610 r93639 30 30 31 31 } 32 33 ?> -
_core_/plugins/dump/formulaires/inc-lister-sauvegardes_fonctions.php
r93610 r93639 6 6 7 7 include_spip('inc/dump'); 8 9 ?> -
_core_/plugins/dump/formulaires/restaurer.php
r93610 r93639 29 29 'choisi' => _request('fichier') ? _request('fichier') : _request('nom'), 30 30 'nom_sauvegarde' => '', 31 'tout_restaurer' => (_request('check_tables') AND!_request('tout_restaurer')) ? '' : 'oui',31 'tout_restaurer' => (_request('check_tables') and !_request('tout_restaurer')) ? '' : 'oui', 32 32 'fichier' => '', 33 33 'tri' => 'nom', … … 45 45 $erreurs = array(); 46 46 $nom = ""; 47 if (!$fichier = _request('fichier') AND!$nom = _request('nom_sauvegarde')) {47 if (!$fichier = _request('fichier') and !$nom = _request('nom_sauvegarde')) { 48 48 $erreurs['fichier'] = _T('info_obligatoire'); 49 49 } elseif ($fichier) { … … 76 76 $tables 77 77 ) . "</li></ol><input type='hidden' name='check_tables' value='oui' />\n"; 78 if (!count(_request('tables')) AND !_request('tout_restaurer') AND_request('check_tables')) {78 if (!count(_request('tables')) and !_request('tout_restaurer') and _request('check_tables')) { 79 79 $erreurs['tout_restaurer'] = _T('dump:selectionnez_table_a_restaurer'); 80 80 } … … 82 82 83 83 if ($nom 84 AND (!count($erreurs) OR (count($erreurs) == 1 ANDisset($erreurs['tables'])))84 and (!count($erreurs) or (count($erreurs) == 1 and isset($erreurs['tables']))) 85 85 ) { 86 86 if (_request('confirm') !== $nom) { … … 102 102 } 103 103 104 if (count($erreurs) AND!isset($erreurs['message_erreur'])) {104 if (count($erreurs) and !isset($erreurs['message_erreur'])) { 105 105 $erreurs['message_erreur'] = ''; 106 106 } // pas de message general automatique ici … … 143 143 } 144 144 } 145 146 147 ?> -
_core_/plugins/dump/formulaires/sauvegarder.php
r93610 r93639 33 33 // ici on liste tout, les tables exclue sont simplement non cochees 34 34 $exclude = lister_tables_noexport(); 35 list($tables, ) = base_liste_table_for_dump($exclude);35 list($tables, ) = base_liste_table_for_dump($exclude); 36 36 $tables = base_lister_toutes_tables('', $tables); 37 37 … … 41 41 '_spipnet' => $GLOBALS['home_server'] . '/' . $GLOBALS['spip_lang'] . '_article1489.html', 42 42 'nom_sauvegarde' => basename(dump_nom_fichier($dir_dump, 'sqlite'), '.sqlite'), 43 'tout_sauvegarder' => (_request('nom_sauvegarde') AND!_request('tout_sauvegarder')) ? '' : 'oui',43 'tout_sauvegarder' => (_request('nom_sauvegarde') and !_request('tout_sauvegarder')) ? '' : 'oui', 44 44 '_tables' => "<ol class='spip'><li class='choix'>\n" . join("</li>\n<li class='choix'>", 45 45 base_saisie_tables('tables', $tables, $exclude, … … 62 62 $erreurs['nom_sauvegarde'] = _T('info_obligatoire'); 63 63 } elseif (!preg_match(',^[\w_][\w_.]*$,', $nom) 64 ORbasename($nom) !== $nom64 or basename($nom) !== $nom 65 65 ) { 66 66 $erreurs['nom_sauvegarde'] = _T('dump:erreur_nom_fichier'); … … 84 84 // (tables de cache en pratique) 85 85 $exclude = lister_tables_noexport(); 86 list($tables, ) = base_liste_table_for_dump($exclude);86 list($tables, ) = base_liste_table_for_dump($exclude); 87 87 $tables = base_lister_toutes_tables('', $tables, $exclude); 88 88 } else { … … 104 104 } 105 105 } 106 107 ?> -
_core_/plugins/dump/inc/dump.php
r93610 r93639 34 34 $repertoire = _DIR_DUMP; 35 35 if (!@file_exists($repertoire) 36 AND!$repertoire = sous_repertoire(_DIR_DUMP, '', false, true)36 and !$repertoire = sous_repertoire(_DIR_DUMP, '', false, true) 37 37 ) { 38 38 $repertoire = preg_replace(',' . _DIR_TMP . ',', '', _DIR_DUMP); … … 136 136 137 137 if (lire_fichier($status_file, $status) 138 AND$status = unserialize($status)139 AND$status['etape'] !== 'fini'140 AND filemtime($status_file) >= time()-120138 and $status = unserialize($status) 139 and $status['etape'] !== 'fini' 140 and filemtime($status_file) >= time() - 120 141 141 ) // si le fichier status est trop vieux c'est un abandon 142 142 { … … 149 149 150 150 if (!$tables) { 151 list($tables, ) = base_liste_table_for_dump(lister_tables_noexport());151 list($tables, ) = base_liste_table_for_dump(lister_tables_noexport()); 152 152 } 153 153 $status = array('tables' => $tables, 'where' => $where, 'archive' => $archive); … … 185 185 static $etape = 1; 186 186 if (unique($table)) { 187 if ($total < 0 OR!is_numeric($total)) {187 if ($total < 0 or !is_numeric($total)) { 188 188 echo "<br /><strong>" . $etape . '. ' . "</strong>$table "; 189 189 } else { … … 192 192 $etape++; 193 193 } 194 if (is_numeric($total) AND$total >= 0) {194 if (is_numeric($total) and $total >= 0) { 195 195 echo ". "; 196 196 } else { … … 226 226 $status_file = _DIR_TMP . basename($status_file) . ".txt"; 227 227 if (!lire_fichier($status_file, $status) 228 OR!$status = unserialize($status)228 or !$status = unserialize($status) 229 229 ) { 230 230 return; … … 303 303 $status_file = _DIR_TMP . basename($status_file) . ".txt"; 304 304 if (!lire_fichier($status_file, $status) 305 OR!$status = unserialize($status)305 or !$status = unserialize($status) 306 306 ) { 307 307 return ''; … … 319 319 function dump_verifie_sauvegarde_finie($status_file) { 320 320 if (!$status = dump_lire_status($status_file) 321 OR$status['etape'] !== 'fini'321 or $status['etape'] !== 'fini' 322 322 ) { 323 323 return ''; … … 335 335 function dump_nom_sauvegarde($status_file) { 336 336 if (!$status = dump_lire_status($status_file) 337 OR!file_exists($f = $status['archive'] . ".sqlite")337 or !file_exists($f = $status['archive'] . ".sqlite") 338 338 ) { 339 339 return ''; … … 351 351 function dump_taille_sauvegarde($status_file) { 352 352 if (!$f = dump_nom_sauvegarde($status_file) 353 OR!$s = filesize($f)353 or !$s = filesize($f) 354 354 ) { 355 355 return ''; … … 367 367 function dump_date_sauvegarde($status_file) { 368 368 if (!$f = dump_nom_sauvegarde($status_file) 369 OR!$d = filemtime($f)369 or !$d = filemtime($f) 370 370 ) { 371 371 return ''; … … 374 374 return date('Y-m-d', $d); 375 375 } 376 377 ?> -
_core_/plugins/dump/inc/sauvegarder.php
r93610 r93639 28 28 $status_file = _DIR_TMP . basename($status_file) . ".txt"; 29 29 if (!lire_fichier($status_file, $status) 30 OR!$status = unserialize($status)30 or !$status = unserialize($status) 31 31 ) { 32 32 } else { … … 36 36 $timeout = 30; 37 37 } // parions sur une valeur tellement courante ... 38 $max_time = time() +$timeout/2;38 $max_time = time() + $timeout / 2; 39 39 40 40 include_spip('inc/minipres'); … … 46 46 echo(install_debut_html($titre)); 47 47 // script de rechargement auto sur timeout 48 echo http_script("window.setTimeout('location.href=\"" . $redirect . "\";'," . ($timeout *1000) . ")");48 echo http_script("window.setTimeout('location.href=\"" . $redirect . "\";'," . ($timeout * 1000) . ")"); 49 49 echo "<div style='text-align: left'>\n"; 50 50 … … 66 66 echo("</div>\n"); 67 67 68 if (!$res AND$redirect) {68 if (!$res and $redirect) { 69 69 echo dump_relance($redirect); 70 70 } … … 76 76 } 77 77 } 78 79 80 ?>
Note: See TracChangeset
for help on using the changeset viewer.