fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'upstream/master' into BUG-10852

Browse Source
This commit is contained in:
Hector Cortez
2013-04-18 11:46:57 -04:00
parent 8b162cda9d 255f48ce02
commit c903dfd1d9
7 changed files with 57 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
workflow/engine/methods/appFolder/appFolderAjax.php
View File

@@ -941,6 +941,7 @@ function copyMoveAction($type)
$itemField["triggerAction"] = "all";
$itemField["store"] = $folderResult;
$itemField["valueField"] = "FOLDER_UID";
$itemField["editable"] = false;
$itemField["displayField"] = "FOLDER_NAME";
$itemField["selectOnFocus"] = true;
$itemField["tpl"] = '<tpl for="."><div ext:qtip="{field2}" class="x-combo-list-item">{field2}</div></tpl>';

19
workflow/engine/methods/authSources/authSources_SearchUsers.php
View File

@@ -34,6 +34,25 @@ $G_ID_MENU_SELECTED = 'USERS';
$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 ($pluginEnabled == 0) {
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', array ('MESSAGE' => G::LoadTranslation( 'ID_AUTH_SOURCE_MISSING' ) ) );
G::RenderPage( 'publish', 'blank' );
}
}
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'authSources/authSources_SearchUsers', '', array ('AUTH_SOURCE_UID' => $_GET['sUID']), '../authSources/authSources_ImportUsers' );
G::RenderPage( 'publish', 'blank' );

6
workflow/engine/methods/setup/languages_Import.php
View File

@@ -97,6 +97,12 @@ try {
);
$configuration->saveConfig( 'LANGUAGE_META', $importResults->lang );
$dir = PATH_CORE . 'content' . PATH_SEP . 'translations' . PATH_SEP;
if (! is_writable( $dir )) {
throw new Exception( G::LoadTranslation( 'ID_TRANSLATIONS_FOLDER_PERMISSIONS' ) );
}
G::uploadFile($languageFile, $dir, $languageFilename, 0777);
ini_set( 'max_execution_time', $sMaxExecutionTime );
} catch (Exception $oError) {