diff --git a/trunk/functions.pl b/trunk/functions.pl
index e9909f7..7d6e14a 100644
--- a/trunk/functions.pl
+++ b/trunk/functions.pl
@@ -6,13 +6,13 @@ sub get_userinfo_from_sid
my ($sid) = @_;
#prepare query
- my $sth = $dbh->prepare(qq{select id, username, locale, pagesize, cortado from users where sid = ?}) or die $dbh->errstr;
+ my $sth = $dbh->prepare(qq{select id, username, locale, pagesize from users where sid = ?}) or die $dbh->errstr;
#execute it
$sth->execute($sid) or die $dbh->errstr;
#save the resulting username
- ($userinfo->{'id'}, $userinfo->{'username'}, $userinfo->{'locale'}, $userinfo->{'pagesize'}, $userinfo->{'cortado'}) = $sth->fetchrow_array();
+ ($userinfo->{'id'}, $userinfo->{'username'}, $userinfo->{'locale'}, $userinfo->{'pagesize'}) = $sth->fetchrow_array();
#finish query
$sth->finish() or die $dbh->errstr;
@@ -141,18 +141,7 @@ sub output_page
my $parser = XML::LibXML->new();
my $xslt = XML::LibXSLT->new();
- if($query->param('cortado') eq 'true')
- {
- @cookies = [$session->cookie(-name=>$session_name, -value=>$session->id), $session->cookie(-name=>'cortado', -value=>'true')];
- }
- elsif($query->param('cortado') eq 'false')
- {
- @cookies = [$session->cookie(-name=>$session_name, -value=>$session->id), $session->cookie(-name=>'cortado', -value=>'false')];
- }
- else
- {
- @cookies = [$session->cookie(-name=>$session_name, -value=>$session->id)];
- }
+ @cookies = [$session->cookie(-name=>$session_name, -value=>$session->id)];
#let the XSLT param choose other stylesheets or default to xhtml.xsl
my $param_xslt = $query->param('xslt');
diff --git a/trunk/init_sql.pl b/trunk/init_sql.pl
index 7e7d413..860f13a 100644
--- a/trunk/init_sql.pl
+++ b/trunk/init_sql.pl
@@ -52,7 +52,6 @@ $dbh->do(qq{create table
timestamp bigint not null,
locale varchar(10) not null,
pagesize tinyint unsigned default 5,
- cortado varchar(5) default 'true',
primary key (id)
)
}) or die $dbh->errstr;
diff --git a/trunk/settings.pl b/trunk/settings.pl
index fa69f57..c935391 100644
--- a/trunk/settings.pl
+++ b/trunk/settings.pl
@@ -11,7 +11,7 @@ if($userinfo->{'username'})
{
if($query->param('submit'))
{
- $dbh->do(qq{update users set locale = ?, pagesize = ?, cortado = ? where id = ?}, undef, $query->param('locale'), $query->param('pagesize'), $query->param('cortado'), $userinfo->{'id'} ) or die $dbh->errstr;
+ $dbh->do(qq{update users set locale = ?, pagesize = ? where id = ?}, undef, $query->param('locale'), $query->param('pagesize'), $userinfo->{'id'} ) or die $dbh->errstr;
$page->{'message'}->{'type'} = "information";
$page->{'message'}->{'text'} = "information_settings_changed";
@@ -26,7 +26,6 @@ if($userinfo->{'username'})
{
$page->{'settings'}->{'locale'} = $userinfo->{'locale'};
$page->{'settings'}->{'pagesize'} = $userinfo->{'pagesize'};
- $page->{'settings'}->{'cortado'} = $userinfo->{'cortado'}
}
else
{
diff --git a/trunk/video.pl b/trunk/video.pl
index c38a2d4..3d91db7 100644
--- a/trunk/video.pl
+++ b/trunk/video.pl
@@ -125,40 +125,10 @@ if($query->url_param('title') or $query->url_param('id'))
}
}
- if($query->param('cortado') eq 'true')
- {
- $cortado = 'true';
- }
- elsif($query->param('cortado') eq 'false')
- {
- $cortado = 'false';
- }
- elsif($userinfo->{'cortado'} eq 'true')
- {
- $cortado = 'true';
- }
- elsif($userinfo->{'cortado'} eq 'false')
- {
- $cortado = 'false';
- }
- elsif($query->cookie('cortado') eq 'true')
- {
- $cortado = 'true';
- }
- elsif($query->cookie('cortado') eq 'false')
- {
- $cortado = 'false';
- }
- else
- {
- $cortado = 'true';
- }
-
#before code cleanup, this was a really obfuscated array/hash creation
push @{ $page->{'video'} },
{
'thumbnail' => "$domain/video-stills/$id",
- 'cortado' => $cortado,
'filesize' => $filesize,
'duration' => $duration,
'width' => $width,
diff --git a/trunk/xsl/xhtml/settings.xsl b/trunk/xsl/xhtml/settings.xsl
index 6362e83..3d57b66 100644
--- a/trunk/xsl/xhtml/settings.xsl
+++ b/trunk/xsl/xhtml/settings.xsl
@@ -59,24 +59,6 @@
-
-
-
- checked
-
-
-
-
-
-
-
-
-
- checked
-
-
-
-