diff --git a/trunk/account.pl b/trunk/account.pl
index a4cd6f6..f4ad5e1 100644
--- a/trunk/account.pl
+++ b/trunk/account.pl
@@ -1,5 +1,3 @@
-#!/usr/bin/perl
-require "include.pl";
require "functions.pl";
#initialize session data
diff --git a/trunk/download.pl b/trunk/download.pl
index c9306a5..3b48fcb 100644
--- a/trunk/download.pl
+++ b/trunk/download.pl
@@ -1,5 +1,3 @@
-#!/usr/bin/perl
-require "include.pl";
require "functions.pl";
#initialize session data
diff --git a/trunk/functions.pl b/trunk/functions.pl
index 098d261..91fc1a8 100644
--- a/trunk/functions.pl
+++ b/trunk/functions.pl
@@ -1,4 +1,3 @@
-#!/usr/bin/perl
require "include.pl";
sub get_userinfo_from_sid
diff --git a/trunk/index.pl b/trunk/index.pl
index 872cf50..e63c54a 100644
--- a/trunk/index.pl
+++ b/trunk/index.pl
@@ -1,5 +1,3 @@
-#!/usr/bin/perl
-require "include.pl";
require "functions.pl";
#create or resume session
diff --git a/trunk/init_sql.pl b/trunk/init_sql.pl
index c6266c1..1608088 100644
--- a/trunk/init_sql.pl
+++ b/trunk/init_sql.pl
@@ -1,6 +1,3 @@
-#!/usr/bin/perl
-require "include.pl";
-
#create or resume session
CGI::Session->name($session_name);
my $session = new CGI::Session;
diff --git a/trunk/locale/en-us.xml b/trunk/locale/en-us.xml
index 772c6a5..bd7d508 100755
--- a/trunk/locale/en-us.xml
+++ b/trunk/locale/en-us.xml
@@ -123,9 +123,9 @@
This is page 3 of 5.
This is page 4 of 5.
This is page 5 of 5.
- go to page 1
- go to page 3
- go to page 4
+ back to page 1
+ back to page 3
+ back to page 4
English
diff --git a/trunk/login.pl b/trunk/login.pl
index 8a4e21e..2933514 100644
--- a/trunk/login.pl
+++ b/trunk/login.pl
@@ -1,5 +1,3 @@
-#!/usr/bin/perl
-require "include.pl";
require "functions.pl";
#initialize session data
diff --git a/trunk/register.pl b/trunk/register.pl
index b533eca..2d454a6 100644
--- a/trunk/register.pl
+++ b/trunk/register.pl
@@ -1,5 +1,3 @@
-#!/usr/bin/perl
-require "include.pl";
require "functions.pl";
#initialize session data
diff --git a/trunk/search.pl b/trunk/search.pl
index d69227e..41904f6 100644
--- a/trunk/search.pl
+++ b/trunk/search.pl
@@ -1,4 +1,3 @@
-require "include.pl";
require "functions.pl";
#initialize session data
diff --git a/trunk/site/main.xml b/trunk/site/main.xml
index 10eeffe..bdd8f99 100755
--- a/trunk/site/main.xml
+++ b/trunk/site/main.xml
@@ -16,7 +16,7 @@
/login.pl
/login.pl?action=openid
/login.pl?action=logout
- INSERT LINK TO YOLANDA AUTHORS HERE
+ http://yolanda.mister-muffin.de/trac
http://www.fsf.org/licensing/licenses/agpl-3.0.html
http://yolanda.mister-muffin.de/trac/browser/trunk
/register.pl
diff --git a/trunk/style/default.css b/trunk/style/default.css
index 5835a23..c51b4ed 100755
--- a/trunk/style/default.css
+++ b/trunk/style/default.css
@@ -207,6 +207,7 @@ img
span.code
{
font-family: monospace;
+ font-weight: normal;
}
span.heading
diff --git a/trunk/upload.pl b/trunk/upload.pl
index e3bef86..2d5c2ba 100644
--- a/trunk/upload.pl
+++ b/trunk/upload.pl
@@ -1,5 +1,3 @@
-#!/usr/bin/perl
-require "include.pl";
require "functions.pl";
#create or resume session
@@ -15,7 +13,47 @@ if($userinfo->{'username'})
{
if($query->param('2'))
{
- $page->{'uploadform'}->{'page'} = '2';
+ if($query->param('DC.Title')&&$query->param('DC.Subject')&&$query->param('DC.Description'))
+ {
+ $page->{'innerresults'} = [''];
+
+ my @args = ();
+
+ #build mysql query
+ $dbquery = "select v.id, v.title, v.description, u.username,
+ from_unixtime( v.timestamp ), v.creator, v.subject,
+ v.contributor, v.source, v.language, v.coverage, v.rights,
+ v.license, filesize, duration, width, height, fps, viewcount,
+ downloadcount,
+ match(v.title, v.description, v.subject)
+ against( ? in boolean mode) as relevance
+ from videos as v, users as u where u.id = v.userid
+ and match(v.title, v.description, v.subject)
+ against( ? in boolean mode)";
+ push @args, $query->param('DC.Title'), $query->param('DC.Title');
+
+ fill_results(@args);
+ $page->{'uploadform'}->{'page'} = '2';
+ }
+ else
+ {
+ if(!$query->param('DC.Title'))
+ {
+ $page->{'message'}->{'type'} = "error";
+ $page->{'message'}->{'text'} = "error_missing_DC.Title";
+ }
+ elsif(!$query->param('DC.Subject'))
+ {
+ $page->{'message'}->{'type'} = "error";
+ $page->{'message'}->{'text'} = "error_missing_DC.Subject";
+ }
+ elsif(!$query->param('DC.Description'))
+ {
+ $page->{'message'}->{'type'} = "error";
+ $page->{'message'}->{'text'} = "error_missing_DC.Description";
+ }
+ $page->{'uploadform'}->{'page'} = '1';
+ }
}
elsif($query->param('3'))
{
@@ -37,11 +75,9 @@ if($userinfo->{'username'})
{
$page->{'uploadform'}->{'page'} = '1';
}
- $temp = $query->param('DC.Description');
- $temp =~ s/\r\n/\n/g;
$page->{'uploadform'}->{'DC.Title'} = $query->param('DC.Title');
$page->{'uploadform'}->{'DC.Subject'} = $query->param('DC.Subject');
- $page->{'uploadform'}->{'DC.Description'} = $temp;
+ $page->{'uploadform'}->{'DC.Description'} = $query->param('DC.Description');
$page->{'uploadform'}->{'DC.Creator'} = $query->param('DC.Creator');
$page->{'uploadform'}->{'DC.Source'} = $query->param('DC.Source');
$page->{'uploadform'}->{'DC.Language'} = $query->param('DC.Language');
diff --git a/trunk/uploader.pl b/trunk/uploader.pl
index 1766cc3..58ed925 100644
--- a/trunk/uploader.pl
+++ b/trunk/uploader.pl
@@ -1,5 +1,3 @@
-#!/usr/bin/perl
-require "include.pl";
require "functions.pl";
CGI::Session->name($session_name);
@@ -22,7 +20,7 @@ sub hook
@page = get_page_array(@userinfo);
-if($userinfo->{'id'})
+if($userinfo->{'id'}&&$query->param("DC.Title") && $query->param("DC.Description") && $query->param("DC.Subject"))
{
#connect to db
my $dbh = DBI->connect("DBI:mysql:$database:$host", $dbuser, $dbpass) or die $dbh->errstr;
diff --git a/trunk/video.pl b/trunk/video.pl
index 16befcf..d0b82ae 100644
--- a/trunk/video.pl
+++ b/trunk/video.pl
@@ -1,4 +1,3 @@
-require "include.pl";
require "functions.pl";
#initialize session data
diff --git a/trunk/xsl/xhtml.xsl b/trunk/xsl/xhtml.xsl
index c5fe239..165b275 100755
--- a/trunk/xsl/xhtml.xsl
+++ b/trunk/xsl/xhtml.xsl
@@ -208,7 +208,7 @@
-
+
@@ -255,12 +255,6 @@