From e1a42e7e94406e4995b953eda76aede2e7a816f5 Mon Sep 17 00:00:00 2001
From: josch <josch@7eef14d0-6ed0-489d-bf55-20463b2d70db>
Date: Tue, 15 Apr 2008 08:15:55 +0000
Subject: [PATCH] some small fixes and improved backend.xml

git-svn-id: http://yolanda.mister-muffin.de/svn@299 7eef14d0-6ed0-489d-bf55-20463b2d70db
---
 trunk/config/backend.xml | 47 ++++++++++++++++++++++------------------
 trunk/functions.pl       |  1 -
 trunk/include.pl         |  4 +---
 trunk/video.pl           |  9 --------
 4 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/trunk/config/backend.xml b/trunk/config/backend.xml
index 21848b8..e73ec0e 100644
--- a/trunk/config/backend.xml
+++ b/trunk/config/backend.xml
@@ -2,29 +2,34 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
 <strings>
+    <!-- database settings -->
     <string id="database">mysql</string>
+    <string id="database_host">localhost</string>
+    <string id="database_name">yolanda</string>
     <string id="database_username">yolanda</string>
     <string id="database_password"><!-- put password here --></string>
-    <string id="page_locale_default">en-us</string>
-    <string id="page_xslt_default">xhtml.xsl</string>
-    <string id="path_root">http://localhost/</string>
+    
+    <string id="url_root">http://localhost/</string>
+    
+    <string id="path_root">/var/www/yolanda/</string>
+    
+    <!-- general page settings -->
+    <string id="page_locale">en-us</string>
+    <string id="page_xslt">xhtml.xsl</string>
+    <string id="page_results_pagesize">10</string>
+    <string id="page_tag_lenght_min">3</string>
+    <string id="page_tag_count">20</string>
+    <string id="page_openid">true</string>
+    <!--<string id="page_bittorrent">false</string>-->
+    <string id="page_cookie_name">sid</string>
+    
+    <!-- settings for video uploads -->
+    <string id="video_height_max">720</string><!-- in pixels -->
+    <string id="video_height_min">240</string>
+    <string id="video_width_max">1080</string>
+    <string id="video_width_min">320</string>
+    <string id="video_filesize_max">204800</string><!-- in bytes -->
+    <string id="video_filesize_min">512</string>
+    <string id="video_audio_bitrate">64</string>
 </strings>
-
-<ints>
-    <int id="page_results_pagesize">10</int>
-    <int id="page_tag_lenght_min">3</int>
-    <int id="page_tag_count">20</int>
-    <int id="video_height_max">720</int><!-- in pixels -->
-    <int id="video_height_min">240</int>
-    <int id="video_width_max">1080</int>
-    <int id="video_width_min">320</int>
-    <int id="video_filesize_max">204800</int><!-- in bytes -->
-    <int id="video_filesize_min">512</int>
-</ints>
-
-<bool>
-    <int id="page_openid">true</int>
-    <int id="page_bittorrent">true</int>
-</bool>
-
 </xsl:stylesheet>
diff --git a/trunk/functions.pl b/trunk/functions.pl
index 5c29dc9..c51e839 100644
--- a/trunk/functions.pl
+++ b/trunk/functions.pl
@@ -42,7 +42,6 @@ sub get_page_array
     }
     
     $page->{'username'} = $userinfo->{'username'};
-    $page->{'stylesheet'} = $stylesheet;
     $page->{'xmlns:dc'} = $xmlns_dc;
     $page->{'xmlns:cc'} = $xmlns_cc;
     $page->{'xmlns:rdf'} = $xmlns_rdf;
diff --git a/trunk/include.pl b/trunk/include.pl
index 963e9ec..c2c992d 100644
--- a/trunk/include.pl
+++ b/trunk/include.pl
@@ -25,9 +25,7 @@ $dbpass = '';
 $domain = 'http://localhost';
 $session_name = 'sid';
 $locale = "en-US";
-# remove stylesheet attribute, this is an XSLT job
-$stylesheet = "/style/default.css";
-# WHAT THE FUCK
+
 $xmlns_dc = "http://purl.org/dc/elements/1.1/";
 $xmlns_cc = "http://web.resource.org/cc/";
 $xmlns_rdf = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
diff --git a/trunk/video.pl b/trunk/video.pl
index 529530f..49a629f 100644
--- a/trunk/video.pl
+++ b/trunk/video.pl
@@ -9,15 +9,6 @@ $session = new CGI::Session;
 
 @page = get_page_array(@userinfo);
 
-# wtf is this shit ?
-if($query->url_param('action') eq 'edit' and $query->url_param('id'))
-{
-    $page->{'message'}->{'type'} = "information";
-}
-if($query->url_param('action') eq 'bookmark' and $query->url_param('id'))
-{
-    $page->{'message'}->{'type'} = "information";
-}
 #check if id or title is passed
 if($query->url_param('id'))
 {