Knah-Tsaeb/Respawn
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'userOptions' into kt-dev

Browse source 
Conflicts:
	.gitignore
This commit is contained in:
Knah Tsaeb 2014-08-29 16:01:52 +02:00
commit 6185cbeeaf
4 changed files with 244 additions and 237 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -220,3 +220,4 @@ mypersonaldata/public/
mypersonaldata/zipversions/ mypersonaldata/zipversions/
!mypersonaldata/zipversions/index.html !mypersonaldata/zipversions/index.html
pass.php pass.php
user_config.php

2
auto_restrict.php
View file

@ -1,4 +1,4 @@
<?php <?php
/** /**
* @author bronco@warriordudimanche.com / www.warriordudimanche.net * @author bronco@warriordudimanche.com / www.warriordudimanche.net
* @copyright open source and free to adapt (keep me aware !) * @copyright open source and free to adapt (keep me aware !)

5
config_page.php
View file

@ -129,13 +129,16 @@ function render_form($var){
} }
include('auto_restrict.php'); include('auto_restrict.php');
include('config.php'); include('config.php');
if(file_exists('user_config.php')){
include('user_config.php');
}
unset($GLOBAL['private_data_folder']); unset($GLOBAL['private_data_folder']);
unset($GLOBAL['public_data_folder']); unset($GLOBAL['public_data_folder']);
$GLOBAL['default_data_folder']=basename($GLOBAL['default_data_folder']); $GLOBAL['default_data_folder']=basename($GLOBAL['default_data_folder']);
$message=''; $message='';
if ($_POST){ if ($_POST){
$auto_form['filename']='config.php'; $auto_form['filename']='user_config.php';
$auto_form['filecontent']="<?php \n /* The configuration generated with auto_form*/\n\n"; $auto_form['filecontent']="<?php \n /* The configuration generated with auto_form*/\n\n";
$auto_form['variable_name']='$GLOBAL'; $auto_form['variable_name']='$GLOBAL';
$all_keys=explode(' | ',$_POST['all_keys']); $all_keys=explode(' | ',$_POST['all_keys']);

3
index.php
View file

@ -35,6 +35,9 @@ if (isset($_GET['tag'])){$search_tags=strip_tags($_GET['tag']);}else{$search_tag
// CONFIGURABLE OPTIONS // CONFIGURABLE OPTIONS
// adapter la configuration dans le fichier config.php // adapter la configuration dans le fichier config.php
include('config.php'); include('config.php');
if(file_exists('user_config.php')){
include('user_config.php');
}
$GLOBAL['version']='2.2'; $GLOBAL['version']='2.2';
$GLOBAL['respawn_url']=returncurrenturl(); $GLOBAL['respawn_url']=returncurrenturl();