fix email

wrenchboard/src/shared_tool/email.cc

@@ -158,6 +158,10 @@ long cron_email(long mailtype, CVars in, CVars &out) {
 
     try {
 
+        CVars yr;
+        load_db_record(yr, "SELECT to_char(now(), 'yyyy') AS YYYY");
+        vars2form(yr, form);
+
         switch (mailtype) {
    
        
@@ -221,7 +225,8 @@ long cron_email(long mailtype, CVars in, CVars &out) {
                 break;
 
                 case WRB_CRONJOB_PENDOFFER_ALERT:
-                    vars2form(x, form);
+                    vars2form(x, form); // need to remove 
+                    vars2form(in, form);
                     form.LetStr("email", in["email"].c_str());
                     form.Email("REMINDER/offer_pending_reminder.mailfile");
                 break;

wrenchboard/src/shared_tool/site_crons.cc

@@ -149,7 +149,7 @@ if ( mode == 300 ){
 }
 
 const PGresult *res = pgsql_query("SELECT jo.id AS offer_id,jo.added,j.title,jo.expire,jo.email, jo.client_id, "
-                                    "jo.job_id,jo.reminder_count,jo.reminder_date "
+                                    "jo.job_id,jo.reminder_count,jo.reminder_date,jo.email AS firstname "
                                     "FROM members_jobs_offer jo "
                                     "LEFT JOIN members_jobs j ON j.id = jo.job_id "
                                     " %s LIMIT %lu ",extraQ, limit);