From 195a6644f5146d33b833851cf3c2ed3e25e65f4c Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Wed, 10 Apr 2013 13:08:15 +0200 Subject: [PATCH 01/11] Trying to solve #9 config.php should not be edited for the final 0.3 from now (except maybe fixing the present commit). + bug fix --- 0.3/autoblogs/autoblog.php | 2 +- 0.3/config.php | 56 +++++++++++++------------------------- 0.3/functions.php | 15 +++++++++- 0.3/index.php | 21 ++++++++------ 0.3/xsaf3.php | 4 +-- 5 files changed, 49 insertions(+), 49 deletions(-) diff --git a/0.3/autoblogs/autoblog.php b/0.3/autoblogs/autoblog.php index 38a68f5..25955a7 100644 --- a/0.3/autoblogs/autoblog.php +++ b/0.3/autoblogs/autoblog.php @@ -722,7 +722,7 @@ echo '
-

PROJET AUTOBLOG'. (!empty($head_title) ? ' ~ '. escape($head_title) : '') .'

+

PROJET AUTOBLOG'. (strlen(HEAD_TITLE) > 0 ? ' ~ '. HEAD_TITLE : '') .'

'.escape($config->site_title).'

'; diff --git a/0.3/config.php b/0.3/config.php index 8a2170e..5230278 100755 --- a/0.3/config.php +++ b/0.3/config.php @@ -1,53 +1,35 @@ SebSauvage et Bohwaz.'); -// Logo à utiliser -$logo=RESOURCES_FOLDER .'icon-logo.svg'; - -// Marquez ici votre propre message qui apparaîtra en bas de page. -// exemple : -//$HTML_footer="
Love data
Data is essential
Data must flow
Data must be used
Data is neither good nor bad
There is no illegal data
Data is free
Data can not be owned
No man, machine or system shall interrupt the flow of data
Locking data is a crime against datanity"; -$HTML_footer='D\'après les premières versions de SebSauvage et Bohwaz.'; - -$head_title = ""; - -/* And now, the XSAF links to be imported, with maximal execusion time for import in second ! -You should add only trusted sources. */ -$autoblog_farm = array( - 'https://raw.github.com/mitsukarenai/xsaf-bootstrap/master/3.json' /*, - 'https://www.ecirtam.net/autoblogs/?export', - 'https://autoblog.suumitsu.eu/?export', */ +// Import autoblogs from friend's autoblog farm - Add a link to the JSON export +$friends_autoblog_farm = array( + 'https://raw.github.com/mitsukarenai/xsaf-bootstrap/master/3.json', + // 'https://www.ecirtam.net/autoblogs/?export', + // 'https://autoblog.suumitsu.eu/?export', + // 'http://streisand.hoa.ro/?export', ); ?> diff --git a/0.3/functions.php b/0.3/functions.php index bffc786..7cb6408 100755 --- a/0.3/functions.php +++ b/0.3/functions.php @@ -1,6 +1,19 @@ create('Projet Autoblog'. ((!empty($head_title)) ? ' | '. $head_title : ''), serverUrl(true),"Projet Autoblog - RSS : Ajouts et changements de disponibilité.", serverUrl(true) . RSS_FILE); + $rss->create('Projet Autoblog'. ((strlen(HEAD_TITLE)>0) ? ' | '. HEAD_TITLE : ''), serverUrl(true),"Projet Autoblog - RSS : Ajouts et changements de disponibilité.", serverUrl(true) . RSS_FILE); } if (isset($_GET['rss'])) { require_once('class_rssfeed.php'); @@ -487,10 +487,10 @@ if(!empty($_POST['socialaccount']) && !empty($_POST['socialinstance']) && ALLOW_ $socialinstance = strtolower(escape($_POST['socialinstance'])); if($socialinstance === 'twitter') { - if( $apitwitter !== FALSE ) { + if( API_TWITTER !== FALSE ) { $sitetype = 'twitter'; $siteurl = "http://twitter.com/$socialaccount"; - $rssurl = $apitwitter.$socialaccount; + $rssurl = API_TWITTER.$socialaccount; } else $error[] = "Twitter veut mettre à mort son API ouverte. Du coup on peut plus faire ça comme ça."; @@ -651,7 +651,7 @@ if( !empty($_POST['opml_file']) && ALLOW_NEW_AUTOBLOGS && ALLOW_NEW_AUTOBLOGS_BY - Projet Autoblog<?php if(!empty($head_title)) { echo " | " . escape($head_title); } ?> + Projet Autoblog<?php if(strlen(HEAD_TITLE)>0) echo " | " . HEAD_TITLE; ?> -

PROJET AUTOBLOG

+

+ PROJET AUTOBLOG + 0) echo " | " . HEAD_TITLE; ?> +

- - + '; + ?>

Présentation

@@ -743,7 +748,7 @@ if( !empty($_POST['opml_file']) && ALLOW_NEW_AUTOBLOGS && ALLOW_NEW_AUTOBLOGS_BY


Twitter
'; else echo 'Twitter
'; ?> Identica
diff --git a/0.3/xsaf3.php b/0.3/xsaf3.php index b62ce5e..47704b3 100755 --- a/0.3/xsaf3.php +++ b/0.3/xsaf3.php @@ -155,8 +155,8 @@ function xsafimport($xsafremote, $max_exec_time) { } if( DEBUG ) echo ''; -if( ALLOW_NEW_AUTOBLOGS and ALLOW_NEW_AUTOBLOGS_BY_XSAF && !empty($autoblog_farm) ) { - foreach( $autoblog_farm AS $value ) { +if( ALLOW_NEW_AUTOBLOGS and ALLOW_NEW_AUTOBLOGS_BY_XSAF && !empty($friends_autoblog_farm) ) { + foreach( $friends_autoblog_farm AS $value ) { if( !empty($value) ) xsafimport($value, EXEC_TIME); } From 78bd6edc0c377257f63caa6fb5fa05109e809674 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Wed, 10 Apr 2013 13:23:38 +0200 Subject: [PATCH 02/11] Poor FOOTER :( --- 0.3/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/0.3/index.php b/0.3/index.php index 1c5778f..9d51ca2 100755 --- a/0.3/index.php +++ b/0.3/index.php @@ -890,7 +890,7 @@ if( !empty($_POST['opml_file']) && ALLOW_NEW_AUTOBLOGS && ALLOW_NEW_AUTOBLOGS_BY ".count($autoblogs)." autoblogs hébergés

"; ?>
Propulsé par Projet Autoblog 0.3 de Mitsu, Oros et Arthur Hoaro (Domaine Public) - ".$HTML_footer; } ?> + 0 ){ echo "
".FOOTER; } ?>