Merge pull request #4896 from totten/master-movedep

[civicrm-core.git] / CRM / Upgrade / Incremental / php / ThreeThree.php

diff --git a/CRM/Upgrade/Incremental/php/ThreeThree.php b/CRM/Upgrade/Incremental/php/ThreeThree.php
index 73776bb75fa6693d944f7505b16f286785dbd638..00fe0b9d30d48c89a14cfdf82a8a2b8f72f3db62 100644 (file)
--- a/CRM/Upgrade/Incremental/php/ThreeThree.php
+++ b/CRM/Upgrade/Incremental/php/ThreeThree.php
@@ -2,7 +2,7 @@
 
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -38,14 +38,14 @@ class CRM_Upgrade_Incremental_php_ThreeThree {
    *
    * @return bool
    */
-  function verifyPreDBstate(&$errors) {
+  public function verifyPreDBstate(&$errors) {
     return TRUE;
   }
 
   /**
    * @param $rev
    */
-  function upgrade_3_3_alpha1($rev) {
+  public function upgrade_3_3_alpha1($rev) {
     $config = CRM_Core_Config::singleton();
     if ($config->userSystem->is_drupal) {
       // CRM-6426 - make civicrm profiles permissioned on drupal my account
@@ -67,7 +67,8 @@ class CRM_Upgrade_Incremental_php_ThreeThree {
     while ($customField->fetch()) {
       $name = CRM_Utils_String::munge($customField->label, '_', 64);
       $fldCnt = CRM_Core_DAO::singleValueQuery($customFldCntQuery,
-        array(1 => array($name, 'String'),
+        array(
+          1 => array($name, 'String'),
           2 => array($customField->id, 'Integer'),
         ), TRUE, FALSE
       );
@@ -79,7 +80,8 @@ Update `civicrm_custom_field`
 SET `name` = %1
 WHERE id = %2
 ";
-      $customFieldParams = array(1 => array($name, 'String'),
+      $customFieldParams = array(
+        1 => array($name, 'String'),
         2 => array($customField->id, 'Integer'),
       );
       CRM_Core_DAO::executeQuery($customFieldQuery, $customFieldParams, TRUE, NULL, FALSE, FALSE);
@@ -94,7 +96,8 @@ WHERE id = %2
     while ($customGroup->fetch()) {
       $name = CRM_Utils_String::munge($customGroup->title, '_', 64);
       $grpCnt = CRM_Core_DAO::singleValueQuery($customGrpCntQuery,
-        array(1 => array($name, 'String'),
+        array(
+          1 => array($name, 'String'),
           2 => array($customGroup->id, 'Integer'),
         )
       );
@@ -113,7 +116,8 @@ WHERE id = %2
     while ($ufGroup->fetch()) {
       $name = CRM_Utils_String::munge($ufGroup->title, '_', 64);
       $ufGrpCnt = CRM_Core_DAO::singleValueQuery($ufGrpCntQuery,
-        array(1 => array($name, 'String'),
+        array(
+          1 => array($name, 'String'),
           2 => array($ufGroup->id, 'Integer'),
         )
       );
@@ -137,7 +141,7 @@ WHERE id = %2
   /**
    * @param $rev
    */
-  function upgrade_3_3_beta1($rev) {
+  public function upgrade_3_3_beta1($rev) {
     $upgrade = new CRM_Upgrade_Form();
     $upgrade->processSQL($rev);
 
@@ -148,7 +152,6 @@ WHERE id = %2
     $updateLineItem1 = "ALTER TABLE civicrm_line_item ADD COLUMN price_field_value_id int(10) unsigned default NULL;";
     CRM_Core_DAO::executeQuery($updateLineItem1);
 
-
     $priceFieldDAO = new CRM_Price_DAO_PriceField();
     $priceFieldDAO->find();
     $ids = array();
@@ -217,7 +220,8 @@ WHERE id = %2
         // update civicrm_line_item for price_field_value_id.
         // Used query to avoid line by line update.
         if ($labelFound || $priceFound) {
-          $lineItemParams = array(1 => array($fieldValueDAO->id, 'Integer'),
+          $lineItemParams = array(
+            1 => array($fieldValueDAO->id, 'Integer'),
             2 => array($opValueDAO->label, 'String'),
           );
           $updateLineItems = "UPDATE civicrm_line_item SET price_field_value_id = %1 WHERE label = %2";
@@ -254,15 +258,17 @@ WHERE id = %2
   /**
    * @param $rev
    */
-  function upgrade_3_3_beta3($rev) {
+  public function upgrade_3_3_beta3($rev) {
     // get the duplicate Ids of line item entries
     $dupeLineItemIds = array();
-    $fields          = array('entity_table', 'entity_id', 'price_field_id', 'price_field_value_id');
-    $mainLineItem    = new CRM_Price_BAO_LineItem();
+    $fields = array('entity_table', 'entity_id', 'price_field_id', 'price_field_value_id');
+    $mainLineItem = new CRM_Price_BAO_LineItem();
     $mainLineItem->find(TRUE);
     while ($mainLineItem->fetch()) {
       $dupeLineItem = new CRM_Price_BAO_LineItem();
-      foreach ($fields as $fld) $dupeLineItem->$fld = $mainLineItem->$fld;
+      foreach ($fields as $fld) {
+        $dupeLineItem->$fld = $mainLineItem->$fld;
+      }
       $dupeLineItem->find(TRUE);
       $dupeLineItem->addWhere("id != $mainLineItem->id");
       while ($dupeLineItem->fetch()) {
@@ -285,15 +291,14 @@ WHERE id = %2
   /**
    * @param $rev
    */
-  function upgrade_3_3_0($rev) {
+  public function upgrade_3_3_0($rev) {
     $upgrade = new CRM_Upgrade_Form();
     $upgrade->processSQL($rev);
 
     //CRM-7123 -lets activate needful languages.
     $config = CRM_Core_Config::singleton();
     $locales = array();
-    if (is_dir($config->gettextResourceDir)) {
-      $dir = opendir($config->gettextResourceDir);
+    if (is_dir($config->gettextResourceDir) && $dir = opendir($config->gettextResourceDir)) {
       while ($filename = readdir($dir)) {
         if (preg_match('/^[a-z][a-z]_[A-Z][A-Z]$/', $filename)) {
           $locales[$filename] = $filename;
@@ -325,7 +330,7 @@ INNER JOIN  civicrm_option_group grp ON ( grp.id = val.option_group_id )
   /**
    * @param $rev
    */
-  function upgrade_3_3_2($rev) {
+  public function upgrade_3_3_2($rev) {
     $dropMailingIndex = FALSE;
     $indexes = CRM_Core_DAO::executeQuery('SHOW INDEXES FROM civicrm_mailing_job');
     while ($indexes->fetch()) {
@@ -357,8 +362,15 @@ INNER JOIN  civicrm_option_group grp ON ( grp.id = val.option_group_id )
     if (CRM_Mailing_Info::workflowEnabled()) {
       $config = CRM_Core_Config::singleton();
       if (is_callable(array(
-        $config->userSystem, 'replacePermission'))) {
-        $config->userSystem->replacePermission('access CiviMail', array('access CiviMail', 'create mailings', 'approve mailings', 'schedule mailings'));
+        $config->userSystem,
+        'replacePermission'
+      ))) {
+        $config->userSystem->replacePermission('access CiviMail', array(
+            'access CiviMail',
+            'create mailings',
+            'approve mailings',
+            'schedule mailings'
+          ));
       }
     }
 
@@ -370,7 +382,7 @@ INNER JOIN  civicrm_option_group grp ON ( grp.id = val.option_group_id )
   /**
    * @param $rev
    */
-  function upgrade_3_3_7($rev) {
+  public function upgrade_3_3_7($rev) {
     $dao = new CRM_Contact_DAO_Contact();
     $dbName = $dao->_database;
 
@@ -406,4 +418,3 @@ INNER JOIN  civicrm_option_group grp ON ( grp.id = val.option_group_id )
     $upgrade->processSQL($rev);
   }
 }
-