From 1bcc28ba332dcedd5bd3cf462ede9556d856a195 Mon Sep 17 00:00:00 2001
From: "Paula V. Quispe" <paula.quispe@colosa.com>
Date: Thu, 11 Jun 2015 12:06:18 -0400
Subject: [PATCH] PM-1060: Import User

---
 .../methods/authSources/authSources_Edit.php  |  2 +-
 .../methods/authSources/authSources_New.php   |  2 +-
 .../authSources/authSources_SearchUsers.php   | 19 +++++--------------
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/workflow/engine/methods/authSources/authSources_Edit.php b/workflow/engine/methods/authSources/authSources_Edit.php
index af572405f..3ea20934d 100755
--- a/workflow/engine/methods/authSources/authSources_Edit.php
+++ b/workflow/engine/methods/authSources/authSources_Edit.php
@@ -105,7 +105,7 @@ if ($fields['AUTH_SOURCE_PROVIDER'] == 'ldap') {
                 $oHeadPublisher = & headPublisher::getSingleton ();
 
                 $oHeadPublisher->assign("Fields", $fields);
-                $oHeadPublisher->addExtJsScript (PATH_TPL. 'ldapAdvanced/library.js', false, true );
+                $oHeadPublisher->addExtJsScript (PATH_TPL. 'ldapAdvanced/library', false, true );
                 $oHeadPublisher->addExtJsScript (PATH_TPL. 'ldapAdvanced/ldapAdvancedForm', false, true );
                 $oHeadPublisher->addExtJsScript (PATH_TPL. 'ldapAdvanced/ldapAdvancedList', false, true );
                 G::RenderPage ('publish', 'extJs');
diff --git a/workflow/engine/methods/authSources/authSources_New.php b/workflow/engine/methods/authSources/authSources_New.php
index 4e515764c..44501902f 100755
--- a/workflow/engine/methods/authSources/authSources_New.php
+++ b/workflow/engine/methods/authSources/authSources_New.php
@@ -57,7 +57,7 @@ if (file_exists( PATH_XMLFORM . 'ldapAdvanced/' . $fields['AUTH_SOURCE_PROVIDER'
             $oHeadPublisher = & headPublisher::getSingleton ();
             
             $oHeadPublisher->assign("Fields", $fields);
-            $oHeadPublisher->addExtJsScript (PATH_TPL. 'ldapAdvanced/library.js', false, true );
+            $oHeadPublisher->addExtJsScript (PATH_TPL. 'ldapAdvanced/library', false, true );
             $oHeadPublisher->addExtJsScript (PATH_TPL. 'ldapAdvanced/ldapAdvancedForm', false, true );
             $oHeadPublisher->addExtJsScript (PATH_TPL. 'ldapAdvanced/ldapAdvancedList', false, true );
             G::RenderPage ('publish', 'extJs');
diff --git a/workflow/engine/methods/authSources/authSources_SearchUsers.php b/workflow/engine/methods/authSources/authSources_SearchUsers.php
index e6e5a6d19..579c66713 100755
--- a/workflow/engine/methods/authSources/authSources_SearchUsers.php
+++ b/workflow/engine/methods/authSources/authSources_SearchUsers.php
@@ -35,17 +35,8 @@ $G_ID_SUB_MENU_SELECTED = 'AUTH_SOURCES';
 
 $G_PUBLISH = new Publisher();
 $fields = $RBAC->getAuthSource( $_GET['sUID'] );
-if (file_exists( PATH_PLUGINS . $fields['AUTH_SOURCE_PROVIDER'] . PATH_SEP . $fields['AUTH_SOURCE_PROVIDER'] . 'Edit.xml' )) {
-    $pluginEnabled = 0;
-    
-    if (file_exists(PATH_PLUGINS . $fields["AUTH_SOURCE_PROVIDER"] . ".php")) {
-        $pluginRegistry = &PMPluginRegistry::getSingleton();
-        $pluginDetail = $pluginRegistry->getPluginDetails($fields["AUTH_SOURCE_PROVIDER"] . ".php");
-    
-        if ($pluginDetail && $pluginDetail->enabled) {
-            $pluginEnabled = 1;
-        }
-    }
+if (file_exists( PATH_XMLFORM . 'ldapAdvanced/' . $fields['AUTH_SOURCE_PROVIDER'] . 'Edit.xml' )) {
+    $pluginEnabled = 1;
 
     if ($pluginEnabled == 0) {
        $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', array ('MESSAGE' => G::LoadTranslation( 'ID_AUTH_SOURCE_MISSING' ) ) );
@@ -61,12 +52,12 @@ if (file_exists( PATH_PLUGINS . $fields['AUTH_SOURCE_PROVIDER'] . PATH_SEP . $fi
         $oHeadPublisher->assign("FORMATS", $c->getFormats());
         $oHeadPublisher->assign("CONFIG", $Config);
 
-        if (file_exists(PATH_PLUGINS . $fields["AUTH_SOURCE_PROVIDER"] . PATH_SEP . $fields["AUTH_SOURCE_PROVIDER"] . 'Flag')) {
+        if (file_exists(PATH_XMLFORM . 'ldapAdvanced/' . $fields['AUTH_SOURCE_PROVIDER'] . 'Flag')) {
             $oHeadPublisher = & headPublisher::getSingleton ();
 
             $oHeadPublisher->assign("Fields", $fields);
-            $oHeadPublisher->addExtJsScript (PATH_PLUGINS . $fields["AUTH_SOURCE_PROVIDER"] . PATH_SEP . 'js' . PATH_SEP . 'library', false, true );
-            $oHeadPublisher->addExtJsScript (PATH_PLUGINS . $fields["AUTH_SOURCE_PROVIDER"] . PATH_SEP . 'js' . PATH_SEP . 'ldapAdvancedSearch', false, true );
+            $oHeadPublisher->addExtJsScript (PATH_TPL. 'ldapAdvanced/library', false, true );
+            $oHeadPublisher->addExtJsScript (PATH_TPL. 'ldapAdvanced/ldapAdvancedSearch', false, true );
             G::RenderPage ('publish', 'extJs');
             die();
         }