Add a layer of indirection around array_merge. kt_array_merge will use

array_merge directly on PHP4, but convert each parameter to an array when on PHP5. git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5173 c91229c3-7414-0410-bfa2-8a42b809f60b

Add a layer of indirection around array_merge. kt_array_merge will use
array_merge directly on PHP4, but convert each parameter to an array when on PHP5. git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5173 c91229c3-7414-0410-bfa2-8a42b809f60b
Neil Blakey-Milner
1 parent 700765ca
Showing 23 changed files with 68 additions and 43 deletions
lib/actions/documentaction.inc.php
lib/actions/folderaction.inc.php
lib/browse/Criteria.inc
lib/browse/PartialQuery.inc.php
lib/browse/browseutil.inc.php
lib/config/config.inc.php
lib/database/dbutil.inc
lib/documentmanagement/documentutil.inc.php
lib/foldermanagement/folderutil.inc.php
lib/groups/GroupUtil.php
lib/help/help.inc.php
lib/metadata/metadatautil.inc.php
lib/permissions/permissiondescriptor.inc.php
lib/permissions/permissionutil.inc.php
lib/search/searchutil.inc.php
lib/subscriptions/SubscriptionManager.inc
lib/subscriptions/subscriptions.inc.php
lib/util/ktutil.inc
lib/workflow/workflowutil.inc.php
plugins/ktcore/KTPermissions.php
@@ -141,7 +141,7 @@ class KTDocumentAction extends KTStandardDispatcher {
             "documentaction" => "viewDocument",
             "folderaction" => "browse",
         );
