mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Merge remote-tracking branch 'origin/3.1.16' into 3.1
This commit is contained in:
Damian Mooyman
commit
b943a0c6dd
@ -9,7 +9,7 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
|
||||
"CMSMAIN.BATCH_PUBLISH_PROMPT": "Sie haben {num} Seite(n) ausgewählt.\n\nWollen Sie diese wirklich veröffentlichen?",
|
||||
"CMSMAIN.BATCH_DELETE_PROMPT": "Sie haben {num} Seite(n) ausgewählt.\n\nWollen Sie diese wirklich löschen?",
|
||||
"CMSMAIN.BATCH_ARCHIVE_PROMPT": "Sie haben {num} Seite(n) ausgewählt.\n\nWollen Sie diese wirklich archivieren?\n\nDiese Seiten und alle Unterseiten davon werden von der veröffentlichen Seite gelöscht und in das Archiv verschoben.",
|
||||
"CMSMAIN.BATCH_RESTORE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to restore to stage?\n\nChildren of archived pages will be restored to the root level, unless those pages are also being restored.",
|
||||
"CMSMAIN.BATCH_RESTORE_PROMPT": "Sie haben {num} Seite(n) ausgewählt.\\n\\nWollen Sie diese wirklich wiederherstellen?\\n\\nUnterseiten von archivierten Seiten werden auf der Root-Ebene wiederhergestellt, es sei denn, diese Seiten werden ebenfalls wiederhergestellt.",
|
||||
"CMSMAIN.BATCH_DELETELIVE_PROMPT": "Sie haben {num} Seite(n) ausgewählt.\n\nWollen Sie diese wirklich von der veröfffentlichten Seite löschen?",
|
||||
"LeftAndMain.CONFIRMUNSAVED": "Sind Sie sicher, dass Sie die Seite verlassen möchten?\n\nWARNUNG: Ihre Änderungen werden nicht gespeichert.\n\nDrücken Sie \"OK\" um fortzufahren, oder \"Abbrechen\" um auf dieser Seite zu bleiben.",
|
||||
"LeftAndMain.CONFIRMUNSAVEDSHORT": "WARNUNG: Ihre Änderungen wurden nicht gespeichert.",
|
||||
|
||||
@ -4,13 +4,13 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
|
||||
if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
|
||||
} else {
|
||||
ss.i18n.addDictionary('eo', {
|
||||
"CMSMAIN.SELECTONEPAGE": "Please select at least one page",
|
||||
"CMSMAIN.BATCH_UNPUBLISH_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to unpublish",
|
||||
"CMSMAIN.BATCH_PUBLISH_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to publish?",
|
||||
"CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
|
||||
"CMSMAIN.BATCH_ARCHIVE_PROMPT": "You have {num} page(s) selected.\n\nAre you sure you want to archive these pages?\n\nThese pages and all of their children pages will be unpublished and sent to the archive.",
|
||||
"CMSMAIN.BATCH_RESTORE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to restore to stage?\n\nChildren of archived pages will be restored to the root level, unless those pages are also being restored.",
|
||||
"CMSMAIN.BATCH_DELETELIVE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete these pages from live?",
|
||||
"CMSMAIN.SELECTONEPAGE": "Bonvole elektu almenaŭ 1 paĝon.",
|
||||
"CMSMAIN.BATCH_UNPUBLISH_PROMPT": "Vi elektis {num} paĝo(j)n.\n\nĈi vi vere volas malpublikigi?",
|
||||
"CMSMAIN.BATCH_PUBLISH_PROMPT": "Vi elektis {num} paĝo(j)n.\n\nĈi vi vere volas publikigi?",
|
||||
"CMSMAIN.BATCH_DELETE_PROMPT": "Vi elektis {num} paĝo(j)n.\n\nĈi vi vere volas forigi?",
|
||||
"CMSMAIN.BATCH_ARCHIVE_PROMPT": "Vi elektis {num} paĝo(j)n.\n\nĈu vi vere volas enarĥivigi tiujn paĝojn?\n\nTiuj paĝoj kaj ĉiuj idaj paĝoj estos malpublikigitaj kaj senditaj al la arĥivo.",
|
||||
"CMSMAIN.BATCH_RESTORE_PROMPT": "Vi elektis {num} paĝo(j)n.\n\nĈu vi vere volas restaŭri al stadio?\n\nIdoj de enarĥivigitaj paĝoj estos restaŭritaj al la radika nivelo, escepte se tiuj paĝoj ankaŭ estos restaŭritaj.",
|
||||
"CMSMAIN.BATCH_DELETELIVE_PROMPT": "Vi elektis {num} paĝo(j)n.\n\nĈi vi vere volas forigi tiujn paĝojn el la publika stadio?",
|
||||
"LeftAndMain.CONFIRMUNSAVED": "Ĉu vi vere volas navigi for de ĉi tiu paĝo?\n\nAVERTO: Viaj ŝanĝoj ne estas konservitaj.\n\nPremu je Akcepti por daŭrigi, aŭ Nuligi por resti ĉe la aktuala paĝo.",
|
||||
"LeftAndMain.CONFIRMUNSAVEDSHORT": "AVERTO: Viaj ŝanĝoj ne estas konservitaj.",
|
||||
"SecurityAdmin.BATCHACTIONSDELETECONFIRM": "Ĉu vi vere volas forigi %s grupojn?",
|
||||
|
||||
@ -4,8 +4,8 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
|
||||
if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
|
||||
} else {
|
||||
ss.i18n.addDictionary('ro', {
|
||||
"CMSMAIN.SELECTONEPAGE": "Please select at least one page",
|
||||
"CMSMAIN.BATCH_UNPUBLISH_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to unpublish",
|
||||
"CMSMAIN.SELECTONEPAGE": "Vă rugăm să selectaţi cel puțin o pagină.",
|
||||
"CMSMAIN.BATCH_UNPUBLISH_PROMPT": "Aveti {num} pagina(i) selectate.\n\nDoriti sa le nenublicati",
|
||||
"CMSMAIN.BATCH_PUBLISH_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to publish?",
|
||||
"CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
|
||||
"CMSMAIN.BATCH_ARCHIVE_PROMPT": "You have {num} page(s) selected.\n\nAre you sure you want to archive these pages?\n\nThese pages and all of their children pages will be unpublished and sent to the archive.",
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
"CMSMAIN.BATCH_PUBLISH_PROMPT": "Sie haben {num} Seite(n) ausgewählt.\n\nWollen Sie diese wirklich veröffentlichen?",
|
||||
"CMSMAIN.BATCH_DELETE_PROMPT": "Sie haben {num} Seite(n) ausgewählt.\n\nWollen Sie diese wirklich löschen?",
|
||||
"CMSMAIN.BATCH_ARCHIVE_PROMPT": "Sie haben {num} Seite(n) ausgewählt.\n\nWollen Sie diese wirklich archivieren?\n\nDiese Seiten und alle Unterseiten davon werden von der veröffentlichen Seite gelöscht und in das Archiv verschoben.",
|
||||
"CMSMAIN.BATCH_RESTORE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to restore to stage?\n\nChildren of archived pages will be restored to the root level, unless those pages are also being restored.",
|
||||
"CMSMAIN.BATCH_RESTORE_PROMPT": "Sie haben {num} Seite(n) ausgewählt.\\n\\nWollen Sie diese wirklich wiederherstellen?\\n\\nUnterseiten von archivierten Seiten werden auf der Root-Ebene wiederhergestellt, es sei denn, diese Seiten werden ebenfalls wiederhergestellt.",
|
||||
"CMSMAIN.BATCH_DELETELIVE_PROMPT": "Sie haben {num} Seite(n) ausgewählt.\n\nWollen Sie diese wirklich von der veröfffentlichten Seite löschen?",
|
||||
"LeftAndMain.CONFIRMUNSAVED": "Sind Sie sicher, dass Sie die Seite verlassen möchten?\n\nWARNUNG: Ihre Änderungen werden nicht gespeichert.\n\nDrücken Sie \"OK\" um fortzufahren, oder \"Abbrechen\" um auf dieser Seite zu bleiben.",
|
||||
"LeftAndMain.CONFIRMUNSAVEDSHORT": "WARNUNG: Ihre Änderungen wurden nicht gespeichert.",
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{
|
||||
"CMSMAIN.SELECTONEPAGE": "Please select at least one page",
|
||||
"CMSMAIN.BATCH_UNPUBLISH_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to unpublish",
|
||||
"CMSMAIN.BATCH_PUBLISH_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to publish?",
|
||||
"CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
|
||||
"CMSMAIN.BATCH_ARCHIVE_PROMPT": "You have {num} page(s) selected.\n\nAre you sure you want to archive these pages?\n\nThese pages and all of their children pages will be unpublished and sent to the archive.",
|
||||
"CMSMAIN.BATCH_RESTORE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to restore to stage?\n\nChildren of archived pages will be restored to the root level, unless those pages are also being restored.",
|
||||
"CMSMAIN.BATCH_DELETELIVE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete these pages from live?",
|
||||
"CMSMAIN.SELECTONEPAGE": "Bonvole elektu almenaŭ 1 paĝon.",
|
||||
"CMSMAIN.BATCH_UNPUBLISH_PROMPT": "Vi elektis {num} paĝo(j)n.\n\nĈi vi vere volas malpublikigi?",
|
||||
"CMSMAIN.BATCH_PUBLISH_PROMPT": "Vi elektis {num} paĝo(j)n.\n\nĈi vi vere volas publikigi?",
|
||||
"CMSMAIN.BATCH_DELETE_PROMPT": "Vi elektis {num} paĝo(j)n.\n\nĈi vi vere volas forigi?",
|
||||
"CMSMAIN.BATCH_ARCHIVE_PROMPT": "Vi elektis {num} paĝo(j)n.\n\nĈu vi vere volas enarĥivigi tiujn paĝojn?\n\nTiuj paĝoj kaj ĉiuj idaj paĝoj estos malpublikigitaj kaj senditaj al la arĥivo.",
|
||||
"CMSMAIN.BATCH_RESTORE_PROMPT": "Vi elektis {num} paĝo(j)n.\n\nĈu vi vere volas restaŭri al stadio?\n\nIdoj de enarĥivigitaj paĝoj estos restaŭritaj al la radika nivelo, escepte se tiuj paĝoj ankaŭ estos restaŭritaj.",
|
||||
"CMSMAIN.BATCH_DELETELIVE_PROMPT": "Vi elektis {num} paĝo(j)n.\n\nĈi vi vere volas forigi tiujn paĝojn el la publika stadio?",
|
||||
"LeftAndMain.CONFIRMUNSAVED": "Ĉu vi vere volas navigi for de ĉi tiu paĝo?\n\nAVERTO: Viaj ŝanĝoj ne estas konservitaj.\n\nPremu je Akcepti por daŭrigi, aŭ Nuligi por resti ĉe la aktuala paĝo.",
|
||||
"LeftAndMain.CONFIRMUNSAVEDSHORT": "AVERTO: Viaj ŝanĝoj ne estas konservitaj.",
|
||||
"SecurityAdmin.BATCHACTIONSDELETECONFIRM": "Ĉu vi vere volas forigi %s grupojn?",
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"CMSMAIN.SELECTONEPAGE": "Please select at least one page",
|
||||
"CMSMAIN.BATCH_UNPUBLISH_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to unpublish",
|
||||
"CMSMAIN.SELECTONEPAGE": "Vă rugăm să selectaţi cel puțin o pagină.",
|
||||
"CMSMAIN.BATCH_UNPUBLISH_PROMPT": "Aveti {num} pagina(i) selectate.\n\nDoriti sa le nenublicati",
|
||||
"CMSMAIN.BATCH_PUBLISH_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to publish?",
|
||||
"CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
|
||||
"CMSMAIN.BATCH_ARCHIVE_PROMPT": "You have {num} page(s) selected.\n\nAre you sure you want to archive these pages?\n\nThese pages and all of their children pages will be unpublished and sent to the archive.",
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{
|
||||
"CMSMAIN.SELECTONEPAGE": "Please select at least one page",
|
||||
"CMSMAIN.BATCH_UNPUBLISH_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to unpublish",
|
||||
"CMSMAIN.BATCH_PUBLISH_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to publish?",
|
||||
"CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
|
||||
"CMSMAIN.SELECTONEPAGE": "请至少选择一个页面",
|
||||
"CMSMAIN.BATCH_UNPUBLISH_PROMPT": "您已选了{num}个页面。\n\n是否确定要取消发布",
|
||||
"CMSMAIN.BATCH_PUBLISH_PROMPT": "您已选了{num}个页面。\n\n是否确定要发布？",
|
||||
"CMSMAIN.BATCH_DELETE_PROMPT": "您已选了{num}个页面。\n\n是否确定要删除？",
|
||||
"CMSMAIN.BATCH_ARCHIVE_PROMPT": "You have {num} page(s) selected.\n\nAre you sure you want to archive these pages?\n\nThese pages and all of their children pages will be unpublished and sent to the archive.",
|
||||
"CMSMAIN.BATCH_RESTORE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to restore to stage?\n\nChildren of archived pages will be restored to the root level, unless those pages are also being restored.",
|
||||
"CMSMAIN.BATCH_DELETELIVE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete these pages from live?",
|
||||
|
||||
@ -4,10 +4,10 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
|
||||
if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
|
||||
} else {
|
||||
ss.i18n.addDictionary('zh', {
|
||||
"CMSMAIN.SELECTONEPAGE": "Please select at least one page",
|
||||
"CMSMAIN.BATCH_UNPUBLISH_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to unpublish",
|
||||
"CMSMAIN.BATCH_PUBLISH_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to publish?",
|
||||
"CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
|
||||
"CMSMAIN.SELECTONEPAGE": "请至少选择一个页面",
|
||||
"CMSMAIN.BATCH_UNPUBLISH_PROMPT": "您已选了{num}个页面。\n\n是否确定要取消发布",
|
||||
"CMSMAIN.BATCH_PUBLISH_PROMPT": "您已选了{num}个页面。\n\n是否确定要发布？",
|
||||
"CMSMAIN.BATCH_DELETE_PROMPT": "您已选了{num}个页面。\n\n是否确定要删除？",
|
||||
"CMSMAIN.BATCH_ARCHIVE_PROMPT": "You have {num} page(s) selected.\n\nAre you sure you want to archive these pages?\n\nThese pages and all of their children pages will be unpublished and sent to the archive.",
|
||||
"CMSMAIN.BATCH_RESTORE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to restore to stage?\n\nChildren of archived pages will be restored to the root level, unless those pages are also being restored.",
|
||||
"CMSMAIN.BATCH_DELETELIVE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete these pages from live?",
|
||||
|
||||
@ -16,6 +16,7 @@ class RSSFeed extends ViewableData {
|
||||
private static $casting = array(
|
||||
"Title" => "Varchar",
|
||||
"Description" => "Varchar",
|
||||
"Link" => "Varchar",
|
||||
);
|
||||
|
||||
/**
|
||||
|
||||
@ -188,14 +188,14 @@ class RequestHandler extends ViewableData {
|
||||
user_error("Non-string method name: " . var_export($action, true), E_USER_ERROR);
|
||||
}
|
||||
|
||||
$className = get_class($this);
|
||||
$classMessage = Director::isLive() ? 'on this handler' : 'on class '.get_class($this);
|
||||
|
||||
try {
|
||||
if(!$this->hasAction($action)) {
|
||||
return $this->httpError(404, "Action '$action' isn't available on class $className.");
|
||||
return $this->httpError(404, "Action '$action' isn't available $classMessage.");
|
||||
}
|
||||
if(!$this->checkAccessAction($action) || in_array(strtolower($action), array('run', 'init'))) {
|
||||
return $this->httpError(403, "Action '$action' isn't allowed on class $className.");
|
||||
return $this->httpError(403, "Action '$action' isn't allowed $classMessage.");
|
||||
}
|
||||
$result = $this->handleAction($request, $action);
|
||||
}
|
||||
@ -232,7 +232,7 @@ class RequestHandler extends ViewableData {
|
||||
|
||||
// But if we have more content on the URL and we don't know what to do with it, return an error.
|
||||
} else {
|
||||
return $this->httpError(404, "I can't handle sub-URLs of a $this->class object.");
|
||||
return $this->httpError(404, "I can't handle sub-URLs $classMessage.");
|
||||
}
|
||||
|
||||
return $this;
|
||||
@ -276,10 +276,10 @@ class RequestHandler extends ViewableData {
|
||||
* @return SS_HTTPResponse
|
||||
*/
|
||||
protected function handleAction($request, $action) {
|
||||
$className = get_class($this);
|
||||
$classMessage = Director::isLive() ? 'on this handler' : 'on class '.get_class($this);
|
||||
|
||||
if(!$this->hasMethod($action)) {
|
||||
return new SS_HTTPResponse("Action '$action' isn't available on class $className.", 404);
|
||||
return new SS_HTTPResponse("Action '$action' isn't available $classMessage.", 404);
|
||||
}
|
||||
|
||||
$res = $this->extend('beforeCallActionHandler', $request, $action);
|
||||
|
||||
40
docs/en/04_Changelogs/3.1.16.md
Normal file
40
docs/en/04_Changelogs/3.1.16.md
Normal file
@ -0,0 +1,40 @@
|
||||
# 3.1.16
|
||||
|
||||
## Upgrading
|
||||
|
||||
FormField validation messages generated by the `Validator` class will now be automatically XML
|
||||
encoded before being rendered alongside an invalid field.
|
||||
|
||||
If a validation message in a custom `Validator` instance should be rendered as literal HTML,
|
||||
then the $message parameter for `Validator::validationError` should be passed as an instance
|
||||
of `HTMLText`
|
||||
|
||||
For example:
|
||||
|
||||
|
||||
:::php
|
||||
class MyCustomValidator extends Validator {
|
||||
public function php($data) {
|
||||
$this->validationError(
|
||||
'EmailAddress',
|
||||
DBField::create_field('HTMLText', "Invalid email. Please sign up at <a href='signup'>this page</a>")
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
<!--- Changes below this line will be automatically regenerated -->
|
||||
|
||||
## Change Log
|
||||
|
||||
### Security
|
||||
|
||||
* 2015-11-11 [245e0aa](https://github.com/silverstripe/silverstripe-framework/commit/245e0aae2f5f3eb0acba1d198ad8e196bb224462) Fix FormField error messages not being encoded safely (Damian Mooyman) - See [ss-2015-026](http://www.silverstripe.org/download/security-releases/ss-2015-026)
|
||||
* 2015-11-09 [53b3bc7](https://github.com/silverstripe/silverstripe-framework/commit/53b3bc707bcccb8f5e5060f85ab1398a0975bba2) Dont expose class on error (Hamish Friedlander) - See [ss-2015-025](http://www.silverstripe.org/download/security-releases/ss-2015-025)
|
||||
* 2015-11-01 [ac4342d](https://github.com/silverstripe/silverstripe-framework/commit/ac4342d81d19201bd8d3814f168240db1ac565fe) XML escape RSSFeed $link parameter (Ingo Schommer) - See [ss-2015-022](http://www.silverstripe.org/download/security-releases/ss-2015-022)
|
||||
* 2015-10-28 [97f21fd](https://github.com/silverstripe/silverstripe-framework/commit/97f21fddb3c565052f19ee3b35366f48e1e9a36f) Fix rewrite hash links XSS (Damian Mooyman) - See [ss-2015-021](http://www.silverstripe.org/download/security-releases/ss-2015-021)
|
||||
|
||||
### Bugfixes
|
||||
|
||||
* 2015-10-20 [b857bdf](https://github.com/silverstripe/silverstripe-framework/commit/b857bdf209d79fc623724e68f6a660354cbd5f93) Fix duplicate files being included in case of flush (Damian Mooyman)
|
||||
* 2015-10-08 [ff6c0a3](https://github.com/silverstripe/silverstripe-cms/commit/ff6c0a3160c5eb3ca624efea6585efb44399dc1c) (v3.1) for #1294 to workaround ErrorPage fatal errors (and undefined var) when publishing. (Patrick Nelson)
|
||||
19
docs/en/04_Changelogs/rc/3.1.16-rc1.md
Normal file
19
docs/en/04_Changelogs/rc/3.1.16-rc1.md
Normal file
@ -0,0 +1,19 @@
|
||||
# 3.1.16-rc1
|
||||
|
||||
See [3.1.16](/changelogs/3.1.16) changelog for more information on what is new in 3.1.16
|
||||
|
||||
<!--- Changes below this line will be automatically regenerated -->
|
||||
|
||||
## Change Log
|
||||
|
||||
### Security
|
||||
|
||||
* 2015-11-11 [245e0aa](https://github.com/silverstripe/silverstripe-framework/commit/245e0aae2f5f3eb0acba1d198ad8e196bb224462) Fix FormField error messages not being encoded safely (Damian Mooyman) - See [ss-2015-026](http://www.silverstripe.org/download/security-releases/ss-2015-026)
|
||||
* 2015-11-09 [53b3bc7](https://github.com/silverstripe/silverstripe-framework/commit/53b3bc707bcccb8f5e5060f85ab1398a0975bba2) Dont expose class on error (Hamish Friedlander) - See [ss-2015-025](http://www.silverstripe.org/download/security-releases/ss-2015-025)
|
||||
* 2015-11-01 [ac4342d](https://github.com/silverstripe/silverstripe-framework/commit/ac4342d81d19201bd8d3814f168240db1ac565fe) XML escape RSSFeed $link parameter (Ingo Schommer) - See [ss-2015-022](http://www.silverstripe.org/download/security-releases/ss-2015-022)
|
||||
* 2015-10-28 [97f21fd](https://github.com/silverstripe/silverstripe-framework/commit/97f21fddb3c565052f19ee3b35366f48e1e9a36f) Fix rewrite hash links XSS (Damian Mooyman) - See [ss-2015-021](http://www.silverstripe.org/download/security-releases/ss-2015-021)
|
||||
|
||||
### Bugfixes
|
||||
|
||||
* 2015-10-20 [b857bdf](https://github.com/silverstripe/silverstripe-framework/commit/b857bdf209d79fc623724e68f6a660354cbd5f93) Fix duplicate files being included in case of flush (Damian Mooyman)
|
||||
* 2015-10-08 [ff6c0a3](https://github.com/silverstripe/silverstripe-cms/commit/ff6c0a3160c5eb3ca624efea6585efb44399dc1c) (v3.1) for #1294 to workaround ErrorPage fatal errors (and undefined var) when publishing. (Patrick Nelson)
|
||||
@ -1211,6 +1211,18 @@ class Form extends RequestHandler {
|
||||
if($errors){
|
||||
// Load errors into session and post back
|
||||
$data = $this->getData();
|
||||
// Encode validation messages as XML before saving into session state
|
||||
// As per Form::addErrorMessage()
|
||||
$errors = array_map(function($error) {
|
||||
// Encode message as XML by default
|
||||
if($error['message'] instanceof DBField) {
|
||||
$error['message'] = $error['message']->forTemplate();;
|
||||
} else {
|
||||
$error['message'] = Convert::raw2xml($error['message']);
|
||||
}
|
||||
return $error;
|
||||
}, $errors);
|
||||
|
||||
Session::set("FormInfo.{$this->FormName()}.errors", $errors);
|
||||
Session::set("FormInfo.{$this->FormName()}.data", $data);
|
||||
return false;
|
||||
|
||||
@ -292,8 +292,6 @@ cs:
|
||||
FROMWEB: 'Z webu'
|
||||
FindInFolder: 'Hledat ve složce'
|
||||
IMAGEALT: 'Alternativní text (alt)'
|
||||
IMAGEALTTEXT: 'Alternativní text (alt) - ukáže se, když obrázek nemúže být zobrazen'
|
||||
IMAGEALTTEXTDESC: 'Zobrazeno na obrazovce, anebo když obrázek nemůže být zobrazen'
|
||||
IMAGEDIMENSIONS: Rozměry
|
||||
IMAGEHEIGHTPX: Výška
|
||||
IMAGETITLE: 'Titul text (tooltip) - další informace o obrázku'
|
||||
@ -328,11 +326,9 @@ cs:
|
||||
DELETED: Smazáno.
|
||||
DropdownBatchActionsDefault: Akcie
|
||||
HELP: Nápověda
|
||||
PAGETYPE: 'Typ stránky:'
|
||||
PERMAGAIN: 'Byli jste odhlášeni z CMS. Pokud se chcete znovu přihlásit, zadejte níže své uživatelské jméno a heslo.'
|
||||
PERMALREADY: 'Omlouvám se, ale nemůžete vstoupit do této části CMS. Pokud se chcete přihlásit jako někdo jiný, udělejte tak níže.'
|
||||
PERMDEFAULT: 'Musíte být přihlášen/a k přístup do oblasti administrace, zadejte vaše přihlošovací údaje dole, prosím.'
|
||||
PLEASESAVE: 'Uložte stránku, prosím. Tato stránka nemůže být aktualizována, protože ještě nebyla uložena.'
|
||||
PreviewButton: Náhled
|
||||
REORGANISATIONSUCCESSFUL: 'Strom webu reorganizován úspěšně.'
|
||||
SAVEDUP: Uloženo.
|
||||
|
||||
@ -260,6 +260,7 @@ de:
|
||||
many_many_Members: Mitglieder
|
||||
GroupImportForm:
|
||||
Help1: '<p>Eine oder mehrere Gruppen im <em>CSV</em>-Format (kommaseparierte Werte) importieren. <small><a href="#" class="toggle-advanced">Erweiterte Nutzung</a></small></p>'
|
||||
Help2: '<div class="advanced"><h4>Erweiterte Benutzung</h4><ul><li>Gültige Spalten: <em>%s</em></li><li>Bereits existierende Gruppen werden anhand ihres eindeutigen <em>Code</em> identifiziert und um neue Einträge aus der Importdatei erweitert.</li><li>Gruppenhierarchien können mittels der Spalte <em>ParentCode</em> erstellt werden.</li><li>Berechtigungen können in der Spalte <em>PermissionCode</em> hinzugefügt werden. Schon zugewiesene Berechtigungen werden nicht entfernt.</li></ul></div>'
|
||||
ResultCreated: '{count} Gruppe(n) wurden erstellt'
|
||||
ResultDeleted: '%d Gruppe(n) gelöscht'
|
||||
ResultUpdated: '%d Gruppe(n) aktualisiert'
|
||||
@ -291,6 +292,7 @@ de:
|
||||
FROMWEB: 'Aus dem Web'
|
||||
FindInFolder: 'In Ordner suchen'
|
||||
IMAGEALT: 'Alternativtext (alt)'
|
||||
IMAGEALTTEXT: 'Alternativtext (alt) - erscheint, falls das Bild nicht angezeigt werden kann.'
|
||||
IMAGEDIMENSIONS: Dimensionen
|
||||
IMAGEHEIGHTPX: Höhe (px)
|
||||
IMAGETITLE: 'Titeltext (Tooltip) - für zusätzliche Informationen über das Bild'
|
||||
@ -325,7 +327,11 @@ de:
|
||||
DELETED: Gelöscht.
|
||||
DropdownBatchActionsDefault: Aktionen
|
||||
HELP: Hilfe
|
||||
PAGETYPE: 'Seitentyp:'
|
||||
PERMAGAIN: 'Sie wurden aus dem System ausgeloggt. Falls Sie sich wieder einloggen möchten, geben Sie bitte Benutzernamen und Passwort im untenstehenden Formular an.'
|
||||
PERMALREADY: 'Leider dürfen Sie diesen Teil des CMS nicht aufrufen. Wenn Sie sich als jemand anderes einloggen wollen, benutzen Sie bitte das nachstehende Formular.'
|
||||
PERMDEFAULT: 'Sie müssen angemeldet sein, um auf diesen Bereich zugreifen zu können. Bitte geben Sie Ihre Zugangsdaten ein.'
|
||||
PLEASESAVE: 'Diese Seite konnte nicht aktualisiert werden weil sie noch nicht gespeichert wurde - bitte speichern.'
|
||||
PreviewButton: Vorschau
|
||||
REORGANISATIONSUCCESSFUL: 'Der Seitenbaum wurde erfolgreich sortiert.'
|
||||
SAVEDUP: Gespeichert.
|
||||
@ -413,6 +419,7 @@ de:
|
||||
Toggle: 'Hilfe zur Formatierung anzeigen'
|
||||
MemberImportForm:
|
||||
Help1: '<p>Mitglieder im <em>CSV</em>-Format (kommaseparierte Werte) importieren. <small><a href="#" class="toggle-advanced">Erweiterte Nutzung</a></small></p>'
|
||||
Help2: '<div class="advanced"><h4>Erweiterte Benutzung</h4><ul><li>Gültige Spalten: <em>%s</em></li><li>Bereits existierende Benutzer werden anhand ihres eindeutigen <em>Code</em> identifiziert und um neue Einträge aus der Importdatei erweitert.</li><li>Gruppen können in der Spalte <em>Gruppen</em> hinzugefügt werden. Gruppen werden anhand ihres <em>Code</em> erkannt. Mehrere Gruppen werden Komma-separiert eingetragen. Schon zugewiesene Gruppen werden nicht entfernt.</li></ul></div>'
|
||||
ResultCreated: '{count} Mitglied(er) wurde(n) erstellt'
|
||||
ResultDeleted: '%d Mitglied(er) gelöscht'
|
||||
ResultNone: 'Keine Änderungen'
|
||||
|
||||
@ -260,6 +260,7 @@ eo:
|
||||
many_many_Members: Membroj
|
||||
GroupImportForm:
|
||||
Help1: '<p>Importi unu aŭ pliaj grupojn en formato <em>CSV</em> (perkome disigitaj valoroj values). <small><a href="#" class="toggle-advanced">Vidigi spertulan uzadon</a></small></p>'
|
||||
Help2: '<div class="advanced"><h4>Speciala uzado </h4><ul><li>Eblaj kolumnoj: <em>%s</em></li><li>Ekzistantaj grupoj kongruiĝas laŭ la valoro de ilia unika <em>Kodo</em>, kaj ĝisdatiĝas per eventualaj valoroj el la importita dosiero</li><li>Eblas krei grupajn hierarĥiojn per la kolumno <em>ParentCode</em>.</li><li>Eblas agordi permeskodojn per la kolumno <em>PermissionCode</em>. Ekzistantaj permeskodoj ne vakiĝas.</li></ul></div>'
|
||||
ResultCreated: 'Kreiĝis {count} grupoj'
|
||||
ResultDeleted: 'Forigis %d grupojn'
|
||||
ResultUpdated: 'Aktualigis %d grupojn'
|
||||
@ -326,15 +327,20 @@ eo:
|
||||
DropdownBatchActionsDefault: Agoj
|
||||
HELP: Helpo
|
||||
PERMAGAIN: 'Vin adiaŭis la CMS. Se vi volas denove saluti, enigu salutnomon kaj pasvorton malsupre.'
|
||||
PERMALREADY: 'Bedaŭrinde vi ne povas aliri tiun parton de la CMS. Se vi volas ensaluti kiel aliulo, faru tion sube.'
|
||||
PERMDEFAULT: 'Necesas ensaluti por aliri la administran zonon; bonvolu enigi viajn akreditaĵoj sube.'
|
||||
PreviewButton: Antaŭvido
|
||||
REORGANISATIONSUCCESSFUL: 'Sukcese reorganizis la retejan arbon.'
|
||||
SAVEDUP: Konservita.
|
||||
ShowAsList: 'vidigi kiel liston'
|
||||
TooManyPages: 'Tro da paĝoj'
|
||||
ValidationError: 'Validiga eraro'
|
||||
VersionUnknown: nekonata
|
||||
LeftAndMain_Menu_ss:
|
||||
Hello: Saluton
|
||||
LOGOUT: 'Elsaluti'
|
||||
ListboxField:
|
||||
SOURCE_VALIDATION: 'Bonvolu elekti valoron el la listo donita. %s ne estas valida agordo'
|
||||
LoginAttempt:
|
||||
Email: 'Retadreso'
|
||||
IP: 'IP-Adreso'
|
||||
@ -410,6 +416,7 @@ eo:
|
||||
Toggle: 'Vidigi aranĝa helpo'
|
||||
MemberImportForm:
|
||||
Help1: '<p>Importi membrojn en <em>CSV-formato</em> (diskomaj valoroj ). <small><a href="#" class="toggle-advanced">Vidigi spertulan uzadon</a></small></p>'
|
||||
Help2: '<div class="advanced"><h4>Speciala uzado </h4><ul><li>Eblaj kolumnoj: <em>%s</em></li><li>Ekzistantaj uzantoj kongruiĝas laŭ la valoro de sia unika atributo <em>Code</em>, kaj ĝisdatiĝas per eventualaj novaj valoroj el la importita dosiero. </li><li>Eblas agordi grupojn per la kolumno <em>Groups</em>. Grupoj estas identigeblaj per sia atributo <em>Code</em>, plurobla grupo estu apartigitaj per komo. Ekzistantaj grupaj membrecoj ne vakiĝas.</li></ul></div>'
|
||||
ResultCreated: 'Krei {count} membrojn'
|
||||
ResultDeleted: 'Forigis %d membrojn'
|
||||
ResultNone: 'Neniu ŝanĝo'
|
||||
@ -539,6 +546,8 @@ eo:
|
||||
Print: Presi
|
||||
TableListField_PageControls_ss:
|
||||
OF: de
|
||||
TextField:
|
||||
VALIDATEMAXLENGTH: 'La longo de la valoro por {name} devas ne superi {maxLength} signojn'
|
||||
TimeField:
|
||||
VALIDATEFORMAT: 'Bonvole enigu validan horan formaton ({format})'
|
||||
ToggleField:
|
||||
|
||||
@ -82,6 +82,7 @@ es:
|
||||
CMSSecurity:
|
||||
INVALIDUSER: '<p>Usuario inválido. <a target="_top" href="{link}">Por favor, vuelva a autenticar aquí</a> para continuar.</p>'
|
||||
LoginMessage: '<p>Si Ud tiene cualquier trabajo sin guardar puede volver donde lo dejó, iniciando sesión más abajo.</p>'
|
||||
SUCCESS: Exito
|
||||
SUCCESSCONTENT: '<p>Inicio de sesión exitoso. Si Ud no es automáticamente redireccionado, <a target="_top" href="{link}">haga clic aquí</a></p>'
|
||||
TimedOutTitleAnonymous: 'Expiró su sesión.'
|
||||
TimedOutTitleMember: 'Eh {name}!<br />Tu sesión expiró.'
|
||||
@ -259,6 +260,7 @@ es:
|
||||
many_many_Members: Miembros
|
||||
GroupImportForm:
|
||||
Help1: '<p>Importar uno o más grupos en formato <em>CSV</em> (valores separados por coma). <small><a href="#" class="toggle-advanced">Mostrar uso avanzado</a></small></p>'
|
||||
Help2: '<div class="advanced"><h4>Uso avanzado</h4><ul><li>Columnas permitidas: <em>%s</em></li><li>Grupos existentes son relacionados con su <em>Código único</em> y actualizados con cualquier nuevo valor desde el archivo importado</li><li>Jerarquías de grupo pueden ser creadas utilizando la columna <em>ParentCode</em>.</li><li>Códigos de permiso pueden ser asignados por la columna <em>PermissionCode</em>. Códigos de permisos existentes no son eliminados.</li></ul></div>'
|
||||
ResultCreated: 'Creados {count} grupos'
|
||||
ResultDeleted: 'Se eliminaron %d grupos'
|
||||
ResultUpdated: 'Actualizados grupos %d'
|
||||
@ -325,6 +327,8 @@ es:
|
||||
DropdownBatchActionsDefault: Acciones
|
||||
HELP: Ayuda
|
||||
PERMAGAIN: 'Ha sido desconectado del CMS. Si quiere volver a entrar, introduzca su nombre de usuario y contraseña a continuación.'
|
||||
PERMALREADY: 'Lamentablemente no puede acceder a esta parte del CMS. Si quiere entrar como alguien distinto, hágalo a continuación'
|
||||
PERMDEFAULT: 'Debes estar conectado para acceder al área de administración; por favor ingresa tus datos a continuación'
|
||||
PreviewButton: Vista previa
|
||||
REORGANISATIONSUCCESSFUL: 'Reorganizado el árbol del sitio con éxito.'
|
||||
SAVEDUP: Guardado
|
||||
@ -412,6 +416,7 @@ es:
|
||||
Toggle: 'Cambiar'
|
||||
MemberImportForm:
|
||||
Help1: '<p>Importar usuarios en <em>formato CSV</em> (valores separados por coma). <small><a href="#" class="toggle-advanced">Mostrar uso avanzado</a></small></p>'
|
||||
Help2: '<div class="advanced"><h4>Uso avanzado</h4><ul><li>Columnas permitidas: <em>%s</em></li><li>Usuarios existentes son relacionados con su <em>Código único</em>, y actualizados con cualquier nuevo valor desde el archivo importado.</li><li>Grupos pueden ser asignados por la columna <em>Groups</em>. Grupos son identificados por su propiedad <em>Code</em>, multiples grupos pueden ser separados por una coma. La pertenencia a grupos existentes no se borra.</li></ul></div>'
|
||||
ResultCreated: 'Creados {count} miembros'
|
||||
ResultDeleted: 'Se eliminaron %d miembros'
|
||||
ResultNone: 'No hay cambios'
|
||||
@ -475,6 +480,7 @@ es:
|
||||
SINGULARNAME: Regla
|
||||
Title: Título
|
||||
PermissionRoleCode:
|
||||
PLURALNAME: 'Códigos de permiso'
|
||||
PermsError: 'No se puede asignar permisos privilegiados al código "% s" (requiere acceso de administrador)'
|
||||
SINGULARNAME: 'Códigos de las regla de permisos'
|
||||
Permissions:
|
||||
|
||||
117
lang/fa_IR.yml
117
lang/fa_IR.yml
@ -4,12 +4,18 @@ fa_IR:
|
||||
AssetTableField:
|
||||
DIM: ابعاد
|
||||
FILENAME: نام فايل
|
||||
FOLDER: پوشه
|
||||
LASTEDIT: 'آخرین تغییرات'
|
||||
OWNER: دارنده
|
||||
SIZE: 'حجم'
|
||||
TITLE: عنوان
|
||||
TYPE: 'نوع'
|
||||
URL: نشانی
|
||||
AssetUploadField:
|
||||
EDITALL: 'ویرایش همه'
|
||||
EDITINFO: 'ویرایش فایلها'
|
||||
FILES: فایلها
|
||||
TOTAL: مجموع
|
||||
BBCodeParser:
|
||||
ALIGNEMENT: جاگذاری
|
||||
ALIGNEMENTEXAMPLE: 'به راست'
|
||||
@ -26,13 +32,29 @@ fa_IR:
|
||||
UNDERLINEEXAMPLE: زیرخط
|
||||
Boolean:
|
||||
ANY: هر
|
||||
NOANSWER: 'خیر'
|
||||
YESANSWER: 'بله'
|
||||
CMSLoadingScreen_ss:
|
||||
LOADING: بارگذاری...
|
||||
CMSMain:
|
||||
SAVE: نگاهداری
|
||||
CMSMemberLoginForm:
|
||||
BUTTONFORGOTPASSWORD: 'رمز عبور را فراموش کردهاید؟'
|
||||
BUTTONLOGOUT: 'خروج'
|
||||
CMSPageHistoryController_versions_ss:
|
||||
PREVIEW: 'پیشنمایش وبسایت'
|
||||
CMSProfileController:
|
||||
MENUTITLE: 'پروفایل من'
|
||||
CMSSecurity:
|
||||
SUCCESS: موفقیت
|
||||
ChangePasswordEmail_ss:
|
||||
CHANGEPASSWORDTEXT1: 'شما گذرواژه تان را دگرگون کردید برای'
|
||||
EMAIL: ايميل
|
||||
HELLO: درود
|
||||
PASSWORD: كلمه عبور
|
||||
CheckboxField:
|
||||
NOANSWER: 'خیر'
|
||||
YESANSWER: 'بله'
|
||||
ConfirmedPasswordField:
|
||||
SHOWONCLICKTITLE: 'تغيير كلمه عبور'
|
||||
CreditCardField:
|
||||
@ -40,36 +62,76 @@ fa_IR:
|
||||
FOURTH: چهارم
|
||||
SECOND: دوم
|
||||
THIRD: سوم
|
||||
CurrencyField:
|
||||
CURRENCYSYMBOL: ﷼
|
||||
DataObject:
|
||||
PLURALNAME: 'داده های اشیاء'
|
||||
SINGULARNAME: 'داده اشیاء'
|
||||
Date:
|
||||
DAY: روز
|
||||
DAYS: روز
|
||||
HOUR: ساعت
|
||||
HOURS: ساعت
|
||||
LessThanMinuteAgo: 'کمتر از یک دقیقه'
|
||||
MIN: دقیقه
|
||||
MINS: دقیقه
|
||||
MONTH: ماه
|
||||
MONTHS: ماه
|
||||
SEC: ثانیه
|
||||
SECS: ثانیه
|
||||
TIMEDIFFAGO: '{difference} پیش'
|
||||
TIMEDIFFIN: 'در {difference}'
|
||||
YEAR: سال
|
||||
YEARS: سال
|
||||
DateField:
|
||||
TODAY: امروز
|
||||
DropdownField:
|
||||
CHOOSE: (گزینش)
|
||||
Enum:
|
||||
ANY: هر
|
||||
File:
|
||||
AviType: 'فایل ویدیو AVI'
|
||||
Content: محتوا
|
||||
CssType: 'فایل CSS'
|
||||
Filename: نام پرونده
|
||||
HtlType: 'فایل HTML'
|
||||
HtmlType: 'فایل HTML'
|
||||
Name: نام
|
||||
PLURALNAME: فايل ها
|
||||
SINGULARNAME: فايل
|
||||
Title: عنوان
|
||||
Folder:
|
||||
PLURALNAME: پوشهها
|
||||
SINGULARNAME: پوشه
|
||||
ForgotPasswordEmail_ss:
|
||||
HELLO: درود
|
||||
TEXT3: برای
|
||||
Form:
|
||||
SubmitBtnLabel: برو
|
||||
VALIDATIONPASSWORDSDONTMATCH: 'گذرواژهها همانند هم نیستند'
|
||||
VALIDATIONPASSWORDSNOTEMPTY: 'گذرواژه نباید تهی باشد'
|
||||
FormField:
|
||||
NONE: هیچ کدام
|
||||
GridAction:
|
||||
DELETE_DESCRIPTION: حذف
|
||||
Delete: حذف
|
||||
GridField:
|
||||
Find: بگرد
|
||||
ResetFilter: از نو
|
||||
GridFieldEditButton_ss:
|
||||
EDIT: ویرایش
|
||||
GridFieldItemEditView:
|
||||
Go_back: 'بازگشت'
|
||||
Group:
|
||||
Code: 'كد گروه'
|
||||
DefaultGroupTitleAdministrators: مدیران کل
|
||||
DefaultGroupTitleContentAuthors: 'نویسندگان مطالب'
|
||||
Description: توضحیات
|
||||
Locked: 'بسته شده است؟'
|
||||
PLURALNAME: گروهها
|
||||
Parent: 'گروه مادر'
|
||||
RolesAddEditLink: 'اضافه/ویرایش وظیفه'
|
||||
SINGULARNAME: گروه
|
||||
Sort: 'تربیت چیدن'
|
||||
has_many_Permissions: مجوزها
|
||||
many_many_Members: اعضاء
|
||||
@ -77,8 +139,11 @@ fa_IR:
|
||||
ResultDeleted: 'گروه %d حذف شد'
|
||||
ResultUpdated: 'گروه %d بروز شد'
|
||||
HtmlEditorField:
|
||||
ADDURL: 'افزودن URL'
|
||||
BUTTONINSERT: وارد کردن
|
||||
BUTTONINSERTLINK: 'گذاشتن پیوند'
|
||||
BUTTONREMOVELINK: 'برداشتن پیوند'
|
||||
BUTTONUpdate: به روزرسانی
|
||||
CSSCLASS: 'جاگیری / الگو'
|
||||
EMAIL: 'پست الکترونیک'
|
||||
FILE: پرونده
|
||||
@ -94,11 +159,25 @@ fa_IR:
|
||||
LINKTO: 'پیوند به'
|
||||
PAGE: برگ
|
||||
URL: نشانی
|
||||
Image:
|
||||
PLURALNAME: فایلها
|
||||
SINGULARNAME: فايل
|
||||
Image_Cached:
|
||||
PLURALNAME: فایلها
|
||||
SINGULARNAME: فايل
|
||||
LeftAndMain:
|
||||
DELETED: حذف شده
|
||||
HELP: کمک
|
||||
PERMAGAIN: 'شما از سیستم مدیریت محتوا خارج شده اید.اگر میخواهید دوباره وارد شوید نام کاربری و رمز عبور خود را در قسمت زیر وارد کنید'
|
||||
PreviewButton: پیشنمایش
|
||||
SAVEDUP: ذخیره شده
|
||||
LeftAndMain_Menu_ss:
|
||||
Hello: درود
|
||||
LOGOUT: 'خروج'
|
||||
LoginAttempt:
|
||||
Email: 'آدرس های ایمیل'
|
||||
Email: 'نشانی ایمیل'
|
||||
IP: 'نشانی IP'
|
||||
Status: وضعیت
|
||||
Member:
|
||||
BUTTONCHANGEPASSWORD: 'تغییر رمز عبور'
|
||||
BUTTONLOGIN: 'ورود'
|
||||
@ -116,20 +195,41 @@ fa_IR:
|
||||
SUBJECTPASSWORDCHANGED: 'گذرواژه شما دگرگون شد'
|
||||
SUBJECTPASSWORDRESET: 'پیوند ازنوسازی گذرواژه شما'
|
||||
SURNAME: نام خانوادگی
|
||||
TIMEFORMAT: 'قالب زمان'
|
||||
YOUROLDPASSWORD: 'رمز عبور قدیمی'
|
||||
belongs_many_many_Groups: گروهها
|
||||
db_LockedOutUntil: 'بسته شده تا '
|
||||
db_Password: رمز عبور
|
||||
db_PasswordExpiry: 'تاریخ از میان رفتن گذرواژه'
|
||||
MemberDatetimeOptionsetField:
|
||||
Preview: پیشنمایش
|
||||
MemberImportForm:
|
||||
ResultDeleted: 'کاربر %d حذف شد'
|
||||
ResultNone: 'تغییری ایجاد نشد'
|
||||
ModelAdmin:
|
||||
DELETE: حذف
|
||||
ModelAdmin_Tools_ss:
|
||||
FILTER: پالایش
|
||||
IMPORT: وارد کردن
|
||||
ModelSidebar_ss:
|
||||
IMPORT_TAB_HEADER: وارد کردن
|
||||
SEARCHLISTINGS: جستجو
|
||||
MoneyField:
|
||||
FIELDLABELAMOUNT: مقدار
|
||||
FIELDLABELCURRENCY: واحد پول
|
||||
NullableField:
|
||||
IsNullLabel: 'خالی است'
|
||||
Pagination:
|
||||
Page: صفحه
|
||||
View: نمایش
|
||||
Permission:
|
||||
AdminGroup: مدیر کل
|
||||
CMS_ACCESS_CATEGORY: 'دسترسی CMS'
|
||||
FULLADMINRIGHTS: 'تواناییهای کامل مدیریتی:'
|
||||
PermissionRole:
|
||||
PLURALNAME: وظایف
|
||||
SINGULARNAME: وظیفه
|
||||
Title: عنوان
|
||||
Permissions:
|
||||
PERMISSIONS_CATEGORY: 'مجوز دسترسی ها و وظایف'
|
||||
PhoneNumberField:
|
||||
@ -142,14 +242,29 @@ fa_IR:
|
||||
SecurityAdmin:
|
||||
APPLY_ROLES: 'اعمال وظایف به گروه'
|
||||
MEMBERS: کاربران
|
||||
MENUTITLE: امنیت
|
||||
NEWGROUP: 'گروه تازه'
|
||||
ROLES: وظایف
|
||||
TABROLES: وظایف
|
||||
Users: کاربران
|
||||
SecurityAdmin_MemberImportForm:
|
||||
BtnImport: 'وارد کردن'
|
||||
SilverStripeNavigator:
|
||||
Edit: ویرایش
|
||||
Mobile: موبایل
|
||||
Tablet: تبلت
|
||||
Width: پهنا
|
||||
SiteTree:
|
||||
TABMAIN: اصلی
|
||||
TableListField:
|
||||
Print: چاپ
|
||||
ToggleField:
|
||||
MORE: بیشتر
|
||||
UploadField:
|
||||
DOEDIT: ذخیره
|
||||
Dimensions: ابعاد
|
||||
EDIT: ویرایش
|
||||
REMOVE: حذف
|
||||
Saved: ذخیره شده
|
||||
Versioned:
|
||||
has_many_Versions: نسخه ها
|
||||
|
||||
@ -251,9 +251,9 @@ fr:
|
||||
CAPTIONTEXT: 'Légende'
|
||||
CSSCLASS: 'Alignement / Style'
|
||||
CSSCLASSCENTER: 'Centré'
|
||||
CSSCLASSLEFT: 'A gauche, avec texte à la ligne.'
|
||||
CSSCLASSLEFT: 'À gauche, avec texte autour.'
|
||||
CSSCLASSLEFTALONE: 'Sur la gauche seulement'
|
||||
CSSCLASSRIGHT: 'a droite, avec texte à la ligne.'
|
||||
CSSCLASSRIGHT: 'À droite, avec texte autour.'
|
||||
DETAILS: Détails
|
||||
EMAIL: 'Adresse email'
|
||||
FILE: Fichier
|
||||
|
||||
@ -326,6 +326,8 @@ it:
|
||||
DropdownBatchActionsDefault: Azioni
|
||||
HELP: Aiuto
|
||||
PERMAGAIN: 'Sei stato disconnesso dal CMS. Se desideri autenticarti nuovamente, inserisci qui sotto nome utente e password.'
|
||||
PERMALREADY: 'Siamo spiacenti, ma non puoi accedere a questa sezione del CMS. Se desideri autenticarti come qualcun altro, fallo qui sotto.'
|
||||
PERMDEFAULT: 'Devi essere autenticato per accedere all''area amministrativa; Per favore inserisci le tue credenziali qui sotto'
|
||||
PreviewButton: Anteprima
|
||||
REORGANISATIONSUCCESSFUL: 'Albero del sito riorganizzato con successo.'
|
||||
SAVEDUP: Salvato.
|
||||
|
||||
@ -292,8 +292,6 @@ sk:
|
||||
FROMWEB: 'Z webu'
|
||||
FindInFolder: 'Vyhľadať v priečinku'
|
||||
IMAGEALT: 'Atlernatívny text (alt)'
|
||||
IMAGEALTTEXT: 'Atlernatívny text (alt) - zobrazí sa ak obrázok nemože byť zobrazený '
|
||||
IMAGEALTTEXTDESC: 'Zobrazí sa na obrazovke, ak obrázok nemôže byť zobrazený'
|
||||
IMAGEDIMENSIONS: Rozmery
|
||||
IMAGEHEIGHTPX: Výška
|
||||
IMAGETITLE: 'Text titulky (tooltip) - pre doplňujúce informácie o obrázku'
|
||||
@ -328,11 +326,9 @@ sk:
|
||||
DELETED: Zmazané.
|
||||
DropdownBatchActionsDefault: Akcie
|
||||
HELP: Pomoc
|
||||
PAGETYPE: 'Typ stránky:'
|
||||
PERMAGAIN: 'Boli ste odhlásený'
|
||||
PERMALREADY: 'Je mi ľúto, ale nemáte prístup k tejto časti CMS. Ak sa chcete prihlásiť ako niekto iný, urobte tak nižšie'
|
||||
PERMDEFAULT: 'Musíte byť prihlásený/á k prístupu do oblasti administrácie, zadajte vaše prihlasovacie údaje dole, prosím.'
|
||||
PLEASESAVE: 'Uložte stránku, prosím. Táto stránka nemôže byť aktualizovaná, pretože eště nebola uložená.'
|
||||
PreviewButton: Náhľad
|
||||
REORGANISATIONSUCCESSFUL: 'Strom webu bol reorganizovaný úspešne.'
|
||||
SAVEDUP: Uložené.
|
||||
|
||||
@ -47,6 +47,8 @@ tr:
|
||||
ERRORNOTREC: 'Kullanıcı adı / şifre hatalı'
|
||||
Boolean:
|
||||
ANY: Herhangi
|
||||
NOANSWER: 'Hayır'
|
||||
YESANSWER: 'Evet'
|
||||
CMSMain:
|
||||
ACCESSALLINTERFACES: 'Tüm İYS arayüzlerine erişim'
|
||||
SAVE: Kaydet
|
||||
@ -56,6 +58,9 @@ tr:
|
||||
EMAIL: E-Posta
|
||||
HELLO: Merhaba
|
||||
PASSWORD: Parola
|
||||
CheckboxField:
|
||||
NOANSWER: 'Hayır'
|
||||
YESANSWER: 'Evet'
|
||||
ConfirmedPasswordField:
|
||||
SHOWONCLICKTITLE: 'Parola Değiştir'
|
||||
CreditCardField:
|
||||
@ -87,6 +92,7 @@ tr:
|
||||
TEXT2: 'şifre sıfırlama linki'
|
||||
TEXT3: için
|
||||
Form:
|
||||
SubmitBtnLabel: Başla
|
||||
VALIDATIONNOTUNIQUE: 'Girilen değer benzersiz olmalıdır'
|
||||
VALIDATIONPASSWORDSDONTMATCH: 'Şifre tekrarı hatalı'
|
||||
VALIDATIONPASSWORDSNOTEMPTY: 'Şifreler boş geçilemez'
|
||||
|
||||
34
lang/zh.yml
34
lang/zh.yml
@ -60,6 +60,8 @@ zh:
|
||||
ERRORNOTREC: '那个用户名 / 密码无法被辨认'
|
||||
Boolean:
|
||||
ANY: 任何
|
||||
NOANSWER: '不是'
|
||||
YESANSWER: '是'
|
||||
CMSLoadingScreen_ss:
|
||||
LOADING: 正在载入……
|
||||
REQUIREJS: 'CMS 要求您启用 JavaScript。'
|
||||
@ -68,16 +70,35 @@ zh:
|
||||
ACCESSALLINTERFACES: '对所有 CMS 部分的访问'
|
||||
ACCESSALLINTERFACESHELP: '支配更多的特殊访问设置'
|
||||
SAVE: 保存
|
||||
CMSMemberLoginForm:
|
||||
BUTTONFORGOTPASSWORD: '忘记密码？'
|
||||
BUTTONLOGIN: '重新登录'
|
||||
BUTTONLOGOUT: '登出'
|
||||
PASSWORDEXPIRED: '<p>您的密码已过期。 <a target="_top" href="{link}">请选择一个新的。</a></ P>'
|
||||
CMSPageHistoryController_versions_ss:
|
||||
PREVIEW: '网站预览'
|
||||
CMSProfileController:
|
||||
MENUTITLE: '我的个人资料'
|
||||
CMSSecurity:
|
||||
INVALIDUSER: '<p>用户已无效。 <a target="_top" href="{link}">请在此继续重新进行身份验证</a>。</ p>'
|
||||
LoginMessage: '<p>如果您有任何未保存的工作，你可以重新登录以回到你未保存的地方。</p>'
|
||||
SUCCESS: 成功
|
||||
SUCCESSCONTENT: '<p>登录成功。如果您没有自动重定向<a target="_top" href="{link}">点击此处</a></p>'
|
||||
TimedOutTitleAnonymous: '你的登陆超时已过期。'
|
||||
TimedOutTitleMember: '你好{name}!<br />你的登陆超时已过期。'
|
||||
ChangePasswordEmail_ss:
|
||||
CHANGEPASSWORDTEXT1: '您的密码已更改为：'
|
||||
CHANGEPASSWORDTEXT2: '现在，您可以使用下列证书来登录了：'
|
||||
EMAIL: 电子邮件
|
||||
HELLO: 您好
|
||||
PASSWORD: 密码
|
||||
CheckboxField:
|
||||
NOANSWER: '不是'
|
||||
YESANSWER: '是'
|
||||
CheckboxFieldSetField:
|
||||
SOURCE_VALIDATION: '请选择列表内提供的选项。{value}不是一个有效的选项'
|
||||
CheckboxSetField:
|
||||
SOURCE_VALIDATION: '请选择列表内提供的选项。''{value}''不是一个有效的选项'
|
||||
ConfirmedPasswordField:
|
||||
ATLEAST: '密码长度必须至少 {min} 个字符。'
|
||||
BETWEEN: '密码长度必须含 {min} 到 {max} 个字符。'
|
||||
@ -124,6 +145,7 @@ zh:
|
||||
DropdownField:
|
||||
CHOOSE: （选择）
|
||||
CHOOSESEARCH: '（选择或搜索）'
|
||||
SOURCE_VALIDATION: '请选择列表内提供的选项。{value}不是一个有效的选项'
|
||||
EmailField:
|
||||
VALIDATION: '请输入一个电子邮件地址'
|
||||
Enum:
|
||||
@ -171,6 +193,7 @@ zh:
|
||||
TEXT2: '密码重设链接'
|
||||
TEXT3: 为
|
||||
Form:
|
||||
CSRF_FAILED_MESSAGE: '似乎是一个技术问题。请点击返回按钮，刷新浏览器，然后再试一次。'
|
||||
FIELDISREQUIRED: '{name} 为必填'
|
||||
SubmitBtnLabel: 前往
|
||||
VALIDATIONCREDITNUMBER: '请确保您输入了正确的 {number} 信用卡号码'
|
||||
@ -244,6 +267,8 @@ zh:
|
||||
HtmlEditorField:
|
||||
ADDURL: '添加网址'
|
||||
ADJUSTDETAILSDIMENSIONS: '详情 &amp; 体积'
|
||||
ANCHORSCANNOTACCESSPAGE: '您不允许访问该页面的内容。'
|
||||
ANCHORSPAGENOTFOUND: '无法找到该页面。'
|
||||
ANCHORVALUE: 固定
|
||||
BUTTONADDURL: '添加网址'
|
||||
BUTTONINSERT: 插入
|
||||
@ -282,6 +307,7 @@ zh:
|
||||
LINKOPENNEWWIN: '在新窗口中打开链接？'
|
||||
LINKTO: '链接到'
|
||||
PAGE: 页面
|
||||
SUBJECT: '电子邮件标题'
|
||||
URL: 网址
|
||||
URLNOTANOEMBEDRESOURCE: '''{url}'' 该网址无法转换成媒体来源。'
|
||||
UpdateMEDIA: '更新媒体'
|
||||
@ -299,15 +325,19 @@ zh:
|
||||
DropdownBatchActionsDefault: 动作
|
||||
HELP: 帮助
|
||||
PERMAGAIN: '您已经退出 CMS。如果您想再次登录，请在下面输入用户名和密码。'
|
||||
PERMALREADY: '抱歉，您不能访问这一部分的后台管理。如果您想以不同的身份登录，请在下面进行操作。'
|
||||
PreviewButton: 预览
|
||||
REORGANISATIONSUCCESSFUL: '重新组织网站地图已成功'
|
||||
SAVEDUP: 已保存。
|
||||
ShowAsList: '以列表方式展示'
|
||||
TooManyPages: '页面数目过多'
|
||||
ValidationError: '验证错误'
|
||||
VersionUnknown: 未知
|
||||
LeftAndMain_Menu_ss:
|
||||
Hello: 您好
|
||||
LOGOUT: '退出'
|
||||
ListboxField:
|
||||
SOURCE_VALIDATION: '请选择列表内提供的选项。%s不是一个有效的选项'
|
||||
LoginAttempt:
|
||||
Email: '电子邮件地址'
|
||||
IP: 'IP 地址'
|
||||
@ -340,6 +370,7 @@ zh:
|
||||
NEWPASSWORD: '新密码'
|
||||
NoPassword: '该成员无密码'
|
||||
PASSWORD: 密码
|
||||
PASSWORDEXPIRED: '您的密码已过期。 请选择一个新的。'
|
||||
PLURALNAME: 成员
|
||||
REMEMBERME: '下次记住我？'
|
||||
SINGULARNAME: 成员
|
||||
@ -445,6 +476,7 @@ zh:
|
||||
SINGULARNAME: 角色
|
||||
Title: 标题
|
||||
PermissionRoleCode:
|
||||
PLURALNAME: '权限角色代码'
|
||||
PermsError: '无法为代码 "%s"分配特权权限（要求具备 ADMIN 访问）'
|
||||
SINGULARNAME: '权限角色代码'
|
||||
Permissions:
|
||||
@ -510,6 +542,8 @@ zh:
|
||||
Print: 打印
|
||||
TableListField_PageControls_ss:
|
||||
OF: 的
|
||||
TextField:
|
||||
VALIDATEMAXLENGTH: '{name} 的长度必须至多{maxLength} 个字符。'
|
||||
TimeField:
|
||||
VALIDATEFORMAT: '请输入有效的时间格式 ({format})'
|
||||
ToggleField:
|
||||
|
||||
@ -43,6 +43,13 @@ class RSSFeedTest extends SapphireTest {
|
||||
$this->assertContains('<description>ItemC AltContent</description>', $content);
|
||||
}
|
||||
|
||||
public function testLinkEncoding() {
|
||||
$list = new ArrayList();
|
||||
$rssFeed = new RSSFeed($list, "http://www.example.com/?param1=true¶m2=true", "Test RSS Feed");
|
||||
$content = $rssFeed->outputToBrowser();
|
||||
$this->assertContains('<link>http://www.example.com/?param1=true&param2=true', $content);
|
||||
}
|
||||
|
||||
public function testRSSFeedWithShortcode() {
|
||||
$list = new ArrayList();
|
||||
$list->push(new RSSFeedTest_ItemD());
|
||||
|
||||
@ -226,6 +226,7 @@ class FormTest extends FunctionalTest {
|
||||
'FormTest_Controller/Form',
|
||||
array(
|
||||
'Email' => 'invalid',
|
||||
'Number' => '<a href="http://mysite.com">link</a>' // XSS attempt
|
||||
// leaving out "Required" field
|
||||
)
|
||||
);
|
||||
@ -244,6 +245,16 @@ class FormTest extends FunctionalTest {
|
||||
'Required fields show a notification on field when left blank'
|
||||
);
|
||||
|
||||
$this->assertContains(
|
||||
''<a href="http://mysite.com">link</a>' is not a number, only numbers can be accepted for this field',
|
||||
$response->getBody(),
|
||||
"Validation messages are safely XML encoded"
|
||||
);
|
||||
$this->assertNotContains(
|
||||
'<a href="http://mysite.com">link</a>',
|
||||
$response->getBody(),
|
||||
"Unsafe content is not emitted directly inside the response body"
|
||||
);
|
||||
}
|
||||
|
||||
public function testSessionSuccessMessage() {
|
||||
@ -630,7 +641,8 @@ class FormTest_Controller extends Controller implements TestOnly {
|
||||
new FieldList(
|
||||
new EmailField('Email'),
|
||||
new TextField('SomeRequiredField'),
|
||||
new CheckboxSetField('Boxes', null, array('1'=>'one','2'=>'two'))
|
||||
new CheckboxSetField('Boxes', null, array('1'=>'one','2'=>'two')),
|
||||
new NumericField('Number')
|
||||
),
|
||||
new FieldList(
|
||||
new FormAction('doSubmit')
|
||||
|
||||
@ -1,9 +1,28 @@
|
||||
<?php
|
||||
|
||||
class SSViewerTest extends SapphireTest {
|
||||
|
||||
/**
|
||||
* Backup of $_SERVER global
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $oldServer = array();
|
||||
|
||||
protected $extraDataObjects = array(
|
||||
'SSViewerTest_Object',
|
||||
);
|
||||
|
||||
public function setUp() {
|
||||
parent::setUp();
|
||||
Config::inst()->update('SSViewer', 'source_file_comments', false);
|
||||
Config::inst()->update('SSViewer_FromString', 'cache_template', false);
|
||||
$this->oldServer = $_SERVER;
|
||||
}
|
||||
|
||||
public function tearDown() {
|
||||
$_SERVER = $this->oldServer;
|
||||
parent::tearDown();
|
||||
}
|
||||
|
||||
/**
|
||||
@ -1160,10 +1179,13 @@ after')
|
||||
$orig = Config::inst()->get('SSViewer', 'rewrite_hash_links');
|
||||
Config::inst()->update('SSViewer', 'rewrite_hash_links', true);
|
||||
|
||||
$_SERVER['REQUEST_URI'] = 'http://path/to/file?foo"onclick="alert(\'xss\')""';
|
||||
$_SERVER['HTTP_HOST'] = 'www.mysite.com';
|
||||
$_SERVER['REQUEST_URI'] = '//file.com?foo"onclick="alert(\'xss\')""';
|
||||
|
||||
// Emulate SSViewer::process()
|
||||
$base = Convert::raw2att($_SERVER['REQUEST_URI']);
|
||||
// Note that leading double slashes have been rewritten to prevent these being mis-interepreted
|
||||
// as protocol-less absolute urls
|
||||
$base = Convert::raw2att('/file.com?foo"onclick="alert(\'xss\')""');
|
||||
|
||||
$tmplFile = TEMP_FOLDER . '/SSViewerTest_testRewriteHashlinks_' . sha1(rand()) . '.ss';
|
||||
|
||||
@ -1231,10 +1253,11 @@ after')
|
||||
$obj = new ViewableData();
|
||||
$obj->InsertedLink = '<a class="inserted" href="#anchor">InsertedLink</a>';
|
||||
$result = $tmpl->process($obj);
|
||||
$this->assertContains(
|
||||
'<a class="inserted" href="<?php echo Convert::raw2att(',
|
||||
$result
|
||||
);
|
||||
|
||||
$code = <<<'EOC'
|
||||
<a class="inserted" href="<?php echo Convert::raw2att(preg_replace("/^(\/)+/", "/", $_SERVER['REQUEST_URI'])); ?>#anchor">InsertedLink</a>
|
||||
EOC;
|
||||
$this->assertContains($code, $result);
|
||||
// TODO Fix inline links in PHP mode
|
||||
// $this->assertContains(
|
||||
// '<a class="inline" href="<?php echo str_replace(',
|
||||
|
||||
@ -4681,11 +4681,15 @@ class SSTemplateParser extends Parser implements TemplateParser {
|
||||
|
||||
// TODO: This is pretty ugly & gets applied on all files not just html. I wonder if we can make this
|
||||
// non-dynamically calculated
|
||||
$code = <<<'EOC'
|
||||
(\Config::inst()->get('SSViewer', 'rewrite_hash_links')
|
||||
? \Convert::raw2att( preg_replace("/^(\\/)+/", "/", $_SERVER['REQUEST_URI'] ) )
|
||||
: "")
|
||||
EOC;
|
||||
// Because preg_replace replacement requires escaped slashes, addcslashes here
|
||||
$text = preg_replace(
|
||||
'/(<a[^>]+href *= *)"#/i',
|
||||
'\\1"\' . (Config::inst()->get(\'SSViewer\', \'rewrite_hash_links\') ?' .
|
||||
' Convert::raw2att( $_SERVER[\'REQUEST_URI\'] ) : "") .
|
||||
\'#',
|
||||
'\\1"\' . ' . addcslashes($code, '\\') . ' . \'#',
|
||||
$text
|
||||
);
|
||||
|
||||
|
||||
@ -1135,11 +1135,15 @@ class SSTemplateParser extends Parser implements TemplateParser {
|
||||
|
||||
// TODO: This is pretty ugly & gets applied on all files not just html. I wonder if we can make this
|
||||
// non-dynamically calculated
|
||||
$code = <<<'EOC'
|
||||
(\Config::inst()->get('SSViewer', 'rewrite_hash_links')
|
||||
? \Convert::raw2att( preg_replace("/^(\\/)+/", "/", $_SERVER['REQUEST_URI'] ) )
|
||||
: "")
|
||||
EOC;
|
||||
// Because preg_replace replacement requires escaped slashes, addcslashes here
|
||||
$text = preg_replace(
|
||||
'/(<a[^>]+href *= *)"#/i',
|
||||
'\\1"\' . (Config::inst()->get(\'SSViewer\', \'rewrite_hash_links\') ?' .
|
||||
' Convert::raw2att( $_SERVER[\'REQUEST_URI\'] ) : "") .
|
||||
\'#',
|
||||
'\\1"\' . ' . addcslashes($code, '\\') . ' . \'#',
|
||||
$text
|
||||
);
|
||||
|
||||
|
||||
@ -1111,9 +1111,9 @@ class SSViewer implements Flushable {
|
||||
if($this->rewriteHashlinks && $rewrite) {
|
||||
if(strpos($output, '<base') !== false) {
|
||||
if($rewrite === 'php') {
|
||||
$thisURLRelativeToBase = "<?php echo Convert::raw2att(\$_SERVER['REQUEST_URI']); ?>";
|
||||
$thisURLRelativeToBase = "<?php echo Convert::raw2att(preg_replace(\"/^(\\\\/)+/\", \"/\", \$_SERVER['REQUEST_URI'])); ?>";
|
||||
} else {
|
||||
$thisURLRelativeToBase = Convert::raw2att($_SERVER['REQUEST_URI']);
|
||||
$thisURLRelativeToBase = Convert::raw2att(preg_replace("/^(\\/)+/", "/", $_SERVER['REQUEST_URI']));
|
||||
}
|
||||
|
||||
$output = preg_replace('/(<a[^>]+href *= *)"#/i', '\\1"' . $thisURLRelativeToBase . '#', $output);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user