From 30c136a1d8f433ea9a47336584ad6c88191f4fb7 Mon Sep 17 00:00:00 2001
From: josch <josch@7eef14d0-6ed0-489d-bf55-20463b2d70db>
Date: Sat, 27 Oct 2007 11:59:23 +0000
Subject: [PATCH] added account.pl with video list capabilities, inserted edit
 button for own videos in result list

git-svn-id: http://yolanda.mister-muffin.de/svn@145 7eef14d0-6ed0-489d-bf55-20463b2d70db
---
 trunk/account.pl                       | 154 +++++++++++++++++++++++++
 trunk/images/tango/video-x-generic.png | Bin 0 -> 12940 bytes
 trunk/search.pl                        |  22 ++--
 trunk/video.pl                         |   6 +-
 trunk/xsl/xhtml.xsl                    |  56 ++++++---
 5 files changed, 211 insertions(+), 27 deletions(-)
 create mode 100644 trunk/account.pl
 create mode 100644 trunk/images/tango/video-x-generic.png

diff --git a/trunk/account.pl b/trunk/account.pl
new file mode 100644
index 0000000..7eee746
--- /dev/null
+++ b/trunk/account.pl
@@ -0,0 +1,154 @@
+#!/usr/bin/perl
+require "include.pl";
+require "functions.pl";
+
+#initialize session data
+CGI::Session->name($session_name);
+$query = new CGI;
+$session = new CGI::Session;
+
+$username = get_username_from_sid($session->id);
+
+%page = ();
+
+$page->{'username'} = $username;
+$page->{'locale'} = $locale;
+$page->{'stylesheet'} = $stylesheet;
+$page->{'xmlns:dc'} = $xmlns_dc;
+$page->{'xmlns:cc'} = $xmlns_cc;
+$page->{'xmlns:rdf'} = $xmlns_rdf;
+	
+if($username)
+{
+	if($query->param('show') eq 'settings')
+	{
+		#results per page
+		#language
+		#cortado or plugin
+	}
+	elsif($query->param('show') eq 'uploads')
+	{
+		$page->{'results'}->{'scriptname'} = 'account.pl';
+		$page->{'results'}->{'argument'} = 'show';
+		$page->{'results'}->{'value'} = 'uploads';
+		$page->{'results'}->{'orderby'} = $query->param('orderby');
+		$page->{'results'}->{'sort'} = $query->param('sort');
+	
+		#connect to db
+		my $dbh = DBI->connect("DBI:mysql:$database:$dbhost", $dbuser, $dbpass) or die $dbh->errstr;
+	
+		#build mysql query
+		$dbquery = "(select v.id, v.title, u.username, from_unixtime( v.timestamp ) as timestamp, v.duration, v.viewcount
+					from videos as v, users as u where v.userid = u.id and u.sid = ?)
+					union
+					(select v.id, v.title, u.username, from_unixtime( v.timestamp ) as timestamp, 0, 0
+					from uploaded as v, users as u where v.userid = u.id and u.sid = ?)";
+	
+		if($query->param('orderby'))
+		{
+			if($query->param('orderby') eq 'filesize')
+			{
+				$dbquery .= " order by filesize";
+			}
+			elsif($query->param('orderby') eq 'duration')
+			{
+				$dbquery .= " order by duration";
+			}
+			elsif($query->param('orderby') eq 'viewcount')
+			{
+				$dbquery .= " order by viewcount";
+			}
+			elsif($query->param('orderby') eq 'timestamp')
+			{
+				$dbquery .= " order by timestamp";
+			}
+			else
+			{
+				$dbquery .= " order by id";
+			}
+		
+			if($query->param('sort') eq "asc")
+			{
+				$dbquery .= " asc"
+			}
+			else
+			{
+				$dbquery .= " desc"
+			}
+		}
+	
+		#prepare query
+		my $sth = $dbh->prepare($dbquery) or die $dbh->errstr;
+	
+		#execute it
+		$resultcount = $sth->execute($session->id, $session->id) or die $dbh->errstr;
+	
+		$rowsperpage = 2;
+	
+		#rediculous but funny round up, will fail with 1000000000000000 results per page
+		#on 0.00000000000001% of all queries - this is a risk we can handle
+		$lastpage = int($resultcount/$rowsperpage+0.999999999999999);
+	
+		$currentpage = $query->param('page') or $currentpage = 1;
+	
+		$dbquery .= " limit ".($currentpage-1)*$rowsperpage.", ".$rowsperpage;
+	
+		#prepare query
+		$sth = $dbh->prepare($dbquery) or die $dbh->errstr;
+	
+		#execute it
+		$sth->execute($session->id, $session->id) or die $dbquery;
+	
+		$page->{'results'}->{'lastpage'} = $lastpage;
+		$page->{'results'}->{'currentpage'} = $currentpage;
+		$page->{'results'}->{'resultcount'} = $resultcount;
+	
+		#get every returned value
+		while (my ($id, $title, $publisher, $timestamp, $duration, $viewcount) = $sth->fetchrow_array())
+		{
+			#before code cleanup, this was a really obfuscated array/hash creation
+			push @{ $page->{'results'}->{'result'} },
+			{
+				'thumbnail'		=> $duration == 0 ? "/images/tango/video-x-generic.png" : "/video-stills/$id",
+				'duration'		=> $duration,
+				'viewcount'		=> $viewcount,
+				'edit'			=> $username eq $publisher ? "true" : "false",
+				'rdf:RDF'		=>
+				{
+					'cc:Work'		=>
+					{
+						'dc:title'			=> [$title],
+						'dc:date'			=> [$timestamp],
+						'dc:identifier'		=> ["$domain/video/$title/$id" . ($duration == 0 ? "/edit=true" : "") ],
+						'dc:publisher'		=> [$publisher]
+					},
+					'cc:License'	=>
+					{
+						'rdf:about' 	=> 'http://creativecommons.org/licenses/GPL/2.0/'
+					}
+				}
+			};
+		}
+	
+		#finish query
+		$sth->finish() or die $dbh->errstr;
+	
+		#close db
+		$dbh->disconnect() or die $dbh->errstr;
+	}
+	else
+	{
+		$page->{'account'} = [''];
+	}
+}
+else
+{
+	$page->{'message'}->{'type'} = "error";
+	$page->{'message'}->{'text'} = "error_202c";
+}
+
+#print xml http header along with session cookie
+print $session->header(-type=>'text/xml', -charset=>'UTF-8');
+
+#print xml
+print XMLout($page, KeyAttr => {}, XMLDecl => $XMLDecl, RootName => 'page', AttrIndent => '1');
diff --git a/trunk/images/tango/video-x-generic.png b/trunk/images/tango/video-x-generic.png
new file mode 100644
index 0000000000000000000000000000000000000000..c0d079aefa658f903733590dde6360cd4608a270
GIT binary patch
literal 12940
zcmaJ|hdW%|*EQ-8VsufW_Y%=N84<k=g6I;xGkO=jM(@4%AbL#@K^Tnay+rRd>UZDY
zAMkmeF=n1?&bj-nv-aL=orzRemBYiKz(GMl!Bdcb3j?0>frlp;6Zq{`_|Fk|LU)BK
zXn}zrU+||0;5D|Byq+s?{mg$45R^5`6L|9lTvivZ>1YA>Fm*9U@$m5Awsx>}{b=fB
z&h6-8nRO&ifr3JdqVV>OmS^^1msc{?jMwr*hxVU8cNYg7f!|TcomfDGjICBB%0r1Y
z0=!%U4b>l&nh)d~xG;i(H(jfR!_fNNKLt2v_n&!GGfrC!5}GqjK_iJHLdEE!W-Y(s
zTA=)%Uqar&+<K%Ov{gLR5GZId<7hUyuD4ole`?y7{;2g_FCF=WCMRlF7ix@CJb>Px
zB4f2tYYPi>nO4~;qW+&hd4Q`aVkLY$JV0n;wtfTt-wHD@`h#|5jmX@OW(B;KByVid
z*UQ)l8!V5HMtc_m!-Gaye}tyiM<aW`N6o~09L<`)+ITQ_^;98pLM$)6Ugct)?84ir
zv;Rnr*<M>@EBa^>=)|hbO7(+Zg}<P{8Z{(eixb94%u0;2`AimPK>YpOj|Mxtg+c@F
zk9zM94>f!FSb1Nf<j%K!)Y)aZt8wJ){0rXsa#YlN7kC(WluHDK;G*vy>=idP#ai(z
z@{so)Uw^z+;kUPDuQz8~PZ=Q%g$8}1AG)|8)<hyVT}7e>=miiSs5knnb--i=;593k
zO@TAGpzDLBu9r9Vt25=}E5YAs?d|R1Zf?ls3DxQfY!%~lE7<VASB$7ZkaOcp6Mey5
z<uEOFSzqtWp$fLdA;y2c%lnv~gg3{%Gr)&x8>EIip{<9ptmbxgw4mj^Q4pt|`Z~X|
zg2)uGwYIk(pyAmzwA3R_wNDr^&&bH7d#R?*PBOut<0Sl6n2MPSd*k|!>~Mvtuy)sm
zbtbkwkv~Pz^>kf!ELTK^H=~-Wwk+@!YCx0gVC|Z%7pV}vgD&dPT*sY#?=c8Jm>$Yc
zVU8?SxwyV20%LYI!xV>8Cnq?oe&5`nZ_AAl#SaddyGCCD%TfQAoKg^XeD05zY@Q13
zI9yg<Mn|-igKNY*dbh&*-McYoU`*bO7#}@?8@^S1VEt1J=aH?>&V2;`Ep1Kjc91dV
zIDc&Ikpm_c*6!Zk51zl`N?R_GW);$H2AH%0S?jYCAC*;A|8!iED^kd6{ERYM$Y-1G
zUtMKx_i0bNZ}SVo&qKf^^XNYcCaq1DIIHHpw6L)m{zHa9>uCgTFTlWsMTpjc^?$eL
z*Bbz8M``b9Z+(ap+u7NXw%U_x;>rRBtLL{wnQb0T(1~~P-}Eif;KB7J5=N&2ATwhn
zD<x@y#sgjq<FyfN+s?|&Y<0Zrx<QM^M_lG(<K<bK-TsZqb!q$E*2q95a>l+3pSQoI
zUQH77I1p{xRCS<TgrF}rdU&v$<OLa{fYDLy=Gs$&f<XM1Rvf8O#L*bT@4c2UU-iJ#
zpM4}-Y;j&)K@0FI;Z6W{(0=b-PypT{1|;^K*J{Dt=|5kchc4W{UPsK67ke*v;b9wt
z@veV=TLXZU2F*UZUmK(DIE!A~3mb^~A8=@76}kisXY>Hr<ajK}vQlC8HVki`={cs?
z3`B0Qkc)2ZUKv9bQZj6B#Gg<vE%V#jG7j<W26_I*PAdf?P6%+r#`&q)n39N+sJt$<
zxnqrgG~27gZgYTp%j_<Vdr$kG|3B0}yjWF3`BA`gz3f5L<=15eHBnNK%qvni(B&~8
z@8}(QMeV-gk9E_QBj!GOPHH@`eVfKQ^j61%Y~iSD`-3C4bT19#Dn2c+kJ+8C4n&^Q
zNGcb6!4k&q^xKXzEK4hCBnc+TiunrgML@VrcWteM|J9+?NM@7mcu2lFCr_3lr=n!w
zn(1+iD5`in)h603uxxoK0q8vb*4dwU+o)QYjDNk(QiXAnoMte8&cgEQqg<9|Bm|L&
zinjtEYCkeLhx0uuInd|o=#ePdG5+z<|E1?D$XAl4Ir$SWo8s0;l|u<E^4M=1duHcm
z7Kn29SM>#i-;t|DGrv!Zy=zaPB(@=RlA%CGngfy;tjDNH%MuD9o9KtzYK}PK&=v0A
z&NvU|w7f#L=<xV4uc;H$(dNp#?5w^iEh|IeEtf(*8BRZ^3?Y&21(w~m*BI3E+zF{7
z<cg5+D5At{wog)I*&oo~U!NRM>b&`(bhL2!AH24^|1GHn*u?UDi?<Gz3mF$InxKa$
zy~Lwm1N$S@l$4&~cOM0n82Rgwx4+?^41rM0DTi(6`ox_VZG(n;2LYbB6dGCHb^EEv
zu)2cM!yd9)+tKWFci2*3Eoxq+%$@@$Ipg?o`jLhFB?Tt=3rfm6TBn}zZ$kU+kKRk;
zX3s(=q(zzpR9q7Y_(LG_Z1p9v_El-giRwIWc_54s@JXuN%kJqqW3tRrB(XJg#tr8m
z>MI(_-$O|(D0Zs}02&@vStd{2enipzM{`o>_iBM1NA1yK$DKq4*2#*pu-&=&{73WG
z;_%Fk!MKkLf*Ttf<dW1Xd5$%EnQ^A%<Y7U(d|l<C5Y!-)H`<FcOKF5r1E?^?Of!|v
zN4&a@150*doc;~xbw2D@+*G)jIbZW|p8h<0z^03MXLf^20}#z;EPMcRF9M@`4TW4@
zu1C@SH<KAq9ZJ31{`6_7P}d7O^iZ>0E$^$!BM|^jWVrzZftz*>!%|i|VZ(vWuv(iT
z4AeD3$CudKV_U9XcGk#+nUU#^mZ=A-(+pvT?RV*sgF_bFG^TvGIn&L8f)4ZYwzf(G
zFWzYKhwbtWSv2}ycdRgFD5LmNdJY1}qIi-q!l1|{INb3wMmH-^kHC8A2`Rv?cFBM<
zyZyO7+&SpwR{=Kscatx0=Gc`BfaqVtFPpZB;%_I_4n6zPg3MFuOJLa3)w@|U0o-XD
zHxnBMtxnF%B0{mxdU;|xYxkMs<O&U%)5-Hp%zT5JfjQYPzxDB<q*W-hw2o^c#0mF2
z`Htna9?8O*5+(KQ0Oj$flIA_ygcJ78?G(StMuOb(J2f>SnBw}-i)vAg*pk)FNX=}~
z3VJ=*FneO#0!OMp3F9};5lSe)m7Wij+hN8F%_44R#AV?KPtmI6L}<Nqg#nPAi>yWG
z;6KG)g-Fj_&Pmgr;7?e=m66}#K}Nl8O--Rb%}bwmg-%~cn$?qjak{^8&h<IcD^6xw
z{SW)zSD7z$(Z<#P$Lp%AUcHO$mk!N#8hx{N>~FfA4ii|cm5e;sWSM`mbbf4V^HrkD
zl@?|*VE@bv;Idcdnh0mq{Icg_eZ&A>oC^sy;gM%0r_WX95s=tT;3kb-yT(e-$f%8Z
zqA#IJZN6^-Sk17#_88?>n&9CPt7YT-9~eU>L`H*iWPSDfXIy-IP&UY64k$3zGHDjw
z-WE|$1c1}IxM~*tJI;!>&f3iBXadL4ukAXrny;GMK94<(Ho*;1Z8D{WZ}Z1PiYRTy
zx_L#<LObOok^FQ1Pk!2)V$S!)|Gff|JriMMA*Cp_{h=NCY=m{?V*e+01<@=sC#Nq9
z4jnnArRjHVf;R0}ThU~%x-C6DZ^$@DZqWkg=Jav{jxab!=(9!u=HtQrY=3RXK#m)f
zDSsJc?&UN?fXDDZu%kL+wQlEjq!i6HD_GW!?dXCtOY0Ap?Q@~85@wrY&GnYQ9uTUX
zN0iA&B<rTCbbn#V8uj$fLTqnz-yJg%#(F-)#KpaaE1J(`Nhax5zmO3c@4T}`e*g(S
zw>y*18nqDdc%%xF4jj!A;u98@r_Dbj4~015prhUm{``5XSTdOx#A{{b`^Z$BTnuZJ
zXDo1v$Z}{OdLYl!oeuY)9+$_y(U8W+l)1R90nw%*xQCYL?G>1l=yFs$<`~>e$wjZF
zJf-xHm!aPj%=eYp*wRLbqh)bI#W5^@XcXwu=8Yr`efsscVe`C=eI3u?<)#XLPl7Jz
z-zDP`A8O}YUMmNOcQgDUr4eN!A*7jMyXW=JCPc60*3BFBezFXLA_g+s4x1PBI^3z-
zU0ztX*FNpt+}ucUkVYG0re|k=GV?{%pWi(93W4A{P{7Y=TMmIb>XE}gkOKv;J{U-j
z_W9sn)E<jL1(foPZTIUAQHoL@=wGrVl)I}^O7>;_A$=Ym@s=Kb4fpBpTJARTzVm+3
z!#_4Y&J*eRqhmVfNdq5<T@c>B-b_y|``RB_@!Wg^7-Ou!z&M;b=;MK~cQK6bkCP(`
z+5;Mulv}p1BmyW@6V%h?8KWS<wYA*y^Yg7vrZJI`*ddUIq@<*prKKf?_S!lz*T0;G
zONN^+FMfRInJ8u5znkGJhJRNpv{+w)SS3^b-3~HRLC&^16M=tiyF7a*>e4385|?LU
z2e+HZN>wsX9Qvf~66m!_jz&3+?CD+^S=!$_Dy-^=c4@0-G-Os{PGZU$GSMRimQ$Ve
zU=**-V10M0_zcZ9Gt4^kGE&EMlNOyKICfvi<zVx*-NN7dS=KBedv_+9Fw?INhEggj
zuYp?bXY-*IdkT(_kPsiA#OH5J=EKB_826=l`VL(wYsfx%wv`?rfg=tU>-Q%~9!c?J
zi@-OOD3n4D^andK83q<cMJ{t@o>u96WeBZ-KsUp|?em1OVt{pNX({5orE)ojijx7f
zs8UG{os3)G&RjQ|ZUkC_$-~}ol2%cu)?sQUv8y2XRRj*E>2f(9*jK`#rqeZggL4Uu
zy6-bQeZ#J<;wpWB>A8+@wK(lfu_=}${`If3<5mKy@GKP~9<*;QO~^lU10|<Q%qOo`
z@oRUL3|S03sQ)W}->lZ4WC_}%)3K&TC)@HGz#7?dz0cUfRPjvpNTFc*1aMA{A>7@a
z02fnXjF~M(iM%}saZ+HNDW{r;=;v37Pu_CLSSv8SI$k)|YZ$@MdE&?YsJc=$^$<d&
zQ|nq=)kxW6{Ng3@lx@!%^xY&v-?1yjglC7kkyGFUaTEq;M~uVH#kJ4*(aP6q;}e#M
zcjR<v4m}fAL{RBAEtPI)LGL-DOPa3E-~*6s;^I^bCz#{aHThhJz89#=w<*~yvS*fl
z%w!Id?nN#E;6S|ej)R*1TQo2Dnz+6f56iQvZ8AJIP}9LjDS>6oX%#xqgsq*&2n0HL
zjy-6yrx1WM^*hIxFza=j2XLT8VDM@y!&~j_=?2dKcuP&OskwP_adDjhe+shM|K>Ey
zU%9WEHdhc)Q@Ae*Y>7YyYu*f8gv2>j$>f>Vkd?!G8BfVNvp%<ym0-rHoxQ!YZewwc
zyuiK3y^Obo36<NXbLNm>tNyI`o}+}8?tuV?FJB4J7g2^A`2CnsD=#{9{4YKxVw=C^
z7Z~VVs~}9_TSg6%Zrbo9C~Mdil8{<Bu&d-Xe9HV<8<3OMkRsntmg?`Oz<TmR@<V3I
z#W2}k71lrBv84I^8J)CNfP}zPH1iqOmUdk}N>cfCa6&<4)aK^q_4LqObWYOf<pTlp
z(6IgGeBJc(fB$e-4EhU$JwN1Fg+VeCL!M)^urOz+7<Fujk>fVF*HFCV%fRJBBA+Ss
zuoK$6#Llt8d_R}DjrVK&yq`KvgO%89bY4Jvn@dSSIu9YoTAZ7K*rt5@(9Mw<f|nFn
z!&Nh^gK0GR{bDNHX#4l)@@O;bxWKSF-g$Mk+ej})Tud1w&YQ(K*Jo~xjEnw*hj4fH
zXYPUmBfo$D{xPYR#gMBs{^g^IJR6&~Zx6IUnw|iQ@i8#(?x?5E<_3dRUlEleY)#e@
zzBC(=X;7zOnfRdih5<Z_1&Mn*^>rY7;nOf({!wz1E_h%)8??sv+oq6<{$bHi1=-n;
z*yNR$c3L01UY60%iV|ZXbOw6H1l6i!-gr;5IL{PxHzr!?daXh&cEWfB4<BD_@?@lh
zV;!%g!EEzkEOWwF`utLBTlIb<NCjL^uP_TnRYfVDWZU}khrbTm`}<pFtxsF9bi2`7
zce0D*1ZjdlRP#1X>BP?c-|$zf%%9D7f7izb%o3v0xLy7pSQBDv-<R`JmbrMoxBfs;
zieStec`YEYRpOgbI^?%-%tTQm#SU!24O2#esz>!L7q3hl)WWcJ61gAmgbTw_*7^8a
zqasajDvK#NYa3==#;oe?l-hLJVWpk&A?N;M*y3c7PK{=y9Dm#eoHoWb(tf@W6;S5Q
zC<eM7>wEf`sz*Obno?`COn=U*gMk8lv#3^wgE@W`OhMeQ{`ox)V5eF&8Yt_^s+}SM
zPu6IzOoAG(5V{gw2p44z`iGz}0w-^8iZm<9@W3^v2)L*Og3U16#adP2l|Cs*MT@8=
z%JWiTheC2q-A`svRxruj+dH$O!rG$LvNC&Y?JK3nbDd;(v<bQBlEe~_jrc@f4~<ut
zT395*J&O4DBzN2WFh7F??G}6I-E7IUWev!~@FB?~Ob9=L*OIS;6MZS7LXMQ=Ml1CR
ztjIyp1N1-*isaA10^1+j$Hc3tbCLpk;@RUqM~Qj8uC(x*`%3gc(SFx!`;jvP3hlPw
z=e!x5eKIo2Dyj)1e-J8g1>*R@syN%spTKZ)t=6Ai@;%(gC+6PNt25>d3D<AqX28P?
zxWf_rRoGO|iEuIWqSp3Y8BN@|e=uAhE=UbifeL~{pkPDAHqNArIubkv+VTqyB!Abs
zxa~~s7ErM!j{qqQy{5+AEg-@`P_AAJU{u&H@nOwjrTj$77l?oYHnHCAOx^jBtsbdN
zSy<)dt|2-qDEK=htoE~dg-Ho)h>v{H6xnP)mLoCvtBv4x`l8+$i3!kl=}Pe*$7yB$
z4=>9ZpRK(RZ#K7lHx{d_Mf4R$SeyQ1cP1xr7w$dfR$r`Xo%xXq{eBq3^adAG$PrLG
zHh^?wVPRoqZ=WLv9cfNiDYZJb>TBSHW$=%x)QhZZDEtuF#e&2mJSQFdeu5CIZ9MKl
zALZhGqIycLRq=Kq1t#)%p(LWE?MvBjOqH_C>gDMPSYF06lzh6lXZ=|8@#5;z1!zT$
zC!E@~zy)hU+7d5>o|W6B*eCmMw3{%xqJPtPU(Z}(CrnV+L6WV^Jkv_|70?+#ig`E~
zDcsGb8<?1a<yMCEx+ng>6+?pQcz0vSzQnUwh&NP#`?8xj7O$mwUklNA9L@_Y!W)Mf
zCB4>(0d-?mj4bl4Zi@po^<mCi1_HQDo@LW?yEg6;Eiul-Oh;IjV|!>^+;e^v8O5R5
z9dayus>*7DF1v`ZA|t86xR-9Z`V&pQ0)HcP+m0P5<KFp3jMnaN^bZkzYJ3p_=`S2L
z`mFER5!$q$+|r}|i|_SoRneTQ2=eElUto!<6?A2~oV*eeTc2p7z4}Kicw^LJl13~1
zeZ1S-HfqICTAkJkg<Qw@RlI%fc8>NmytQTdi@G)SexDy&XR2TC?rx;&JCxLD@1{2n
z={=|Rw3u5*aAy`Oo~fy*@RryNei`}%m5^9^L&}^dt?)fePQF$QRFW)Y$@?N+c`%L!
z4LwL2j1<yQzK;_-KKZ*a->kweFmiJvT%m;%z!Onw%}Au6D0}%?byPWFsF)zr`{(;M
zWzn4V$r~oZp%601qoX5>ktO}9FDde8!)rPyC2}>p`bx7y)fG(3W|MU;J(HoIb}((H
zt1laL8|FB}jUOi(Bu3PELJ(dS;rKnc<-Zi#3`kp+-A7Q)6<Eqs{qfR*V|k#09kt+|
z6-4x_?qAbf9#xy;r54O(e~1<7&^_$Cq8~3GaC0cke0@>b?A0cg+ufphQKMwxWzwJM
z6KJzWr$?(Dj;$<_tIYHBA3)j?`=Q&${SBP_Dn%`2Erpy|Btyl8@2;z)$~<2K6%df^
z)6>Z<fp)Wg;`QyGvV}2wW+4}t?$;;YYzi1`F=u^lex4VFN@mx$X|s`|8E?RiB_CqO
z_d9e&v4q}oEZ5?^G%F$`OaAxIs<4W`sTR#kEwOWR#C<Y-2Axh59q*ZP->3bmVKVmc
zAfv<*@?z8E{`qcDJg2&>gRDo22k}++_l{Hd2uZ;4QLV$|F8`ce7_!f@HY3oVPx=@3
z3bmL!IvZ1atq+2m9QR5y&nd<11DNhD12r=COW+%IsoWKseDz=Fi;ai|>kZn>(ut*s
zk)44AuP`}H&Ey&n$F(>yN0uCSU+Xw2uB0LQgj|{$mz?-e8{s?}4S}J)0-gl<bnnd%
z&)3@^(DAv6p*dH}^qd?fNushXc0*o39r-i&84_$(|4Zpr6)$|viChJ#Wme5>K>Y=y
zIfby^RPy`2qBLE|O@EpHc{0SzM>4OhtSk*mhfwwnOEdCM@HuY7?|G45R1+OpaqDU`
z^=)ugJhGWsH+7(zh)-K@Za(;J71P=uAdR~C+x7cMiDk9hpt`%kKT<Fg4&nQsNZ^D9
zyA0l-<)Z)II%D`f^HAPs&q`q$l8yRn``OKdzhmOn_s>|ZPS&^~4F{QpGlCjcueHXo
zPq7y5_C&*ELnoY@Hj`ky-loYi2x>Dk7u1pWKmOVz(S9(i36UXyIBo6_sOG}jja^-<
zZ5-gd3Ds$q@0EVpR8@e0R57wem})*TMSKo*Sh+77{I%r*MyIx4x*090>vNXP`<_d=
zEKu;uYQknlT0Ai02KQCxg*b~^PI*M~@6lO(_TV6heGN4josSQBzlx=X!mc0y0l)wE
zB0OBJ1KmJ_u#Oa9+bx%W#U00E2aeVn6LHY)-i?(<soBYQNPh43X;0Jkt+(YiP&H@C
z({EKQMg_X72fy^5OZa^0tLv<u98*^)O4`ueQQgyHB{nz^JU7Yo_in#UUe;khiyiEa
zOD62&>1^j!74R!gZUoXqTA9nO8aXg#5|O46=d7Pe3jXQ+zjN`YAFg1n*pw!}{jQ<6
zBN&D=T?GMVF2TxzXu(zVx%LZ;gwA7e*;^+ZuUt<u(6S}@l*clp8A}*5<aq^M3fQlm
z>tl{Tgan&TU)Ack;W3Gy_IoIlz_bI5dXoaT8k)qdmuEmTOE{0WQj)3v{sYQ4h}q|;
z%S!n-ti*-7oL@$^gyB21v~&I|pUK1Go4WSfcqA2>^`-oFZN6IA)3B&z16Q4$t))qq
zH&7I)lOr>94$lAa_({T-^0l}%TnO>C2%!mpW5J$NDVCk8#00D0-<^voyLJPNo-x7(
zw+5%Z0yc`Gs-l^Z^?#2^D;t|^0ufr3ubS<B>Q`a)o~W-j>TNpA&QJ{bi+O|X7mUZ<
z{5*a{j<zR-nAKYhn@7Vceig`s%a4tn{pxd+opHPMo__t>E%NPIC7DR&kM>75fRBDQ
z+ZRrhXATnNnKJudUbk>+i}B<rCLy#DVn&S?cq%F?DAg-pAEOxU^_8#=Yix2A>b2JM
zx-ap@ax{N%Q9aj52?Io_vy0!2mWYQ3`j!+oBfLI0>R`k0?b+GTSF4{s#>L0`Y==U=
zH8pvKh<k5>jROt>G~pNDYU5stE_4tm8Ecrny!V%CS#hS!$4QZc64>nzqoKhRqe=)X
zw4y2^t$)7zDIDOCToJkJwW;6Xj%PRqs{?AFDb=d#(9+!t_~pd%G&c0hsQJG$oyRc-
zWB&Qg3Qq2ygDDG@x}4oN4=lO&ub&asxG#)b{c@}OviDnQJYb)wr(S2~Qq4N^XO73R
zz^i}!8On*HmENxbkE!$NA)XMMt*b(d8wl5K<+F61^^09TDzU-_7ob6sk?CU}HAWJ&
z#~tn1r`nq?kft&vG;irOrv0m3gd;5+y?0ZpxyWp7N{edrx2Ov_ckBEQl|D6!q<kZ=
zt!1A8LE;CO*ekNdgw7%z{WtVi<jf`X$Epl0_YZ}52`9m*Hi3^p0gpSkadB5gffF+`
za%yVFoz1)O%w)bnI%1sD<?GJ)qoX$WIlIi$p=jc$nfDe&4XNMk7nGHic_k&gS5YI<
zKG)g;W)pILIt&i|oThIGctw*-b27B6xK%Kh+uuC@5kqGpO-&6~x|@OKU_6a$DX*^O
z<6XeRzQ>1DL)ovH_J3Zpnad#0Dc?v3DJJs!?-S8H71r9uQ-po5X<7cOT~qm%JB=Yh
zel?D~WyxL4(YG(F^ZrdFV{W>Ii#O^*_iY4hv@#R0fTpI1(*UEx8An@~%EH7X(1bO@
zP~)(mf^8UR0jl)>s?4~FF0=zW>1z8P;gImk!*a`u7cWldzcn}i$tnCI&q(e<Nbqxz
zMe@3-?!Hf_4R@EldFvfZiD0pOn;34uPMVabrIPIks24Y!VbS+|)Gg&4DA9N`$_?fN
z!&mNkfZ3G^Y3ZfP@}|%xWVh{6AS<*o3p8c4vGE<A{&iLsW+KQ~iO&Ebj+K~^G@1Yq
zx`y6+8Gd6ME>)r2-95~>?m~T}9jzxdQ{l?BE!AQ_T|7q!8=+wINJ#^lMwUtrVq3)h
zfHl?JRBw7mr~9JGWAt~ws}_F!C0O^}u7Alp#1~s)5XLa-Ou)ki&4XLd%Drn~T-?|&
z;YR`WEl<q~krp{yTMoy7JF%U^T5jzG#C8OWrF<!&4im|ef<jTzM{SKH4%upvpZ}S3
zR4viZ3}+%`vw(<sBO%fWR~H#{-48i~U67pGeW2AA|6EPlZ0~w7tKrf{1sndsQP+7}
z;HM_x7b4<f_#Q{l`z92V03r=G&98RaXpuaneA1q|G{)5J@ejPZy27Z_j6@%*{EA#%
zrM-6Oh|fKeyomDZZsy8RVUqtn_GOf-=8>Njn@>Qbq``q#kL8?sgQ*3F4vdcWHv4y$
zldv)n5=CAJ6!Kiw3Xr~I`Mo$gKW9Gq_`^d!hd<{L6cn71q@r8biqi%6^~o&9be?Yy
z`Uk8$mi45m78A*mK#b&XwU2}hZr^;w-ce1TIG%TryK$=v*uhpoHUk~zsL%>*Yojt8
z&{7Tn(?A^@Dr47k?C;RMOInyvT6qPlq?npB02&!3!Mrvb28KL@CU+V~m4+7}D?q=0
z<qP>x*M)*Y@bKSRfDAU}Ua5d6bMe=G2@FzyL&=QG6=_fI9<;}{47la!Gd{TsDgYP<
z^iIUK0wdAz4r>ZqiehT=WR@p)NwzFu8gz^{BY`J2nGZJ1hHi;7H~H8Xj-RK8J&8{t
zFP)CW0BtNCds#jK4OcEH^xHpQNkMxGgRi2g&)Ase?3!(`F~}$d?MxOVt{W^y+c7qV
z2F!x&B=>jV=1n1~jZJn<HOfxfB)WLo9q;&fvMB`H9Uv!IRj|$dOE;jo&h@%_!EIP+
z)UAZ%2YevDQ{kbviJma~eUgbOw;U6mh?QeGum;ng60QXK$=wTcToz{|`fFR*0oI|u
zn$*L^FZ$SkLMwidL^S!h)O`ZJ1XZ-a1A_?=<J(KL%9sU`e05f*+Y6ovt8a>?*LM%N
z&mAoM0;CKLm-;h5kitW!J|`0{G>`N9DLAj2)k}*LY_FF*%a(A>ELdBs6pa9sv}a`8
zJpBC1%zQdD3o28wZ-2Zk(f}kcXaOX_DP3J&Rtmn<yUjN>t**bM9)KyMQx#153<DNN
zX$!<%y!O2f#fujehLceGx%e-}>={=pQg{80NCP>3-x^^{)~k!}_yL<~%ac>YcZHCC
z6mM_u-TjV+i%Y;b-iVh{rCs%4|1G!OG{GOc+$|}HYnNZ=h-c4bfAauxl>7ywE778B
z^-Zm)P<SVY;NutX@9%%RbOorn05AWzxnW`wK?4N`(H1zRms%02Ot3ymODph+%*eGF
zxYrogSu`WI&r>r6aQm_fA<+X?wzdqU(O!dE`qU%MZJwv7GBRbt?g!*$i0s;_G9|+9
z&&=*Lo_oCoOj0pb(tX%qZJGM#<i~z19gau($U73ce$2qsR8pW1{EckcqstmOofYa<
zWlt#uOq*Cr%t%35FechFqvOZ)HK%lWenmz?Izk*GoN#Q+&*`NK1?o;=cbvP*naZLn
z>?!m~qn@@QQ!@3s^a&AsVp(S1-t&4pqRO=7z2mr!;3j)n-WGL@tsk?BI15UGg@7fS
zlam8zqUH8FWczn_k%9tVnmQv}ydTMa3j5y+uRMJxVkE>aChqZD-9-ziFCMEU<OmHs
zQa|W2y1vC)IPTn!dn(w!-Itby3fj%K=Ia*{o_b~vzVwMPs|PwU_%{ziTN`G`2{2vY
zCeVW)WjRz0@eF_=1xuJ|&Ch0=LlN7qrEYt<{8fzFTmD@ib(Ex4kjWQ(+VA7n_;^%k
z0L0lXwk7}$e|vj-mv+vh6@te3tlzm9;wW;`hc;u*bVc$;x?JtYa`$p?$MS<~!20<=
z$%AhNMMX)=%gZB)mT<ddN2y19L`1~fLbw|oFq=C2HIWx<*LM@KB1;N0+6OwWEvg^7
zJGu?p>_mP>zMXHL7wvPB)H#{X@1ROZg|=5Q<+pqa-R;}f<oI!?jMk^Xcb*|hzs9pa
zeTiIH7+mfOQ11RB*SE9S;<)0b7wR_vf&5Jv|MTq9_-;o|k^&dwiH7biQ8{W#S63Gh
zZ0^dIfeq(e-#s=*CI%THphb3OrXN-NUU%Jn^~g<UW2{6s(FB3B@!%S63A`szKfI%g
z+!0d2&BNE9zhAwRLK(VwEW>v<emola9EOOg3)vvg*%p7udUbzD<`2I~@rfQ-Cj*T%
z3};J8{YYS_^BxhHk^$`NW3Ou;z?$*_PKY#UTU`9`8jFwnGFH4KS!MVl8e&_ovvoPr
z70?7JY=BksA==Im%ztr&&0)iYX~8;mZ5t)NKT{Y%hEtSr&c$mTD|cfH-abB0U8XyZ
zE(_s(rt=F6fVoz~y`mpfvHL&ey-uAm5MenvKl#p9$@b59=a&mtXA$1%ME5qvb(lZL
z%-70f&!Z9k?JL8FllvW3Ic?`6#PN#9iAP;)k!^nzBdu0~dez)s;3GonBB-VL8-IW*
z@|z0D%=qG>vX76LibGp74$zb(FvtmeACNbaJfpy&v$BbrAhxEbiYsrDBTWxElC0xM
zh|*E)&qD_ZsA#?mm-|71nknfUCZmcR1pbknnp#HQ|8Tbq|1m)6rlJ;`BQ=nl-GIO8
z?bL^b52JYj+hWT!*x^#;l(%SF$`Tj<e1XDbVtQKeRW(b==6dKeDhc;wp!gkA;ugUD
z?8FLXq@n}#Gcfu-cZg?6T@{o5VOxpx3);9%J{1IxJ5w$THJ;nSc!3OKQseB`ht=-S
z2(Ck&cJFFW)Zp#vT)Ez;nyb`2FW0BrphtXk)F9(=etW~M%l2BG<U{phmm<10gVc|M
zajv%)yX{TjE+4CQ1_fm~mz(7C`HJ4XJx$s-!R8C9m`z)H<F$?mciu|-U0tLb>?}F%
zy@;ir{-n71R=Qwk@J=_5P>jaMFXUn0J$mjW>=shjOqg$Tj_<7=CrhO0fFm{`UNQ~u
z8;`quC1nDxeU>jxZ1qR5l##ySkU|IPxeFV<@EmOcykf45+zbmBm#CpgXJ%%Wsvnjd
zAP4dJaV@X|9kg<7I=yWF-yY<vF6&93pBfr2u((c|OO%fxPJNK^ffPc5@oD^v@RlVX
zMAwAXg+tFu=K@bm4K#uy3%}wP=$|y$Nr$#v0XMKrxQ+dprJf*+`zVhHstZ1o&uF$2
zi{sLS4abCh<1(kvFP(7W!(xQWt7Mc?XO`9=(I05rb@Lm7N_WZIiSVc42+uR{&YpMa
z<O6P>5DSJ1Q69p?#wIh($QygL{^9O<_qJjl!X;nh*?VIFDjk)!;0TA^`VaI`jh17h
zxe~5N3ajD5Df!DMKWAzV^^q-HR5<pR8Qom%wT`6FsT?Nm5_oZhhPFz<^8=T*Y);ZB
zmWH{-`cJ(6>jxR<ub$)K#gjzK3aRSo(Hcy9InK<rfI3=QW)5}^bty0Ij;BJd-i3H3
z1%gl(npx*blePZFD9WFRn1|Yu9TJdSI{dY<Mu^HTlq5?T&DS{}wyrUnaIs(XDMqr|
z#A&C}XSKw>E9wS3&5t!eNuMC!I!ALNbm!YmnrF(tANCR%LfT+w+ibv&AXO@PTd%JC
z*QKrhz>Zzy_3H$24|hhuk<K2Qk6dj+(r~mqBN)F7pH7@e96Q6om$*=uqQHM<Dis59
zd<RRZUsL=p&!||<_KtQnuMS@nb6DwBPk;XnI{07oU4Z9~?aWm)C!UZvz!5Jp_y5S%
za_Q*T`P$p#Nw6=^ETlyr=p@#?B(P;#hr-4a(=x;_Zf6`<I76>^pyDx`roEa1A?mij
z*y^M?01J#V7q4$nQ%yovGEc6r+kU0nGLCy1;j$qhBTe?4z>s&E!ITSBF~|L0&ha%7
zobK#TQpjc4>IZ8pkWN$ebWyxyrE#b5Z3OYU4DAY<XIOfv^|$7x3FMNBjwK6}$oJSs
z4TadRUFv=_NzG_Rd3S~i#Ig3}R1sTO?TkxH%8?FR*Q?q{CH2GEABKE4fnt5IqtAlj
znzH1@%i<fz37ABw<<=K)s<JZDv(Y!>ua3pOnYZ0`!8%K^bt7?xbgPJ9mH~8Zo=k*a
z6P;3y_q#gjJVX>)ATPal3RL+eY0+sgz0@xCPCf3fsc**BZuzFx%fbSiAg<594O{@(
ztb1fPFj_&1^6%azKMsD^Zh=oI*AvD`w6rw6$IDrdo%p)z?VAdwRVd_7?ow!&IT=u>
z&g*^0_qs#aIr1sp4i=Y4GzC08TGo0zRiPWm%G4L0fpkuh;r}~n+G>G{L&s0oPfFMC
zhG$l{-V|gz4GM+O(V|f$!z90P=Gl-)3FuM>>rAL~$_Xkz-vLFX*|tV$Pp!ANn}$Ga
z17nhTyK%4g&@4)lE0_!#zwZWg{`Dl^!5nL!V@_*RV`2Z)TrA2C1=H~CTqM<qkfC}9
zxx$8Jl^Ss9K4c@Z(3ne--T2Z&A^zLB{wD7f^?Hot8S0bU@Ggy{!SX08wIYw<W2ZA{
zd6;8-WG_6iTivkz?m4!Nr10-m2f8>{y-dE238;zAgaD^5`NjkS3?~40edD(*TSM;?
zXqx*(<RwT|$2Xp+*Cz-e?Dt?NyO8dBkQaE_D@kn1coI!=xQw4&d4r3w>TIHt^SFXR
zRU(>g2|}PuM7ihmu7FB1o5=!=+oxB2MT|#MzEGgqaDXs!Hl8SEG4Er~Ki}hgCGj)>
zzh*7zOe_#vUED|ZF7+Ct^!4rs8l&ZsK<!ds?`t8%Zngj9Oc+j90@-Mv(}vs>yXIN1
zUI)4MW(CHh)Pd=m71+88C!i56MZc0UC9!Zp9w<*}o^!iZ4F{=CarUUWsAH&4pc0RG
z(d&Es-X4%DY97YVK(1bvpgw4XzF`GZ$Smr;1kba3%c(qF*Q2NM^O(hnRi$42Ku3^T
z(c{;y-agg4l+WggfrP^9uJ?%S4I*ie(Kbi1?b@9c@O>__8+}pR^~j?<!EWr7EPDe1
zO2~AzFPD<Zq}av2SK4l`)22cO>S!cw+1>?+xf1@(AsNi#h<lRFIfkdX_Mip!{9V+y
z?a>_IyZIw}P58S)lk0aZZ=tGw%>=CO%uS+tRVocO&HZ?1Z`m;wu%QExSEa}ma8U7-
zBQ8!mdL;=qU3+@Tswn!<1b=^AecxGLutydG86B(l30epow7E-zNyfp@NTH-REpBlE
z6e$#!dTi#}Op0t<9zlKOYjdGhLI{qgSJc9e(dAO9d7^V-4d1m-ZJi~+x{kR)`k38S
zV{HQ`c88z};;U_qzLi_i8LC=WyT(R|ue}e8{+Kz3?=1C|{K;N%J5jC1BsVNaiMEI?
z+=W7VH1D7ff}>FI^$S02+1egrs5n>1jh4iAj~3>Tl<+kT3G}`VvThjyxm0QqB%k>R
zgGq4wsflPkNqlozuRg%s^4Fe5v7oMBE9c5V?;+Z4EGRJ$#a3g}UE%9E)aCNFb+HX^
z><XW>tvQgF^=C;k5*l&XdyGmWz1tJO9U_c#Psz3=#9n(xyoWfe0E!pzschL{)2r7_
z%B>Sr6VFsC;Mg#+DVc{D^E8uZ3MSV#>5UQr8CTIMPKLh_0#TEotdis)S)*kzeTg_{
z$vsK(n^V)(r^4cYGr&QiDyy_anEy+r@5WfZF9kRQP?;2Ta2@zj9cm<2e@87uxqQrS
z`*GI_J6py$Y8my~ueJAGoa;6Xx;l?D1{ul5N-I4#R%9zHNq*8){O8I_M$#))g&a$S
zz5D`u<hGGlMLTx#jpINSq5uUbfM2V-9>|o7G#J-t|0Vk_mA^hi<CZ;~asyUOyHABv
zjlza?f@n}2A<)jA(g#PrG6rspfY8LaC+mVeJZQv~_nm-K6=z9~JHa5xFq(HyZ2Nl_
zI3BW|77EF8%f3kQb99UAsruWB5P8(A#~n#swjx5tgRrQcGWN0VIrr9{Iykx_lg|<%
z>-a%Sy{^y*DU5f4LWSTI4EJe+D{Erx9_A2Fs;!W2N^|Of7dNy@y0==2ZN}i!r^1Uy
z251DLh|vLj8Sc$8yyH3Bw%G%wyVdCK)np}H!Uux#REczWc9ITR4=9K!(pY6)^<yPj
zcQkh^-VzGJQWxFWjoMfUl0xl9^=(`Sruh7%OzGd4n{$mn756cguWOF&5q#{Sh2x;_
zGN_B}CZ098RkE4R#@DrB9>4sR%SwFyB4x@%Fj=5JsZ|fb)@*km{ee!-@mbkelRn3M
zyMHgstMetv2zrIXkP?PoN9}KSF-S}Mj*Z?9_IW(i@N^oCp#p>VL79*EqT4G*uJ;>b
zr>|a}_$c*y)ZDkx!Oj4nhet_vsww_+8(i^V;o&L~_ldnGWsO9lQ6<5+y@ud){T}LL
z8y0NlXD)|it#T~G`M*$$T!LC_AcbV+19uufCq(qN<=_{cpnNovLlK7UI~mG2N_#M-
zxbc!%cT35lQejvwGP;S##$JrgHjyL*5}*I;dg@Oi;vW@JdHKZFyrIchlyS8oDU+-Y
zzk@ugAb3BJ28XUYSP{&l?ma1|-ag;+;bu~sGejHJNCd{(x1IDmw6CF@GfhpAO{epl
zUSz8VyjL)pn{VDq;-|C3H#BCR_i9fc22wV{Xjj>dI{w=)Ri3e?DS=g1tnaZ~qr%po
aux>?DVl>icI)HDEpeV?yzO99t1pgl~hDEgi

literal 0
HcmV?d00001

diff --git a/trunk/search.pl b/trunk/search.pl
index 6e74128..95d6c82 100644
--- a/trunk/search.pl
+++ b/trunk/search.pl
@@ -6,10 +6,11 @@ CGI::Session->name($session_name);
 $query = new CGI;
 $session = new CGI::Session;
 
+$username = get_username_from_sid($session->id);
+
 %page = ();
-	
-#if a username is associated with session id, username is nonempty
-$page->{'username'} = get_username_from_sid($session->id);
+
+$page->{'username'} = $username;
 $page->{'locale'} = $locale;
 $page->{'stylesheet'} = $stylesheet;
 $page->{'xmlns:dc'} = $xmlns_dc;
@@ -19,9 +20,11 @@ $page->{'xmlns:rdf'} = $xmlns_rdf;
 #check if query is set
 if($query->param('query') or $query->param('orderby'))
 {
-	$page->{results}->{query} = $query->param('query');
-	$page->{results}->{orderby} = $query->param('orderby');
-	$page->{results}->{sort} = $query->param('sort');
+	$page->{'results'}->{'scriptname'} = 'search.pl';
+	$page->{'results'}->{'argument'} = 'query';
+	$page->{'results'}->{'value'} = $query->param('query');
+	$page->{'results'}->{'orderby'} = $query->param('orderby');
+	$page->{'results'}->{'sort'} = $query->param('sort');
 	
 	#connect to db
 	my $dbh = DBI->connect("DBI:mysql:$database:$dbhost", $dbuser, $dbpass) or die $dbh->errstr;
@@ -88,7 +91,7 @@ if($query->param('query') or $query->param('orderby'))
 	my $sth = $dbh->prepare($dbquery) or die $dbh->errstr;
 	
 	#execute it
-	$resultcount = $sth->execute(@args) or die $dbquery;
+	$resultcount = $sth->execute(@args) or die $dbh->errstr;
 	
 	$rowsperpage = 2;
 	
@@ -111,7 +114,7 @@ if($query->param('query') or $query->param('orderby'))
 	$page->{'results'}->{'resultcount'} = $resultcount;
 	
 	#get every returned value
-	while (my ($id, $title, $creator, $description, $username, $timestamp, $duration, $viewcount, $relevance) = $sth->fetchrow_array())
+	while (my ($id, $title, $creator, $description, $publisher, $timestamp, $duration, $viewcount, $relevance) = $sth->fetchrow_array())
 	{
 		#before code cleanup, this was a really obfuscated array/hash creation
 		push @{ $page->{'results'}->{'result'} },
@@ -119,6 +122,7 @@ if($query->param('query') or $query->param('orderby'))
 			'thumbnail'		=> "./video-stills/$id",
 			'duration'		=> $duration,
 			'viewcount'		=> $viewcount,
+			'edit'			=> $username eq $publisher ? "true" : "false",
 			'rdf:RDF'		=>
 			{
 				'cc:Work'		=>
@@ -128,7 +132,7 @@ if($query->param('query') or $query->param('orderby'))
 					'dc:creator'		=> [$creator],
 					'dc:date'			=> [$timestamp],
 					'dc:identifier'		=> ["$domain/video/$title/$id"],
-					'dc:publisher'		=> [$username]
+					'dc:publisher'		=> [$publisher]
 				},
 				'cc:License'	=>
 				{
diff --git a/trunk/video.pl b/trunk/video.pl
index f3d4195..4f7f9ec 100644
--- a/trunk/video.pl
+++ b/trunk/video.pl
@@ -16,8 +16,12 @@ $page->{'xmlns:dc'} = $xmlns_dc;
 $page->{'xmlns:cc'} = $xmlns_cc;
 $page->{'xmlns:rdf'} = $xmlns_rdf;
 
+if($query->url_param('edit') eq 'true' and $query->url_param('id'))
+{
+	$page->{'message'}->{'type'} = "information";
+}
 #check if id or title is passed
-if($query->url_param('title') or $query->url_param('id'))
+elsif($query->url_param('title') or $query->url_param('id'))
 {
 	#connect to db
 	my $dbh = DBI->connect("DBI:mysql:$database:$dbhost", $dbuser, $dbpass) or die $dbh->errstr;
diff --git a/trunk/xsl/xhtml.xsl b/trunk/xsl/xhtml.xsl
index 0e31d64..ac3507f 100755
--- a/trunk/xsl/xhtml.xsl
+++ b/trunk/xsl/xhtml.xsl
@@ -290,13 +290,13 @@
 			<xsl:otherwise>
 				<a>
 					<xsl:attribute name="href">
-						<xsl:value-of select="concat($site_strings[@id='page_results'], @query, '&amp;orderby=', @orderby, '&amp;sort=', @sort, '&amp;page=1')" />
+						<xsl:value-of select="concat(@scriptname, '?', @argument, '=', @value, '&amp;orderby=', @orderby, '&amp;sort=', @sort, '&amp;page=1')" />
 					</xsl:attribute>
 					&lt;&lt;
 				</a>
 				<a>
 					<xsl:attribute name="href">
-						<xsl:value-of select="concat($site_strings[@id='page_results'], @query, '&amp;orderby=', @orderby, '&amp;sort=', @sort, '&amp;page=', @currentpage - 1)" />
+						<xsl:value-of select="concat(@scriptname, '?', @argument, '=', @value, '&amp;orderby=', @orderby, '&amp;sort=', @sort, '&amp;page=', @currentpage - 1)" />
 					</xsl:attribute>
 					&lt;
 				</a>
@@ -305,7 +305,7 @@
 		<xsl:if test="@currentpage > 2">
 			<a>
 				<xsl:attribute name="href">
-					<xsl:value-of select="concat($site_strings[@id='page_results'], @query, '&amp;orderby=', @orderby, '&amp;sort=', @sort, '&amp;page=', @currentpage - 2)" />
+					<xsl:value-of select="concat(@scriptname, '?', @argument, '=', @value, '&amp;orderby=', @orderby, '&amp;sort=', @sort, '&amp;page=', @currentpage - 2)" />
 				</xsl:attribute>
 				<xsl:value-of select="@currentpage - 2" />
 			</a>
@@ -313,7 +313,7 @@
 		<xsl:if test="@currentpage > 1">
 			<a>
 				<xsl:attribute name="href">
-					<xsl:value-of select="concat($site_strings[@id='page_results'], @query, '&amp;orderby=', @orderby, '&amp;sort=', @sort, '&amp;page=', @currentpage - 1)" />
+					<xsl:value-of select="concat(@scriptname, '?', @argument, '=', @value, '&amp;orderby=', @orderby, '&amp;sort=', @sort, '&amp;page=', @currentpage - 1)" />
 				</xsl:attribute>
 				<xsl:value-of select="@currentpage - 1" />
 			</a>
@@ -323,7 +323,7 @@
 		<xsl:if test="$temp > 0">
 			<a>
 				<xsl:attribute name="href">
-					<xsl:value-of select="concat($site_strings[@id='page_results'], @query, '&amp;orderby=', @orderby, '&amp;sort=', @sort, '&amp;page=', @currentpage + 1)" />
+					<xsl:value-of select="concat(@scriptname, '?', @argument, '=', @value, '&amp;orderby=', @orderby, '&amp;sort=', @sort, '&amp;page=', @currentpage + 1)" />
 				</xsl:attribute>
 				<xsl:value-of select="@currentpage + 1" />
 			</a>
@@ -331,7 +331,7 @@
 		<xsl:if test="$temp > 1">
 			<a>
 				<xsl:attribute name="href">
-					<xsl:value-of select="concat($site_strings[@id='page_results'], @query, '&amp;orderby=', @orderby, '&amp;sort=', @sort, '&amp;page=', @currentpage + 2)" />
+					<xsl:value-of select="concat(@scriptname, '?', @argument, '=', @value, '&amp;orderby=', @orderby, '&amp;sort=', @sort, '&amp;page=', @currentpage + 2)" />
 				</xsl:attribute>
 				<xsl:value-of select="@currentpage + 2" />
 			</a>
@@ -343,13 +343,13 @@
 			<xsl:otherwise>
 				<a>
 					<xsl:attribute name="href">
-						<xsl:value-of select="concat($site_strings[@id='page_results'], @query, '&amp;orderby=', @orderby, '&amp;sort=', @sort, '&amp;page=', @currentpage + 1)" />
+						<xsl:value-of select="concat(@scriptname, '?', @argument, '=', @value, '&amp;orderby=', @orderby, '&amp;sort=', @sort, '&amp;page=', @currentpage + 1)" />
 					</xsl:attribute>
 					&gt;
 				</a>
 				<a>
 					<xsl:attribute name="href">
-						<xsl:value-of select="concat($site_strings[@id='page_results'], @query, '&amp;orderby=', @orderby, '&amp;sort=', @sort, '&amp;page=', @lastpage)" />
+						<xsl:value-of select="concat(@scriptname, '?', @argument, '=', @value, '&amp;orderby=', @orderby, '&amp;sort=', @sort, '&amp;page=', @lastpage)" />
 					</xsl:attribute>
 					&gt;&gt;
 				</a>
@@ -479,12 +479,13 @@
 					</a>
 				</td>
 				<td><h2>
-					<a>
-						<xsl:attribute name="href">
-							<xsl:value-of select="rdf:RDF/cc:Work/dc:identifier" />
-						</xsl:attribute>
-						<xsl:value-of select="rdf:RDF/cc:Work/dc:title" />
-					</a></h2>
+						<a>
+							<xsl:attribute name="href">
+								<xsl:value-of select="rdf:RDF/cc:Work/dc:identifier" />
+							</xsl:attribute>
+							<xsl:value-of select="rdf:RDF/cc:Work/dc:title" />
+						</a>
+					</h2>
 					<table class="videometadata">
 						<tr>
 							<td class="leftcell">
@@ -506,6 +507,21 @@
 							</td>
 						</tr>
 					</table>
+					<xsl:if test="@edit='true'">
+						<a>
+							<xsl:attribute name="href">
+								<xsl:choose>
+									<xsl:when test="@duration=0">
+										<xsl:value-of select="rdf:RDF/cc:Work/dc:identifier" />
+									</xsl:when>
+									<xsl:otherwise>
+										<xsl:value-of select="concat(rdf:RDF/cc:Work/dc:identifier, '/edit=true')" />
+									</xsl:otherwise>
+								</xsl:choose>
+							</xsl:attribute>
+							<img src="/images/tango/accessories-text-editor.png" style="border:0;vertical-align:bottom;" />edit
+						</a>
+					</xsl:if>
 				</td>
 			</tr>
 		</xsl:for-each>
@@ -514,11 +530,17 @@
 	<xsl:call-template name="pagination"/>
 	
 	<div>
-		<form method="get" action="search.pl">
+		<form method="get">
+			<xsl:attribute name="action">
+				<xsl:value-of select="@scriptname" />
+			</xsl:attribute>
 			<fieldset>
-				<input type="hidden" name="query">
+				<input type="hidden">
+					<xsl:attribute name="name">
+						<xsl:value-of select="@argument" />
+					</xsl:attribute>
 					<xsl:attribute name="value">
-						<xsl:value-of select="@query" />
+						<xsl:value-of select="@value" />
 					</xsl:attribute>
 				</input>
 				order by: