Index: openacs-4/packages/attendance/lib/attendance-portrait.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attendance/lib/attendance-portrait.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/attendance/lib/attendance-portrait.adp	5 Apr 2006 01:49:01 -0000	1.2
+++ openacs-4/packages/attendance/lib/attendance-portrait.adp	7 Apr 2006 02:33:06 -0000	1.3
@@ -16,20 +16,19 @@
     <pageTemplate id="main">
           <pageGraphics>
           </pageGraphics>
-          <frame id="f1" x1=".5in" y1="8in" width="7.5in"
+          <frame id="f1" x1=".5in" y1="7in" width="7.5in"
+              height="1.5in"/>
+          <frame id="f2" x1=".5in" y1="5.5in" width="7.5in"
+              height="1.5in"/>
+          <frame id="f3" x1=".5in" y1="4in" width="7.5in"
+              height="1.5in"/>
+          <frame id="f4" x1=".5in" y1="2.5in" width="7.5in"
+              height="1.5in"/>
+          <frame id="f5" x1=".5in" y1="1in" width="7.5in"
+              height="1.5in"/>
+          <frame id="f6" x1=".5in" y1="0in" width="7.5in"
               height="1in"/>
-          <frame id="f2" x1=".5in" y1="7in" width="7.5in"
-              height="1in"/>
-          <frame id="f3" x1=".5in" y1="6in" width="7.5in"
-              height="1in"/>
-          <frame id="f4" x1=".5in" y1="4in" width="7.5in"
-              height="2in"/>
-          <frame id="f5" x1=".5in" y1="3in" width="7.5in"
-              height="2in"/>
-          <frame id="f5" x1=".5in" y1="1.5in" width="7.5in"
-              height="2in"/>
-          <frame id="f7" x1=".5in" y1=".75in" width="7.5in"
-              height="1in"/>
+
     </pageTemplate>
 </template>
 <stylesheet>
@@ -39,23 +38,26 @@
     <paraStyle name="h1"
     fontName="Times-Roman"
     fontSize="20"
-    spaceBefore="1cm"
-    spaceAfter="1cm"
+    leading="21"
+    spaceBefore=".1cm"
+    spaceAfter=".1cm"
     alignment="CENTER"
      />
     <paraStyle name="h2"
     fontName="Times-Roman"
     fontSize="18"
-    spaceBefore="1cm"
-    spaceAfter="1cm"
+    leading="19"
+    spaceBefore=".1cm"
+    spaceAfter=".1cm"
     alignment="CENTER"
      />
      <paraStyle name="p"
      fontName="Times-Roman"
      fontSize="14"
+     leading="16"
      leftIndent="5"
-     spaceBefore=".25cm"
-     spaceAfter=".25cm"
+     spaceBefore=".1cm"
+     spaceAfter=".1cm"
      alignment="CENTER"
      />
      <blockTableStyle id="sig">
@@ -94,6 +96,7 @@
   <para style="p">
    <b>@attended@</b>
   </para>
+<nextFrame name="f2"/>
   <para style="h2">
    <b>@community_name@</b>
   </para>
@@ -103,26 +106,27 @@
    <para style="p">
     <b>@date@</b>
    </para>
+<nextFrame name="f3"/>
    <para style="p">
     <b>@description_label@ @course_description@</b>
    </para>
-<nextFrame/>
+<nextFrame name="f4"/>
  <blockTable style="sig">
   <tr>
    <td><para style="sigData">@signature_1;noquote@</para></td>
    <td><para style="sigData">@signature_2;noquote@</para></td>
    <td><para style="sigData">@signature_3;noquote@</para></td>
   </tr>
  </blockTable>
-<nextFrame/>
+<nextFrame name="f5"/>
  <blockTable style="sig">
   <tr>
    <td><para style="sigData">@signature_4;noquote@</para></td>
    <td><para style="sigData">@signature_5;noquote@</para></td>
    <td><para style="sigData">@signature_6;noquote@</para></td>
   </tr>
  </blockTable>
-<nextFrame/>
+<nextFrame name="f6"/>
  <para style="footer">
 	@continuing_ed_credit_info@
  </para>
Index: openacs-4/packages/attendance/www/admin/certificates.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attendance/www/admin/certificates.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/attendance/www/admin/certificates.tcl	5 Apr 2006 01:49:01 -0000	1.3
+++ openacs-4/packages/attendance/www/admin/certificates.tcl	7 Apr 2006 02:33:06 -0000	1.4
@@ -1,3 +1,4 @@
+
 ad_page_contract {
 	Generate PDF for certificates
 } -query {
@@ -20,9 +21,14 @@
 }
 # setup course section info
 
-set package_id [ad_conn package_id]
-# setup multirow of user data
-set user_id [split $user_id]
+set package_id [ad_conn package_id] 
+
+#setup multirow of user data we
+# can't use multiple in a hidden variable and the multiple in
+# ad_page_contract messes up the curly braces so throw them away to be
+# safe since we might export user_id as a URL variable in a redirect
+set user_id [split [string trim $user_id \{\}]]
+
 ad_form -name certificates \
     -html { enctype multipart/form-data } \
     -export {user_id community_id} \
@@ -127,7 +133,7 @@
 				   -item_path "__attendance_default_logo_image" \
 				   -root_folder_id [dotlrn::get_package_id]]] \
 	    -target_item_id $image_id
-
+	
 	ad_returnredirect -message "Using site wide default" [export_vars -base "certificates" {user_id community_id certificate certifies_that attended description_label course_description community_name instructors signature_1 signature_2 signature_3 signature_4 signature_5 signature_6 continuting_ed_credit_info}]
     }
 
@@ -172,7 +178,9 @@
 
     if {$image_id ne ""} {
 	set image_cr_file_path [cr_fs_path][db_string get_path "select content from cr_revisions cr, cr_items ci where ci.item_id=:image_id and ci.live_revision=cr.revision_id" -default ""]
-	lappend vars image_cr_file_path $image_cr_file_path
+	if {[file exists $image_cr_file_path]} {
+	    lappend vars image_cr_file_path $image_cr_file_path
+	}
     }
 
     foreach i {1 2 3 4 5 6} {