Commit 0509ab34 authored by Cyril Vazquez's avatar Cyril Vazquez

Merge branch 'bug/qualys' into 'master'

Bug/qualys See merge request !16
parents 717f15f2 789efa79
......@@ -8,11 +8,12 @@ class Func
/* Properties */
public $args;
public $name;
/* Methods */
public function __construct($name, $args)
{
$this->code = $code;
$this->name = $name;
$this->args = $args;
}
......
......@@ -1083,10 +1083,10 @@ abstract class AbstractCompiler
protected function getFuncExpression($func)
{
switch($func->code) {
//switch($func->code) {
//case LAABS_T_IS_NULL:
// return $this->getOperandExpression($func->parameters[0]) . " IS NULL";
}
//}
}
protected function getOperandExpression($operand, $cast=false)
......
......@@ -121,12 +121,19 @@ class Exception
$this->view->setSource('error', $exception);
} else {
$previous = null;
if ($exception instanceof \core\Exception) {
$previous = $exception;
}
$newException = new \core\Exception(
$this->translator->getText("An error occured during the process of your request. Please contact the administrator of the application."),
500,
$exception
$previous
);
$this->view->setSource('error', $exception);
$this->view->setSource('error', $newException);
}
$this->view->merge();
......
......@@ -33,14 +33,14 @@
<div class="form-group">
<label for="password" class="col-md-3 control-label">Password<span style="color : red">*</span></label>
<div class="col-md-9">
<input type="password" class="form-control" id="password" name="password" placeholder="Password">
<input type="password" class="form-control" id="password" name="password" placeholder="Password" autocomplete="off">
</div>
</div>
<?merge user.accountId.bool().not() ?>
<div class="form-group">
<label for="verification" class="col-md-3 control-label">Password verification<span style="color : red">*</span></label>
<div class="col-md-9">
<input type="password" class="form-control" id="verification" name="verification" placeholder="Password verification">
<input type="password" class="form-control" id="verification" name="verification" placeholder="Password verification" autocomplete="off">
</div>
</div>
</div>
......
......@@ -16,7 +16,7 @@
<input type="text" placeholder="Username" class="form-control" name="userName" id="userName" autofocus>
</div>
<div class="form-group">
<input type="password" placeholder="Password" class="form-control" name="password" id="password">
<input type="password" placeholder="Password" class="form-control" name="password" id="password" autocomplete="off">
</div>
<a href="#" class="pull-right" id="forgotAccount">Forgot password ?</a>
<br>
......
......@@ -34,7 +34,7 @@
<div class="collapse well" id="user_password">
<div class="form-group">
<label>New password</label>
<input type="text" class="form-control" name="newPassword" placeholder="New password">
<input type="text" class="form-control" name="newPassword" placeholder="New password" autocomplete="off">
</div>
<button class="btn btn-success" id="user_newPassword" type="button" data-useraccountid="[?merge user.accountId ?]" title="Ok"><i class="fa fa-check">&nbsp;</i>OK</button>
</div>
......
......@@ -14,19 +14,19 @@
<div class="form-group">
<label class="col-md-4 control-label">Old password</label>
<div class="col-md-8">
<input type="password" class="form-control" id="oldPassword" name="oldPassword" placeholder="Old password">
<input type="password" class="form-control" id="oldPassword" name="oldPassword" placeholder="Old password" autocomplete="off">
</div>
</div>
<div class="form-group newPassword">
<label class="col-md-4 control-label">New password</label>
<div class="col-md-8">
<input type="password" class="form-control" id="newPassword" name="newPassword" placeholder="New password">
<input type="password" class="form-control" id="newPassword" name="newPassword" placeholder="New password" autocomplete="off">
</div>
</div>
<div class="form-group newPassword">
<label class="col-md-4 control-label">Comfirm password</label>
<label class="col-md-4 control-label">Confirm password</label>
<div class="col-md-8">
<input type="password" class="form-control" id="confirmPassword" name="comfrimPassword" placeholder="Comfirm password">
<input type="password" class="form-control" id="confirmPassword" name="confirmPassword" placeholder="Confirm password" autocomplete="off">
</div>
</div>
<div class="panel-footer clearfix">
......
......@@ -22,14 +22,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<h1 class="modal-title" id="myModalLabel">Oops!...</h1>
</div>
<div class="modal-body">
<span>An error occured while processing your request.</span>
<span><?merge error.getMessage() ?></span>
<?merge error.getPrevious().bool() ?>
<button class="btn btn-default pull-right" type="button" data-toggle="collapse" data-target="#detail" aria-expanded="false" aria-controls="detail">
?
</button>
<?merge error.getPrevious().bool() ?>
<div class="collapse " id="detail">
<br/>
<code class="badge"><?merge error.getCode() ?></code>
<code><?merge error.getMessage() ?></code>
<code class="badge"><?merge error.getPrevious().getCode() ?></code>
<code><?merge error.getPrevious().getMessage() ?></code>
</div>
</div>
<div class="modal-footer">
......
......@@ -30,8 +30,8 @@
</div>
<?hinclude /filePlan/folderForm.html ?>
<?hinclude /filePlan/movingComfirmationModal.html ?>
<?hinclude /filePlan/supressionComfirmationModal.html ?>
<?hinclude /filePlan/movingConfirmationModal.html ?>
<?hinclude /filePlan/supressionConfirmationModal.html ?>
<?hinclude /filePlan/archiveAssignmentModal.html ?>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment