Merge branch 'master' into myAutoBlog
This commit is contained in:
commit
8ac6108585
3 changed files with 7 additions and 12 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -1,6 +1,6 @@
|
||||||
0.3/.versionlock
|
0.3/.versionlock
|
||||||
0.3/.xsaflock
|
0.3/.xsaflock
|
||||||
0.3/rss.xml
|
0.3/resources/rss.xml
|
||||||
.project
|
.project
|
||||||
!0.3/resources/user.css
|
!0.3/resources/user.css
|
||||||
0.3/autoblogs/*
|
0.3/autoblogs/*
|
||||||
|
|
|
@ -162,17 +162,17 @@ function versionCheck() {
|
||||||
/**
|
/**
|
||||||
* RSS Feed
|
* RSS Feed
|
||||||
**/
|
**/
|
||||||
|
if( !file_exists(RSS_FILE)) {
|
||||||
|
require_once('class_rssfeed.php');
|
||||||
|
$rss = new AutoblogRSS(RSS_FILE);
|
||||||
|
$rss->create('Projet Autoblog'. ((!empty($head_title)) ? ' | '. $head_title : ''), serverUrl(true),"Projet Autoblog - RSS : Ajouts et changements de disponibilité.", serverUrl(true) . RSS_FILE);
|
||||||
|
}
|
||||||
if (isset($_GET['rss'])) {
|
if (isset($_GET['rss'])) {
|
||||||
require_once('class_rssfeed.php');
|
require_once('class_rssfeed.php');
|
||||||
$rss = new AutoblogRSS(RSS_FILE);
|
$rss = new AutoblogRSS(RSS_FILE);
|
||||||
$rss->displayXML();
|
$rss->displayXML();
|
||||||
die;
|
die;
|
||||||
}
|
}
|
||||||
if( !file_exists(RSS_FILE)) {
|
|
||||||
require_once('class_rssfeed.php');
|
|
||||||
$rss = new AutoblogRSS(RSS_FILE);
|
|
||||||
$rss->create('Projet Autoblog'. ((!empty($head_title)) ? ' | '. $head_title : ''), serverUrl(true),"Projet Autoblog - RSS : Ajouts et changements de disponibilité.", serverUrl(true) . '/' . RSS_FILE);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* SVG
|
* SVG
|
||||||
|
@ -566,7 +566,7 @@ if( !empty($_POST['generic']) && ALLOW_NEW_AUTOBLOGS && ALLOW_NEW_AUTOBLOGS_BY_L
|
||||||
$error = array_merge( $error, createAutoblog('generic', $sitename, $siteurl, $rssurl, $error));
|
$error = array_merge( $error, createAutoblog('generic', $sitename, $siteurl, $rssurl, $error));
|
||||||
|
|
||||||
if( empty($error))
|
if( empty($error))
|
||||||
$success[] = '<iframe width="1" height="1" frameborder="0" src="'. urlToFolderSlash( $siteurl ) .'/index.php"></iframe><b style="color:darkgreen">Autoblog '. $sitename .' crée avec succès.</b> → <a target="_blank" href="'. urlToFolderSlash( $siteurl ) .'">afficher l\'autoblog</a>';
|
$success[] = '<iframe width="1" height="1" frameborder="0" src="'. urlToFolderSlash( $siteurl ) .'/index.php"></iframe><b style="color:darkgreen">Autoblog '. $sitename .' crée avec succès.</b> → <a target="_blank" href="'. AUTOBLOGS_FOLDER . urlToFolderSlash( $siteurl ) .'">afficher l\'autoblog</a>';
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// checking procedure
|
// checking procedure
|
||||||
|
|
|
@ -1,5 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0">
|
|
||||||
<channel>
|
|
||||||
<atom:link href="http://workspace.hoa.ro/autoblog/Projet-Autoblog/0.3//./resources/rss.xml" rel="self" type="application/rss+xml">http://workspace.hoa.ro/autoblog/Projet-Autoblog/0.3/</atom:link><title>Projet Autoblog</title><description>Projet Autoblog - RSS : Ajouts et changements de disponibilité.</description></channel>
|
|
||||||
</rss>
|
|
Loading…
Reference in a new issue