natalie/srchub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing issue with indefero repo and removing registration key

Browse Source
This commit is contained in:
Nathan Adams 2013-07-27 19:17:56 -05:00
parent 42a3fd82bb
commit ef58d4135f
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indefero/src/IDF/Form/Register.php
View File

@ -55,12 +55,6 @@ class IDF_Form_Register extends Pluf_Form
'help_text' => __('We will never send you any unsolicited emails. We hate spam too!'), '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( $this->fields['terms'] = new Pluf_Form_Field_Boolean(
array('required' => true, array('required' => true,
@ -71,8 +65,7 @@ class IDF_Form_Register extends Pluf_Form
public function clean_regkey() 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!");
} }
/** /**

17
indefero/src/IDF/Scm/Git.php
View File

@ -74,9 +74,11 @@ class IDF_Scm_Git extends IDF_Scm
foreach ($out as $line) { foreach ($out as $line) {
$line = trim($line); $line = trim($line);
if ($line != '') { if ($line != '') {
$action = $line[0]; $action = $line[0];
#echo "line = " . $line . "\n";
#echo "action = " . $action;
if ($action == 'A') { if ($action == 'A') {
$filename = trim(substr($line, 1)); $filename = trim(substr($line, 1));
$return->additions[] = $filename; $return->additions[] = $filename;
@ -87,8 +89,19 @@ class IDF_Scm_Git extends IDF_Scm
$filename = trim(substr($line, 1)); $filename = trim(substr($line, 1));
$return->patches[] = $filename; $return->patches[] = $filename;
} else if ($action == 'R') { } 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); $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') { } else if ($action == 'C') {
$matches = preg_split("/\t/", $line); $matches = preg_split("/\t/", $line);
$return->copies[$matches[1]] = $matches[2]; $return->copies[$matches[1]] = $matches[2];

7
indefero/src/IDF/templates/idf/register/index.html
View File

@ -19,13 +19,6 @@
</td> </td>
</tr> </tr>
<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> <th><strong>{$form.f.email.labelTag}:</strong></th>
<td>{if $form.f.email.errors}{$form.f.email.fieldErrors}{/if} <td>{if $form.f.email.errors}{$form.f.email.fieldErrors}{/if}
{$form.f.email|unsafe}<br /> {$form.f.email|unsafe}<br />