Bug fix: correct artviper for identification [Config modified]

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@152 b3834d28-1941-0410-a4f8-b48e95affb8f

5 files changed, 322 insertions, 223 deletions

diff --git a/config.inc.php.example b/config.inc.php.example
index 7b9eff9..9966286 100644
--- a/config.inc.php.example
+++ b/config.inc.php.example
@@ -28,7 +28,7 @@ $tableprefix = 'sc_';  # table prefix used for this installation. Do not use '-'
 
 ### Users ###
 $adminemail         = 'admin@example.org'; # Contact address for the site administrator. Used as the FROM address in password retrieval e-mails.
-$admin_users = array('admin'); # admin users  = array('adminnickname', 'user1nick', 'user2nick');
+$admin_users = array(''); # admin users  = array('adminnickname', 'user1nick', 'user2nick');
 $reservedusers      = array('all', 'watchlist'); # array of usernames that cannot be registered
 # Antispam
 $antispamQuestion = 'name of this application (no Caps)'; # antispamQuestion: A question to avoid spam
@@ -66,8 +66,13 @@ $filetypes          = array(
                         'video' => array('avi', 'mov', 'mp4', 'mpeg', 'mpg', 'wmv')
                         );
 $enableCommonBookmarkDescription = true; # enableCommonBookmarkDescription {true,false}
-$enableWebsiteThumbnails = true; # enableWebsiteThumbnails {true|false}
+
+
+### Website Thumbnails ###
+$enableWebsiteThumbnails = false; # enableWebsiteThumbnails {true|false}
 # According to artviper.net license, buy a license if you gain profit with your pages. (see http://www.websitethumbnail.de/)
+$thumbnailsUserId = ''; #you need to register on http://www.artviper.net/registerAPI.php in order to register your domain
+$thumbnailsKey = '';   #then artviper.net send you a UserId and a secretKey
 
 
 ### Tags ###
diff --git a/scuttle.css b/scuttle.css
index 12cc247..57f8523 100644
--- a/scuttle.css
+++ b/scuttle.css
@@ -1,322 +1,373 @@
 /* BASE */
-
 * {
-    font-family: "trebuchet ms", tahoma, sans-serif;
+	font-family: "trebuchet ms", tahoma, sans-serif;
 }
+
 a {
-    color: #47A;
-    text-decoration: none;
+	color: #47A;
+	text-decoration: none;
 }
+
 a:hover {
-    color: #258;
-    text-decoration: underline;
+	color: #258;
+	text-decoration: underline;
 }
+
 a img {
-    border: 0;
+	border: 0;
 }
+
+img.thumbnail { /* Thank you Ricco * */
+	border: 1px solid #AAAAAA;
+	float: left;
+	margin-bottom: 4px;
+	margin-right: 6px;
+	padding: 1px;
+}
+
 body {
-    margin: 0;
-    padding: 0;
+	margin: 0;
+	padding: 0;
 }
-input[type=text],
-input[type=password],
-select,
-textarea {
-    border: 1px solid #AAA;
-    padding: 0.1em;
+
+input[type=text],input[type=password],select,textarea {
+	border: 1px solid #AAA;
+	padding: 0.1em;
 }
-input[type=text],
-input[type=password],
-textarea {
-    padding: 0.2em;
+
+input[type=text],input[type=password],textarea {
+	padding: 0.2em;
 }
-input[type=text]:focus,
-input[type=password]:focus,
-select:focus,
-textarea:focus {
-    border-color: #666;
+
+input[type=text]:focus,input[type=password]:focus,select:focus,textarea:focus
+	{
+	border-color: #666;
 }
-p.error,
-p.success {
-    border: 1px solid;
-    font-size: small;
-    margin: 0.5em;
-    padding: 0.5em;
-    width: 70%;
+
+p.error,p.success {
+	border: 1px solid;
+	font-size: small;
+	margin: 0.5em;
+	padding: 0.5em;
+	width: 70%;
 }
+
 p.error {
-    background: #FCC;
-    border-color: #966;
-    color: #633;
+	background: #FCC;
+	border-color: #966;
+	color: #633;
 }
+
 p.success {
-    background: #CFC;
-    border-color: #696;
-    color: #363;
+	background: #CFC;
+	border-color: #696;
+	color: #363;
 }
+
 td#availability {
-    color: #285;
-    font-weight: bold;
+	color: #285;
+	font-weight: bold;
 }
+
 td#availability.not-available {
-    color: #F00;
+	color: #F00;
 }
+
 textarea {
-    font-size: small;
-    padding: 0.2em;
+	font-size: small;
+	padding: 0.2em;
 }
+
 th {
-    padding-right: 1em;
-    text-align: right;
+	padding-right: 1em;
+	text-align: right;
 }
 
 /* HEADER */
-
 div#header {
-    background: #FFF url('bg_header.png') bottom repeat-x;
-    border-bottom: 3px solid #9CD;
-    clear: both;
+	background: #FFF url('bg_header.png') bottom repeat-x;
+	border-bottom: 3px solid #9CD;
+	clear: both;
 }
-div#header:after {
-    content: "."; 
-    display: block; 
-    height: 0; 
-    clear: both; 
-    visibility: hidden;
+
+div#header :after {
+	content: ".";
+	display: block;
+	height: 0;
+	clear: both;
+	visibility: hidden;
 }
