diff options
| author | Michael Tänzer <neo@nhng.de> | 2013-11-20 13:56:24 +0100 |
|---|---|---|
| committer | Michael Tänzer <neo@nhng.de> | 2013-11-20 13:56:24 +0100 |
| commit | fcad1f4ad86a5aa5c3a73e1aa6ef4c0349678cbd (patch) | |
| tree | 5d91deb5177d362f675b468810e0eca894b72135 /includes | |
| parent | 2d0ac083b13979fedd6384b62bd0991d1fcb4d43 (diff) | |
| parent | 8fea7a3007d7062148ce8af0e0793ce8e2db778e (diff) | |
| download | cacert-devel-fcad1f4ad86a5aa5c3a73e1aa6ef4c0349678cbd.tar.gz cacert-devel-fcad1f4ad86a5aa5c3a73e1aa6ef4c0349678cbd.tar.xz cacert-devel-fcad1f4ad86a5aa5c3a73e1aa6ef4c0349678cbd.zip | |
Merge branch 'bug-1010' into release
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/account.php | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/includes/account.php b/includes/account.php index 2addca1..f28cf49 100644 --- a/includes/account.php +++ b/includes/account.php @@ -1540,6 +1540,7 @@ $query = "insert into `orgemailcerts` set `CN`='$defaultemail', + `ou`='".$_SESSION['_config']['OU']."', `keytype`='NS', `orgid`='".$org['orgid']."', `created`=FROM_UNIXTIME(UNIX_TIMESTAMP()), @@ -1630,6 +1631,7 @@ $query = "insert into `orgemailcerts` set `CN`='$defaultemail', + `ou`='".$_SESSION['_config']['OU']."', `keytype`='" . sanitizeHTML($_REQUEST['keytype']) . "', `orgid`='".$org['orgid']."', `created`=FROM_UNIXTIME(UNIX_TIMESTAMP()), @@ -1705,6 +1707,7 @@ $query = "insert into `orgemailcerts` set `orgid`='".$row['orgid']."', `CN`='".$row['CN']."', + `ou`='".$row['ou']."', `subject`='".$row['subject']."', `keytype`='".$row['keytype']."', `csr_name`='".$row['csr_name']."', @@ -1821,6 +1824,21 @@ exit; } + if($oldid == 18 && array_key_exists('filter',$_REQUEST) && $_REQUEST['filter']!= "") + { + $id=18; + $_SESSION['_config']['orgfilterid']=$_REQUEST['orgfilterid']; + $_SESSION['_config']['sorting']=$_REQUEST['sorting']; + $_SESSION['_config']['status']=$_REQUEST['status']; + } + + if($oldid == 18 && array_key_exists('reset',$_REQUEST) && $_REQUEST['reset']!= "") + { + $id=18; + $_SESSION['_config']['orgfilterid']=0; + $_SESSION['_config']['sorting']=0; + $_SESSION['_config']['status']=0; + } if($process != "" && $oldid == 20) { @@ -2177,6 +2195,22 @@ exit; } + if($oldid == 22 && array_key_exists('filter',$_REQUEST) && $_REQUEST['filter']!= "") + { + $id=22; + $_SESSION['_config']['dorgfilterid']=$_REQUEST['dorgfilterid']; + $_SESSION['_config']['dsorting']=$_REQUEST['dsorting']; + $_SESSION['_config']['dstatus']=$_REQUEST['dstatus']; + } + + if($oldid == 22 && array_key_exists('reset',$_REQUEST) && $_REQUEST['reset']!= "") + { + $id=22; + $_SESSION['_config']['dorgfilterid']=0; + $_SESSION['_config']['dsorting']=0; + $_SESSION['_config']['dstatus']=0; + } + if(($id == 24 || $oldid == 24 || $id == 25 || $oldid == 25 || $id == 26 || $oldid == 26 || $id == 27 || $oldid == 27 || $id == 28 || $oldid == 28 || $id == 29 || $oldid == 29 || |