From ed330762c66d8759b4da5d620932d624c2750457 Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Sat, 30 Jan 2021 19:42:19 -0500 Subject: [PATCH] fix --- adminwww/application/config/autoload.php | 6 +-- adminwww/application/config/config.php | 8 ++-- adminwww/application/config/constants.php | 13 ++++++ adminwww/application/config/database.php | 33 +++++++++++++++ adminwww/application/controllers/Login.php | 38 ++++++++++++++++-- .../application/views/welcome_message.php | 12 +++--- adminwww/assets/img/logo.png | Bin 2417 -> 1162 bytes 7 files changed, 93 insertions(+), 17 deletions(-) diff --git a/adminwww/application/config/autoload.php b/adminwww/application/config/autoload.php index 7cdc901..8db4b16 100644 --- a/adminwww/application/config/autoload.php +++ b/adminwww/application/config/autoload.php @@ -58,8 +58,8 @@ $autoload['packages'] = array(); | | $autoload['libraries'] = array('user_agent' => 'ua'); */ -$autoload['libraries'] = array(); - +//$autoload['libraries'] = array(); +$autoload['libraries'] = array('database','session','form_validation'); /* | ------------------------------------------------------------------- | Auto-load Drivers @@ -89,7 +89,7 @@ $autoload['drivers'] = array(); | | $autoload['helper'] = array('url', 'file'); */ -$autoload['helper'] = array(); +$autoload['helper'] = array('url','form'); /* | ------------------------------------------------------------------- diff --git a/adminwww/application/config/config.php b/adminwww/application/config/config.php index 0707759..aa92559 100644 --- a/adminwww/application/config/config.php +++ b/adminwww/application/config/config.php @@ -9,7 +9,6 @@ spl_autoload_register(function($classname) { } } }); - /* function __autoload($classname) { @@ -20,8 +19,8 @@ function __autoload($classname) { } } } -*/ -///home/sameye/mermsemr/adminwww/application/config + */ +///home/sameye/mermsemr/providerwww/application/config /* |-------------------------------------------------------------------------- @@ -59,7 +58,6 @@ $config['base_url'] = 'https://'.$_SERVER['SERVER_NAME'].'/'; */ //$config['index_page'] = 'index.php'; $config['index_page'] = ''; - /* |-------------------------------------------------------------------------- | URI PROTOCOL @@ -137,7 +135,7 @@ $config['enable_hooks'] = FALSE; | https://codeigniter.com/user_guide/general/creating_libraries.html | */ -$config['subclass_prefix'] = 'MY_'; +$config['subclass_prefix'] = 'MCORE_'; /* |-------------------------------------------------------------------------- diff --git a/adminwww/application/config/constants.php b/adminwww/application/config/constants.php index 18d3b4b..25c6e8a 100644 --- a/adminwww/application/config/constants.php +++ b/adminwww/application/config/constants.php @@ -83,3 +83,16 @@ defined('EXIT_USER_INPUT') OR define('EXIT_USER_INPUT', 7); // invalid user defined('EXIT_DATABASE') OR define('EXIT_DATABASE', 8); // database error defined('EXIT__AUTO_MIN') OR define('EXIT__AUTO_MIN', 9); // lowest automatically-assigned error code defined('EXIT__AUTO_MAX') OR define('EXIT__AUTO_MAX', 125); // highest automatically-assigned error code + +define('PHP_LOGIN_OK', 100 ); +define('PHP_API_OK', 0); + +define('MERMSEMR_BKO_START', 100000 ); +define('MERMSEMR_BKO_LOGIN', 100005); +define('MERMSEMR_BKO_CREATEUSER', 100010); +define('MERMSEMR_BKO_EDITUSER', 100011); +define('MERMSEMR_BKO_UPDATEMEMBER', 100012); +define('MERMSEMR_BKO_ADDREASON', 100020); +define('MERMSEMR_BKO_DELETEALLCARDS', 100022); +define('MERMSEMR_BKO_ADDCARD', 100028); +define('MERMSEMR_BKO_LANGUAGE_STATUS', 100030); \ No newline at end of file diff --git a/adminwww/application/config/database.php b/adminwww/application/config/database.php index d22321e..6ab8d54 100644 --- a/adminwww/application/config/database.php +++ b/adminwww/application/config/database.php @@ -73,7 +73,40 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $active_group = 'default'; $query_builder = TRUE; +require_once('backend.php'); + +$show_database_error = true; +$is_live = $mermsemr->cfgReadChar("system.live"); +if ($is_live == false) { + $show_database_error = false; +} + + $db['default'] = array( + 'dsn' => '', + 'hostname' => $mermsemr->cfgReadChar("database.host"), + 'username' => $mermsemr->cfgReadChar("database.user"), + 'password' => $mermsemr->cfgReadChar("database.pass"), + 'database' => $mermsemr->cfgReadChar("database.name"), + 'dbdriver' => 'postgre', + 'dbprefix' => '', + 'pconnect' => FALSE, + 'db_debug' => $show_database_error, + 'db_debug2' => (ENVIRONMENT !== 'production'), + 'cache_on' => FALSE, + 'cachedir' => '', + 'char_set' => 'utf8', + 'dbcollat' => 'utf8_general_ci', + 'swap_pre' => '', + 'encrypt' => FALSE, + 'compress' => FALSE, + 'stricton' => FALSE, + 'failover' => array(), + 'save_queries' => TRUE +); + + +$db['default_out'] = array( 'dsn' => '', 'hostname' => 'localhost', 'username' => '', diff --git a/adminwww/application/controllers/Login.php b/adminwww/application/controllers/Login.php index 481b060..9969f2c 100644 --- a/adminwww/application/controllers/Login.php +++ b/adminwww/application/controllers/Login.php @@ -1,13 +1,45 @@ load->view('admin/view_dash'); + $data = array(); + $out = array(); + + // $data["username"] = 'oameye'; + // $data["password"] = 'may12002'; + + // var_dump($this->input->post()); + + $data['username'] = trim($this->input->post('username')); + $data['password'] = htmlspecialchars($this->input->post('password')); + + $data2 = array( + 'username' => $this->input->post('username'), + 'password'=> $this->input->post('password'), + 'is_logged_in' => false + ); + + + // $data["username"] = 'oameye'; + // $data["password"] = 'may12002'; + + $this->loginAdminUser($data, $out); + + //print_r($_SESSION); + + if (isset($_SESSION['session_id']) && $_SESSION['session_id'] !=''){ + redirect('/dash'); + } + $this->load->view('welcome_message'); - } + } } diff --git a/adminwww/application/views/welcome_message.php b/adminwww/application/views/welcome_message.php index 2526c49..b787cd4 100644 --- a/adminwww/application/views/welcome_message.php +++ b/adminwww/application/views/welcome_message.php @@ -43,7 +43,7 @@

