diff options
| author | Michael Tänzer <neo@nhng.de> | 2011-11-20 01:31:19 +0100 |
|---|---|---|
| committer | Michael Tänzer <neo@nhng.de> | 2011-11-20 01:31:19 +0100 |
| commit | d933011668c5731b82c23a2ae8272a9488f5640c (patch) | |
| tree | 3e36200a325501ce26fb1ef93a195cf6e6621937 | |
| parent | 4942782d3a52b8a067a63af5767425f6f022f83e (diff) | |
| parent | fba0e788405dc3aa4a27bdad228d3568e8faf214 (diff) | |
| download | cacert-devel-d933011668c5731b82c23a2ae8272a9488f5640c.tar.gz cacert-devel-d933011668c5731b82c23a2ae8272a9488f5640c.tar.xz cacert-devel-d933011668c5731b82c23a2ae8272a9488f5640c.zip | |
Merge branch 'bug-966' into release
| -rw-r--r-- | includes/account.php | 8 | ||||
| -rw-r--r-- | pages/account/16.php | 2 | ||||
| -rw-r--r-- | pages/account/30.php | 2 | ||||
| -rw-r--r-- | pages/account/31.php | 2 | ||||
| -rw-r--r-- | pages/account/34.php | 2 |
5 files changed, 11 insertions, 5 deletions
diff --git a/includes/account.php b/includes/account.php index 24c61d8..55c9f7a 100644 --- a/includes/account.php +++ b/includes/account.php @@ -35,6 +35,12 @@ exit; } + if ($process == _("Cancel")) + { + // General reset CANCEL process requests + $process = ""; + } + if($id == 45 || $id == 46 || $oldid == 45 || $oldid == 46) { @@ -2198,7 +2204,7 @@ $orgid = 0; } - if($oldid == 31 && $process != _("Cancel")) + if($oldid == 31 && $process != "") { $query = "select * from `orgdomains` where `orgid`='".intval($_SESSION['_config']['orgid'])."'"; $dres = mysql_query($query); diff --git a/pages/account/16.php b/pages/account/16.php index 3e582e3..514ecfd 100644 --- a/pages/account/16.php +++ b/pages/account/16.php @@ -57,7 +57,7 @@ </tr> <? } ?> <tr> - <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Another Email")?>"> + <td class="DataTD" colspan="2"><input type="submit" name="add_email" value="<?=_("Another Email")?>"> <input type="submit" name="process" value="<?=_("Next")?>"></td> </tr> </table> diff --git a/pages/account/30.php b/pages/account/30.php index 30c86f3..33eeca8 100644 --- a/pages/account/30.php +++ b/pages/account/30.php @@ -34,7 +34,7 @@ <td class="DataTD" colspan="2"><? printf(_("Are you really sure you want to remove %s and all certificates issued under this domain?"), sanitizeHTML($row['domain'])); ?></td> </tr> <tr> - <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Cancel")?>"> + <td class="DataTD" colspan="2"><input type="submit" name="cancel" value="<?=_("Cancel")?>"> <input type="submit" name="process" value="<?=_("Delete")?>"></td> </tr> </table> diff --git a/pages/account/31.php b/pages/account/31.php index d91a77a..9f3d27e 100644 --- a/pages/account/31.php +++ b/pages/account/31.php @@ -29,7 +29,7 @@ <td class="DataTD" colspan="2"><? printf(_("Are you really sure you want to remove %s and all certificates issued under this organisation?"), sanitizeHTML($org['O'])); ?></td> </tr> <tr> - <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Cancel")?>"> + <td class="DataTD" colspan="2"><input type="submit" name="cancel" value="<?=_("Cancel")?>"> <input type="submit" name="process" value="<?=_("Delete")?>"></td> </tr> </table> diff --git a/pages/account/34.php b/pages/account/34.php index 25ad1db..b11bc7d 100644 --- a/pages/account/34.php +++ b/pages/account/34.php @@ -35,7 +35,7 @@ <td class="DataTD" colspan="2"><? printf(_("Are you really sure you want to remove %s from administering this organisation?"), sanitizeHTML($user['fname'])." ".sanitizeHTML($user['lname'])); ?></td> </tr> <tr> - <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Cancel")?>"> + <td class="DataTD" colspan="2"><input type="submit" name="cancel" value="<?=_("Cancel")?>"> <input type="submit" name="process" value="<?=_("Delete")?>"></td> </tr> </table> |