+
 * html div#header {
-    height: 1%;
+	height: 1%;
 }
+
 h1 {
-    float: left;
-    font-size: x-large;
-    font-weight: bold;
-    letter-spacing: 0.25em;
-    margin: 0;
-    padding: 1em;
-    text-transform: lowercase;
-}
-html > body h1 {
-    background: url('logo.png') no-repeat 10px;
-    padding-left: 75px;
-}
-html > body div#header.popup h1 {
-    background: url('logo_24.png') no-repeat 10px;
-    padding: 0.5em 0.5em 0.5em 50px;
+	float: left;
+	font-size: x-large;
+	font-weight: bold;
+	letter-spacing: 0.25em;
+	margin: 0;
+	padding: 1em;
+	text-transform: lowercase;
+}
+
+html>body h1 {
+	background: url('logo.png') no-repeat 10px;
+	padding-left: 75px;
 }
+
+html>body div#header.popup h1 {
+	background: url('logo_24.png') no-repeat 10px;
+	padding: 0.5em 0.5em 0.5em 50px;
+}
+
 /*html > body div#header #welcome {
     position:absolute;
     left:75px;
 }*/
 #welcome {
-    border: 10px solid #995;
-    width: 66%;
-    padding: 10px;
-    text-align:center;
-    font-size: medium;
+	border: 10px solid #995;
+	width: 66%;
+	padding: 10px;
+	text-align: center;
+	font-size: medium;
 }
 
+#bottom {
+	padding-top: 10px;
+	text-align: center;
+	font-size: xx-small;
+}
 
 h1 a {
-    color: #000;
+	color: #000;
 }
+
 h1 a:hover {
-    color: #000;
+	color: #000;
 }
+
 h2 {
-    background: #666 url('bg_bar.png') center center repeat-x;
-    border-bottom: 3px solid #DDD;
-    clear: both;
-    color: #DDD;
-    font-size: medium;
-    letter-spacing: 0.1em;
-    margin: 0 0 1em 0;
-    padding: 0.5em 1em;
-    text-transform: lowercase;
+	background: #666 url('bg_bar.png') center center repeat-x;
+	border-bottom: 3px solid #DDD;
+	clear: both;
+	color: #DDD;
+	font-size: medium;
+	letter-spacing: 0.1em;
+	margin: 0 0 1em 0;
+	padding: 0.5em 1em;
+	text-transform: lowercase;
 }
 
 /* NAVIGATION */
-
 ul#navigation {
-    list-style-type: none;
-    margin: 0;
-    padding: 1.75em 1em;
-    text-transform: lowercase;
-    width: auto;
+	list-style-type: none;
+	margin: 0;
+	padding: 1.75em 1em;
+	text-transform: lowercase;
+	width: auto;
 }
+
 ul#navigation a {
-    font-size: medium;
-    font-weight: bold;
-    padding: 0.2em 0.5em;
+	font-size: medium;
+	font-weight: bold;
+	padding: 0.2em 0.5em;
 }
+
 ul#navigation a:hover {
-    background: #7AD;
-    color: #FFF;
+	background: #7AD;
+	color: #FFF;
 }
+
 ul#navigation li {
-    float: left;
+	float: left;
 }
+
 ul#navigation li.access {
-    float: right;
+	float: right;
 }
 
 /* BOOKMARKS */
-
 ol#bookmarks {
-    list-style-type: none;
-    margin: 0;
-    padding: 0 1em;
-    width: 70%;
+	list-style-type: none;
+	margin: 0;
+	padding: 0 1em;
+	width: 70%;
 }
