From 814cc39fbeab1b648f069b4615fb268de9bd2322 Mon Sep 17 00:00:00 2001 From: Piotr KUCHARSKI Date: Wed, 26 Nov 2014 19:47:05 +0100 Subject: [PATCH] clean up spacing and braces according to PSR-2 rules --- rss.php | 287 +++++++++++++++++++++++++++----------------------------- 1 file changed, 139 insertions(+), 148 deletions(-) diff --git a/rss.php b/rss.php index cf2ea5d..aab1293 100644 --- a/rss.php +++ b/rss.php @@ -1,7 +1,7 @@ - $ovalue){ - $nkeys = array_keys($new, $ovalue); - foreach($nkeys as $nindex){ - $matrix[$oindex][$nindex] = isset($matrix[$oindex - 1][$nindex - 1]) ? - $matrix[$oindex - 1][$nindex - 1] + 1 : 1; - if($matrix[$oindex][$nindex] > $maxlen){ - $maxlen = $matrix[$oindex][$nindex]; - $omax = $oindex + 1 - $maxlen; - $nmax = $nindex + 1 - $maxlen; - } - } - } - if($maxlen == 0) return array(array('d'=>$old, 'i'=>$new)); - return array_merge( - diff(array_slice($old, 0, $omax), array_slice($new, 0, $nmax)), - array_slice($new, $nmax, $maxlen), - diff(array_slice($old, $omax + $maxlen), array_slice($new, $nmax + $maxlen))); - } +# Paul's Simple Diff Algorithm v 0.1 : http://paulbutler.org/archives/a-simple-diff-algorithm-in-php/ +function diff($old, $new) +{ + $matrix = array(); + $maxlen = 0; + foreach ($old as $oindex => $ovalue) { + $nkeys = array_keys($new, $ovalue); + foreach ($nkeys as $nindex) { + $matrix[$oindex][$nindex] = isset($matrix[$oindex - 1][$nindex - 1]) ? + $matrix[$oindex - 1][$nindex - 1] + 1 : 1; + if ($matrix[$oindex][$nindex] > $maxlen) { + $maxlen = $matrix[$oindex][$nindex]; + $omax = $oindex + 1 - $maxlen; + $nmax = $nindex + 1 - $maxlen; + } + } + } + if ($maxlen == 0) + return array(array('d'=>$old, 'i'=>$new)); + return array_merge( + diff(array_slice($old, 0, $omax), array_slice($new, 0, $nmax)), + array_slice($new, $nmax, $maxlen), + diff(array_slice($old, $omax + $maxlen), array_slice($new, $nmax + $maxlen))); +} - function print_array($array_to_display) { - echo '
';
-		print_r($array_to_display);
-		echo '
'; - } -/*===================*/ -/*Variables*/ -/*===================*/ - require("config-default.php"); - include("config.php"); - #$content = ""; - $old_files_list = "db_old_files"; //list of files in ./photos - $db_feed_source = "db_feed_source"; - $db_rss_timestamp = "db_rss_timestamp"; - $Folder = 'photos'; - $content = ListFiles($gallery_link, $content, $Folder, $SkipExts, $SkipObjects); - $to_store = ""; - // Init files - if (!file_exists($old_files_list)) - { - file_put_contents($old_files_list, ""); - } - if (!file_exists($db_feed_source)) - { - file_put_contents($db_feed_source, ""); - } - if (!file_exists($db_rss_timestamp)) - { - file_put_contents($db_rss_timestamp, ""); - } +function print_array($array_to_display) +{ + echo '
';
+    print_r($array_to_display);
+    echo '
'; +} /*===================*/ -/*Computing*/ +/* Variables */ /*===================*/ - #Todo : ajouter une condition : dois-je regénérer le flux ou utiliser les anciens fichiers ? - $temp = file_get_contents($db_feed_source); - $last_rss_gen = file_get_contents($db_rss_timestamp); - $current_time = time(); - //If the RSS generation is already launched, don't do a second generation at the same time - if (($current_time - $last_rss_gen) > $rss_refresh_interval && file_exists("rss.locker") == false) - { - file_put_contents("rss.locker", ""); - file_put_contents($db_rss_timestamp, time()); - // Load the list from files. - $old_files_list_content = explode("\n", file_get_contents($old_files_list)); - $new_files_list_content = explode("\n", $content); #debug - // Generate and stock new elements - $differences = diff($old_files_list_content, $new_files_list_content); - for ($i=0; $i < count($differences); $i++) - { - if (is_array($differences[$i])) - { - for ($j=0; $j < count($differences[$i]["i"]); $j++) - { - if (strlen($differences[$i]["i"][$j]) > 2) - { - $to_store .= $differences[$i]["i"][$j] . "\n"; - } - } - } - } - //Add new elements at the top of the feed's source - $temp = $to_store . $temp; - file_put_contents($db_feed_source, $temp); - // Store the current file list for the next generation - file_put_contents($old_files_list, $content); - unlink("rss.locker"); - } +require("config-default.php"); +include("config.php"); +#$content = ""; +$old_files_list = "db_old_files"; //list of files in ./photos +$db_feed_source = "db_feed_source"; +$db_rss_timestamp = "db_rss_timestamp"; +$Folder = 'photos'; +$content = ListFiles($gallery_link, $content, $Folder, $SkipExts, $SkipObjects); +$to_store = ""; +// Init files +if (!file_exists($old_files_list)) { + file_put_contents($old_files_list, ""); +} +if (!file_exists($db_feed_source)) { + file_put_contents($db_feed_source, ""); +} +if (!file_exists($db_rss_timestamp)) { + file_put_contents($db_rss_timestamp, ""); +} + /*===================*/ -/*XML Gen*/ +/* Computing */ /*===================*/ - $temp = explode("\n", $temp); - $pieceOfTitle; - $titleLenght; - echo " - - - ".$title." - ".$gallery_link." - ".$description." - "; - for ($i=0; $i < $nb_items_rss; $i++) { - $pieceOfTitle = strrchr ($temp[$i] , "/"); - $titleLenght = strlen($pieceOfTitle) - strlen(strrchr($pieceOfTitle, ".")); - echo - " - " . substr($pieceOfTitle, 1, $titleLenght-1) . " - ". $temp[$i] . " - - ]]> - - " - ; - if ($temp[$i+1] == NULL) - break; - } - echo" - - - "; -?> +#Todo : ajouter une condition : dois-je regénérer le flux ou utiliser les anciens fichiers ? +$temp = file_get_contents($db_feed_source); +$last_rss_gen = file_get_contents($db_rss_timestamp); +$current_time = time(); +// If the RSS generation is already launched, don't do a second generation at the same time +if (($current_time - $last_rss_gen) > $rss_refresh_interval && file_exists("rss.locker") == false) { + file_put_contents("rss.locker", ""); + file_put_contents($db_rss_timestamp, time()); + // Load the list from files. + $old_files_list_content = explode("\n", file_get_contents($old_files_list)); + $new_files_list_content = explode("\n", $content); #debug + // Generate and stock new elements + $differences = diff($old_files_list_content, $new_files_list_content); + for ($i=0; $i < count($differences); $i++) { + if (is_array($differences[$i])) { + for ($j=0; $j < count($differences[$i]["i"]); $j++) { + if (strlen($differences[$i]["i"][$j]) > 2) { + $to_store .= $differences[$i]["i"][$j] . "\n"; + } + } + } + } + // Add new elements at the top of the feed's source + $temp = $to_store . $temp; + file_put_contents($db_feed_source, $temp); + // Store the current file list for the next generation + file_put_contents($old_files_list, $content); + unlink("rss.locker"); +} +/*===================*/ +/* XML Gen */ +/*===================*/ +$temp = explode("\n", $temp); +$pieceOfTitle; +$titleLenght; +echo " + + + ".$title." + ".$gallery_link." + ".$description." + "; +for ($i=0; $i < $nb_items_rss; $i++) { + $pieceOfTitle = strrchr ($temp[$i] , "/"); + $titleLenght = strlen($pieceOfTitle) - strlen(strrchr($pieceOfTitle, ".")); + echo " + " . substr($pieceOfTitle, 1, $titleLenght-1) . " + ". $temp[$i] . " + + ]]> + + "; + if ($temp[$i+1] == NULL) + break; +} +echo " + + +";