phpcs fixes - pre-existing issues

diff --git a/templates/CRM/common/civicrm.settings.php.template b/templates/CRM/common/civicrm.settings.php.template
index 0a4a01a4c4fe996996aa5193a404b0790e437dff..cd7825a6907ad9b33edfb58e462ae99ee1ebb4a7 100644 (file)
--- a/templates/CRM/common/civicrm.settings.php.template
+++ b/templates/CRM/common/civicrm.settings.php.template
@@ -38,20 +38,20 @@
  *      define( 'CIVICRM_UF'        , 'Drupal' );
  *
  * Settings for Drupal 6.x:
- *      define( 'CIVICRM_UF'        , 'Drupal6' );
+ *      define( 'CIVICRM_UF'        , 'Drupal6');
  *
  * Settings for Joomla 1.7.x - 2.5.x:
- *      define( 'CIVICRM_UF'        , 'Joomla' );
+ *      define( 'CIVICRM_UF'        , 'Joomla');
  *
  * Settings for WordPress 3.3.x:
- *      define( 'CIVICRM_UF'        , 'WordPress' );
+ *      define( 'CIVICRM_UF'        , 'WordPress');
  *
  * You may have issues with images in CiviCRM. If this is the case, be sure
  * to update the CiviCRM Resource URL field to your CiviCRM root directory
  * (Administer::System Settings::Resource URLs).
  */
 if (!defined('CIVICRM_UF')) {
-  define( 'CIVICRM_UF'               , '%%cms%%'        );
+  define( 'CIVICRM_UF', '%%cms%%');
 }
 
 /**
@@ -62,7 +62,7 @@ if (!defined('CIVICRM_UF')) {
  *      define( 'CIVICRM_UF_DSN', 'mysql://cms_db_username:cms_db_password@db_server/cms_database?new_link=true');
  */
 if (!defined('CIVICRM_UF_DSN')) {
-  define( 'CIVICRM_UF_DSN'           , 'mysql://%%CMSdbUser%%:%%CMSdbPass%%@%%CMSdbHost%%/%%CMSdbName%%?new_link=true' );
+  define( 'CIVICRM_UF_DSN'           , 'mysql://%%CMSdbUser%%:%%CMSdbPass%%@%%CMSdbHost%%/%%CMSdbName%%?new_link=true');
 }
 
 /**
@@ -76,16 +76,16 @@ if (!defined('CIVICRM_UF_DSN')) {
  *
  * EXAMPLE: Drupal and CiviCRM running in the same database...
  *      DB Name = drupal, DB User = drupal
- *      define( 'CIVICRM_DSN'         , 'mysql://drupal:YOUR_PASSWORD@localhost/drupal?new_link=true' );
+ *      define( 'CIVICRM_DSN'         , 'mysql://drupal:YOUR_PASSWORD@localhost/drupal?new_link=true');
  *
  * EXAMPLE: Drupal and CiviCRM running in separate databases...
  *      Drupal  DB Name = drupal, DB User = drupal
  *      CiviCRM DB Name = civicrm, CiviCRM DB User = civicrm
- *      define( 'CIVICRM_DSN'         , 'mysql://civicrm:YOUR_PASSWORD@localhost/civicrm?new_link=true' );
+ *      define( 'CIVICRM_DSN'         , 'mysql://civicrm:YOUR_PASSWORD@localhost/civicrm?new_link=true');
  *
  */
 if (!defined('CIVICRM_DSN')) {
-  define( 'CIVICRM_DSN'          , 'mysql://%%dbUser%%:%%dbPass%%@%%dbHost%%/%%dbName%%?new_link=true' );
+  define( 'CIVICRM_DSN'          , 'mysql://%%dbUser%%:%%dbPass%%@%%dbHost%%/%%dbName%%?new_link=true');
 }
 
 /**
@@ -118,7 +118,7 @@ if (!defined('CIVICRM_LOGGING_DSN')) {
  *      $civicrm_root = '/var/www/htdocs/drupal/sites/all/modules/civicrm/';
  *
  * the CIVICRM_TEMPLATE_COMPILEDIR would be:
- *      define( 'CIVICRM_TEMPLATE_COMPILEDIR', '/var/www/htdocs/drupal/sites/default/files/civicrm/templates_c/' );
+ *      define( 'CIVICRM_TEMPLATE_COMPILEDIR', '/var/www/htdocs/drupal/sites/default/files/civicrm/templates_c/');
  *
  * EXAMPLE - Joomla Installations:
  * If the path to the Joomla home directory is /var/www/htdocs/joomla
@@ -126,7 +126,7 @@ if (!defined('CIVICRM_LOGGING_DSN')) {
  *      $civicrm_root = '/var/www/htdocs/joomla/administrator/components/com_civicrm/civicrm/';
  *
  * the CIVICRM_TEMPLATE_COMPILEDIR would be:
- *      define( 'CIVICRM_TEMPLATE_COMPILEDIR', '/var/www/htdocs/joomla/media/civicrm/templates_c/' );
+ *      define( 'CIVICRM_TEMPLATE_COMPILEDIR', '/var/www/htdocs/joomla/media/civicrm/templates_c/');
  *
  * EXAMPLE - WordPress Installations:
  * If the path to the WordPress home directory is /var/www/htdocs/wordpress
@@ -134,7 +134,7 @@ if (!defined('CIVICRM_LOGGING_DSN')) {
  *      $civicrm_root = '/var/www/htdocs/wordpress/wp-content/plugins/civicrm/civicrm/';
  *
  * the CIVICRM_TEMPLATE_COMPILEDIR would be:
- *      define( 'CIVICRM_TEMPLATE_COMPILEDIR', '/var/www/htdocs/wordpress/wp-content/plugins/files/civicrm/templates_c/' );
+ *      define( 'CIVICRM_TEMPLATE_COMPILEDIR', '/var/www/htdocs/wordpress/wp-content/plugins/files/civicrm/templates_c/');
  *
  */
 