-html > body ol#bookmarks {
-    margin: 0 1em;
-    padding: 0;
+
+html>body ol#bookmarks {
+	margin: 0 1em;
+	padding: 0;
 }
+
 img.thumbnail {
-    float: left;
-    padding: 1px;
-    margin-right: 6px;
-    margin-bottom:4px;
-    border:1px solid #AAA;
+	float: left;
+	padding: 1px;
+	margin-right: 6px;
+	margin-bottom: 4px;
+	border: 1px solid #AAA;
 }
+
 div.link a {
-    color: blue;
-    font-size: medium;
+	color: blue;
+	font-size: medium;
 }
+
 div.link a:visited {
-    color: purple;
+	color: purple;
 }
+
 div.address {
-    color: #285;
+	color: #285;
 }
+
 div.meta {
-    color: #285;
+	color: #285;
 }
+
 div.meta span {
-    color: #F00;
+	color: #F00;
 }
+
 li.xfolkentry {
-    border-bottom: 1px solid #DDD;
-    margin-bottom: 0;
-    padding: 1em 0.5em;
+	border-bottom: 1px solid #DDD;
+	margin-bottom: 0;
+	padding: 1em 0.5em;
 }
-html > body li.xfolkentry {
-    border-bottom: 1px dotted #AAA;
+
+html>body li.xfolkentry {
+	border-bottom: 1px dotted #AAA;
 }
+
 li.xfolkentry div {
-    padding: 0.1em;
+	padding: 0.1em;
 }
+
 li.xfolkentry.deleted {
-    opacity: 0.5;
+	opacity: 0.5;
 }
+
 li.xfolkentry.private {
-    border-left: 3px solid #F00;
+	border-left: 3px solid #F00;
 }
+
 li.xfolkentry.shared {
-    border-left: 3px solid #FA0;
+	border-left: 3px solid #FA0;
 }
 
 /* SIDEBAR */
-
 div#sidebar {
-    font-size: small;
-    position: absolute;
-    right: 1em;
-    top: 10em;
-    width: 25%;
+	font-size: small;
+	position: absolute;
+	right: 1em;
+	top: 10em;
+	width: 25%;
 }
+
 div#sidebar a {
-    color: #995;
+	color: #995;
 }
+
 div#sidebar a:hover {
-    color: #773;
+	color: #773;
 }
+
 div#sidebar div {
-    background: #FFF url('bg_sidebar.png') bottom repeat-x;
-    border: 1px solid #CC8;
-    color: #555;
-    margin-bottom: 1em;
+	background: #FFF url('bg_sidebar.png') bottom repeat-x;
+	border: 1px solid #CC8;
+	color: #555;
+	margin-bottom: 1em;
 }
+
 div#sidebar h2 {
-    background: transparent;
-    border: 0;
-    color: #995;
-    letter-spacing: 0;
-    margin: 0;
-    padding: 0.5em 0;
+	background: transparent;
+	border: 0;
+	color: #995;
+	letter-spacing: 0;
+	margin: 0;
+	padding: 0.5em 0;
 }
+
 div#sidebar hr {
-    display: none;
+	display: none;
 }
+
 div#sidebar p {
-    margin: 1em;
+	margin: 1em;
 }
+
 div#sidebar p.tags a {
-    margin: 0;
+	margin: 0;
 }
+
 div#sidebar table {
-    margin: 0.5em 0.5em 0 0.5em;
+	margin: 0.5em 0.5em 0 0.5em;
 }
+
 div#sidebar table td {
-    padding-bottom: 0.25em;
-    padding-right: 0.5em;
+	padding-bottom: 0.25em;
+	padding-right: 0.5em;
 }
+
 div#sidebar ul {
-    list-style-type: none;
-    margin: 0;
-    padding: 0.5em;
+	list-style-type: none;
+	margin: 0;
+	padding: 0.5em;
 }
+
 div#sidebar ul li {
-    margin: 0.5em 0;
+	margin: 0.5em 0;
 }
 
 /* TAGS */
-
 p.commondescription {
-    padding-left:5px;
-    color: #555;
-    font-weight: bold;
-    border-left: 1px solid #CC8;
-    width: 70%;
+	padding-left: 5px;
+	color: #555;
+	font-weight: bold;
+	border-left: 1px solid #CC8;
+	width: 70%;
 }
 
 p.tags {
-    line-height: 2.25em;
-    /*margin: 2em 10%;*/
-    text-align: justify;
-    vertical-align: middle;
-    width: 70%;
+	line-height: 2.25em;
+	/*margin: 2em 10%;*/
+	text-align: justify;
+	vertical-align: middle;
+	width: 70%;
 }
