fix
This commit is contained in:
@@ -33,7 +33,7 @@ class Welcome extends Bko_Controller {
|
||||
//var_dump($out);
|
||||
if ($ret == PHP_API_OK) {
|
||||
$this->buildUserSession($ret, $out);
|
||||
redirect('dash');
|
||||
redirect('start');
|
||||
} else {
|
||||
$data['action_message'] = $this->formatedMesage('ERROR', 'Invalid Username/Password');
|
||||
}
|
||||
|
||||
@@ -68,12 +68,12 @@ class COR_Controller extends CI_Controller {
|
||||
}
|
||||
|
||||
protected function savvy_api($in, &$out) {
|
||||
global $savvyext;
|
||||
global $coregrade;
|
||||
$ret = -1;
|
||||
$in['pid'] = 115;
|
||||
$in['backoffice'] = 1;
|
||||
error_log(json_encode($in));
|
||||
$out = $savvyext->savvyext_api($in);
|
||||
$out = $coregrade->coregrade_api($in);
|
||||
$ret = $out["retval"];
|
||||
error_log("ret = $ret");
|
||||
error_log(json_encode($out));
|
||||
@@ -81,12 +81,12 @@ class COR_Controller extends CI_Controller {
|
||||
}
|
||||
|
||||
protected function main_api_post($endpoint,$payload) {
|
||||
global $savvyext;
|
||||
global $coregrade;
|
||||
|
||||
$httpAuthToken = $savvyext->cfgReadChar('system.oauth2_token');
|
||||
$encryptionAlg = $savvyext->cfgReadChar('encryption.algorithm');
|
||||
$encryptionKey = $savvyext->cfgReadChar('encryption.key');
|
||||
$encryptionIV = $savvyext->cfgReadChar('encryption.iv');
|
||||
$httpAuthToken = $coregrade->cfgReadChar('system.oauth2_token');
|
||||
$encryptionAlg = $coregrade->cfgReadChar('encryption.algorithm');
|
||||
$encryptionKey = $coregrade->cfgReadChar('encryption.key');
|
||||
$encryptionIV = $coregrade->cfgReadChar('encryption.iv');
|
||||
|
||||
$encrypted_payload = bin2hex(
|
||||
openssl_encrypt(
|
||||
@@ -97,7 +97,7 @@ class COR_Controller extends CI_Controller {
|
||||
$encryptionIV
|
||||
));
|
||||
$postdata = "{\"encrypted_payload\": \"${encrypted_payload}\"}";
|
||||
$url = $savvyext->cfgReadChar('system.api_url').$endpoint;
|
||||
$url = $coregrade->cfgReadChar('system.api_url').$endpoint;
|
||||
|
||||
$ch = curl_init($url);
|
||||
curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
|
||||
@@ -133,14 +133,14 @@ class COR_Controller extends CI_Controller {
|
||||
}
|
||||
|
||||
protected function main_api_get($endpoint,$payload) {
|
||||
global $savvyext;
|
||||
global $coregrade;
|
||||
|
||||
$httpAuthToken = $savvyext->cfgReadChar('system.oauth2_token');
|
||||
$encryptionAlg = $savvyext->cfgReadChar('encryption.algorithm');
|
||||
$encryptionKey = $savvyext->cfgReadChar('encryption.key');
|
||||
$encryptionIV = $savvyext->cfgReadChar('encryption.iv');
|
||||
$httpAuthToken = $coregrade->cfgReadChar('system.oauth2_token');
|
||||
$encryptionAlg = $coregrade->cfgReadChar('encryption.algorithm');
|
||||
$encryptionKey = $coregrade->cfgReadChar('encryption.key');
|
||||
$encryptionIV = $coregrade->cfgReadChar('encryption.iv');
|
||||
|
||||
$url = $savvyext->cfgReadChar('system.api_url').$endpoint.$payload;
|
||||
$url = $coregrade->cfgReadChar('system.api_url').$endpoint.$payload;
|
||||
//echo $url;
|
||||
$ch = curl_init($url);
|
||||
curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "GET");
|
||||
|
||||
@@ -135,176 +135,26 @@
|
||||
</ul>
|
||||
<ul class="nav navbar-nav navbar-right" style="background-color:#B22222;">
|
||||
|
||||
<li class="dropdown dropdown-user">
|
||||
<a class="dropdown-toggle" data-toggle="dropdown">
|
||||
<span>Member</span>
|
||||
<i class="caret"></i>
|
||||
</a>
|
||||
|
||||
<ul class="dropdown-menu dropdown-menu-right">
|
||||
<li><a href="/member/trackedemail"><i class="icon-user-plus"></i>Tracked Email</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
|
||||
<li class="dropdown dropdown-user">
|
||||
<a class="dropdown-toggle" data-toggle="dropdown">
|
||||
<span>Cards</span>
|
||||
<span>Configure</span>
|
||||
<i class="caret"></i>
|
||||
</a>
|
||||
|
||||
<ul class="dropdown-menu dropdown-menu-right">
|
||||
<li><a href="/cards"><i class="icon-user-plus"></i>App Cards</a></li>
|
||||
<li><a href="/subscription/subscriptionreport"><i class="icon-user-plus"></i>Classroom Templates</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="/cards/surveycards"><i class="icon-user-plus"></i>Survey Cards</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="/cards/dynamiccards"><i class="icon-user-plus"></i>Manage Dynamic Cards</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="/cards/arcvcards"><i class="icon-user-plus"></i>Archived Cards</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="/cards/deletedcards"><i class="icon-user-plus"></i>Deleted Cards</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="#"><i class="icon-user-plus"></i> Not used yet....</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
<li class="dropdown dropdown-user">
|
||||
<a class="dropdown-toggle" data-toggle="dropdown">
|
||||
<span>Subscription</span>
|
||||
<i class="caret"></i>
|
||||
</a>
|
||||
|
||||
<ul class="dropdown-menu dropdown-menu-right">
|
||||
<li><a href="/subscription/subscriptionreport"><i class="icon-user-plus"></i>Subscription Report</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="/subscription/carpoolreport"><i class="icon-user-plus"></i>CarPool Report</a></li>
|
||||
<li><a href="#"><i class="icon-user-plus"></i>.... ..... ....</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="/subscription/carpoolfriend"><i class="icon-user-plus"></i>CarPool Friend</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="/subscription"><i class="icon-user-plus"></i>Configured</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="#"><i class="icon-user-plus"></i>........</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
<li class="dropdown dropdown-user">
|
||||
<a class="dropdown-toggle" data-toggle="dropdown">
|
||||
<span>Surveys</span>
|
||||
<i class="caret"></i>
|
||||
</a>
|
||||
|
||||
<ul class="dropdown-menu dropdown-menu-right">
|
||||
<li><a href="/subscription/surveyreport"><i class="icon-user-plus"></i>Survey Report</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="/subscription"><i class="icon-user-plus"></i>Survey List</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="#"><i class="icon-user-plus"></i>........</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
<li class="dropdown dropdown-user">
|
||||
<a class="dropdown-toggle" data-toggle="dropdown">
|
||||
<span>Points</span>
|
||||
<i class="caret"></i>
|
||||
</a>
|
||||
|
||||
<ul class="dropdown-menu dropdown-menu-right">
|
||||
<li><a href="/points"><i class="icon-user-plus"></i>Redeem Report</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="/bkoadmin/points"><i class="icon-user-plus"></i>Points Settings</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="/points/assignpoints"><i class="icon-user-plus"></i>Assign Points</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
<li class="dropdown dropdown-user">
|
||||
<a class="dropdown-toggle" data-toggle="dropdown">
|
||||
<span>Tools</span>
|
||||
<i class="caret"></i>
|
||||
</a>
|
||||
|
||||
<ul class="dropdown-menu dropdown-menu-right">
|
||||
<li><a href="/uploads/cardimages"><i class="icon-user-plus"></i>Card Images</a></li>
|
||||
<!-- li class="divider"></li>
|
||||
<li><a href="/bkoadmin/cards"><i class="icon-user-plus"></i>App Cards</a></li>
|
||||
<li><a href="/bkoadmin/arcvcards"><i class="icon-user-plus"></i>Deleted Cards</a></li -->
|
||||
<li class="divider"></li>
|
||||
<li><a href="/tools/pointsofinterest"><i class="icon-user-plus"></i>Point of Interest[POS]</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="/tools/gpstriggeraddress"><i class="icon-user-plus"></i>GPS Trigger Addresses</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="/tools/neighborhood"><i class="icon-user-plus"></i>Neighborhood Settings</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="/advice/advicelist"><i class="icon-user-plus"></i>Advice List</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="/advice/receiptadvice"><i class="icon-user-plus"></i>Receipt Advice</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="/acl/index"><i class="icon-user-plus"></i>ACL</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="/Acl_WhiteList/index"><i class="icon-user-plus"></i>ACL WhiteList Extra</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="/Global_settings/index"><i class="icon-user-plus"></i>Global Setting</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="/Addresses/index"><i class="icon-user-plus"></i>Addresses</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="/Geofence_area_anchor/index"><i class="icon-user-plus"></i>Geofence Area Anchor</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="/Credit_cards/index"><i class="icon-user-plus"></i>Credit Card Benefits</a></li>
|
||||
|
||||
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
|
||||
<li class="dropdown dropdown-user">
|
||||
<a class="dropdown-toggle" data-toggle="dropdown">
|
||||
<span>System</span>
|
||||
<i class="caret"></i>
|
||||
</a>
|
||||
|
||||
<ul class="dropdown-menu dropdown-menu-right">
|
||||
<!-- li><a href="/bkoreport/decisionstatus"><i class="icon-user-plus"></i>Personalty Group</a></li>
|
||||
<li class="divider"></li -->
|
||||
<li><a href="/bkoadmin/country"><i class="icon-user-plus"></i>Country Settings</a></li>
|
||||
<li><a href="/bkoadmin/transport"><i class="icon-user-plus"></i>Transport Settings</a></li>
|
||||
<li class="divider"></li>
|
||||
<!-- li><a href="/bkoadmin/points"><i class="icon-user-plus"></i>Points Settings</a></!-->
|
||||
<li><a href="/bkoadmin/appsettings"><i class="icon-user-plus"></i>App Settings</a></li>
|
||||
<li><a href="/bkoadmin/usermanagerment"><i class="icon-user-plus"></i>User Management</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="/bkoadmin/globals"><i class="icon-user-plus"></i>Globals</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="/tools/testaccounts"><i class="icon-shield-check"></i>Test Accounts</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="/security"><i class="icon-shield-check"></i>Blocked IPs</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="/tracking/crashlog/"><i class="icon-shield-check"></i>Crash Log</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="/myfloat_version/"><i class="icon-help"></i>My Float Version</a></li>
|
||||
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
|
||||
<li class="dropdown dropdown-user">
|
||||
<a class="dropdown-toggle" data-toggle="dropdown">
|
||||
<span>Personalty</span>
|
||||
<i class="caret"></i>
|
||||
</a>
|
||||
|
||||
<ul class="dropdown-menu dropdown-menu-right">
|
||||
<li><a href="/bkoreport/decisionstatus"><i class="icon-user-plus"></i>Personalty Group</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="/descision/descisionlogic"><i class="icon-user-plus"></i>Descision Logic</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="/descision/personaltyname"><i class="icon-user-plus"></i>Personalty Name</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="/descision/personaltycards"><i class="icon-user-plus"></i>Personalty Cards</a></li>
|
||||
<li class="divider"></li>
|
||||
|
||||
<li><a href="/descision/descisionreport"><i class="icon-user-plus"></i> Report</a></li>
|
||||
<li><a href="/descision/descisiontree"><i class="icon-user-plus"></i> Tree</a></li>
|
||||
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
<li class="dropdown dropdown-user">
|
||||
<a class="dropdown-toggle" data-toggle="dropdown">
|
||||
|
||||
Reference in New Issue
Block a user