-        $this->aBreadcrumbs = array_merge($this->aBreadcrumbs,
+        $this->aBreadcrumbs = kt_array_merge($this->aBreadcrumbs,
             KTBrowseUtil::breadcrumbsForDocument($this->oDocument, $aOptions));
 	    $actions = KTDocumentActionUtil::getDocumentActionsForDocument($this->oDocument, $this->oUser);
@@ -136,7 +136,7 @@ class KTFolderAction extends KTStandardDispatcher {
             "documentaction" => "viewDocument",
             "folderaction" => "browse",
         );
-        $this->aBreadcrumbs = array_merge($this->aBreadcrumbs,
+        $this->aBreadcrumbs = kt_array_merge($this->aBreadcrumbs,
             KTBrowseUtil::breadcrumbsForFolder($this->oFolder, $aOptions));
         $portlet = new KTActionPortlet(_kt("Folder Actions"));
@@ -448,7 +448,7 @@ class GenericMetadataCriterion extends BrowseCriterion {
     function searchSQL ($aRequest) {
         $p = parent::searchSQL($aRequest);
         $p[0] = join(' AND ', array($p[0], "$this->sSearchTable.document_field_id = ?"));
-        $p[1] = array_merge($p[1], array($this->iID));
+        $p[1] = kt_array_merge($p[1], array($this->iID));
         return $p;
     }
@@ -717,7 +717,7 @@ class Criteria {
         }
         $aQuery = array("SELECT id FROM $default->document_fields_table", array()); /*ok*/
         $aIDs = DBUtil::getResultArrayKey($aQuery, 'id');
-        $aAllCriteriaIDs = array_merge(array_keys($aBaseCriteria), $aIDs);
+        $aAllCriteriaIDs = kt_array_merge(array_keys($aBaseCriteria), $aIDs);
         foreach ($aAllCriteriaIDs as $iID) {
             $oCriterion =& Criteria::getCriterionByNumber($iID);
             $aAllCriteria[$iID] =& $oCriterion;
@@ -126,8 +126,8 @@ class BrowseQuery extends PartialQuery{
                 KTUtil::getTableName("document_content_version"),
                 $this->sDocumentJoinClause, $sPermissionJoin, $sWhere);
         $aParams = array();
-        $aParams = array_merge($aParams, $this->aDocumentJoinParams);
-        $aParams = array_merge($aParams, $aPermissionParams);
+        $aParams = kt_array_merge($aParams, $this->aDocumentJoinParams);
+        $aParams = kt_array_merge($aParams, $aPermissionParams);
         $aParams[] = $this->folder_id;
         return array($sQuery, $aParams);
     }
@@ -159,7 +159,7 @@ class BrowseQuery extends PartialQuery{
         $sQuery = "SELECT $sSelect FROM " . KTUtil::getTableName("folders") . " AS F $sPermissionJoin $sWhere ";
         $aParams = array();
-        $aParams = array_merge($aParams,  $aPermissionParams);
+        $aParams = kt_array_merge($aParams,  $aPermissionParams);
         $aParams[] = $this->folder_id;
         return array($sQuery, $aParams);
     }
@@ -470,7 +470,7 @@ class ArchivedBrowseQuery extends BrowseQuery {
                 KTUtil::getTableName("document_content_version"),
                 $sPermissionJoin, $sWhere);
         $aParams = array();
-        $aParams = array_merge($aParams,  $aPermissionParams);
+        $aParams = kt_array_merge($aParams,  $aPermissionParams);
         $aParams[] = $this->folder_id;
         return array($sQuery, $aParams);
     }
@@ -322,7 +322,7 @@ class KTBrowseUtil {
             WHERE
                 PLA.permission_descriptor_id IN ($sPermissionDescriptors)
                 AND NOT (PLA2.permission_descriptor_id IN ($sPermissionDescriptors))";
-        $aParams = array_merge(array($oPermission->getId(), $oPermission->getId()), $aPermissionDescriptors, $aPermissionDescriptors);
+        $aParams = kt_array_merge(array($oPermission->getId(), $oPermission->getId()), $aPermissionDescriptors, $aPermissionDescriptors);
         $res = DBUtil::getResultArrayKey(array($sQuery, $aParams), 'id');
         if (PEAR::isError($res)) {
@@ -84,7 +84,7 @@ class KTConfig {
                 $this->setns(null, $seck, $secv);
             }
         }
-        $this->conf = array_merge($this->conf, $conf["root"]);
+        $this->conf = kt_array_merge($this->conf, $conf["root"]);
     }
     function setns($seck, $k, $v, $bDefault = false) {
@@ -180,7 +180,7 @@ class DBUtil {
             $aWhereFields[] = $k . ' = ?';
         }
         $sWhere = join(' AND ', $aWhereFields);
-        $aValues = array_merge(array_values($aFieldValues), array_values($aWhereFieldValues));
+        $aValues = kt_array_merge(array_values($aFieldValues), array_values($aWhereFieldValues));
         $sth = $db->autoPrepare($sTable, array_keys($aFieldValues), DB_AUTOQUERY_UPDATE, $sWhere);
         $res =& $db->execute($sth, array_values($aValues));
@@ -217,7 +217,7 @@ class KTDocumentUtil {
     // {{{ validateMetadata
     function validateMetadata(&$oDocument, $aMetadata) {
         $aFieldsets =& KTFieldset::getGenericFieldsets();
-        $aFieldsets =& array_merge($aFieldsets,
+        $aFieldsets =& kt_array_merge($aFieldsets,
                 KTFieldset::getForDocumentType($oDocument->getDocumentTypeId()));
         $aSimpleMetadata = array();
         foreach ($aMetadata as $aSingleMetadatum) {
@@ -250,7 +250,7 @@ class KTFolderUtil {
             // child folders.
             $aCFIds = Folder::getList(array('parent_id = ?', array($iFolderId)), array('ids' => true));
-            $aRemainingFolders = array_merge($aRemainingFolders, $aCFIds);
+            $aRemainingFolders = kt_array_merge($aRemainingFolders, $aCFIds);
         }
         // FIXME we could subdivide this to provide a per-item display (viz. bulk upload, etc.)
@@ -346,7 +346,7 @@ class KTFolderUtil {
             // child folders.
             $aCFIds = Folder::getList(array('parent_id = ?', array($iFolderId)), array('ids' => true));
-            $aRemainingFolders = array_merge($aRemainingFolders, $aCFIds);
+            $aRemainingFolders = kt_array_merge($aRemainingFolders, $aCFIds);
         }
         if ((!empty($aFailedDocuments) || (!empty($aFailedFolders)))) {
@@ -419,7 +419,7 @@ class KTFolderUtil {
             }
             $aCFIds = Folder::getList(array('parent_id = ?', array($iFolderId)), array('ids' => true));
-            $aRemainingFolders = array_merge($aRemainingFolders, $aCFIds);
+            $aRemainingFolders = kt_array_merge($aRemainingFolders, $aCFIds);
         }
@@ -143,7 +143,7 @@ class GroupUtil {
             "is_unit_admin" => false,
             "is_system_admin" => false,
         );
-        $aDetails = array_merge($aDefaultDetails, $aGroupDetails);
+        $aDetails = kt_array_merge($aDefaultDetails, $aGroupDetails);
         if (is_null(KTUtil::arrayGet($aDetails, "name"))) {
             return PEAR::raiseError("Needed key name is not provided");
         }
@@ -172,7 +172,7 @@ class GroupUtil {
         $aDefaultOptions = array(
             //"active" => true,
         );
-        $aOptions = array_merge($aDefaultOptions, $aGivenOptions);
+        $aOptions = kt_array_merge($aDefaultOptions, $aGivenOptions);
         $aWhere = array();
         /* if ($aOptions["active"] === true) {
@@ -250,7 +250,7 @@ class GroupUtil {
         foreach ($aGroupIDs as $iGroupID) {
             $aExtraIDs = KTUtil::arrayGet($aGroupArray, $iGroupID);
             if (is_array($aExtraIDs)) {
-                $aGroupIDs = array_merge($aGroupIDs, $aExtraIDs);
+                $aGroupIDs = kt_array_merge($aGroupIDs, $aExtraIDs);
             }
         }
         $aGroupIDs = array_unique($aGroupIDs);
@@ -319,7 +319,7 @@ class GroupUtil {
                     if (is_null($aStuff)) {
                         continue;
                     }
-                    $v = array_unique(array_merge($v, $aStuff));
+                    $v = array_unique(kt_array_merge($v, $aStuff));
                     sort($v);
                 }
                 $aExpandedGroups[$k] = $v;
@@ -351,7 +351,7 @@ class GroupUtil {
         $sTable = KTUtil::getTableName('users_groups');
         $sQuery = 'SELECT group_id FROM ' . $sTable . ' WHERE user_id = ? AND group_id IN (' . DBUtil::paramArray($aSubgroups) . ')';
         $aParams = array($oUser->getId());
-        $aParams = array_merge($aParams, $aSubgroups);
+        $aParams = kt_array_merge($aParams, $aSubgroups);
         $res = DBUtil::getOneResult(array($sQuery, $aParams));
         if (PEAR::isError($res)) {
@@ -51,7 +51,7 @@ class KTHelp {
         $final_path = array(null,'kthelp', $path_segments[0]);
         $final_path[] = $lang_code;
-        $final_path = array_merge($final_path, array_slice($path_segments, 1));
+        $final_path = kt_array_merge($final_path, array_slice($path_segments, 1));
         $help_path = implode('/',$final_path);
@@ -646,7 +646,7 @@ class KTMetadataUtil {
         $aGenericFieldsetIds = KTFieldset::getGenericFieldsets(array('ids' => true));
         $aSpecificFieldsetIds = KTFieldset::getForDocumentType($iDocumentTypeId, array('ids' => true));
-        $aFieldsetIds = array_merge($aDocumentFieldsetIds, $aGenericFieldsetIds, $aSpecificFieldsetIds);
+        $aFieldsetIds = kt_array_merge($aDocumentFieldsetIds, $aGenericFieldsetIds, $aSpecificFieldsetIds);
         $aFieldsetIds = array_unique($aFieldsetIds);
         sort($aFieldsetIds);
@@ -179,7 +179,7 @@ class KTPermissionDescriptor extends KTEntity {
         $sQuery = "SELECT COUNT(group_id) AS num FROM $sTable
             WHERE descriptor_id = ? AND group_id IN ($sGroupIDs)";
         $aParams = array($this->getID());
-        $aParams = array_merge($aParams, $aGroupIDs);
+        $aParams = kt_array_merge($aParams, $aGroupIDs);
         $res = DBUtil::getOneResultKey(array($sQuery, $aParams), 'num');
         if (PEAR::isError($res)) {
             return $res;
@@ -288,7 +288,7 @@ class KTPermissionDescriptor extends KTEntity {
         $sQuery = "SELECT COUNT(role_id) AS num FROM $sTable
             WHERE descriptor_id = ? AND role_id IN ($sRoleIDs)";
         $aParams = array($this->getID());
-        $aParams = array_merge($aParams, $aRoleIDs);
+        $aParams = kt_array_merge($aParams, $aRoleIDs);
         $res = DBUtil::getOneResultKey(array($sQuery, $aParams), 'num');
         if (PEAR::isError($res)) {
             return $res;
@@ -397,7 +397,7 @@ class KTPermissionDescriptor extends KTEntity {
         $sQuery = "SELECT COUNT(user_id) AS num FROM $sTable
             WHERE descriptor_id = ? AND user_id IN ($sUserIDs)";
         $aParams = array($this->getID());
-        $aParams = array_merge($aParams, $aUserIDs);
+        $aParams = kt_array_merge($aParams, $aUserIDs);
         $res = DBUtil::getOneResultKey(array($sQuery, $aParams), 'num');
         if (PEAR::isError($res)) {
             return $res;
@@ -324,8 +324,8 @@ class KTPermissionUtil {
                     }
                     // roles are _not_ always assigned (can be null at root)
                     if (!is_null($_roleCache[$iRoleId])) {
-                        $aMapPermAllowed[$iPermissionId]['user'] = array_merge($aAllowed['user'], $_roleCache[$iRoleId]->getUserIds());
-                        $aMapPermAllowed[$iPermissionId]['group'] = array_merge($aAllowed['group'], $_roleCache[$iRoleId]->getGroupIds());
+                        $aMapPermAllowed[$iPermissionId]['user'] = kt_array_merge($aAllowed['user'], $_roleCache[$iRoleId]->getUserIds());
+                        $aMapPermAllowed[$iPermissionId]['group'] = kt_array_merge($aAllowed['group'], $_roleCache[$iRoleId]->getGroupIds());
                         // naturally, roles cannot be assigned roles, or madness follows.
                     }
                 }
@@ -94,7 +94,7 @@ class KTSearchUtil {
         foreach ($aSQL as $sSQL) {
             if (is_array($sSQL)) {
                 $aCritQueries[] = '('.$sSQL[0].')';
-                $aCritParams = array_merge($aCritParams , $sSQL[1]);
+                $aCritParams = kt_array_merge($aCritParams , $sSQL[1]);
             } else {
                 $aCritQueries[] = '('.$sSQL.')';
             }
@@ -141,8 +141,8 @@ class KTSearchUtil {
             $aSubgroup = KTUtil::arrayGet($aOneCriteriaSet, "subgroup");
             if (!empty($aValues)) {
                 list($aThisCritQueries, $aThisParams, $aThisJoinSQL) = KTSearchUtil::_oneCriteriaSetToSQL($aOneCriteriaSet["values"]);
-                $aJoinSQL = array_merge($aJoinSQL, $aThisJoinSQL);
-                $aParams = array_merge($aParams, $aThisParams);
+                $aJoinSQL = kt_array_merge($aJoinSQL, $aThisJoinSQL);
+                $aParams = kt_array_merge($aParams, $aThisParams);
                 $tabs = str_repeat("\t", ($iRecurseLevel + 2));
                 $aSearchStrings[] = "\n$tabs(\n$tabs\t" . join("\n " . KTUtil::arrayGet($aOneCriteriaSet, 'join', "AND") . " ", $aThisCritQueries) . "\n$tabs)";
             } else if (!empty($aSubgroup)) {
@@ -154,7 +154,7 @@ class KTSearchUtil {
                 list($sThisSearchString, $aThisParams, $sThisJoinSQL) =
                     KTSearchUtil::criteriaSetToSQL($aOneCriteriaSet, $iRecurseLevel + 1);
                 $aJoinSQL[] = $sThisJoinSQL;
-                $aParams = array_merge($aParams, $aThisParams);
+                $aParams = kt_array_merge($aParams, $aThisParams);
                 $aSearchStrings[] = $sThisSearchString;
             }
         }
@@ -198,7 +198,7 @@ class KTSearchUtil {
         $sPermissionDescriptors = DBUtil::paramArray($aPermissionDescriptors);
         $sSQLString = "PLA.permission_descriptor_id IN ($sPermissionDescriptors)";
         $aParams = array($oPermission->getId());
-        $aParams = array_merge($aParams, $aPermissionDescriptors);
+        $aParams = kt_array_merge($aParams, $aPermissionDescriptors);
         return array($sSQLString, $aParams, $sJoinSQL);
     }
     // }}}
@@ -304,10 +304,10 @@ class KTSearchUtil {
     // GROUP BY D.id
         $aParams = array();
-        $aParams = array_merge($aParams, $aInitialJoinParams);
-        $aParams = array_merge($aParams, $aPermissionParams);
+        $aParams = kt_array_merge($aParams, $aInitialJoinParams);
+        $aParams = kt_array_merge($aParams, $aPermissionParams);
         $aParams[] = $sToSearch;
-        $aParams = array_merge($aParams, $aCritParams);
+        $aParams = kt_array_merge($aParams, $aCritParams);
         return array($sQuery, $aParams);
     }
@@ -139,7 +139,7 @@ class SubscriptionManager {
     * @return array of subscription objects
     */
     function listSubscriptions($iUserID) {
-        return $aSubscriptions = array_merge(SubscriptionManager::retrieveUserSubscriptions($iUserID, SubscriptionEvent::subTypes('Folder')),
+        return $aSubscriptions = kt_array_merge(SubscriptionManager::retrieveUserSubscriptions($iUserID, SubscriptionEvent::subTypes('Folder')),
                                              SubscriptionManager::retrieveUserSubscriptions($iUserID, SubscriptionEvent::subTypes('Document')));
     }
@@ -173,7 +173,7 @@ class SubscriptionManager {
     * @return array of subscription objects
     */    
     function listSubscriptionAlerts($iUserID) {
-        return $aSubscriptions = array_merge(SubscriptionManager::retrieveSubscriptionAlerts($iUserID, SubscriptionEvent::subTypes("Folder")),
+        return $aSubscriptions = kt_array_merge(SubscriptionManager::retrieveSubscriptionAlerts($iUserID, SubscriptionEvent::subTypes("Folder")),
                                              SubscriptionManager::retrieveSubscriptionAlerts($iUserID, SubscriptionEvent::subTypes("Document")));        
     }
@@ -619,7 +619,7 @@ class SubscriptionEvent {
     // after this has been called.
     function _pruneAlertedUsers($aUserIds) {
         $returnArray = array_diff($aUserIds, $this->alertedUsers);
-        $this->alertedUsers = array_merge($returnArray, $this->alertedUsers); // now contains all users who will have been alerted.
+        $this->alertedUsers = kt_array_merge($returnArray, $this->alertedUsers); // now contains all users who will have been alerted.
         return $returnArray;
     }
@@ -570,4 +570,29 @@ class KTUtil {
 }
+/**
+ *
+ * Merges two arrays using array_merge
+ *
+ * array_merge in PHP5 got more strict about its parameter handling,
+ * forcing arrays.
+ *
+ */
+if (version_compare(phpversion(), '5.0') === -1) {
+    function kt_array_merge() {
+        $args = func_get_args();
+        return call_user_func_array("array_merge",$args);
+    }
+} else {
+    eval('
+    function kt_array_merge() {
+        $args = func_get_args();
+        foreach ($args as &$arg)  {
+            $arg = (array)$arg;
+        }
+        return call_user_func_array("array_merge",$args);
+    }
+    ');
+}
+
 ?>
@@ -591,7 +591,7 @@ class KTWorkflowUtil {
         $aGroupMembershipSet = GroupUtil::buildGroupArray();
         $aAllIds = array_keys($aGroups);
         foreach ($aGroups as $id => $oGroup) {
-            $aAllIds = array_merge($aGroupMembershipSet[$id], $aAllIds);
+            $aAllIds = kt_array_merge($aGroupMembershipSet[$id], $aAllIds);
         }
         foreach ($aAllIds as $id) {
@@ -525,7 +525,7 @@ class KTRoleAllocationPlugin extends KTFolderAction {
 			if (PEAR::isError($aNewFolders)) {
 				$this->errorRedirectToMain(_kt('Failure to generate folderlisting.'));
 			}
-			$folder_queue = array_merge ($folder_queue, (array) $aNewFolders); // push.
+			$folder_queue = kt_array_merge ($folder_queue, (array) $aNewFolders); // push.
 			// update the folder.
@@ -256,7 +256,7 @@ class KTWorkflowDispatcher extends KTAdminDispatcher {
             $aNamedActions[] = $aInfo['actions_by_name'][$sName];
         }
-        $aThese = array_merge($aAlways, $aNamedActions);
+        $aThese = kt_array_merge($aAlways, $aNamedActions);
         // some controlled.  we need to be careful here:  list actions that _are always_ available
         if (empty($aThese)) { return _kt('No actions available.'); }
@@ -170,7 +170,7 @@ class KTBulkExportAction extends KTFolderAction {
                 KTUtil::getTableName("document_content_version"),
                 $sPermissionJoin, $sWhere);
         $aParams = array();
-        $aParams = array_merge($aParams,  $aPermissionParams);
+        $aParams = kt_array_merge($aParams,  $aPermissionParams);
         $aParentFolderIds = split(',', $this->oFolder->getParentFolderIds());
         $aParentFolderIds[] = $this->oFolder->getId();
         if ($aParentFolderIds[0] == 0) {
@@ -116,7 +116,7 @@ class KTBaseIndexerTrigger {
         }
         $cmdline = array($sCommand);
-        $cmdline = array_merge($cmdline, $this->args);
+        $cmdline = kt_array_merge($cmdline, $this->args);
         $cmdline[] = $sFilename;
         $aOptions = array();