Skip to content
This repository was archived by the owner on Nov 25, 2020. It is now read-only.

Commit e0c2425

Browse files
FredPassosFredPassos
committed
Merge remote-tracking branch 'refs/remotes/pydio/develop' into translate_pt-br
2 parents 1ceada5 + 3f30487 commit e0c2425

File tree

9 files changed

+1586
-1299
lines changed

9 files changed

+1586
-1299
lines changed

‎core/src/conf/RELEASE_NOTE

Lines changed: 1427 additions & 1291 deletions
Large diffs are not rendered by default.

‎core/src/core/classes/class.AJXP_JSPacker.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public static function pack()
6262
* @param $mode
6363
* @return bool
6464
*/
65-
public function concatListAndPack($src, $out, $mode)
65+
public static function concatListAndPack($src, $out, $mode)
6666
{
6767
if (!is_file($src) || !is_readable($src)) {
6868
return false;

‎core/src/core/classes/class.AJXP_MetaStreamWrapper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ protected static function translateScheme($url, $crtInstance = null){
124124
if (!empty($baseDir) || $baseDir != "/") {
125125
$crtPath = parse_url($url, PHP_URL_PATH);
126126
$crtBase = basename($crtPath);
127-
if (!empty($crtPath) && $crtPath != "/" && $crtBase != $contentFilter->getUniquePath() && $crtBase != ".ajxp_meta") {
127+
if (!empty($crtPath) && $crtPath != "/" && fsAccessWrapper::unPatchPathForBaseDir($crtBase) != $contentFilter->getUniquePath() && $crtBase != ".ajxp_meta") {
128128
throw new Exception("Cannot find file " . $crtBase);
129129
}
130130
// Prepend baseDir in path

‎core/src/plugins/action.share/res/react/ShareDialog.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@
8585
showMailer:function(subject, message, users = []){
8686
if(ReactModel.Share.forceMailerOldSchool()){
8787
subject = encodeURIComponent(subject);
88-
message = encodeURIComponent(message);
8988
global.location.href = "mailto:[email protected]?Subject="+subject+"&Body="+message;
9089
return;
9190
}

‎core/src/plugins/action.share/res/react/model/ShareModel.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -870,7 +870,7 @@
870870
s = MessageHash["share_center.42"];
871871
if(s) s = s.replace("%s", ApplicationTitle);
872872
link = this.getPublicLink(linkId);
873-
message = s + "\n\n " + "<a href='"+link+"'>"+link+"</a>";
873+
message = s + "\n\n " + "<a href=\""+link+"\">"+link+"</a>";
874874
}else{
875875
if(!this._data['repository_url']){
876876
throw new Error(MessageHash['share_center.229']);
@@ -880,7 +880,7 @@
880880
if(this._data['repository_url']){
881881
link = this._data['repository_url'];
882882
}
883-
message = s + "\n\n " + "<a href='" + link +"'>" + MessageHash["share_center.46"].replace("%s1", this.getGlobal("label")).replace("%s2", ajaxplorer.appTitle) + "</a>";
883+
message = s + "\n\n " + "<a href=\"" + link +"\">" + MessageHash["share_center.46"].replace("%s1", this.getGlobal("label")).replace("%s2", ajaxplorer.appTitle) + "</a>";
884884
}
885885
var usersList = null;
886886
if(this.shareFolderMode == 'workspace' && oForm) {

‎core/src/plugins/core.ajaxplorer/ajxp_mixins.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<global_param group_switch_name="dibi_provider" group_switch_label="MySQL" group_switch_value="mysql" name="mysql_database" default="pydio" label="MIXIN_MESSAGE[Database]" description="MIXIN_MESSAGE[Database name]" type="string" mandatory="true"/>
6666
<global_param group_switch_name="dibi_provider" group_switch_label="MySQL" group_switch_value="mysql" name="mysql_username" default="" label="MIXIN_MESSAGE[User]" description="MIXIN_MESSAGE[User name]" type="string" mandatory="true"/>
6767
<global_param group_switch_name="dibi_provider" group_switch_label="MySQL" group_switch_value="mysql" name="mysql_password" default="" label="MIXIN_MESSAGE[Password]" description="MIXIN_MESSAGE[User password]" type="password" mandatory="true"/>
68-
<global_param group_switch_name="dibi_provider" group_switch_label="MySQL" group_switch_value="mysql" name="mysql_use_mysqli" default="false" label="MIXIN_MESSAGE[Use MySQLi]" description="MIXIN_MESSAGE[Use PHP MySQLi extension]" type="boolean" mandatory="true"/>
68+
<global_param group_switch_name="dibi_provider" group_switch_label="MySQL" group_switch_value="mysql" name="mysql_use_mysqli" default="true" label="MIXIN_MESSAGE[Use MySQLi]" description="MIXIN_MESSAGE[Use PHP MySQLi extension]" type="boolean" mandatory="true"/>
6969
<global_param group_switch_name="dibi_provider" group_switch_label="Sqlite 3" group_switch_value="sqlite3" name="sqlite3_driver" default="sqlite3" label="MIXIN_MESSAGE[Driver]" description="MIXIN_MESSAGE[Driver type (do not touch)]" type="hidden" mandatory="true"/>
7070
<global_param group_switch_name="dibi_provider" group_switch_label="Sqlite 3" group_switch_value="sqlite3" name="sqlite3_formatDate" default="'Y-m-d'" label="formatDate" description="formatDate (do not touch)" type="hidden" mandatory="true"/>
7171
<global_param group_switch_name="dibi_provider" group_switch_label="Sqlite 3" group_switch_value="sqlite3" name="sqlite3_formatDateTime" default="'Y-m-d H:i:s'" label="formatDateTime" description="formatDateTime (do not touch)" type="hidden" mandatory="true"/>
@@ -83,7 +83,7 @@
8383
<global_param group_switch_name="dibi_provider" group_switch_label="PDO" group_switch_value="pdo" name="pdo_dsn" default="mysql:host=localhost;dbname=db" label="MIXIN_MESSAGE[DSN]" description="MIXIN_MESSAGE[Data Source Name]" type="string" mandatory="true"/>
8484
<global_param group_switch_name="dibi_provider" group_switch_label="PDO" group_switch_value="pdo" name="pdo_username" default="" label="MIXIN_MESSAGE[User]" description="MIXIN_MESSAGE[User name]" type="string" mandatory="true"/>
8585
<global_param group_switch_name="dibi_provider" group_switch_label="PDO" group_switch_value="pdo" name="pdo_password" default="" label="MIXIN_MESSAGE[Password]" description="MIXIN_MESSAGE[User password]" type="password" mandatory="true"/>
86-
<global_param group_switch_name="dibi_provider" group_switch_label="MySQL" group_switch_value="mysql" name="mysql_driver" default="mysql" llabel="MIXIN_MESSAGE[Driver]" description="MIXIN_MESSAGE[Driver type (do not touch)]" type="hidden" mandatory="true"/>
86+
<global_param group_switch_name="dibi_provider" group_switch_label="MySQL" group_switch_value="mysql" name="mysql_driver" default="mysql" label="MIXIN_MESSAGE[Driver]" description="MIXIN_MESSAGE[Driver type (do not touch)]" type="hidden" mandatory="true"/>
8787
<global_param group_switch_name="dibi_provider" group_switch_label="MySQL" group_switch_value="mysql" name="mysql_host" default="localhost" label="MIXIN_MESSAGE[Host]" description="MIXIN_MESSAGE[Database server]" type="string" mandatory="true"/>
8888
<global_param group_switch_name="dibi_provider" group_switch_label="MySQL" group_switch_value="mysql" name="mysql_database" default="pydio" label="MIXIN_MESSAGE[Database]" description="MIXIN_MESSAGE[Database name]" type="string" mandatory="true"/>
8989
<global_param group_switch_name="dibi_provider" group_switch_label="MySQL" group_switch_value="mysql" name="mysql_username" default="" label="MIXIN_MESSAGE[User]" description="MIXIN_MESSAGE[User name]" type="string" mandatory="true"/>

‎core/src/plugins/gui.ajax/res/js/ui/prototype/class.PreviewFactory.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ Class.create("PreviewFactory", {
9292
var bgUrl = oImageToLoad.editorClass.prototype.getCoveringBackgroundSource(oImageToLoad.ajxpNode);
9393
bgUrl = bgUrl.replace('(', '\\(').replace(')', '\\)').replace('\'', '\\\'');
9494
oImageToLoad.mainObject.setStyle({
95-
backgroundImage:'url(' + oImageToLoad.editorClass.prototype.getCoveringBackgroundSource(oImageToLoad.ajxpNode) + ')',
95+
backgroundImage:'url(' + bgUrl + ')',
9696
backgroundSize : 'cover'
9797
});
9898
}else{

0 commit comments

Comments
 (0)