@@ -142,7 +142,7 @@ global $civicrm_root;
 
 $civicrm_root = '%%crmRoot%%';
 if (!defined('CIVICRM_TEMPLATE_COMPILEDIR')) {
-  define( 'CIVICRM_TEMPLATE_COMPILEDIR', '%%templateCompileDir%%' );
+  define( 'CIVICRM_TEMPLATE_COMPILEDIR', '%%templateCompileDir%%');
 }
 
 /**
@@ -158,20 +158,20 @@ if (!defined('CIVICRM_TEMPLATE_COMPILEDIR')) {
  * these variables would be set as below. Modify as needed for your install.
  *
  * CIVICRM_UF_BASEURL - home URL for your site:
- *      define( 'CIVICRM_UF_BASEURL' , 'http://www.example.com/drupal/' );
+ *      define( 'CIVICRM_UF_BASEURL' , 'http://www.example.com/drupal/');
  *
  * EXAMPLE - Joomla Installations:
  * If your site's home url is http://www.example.com/joomla/
  *
  * CIVICRM_UF_BASEURL - home URL for your site:
  * Administration site:
- *      define( 'CIVICRM_UF_BASEURL' , 'http://www.example.com/joomla/administrator/' );
+ *      define( 'CIVICRM_UF_BASEURL' , 'http://www.example.com/joomla/administrator/');
  * Front-end site:
- *      define( 'CIVICRM_UF_BASEURL' , 'http://www.example.com/joomla/' );
+ *      define( 'CIVICRM_UF_BASEURL' , 'http://www.example.com/joomla/');
  *
  */
 if (!defined('CIVICRM_UF_BASEURL')) {
-  define( 'CIVICRM_UF_BASEURL'      , '%%baseURL%%' );
+  define( 'CIVICRM_UF_BASEURL'      , '%%baseURL%%');
 }
 
 /**
@@ -229,7 +229,7 @@ if (!defined('CIVICRM_UF_BASEURL')) {
  * More info at http://wiki.civicrm.org/confluence/display/CRMDOC/Command-line+Script+Configuration
  */
 if (!defined('CIVICRM_SITE_KEY')) {
-  define( 'CIVICRM_SITE_KEY', '%%siteKey%%' );
+  define( 'CIVICRM_SITE_KEY', '%%siteKey%%');
 }
 
 /**
@@ -248,12 +248,12 @@ if (!defined('CIVICRM_MAIL_SMARTY')) {
  * You must disable CIVICRM_MAIL_LOG before CiviCRM will talk to your MTA.
  */
 // if (!defined('CIVICRM_MAIL_LOG')) {
