projects
/
namibia
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
70bc998
)
updates
author
Mark
<mark@nirph.com>
Mon, 12 Dec 2016 11:55:35 +0000
(13:55 +0200)
committer
Mark
<mark@nirph.com>
Mon, 12 Dec 2016 11:55:35 +0000
(13:55 +0200)
module/Utility/src/Utility/Comms/Sms.php
patch
|
blob
|
history
module/Valuation/src/Valuation/Controller/XmlRpcController.php
patch
|
blob
|
history
public/js/app/router.js
patch
|
blob
|
history
public/js/app/workspace.js
patch
|
blob
|
history
refresh-proxies.sh
patch
|
blob
|
history
diff --git
a/module/Utility/src/Utility/Comms/Sms.php
b/module/Utility/src/Utility/Comms/Sms.php
index
e4e627e
..
8f2d116
100644
(file)
--- a/
module/Utility/src/Utility/Comms/Sms.php
+++ b/
module/Utility/src/Utility/Comms/Sms.php
@@
-263,6
+263,8
@@
class Sms
. "&to=$this->sTo"
. "&text=".substr(urlencode($this->sBody),0,620);
. "&to=$this->sTo"
. "&text=".substr(urlencode($this->sBody),0,620);
+ \Utility\Debug::errorLog("sms url", $sUrl);
+
if (!empty($this->sSmscId))
{
$sUrl .= "&smsc=" . $this->sSmscId;
if (!empty($this->sSmscId))
{
$sUrl .= "&smsc=" . $this->sSmscId;
diff --git
a/module/Valuation/src/Valuation/Controller/XmlRpcController.php
b/module/Valuation/src/Valuation/Controller/XmlRpcController.php
index
e1e6a7d
..
ac96640
100644
(file)
--- a/
module/Valuation/src/Valuation/Controller/XmlRpcController.php
+++ b/
module/Valuation/src/Valuation/Controller/XmlRpcController.php
@@
-88,8
+88,8
@@
class XmlRpcController extends \Zend\Mvc\Controller\AbstractActionController
ini_set('memory_limit','512M');
try {
$url = IS_DEV_ENV
ini_set('memory_limit','512M');
try {
$url = IS_DEV_ENV
- ? 'http://
bid4cars
.local/xmlrpc/1.0'
- : 'http://bid4cars.
nirph.com
/xmlrpc/1.0';
+ ? 'http://
namibia
.local/xmlrpc/1.0'
+ : 'http://bid4cars.
com.na
/xmlrpc/1.0';
$client = new \Zend\XmlRpc\Client($url);
//$client = new \Zend\XmlRpc\Client($url . '/callback');
$arg1 = '4afb4a290f971186654f18dd6a13a7d7';
$client = new \Zend\XmlRpc\Client($url);
//$client = new \Zend\XmlRpc\Client($url . '/callback');
$arg1 = '4afb4a290f971186654f18dd6a13a7d7';
diff --git
a/public/js/app/router.js
b/public/js/app/router.js
index
4f84a86
..
66c4fc9
100644
(file)
--- a/
public/js/app/router.js
+++ b/
public/js/app/router.js
@@
-277,8
+277,8
@@
}
if ('home' == page
}
if ('home' == page
- && ('
bid4cars
.local' == window.location.host
- || '
bid4cars
.nirph.com' == window.location.host
+ && ('
namibia
.local' == window.location.host
+ || '
namibia
.nirph.com' == window.location.host
|| 'www.bid4cars.com.na' == window.location.host))
{
page = 'dealerhome';
|| 'www.bid4cars.com.na' == window.location.host))
{
page = 'dealerhome';
diff --git
a/public/js/app/workspace.js
b/public/js/app/workspace.js
index
cecb1d5
..
ad0330c
100644
(file)
--- a/
public/js/app/workspace.js
+++ b/
public/js/app/workspace.js
@@
-1158,8
+1158,8
@@
App.API.getTask(
'getActiveAccount', 'User', 'Profile.ActiveAccount', null,
{}, function() {
App.API.getTask(
'getActiveAccount', 'User', 'Profile.ActiveAccount', null,
{}, function() {
- if ('
bid4cars
.nirph.com' != window.location.hostname
- && '
bid4cars
.local' != window.location.hostname
+ if ('
namibia
.nirph.com' != window.location.hostname
+ && '
namibia
.local' != window.location.hostname
&& 'bid4cars.com.na' != window.location.hostname)
{
alert('Please click ok to refresh this page.');
&& 'bid4cars.com.na' != window.location.hostname)
{
alert('Please click ok to refresh this page.');
@@
-1178,8
+1178,8
@@
App.API.getTask(
'getActiveAccount', 'User', 'Profile.ActiveAccount', null,
{}, function() {
App.API.getTask(
'getActiveAccount', 'User', 'Profile.ActiveAccount', null,
{}, function() {
- if ('
bid4cars
.nirph.com' != window.location.hostname
- && '
bid4cars
.local' != window.location.hostname
+ if ('
namibia
.nirph.com' != window.location.hostname
+ && '
namibia
.local' != window.location.hostname
&& 'bid4cars.com.na' != window.location.hostname)
{
alert('Please click ok to refresh this page.');
&& 'bid4cars.com.na' != window.location.hostname)
{
alert('Please click ok to refresh this page.');
@@
-1516,7
+1516,7
@@
&& true == App.permissions.accessAdminModule)
{
_w.initAdmin();
&& true == App.permissions.accessAdminModule)
{
_w.initAdmin();
- if ('
bid4cars
.local' != window.location.hostname)
+ if ('
namibia
.local' != window.location.hostname)
{
window.location.hash = '/admin';
}
{
window.location.hash = '/admin';
}
diff --git
a/refresh-proxies.sh
b/refresh-proxies.sh
index
3c9ea93
..
d010c1f
100644
(file)
--- a/
refresh-proxies.sh
+++ b/
refresh-proxies.sh
@@
-6,6
+6,6
@@
rm -f data/DoctrineORMModule/Proxy/__CG__*
mv /tmp/__CG__* data/DoctrineORMModule/Proxy/
echo -e "\nKicking the cache..."
rm -rf data/cache/module*
mv /tmp/__CG__* data/DoctrineORMModule/Proxy/
echo -e "\nKicking the cache..."
rm -rf data/cache/module*
-wget "http://
bid4cars
.local/ck.php"
+wget "http://
namibia
.local/ck.php"
rm -f ck.*
rm -f ck.*