diff --git a/design/style.css b/design/style.css
index 2a24129..f3d7ebc 100644
--- a/design/style.css
+++ b/design/style.css
@@ -9,7 +9,12 @@ body {
a:hover { color: #050;text-shadow:0 0 3px green;}
a { color: black; text-decoration: none;}
-
+.icon{font-family:arial, sans-serif;display:inline-block;border-radius: 2px;margin:1px;height:16px;width:16px;border:solid 1px;font-size:10px;line-height:16px;font-weight: bold; text-align:center;}
+.private .icon{color:rgba(200,0,0,0.6);background-color:rgba(255,0,0,0.2);border-color:rgba(255,0,0,0.4);}
+.public .icon{color:rgba(0,200,0,0.6);background-color:rgba(0,255,0,0.2);border-color:rgba(0,255,0,0.4);}
+.private .icon:hover{color:rgba(200,0,0,1);background-color:rgba(255,0,0,0.5);border-color:rgba(255,0,0,0.8);text-shadow:none;box-shadow: 0 0 1px red}
+.public .icon:hover{color:rgba(0,200,0,1);background-color:rgba(0,255,0,0.5);border-color:rgba(0,255,0,0.8);text-shadow:none;box-shadow: 0 0 1px green}
+.public .icon.suppr:hover,.private .icon.suppr:hover{color:pink;background-color:rgba(255,0,0,0.9);border-color:rgba(255,0,0,1);}
input{outline:none;-moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; height:25px;padding : 3px ; vertical-align: bottom; margin-top : 3px ;}
input[type=text]{width:80%;min-width:200px; background-color:rgba(255,255,255,0.8);border:1px solid #444;border-top-color:#333;border-bottom-color:#aaa; -moz-box-shadow: inset 0 1px 3px #000000; -webkit-box-shadow: inset 0 1px 3px #000000; box-shadow: inset 0 1px 3px #000000; }
input[type=text]:hover{background-color:rgba(200,255,200,0.8);-moz-box-shadow: inset 0 1px 3px #040; -webkit-box-shadow: inset 0 1px 3px #040; box-shadow: inset 0 1px 3px #040; }
@@ -32,43 +37,42 @@ header{
header nav{display:inline-block; vertical-align: top;}
header nav .zip{width:16px;height:16px; display:inline-block;background:url(zip.png) no-repeat;}
header nav p{color:lightgreen;text-shadow: 0 1px 1px black;font-size:20px;}
-header nav .tag_public{display:inline-block;padding:5px;color:green;text-shadow: 0 1px 1px black;}
-header nav .tag_public:hover{color:lightgreen;}
-header nav .tag_private{display:inline-block;padding:5px;color:red;text-shadow: 0 1px 1px black;}
-header nav .tag_private:hover{color:pink;}
+
aside{height:100%;padding-bottom : 70px;text-align:center;}
aside iframe{height:100%;border:none;}
aside ul{padding:0;}
-aside li{margin:5px;list-style:none;vertical-align:middle;border-radius:3px;overflow-x:hidden;}
+aside li{margin:5px;list-style:none;vertical-align:middle;border-radius:3px;}
aside li .tag{font-size:10px;display:inline-block;padding:2px;border-radius:3px;}
-aside .public li .tag{background:rgba(100,255,100,0.4);color:green;}
-aside .public li .tag:hover{background:rgba(100,255,100,0.9);color:darkgreen;}
-aside .private li .tag{background:rgba(255,100,100,0.4);color:red;}
-aside .private li .tag:hover{background:rgba(255,100,100,0.9);color:darkred;text-shadow:0 0 3px red;}
-
+nav .tag_public, aside .public li .tag{display:inline-block;border-radius:3px;padding:2px;margin:1px;background:rgba(100,255,100,0.4);color:green;}
+nav .tag_public:hover, aside .public li .tag:hover{background:green;}
+nav .tag_private, aside .private li .tag{display:inline-block;border-radius:3px;padding:2px;margin:1px;background:rgba(255,100,100,0.4);color:pink;text-shadow:0 1px 1px darkred;}
+nav .tag_private:hover, aside .private li .tag:hover{background:red;}
+.tag_cloud{padding:2px;}
+nav .tag_public{color:lightgreen;}
+aside .public,.private{overflow-x:hidden;min-width:300px;text-align:left;vertical-align:top; margin-top:25px;padding:10px; border-radius:3px; border:1px solid;display:inline-block;}
+aside .public{background:rgba(100,255,100,0.2);border-color:rgba(0,255,0,0.4);}
+aside .private{background:rgba(255,100,100,0.2);border-color:rgba(255,0,0,0.3);}
+aside .private a:hover{text-shadow:0 0 5px red;color:darkred;}
+aside .private em{color:darkred;}
+aside li em {font-size:10px ;}
aside .public li{background:rgba(100,255,100,0.2);}
aside .private li{background:rgba(255,100,100,0.2);}
-aside .public {background:rgba(100,255,100,0.2);}
-aside .private {background:rgba(255,100,100,0.2);}
-aside li em {font-size:10px ; color:#484;}
-aside li.private em { color:#844;}
+
aside li img {vertical-align:bottom;margin:1px;width:16px;height:16px;}
-aside li a.suppr,aside li a.rename,aside li a.origine, aside li a.zip, aside li a.tagme{opacity:0.5;width:16px;height:16px;display:inline-block;background:url(actions.png) no-repeat 0 -159px ;}
+/*aside li a.suppr,aside li a.rename,aside li a.origine, aside li a.zip, aside li a.tagme{opacity:0.5;width:16px;height:16px;display:inline-block;background:url(actions.png) no-repeat 0 -159px ;}
aside li a.origine{background-position: 0 -396px ;}
aside li a.zip{background-position: 0 2px ;}
aside li a.tagme{background-position: 0 -63px ;}
aside li a.rename{background-position: 0 -30px ;}
-aside li a.tagme:hover,aside li a.rename:hover,aside li a.suppr:hover,aside li a.origine:hover,aside li a.zip:hover{opacity:1;}
+aside li a.tagme:hover,aside li a.rename:hover,aside li a.suppr:hover,aside li a.origine:hover,aside li a.zip:hover{opacity:1;}*/
aside li a.toprivate,aside li a.topublic{float:right;margin-right:5px;opacity:0.5;}
aside li a.toprivate:hover,aside li a.topublic:hover{opacity:1;}
-aside .public,.private{min-width:300px;text-align:left;vertical-align:top; margin-top:25px;padding:10px; border-radius:5px; border:1px dashed;display:inline-block;}
-aside .public{border-color:green;}
-aside .private{border-color:red;}
+
footer {
font-size:10px;text-align: right; color:lightgreen;text-shadow: 0 1px 1px black; position:fixed; line-height:15px;
bottom:0;left:0;right:0;height:auto;min-height:15px;padding-right : 5px ; -webkit-touch-callout: none; -webkit-user-select: none; -khtml-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none;
diff --git a/index.php b/index.php
index 1f1b591..6545e41 100644
--- a/index.php
+++ b/index.php
@@ -1,4 +1,27 @@
Bookmarklet';
+$column_width='width:47%';
+if ($GLOBAL['public']){$bookmarklet='';$column_width='width:97%';}
+if (!creer_dossier($GLOBAL['data_folder'], TRUE)) { die('Cant create '.$GLOBAL['data_folder'].' folder.'); }
+if (!creer_dossier($GLOBAL['data_folder'].'/zipversions', TRUE)) { die('Cant create '.$GLOBAL['data_folder'].'/zipversions'.' folder.'); }
+if (!creer_dossier($GLOBAL['private_data_folder'], TRUE)) { die('Cant create '.$GLOBAL['private_data_folder'].' folder.'); }
+if (!creer_dossier($GLOBAL['public_data_folder'], TRUE)) { die('Cant create '.$GLOBAL['public_data_folder'].' folder.'); }
+if (is_file($GLOBAL['data_folder'].'/tags.txt')){$GLOBAL['tag_array']=unstore($GLOBAL['data_folder'].'/tags.txt');}else{$GLOBAL['tag_array']=array('public'=>array(),'private'=>array());store($GLOBAL['data_folder'].'/tags.txt',$GLOBAL['tag_array']);}
+if (!isset($GLOBAL['tag_array']['public'])){$GLOBAL['tag_array']['public']=array();};
+if (!isset($GLOBAL['tag_array']['private'])){$GLOBAL['tag_array']['private']=array();};
+
+
+
+
// Fonctions
function aff($a,$stop=true){echo 'Arret a la ligne '.__LINE__.' du fichier '.__FILE__.'
';var_dump($a);echo '
';if ($stop){exit();}}
function BodyClasses($add=''){$regex='#(msie)[/ ]([0-9])+|(firefox)/([0-9])+|(chrome)/([0-9])+|(opera)/([0-9]+)|(safari)/([0-9]+)|(android)|(iphone)|(ipad)|(blackberry)|(Windows Phone)|(symbian)|(mobile)|(bada])#i';@preg_match($regex,$_SERVER['HTTP_USER_AGENT'],$resultat);return ' class="'.$add.' '.@preg_replace('#([a-zA-Z ]+)[ /]([0-9]+)#','$1 $1$2',$resultat[0]).' '.basename($_SERVER['PHP_SELF'],'.php').'" ';}
@@ -16,6 +66,40 @@ function stripAccents($string){ $a=explode(' ','à á â ã ä ç è é ê ë ì
function returncurrenturl(){$domaine=dirname($_SERVER['SERVER_PROTOCOL']) . "://" . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] ;$domaine=explode('?',$domaine);return $domaine[0];}
function store($file,$datas){file_put_contents($file,serialize($datas));}
function unstore($file){ return unserialize(file_get_contents($file));}
+function getinfos($path=''){if (!is_file($path.'/index.ini')){return false;} return parse_ini_file($path.'/index.ini');}
+function setinfos($path='',$infos=array()){ if (!is_dir($path.'/index.ini')){return false;}$ini='';foreach($infos as $key=>$val){$ini.=$key.'="'.str_replace('"','\"',$val).'"'."\n";}store($path.'/index.ini',$ini);}
+function statuspath($path){global $GLOBAL;if (strpos($path,$GLOBAL['public_data_folder'])!==false){return 'public';}else{return 'private';}}
+function idfrompath($path){$id=explode('/',$path);$id=$id[count($id)-1];return $id;}
+function deltags($tags,$path,$id=false,$status=false){
+ /* delete the tags of the page's path*/
+ global $GLOBAL;
+ if (is_string($tags)){$tags=explode(' ',$tags);}
+ if (!$status){$status=statuspath($path);}
+ if (!$id){$id=idfrompath($path);}
+
+ foreach($tags as $tag){
+ if (isset($GLOBAL['tag_array'][$status][$id])){
+ $GLOBAL['tag_array'][$status][$id]=trim(str_replace(' '.$tag.' ','',' '.$GLOBAL['tag_array'][$status][$id].' '));
+ }
+ }
+ store($GLOBAL['data_folder'].'/tags.txt',$GLOBAL['tag_array']);
+}
+function settags($tags,$path,$id=false,$status=false){
+ /* set tags to the page's path*/
+ global $GLOBAL;
+ if (!$status){$status=statuspath($path);}
+ if (!$id){$id=idfrompath($path);}
+ $GLOBAL['tag_array'][$status][$id]=trim($tags);
+ store($GLOBAL['data_folder'].'/tags.txt',$GLOBAL['tag_array']);
+}
+
+function link2favicon($dir){
+ if (!is_dir($dir)){return '';}
+ $favs=glob($dir.'/*favicon*');
+ $fav=basename($favs[0]);
+ $extension=pathinfo($dir,PATHINFO_EXTENSION);
+ echo '';
+}
function search($public='public',$tag=false){
global $GLOBAL;
//$GLOBAL['tag_array'];
@@ -76,28 +160,26 @@ function array2feed($array=null){
return $feed;
}
function tagcloud(){
- global $GLOBAL;
- $array=array();
+ global $GLOBAL; $array=array('public'=>array(),'private'=>array());
if (!$GLOBAL['public']){
foreach ($GLOBAL['tag_array']['private'] as $key=>$tag){
- $tags=explode(' ',$tag);
+ $tags=explode(' ',trim($tag));
foreach ($tags as $t){
- if (!isset($array[$t]['nb'])){$array[$t]['nb']=1;}else{$array[$t]['nb']++;}
- if (!isset($array[$t]['status'])){$array[$t]['status']='private';}
+ if (!isset($array['private'][$t]['nb'])){$array['private'][$t]['nb']=1;}else{$array['private'][$t]['nb']++;}
+ //if (!isset($array['private'][$t]['status'])){$array[$t]['status']='private';}
}
}
}
foreach ($GLOBAL['tag_array']['public'] as $key=>$tag){
- $tags=explode(' ',$tag);
+ $tags=explode(' ',trim($tag));
foreach ($tags as $t){
- if (!isset($array[$t]['nb'])){$array[$t]['nb']=1;}else{$array[$t]['nb']++;}
- if (!isset($array[$t]['status'])){$array[$t]['status']='public';}
+ if (!isset($array['public'][$t]['nb'])){$array['public'][$t]['nb']=1;}else{$array['public'][$t]['nb']++;}
+ //if (!isset($array[$t]['status'])){$array[$t]['status']='public';}
}
}
- foreach ($array as $tag=>$val){
- echo ''.$tag.' '.$val['nb'].'';
- }
+ foreach ($array['public'] as $tag=>$val){if (trim($tag)!=''){echo ''.$tag.' '.$val['nb'].'';}}
+ if (isset($array['private'])){foreach ($array['private'] as $tag=>$val){if (trim($tag)!=''){echo ''.$tag.' '.$val['nb'].'';}}}
}
function tag2links($tagstring){
global $GLOBAL;
@@ -111,65 +193,10 @@ function tag2links($tagstring){
if(isset($_GET['publicget'])||isset($_GET['privateget'])){$bodyclass.=' iframe';}
$bodyclass=bodyclasses($bodyclass);$target='';
-/* (webpage retriever by Timo Van Neerden; http://lehollandaisvolant.net/contact December 2012)
- * last updated : December, 10th, 2012
- *
- * This piece of software is under the WTF Public Licence.
- * Everyone is permitted to copy and distribute verbatim or modified
- * copies of this program, under the following terms of the WFTPL :
- *
- * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- * TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- *
- * 0. You just DO WHAT THE FUCK YOU WANT TO.
- *
- */
-
-/* all the enhancements (logo, css, session lock, bookmarklet, tags, rss feed, api) are from Bronco (www.warriordudimanche.net)
-* and are based on the same licence ;)
-* thanks a lot to Timo for his great job on this app ;) */
-
-// PHP 5.1.2 minimum required
-
-error_reporting(-1);
-date_default_timezone_set('UTC');
-// CONFIGURABLE OPTIONS
-// change those directories'names for more security
-$GLOBAL['data_folder'] = 'mypersonaldata';
-$GLOBAL['private_data_folder'] = $GLOBAL['data_folder'].'/private';
-$GLOBAL['public_data_folder'] = $GLOBAL['data_folder'].'/public';
-$GLOBAL['default_data_folder'] = $GLOBAL['public_data_folder'];//change to private_data_folder to make private the default status
-$GLOBAL['version']='2.0';
-$GLOBAL['rss_title']='Respawn: le flux de la webliothèque';
-$GLOBAL['rss_description']='Le respawn de warriordudimanche.net';
-$GLOBAL['respawn_url']=returncurrenturl();
-$GLOBAL['message'] = 'Votre webliothèque perso';
-$GLOBAL['public_title'] = 'Voici la webliothèque publique de Bronco';
-$bookmarklet='Bookmarklet';
-$column_width='width:47%';
-if ($GLOBAL['public']){$bookmarklet='';$column_width='width:97%';}
-if (!creer_dossier($GLOBAL['data_folder'], TRUE)) { die('Cant create '.$GLOBAL['data_folder'].' folder.'); }
-if (!creer_dossier($GLOBAL['data_folder'].'/zipversions', TRUE)) { die('Cant create '.$GLOBAL['data_folder'].'/zipversions'.' folder.'); }
-if (!creer_dossier($GLOBAL['private_data_folder'], TRUE)) { die('Cant create '.$GLOBAL['private_data_folder'].' folder.'); }
-if (!creer_dossier($GLOBAL['public_data_folder'], TRUE)) { die('Cant create '.$GLOBAL['public_data_folder'].' folder.'); }
-if (is_file($GLOBAL['data_folder'].'/tags.txt')){$GLOBAL['tag_array']=unstore($GLOBAL['data_folder'].'/tags.txt');}else{$GLOBAL['tag_array']=array('public'=>array(),'private'=>array());store($GLOBAL['data_folder'].'/tags.txt',$GLOBAL['tag_array']);}
-if (!isset($GLOBAL['tag_array']['public'])){$GLOBAL['tag_array']['public']=array();};
-if (!isset($GLOBAL['tag_array']['private'])){$GLOBAL['tag_array']['private']=array();};
-
//
// BEGIN SCRIPT
//
-
-#TODO
-/*
-- remplacer les liens relatifs par les liens absolus (ne chercher que les liens relatifs, uri)
-- gestion des pages DL (classement ?)
-- gestion de la taille max des fichiers à télélcharger
-
-
-*/
-
// init
// url not yet retrieved
$GLOBAL['done']['d'] = FALSE;
@@ -365,6 +392,12 @@ if (!$GLOBAL['public']){ // private
if (isset($_GET['suppr']) and $torem = $_GET['suppr'] and $torem != '') {
$torem = htmlspecialchars($_GET['suppr']);
if (is_dir($_GET['suppr'])){
+ // suppr tags
+ $id=idfrompath($_GET['suppr']);
+ $status=statuspath($_GET['suppr']);
+ if (isset($GLOBAL['tag_array'][$status][$id])){deltags($GLOBAL['tag_array'][$status][$id],$_GET['suppr'],$id,$status);}
+
+ // suppr page
$sousliste = scandir($_GET['suppr']); // listage des dossiers de data.
$nb_sousfichier = count($sousliste);
for ($j = 0 ; $j < $nb_sousfichier ; $j++) {
@@ -387,6 +420,11 @@ if (!$GLOBAL['public']){ // private
$torem = htmlspecialchars($_GET['toprivate']);
if (is_dir($GLOBAL['public_data_folder'].'/'.$_GET['toprivate'])){
rename ($GLOBAL['public_data_folder'].'/'.$_GET['toprivate'],$GLOBAL['private_data_folder'].'/'.$_GET['toprivate']);
+ if (isset($GLOBAL['tag_array']['public'][$_GET['toprivate']])){
+ $temp=$GLOBAL['tag_array']['public'][$_GET['toprivate']];
+ deltags($temp,$_GET['toprivate'],$_GET['toprivate'],'public');
+ settags($temp,$_GET['toprivate'],$_GET['toprivate'],'private');
+ }
header("location: index.php");
}
}
@@ -395,6 +433,11 @@ if (!$GLOBAL['public']){ // private
$torem = htmlspecialchars($_GET['topublic']);
if (is_dir($GLOBAL['private_data_folder'].'/'.$_GET['topublic'])){
rename ($GLOBAL['private_data_folder'].'/'.$_GET['topublic'],$GLOBAL['public_data_folder'].'/'.$_GET['topublic']);
+ if (isset($GLOBAL['tag_array']['private'][$_GET['topublic']])){
+ $temp=$GLOBAL['tag_array']['private'][$_GET['topublic']];
+ deltags($temp,$_GET['topublic'],$_GET['topublic'],'private');
+ settags($temp,$_GET['topublic'],$_GET['topublic'],'public');
+ }
header("location: index.php");
}
}
@@ -427,7 +470,6 @@ if (!$GLOBAL['public']){ // private
$old=strip_tags(urldecode($_GET['rename']));
$new=strip_tags(urldecode($_GET['to']));
$newini='URL="'.$ini['URL'].'"'."\n".'TITLE="'.$new.'"'."\n".'DATE="'.$ini['DATE'].'"';
- //$ini=str_replace('TITLE="'.$old.'"','TITLE="'.$new.'"',$ini);aff($ini);
file_put_contents($_GET['file'].'/index.ini',$newini);
}
}
@@ -696,6 +738,7 @@ function complete_url($url) {
function add_table_and_replace(&$data, $retrievable, &$match1, $match, $url_p, $type) {
global $GLOBAL;
// get the filenam (basename)
+ global $GLOBAL;
$nom_fichier = (preg_match('#^https?://#', $match)) ? pathinfo(parse_url($match, PHP_URL_PATH), PATHINFO_BASENAME) : pathinfo($match, PATHINFO_BASENAME);
// get the URL. For relatives URL, uses the GLOBALS[url] tu make the complete URL
// the files in CSS are relative to the CSS !
@@ -786,7 +829,7 @@ if ($GLOBAL['done']['d'] !== FALSE) {
<?php echo $page_title; ?>
-
+
@@ -795,7 +838,7 @@ if ($GLOBAL['done']['d'] !== FALSE) {