srchub Commit Details

Date:

2014-12-29 21:38:22 (10 years 10 months ago)

Author:

Natalie Adams

Branch:

master

Commit:

3ccdcf666b6e1165a85140d9bc5b22350085827a

Parents:

660df0f5d54de187d679cd6d690573f50fb74ccb

Message:

Fixing the following issues:

Issue 88
Issue 87
Issue 86

Along with some slight fixes

Changes:

File differences

-80
81 81
82 82
83
84
85
86
87
88
89
83 90
84 91
85 92
+            $request->desc = $this->cleaned_data['desc'];␍␊
            $request->submitter = $this->user;␍␊
            $request->create();␍␊
␍␊
            $from_email = Pluf::f('from_email');␍␊
            $email = new Pluf_Mail($from_email, "",␍␊
                __('[Action Required] New Repo Request')); //send to no-one but admins will be BCCed␍␊
            $email->addTextMessage(sprintf("%s has requested a new repo with the name of %s - please login and approve or deny it", $this->user, $request->shortname));␍␊
            $email->sendMail();␍␊
␍␊
            return true;␍␊
        } catch (Exception $e)␍␊
        {␍␊
             $request->desc = $this->cleaned_data['desc'];␍␊
             $request->submitter = $this->user;␍␊
             $request->create();␍␊
+␍␊
+            $from_email = Pluf::f('from_email');␍␊
+            $email = new Pluf_Mail($from_email, "",␍␊
+                __('[Action Required] New Repo Request')); //send to no-one but admins will be BCCed␍␊
+            $email->addTextMessage(sprintf("%s has requested a new repo with the name of %s - please login and approve or deny it", $this->user, $request->shortname));␍␊
+            $email->sendMail();␍␊
+␍␊
             return true;␍␊
         } catch (Exception $e)␍␊
         {␍␊

-531
532 532
533 533
534
535
536
537
538
534 539
535 540
536 541
+                'model' => 'IDF_Views_Admin',␊
                'method' => 'projectRequestCreate');␊
␊
$ctl[] = array('regex' => '#^/admin/projects/rejectrequest/(\d+)/$#',␊
                'base' => $base,␊
                'model' => 'IDF_Views_Admin',␊
                'method' => 'projectRequestReject');␊
␊
$ctl[] = array('regex' => '#^/admin/projects/(\d+)/delete/$#',␊
               'base' => $base,␊
               'model' => 'IDF_Views_Admin',␊
                 'model' => 'IDF_Views_Admin',␊
                 'method' => 'projectRequestCreate');␊
 ␊
+$ctl[] = array('regex' => '#^/admin/projects/rejectrequest/(\d+)/$#',␊
+                'base' => $base,␊
+                'model' => 'IDF_Views_Admin',␊
+                'method' => 'projectRequestReject');␊
+␊
 $ctl[] = array('regex' => '#^/admin/projects/(\d+)/delete/$#',␊
                'base' => $base,␊
                'model' => 'IDF_Views_Admin',␊

-
2
3
4
5
6
7
8
9
10
+Hello {$user},␊
␊
You are receiving this email because you have requested a repository.␊
Unfortunately, your request for {$shortname|safe} was not approved!␊
␊
If you have any questions please feel free to email a member of the development team.␊
␊
Yours faithfully,␊
The development team.␊
␊
+Hello {$user},␊
+␊
+You are receiving this email because you have requested a repository.␊
+Unfortunately, your request for {$shortname|safe} was not approved!␊
+␊
+If you have any questions please feel free to email a member of the development team.␊
+␊
+Yours faithfully,␊
+The development team.␊
+␊

-5
6 6
7 7
8
9
8 10
9 11
10 12
+␍␊
If you have any questions please feel free to email a member of the development team.␍␊
␍␊
Happy hacking!␍␊
␍␊
Yours faithfully,␍␊
The development team.␍␊
␍␊
 ␍␊
 If you have any questions please feel free to email a member of the development team.␍␊
 ␍␊
+Happy hacking!␍␊
+␍␊
 Yours faithfully,␍␊
 The development team.␍␊
 ␍␊

-125
126 126
127 127
128
129
130
131
132
133
134
135
128 136
129 137
130 138
+                               'Date' => date(DATE_RFC2822),␊
                               'Subject' => $subject,␊
                               );␊
        if (Pluf::f('send_emails', true)) {␊
            $bccemails = [];␊
            foreach(Pluf::f("admins", array()) as $admin)␊
            {␊
                $bccemails[] = $admin[1];␊
            }␊
            $this->headers["BCC"] = implode(",", $bccemails);␊
        }␊
    }␊
␊
    /**␊
                                'Date' => date(DATE_RFC2822),␊
                                'Subject' => $subject,␊
                                );␊
+        if (Pluf::f('send_emails', true)) {␊
+            $bccemails = [];␊
+            foreach(Pluf::f("admins", array()) as $admin)␊
+            {␊
+                $bccemails[] = $admin[1];␊
+            }␊
+            $this->headers["BCC"] = implode(",", $bccemails);␊
+        }␊
     }␊
 ␊
     /**␊