MERMS BackOffice

Welcome back, please login to your account.

-
+
@@ -65,21 +65,21 @@ Remember Me
- Forgot Password ? +
- Sign In +
-
+
-
+
diff --git a/adminwww/assets/img/logo.png b/adminwww/assets/img/logo.png index 25f0cf65b7d1c88bf934aedd6efbd9dd39527d94..46eb892fa2b70518825e91f9a6eb765a76eb35c4 100644 GIT binary patch delta 1142 zcmV-+1d03c5{e0sBYy-@Nkli*eg942Fqb7sv`)!5JYQ!5JYPp&20=K^Y+) zAsN9Qp)u*V*hG74o7eCYXqcRlB9QKEhje1MQ@00000000000000004yGB?VXM1 zwST|vJ4N~5UOCNm`!t#7Ik~#{^$Fb9B)SC7v*Ws+hOW)O?|(|R#gXmv;2kf~X4X-( zeaFuP-9koa0^iM@U3V|m+9zYoJrNx<>RenGZt(5ExqS}&&y_hFV;+g8 zT^BC1KqP4UR0r7&{JnIXKsh~cDP0~4bvhVD;tAS5djwg@^vWlvVVBaS zRHw71&T9<5>9r*X`9(xzjFA@NOK^}!zL&kCK3gW)_DgV(e>WH4l6pSj_abYMOkJ*) zC8B5klp|adGA&?G3~<&W>8T#HNWj=Qw3%0L+E9OO&cuAGPf@ zYmmNycYgy7LDRruXamV+Z>i@o#z^ybZ4OfnU5-kJdgYv=DJW&1nk3sk$3dDv-1uVw zBgi#gi0DOGrnoK~ZIMEfeOz|xTV|@vmI>Nklg%44aK9le(K(LXyPp#?V5{ij>SC>R z8-beM_>QMs`{iu*CfVM06XGOXTC6WU7Vx+(@>4<ZTY>%oTl0RSl_+9HDqv=9K_byRUQRHES zQGcYAeLl}qp^hDD+n08bB}}oTI%*r#sJd{X;$Go!ccreq0@SvTb`TCdN=BKzgG3~( zsdA`l=)&RJLHMxS$UPh6$}uUnj}7x)ywAZEzY8ta-3Xl>lj*`?+`YB-kKhE2`5zHO zZk7^lHt)5baLaM`DRq$+?ifKb&^pMqA%E%;am-qoQkO02JsKrPkdNNymME=D$v^@e zD1#a!NNGaJaC1wDE3J!Erh7?T%v)G$JIE63lZ^JwiZMOq7AdWZ=pc%;aO7lVpnYHp zi}bJ5(&fEihl5v;W}up42^pfB?Ws!Z!tr`(*EfcD&gBA$q`b6Y$lw>@_q9`07jND% z*FKx#b53}s1oSB8AQ8KiYp1v_MC2OyeL|=6?2;StOh`T{|NTM8;4nlbUHG;9M}F?S z;iy$;^Y77kFO>rT0000000000000000000000000jE6DiFA*0+v$-fF@c;k-07*qo IM6N<$f=B8rXaE2J delta 2407 zcmYjSdotQQ%~5_BmD)N&3cSza@Ap>=-rmbbOmJSB zbYI8~$PVtdPrsb!Q+FAuJy@u7|AGZKSplj5R+KoN2rT@6&?nZKFkd5%5XJ*!Ai@7j?1V`!0mm3}1B@iH7?7v~G&v*;sfVxztbsxHZg2vau|-qt zs)1}IX!lhL|Ig?up1eFnzE07Q=m2R7*veyAI7H$!Bf+0fU^N)>b;{%ffM*T=>awEA zN&ZSzlGw^tD@4lLI{;FXt;7K8@MHp$j3i^=5*D7H`aPF~0!1nc)BIC_dU3k3l5vU_dD9_9YT;xV?TRwKITdyV&j(Gmjnf+z0xg_WILO8WnAnh8um(^qk8>>A?XYUvh&fL<4 zdQse$C01DKX&8j~tMJUHEhS5GY(!{hMDJVmr|ffdu|mfW&Ruk;w-3zK#ff2#+lelq zS{&fA=+I)BQykErYv{#veqQK}$L}dKRGQ&4!OO96UbhL@kV@P!NH-vcarm=&HA<>7 zE{>lpQl|yzL2_0wz0BohQpr%L*jIbn;W<`x`Jz&yQE zf~2;g`Fe8g-bqH`)mG1ME+lC~X1~B`nM=G3%BjF401}FJQi6C|@LJ!Ymv!sUH6D5y zax`^aQNr{4sA08lQ@8iA)@O?4*}A0w)$@udQ?q))505#ln3bb@{ZduDdQPsG2jg8c z^}KP6(TM5%fj@iS@*Yg9hP>F|ey!jnA(C|R7QcR< zhkcVMSxL11Q2`tMUFOqa;q*keb=lP=&AD6Bjd|(uxV!kcD>wYxN^(Pg1cddzTgUaA zjorK}aeE;5cCJt`;zuj!*z@>8(9jWkME>;2tyTYg?@7Ous*clncxNTwSQLo)IXQza zm#7C61w%*r32LX*g=~6_+Uo6|S*czZTL4{ ztn`j%1%76(jx%lI$!B`v8cPT%X;-Wj-=+mMB*+V!?dY_df4U7k)}J)~OBj_BLKX%L zZr)QKQd`=8(Uv~DtJFBSwZq9Biolq6^(~Dtev8DxiAAbZ_EQls`Q1m^#T`XLh@(sS zD^NGH{6X}XIKDo$SR6nC^GBK6cNfZV6HWTw-!~w4#_0}%%qIr&b!QJ^``XW>os76+ z0=ZK-!yjDKx$CU1;72I3;C{mj=aWaT8Rwe?9ifYZd+6+JtX@2Mc^5!^Rln8LC_cGUT* zOOfJut?^CUJ9QIZf`cube$Ntm#*&w{EFZB34!V>;2;&Izus3g{wAW|DxJay-#_4>? zKr`=KNy;>)nRR!g29pE~gu4whK1Q#8nMcfsQt1ygA00q%j1))z#2QFU6{ta)zl3^g z{DE+xhldwbNSE*FD1#fHLDTE(`NQ__`rqt)8=tHFDY-3o?Kp}>QQ+U~s>Yxx?}_g+ zZ#p(%(CyzM<)B31YE>7x50GpFZ2&J2G%Zr*!6d3cARMc60o(@aG{_-vY$0yyFQ`34|41ssEY)c`)SWF>T1Vkf;t Tk5IU$fUIaXj+A@W7h?YnmB}yE