fixes #9 - config.php is now in gitignore
This commit is contained in:
parent
3bfeb41ec3
commit
e3a251b8fe
5 changed files with 56 additions and 26 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -1,3 +1,4 @@
|
|||
0.3/config.php
|
||||
0.3/.versionlock
|
||||
0.3/.xsaflock
|
||||
0.3/resources/rss.xml
|
||||
|
|
|
@ -24,7 +24,7 @@ libxml_disable_entity_loader(true);
|
|||
if (file_exists(__DIR__ . '/../config.php')) {
|
||||
require_once __DIR__ . '/../config.php';
|
||||
}
|
||||
else die("Configuration file not found.");
|
||||
//else die("Configuration file not found.");
|
||||
|
||||
if (file_exists(__DIR__ . '/../functions.php')){
|
||||
require_once __DIR__ . '/../functions.php';
|
||||
|
|
|
@ -1,31 +1,39 @@
|
|||
<?php
|
||||
/**
|
||||
* config.php - Configuration file
|
||||
* config.php - User configuration file
|
||||
* ---
|
||||
* If you uncomment a setting in this file, it will override default option
|
||||
*
|
||||
* See how to configure your Autoblog farm at
|
||||
* https://github.com/mitsukarenai/Projet-Autoblog/wiki/Configuration
|
||||
**/
|
||||
|
||||
define( 'ALLOW_FULL_UPDATE', TRUE );
|
||||
define( 'ALLOW_CHECK_UPDATE', TRUE );
|
||||
// define( 'LOGO', 'icon-logo.svg' );
|
||||
// define( 'HEAD_TITLE', '');
|
||||
// define( 'FOOTER', 'D\'après les premières versions de <a href="http://sebsauvage.net">SebSauvage</a> et <a href="http://bohwaz.net/">Bohwaz</a>.');
|
||||
|
||||
// If you set ALLOW_NEW_AUTOBLOGS to FALSE, the following options do not matter.
|
||||
define( 'ALLOW_NEW_AUTOBLOGS', TRUE );
|
||||
define( 'ALLOW_NEW_AUTOBLOGS_BY_LINKS', TRUE );
|
||||
define( 'ALLOW_NEW_AUTOBLOGS_BY_SOCIAL', TRUE );
|
||||
define( 'ALLOW_NEW_AUTOBLOGS_BY_BUTTON', TRUE );
|
||||
define( 'ALLOW_NEW_AUTOBLOGS_BY_OPML_FILE', TRUE );
|
||||
define( 'ALLOW_NEW_AUTOBLOGS_BY_OPML_LINK', TRUE );
|
||||
define( 'ALLOW_NEW_AUTOBLOGS_BY_XSAF', TRUE );
|
||||
// define( 'ALLOW_FULL_UPDATE', TRUE );
|
||||
// define( 'ALLOW_CHECK_UPDATE', TRUE );
|
||||
|
||||
// More about TwitterBridge : https://github.com/mitsukarenai/twitterbridge
|
||||
define( 'API_TWITTER', FALSE );
|
||||
/**
|
||||
* If you set ALLOW_NEW_AUTOBLOGS to FALSE, the following options do not matter.
|
||||
**/
|
||||
// define( 'ALLOW_NEW_AUTOBLOGS', TRUE );
|
||||
// define( 'ALLOW_NEW_AUTOBLOGS_BY_LINKS', TRUE );
|
||||
// define( 'ALLOW_NEW_AUTOBLOGS_BY_SOCIAL', TRUE );
|
||||
// define( 'ALLOW_NEW_AUTOBLOGS_BY_BUTTON', TRUE );
|
||||
// define( 'ALLOW_NEW_AUTOBLOGS_BY_OPML_FILE', TRUE );
|
||||
// define( 'ALLOW_NEW_AUTOBLOGS_BY_OPML_LINK', TRUE );
|
||||
// define( 'ALLOW_NEW_AUTOBLOGS_BY_XSAF', TRUE );
|
||||
|
||||
define( 'LOGO', 'icon-logo.svg' );
|
||||
define( 'HEAD_TITLE', '');
|
||||
define( 'FOOTER', 'D\'après les premières versions de <a href="http://sebsauvage.net">SebSauvage</a> et <a href="http://bohwaz.net/">Bohwaz</a>.');
|
||||
/**
|
||||
* More about TwitterBridge : https://github.com/mitsukarenai/twitterbridge
|
||||
**/
|
||||
// define( 'API_TWITTER', FALSE );
|
||||
|
||||
// Import autoblogs from friend's autoblog farm - Add a link to the JSON 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',
|
||||
|
|
|
@ -1,6 +1,9 @@
|
|||
<?php
|
||||
|
||||
// Technical configuration
|
||||
/**
|
||||
* DO NOT EDIT THESE LINES
|
||||
* You can override these options by setting them in config.php
|
||||
**/
|
||||
if(!defined('ROOT_DIR'))
|
||||
{
|
||||
define('ROOT_DIR', dirname($_SERVER['SCRIPT_FILENAME']));
|
||||
|
@ -13,6 +16,25 @@ if (!defined('RSS_FILE')) define('RSS_FILE', RESOURCES_FOLDER.'rss.xml');
|
|||
date_default_timezone_set('Europe/Paris');
|
||||
setlocale(LC_TIME, 'fr_FR.UTF-8', 'fr_FR', 'fr');
|
||||
|
||||
if( !defined('ALLOW_FULL_UPDATE')) define( 'ALLOW_FULL_UPDATE', TRUE );
|
||||
if( !defined('ALLOW_CHECK_UPDATE')) define( 'ALLOW_CHECK_UPDATE', TRUE );
|
||||
|
||||
// If you set ALLOW_NEW_AUTOBLOGS to FALSE, the following options do not matter.
|
||||
if( !defined('ALLOW_NEW_AUTOBLOGS')) define( 'ALLOW_NEW_AUTOBLOGS', TRUE );
|
||||
if( !defined('ALLOW_NEW_AUTOBLOGS_BY_LINKS')) define( 'ALLOW_NEW_AUTOBLOGS_BY_LINKS', TRUE );
|
||||
if( !defined('ALLOW_NEW_AUTOBLOGS_BY_SOCIAL')) define( 'ALLOW_NEW_AUTOBLOGS_BY_SOCIAL', TRUE );
|
||||
if( !defined('ALLOW_NEW_AUTOBLOGS_BY_BUTTON')) define( 'ALLOW_NEW_AUTOBLOGS_BY_BUTTON', TRUE );
|
||||
if( !defined('ALLOW_NEW_AUTOBLOGS_BY_OPML_FILE')) define( 'ALLOW_NEW_AUTOBLOGS_BY_OPML_FILE', TRUE );
|
||||
if( !defined('ALLOW_NEW_AUTOBLOGS_BY_OPML_LINK')) define( 'ALLOW_NEW_AUTOBLOGS_BY_OPML_LINK', TRUE );
|
||||
if( !defined('ALLOW_NEW_AUTOBLOGS_BY_XSAF')) define( 'ALLOW_NEW_AUTOBLOGS_BY_XSAF', TRUE );
|
||||
|
||||
// More about TwitterBridge : https://github.com/mitsukarenai/twitterbridge
|
||||
if( !defined('API_TWITTER')) define( 'API_TWITTER', FALSE );
|
||||
|
||||
if( !defined('LOGO')) define( 'LOGO', 'icon-logo.svg' );
|
||||
if( !defined('HEAD_TITLE')) define( 'HEAD_TITLE', '');
|
||||
if( !defined('FOOTER')) define( 'FOOTER', 'D\'après les premières versions de <a href="http://sebsauvage.net">SebSauvage</a> et <a href="http://bohwaz.net/">Bohwaz</a>.');
|
||||
|
||||
// Functions
|
||||
function NoProtocolSiteURL($url) {
|
||||
$protocols = array("http://", "https://");
|
||||
|
|
|
@ -21,22 +21,21 @@
|
|||
define('XSAF_VERSION', 3);
|
||||
define('ROOT_DIR', __DIR__);
|
||||
|
||||
$error = array();
|
||||
$success = array();
|
||||
|
||||
if(file_exists("config.php")){
|
||||
include "config.php";
|
||||
require_once "config.php";
|
||||
}else{
|
||||
echo "config.php not found !";
|
||||
die;
|
||||
$error[] = "config.php not found !";
|
||||
}
|
||||
if(file_exists("functions.php")){
|
||||
include "functions.php";
|
||||
require_once "functions.php";
|
||||
}else{
|
||||
echo "functions.php not found !";
|
||||
die;
|
||||
}
|
||||
|
||||
$error = array();
|
||||
$success = array();
|
||||
|
||||
function get_title_from_feed($url) {
|
||||
return get_title_from_datafeed(file_get_contents($url));
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue