Merge remote-tracking branch 'origin/develop' into develop

Author: cdujeu

core/src/plugins/access.smb/smb.php

@@ -639,9 +639,7 @@ public function stream_open ($url, $mode, $options, $opened_path)
         $this->mode = $mode;
         $this->defer_stream_read;
         $this->parsed_url = $pu = smb::parse_url($url);
-        if ($pu['type'] <> 'path') 
-        	return false;
-        	//trigger_error('stream_open(): error in URL', E_USER_ERROR);
+        if ($pu['type'] <> 'path') trigger_error('stream_open(): error in URL', E_USER_ERROR);
         switch ($mode) {
             case 'r':
             case 'r+':

core/src/plugins/action.updater/class.AjaXplorerUpgrader.php

@@ -90,6 +90,7 @@ public function __construct($archiveURL, $hash, $method, $backupFiles = array())
     public static function configureProxy($proxyHost, $proxyUser, $proxyPass)
     {
         $proxy = array( 'http' => array( 'proxy' => 'tcp://'.$proxyHost, 'request_fulluri' => true ) );
+        $proxy['ssl']['SNI_enabled'] = false;
         if (!empty($proxyUser) && !empty($proxyPass)) {
             $auth = base64_encode($proxyUser.":".$proxyPass);
             $proxy['http']['header'] = "Proxy-Authorization: Basic $auth";

core/src/plugins/core.ajaxplorer/i18n/it.php

@@ -19,15 +19,15 @@
 * The latest code can be found at <http://pyd.io/>.
 */
 //
-//      Updated for Pydio 4.0.2
-//      Italian transalation version: 4.0.2-001
-//
-//      Maintained by Michele Beltrame
-//      http://www.cattlegrid.info/
-//      mb [AT] italpro [DOT] net
+//      Maintained by DepaMarco
+//	http://github.com/DepaMarco
 //
 //      Previous maintainers:
 //
+//          Michele Beltrame
+//          http://www.cattlegrid.info/
+//          mb [AT] italpro [DOT] net
+
 //          Updates for Pydio 2.5.5 by
 //          Davide Cavalca <davide at cavalca dot name>
 //
@@ -646,11 +646,11 @@
 "plugtype.desc.mailer" => "Strumenti per consentire all'applicazione di inviare email",
 "plugtype.title.mq" => "Messaggistica Istantanea",
 "plugtype.desc.mq" => "Implementazione di un semplice server PUB/SUB",
-    "537" => "File is too large! Maximum authorized size is %i",
-    "538" => "Upload error: no file found on server!",
-    "539" => "Upload error: file is partial",
-    "540" => "Upload error: cannot find the temporary directory",
-    "541" => "Upload error: cannot write into the temporary directory",
-    "542" => "Upload error: a PHP extension stopped the upload process."
+"537" => "Il file è troppo grande! La dimensione massima autorizzata è %i",
+"538" => "Errore caricamento: nessun file trovato sul server!",
+"539" => "Errore caricamento: il file è parziale",
+"540" => "Errore caricamento: impossibile trovare la cartella temporanea",
+"541" => "Errore caricamento: non è possibile scrivere nella cartella temporanea",
+"542" => "Errore caricamento: un'estensione PHP ha bloccato il processo di caricamento"
 /* END SENTENCE */
 );

core/src/plugins/uploader.jumploader/i18n/conf/it.php

@@ -0,0 +1,25 @@
+<?php
+/*
+* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+* This file is part of Pydio.
+*
+* Pydio is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Affero General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* Pydio is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Affero General Public License for more details.
+*
+* You should have received a copy of the GNU Affero General Public License
+* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+*
+* The latest code can be found at <http://pyd.io/>.
+*/
+$mess=array(
+"Jumploader" => "Java (file grandi)",
+"Third-party JumpLoader JAVA applet allowing to upload folders, chunk big files, etc." => "Applet JAVA di terze parti (JumpLoader); consente di caricare cartelle, spezzare file di grandi dimensioni ecc.",
+"Install Applet" => "Installa Applet",
+);

core/src/plugins/uploader.plupload/i18n/conf/it.php

@@ -0,0 +1,25 @@
+<?php
+/*
+* Copyright 2007-2014 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+* This file is part of Pydio.
+*
+* Pydio is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Affero General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* Pydio is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Affero General Public License for more details.
+*
+* You should have received a copy of the GNU Affero General Public License
+* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+*
+* The latest code can be found at <http://pyd.io/>.
+*/
+$mess=array(
+"PLUploader" => "PLUploader",
+"PlUpload uploader support. Requires downloading and installing the PLupload sources." => "Supporto per PlUpload. Richiede lo scaricamento e l'installazione dei sorgenti di PLupload.",
+);
+