Author: jfthomps
Date: Wed Jun 7 17:57:04 2017
New Revision: 1797980
URL: http://svn.apache.org/viewvc?rev=1797980&view=rev
Log:
VCL-1045 - Method of encrypting sensitive database entries
xmlrpcWrappers.php: modified XMLRPCcheckCryptSecrets: updated conditional that
adds multiple UNION SELECT's to $subquery so the 2nd condition is
count($secretids) > 1 instead of just else because $secretids could be empty at
this point (thanks Andy!)
Modified:
vcl/trunk/web/.ht-inc/xmlrpcWrappers.php
Modified: vcl/trunk/web/.ht-inc/xmlrpcWrappers.php
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/xmlrpcWrappers.php?rev=1797980&r1=1797979&r2=1797980&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/xmlrpcWrappers.php (original)
+++ vcl/trunk/web/.ht-inc/xmlrpcWrappers.php Wed Jun 7 17:57:04 2017
@@ -3821,7 +3821,7 @@ function XMLRPCcheckCryptSecrets($reserv
$subquery = "SELECT $secret1 AS id";
if(count($secretids) == 1)
$subquery .= " UNION SELECT {$secretids[0]}";
- else
+ elseif(count($secretids) > 1)
$subquery .= " UNION SELECT " . implode(' UNION SELECT ',
$secretids);
$query = "SELECT ck.id as cryptkeyid, "
. "ck.pubkey as cryptkey, "
