[Yapcom-commit] rev 323 - in yapcom/trunk: . lib/YAPC

[svn at pti.co.il]

Author: gabor
Date: 2006-08-06 23:57:41 +0300 (Sun, 06 Aug 2006)
New Revision: 323

Modified:
   yapcom/trunk/
   yapcom/trunk/lib/YAPC/Config.pm
   yapcom/trunk/lib/YAPC/Organizer.pm
Log:
fix accessing person
use the right fields....
(Yuval Yaari)



Property changes on: yapcom/trunk
___________________________________________________________________
Name: svk:merge
   - 8c4c90e1-83eb-0310-96eb-e7cb62807872:/local/yapcom:10650
   + 8c4c90e1-83eb-0310-96eb-e7cb62807872:/local/yapcom:10651

Modified: yapcom/trunk/lib/YAPC/Config.pm
===================================================================
--- yapcom/trunk/lib/YAPC/Config.pm	2006-08-06 20:57:37 UTC (rev 322)
+++ yapcom/trunk/lib/YAPC/Config.pm	2006-08-06 20:57:41 UTC (rev 323)
@@ -18,14 +18,14 @@
     
 sub get_config_name {
 #   warn Dumper \%ENV; #$ENV{REQUEST_URL};
-    my $url = $ENV{SERVER_NAME} . $ENV{SCRIPT_NAME};
+    my $url = ($ENV{SERVER_NAME} || "") . ($ENV{SCRIPT_NAME} || "");
     if ($url =~ m{^ ([^/]+ (/[^/]+)?) }x) {
         $url = $1;
         #warn $1;
         # TODO: what if no match ?
     }
     #warn $url;
-    return $SITES{$url} || 'config'; # TODO make this more roboust !!
+    return $SITES{$url} || 'config_default'; # TODO make this more roboust !!
 }
 
 

Modified: yapcom/trunk/lib/YAPC/Organizer.pm
===================================================================
--- yapcom/trunk/lib/YAPC/Organizer.pm	2006-08-06 20:57:37 UTC (rev 322)
+++ yapcom/trunk/lib/YAPC/Organizer.pm	2006-08-06 20:57:41 UTC (rev 323)
@@ -882,11 +882,12 @@
 
 	# for administrators get back everyone, for non admins only validated, unhidden people
 	my %search;
-	if ((defined $id and defined $q->parma('id') and $id  == $q->param('id')) or $admin) {
+	if ((defined $id and defined $q->param('id') and $id  == $q->param('id')) or $admin) {
 		%search = (id => $q->param('id'));
 	} else {
-		%search = (id => $q->param('id'), admin => 1, hide => 0); # TODO: maybe hide is undef?
+		%search = (id => $q->param('id'), acked => 1, hide => 0); # TODO: maybe hide is undef?
 	}
+    #warn Dumper \%search;
 	my ($p) = eval {YAPC::Person->search(%search);};
 	return $self->send_message('no_such_person') if not $p;