added activate account action in Auth route

SE/se-lib/Core/DataSource/Mysql.php

@@ -93,6 +93,7 @@ class Core_DataSource_Mysql extends Core_DataSource {
 	}
 
 	public function _($str) {
+		//return $this->_pdo->quote($str);// TODO: PDO
 		return mysql_real_escape_string($str, $this->_conn);
 	}
 

SE/se-lib/Route/Auth.php

@@ -8,7 +8,8 @@ class Route_Auth extends RouteBase {
 
 	public function handleAuth() {
 		if (!User::logged()) {
-		//	throw new HttpException('Unauthorized', 401);
+			$_SESSION['ADM_ACCOUNT'] = 'Anonymous';
+			// throw new HttpException('Unauthorized', 401);
 		}
 	}
 
@@ -19,7 +20,9 @@ class Route_Auth extends RouteBase {
 	<div class="container">
 		<h1>Unauthorized</h1>
 		<ul>
-			<li><a href="index.php?_route=Auth&_task=register">Register</a></li>
+			<li><a href="index.php?_route=Auth&_task=registerForm">Register</a></li>
+			<li><a href="index.php?_route=Auth&_task=loginForm">Login</a></li>
+			<li><a href="index.php?_route=Auth&_task=activateForm">Activate</a></li>
 		</ul>
 	</div>
 <?php
@@ -34,54 +37,99 @@ class Route_Auth extends RouteBase {
 		SE_Layout::dol();
 	}
 
-	public function registerAction() {
+	public function loginFormAction() {
 		SE_Layout::gora();
+?>
+TODO: login...
+<?php
+		SE_Layout::dol();
+	}
 
-		$formFields = array();
-		$overrideLabels = array();
-		$formFields[] = 'ADM_NAME';// Imię i nazwisko
-		$formFields[] = 'EMAIL';// Adres e-mail
-		$formFields[] = 'ADM_PASSWD';// Hasło
-		// Potwierdź hasło
-		// TODO: stanowisko - if allowed (TODO: in config? '.cnf--auth-{host}.ini.php')
-		$overrideLabels['ADM_NAME'] = 'Imię i nazwisko';
-		$overrideLabels['EMAIL'] = "Email";
-		$overrideLabels['ADM_PASSWD'] = "Hasło";
+	public function activateFormAction() {
+		SE_Layout::gora();
+?>
+<div class="container">
+	<div id="ACTIVATE_FRM_<?php echo $tableHash; ?>_DBG_LOG" style="border:1px solid red;max-height:300px;overflow:scroll"></div>
+	<div id="ACTIVATE_FRM_<?php echo $tableHash; ?>_MSGS"></div>
+	<form class="form-horizontal"
+				action=""
+				method="post"
+				id="ACTIVATE_FRM_<?php echo $tableHash; ?>">
+		<fieldset>
+			<legend>Aktywacja konta</legend>
 
-		$tblAcl = $this->_getUsersTableAcl($formFields, $overrideLabels);
-		//$dataSource = $tblAcl->getDataSource();
+			<div class="form-group">
+				<label class="col-xs-12 col-sm-3 col-md-2 control-label" for="activateHash">Kod aktywacyjny
+					<i class="glyphicon glyphicon-info-sign frm-help"
+						 data-toggle="popover"
+						 data-trigger="hover"
+						 title=""
+						 data-content="Kod aktywacyjny otrzymany drogą mailową"
+						 data-original-title="Kod aktywacyjny"></i>
+				</label>
+				<div class="col-xs-12 col-sm-9 col-md-10">
+					<input id="activateHash" name="activateHash" type="text" value="" tabindex="<?php echo (++$tabindex); ?>" maxlength="100" class="form-control">
+				</div>
+			</div>
 
-		$cols = array();
+			<div class="form-group">
+				<div class="col-xs-offset-0 col-xs-12 col-sm-offset-3 col-sm-9 col-md-offset-2 col-md-10">
+					<button type="submit" class="btn btn-primary" tabindex="<?php echo (++$tabindex); ?>">Aktywuj</button>
+				</div>
+			</div>
 
-		$fieldsList = array();
-		$fieldsListAll = $tblAcl->getFields();
-		foreach ($formFields as $vColName) {
-			$vColID = $tblAcl->getFieldIdByName($vColName);
-			if (isset($fieldsListAll[$vColID])) {
-				$fieldsList[$vColID] = $fieldsListAll[$vColID];
-				$cols[$vColID] = '';
-				//$cols[$kID] = V::get($vCol['name'], '', $row);
-				$cols[$vColID] = V::get("f{$vColID}", $cols[$vColID], $_POST);
-			}
-			else {
-				?>
-					<div class="alert alert-danger">
-						<h4>Error!</h4>
-						Brak uprawnień do pola <?php echo $vColName; ?>
-					</div>
-				<?php
-			}
+		</fieldset>
+	</form>
+</div>
+<?php $this->_printFormFactoryJS(); ?>
+<script>
+jQuery(document).ready(function(){
+	var formNode = $('#ACTIVATE_FRM_<?php echo $tableHash; ?>'),
+			msgsNode = $('#ACTIVATE_FRM_<?php echo $tableHash; ?>_MSGS'),
+			dbgNode = $('#ACTIVATE_FRM_<?php echo $tableHash; ?>_DBG_LOG'),
+			form = FormFactory({
+				formNode: formNode,
+				msgsNode: msgsNode,
+				dbgNode: dbgNode,
+				url: 'index.php?_route=Auth&_task=activate'
+			})
+	;
+
+	jQuery('textarea').autosize();
+
+	jQuery('.frm-help').popover({trigger:'hover'});
+
+	formNode.on('submit', {form: form}, function(e) {
+		if (e.data && e.data.form) {
+			e.data.form.submit(e);
 		}
+		return false;
+	});
+});
+</script>
+<?php
+		SE_Layout::dol();
+	}
 
-		DBG::_(true, true, "cols", $cols, __CLASS__, __FUNCTION__, __LINE__);
+	public function registerFormAction() {
+		SE_Layout::gora();
+
+		$tblAcl = $this->_getUsersTableAcl();
+		$fieldsList = $this->_getRegisterValuesFromArray($_POST);
+
+		DBG::_(true, true, "tblAcl", $tblAcl, __CLASS__, __FUNCTION__, __LINE__);
+		DBG::_(true, true, "fieldsList", $fieldsList, __CLASS__, __FUNCTION__, __LINE__);
 		$tableHash = 'routeAuthRegister';
 ?>
-<div class="container AjaxFrmHorizontalEdit">
+<div class="container">
+	<div id="CREATE_FRM_<?php echo $tableHash; ?>_DBG_LOG" style="border:1px solid red;max-height:300px;overflow:scroll"></div>
 	<div id="CREATE_FRM_<?php echo $tableHash; ?>_MSGS"></div>
-	<form class="form-horizontal" action="" method="post" id="CREATE_FRM_<?php echo $tableHash; ?>">
+	<form class="form-horizontal"
+				action=""
+				method="post"
+				id="CREATE_FRM_<?php echo $tableHash; ?>">
 		<fieldset>
-			<legend>Zarejestruj</legend>
-
+			<legend>Zarejestruj konto</legend>
 
 			<?php $tabindex = 0; foreach ($fieldsList as $kID => $vCol) : ?>
 				<?php if ($tblAcl->isAllowed($kID, 'C')) : ?>
@@ -93,7 +141,7 @@ class Route_Auth extends RouteBase {
 						<div class="col-xs-12 col-sm-9 col-md-10">
 							<?php
 								$fieldParams = array('appendBack'=>true, 'tabindex'=>(++$tabindex), 'maxGrid'=>8);
-								echo $tblAcl->showFormItem('C', $kID, "f{$kID}", $cols[$kID], $fieldParams);
+								echo $tblAcl->showFormItem('C', $kID, "f{$kID}", $vCol['value'], $fieldParams);
 							?>
 						</div>
 					</div>
@@ -109,83 +157,184 @@ class Route_Auth extends RouteBase {
 		</fieldset>
 	</form>
 </div>
-
+<?php $this->_printFormFactoryJS(); ?>
 <script>
 jQuery(document).ready(function(){
+	var formNode = $('#CREATE_FRM_<?php echo $tableHash; ?>'),
+			msgsNode = $('#CREATE_FRM_<?php echo $tableHash; ?>_MSGS'),
+			dbgNode = $('#CREATE_FRM_<?php echo $tableHash; ?>_DBG_LOG'),
+			form = FormFactory({
+				formNode: formNode,
+				msgsNode: msgsNode,
+				dbgNode: dbgNode,
+				url: 'index.php?_route=Auth&_task=register'
+			})
+	;
+
 	jQuery('textarea').autosize();
 
 	jQuery('.frm-help').popover({trigger:'hover'});
 
-	jQuery('#CREATE_FRM_<?php echo $tableHash; ?>').on('submit', function(e) {
-		var data = $(this).serialize(),
-				formNode = $('#CREATE_FRM_<?php echo $tableHash; ?>'),
-				msgsNode = $('#CREATE_FRM_<?php echo $tableHash; ?>_MSGS')
-		;
+	formNode.on('submit', {form: form}, function(e) {
+		if (e.data && e.data.form) {
+			e.data.form.submit(e);
+		}
+		return false;
+	});
+});
+</script>
+		<?php
+		SE_Layout::dol();
+	}
 
-		$.ajax({
-			data: data,
-			dataType: 'json',
-			type: "POST",
-			async: true,
-			url: 'index.php?_route=Auth&_task=createSave'
-		})
-		.always(function(dataOrJqXHR){
-			var data;
-			if (dataOrJqXHR && 'readyState' in dataOrJqXHR && 'status' in dataOrJqXHR) {
-				if ('responseJSON' in dataOrJqXHR) {
-					data = dataOrJqXHR.responseJSON;
-				} else {
-					data = {};
-					data.msg = dataOrJqXHR.responseText || 'Nieznany błąd';
-					if (dataOrJqXHR.status == 404) {
-						data.type = 'error';
-					} else {
-						data.type = 'warning';
-					}
+public function _printFormFactoryJS() {
+?><script>
+var FormFactory = function(options) {
+	var priv = {};
+	priv.formNode = options.formNode;
+	priv.msgsNode = options.msgsNode;
+	priv.dbgNode = options.dbgNode;
+	priv.url = options.url;
+	priv.req = null;
+	priv.reqCounter = 0;
+
+	var showMsg = function(msg) {
+		$('<div class="alert alert-info">' + msg + '</div>').appendTo(priv.msgsNode);
+	}
+	var log = function(msg, type) {
+		var type = type || 'info';
+		if (!priv.dbgNode) return false;
+		$('<div class="alert alert-' + type + '">' + msg + '</div>').appendTo(priv.dbgNode);
+	}
+	var showSuccess = function(msg) {
+		$('<div class="alert alert-success">' + msg + '</div>').appendTo(priv.msgsNode);
+	}
+	var showError = function(msg) {
+		$('<div class="alert alert-danger">' + msg + '</div>').appendTo(priv.msgsNode);
+	}
+	var showWarning = function(msg) {
+		$('<div class="alert alert-warning">' + msg + '</div>').appendTo(priv.msgsNode);
+	}
+	var showInfo = function(msg) {
+		$('<div class="alert alert-info">' + msg + '</div>').appendTo(priv.msgsNode);
+	}
+	var clearMsgs = function(msg) {
+		priv.msgsNode.empty();
+	}
+	var hideForm = function() {
+		priv.formNode.hide();
+	}
+	var showForm = function() {
+		priv.formNode.show();
+	}
+	var parseResponse = function(data) {
+		var form = this,
+				data = {
+					type: ('type' in data)? data.type : 'error',
+					msg: ('msg' in data)? data.msg : 'Nieznany błąd'
 				}
+		;
+		form.log('parseResponse... data:' + JSON.stringify(data), 'info');
+		if (data.type == 'error' || data.type == 'warning') {
+			form.showError('<h4>Wystąpiły błędy!</h4>' + data.msg);
+			// TODO: show all fields errors
+		}
+		else if (data.type == 'success') {
+			var msg = '';
+			if (data.id && data.id > 0) {
+				msg = 'Utworzono pomyślnie konto w systemie';
+			} else if (data.msg) {
+				msg = data.msg;
 			} else {
-				data = dataOrJqXHR;
-			}
-console.log('L.<?php echo __LINE__; ?> data', data);
-
-			if (data.type == 'error' || data.type == 'warning') {
-				var out = '<div class="container">';
-				out += '<div class="alert alert-danger">' +
-							'<h4>Wystąpiły błędy!</h4>' + data.msg +
-							(('errors' in data)? '<p>' + data.errors + '</p>' : '') +
-						'</div>';
-				out += '</div>';
-				// TODO: show all fields errors
-				$(out).appendTo(msgsNode);
+				msg = 'OK';
 			}
-			else if (data.type == 'success') {
-				var msg = '';
-				if (data.id && data.id > 0) {
-					msg = 'Utworzono pomyślnie konto w systemie';
-				} else if (data.msg) {
-					msg = data.msg;
+			form.showSuccess(msg);
+			form.hideForm();
+		} else {
+			form.showError('<h4>Wystąpiły błędy!</h4>' + data.msg);
+		}
+	}
+	var submit = function(e) {
+		var data = priv.formNode.serialize(),
+				form = this,
+				reqCounter = 0 + priv.reqCounter
+		;
+		e.preventDefault();
+		priv.reqCounter++;
+		form.clearMsgs();
+		form.log('DBG:REQ('+reqCounter+'). sending form...', 'info');
+		console.log('sending form... data:', data);
+
+		if (priv.req) {
+			form.log('DBG:REQ('+reqCounter+'). abort previous xhr', 'info');
+			priv.req.abort();
+		}
+		priv.req = superagent
+			.post(priv.url)
+			.type('form')
+			.send(data)
+			.set('Accept', 'application/json')
+			.end(function(err, res) {
+				console.log('DBG:REQ('+reqCounter+') res:', res, 'res.body:', res.body);
+				if (err || !res.ok) {
+					form.log('DBG:REQ('+reqCounter+'). error', 'info');
 				} else {
-					msg = 'OK';
+					//form.log('DBG:REQ('+reqCounter+'). res.status(' + res.status + ') body:' + JSON.stringify(res.body), 'info');
+					if ('application/json' !== res.type) {
+						form.showError('<h4>Wystąpiły błędy!</h4>' + res.text);
+						return;
+					}
+					form.log('DBG:REQ('+reqCounter+'). res.status:' + res.status + '. res.body:' + JSON.stringify(res.body), 'info');
+					form.parseResponse(res.body);
 				}
-				var out = '<div class="container">';
-					out += '<div class="alert alert-success">' + msg + '</div>';
-				out += '</div>';
-				$(out).appendTo(msgsNode);
-				formNode.hide();
-			}
-		});
-		console.log('L.<?php echo __LINE__; ?>');return false;
-
+				priv.req = null;
+			});
 		return false;
-	});
-});
+	}
+	return {
+		log: log,
+		showMsg: showMsg,
+		showSuccess: showSuccess,
+		showError: showError,
+		showWarning: showWarning,
+		showInfo: showInfo,
+		clearMsgs: clearMsgs,
+		hideForm: hideForm,
+		showForm: showForm,
+		submit: submit,
+		parseResponse: parseResponse
+	};
+}
 </script>
-		<?php
-		SE_Layout::dol();
+<?php
+	}
+
+	public function _getRegisterFormFields() {
+		$formFields = array();
+		$formFields[] = 'ADM_NAME';// Imię i nazwisko
+		$formFields[] = 'EMAIL';// Adres e-mail
+		$formFields[] = 'ADM_PASSWD';// Hasło
+		// Potwierdź hasło
+		// TODO: stanowisko - if allowed (TODO: in config? '.cnf--auth-{host}.ini.php')
+		return $formFields;
+	}
+
+	public function _getUsersTableAcl() {
+		static $_usersTblAcl = null;
+		if (!$_usersTblAcl) $_usersTblAcl = $this->_fetchUsersTableAcl();
+		if (!$_usersTblAcl) throw new Exception("Error No Table ACL!");
+		return $_usersTblAcl;
 	}
 
-	public function _getUsersTableAcl($formFields, $overrideLabels = array()) {
-		$idTable = ProcesHelper::getZasobTableID('ADMIN_USERS');
+	public function _fetchUsersTableAcl() {
+		$tableName = 'TEST_PERMS';//'ADMIN_USERS';
+		$formFields = $this->_getRegisterFormFields();
+		$overrideLabels = array();
+		$overrideLabels['ADM_NAME'] = 'Imię i nazwisko';
+		$overrideLabels['EMAIL'] = "Email";
+		$overrideLabels['ADM_PASSWD'] = "Hasło";
+
+		$idTable = ProcesHelper::getZasobTableID($tableName);
 		if (!$idTable) throw new Exception("Brak id tabeli");
 		//DBG::_(true, true, "idTable", $idTable, __CLASS__, __FUNCTION__, __LINE__);
 
@@ -200,7 +349,7 @@ console.log('L.<?php echo __LINE__; ?> data', data);
 			//DBG::_(true, true, "conf (isRegisterAllowed={$isRegisterAllowed})", $conf, __CLASS__, __FUNCTION__, __LINE__);
 			if (!$isRegisterAllowed) throw new Exception("Brak uprawnień do rejestracji");
 
-			$zasobTblInfo = ProcesHelper::getZasobTableInfoByUri($tblUri = "default_db/ADMIN_USERS");
+			$zasobTblInfo = ProcesHelper::getZasobTableInfoByUri($tblUri = "default_db/{$tableName}");
 			if (!$zasobTblInfo) throw new HttpException("Brak zasobu dla tabeli użytkowników", 404);
 			//DBG::_(true, true, "zasobTblInfo", $zasobTblInfo, __CLASS__, __FUNCTION__, __LINE__);
 
@@ -227,18 +376,22 @@ console.log('L.<?php echo __LINE__; ?> data', data);
 					$fldConf['CELL_DESC'] = (array_key_exists($fldInfo->DESC, $overrideLabels))? $overrideLabels[$fldInfo->DESC] : $fldInfo->OPIS;
 					$fldConf['CELL_LABEL'] = (array_key_exists($fldInfo->DESC, $overrideLabels))? $overrideLabels[$fldInfo->DESC] : $fldInfo->DESC_PL;
 					$fldConf['SORT_PRIO'] = $fldInfo->SORT_PRIO;
-					$fldConf['FORM_TREAT'] = 'RWXC';
+					if ('ADM_PASSWD' == $fldInfo->DESC) {
+						$fldConf['FORM_TREAT'] = 'WXC';
+					} else {
+						$fldConf['FORM_TREAT'] = 'RWXC';
+					}
 					$fieldsConfig[$fldInfo->ID] = $fldConf;
 				}
 				//DBG::_(true, true, "fieldsConfig", $fieldsConfig, __CLASS__, __FUNCTION__, __LINE__);
 			}
 
 			{// TODO: init and save in session default perms
-				DBG::_(true, true, "ses tbl cache[{$idTable}]", $_SESSION['TableAcl_cache'][$idTable], __CLASS__, __FUNCTION__, __LINE__);
+				//DBG::_(true, true, "ses tbl cache[{$idTable}]", $_SESSION['TableAcl_cache'][$idTable], __CLASS__, __FUNCTION__, __LINE__);
 				$tblAcl = TableAcl::buildInstance($idTable, $tableConfig);
 				$tblAcl->initFieldsFromConfig($fieldsConfig);
 				$tblAcl->save();
-				DBG::_(true, true, "ses tbl cache[{$idTable}]", $_SESSION['TableAcl_cache'][$idTable], __CLASS__, __FUNCTION__, __LINE__);
+				//DBG::_(true, true, "ses tbl cache[{$idTable}]", $_SESSION['TableAcl_cache'][$idTable], __CLASS__, __FUNCTION__, __LINE__);
 			}
 
 			//throw new Exception("Brak uprawnień do tabeli ID={$idTable}");
@@ -248,8 +401,126 @@ console.log('L.<?php echo __LINE__; ?> data', data);
 		//$tblAcl = $userAcl->getTableAcl($idTable);
 		if (!$tblAcl) throw new Exception("Brak tabeli");
 		$tblAcl->init();
-		DBG::_(true, true, "tblAcl", $tblAcl, __CLASS__, __FUNCTION__, __LINE__);
+		//DBG::_(true, true, "tblAcl", $tblAcl, __CLASS__, __FUNCTION__, __LINE__);
 		return $tblAcl;
 	}
 
+	public function _getRegisterValuesFromArray($args = array()) {
+		$fieldsList = array();
+
+		$tblAcl = $this->_getUsersTableAcl();
+		$formFields = $this->_getRegisterFormFields();
+		$fieldsListAll = $tblAcl->getFields();
+		foreach ($formFields as $vColName) {
+			$vColID = $tblAcl->getFieldIdByName($vColName);
+			if (!isset($fieldsListAll[$vColID])) {
+				throw new Exception("Brak uprawnień do pola '{$vColName}'");
+			}
+			$fieldsList[$vColID] = $fieldsListAll[$vColID];
+			$value = '';
+			$value = V::get("f{$vColID}", $value, $args);
+			$fieldsList[$vColID]['value'] = $value;
+		}
+		return $fieldsList;
+	}
+
+	public function registerAction() {
+		$args = $_POST;
+		$resData = new stdClass();
+		$resData->_args = $args;// TODO: DBG
+		$resData->type = 'error';
+		$resData->msg = 'Error';
+		header('Content-type: application/json; charset="utf-8"');
+		try {
+			$itemData = array();
+			$tblAcl = $this->_getUsersTableAcl();
+			$fieldsList = $this->_getRegisterValuesFromArray($args);
+			$ds = $tblAcl->getDataSource();
+			foreach ($fieldsList as $idFld => $fldData) {
+				$itemData[$fldData['name']] = $fldData['value'];
+			}
+			if (!filter_var($itemData['EMAIL'], FILTER_VALIDATE_EMAIL)) {
+				throw new Exception("Proszę podać poprawny adres email");
+			}
+			$itemData['EMPLOYEE_TYPE'] = 'Anonymous';
+			$itemData['A_STATUS'] = 'WAITING';// TODO: konto oczekuje aktywacji? z config
+			//$itemData['ADM_ADMIN_LEVEL'] = '6';
+			$itemData['A_AUTH_TOKEN'] = md5("ADMIN_USERS.auth_token." . time());
+			$itemData['A_AUTH_TOKEN_VALID'] = date("Y-m-d H:i:s", mktime(6 + date('H'), date('i'), date('s'), date("m"), date("d"), date("Y")));
+			$resData->userName = User::getName();
+			$resData->id = $ds->addItem($itemData);
+			{
+				$resData->_fieldsList = $fieldsList;// TODO: DBG
+				$resData->_tblAcl = $tblAcl;// TODO: DBG
+				$resData->_itemData = $itemData;// TODO: DBG
+			}
+			if ($resData->id > 0) {
+				$resData->type = 'success';
+				$resData->msg = "Pomyślnie utworzono konto w systemie";
+				// TODO: konto oczekuje aktywacji? z config
+			}
+		} catch (Exception $e) {
+			$resData->type = 'error';
+			$resData->msg = $e->getMessage();
+		}
+
+		echo json_encode($resData);
+	}
+
+	public function activateAction() {
+		$args = $_REQUEST;
+		$resData = new stdClass();
+		$resData->_args = $args;// TODO: DBG
+		$resData->type = 'error';
+		$resData->msg = 'Error';
+		header('Content-type: application/json; charset="utf-8"');
+		try {
+			$token = V::get('activateHash', '', $args);
+			// e3360132c963ae5b21ff6de77bcbbed6
+			if (32 != strlen($token)) throw new Exception("Wrong token");
+			if (!preg_match('/^[a-fA-F0-9]+$/', $token)) throw new Exception("Wrong token");
+			$tblAcl = $this->_getUsersTableAcl();
+
+			$ds = $tblAcl->getDataSource();
+
+			$tblName = $tblAcl->getName();
+			$dbs = DB::getDataSource();
+			$sqlToken = $dbs->_($token);
+			$sql = "
+				select t.`ID`
+				from `{$tblName}` t
+				where t.`A_AUTH_TOKEN`='{$sqlToken}'
+					and t.`A_AUTH_TOKEN_VALID` is not null
+					and t.`A_AUTH_TOKEN_VALID` > NOW()
+					and t.`A_STATUS`='WAITING'
+			";
+			//DBG::_(true, true, "sql", $sql, __CLASS__, __FUNCTION__, __LINE__);
+			$items = $dbs->getListByQuery($sql);
+			if (0 == count($items)) throw new Exception("Kod nieaktywny");
+			$idUser = V::get('ID', 0, reset($items), 'int');
+			if ($idUser <= 0) throw new Exception("Kod nieaktywny");
+
+			//DBG::_(true, true, "items", $items, __CLASS__, __FUNCTION__, __LINE__);
+
+			$itemData = array();
+			$itemData['ID'] = $idUser;
+			$itemData['A_STATUS'] = 'NORMAL';
+			$itemData['A_AUTH_TOKEN_VALID'] = 'NULL';
+			$ds->updateItem($itemData);
+			{
+				$resData->_fieldsList = $fieldsList;// TODO: DBG
+				$resData->_tblAcl = $tblAcl;// TODO: DBG
+				$resData->_itemData = $itemData;// TODO: DBG
+			}
+			$resData->type = 'success';
+			$resData->msg = "Pomyślnie aktywowano konto w systemie";
+		} catch (Exception $e) {
+			$resData->type = 'error';
+			$resData->msg = $e->getMessage();
+			$resData->errorCode = $e->getLine();
+		}
+
+		echo json_encode($resData);
+	}
+
 }