-p.tags a,
-p.tags span {
-    color: #47A;
-    margin-right: 0.5em;
+
+p.tags a,p.tags span {
+	color: #47A;
+	margin-right: 0.5em;
 }
+
 p.tags span:hover {
-    cursor: pointer;
-    text-decoration: underline;
+	cursor: pointer;
+	text-decoration: underline;
 }
+
 p.tags span.selected {
-    background: #CEC;
+	background: #CEC;
 }
 
 /* PROFILE */
-
 table.profile th {
-    width: 10em;
+	width: 10em;
 }
 
 /* OTHER GUFF */
-
 dd {
 	background: #CEC;
 	border-right: 4px solid #ACA;
 	color: #464;
 	padding: 6px;
 }
+
 dd a {
 	color: #464;
 }
+
 dd a:hover {
 	color: #000 !important;
 	text-decoration: underline !important;
@@ -327,11 +378,13 @@ dl {
 	margin: 1em;
 	width: 70%;
 }
+
 dl#profile dd {
 	background: #CDE;
 	border-color: #ABC;
 	color: #247;
 }
+
 dl#profile dt {
 	background: #BCE;
 	border-color: #9AC;
@@ -340,16 +393,20 @@ dl#profile dt {
 	font-weight: bold;
 	padding: 6px;
 }
+
 dl#profile a {
 	color: #446;
 }
+
 dl#profile a:hover {
 	color: #000 !important;
 	text-decoration: underline !important;
 }
+
 dl#meta dd {
 	line-height: 1.5em;
 }
+
 dl#meta dt {
 	background: #BDB;
 	color: #353;
@@ -357,9 +414,11 @@ dl#meta dt {
 	font-weight: bold;
 	padding: 6px;
 }
+
 dt {
 	border-right: 4px solid #9B9;
 }
+
 dt a {
 	background: #BDB;
 	color: #353;
@@ -367,31 +426,35 @@ dt a {
 	font-weight: bold;
 	padding: 6px;
 }
+
 dt a:hover {
-    background: #ACA;
-    border: 0;
+	background: #ACA;
+	border: 0;
 }
+
 form {
 	margin: 0;
 }
+
 form#search {
-       margin-right: 0.75em;
-       color: #CCC;
-       font-size: small;
-       float: right;
-       margin: 0;
-       position: absolute;
-       right: 0;
-       top: 6.4em;
-}
-form label,
-form td,
-form th {
+	margin-right: 0.75em;
+	color: #CCC;
 	font-size: small;
+	float: right;
+	margin: 0;
+	position: absolute;
+	right: 0;
+	top: 6.4em;
 }
+
+form label,form td,form th {
+	font-size: small;
+}
+
 form table {
 	margin: 0 1em;
 }
+
 h3 {
 	background: #DDD;
 	color: #555;
@@ -400,83 +463,92 @@ h3 {
 	margin: 2em 1em 1em 1em;
 	padding: 0.25em 0.75em;
 }
+
 li {
 	font-size: small;
 	margin-bottom: 0.5em;
 }
+
 p {
-    font-size: small;
-    margin: 1em;
+	font-size: small;
+	margin: 1em;
 }
-p#sort {
-    /*color: #CCC;*/
-    font-size: small;
-    /*float: right;*/
-    /*margin: 0;*/
-    /*position: absolute;*/
-    right: 0;
-    top: 7em;
+
+p#sort { /*color: #CCC;*/
+	font-size: small;
+	/*float: right;*/ /*margin: 0;*/ /*position: absolute;*/
+	right: 0;
+	top: 7em;
 }
-html > body p#sort {
-    /*margin-right: 0.75em;*/
+
+html>body p#sort { /*margin-right: 0.75em;*/
+	
 }
+
 p#sort a {
-    background: #AAA;
-    color: #555;
-    font-weight: normal;
-    margin-right: 0.5em;
-    padding: 0 1em;
+	background: #AAA;
+	color: #555;
+	font-weight: normal;
+	margin-right: 0.5em;
+	padding: 0 1em;
 }
-html > body p#sort a {
-    margin-right: 0;
+
+html>body p#sort a {
+	margin-right: 0;
 }
