Merge branch 'hotfix-2.0.x' into develop

Bump version to 3.0.0
SURFscz · Sep 19, 2017 · 667227d · 667227d
2 parents 43e7b39 + 4ac8d9d
commit 667227d
Show file tree

Hide file tree

Showing 715 changed files with 8,669 additions and 4,856 deletions.
diff --git a/...AvailablePlugin/LdapServiceTokenProvisioner/Model/CoLdapServiceTokenProvisionerTarget.php b/...AvailablePlugin/LdapServiceTokenProvisioner/Model/CoLdapServiceTokenProvisionerTarget.php
@@ -106,7 +106,7 @@ public function provision($coProvisioningTargetData, $op, $provisioningData) {
     $CoLdapProvisionerDn = ClassRegistry::init('LdapProvisioner.CoLdapProvisionerDn');
 
     $args = array();
-    $args['conditions']['CoLdapProvisionerDn.co_ldap_provisioner_target_id'] = $coProvisioningTargetData['CoLdapServiceTokenProvisionerTarget']['co_ldap_provisioner_target'];
+    $args['conditions']['CoLdapProvisionerDn.co_ldap_provisioner_target_id'] = $coProvisioningTargetData['CoLdapServiceTokenProvisionerTarget']['co_ldap_provisioner_target_id'];
     $args['conditions']['CoLdapProvisionerDn.co_person_id'] = $provisioningData['CoPerson']['id'];
     $args['fields'] = array('id', 'dn');
     $args['contain'] = false;
@@ -123,7 +123,7 @@ public function provision($coProvisioningTargetData, $op, $provisioningData) {
     $CoLdapProvisionerTarget = ClassRegistry::init('LdapProvisioner.CoLdapProvisionerTarget');
 
     $args = array();
-    $args['conditions']['CoLdapProvisionerTarget.id'] = $coProvisioningTargetData['CoLdapServiceTokenProvisionerTarget']['co_ldap_provisioner_target'];
+    $args['conditions']['CoLdapProvisionerTarget.id'] = $coProvisioningTargetData['CoLdapServiceTokenProvisionerTarget']['co_ldap_provisioner_target_id'];
     $args['contain'] = false;
 
     $ldapTarget = $CoLdapProvisionerTarget->find('first', $args);

diff --git a/app/AvailablePlugin/NetForumSource/Model/NetForumPro.php b/app/AvailablePlugin/NetForumSource/Model/NetForumPro.php
@@ -131,7 +131,7 @@ public function queryByName($searchKey) {
    * 
    * @since COmanage Registry v2.0.0
    * @param String  $searchKey   Search key (customer key)
-   * @return Array Array of OrgIdentity data
+   * @return SimpleXMLElement Object Unprocessed response from NetForum
    */
 
   public function queryForEvents($searchKey) {
@@ -141,7 +141,15 @@ public function queryForEvents($searchKey) {
       'szRecordDate' => ''
     );
 
-    return $this->queryNetForumPro('GetCustomerEvent', 'GetCustomerEventResult', $search);
+    return $this->queryNetForumPro('GetCustomerEvent',
+                                   'GetCustomerEventResult',
+                                   $search,
+                                   true,
+                                   false,
+                                   false,
+                                   false,
+                                   // We want to return the raw response so the caller can process it
+                                   false);
   }
 
   /**
@@ -155,6 +163,7 @@ public function queryForEvents($searchKey) {
    * @param Boolean $raw        If true, return raw (XML) record as well as formatted OrgIdentity data
    * @param Boolean $events     If true, query for events for matching customer keys (requires $raw, set to false if $callName is 'GetCustomerEvent')
    * @param Boolean $deep       If true, make an additional query on customer key to get more detailed record
+   * @param Boolean $process    If true, attempt to process the record into OrgIdentity format
    * @return Array Array of OrgIdentity data, and optionally raw (XML) data
    * @throws SoapFault
    */
@@ -165,7 +174,8 @@ protected function queryNetForumPro($callName,
                                       $active=true,
                                       $raw=false,
                                       $events=false,
-                                      $deep=false) {
+                                      $deep=false,
+                                      $process=true) {
     $results = array();
 
     $opts = array(
@@ -197,6 +207,10 @@ protected function queryNetForumPro($callName,
 
     $r = new SimpleXMLElement($sresponse->$resultName->any);
 
+    if(!$process) {
+      return $r;
+    }
+
     foreach($r->Result as $entry) {
       if($deep) {
         // If requested to go deep, we don't expect MemberStatus in the "abbreviated" result
@@ -226,8 +240,8 @@ protected function queryNetForumPro($callName,
               // Events are accessed via a separate call. Our typical use case will be to map events
               // to groups, so we'll make that separate call and then merge the results.
 
-              $eret = $this->queryForEvents($entry->cst_key);
-
+              $eret = $this->queryForEvents((string)$entry->cst_key);
+              
               if($eret) {
                 $exml = $entry->addChild('Events');
 

diff --git a/app/Config/VERSION b/app/Config/VERSION
@@ -1 +1 @@
-3.0.0
+3.0.0
diff --git a/app/Console/Command/UpgradeVersionShell.php b/app/Console/Command/UpgradeVersionShell.php
@@ -69,6 +69,7 @@ class UpgradeVersionShell extends AppShell {
     "1.0.7" => array('block' => false),
     "2.0.0" => array('block' => false, 'post' => 'post110'),
     "2.0.1" => array('block' => false),
+    "2.0.2" => array('block' => false),
     "3.0.0" => array('block' => false)
   );
 

diff --git a/app/Controller/HistoryRecordsController.php b/app/Controller/HistoryRecordsController.php
@@ -378,4 +378,22 @@ function isAuthorized() {
     $this->set('permissions', $p);
     return $p[$this->action];
   }
+
+  /**
+   * Redirect to 'index' view if orgidentityid and coid are defined, otherwise use default redirect.
+   *
+   * @since  COmanage Registry v2.0.2
+   */
+  function performRedirect() {
+    if (isset($this->request->params['named']['orgidentityid'], $this->cur_co['Co']['id'])) {
+      $redirectUrl = array(
+        'controller'    => Inflector::tableize($this->modelClass),
+        'action'        => 'index',
+        'orgidentityid' => filter_var($this->request->params['named']['orgidentityid'], FILTER_SANITIZE_SPECIAL_CHARS),
+        'co'            => filter_var($this->cur_co['Co']['id'], FILTER_SANITIZE_SPECIAL_CHARS));
+      $this->redirect($redirectUrl);
+    } else {
+      parent::performRedirect();
+    }
+  }
 }
diff --git a/app/Lib/lang.php b/app/Lib/lang.php
@@ -1153,6 +1153,7 @@
   'fd.key' =>         'Key',
   'fd.language' =>    'Language',
   'fd.lan.desc' =>    'Lowercase alphanumeric characters only',
+  'fd.lan.res.desc' => 'Lowercase alphanumeric characters only<br />Must not be a reserved word',
   'fd.link.location' => 'Link Location',  
   'fd.link.order' =>  'Link Order',
   'fd.link.title' =>  'Link Title',

diff --git a/lib/Cake/Cache/Cache.php b/lib/Cake/Cache/Cache.php
@@ -1,17 +1,17 @@
 <?php
 /**
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://cakephp.org CakePHP(tm) Project
  * @package       Cake.Cache
  * @since         CakePHP(tm) v 1.2.0.4933
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 
 App::uses('Inflector', 'Utility');

diff --git a/lib/Cake/Cache/CacheEngine.php b/lib/Cake/Cache/CacheEngine.php
@@ -1,17 +1,17 @@
 <?php
 /**
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://cakephp.org CakePHP(tm) Project
  * @package       Cake.Cache
  * @since         CakePHP(tm) v 1.2.0.4933
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 
 /**

diff --git a/lib/Cake/Cache/Engine/ApcEngine.php b/lib/Cake/Cache/Engine/ApcEngine.php
@@ -2,18 +2,18 @@
 /**
  * APC storage engine for cache.
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://cakephp.org CakePHP(tm) Project
  * @package       Cake.Cache.Engine
  * @since         CakePHP(tm) v 1.2.0.4933
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 
 /**

diff --git a/lib/Cake/Cache/Engine/FileEngine.php b/lib/Cake/Cache/Engine/FileEngine.php
@@ -6,17 +6,17 @@
  *
  * You can configure a FileEngine cache, using Cache::config()
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://cakephp.org CakePHP(tm) Project
  * @since         CakePHP(tm) v 1.2.0.4933
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 
 /**
@@ -267,6 +267,10 @@ protected function _clearDirectory($path, $now, $threshold) {
 		}
 
 		$dir = dir($path);
+		if ($dir === false) {
+			return;
+		}
+
 		while (($entry = $dir->read()) !== false) {
 			if (substr($entry, 0, $prefixLength) !== $this->settings['prefix']) {
 				continue;

diff --git a/lib/Cake/Cache/Engine/MemcacheEngine.php b/lib/Cake/Cache/Engine/MemcacheEngine.php
@@ -2,18 +2,18 @@
 /**
  * Memcache storage engine for cache
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://cakephp.org CakePHP(tm) Project
  * @package       Cake.Cache.Engine
  * @since         CakePHP(tm) v 1.2.0.4933
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 
 /**

diff --git a/lib/Cake/Cache/Engine/MemcachedEngine.php b/lib/Cake/Cache/Engine/MemcachedEngine.php
@@ -1,16 +1,16 @@
 <?php
 /**
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://cakephp.org CakePHP(tm) Project
  * @since         CakePHP(tm) v 2.5.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 
 /**

diff --git a/lib/Cake/Cache/Engine/RedisEngine.php b/lib/Cake/Cache/Engine/RedisEngine.php
@@ -2,18 +2,18 @@
 /**
  * Redis storage engine for cache
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://cakephp.org CakePHP(tm) Project
  * @package       Cake.Cache.Engine
  * @since         CakePHP(tm) v 2.2
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 
 /**

diff --git a/lib/Cake/Cache/Engine/WincacheEngine.php b/lib/Cake/Cache/Engine/WincacheEngine.php
@@ -4,18 +4,18 @@
  *
  * Supports wincache 1.1.0 and higher.
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://cakephp.org CakePHP(tm) Project
  * @package       Cake.Cache.Engine
  * @since         CakePHP(tm) v 1.2.0.4933
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 
 /**

diff --git a/lib/Cake/Cache/Engine/XcacheEngine.php b/lib/Cake/Cache/Engine/XcacheEngine.php
@@ -2,18 +2,18 @@
 /**
  * Xcache storage engine for cache.
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://cakephp.org CakePHP(tm) Project
  * @package       Cake.Cache.Engine
  * @since         CakePHP(tm) v 1.2.0.4947
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 
 /**

diff --git a/lib/Cake/Config/config.php b/lib/Cake/Config/config.php
@@ -2,18 +2,18 @@
 /**
  * Core Configurations.
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://cakephp.org CakePHP(tm) Project
  * @package       Cake.Config
  * @since         CakePHP(tm) v 1.1.11.4062
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 
 $versionFile = file(CAKE . 'VERSION.txt');