-// define( 'CIVICRM_MAIL_LOG', '%%templateCompileDir%%/mail.log' );
+// define( 'CIVICRM_MAIL_LOG', '%%templateCompileDir%%/mail.log');
 // }
 
 
 if (!defined('CIVICRM_DOMAIN_ID')) {
-  define( 'CIVICRM_DOMAIN_ID'      , 1 );
+  define( 'CIVICRM_DOMAIN_ID', 1);
 }
 
 /**
@@ -280,7 +280,7 @@ if (!defined('CIVICRM_DOMAIN_ID')) {
  *
  */
 if (!defined('CIVICRM_DB_CACHE_CLASS')) {
-  define( 'CIVICRM_DB_CACHE_CLASS', 'ArrayCache' );
+  define('CIVICRM_DB_CACHE_CLASS', 'ArrayCache');
 }
 
 /**
@@ -288,14 +288,14 @@ if (!defined('CIVICRM_DB_CACHE_CLASS')) {
  * same machine (Unix).
  */
 if (!defined('CIVICRM_DB_CACHE_HOST')) {
-  define( 'CIVICRM_DB_CACHE_HOST', 'localhost' );
+  define('CIVICRM_DB_CACHE_HOST', 'localhost');
 }
 
 /**
  * Change this if you are not using the standard port for memcache or apccache (11211)
  */
 if (!defined('CIVICRM_DB_CACHE_PORT')) {
-  define( 'CIVICRM_DB_CACHE_PORT', 11211 );
+  define('CIVICRM_DB_CACHE_PORT', 11211 );
 }
 
 /**
@@ -303,7 +303,7 @@ if (!defined('CIVICRM_DB_CACHE_PORT')) {
  * Default value is 3600 (i.e., after an hour)
  */
 if (!defined('CIVICRM_DB_CACHE_TIMEOUT')) {
-  define( 'CIVICRM_DB_CACHE_TIMEOUT', 3600 );
+  define('CIVICRM_DB_CACHE_TIMEOUT', 3600 );
 }
 
 /**
@@ -315,7 +315,7 @@ if (!defined('CIVICRM_DB_CACHE_TIMEOUT')) {
  * 'server2_' for the second server.
  */
 if (!defined('CIVICRM_MEMCACHE_PREFIX')) {
-  define( 'CIVICRM_MEMCACHE_PREFIX', '' );
+  define('CIVICRM_MEMCACHE_PREFIX', '');
 }
 
 /**
@@ -353,7 +353,7 @@ if (!defined('CIVICRM_MEMCACHE_PREFIX')) {
  * to FALSE; for SVN checkouts, it defaults to TRUE.
  */
 // if (!defined('CIVICRM_MYSQL_STRICT')) {
-// define( 'CIVICRM_MYSQL_STRICT', TRUE );
+// define('CIVICRM_MYSQL_STRICT', TRUE );
 // }
 
 /**
@@ -372,10 +372,11 @@ if ( set_include_path( $include_path ) === false ) {
 }
 
 if (!defined('CIVICRM_CLEANURL')) {
-  if ( function_exists( 'variable_get' ) && variable_get('clean_url', '0') != '0' ) {
-    define( 'CIVICRM_CLEANURL', 1 );
-  } else {
-    define( 'CIVICRM_CLEANURL', 0 );
+  if ( function_exists('variable_get') && variable_get('clean_url', '0') != '0') {
+    define('CIVICRM_CLEANURL', 1 );
+  }
+  else {
+    define('CIVICRM_CLEANURL', 0);
   }
 }