+
 p#sort a:hover {
-    background: #CCC;
-    text-decoration: none !important;
+	background: #CCC;
+	text-decoration: none !important;
 }
+
 p#sort span {
-    display: none;
+	display: none;
 }
+
 p.paging {
 	font-size: small;
 	margin-left: 1em;
 }
-p.paging a,
-p.paging span.disable {
+
+p.paging a,p.paging span.disable {
 	background: #888;
 	color: #FFF;
 	display: inline;
 	margin-right: 0.5em;
 	padding: 0.25em 1em;
 }
+
 p.paging a:hover {
 	background: #666;
 }
+
 p.paging span {
 	display: none;
 }
+
 p.paging span.disable {
 	background: #DDD;
 	color: #AAA;
 }
+
 div.collapsible p.tags {
 	line-height: 2.25em;
 	margin: 1em 2em;
 }
+
 th label {
 	padding-right: 1em;
 }
+
 ul {
 	margin-right: 1em;
 	width: 75%;
 }
 
 /* DOJO Style */
-
-.scuttletheme .dijitInputField input,
-.scuttletheme .dijitTextBox,
-.scuttletheme .dijitComboBox,
-.scuttletheme .dijitSpinner {
+.scuttletheme .dijitInputField input,.scuttletheme .dijitTextBox,.scuttletheme .dijitComboBox,.scuttletheme .dijitSpinner
+	{
 	width: 100%;
 	margin: 0 0 0 0;
-}
+}
\ No newline at end of file
diff --git a/templates/bookmarks.tpl.php b/templates/bookmarks.tpl.php
index afd6c91..ae3e08b 100644
--- a/templates/bookmarks.tpl.php
+++ b/templates/bookmarks.tpl.php
@@ -191,7 +191,8 @@ window.onload = playerLoad;
         // Output
         echo '<li class="xfolkentry'. $access .'">'."\n";
 	if ($GLOBALS['enableWebsiteThumbnails']) {
-	    echo '<a href="'. $address .'"'. $rel .' ><img class="thumbnail" src="http://www.artviper.net/screenshots/screener.php?sdx=1024&sdy=768&w=90&h=68&url='.$address.'"></a>';
+		$thumbnailHash = md5($address.$GLOBALS['thumbnailsUserId'].$GLOBALS['thumbnailsKey']);	    
+	    echo '<a href="'. $address .'"'. $rel .' ><img class="thumbnail" src="http://www.artviper.net/screenshots/screener.php?url='.$address.'&w=120&sdx=1280&userID='.$GLOBALS['thumbnailsUserId'].'&hash='.$thumbnailHash.'" />  ';
 	}
 	echo '<div>';
 
diff --git a/templates/bottom.inc.php b/templates/bottom.inc.php
index 262ca2a..4ad9618 100644
--- a/templates/bottom.inc.php
+++ b/templates/bottom.inc.php
@@ -1,5 +1,14 @@
 <!--following code is generated by templates/bottom.inc.php-->
 <div id="bottom">
+<?php
+echo T_("Propulsed by ");
+echo "<a href=\"https://sourceforge.net/projects/semanticscuttle/\">SemanticScuttle</a>";
+
+if($GLOBALS['enableWebsiteThumbnails']) {
+	// Licence to the thumbnails provider (OBLIGATORY IF YOU USE ARTVIPER SERVICE)
+	echo " (<a href=\"http://www.artviper.net\" title=\"artViper designstudio\">thumbnails by artViper designstudio</a>)";
+}
+?>
 
 </div>
 
diff --git a/upgrade.txt b/upgrade.txt
index 2677fcd..6b54428 100644
--- a/upgrade.txt
+++ b/upgrade.txt
@@ -1,5 +1,17 @@
 ==== UPGRADE instructions ====
 
+=== From version 0.89 to 0.90 ===
+- Backup you database
+- Make a copy from your SemanticScuttle Web directory
+- Upgrade your database by following instructions ONE after ONE (order is important) :
+
+- Upgrade your current configuration file (config.inc.php) with respect to config.inc.php.example
+# add these lines under $enableWebsiteThumbnails = false; # enableWebsiteThumbnails {true|false}:
+$thumbnailsUserId = '';
+$thumbnailsKey = ''; 
+
+
+
 === From version 0.88 to 0.89 ===
 - Backup you database
 - Make a copy from your SemanticScuttle Web directory