bob
/
westdc-zf1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge r2058

This commit is contained in:
wlx 2012-03-16 07:34:48 +00:00
parent 4851a82986
commit eed2a9dec0
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/default/controllers/ServiceController.php
View File

@ -1224,9 +1224,8 @@ class ServiceController extends Zend_Controller_Action
$sql='select username,md5(password) as pwd from users where id='.$user->id; $sql='select username,md5(password) as pwd from users where id='.$user->id;
$row=$this->db->fetchRow($sql); $row=$this->db->fetchRow($sql);
$login=$this->config->geonetwork->url.'/srv/en/xml.user.login?username='.$row->username.'&password='.$row->pwd; $login=$this->config->geonetwork->url.'/srv/en/xml.user.login?username='.$row->username.'&password='.$row->pwd;
$url = $this->_request->getParam('url'); $url = $this->config->geonetwork->url.'/srv/cn/'.$this->_request->getParam('url');
if empty($url)
$url='/geonetwork/srv/cn/';
$body='<html> $body='<html>
<script type="text/javascript" src="/js/jquery-1.7.min.js"></script> <script type="text/javascript" src="/js/jquery-1.7.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">