Merge branch 'master' of git://github.com/colosa/processmaker into BUG-0000

workflow/engine/classes/class.wsTools.php

@@ -302,15 +302,12 @@ class workspaceTools
             $names = explode(".", basename($poFile));
             $extension = array_pop($names);
             $langid = array_pop($names);
-            if (strcasecmp($langid, "en") == 0) {
-                CLI::logging("Updating database translations with $poName\n");
-                Language::import($poFile, false, true);
-            } elseif ($first) {
+            if (strcasecmp($langid, "en") != 0 && $first) {
                 CLI::logging("Updating XML form translations with $poName\n");
                 Language::import($poFile, true, false);
-                CLI::logging("Updating database translations with $poName\n");
-                Language::import($poFile, false, true);
             }
+            CLI::logging("Updating database translations with $poName\n");
+            Language::import($poFile, false, true);
         }
     }
 

workflow/engine/classes/model/Language.php

@@ -275,9 +275,11 @@ class Language extends BaseLanguage
             $oLanguage->update( array ('LAN_ID' => $languageID,'LAN_ENABLED' => '1'
             ) );
 
-            $trn = new Translation();
-            $trn->generateFileTranslation( $LOCALE );
-            $trn->addTranslationEnvironment( $LOCALE, $POHeaders, $countItemsSuccess );
+            if ($updateXml) {
+                $trn = new Translation();
+                $trn->generateFileTranslation( $LOCALE );
+                $trn->addTranslationEnvironment( $LOCALE, $POHeaders, $countItemsSuccess );
+            }
 
             //fill the results
             $results = new stdClass();

workflow/engine/controllers/installer.php

@@ -822,26 +822,36 @@ class Installer extends Controller
             G::loadClass( 'system' );
             $envFile = PATH_CONFIG . 'env.ini';
 
-            //writting for new installtions to use the classic skin
-            $updatedConf['default_skin'] = 'classic';
-            $info->uri = '/sys' . $_REQUEST['workspace'] . '/en/classic/login/login';
-
-            try {
-                G::update_php_ini( $envFile, $updatedConf );
-            } catch (Exception $e) {
-                $info->result = false;
-                $info->message = G::LoadTranslation('ID_PROCESSMAKER_WRITE_CONFIG_INDEX', SYS_LANG, Array($envFile));
-                $info->message .= G::LoadTranslation('ID_PROCESSMAKER_UI_NOT_INSTALL');
-                $this->installLog( G::LoadTranslation('ID_INSTALL_BUT_ERROR', SYS_LANG, Array('env.ini')));
-                return $info;
-            }
-
             // getting configuration from env.ini
             $sysConf = System::getSystemConfiguration( $envFile );
 
+            $langUri = 'en';
+            if (isset($sysConf['default_lang'])) {
+                $langUri = $sysConf['default_lang'];
+            }
+
+            $skinUri = 'classic';
+            if (isset($sysConf['default_skin'])) {
+                $skinUri = $sysConf['default_skin'];
+            }
+
+            $updatedConf['default_lang'] = $langUri;
+            $updatedConf['default_skin'] = $skinUri;
+            $info->uri =  PATH_SEP . 'sys' . $_REQUEST['workspace'] . PATH_SEP . $langUri . PATH_SEP . $skinUri . PATH_SEP . 'login' . PATH_SEP . 'login';
+
             if (defined('PARTNER_FLAG') || isset($_REQUEST['PARTNER_FLAG'])) {
                 $this->buildParternExtras($adminUsername, $adminPassword, $_REQUEST['workspace'], SYS_LANG);
             } else {
+                try {
+                    G::update_php_ini( $envFile, $updatedConf );
+                } catch (Exception $e) {
+                    $info->result = false;
+                    $info->message = G::LoadTranslation('ID_PROCESSMAKER_WRITE_CONFIG_INDEX', SYS_LANG, Array($envFile));
+                    $info->message .= G::LoadTranslation('ID_PROCESSMAKER_UI_NOT_INSTALL');
+                    $this->installLog( G::LoadTranslation('ID_INSTALL_BUT_ERROR', SYS_LANG, Array('env.ini')));
+                    return $info;
+                }
+
                 try {
                     // update the main index file
                     $indexFileUpdated = System::updateIndexFile(array('lang' => 'en','skin' => $updatedConf['default_skin']));

workflow/engine/methods/appFolder/appFolderAjax.php

@@ -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>';

workflow/engine/methods/setup/languages_Import.php

@@ -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) {

workflow/engine/templates/users/users.js

@@ -421,6 +421,7 @@ Ext.onReady(function () {
         xtype      : 'textfield',
         width      : 260,
         allowBlank : false,
+        hidden     : (typeof EDITPROFILE != "undefined" && EDITPROFILE == 1)? true : false,
         listeners: {
           blur : function(ob)
           {