Merge branch 'jansa'

admin/application/views/settings.php

@@ -43,7 +43,7 @@
               	
 	                <div class="form-group col-xs-4">
 	                  <label>Site Title</label>
-	                  <input type="text" name="site_title" class="form-control required" placeholder="Enter Site Title" value="<?php echo encrypt_data($data['site_title'])?>">
+	                  <input type="text" name="site_title" class="form-control required" placeholder="Enter Site Title" value="<?php encrypt_data(echo $data['site_title'])?>">
 	                </div>
 	                <div class="form-group col-xs-4">
 	                  <label>Site Logo</label>
@@ -59,21 +59,21 @@
                 <div class="row">
                 	<div class="form-group col-xs-4">
                       <label>SMTP Username</label>
-                      <input type="text" name="smtp_username" class="form-control required" placeholder="Enter SMTP Username" value="<?php echo encrypt_data($data['smtp_username'])?>">
+                      <input type="text" name="smtp_username" class="form-control required" placeholder="Enter SMTP Username" value="<?php encrypt_data(echo $data['smtp_username'])?>">
                     </div>
                     <div class="form-group col-xs-4">
                       <label>SMTP Password</label>
-                      <input type="text" name="smtp_password" class="form-control required" placeholder="Enter SMTP Password" value="<?php echo encrypt_data($data['smtp_password'])?>">
+                      <input type="text" name="smtp_password" class="form-control required" placeholder="Enter SMTP Password" value="<?php encrypt_data(echo $data['smtp_password'])?>">
                     </div>
                     <div class="form-group col-xs-4">
                       <label>SMTP Host</label>
-                      <input type="text" name="smtp_host" class="form-control required" placeholder="Enter Host Name" value="<?php echo encrypt_data($data['smtp_host'])?>">
+                      <input type="text" name="smtp_host" class="form-control required" placeholder="Enter Host Name" value="<?php encrypt_data(echo $data['smtp_host'])?>">
                     </div>
                 </div>
                 <div class="row">
                 	<div class="form-group col-xs-4">
                       <br><label>IPOK Fee(in %)</label>
-                      <input type="text" name="ipok_fee" class="form-control required" placeholder="Enter IPOK Fee" value="<?php echo encrypt_data($data['ipok_fee'])?>">
+                      <input type="text" name="ipok_fee" class="form-control required" placeholder="Enter IPOK Fee" value="<?php encrypt_data(echo $data['ipok_fee'])?>">
                     </div>
 
                 </div>