srchub-old

srchub-old Commit Details


Date:2013-07-27 19:17:00 (11 years 8 months ago)
Author:Natalie Adams
Branch:default
Commit:681ef31caf61
Parents: 3e122c7af4b4
Message:Fixing issue with indefero repo and removing registration key
Changes:
Mindefero/src/IDF/Form/Register.php (2 diffs)
Mindefero/src/IDF/Scm/Git.php (2 diffs)
Mindefero/src/IDF/templates/idf/register/index.html (1 diff)

File differences

indefero/src/IDF/Form/Register.php
5555
5656
5757
58
59
60
61
62
63
6458
6559
6660
......
7165
7266
7367
74
75
68
7669
7770
7871
                                            'help_text' => __('We will never send you any unsolicited emails. We hate spam too!'),␊
                                            ));␊
␊
␉$this->fields['regkey'] = new Pluf_Form_Field_Varchar(␊
                                      array('required' => true,␊
                                            'label' => __('Registration Key'),␊
                                            'initial' => '',␊
                                            'help_text' => __('Please enter the key given to you by adamsna[at]datanethost.net'),␊
                                            ));␊
␊
        $this->fields['terms'] = new Pluf_Form_Field_Boolean(␊
                                      array('required' => true,␊
␊
    public function clean_regkey()␊
    {␊
␉if ($this->cleaned_data['regkey'] != "2rv9o4nb5")␊
␉␉throw new Pluf_Form_Invalid("The regkey was incorrect - please contact Nathan for the key!");␊
␊
    }␊
␊
    /**␊
indefero/src/IDF/Scm/Git.php
7474
7575
7676
77
7778
7879
79
80
81
8082
8183
8284
......
8789
8890
8991
92
93
94
9095
91
96
97
98
99
100
101
102
103
104
92105
93106
94107
␊
        foreach ($out as $line) {␊
            $line = trim($line);␊
␊
            if ($line != '') {␊
                $action = $line[0];␊
␊
                #echo "line = " . $line . "\n";␊
                #echo "action = " . $action;␊
                if ($action == 'A') {␊
                    $filename = trim(substr($line, 1));␊
                    $return->additions[] = $filename;␊
                    $filename = trim(substr($line, 1));␊
                    $return->patches[] = $filename;␊
                } else if ($action == 'R') {␊
                    // This patch is needed because it seems␊
                    // that under a merge git may show a status␊
                    // of RC and not say the location of the original file␊
                    $matches = preg_split("/\t/", $line);␊
                    $return->renames[$matches[1]] = $matches[2];␊
                    if (count($matches) != 3)␊
                    {␊
                        $return->additions[] = $matches[1];␊
                    }␊
                    else␊
                    {␊
                        $return->renames[$matches[1]] = $matches[2];␊
                    }␊
␊
                } else if ($action == 'C') {␊
                    $matches = preg_split("/\t/", $line);␊
                    $return->copies[$matches[1]] = $matches[2];␊
indefero/src/IDF/templates/idf/register/index.html
1919
2020
2121
22
23
24
25
26
27
28
2922
3023
3124
</td>␊
</tr>␊
<tr>␊
<th><strong>{$form.f.regkey.labelTag}:</strong></th>␊
<td>{if $form.f.regkey.errors}{$form.f.regkey.fieldErrors}{/if}␊
{$form.f.regkey|unsafe}<br />␊
<span class="helptext">{$form.f.regkey.help_text}</span>␊
</td>␊
</tr>␊
<tr>␊
<th><strong>{$form.f.email.labelTag}:</strong></th>␊
<td>{if $form.f.email.errors}{$form.f.email.fieldErrors}{/if}␊
{$form.f.email|unsafe}<br />␊

Archive Download the corresponding diff file

Branches

Tags

Page rendered in 1.12028s using 14 queries.