Author: jfthomps
Date: Mon May  1 17:11:38 2017
New Revision: 1793377

URL: http://svn.apache.org/viewvc?rev=1793377&view=rev
Log:
VCL-1029 - add a section for managing affiliations to Site Configuration

siteconfig.php: modified Affiliations::deleteValue: fixed bug where most of the 
stuff in the variable table was getting deleted when deleting an affiliation - 
backslashes needed another set of escaping

Modified:
    vcl/trunk/web/.ht-inc/siteconfig.php

Modified: vcl/trunk/web/.ht-inc/siteconfig.php
URL: 
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/siteconfig.php?rev=1793377&r1=1793376&r2=1793377&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/siteconfig.php (original)
+++ vcl/trunk/web/.ht-inc/siteconfig.php Mon May  1 17:11:38 2017
@@ -3008,25 +3008,25 @@ class Affiliations extends GlobalMultiVa
                doQuery($query);
                $query = "DELETE FROM affiliation WHERE id = $key";
                doQuery($query);
-               $query = "DELETE FROM variable WHERE name REGEXP 
'^usermessage\\|[^\\|]+\\|$affilname$'";
+               $query = "DELETE FROM variable WHERE name REGEXP 
'^usermessage\\\\|[^\\\\|]+\\\\|$affilname$'";
                doQuery($query);
-               $query = "DELETE FROM variable WHERE name REGEXP 
'^ignore_connections_gte\\|$affilname$'";
+               $query = "DELETE FROM variable WHERE name REGEXP 
'^ignore_connections_gte\\\\|$affilname$'";
                doQuery($query);
-               $query = "DELETE FROM variable WHERE name REGEXP 
'^acknowledgetimeout\\|$affilname$'";
+               $query = "DELETE FROM variable WHERE name REGEXP 
'^acknowledgetimeout\\\\|$affilname$'";
                doQuery($query);
-               $query = "DELETE FROM variable WHERE name REGEXP 
'^initialconnecttimeout\\|$affilname$'";
+               $query = "DELETE FROM variable WHERE name REGEXP 
'^initialconnecttimeout\\\\|$affilname$'";
                doQuery($query);
-               $query = "DELETE FROM variable WHERE name REGEXP 
'^reconnecttimeout\\|$affilname$'";
+               $query = "DELETE FROM variable WHERE name REGEXP 
'^reconnecttimeout\\\\|$affilname$'";
                doQuery($query);
-               $query = "DELETE FROM variable WHERE name REGEXP 
'^general_inuse_check\\|$affilname$'";
+               $query = "DELETE FROM variable WHERE name REGEXP 
'^general_inuse_check\\\\|$affilname$'";
                doQuery($query);
-               $query = "DELETE FROM variable WHERE name REGEXP 
'^server_inuse_check\\|$affilname$'";
+               $query = "DELETE FROM variable WHERE name REGEXP 
'^server_inuse_check\\\\|$affilname$'";
                doQuery($query);
-               $query = "DELETE FROM variable WHERE name REGEXP 
'^cluster_inuse_check\\|$affilname$'";
+               $query = "DELETE FROM variable WHERE name REGEXP 
'^cluster_inuse_check\\\\|$affilname$'";
                doQuery($query);
-               $query = "DELETE FROM variable WHERE name REGEXP 
'^general_end_notice_first\\|$affilname$'";
+               $query = "DELETE FROM variable WHERE name REGEXP 
'^general_end_notice_first\\\\|$affilname$'";
                doQuery($query);
-               $query = "DELETE FROM variable WHERE name REGEXP 
'^general_end_notice_second\\|$affilname$'";
+               $query = "DELETE FROM variable WHERE name REGEXP 
'^general_end_notice_second\\\\|$affilname$'";
                doQuery($query);
                return 1;
        }


Reply via email to