// Merge -> revision 8800

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8808 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-09-27 14:30:06 +00:00
parent 05fde82c53
commit 1b6d0d1be3
110 changed files with 1240 additions and 1066 deletions
@@ -959,7 +959,7 @@ class TSBuyerProtection extends AbsTrustedShops
private function _displayFormRegistrationLink($link = false)
{
$out = '
<form action="'.$this->_makeFormAction($_SERVER['REQUEST_URI'], $this->id_tab).'" method="post" >
<form action="'.$this->_makeFormAction(Tools::safeOutput($_SERVER['REQUEST_URI']), $this->id_tab).'" method="post" >
<fieldset>
<legend><img src="../img/admin/cog.gif" alt="" />'.$this->l('Get the Registration Link').'</legend>
<p>'.$this->l('This variable was sent to you via e-mail by TrustedShops').'</p>
@@ -999,7 +999,7 @@ class TSBuyerProtection extends AbsTrustedShops
private function _displayFormAddCertificate()
{
$out = '
<form action="'.$this->_makeFormAction($_SERVER['REQUEST_URI'], $this->id_tab).'" method="post" >
<form action="'.$this->_makeFormAction(Tools::safeOutput($_SERVER['REQUEST_URI']), $this->id_tab).'" method="post" >
<fieldset>
<legend><img src="../img/admin/cog.gif" alt="" />'.$this->l('Add Trusted Shops certificate').'</legend>
<label>'.$this->l('New certificate').'</label>
@@ -1024,7 +1024,7 @@ class TSBuyerProtection extends AbsTrustedShops
});
});
</script>
<form action="'.$this->_makeFormAction($_SERVER['REQUEST_URI'], $this->id_tab).'" method="post" >
<form action="'.$this->_makeFormAction(Tools::safeOutput($_SERVER['REQUEST_URI']), $this->id_tab).'" method="post" >
<fieldset>
<legend><img src="../img/admin/cog.gif" alt="" />'.$this->l('Manage Trusted Shops certificates').'</legend>
<table width="100%">
@@ -1129,7 +1129,7 @@ class TSBuyerProtection extends AbsTrustedShops
});
</script>
<form action="'.$this->_makeFormAction($_SERVER['REQUEST_URI'], $this->id_tab).'" method="post" >
<form action="'.$this->_makeFormAction(Tools::safeOutput($_SERVER['REQUEST_URI']), $this->id_tab).'" method="post" >
<fieldset>
<legend><img src="../img/admin/tab-tools.gif" alt="" />'.$this->l('Edit certificate').'</legend>
<input type="hidden" name="iso_lang" value="'.$certificate['language'].'" />