diff --git a/application/controllers/api.php b/application/controllers/api.php
index f0fbf17..b9729b8 100644
--- a/application/controllers/api.php
+++ b/application/controllers/api.php
@@ -250,28 +250,28 @@ function get_forms($app_id, $imei_no) {
         $form_array_final = array(
             'forms' => $form_array
         );
-        $image_array_final = array(
+        $Final_image = array(
             'images' => $image_array
         );
-        $file_array_final = array(
+        $final_array = array(
             'files' => $file_array
         );
-        $app_general_setting = get_app_general_settings($app_id);
+        $general_setting = get_general_settings($app_id);
         $prefrences = array();
-        if(isset($app_general_setting->has_geo_fencing)){
+        if(isset($general_setting->has_geo_fencing)){
             
-            $prefrences['IS_SECURE_APP']=($app_general_setting->secured_apk==1)?'YES':'NO';
-            $prefrences['showHighResOption']=($app_general_setting->high_resolution_image==1)?'YES':'NO';
-            $prefrences['PersistImagesOnDevice']=($app_general_setting->persist_images_on_device==1)?'YES':'NO';
-            $prefrences['BackgroundUpdate']=($app_general_setting->background_update==1)?'YES':'NO';
-            $prefrences['ForceUpdate']=($app_general_setting->force_update==1)?'YES':'NO';
-            $prefrences['EnableAutoTime']=($app_general_setting->enable_auto_time==1)?'YES':'NO';
-            $prefrences['TrackingStatus']=($app_general_setting->tracking_status==1)?'YES':'NO';
-            $prefrences['TrackingInterval']=(isset($app_general_setting->tracking_interval))?$app_general_setting->tracking_interval:'5';
-            $prefrences['TrackingDistance']=(isset($app_general_setting->tracking_distance))?$app_general_setting->tracking_distance:'100';
-            $prefrences['DebugTracking']=(isset($app_general_setting->debug_tracking) && $app_general_setting->debug_tracking == 1)?'YES':'NO';
-            $prefrences['hasGeoFencing']=(isset($app_general_setting->has_geo_fencing) && $app_general_setting->has_geo_fencing == 1)?'YES':'NO';
-            $prefrences['DebugGeoFencing']=(isset($app_general_setting->debug_geo_fencing) && $app_general_setting->debug_geo_fencing == 1)?'YES':'NO';
+            $prefrences['IS_SECURE_APP']=($general_setting->secured_apk==1)?'YES':'NO';
+            $prefrences['showHighResOption']=($general_setting->high_resolution_image==1)?'YES':'NO';
+            $prefrences['PersistImagesOnDevice']=($general_setting->persist_images_on_device==1)?'YES':'NO';
+            $prefrences['BackgroundUpdate']=($general_setting->background_update==1)?'YES':'NO';
+            $prefrences['ForceUpdate']=($general_setting->force_update==1)?'YES':'NO';
+            $prefrences['EnableAutoTime']=($general_setting->enable_auto_time==1)?'YES':'NO';
+            $prefrences['TrackingStatus']=($general_setting->tracking_status==1)?'YES':'NO';
+            $prefrences['TrackingInterval']=(isset($general_setting->tracking_interval))?$general_setting->tracking_interval:'5';
+            $prefrences['TrackingDistance']=(isset($general_setting->tracking_distance))?$general_setting->tracking_distance:'100';
+            $prefrences['DebugTracking']=(isset($general_setting->debug_tracking) && $general_setting->debug_tracking == 1)?'YES':'NO';
+            $prefrences['hasGeoFencing']=(isset($general_setting->has_geo_fencing) && $general_setting->has_geo_fencing == 1)?'YES':'NO';
+            $prefrences['DebugGeoFencing']=(isset($general_setting->debug_geo_fencing) && $general_setting->debug_geo_fencing == 1)?'YES':'NO';
             //Get geoFence from App user table
             $prefrences['geoFence']="[{'lng':74.33375,'lat':31.50282},{'lng':72.32271,'lat':31.49976},{'lng':74.3286,'lat':31.48541},{'lng':74.3474,'lat':30.48577},{'lng':74.33764,'lat':34.5049}]";
             
@@ -280,8 +280,8 @@ function get_forms($app_id, $imei_no) {
             $prefrences = new stdClass();
         }
         $p = array('preferences' => $prefrences);
-        $form_array_return = array_merge($image_array_final, $form_array_final, $file_array_final,$p);
-        return $form_array_return;
+        $form_return = array_merge($Final_image, $form_array_final, $final_array,$p);
+        return $form_return;
     }
 
     /**
@@ -480,13 +480,13 @@ public function saverecords() {
 
         //$app_id = $form_info ['app_id'];
         // Temprary block the record sending
-        $app_general_setting = get_app_general_settings($app_id);
+        $general_setting = get_general_settings($app_id);
 
 
         //Minimum version to accept activity
-        if(isset($app_general_setting->minimum_version_to_accept) && $app_general_setting->minimum_version_to_accept != ''){
+        if(isset($general_setting->minimum_version_to_accept) && $general_setting->minimum_version_to_accept != ''){
 
-            if ((float)$version_name < (float)$app_general_setting->minimum_version_to_accept) {
+            if ((float)$version_name < (float)$general_setting->minimum_version_to_accept) {
                 $jsone_array = array(
                     'error' => 'Please refresh the application version, This is old version and not allow to submit data.'
                 );
@@ -498,10 +498,10 @@ public function saverecords() {
         }
 
 
-        if (isset($app_general_setting->record_stop_sending) && $app_general_setting->record_stop_sending == 1) {
+        if (isset($general_setting->record_stop_sending) && $general_setting->record_stop_sending == 1) {
             $error_message = "Record receiving service currently not available. Record saved localy. Please Try later";
-            if ($app_general_setting->message_stop_sending_record != '') {
-                $error_message = $app_general_setting->message_stop_sending_record;
+            if ($general_setting->message_stop_sending_record != '') {
+                $error_message = $general_setting->message_stop_sending_record;
             }
             $jsone_array = array(
                 'error' => $error_message
@@ -521,7 +521,7 @@ public function saverecords() {
         
         if($imei_no!==''){
             $authorized = $this->app_model->appuser_imei_already_exist($imei_no, $app_id);
-            if (isset($app_general_setting->only_authorized) && $app_general_setting->only_authorized == 1 && !$authorized) {
+            if (isset($general_setting->only_authorized) && $general_setting->only_authorized == 1 && !$authorized) {
                 $jsone_array = array(
                     'error' => 'You are not authorized'
                 );
@@ -546,7 +546,7 @@ public function saverecords() {
 
 
         $direct_save = true;
-        if (isset($app_general_setting->direct_save) && $app_general_setting->direct_save == 1)
+        if (isset($general_setting->direct_save) && $general_setting->direct_save == 1)
         {
             $direct_save = false;
         }
@@ -602,11 +602,11 @@ public function saverecords() {
         }
 
         if($form_id == '10601'){
-            $match_exist_field_value = $record['cardnumber'];
-            //$activity_aready_exist = $this->db->get_where('zform_10601', array('cardnumber' => $match_exist_field_value))->row_array();
+            $check_alredy_regestered = $record['cardnumber'];
+            //$activity_aready_exist = $this->db->get_where('zform_10601', array('cardnumber' => $check_alredy_regestered))->row_array();
             $query=$this->db->query("select *
                                     from zform_10601
-                                    where cardnumber ='$match_exist_field_value' and is_deleted='0'");
+                                    where cardnumber ='$check_alredy_regestered' and is_deleted='0'");
             $activity_aready_exist = $query->row_array();
             //print_r($activity_aready_exist);
             //echo $this->db->last_query().'=======';
@@ -717,9 +717,9 @@ public function saverecords() {
                 $bucket_name = $s3_bucket;
                 
                 $s3 = new S3($s3_access_key, $s3_secret_key);
-                $imgName = '';
+                $img_name = '';
                 $rand_name = random_string('alnum', 10);
-                $imgName = $form_id . "_" . $rand_name . '.jpg';
+                $img_name = $form_id . "_" . $rand_name . '.jpg';
                 $fileTempName = $_FILES [$picture_key] ['tmp_name'];
 
                 $image_title='';
@@ -736,10 +736,10 @@ public function saverecords() {
                 }
 
                 // move the file
-                if ($s3->putObjectFile($fileTempName, $bucket_name, $imgName, S3::ACL_PUBLIC_READ)) {
-                    $imgName = 'http://' . $bucket_name . '.s3.amazonaws.com/' . $imgName;
+                if ($s3->putObjectFile($fileTempName, $bucket_name, $img_name, S3::ACL_PUBLIC_READ)) {
+                    $img_name = 'http://' . $bucket_name . '.s3.amazonaws.com/' . $img_name;
                     $temp_array = array(
-                        'image' => $imgName,
+                        'image' => $img_name,
                         'title' => $image_title
                     );
                     $images_array[] = $temp_array;
@@ -753,7 +753,7 @@ public function saverecords() {
                     $config ['allowed_types'] = 'png|gif|jpg|jpeg';
                     $config ['max_size'] = '4000';
                     $config ['encrypt_name'] = true;
-                    $config ['file_name'] = $imgName;
+                    $config ['file_name'] = $img_name;
 
                     $this->load->library('upload', $config);
                     if (!$this->upload->do_upload($picture_key)) {
@@ -767,10 +767,10 @@ public function saverecords() {
                         $error_before = array(
                             'file' => $data ['upload_data'] ['file_name']
                         );
-                        //$imgName = base_url() . 'assets/images/data/form-data/' . $data ['upload_data'] ['file_name'];
-                        $imgName = NFS_IMAGE_PATH.'/app_id_'.$app_id.'/'.$data ['upload_data'] ['file_name'];
+                        //$img_name = base_url() . 'assets/images/data/form-data/' . $data ['upload_data'] ['file_name'];
+                        $img_name = NFS_IMAGE_PATH.'/app_id_'.$app_id.'/'.$data ['upload_data'] ['file_name'];
                         $temp_array = array(
-                            'image' => $imgName,
+                            'image' => $img_name,
                             'title' => $image_title
                         );
                         $images_array[] = $temp_array;
@@ -780,7 +780,7 @@ public function saverecords() {
             else 
             {
                 $rand_name = random_string('alnum', 10);
-                $imgName = $form_id . "_" . $rand_name . '.jpg';
+                $img_name = $form_id . "_" . $rand_name . '.jpg';
                 //$path = './assets/images/data/form-data/';
                 $path = NFS_IMAGE_PATH.'/app_id_'.$app_id;
                 @mkdir($path);
@@ -788,7 +788,7 @@ public function saverecords() {
                 $config ['allowed_types'] = 'png|gif|jpg|jpeg';
                 $config ['max_size'] = '4000';
                 $config ['encrypt_name'] = true;
-                $config ['file_name'] = $imgName;
+                $config ['file_name'] = $img_name;
                 $image_title='';
                 foreach ($cap_seq_array as $ckey => $cvalue) {
                     if (strpos($_FILES [$picture_key] ['name'], $cvalue) !== false) {
@@ -813,10 +813,10 @@ public function saverecords() {
                     $error_before = array(
                         'file' => $data ['upload_data'] ['file_name']
                     );
-                    $imgName = NFS_IMAGE_PATH.'/app_id_'.$app_id.'/'.$data ['upload_data'] ['file_name'];
-                    //$imgName = base_url() . 'assets/images/data/form-data/' . $data ['upload_data'] ['file_name'];
+                    $img_name = NFS_IMAGE_PATH.'/app_id_'.$app_id.'/'.$data ['upload_data'] ['file_name'];
+                    //$img_name = base_url() . 'assets/images/data/form-data/' . $data ['upload_data'] ['file_name'];
                     $temp_array = array(
-                        'image' => $imgName,
+                        'image' => $img_name,
                         'title' => $image_title
                     );
                     $images_array [] = $temp_array;
@@ -856,7 +856,7 @@ public function saverecords() {
             }
         }
 
-        $dataresultnew = array(
+        $data_result_new = array(
             'form_id' => $form_id,
             'imei_no' => $imei_no,
             'location' => $location,
@@ -876,11 +876,11 @@ public function saverecords() {
         if (strpos($_SERVER ['SERVER_NAME'], 'monitoring.punjab') !== false) {
             if($form_id == 21 || $form_id == 20)
             {
-                $dataresultnew['created_datetime_partition']=$created_datetime;
+                $data_result_new['created_datetime_partition']=$created_datetime;
 
             }
         }
-        $dataresultnew1 = array_merge($dataresultnew, $record);
+        $data_result_new1 = array_merge($data_result_new, $record);
         
         
         
@@ -890,7 +890,7 @@ public function saverecords() {
             $fields_list = $this->db->list_fields('zform_' . $form_id);
             $fields_list = array_map('strtolower', $fields_list);
             $after_field = $fields_list[count($fields_list) - 13];
-            foreach ($dataresultnew1 as $element => $ele_val) {
+            foreach ($data_result_new1 as $element => $ele_val) {
                 if ($element != '') {
                     $element = str_replace('[]', '', $element);
                     if (!(in_array(strtolower($element), $fields_list))) {
@@ -920,19 +920,19 @@ public function saverecords() {
             ///////////////////////// HASSAN ANWAR     ////////////////////////////
             ///////////////////////////////////////////////////////////////////////
 
-            $multiChoices = $this->db->query("Select * from form_multiselectFieldLabels where formId='$form_id'");
-            foreach($multiChoices->result() as $row)
+            $multi_choices = $this->db->query("Select * from form_multiselectFieldLabels where formId='$form_id'");
+            foreach($multi_choices->result() as $row)
             {
-                $fd=(array) $dataresultnew1;
+                $fd=(array) $data_result_new1;
 
                 $label=$row->fieldLabel;
-                $choicesSent= $dataresultnew1[$label];
-                $choicesSent=explode(',',$choicesSent);
+                $choice_sent= $data_result_new1[$label];
+                $choice_sent=explode(',',$choice_sent);
 
-                foreach($choicesSent as $choice)
+                foreach($choice_sent as $choice)
                 {
                     $choice=str_replace(' ', '_', $choice);
-                    $dataresultnew1[$label.'_'.$choice]='1';
+                    $data_result_new1[$label.'_'.$choice]='1';
                 }
 
             }
@@ -943,10 +943,10 @@ public function saverecords() {
             ///////////////////////////////////////////////////////////////////////
         }
          
-        $this->form_results_model->update_mobile_activity($activity_inserted_id,array('form_data_decoded'=>  json_encode($dataresultnew1)));
+        $this->form_results_model->update_mobile_activity($activity_inserted_id,array('form_data_decoded'=>  json_encode($data_result_new1)));
 
         $final_array = array();
-        foreach ($dataresultnew1 as $key => $value) {
+        foreach ($data_result_new1 as $key => $value) {
             $key = strtolower($key);
             if(array_key_exists($key, $final_array)){
                 $final_array[$key] = $final_array[$key].','.$value;
@@ -959,9 +959,9 @@ public function saverecords() {
         }
 
         try{
-            $ret_ins = $this->db->insert( 'zform_'.$form_id, $final_array );
+            $database_insert = $this->db->insert( 'zform_'.$form_id, $final_array );
             
-            if(!$ret_ins){
+            if(!$database_insert){
                 $err_msg .= $this->db->_error_message();
                 $this->form_results_model->update_mobile_activity($activity_inserted_id,array('error'=>$err_msg));
     //            $jsone_array = array (
@@ -970,7 +970,7 @@ public function saverecords() {
     //            echo json_encode ( $jsone_array );
                 exit();
             }
-            $form_result_id_new = $this->db->insert_id();
+            $form_result_id = $this->db->insert_id();
         }catch (Exception $e) {
                 $this->form_results_model->update_mobile_activity($activity_inserted_id,array('error'=>$e->message()));
                 echo json_encode($jsone_array);
@@ -992,7 +992,7 @@ public function saverecords() {
                     }
                     $sub_comon_ary = array(
                         'form_id' => $form_id,
-                        'zform_result_id' => $form_result_id_new
+                        'zform_result_id' => $form_result_id
                     );
                     $sub_comon_fields = array_merge($sub_comon_fields, $sub_comon_ary);
                     $this->db->insert($subtable_name, $sub_comon_fields);
@@ -1005,7 +1005,7 @@ public function saverecords() {
             foreach ($images_array as $image_path) {
 
                 $add_images = array(
-                    'zform_result_id' => $form_result_id_new,
+                    'zform_result_id' => $form_result_id,
                     'form_id' => $form_id,
                     'image' => $image_path ['image']
                 );
@@ -1042,7 +1042,7 @@ public function saverecords() {
                     'image_title' => $add_images ['title'],
                     'location' => $location,
                     'form_id' => $form_id,
-                    'remote_record_id' => $form_result_id_new,
+                    'remote_record_id' => $form_result_id,
                     'security_key' => $form_info ['security_key']
                 );
 
@@ -1062,7 +1062,7 @@ public function saverecords() {
                     $oldrecarray = array(
                         'post_status' => 'yes'
                     );
-                    $this->db->where('id', $form_result_id_new);
+                    $this->db->where('id', $form_result_id);
                     $this->db->update('zform_4575', $oldrecarray);
                 }
             } else {
@@ -1071,7 +1071,7 @@ public function saverecords() {
                     'image' => $image_array_post,
                     'location' => $location,
                     'form_id' => $form_id,
-                    'remote_record_id' => $form_result_id_new,
+                    'remote_record_id' => $form_result_id,
                     'security_key' => $form_info ['security_key']
                 );
                 $record11 = array_merge($final_array, $tempary);
@@ -1084,7 +1084,7 @@ public function saverecords() {
                     $oldrecarray = array(
                         'post_status' => 'yes'
                     );
-                    $this->db->where('id', $form_result_id_new);
+                    $this->db->where('id', $form_result_id);
                     $this->db->update('zform_' . $form_id, $oldrecarray);
                 }
             }
@@ -1097,7 +1097,7 @@ public function saverecords() {
                 app3866($app_id, $imei_no, $final_array);
             }
             if ($app_id == '3882' || $app_id == '3883') {
-                // app3883($app_id,$imei_no,$dataresultnew1);
+                // app3883($app_id,$imei_no,$data_result_new1);
             }
         }
         //$this->form_results_model->update_mobile_activity($activity_inserted_id,array('error'=>'submitted'));
@@ -1242,7 +1242,7 @@ public function saverecordscron() {
                 }
             }
 
-            $dataresultnew = array(
+            $data_result_new = array(
                 'form_id' => $form_id,
                 'imei_no' => $imei_no,
                 'location' => $location,
@@ -1256,7 +1256,7 @@ public function saverecordscron() {
                 'activity_datetime' => $activity_datetime,
                 'created_datetime' => $created_datetime
             );
-            $dataresultnew1 = array_merge($dataresultnew, $record);
+            $data_result_new1 = array_merge($data_result_new, $record);
 
 
 
@@ -1265,7 +1265,7 @@ public function saverecordscron() {
             $fields_list = $this->db->list_fields('zform_' . $form_id);
             $fields_list = array_map('strtolower', $fields_list);
             $after_field = $fields_list[count($fields_list) - 13];
-            foreach ($dataresultnew1 as $element => $ele_val) {
+            foreach ($data_result_new1 as $element => $ele_val) {
                 if ($element != '') {
                     $element = str_replace('[]', '', $element);
                     if (!(in_array(strtolower($element), $fields_list))) {
@@ -1284,10 +1284,10 @@ public function saverecordscron() {
             }
 
 
-            $this->form_results_model->update_mobile_activity($activity_inserted_id, array('form_data_decoded' => json_encode($dataresultnew1)));
-            $ret_ins = $this->db->insert('zform_' . $form_id, $dataresultnew1);
-            $form_result_id_new = $this->db->insert_id();
-            if (!$ret_ins) {
+            $this->form_results_model->update_mobile_activity($activity_inserted_id, array('form_data_decoded' => json_encode($data_result_new1)));
+            $database_insert = $this->db->insert('zform_' . $form_id, $data_result_new1);
+            $form_result_id = $this->db->insert_id();
+            if (!$database_insert) {
                 $err_msg .= 'Record Not Submitted. ' . $this->db->_error_message() . '.                         "Please Refresh your application"';
                 $this->form_results_model->update_mobile_activity($activity_inserted_id, array('error' => $err_msg));
 
@@ -1307,7 +1307,7 @@ public function saverecordscron() {
                         }
                         $sub_comon_ary = array(
                             'form_id' => $form_id,
-                            'zform_result_id' => $form_result_id_new
+                            'zform_result_id' => $form_result_id
                         );
                         $sub_comon_fields = array_merge($sub_comon_fields, $sub_comon_ary);
                         $this->db->insert($subtable_name, $sub_comon_fields);
@@ -1320,7 +1320,7 @@ public function saverecordscron() {
                 foreach ($images_array as $image_path) {
 
                     $add_images = array(
-                        'zform_result_id' => $form_result_id_new,
+                        'zform_result_id' => $form_result_id,
                         'form_id' => $form_id,
                         'image' => $image_path['image']
                     );
@@ -1354,10 +1354,10 @@ public function saverecordscron() {
                         'image' => $image_array_post,
                         'location' => $location,
                         'form_id' => $form_id,
-                        'remote_record_id' => $form_result_id_new,
+                        'remote_record_id' => $form_result_id,
                         'security_key' => $form_info ['security_key']
                     );
-                    $record11 = array_merge($dataresultnew1, $tempary);
+                    $record11 = array_merge($data_result_new1, $tempary);
                     $data_post_json = json_encode($record11);
                     $urlpost = urlencode($data_post_json);
                     $post_url = urlencode($post_url);
@@ -1367,7 +1367,7 @@ public function saverecordscron() {
                         $oldrecarray = array(
                             'post_status' => 'yes'
                         );
-                        $this->db->where('id', $form_result_id_new);
+                        $this->db->where('id', $form_result_id);
                         $this->db->update('zform_' . $form_id, $oldrecarray);
                     }
                 
@@ -1454,11 +1454,11 @@ public function saverecordsharzindagi() {
         }
         $app_id = $form_info ['app_id'];
         // Temprary block the record sending
-        $app_general_setting = get_app_general_settings($app_id);
-        if (isset($app_general_setting->record_stop_sending) && $app_general_setting->record_stop_sending == 1) {
+        $general_setting = get_general_settings($app_id);
+        if (isset($general_setting->record_stop_sending) && $general_setting->record_stop_sending == 1) {
             $error_message = "Record receiving service currently not available. Please Try later";
-            if ($app_general_setting->message_stop_sending_record != '') {
-                $error_message = $app_general_setting->message_stop_sending_record;
+            if ($general_setting->message_stop_sending_record != '') {
+                $error_message = $general_setting->message_stop_sending_record;
             }
             $jsone_array = array(
                 'error' => $error_message
@@ -1477,7 +1477,7 @@ public function saverecordsharzindagi() {
         }
 
         $authorized = $this->app_model->appuser_imei_already_exist($imei_no, $app_id);
-        if ($app_general_setting->only_authorized == 1 && !$authorized) {
+        if ($general_setting->only_authorized == 1 && !$authorized) {
             $jsone_array = array(
                 'error' => 'This IMEI# not authorized to sumbit record'
             );
@@ -1485,8 +1485,8 @@ public function saverecordsharzindagi() {
             exit();
         }
        
-        $ret_ins = $this->db->insert( 'zform_'.$form_id, $form_data );
-        $form_result_id_new = $this->db->insert_id();
+        $database_insert = $this->db->insert( 'zform_'.$form_id, $form_data );
+        $form_result_id = $this->db->insert_id();
 
         $images_array = array();
         $site_settings = $this->site_model->get_settings('1');
@@ -1499,19 +1499,19 @@ public function saverecordsharzindagi() {
             // instantiate the class
             $this->load->library('S3');
             $s3 = new S3($s3_access_key, $s3_secret_key);
-            $imgName = '';
+            $img_name = '';
             for ($file = 1; $file <= 5; $file ++) {
                 if (isset($_FILES ['picture_file_' . $file])) {
                     $rand_name = random_string('alnum', 10);
-                    $imgName = $form_id . "_" . $rand_name . '.jpg';
+                    $img_name = $form_id . "_" . $rand_name . '.jpg';
                     $fileTempName = $_FILES ['picture_file_' . $file] ['tmp_name'];
                     
                     
                     // move the file
-                    if ($s3->putObjectFile($fileTempName, $bucket_name, $imgName, S3::ACL_PUBLIC_READ)) {
-                        $imgName = 'http://' . $bucket_name . '.s3.amazonaws.com/' . $imgName;
+                    if ($s3->putObjectFile($fileTempName, $bucket_name, $img_name, S3::ACL_PUBLIC_READ)) {
+                        $img_name = 'http://' . $bucket_name . '.s3.amazonaws.com/' . $img_name;
                         $temp_array = array(
-                            'image' => $imgName,
+                            'image' => $img_name,
                             'title' => $image_title
                         );
                         $images_array [] = $temp_array;
@@ -1524,7 +1524,7 @@ public function saverecordsharzindagi() {
                             $config ['allowed_types'] = 'png|gif|jpg|jpeg';
                             $config ['max_size'] = '4000';
                             $config ['encrypt_name'] = true;
-                            $config ['file_name'] = $imgName;
+                            $config ['file_name'] = $img_name;
 
 
                             $this->load->library('upload', $config);
@@ -1539,9 +1539,9 @@ public function saverecordsharzindagi() {
                                 $error_before = array(
                                     'file' => $data ['upload_data'] ['file_name']
                                 );
-                                $imgName = base_url() . 'assets/images/data/form-data/' . $data ['upload_data'] ['file_name'];
+                                $img_name = base_url() . 'assets/images/data/form-data/' . $data ['upload_data'] ['file_name'];
                                 $temp_array = array(
-                                    'image' => $imgName,
+                                    'image' => $img_name,
                                     'title' => $image_title
                                 );
                                 $images_array [] = $temp_array;
@@ -1555,13 +1555,13 @@ public function saverecordsharzindagi() {
             for ($file = 1; $file <= 5; $file ++) {
                 if (isset($_FILES ['picture_file_' . $file])) {
                     $rand_name = random_string('alnum', 10);
-                    $imgName = $form_id . "_" . $rand_name . '.jpg';
+                    $img_name = $form_id . "_" . $rand_name . '.jpg';
                     $path = './assets/images/data/form-data/';
                     $config ['upload_path'] = $path;
                     $config ['allowed_types'] = 'png|gif|jpg|jpeg';
                     $config ['max_size'] = '4000';
                     $config ['encrypt_name'] = true;
-                    $config ['file_name'] = $imgName;
+                    $config ['file_name'] = $img_name;
 
                     $this->load->library('upload', $config);
                     if (!$this->upload->do_upload('picture_file_' . $file)) {
@@ -1575,9 +1575,9 @@ public function saverecordsharzindagi() {
                         $error_before = array(
                             'file' => $data ['upload_data'] ['file_name']
                         );
-                        $imgName = base_url() . 'assets/images/data/form-data/' . $data ['upload_data'] ['file_name'];
+                        $img_name = base_url() . 'assets/images/data/form-data/' . $data ['upload_data'] ['file_name'];
                         $temp_array = array(
-                            'image' => $imgName,
+                            'image' => $img_name,
                             'title' => $image_title
                         );
                         $images_array [] = $temp_array;
@@ -1591,7 +1591,7 @@ public function saverecordsharzindagi() {
             foreach ($images_array as $image_path) {
 
                 $add_images = array(
-                    'zform_result_id' => $form_result_id_new,
+                    'zform_result_id' => $form_result_id,
                     'form_id' => $form_id,
                     'image' => $image_path ['image'],
                     'title' => $image_path ['title']
@@ -1670,11 +1670,11 @@ public function saverecordsweb() {
         }
         $app_id = $form_info ['app_id'];
         // Temprary block the record sending
-        $app_general_setting = get_app_general_settings($app_id);
-        if (isset($app_general_setting->record_stop_sending) && $app_general_setting->record_stop_sending == 1) {
+        $general_setting = get_general_settings($app_id);
+        if (isset($general_setting->record_stop_sending) && $general_setting->record_stop_sending == 1) {
             $error_message = "Record receiving service currently not available. Please Try later";
-            if ($app_general_setting->message_stop_sending_record != '') {
-                $error_message = $app_general_setting->message_stop_sending_record;
+            if ($general_setting->message_stop_sending_record != '') {
+                $error_message = $general_setting->message_stop_sending_record;
             }
             $jsone_array = array(
                 'error' => $error_message
@@ -1693,7 +1693,7 @@ public function saverecordsweb() {
         }
 
 /*        $authorized = $this->app_model->appuser_imei_already_exist($imei_no, $app_id);
-        if ($app_general_setting->only_authorized == 1 && !$authorized) {
+        if ($general_setting->only_authorized == 1 && !$authorized) {
             $jsone_array = array(
                 'error' => 'You are not authorized'
             );
@@ -1778,11 +1778,11 @@ public function saverecordsweb() {
             // instantiate the class
             $this->load->library('S3');
             $s3 = new S3($s3_access_key, $s3_secret_key);
-            $imgName = '';
+            $img_name = '';
             for ($file = 1; $file <= 5; $file ++) {
                 if (isset($_FILES ['picture_file_' . $file])) {
                     $rand_name = random_string('alnum', 10);
-                    $imgName = $form_id . "_" . $rand_name . '.jpg';
+                    $img_name = $form_id . "_" . $rand_name . '.jpg';
                     $fileTempName = $_FILES ['picture_file_' . $file] ['tmp_name'];
                     $title_id = $_FILES ['picture_file_' . $file] ['name'];
                     $title_id = explode('-', $title_id);
@@ -1793,10 +1793,10 @@ public function saverecordsweb() {
                         }
                     }
                     // move the file
-                    if ($s3->putObjectFile($fileTempName, $bucket_name, $imgName, S3::ACL_PUBLIC_READ)) {
-                        $imgName = 'http://' . $bucket_name . '.s3.amazonaws.com/' . $imgName;
+                    if ($s3->putObjectFile($fileTempName, $bucket_name, $img_name, S3::ACL_PUBLIC_READ)) {
+                        $img_name = 'http://' . $bucket_name . '.s3.amazonaws.com/' . $img_name;
                         $temp_array = array(
-                            'image' => $imgName,
+                            'image' => $img_name,
                             'title' => $image_title
                         );
                         $images_array [] = $temp_array;
@@ -1807,7 +1807,7 @@ public function saverecordsweb() {
             for ($file = 1; $file <= 5; $file ++) {
                 if (isset($_FILES ['picture_file_' . $file])) {
                     $rand_name = random_string('alnum', 10);
-                    $imgName = $form_id . "_" . $rand_name . '.jpg';
+                    $img_name = $form_id . "_" . $rand_name . '.jpg';
                     //$path = './assets/images/data/form-data/';
                     $path = NFS_IMAGE_PATH.'/app_id_'.$app_id;
                     @mkdir($path);
@@ -1815,7 +1815,7 @@ public function saverecordsweb() {
                     $config ['allowed_types'] = 'png|gif|jpg|jpeg';
                     $config ['max_size'] = '4000';
                     $config ['encrypt_name'] = true;
-                    $config ['file_name'] = $imgName;
+                    $config ['file_name'] = $img_name;
 
                     $title_id = $_FILES ['picture_file_' . $file] ['name'];
                     $title_id = explode('-', $title_id);
@@ -1838,9 +1838,9 @@ public function saverecordsweb() {
                         $error_before = array(
                             'file' => $data ['upload_data'] ['file_name']
                         );
-                        $imgName = NFS_IMAGE_PATH.'/app_id_'.$app_id .'/'. $data ['upload_data'] ['file_name'];
+                        $img_name = NFS_IMAGE_PATH.'/app_id_'.$app_id .'/'. $data ['upload_data'] ['file_name'];
                         $temp_array = array(
-                            'image' => $imgName,
+                            'image' => $img_name,
                             'title' => $image_title
                         );
                         $images_array [] = $temp_array;
@@ -1870,7 +1870,7 @@ public function saverecordsweb() {
             }
         }
 
-        $dataresultnew = array(
+        $data_result_new = array(
             'form_id' => $form_id,
             'imei_no' => $imei_no,
             'location' => $location,
@@ -1884,7 +1884,7 @@ public function saverecordsweb() {
             'activity_datetime' => $activity_datetime,
             'created_datetime' => $created_datetime
         );
-        $dataresultnew1 = array_merge($dataresultnew, $record);
+        $data_result_new1 = array_merge($data_result_new, $record);
         
         if ($app_id == '5316') {
 
@@ -1892,19 +1892,19 @@ public function saverecordsweb() {
             ///////////////////////// HASSAN ANWAR     ////////////////////////////
             ///////////////////////////////////////////////////////////////////////
 
-            $multiChoices = $this->db->query("Select * from form_multiselectFieldLabels where formId='$form_id'");
-            foreach($multiChoices->result() as $row)
+            $multi_choices = $this->db->query("Select * from form_multiselectFieldLabels where formId='$form_id'");
+            foreach($multi_choices->result() as $row)
             {
-                $fd=(array) $dataresultnew1;
+                $fd=(array) $data_result_new1;
 
                 $label=$row->fieldLabel;
-                $choicesSent= $dataresultnew1[$label];
-                $choicesSent=explode(',',$choicesSent);
+                $choice_sent= $data_result_new1[$label];
+                $choice_sent=explode(',',$choice_sent);
 
-                foreach($choicesSent as $choice)
+                foreach($choice_sent as $choice)
                 {
                     $choice=str_replace(' ', '_', $choice);
-                    $dataresultnew1[$label.'_'.$choice]='1';
+                    $data_result_new1[$label.'_'.$choice]='1';
                 }
 
             }
@@ -1914,15 +1914,15 @@ public function saverecordsweb() {
             ///////////////////////// HASSAN ANWAR     ////////////////////////////
             ///////////////////////////////////////////////////////////////////////
         }
-        $ret_ins = $this->db->insert( 'zform_'.$form_id, $dataresultnew1 );
-        $form_result_id_new = $this->db->insert_id();
-        if(!$ret_ins){
+        $database_insert = $this->db->insert( 'zform_'.$form_id, $data_result_new1 );
+        $form_result_id = $this->db->insert_id();
+        if(!$database_insert){
             //Mobile activity log - Start
             $mobile_log = array(
                 'imei_no' => $imei_no,
                 'form_id' => $form_id,
                 'app_id' => $app_id,
-                'record' => json_encode($dataresultnew1)
+                'record' => json_encode($data_result_new1)
             );
             $this->db->insert( 'mobile_activity_log', $mobile_log);
             //Mobile activity log - End
@@ -1949,7 +1949,7 @@ public function saverecordsweb() {
                     }
                     $sub_comon_ary = array(
                         'form_id' => $form_id,
-                        'zform_result_id' => $form_result_id_new
+                        'zform_result_id' => $form_result_id
                     );
                     $sub_comon_fields = array_merge($sub_comon_fields, $sub_comon_ary);
                     $this->db->insert($subtable_name, $sub_comon_fields);
@@ -1962,7 +1962,7 @@ public function saverecordsweb() {
             foreach ($images_array as $image_path) {
 
                 $add_images = array(
-                    'zform_result_id' => $form_result_id_new,
+                    'zform_result_id' => $form_result_id,
                     'form_id' => $form_id,
                     'image' => $image_path ['image']
                 );
@@ -1998,11 +1998,11 @@ public function saverecordsweb() {
                     'image_title' => $add_images ['title'],
                     'location' => $location,
                     'form_id' => $form_id,
-                    'remote_record_id' => $form_result_id_new,
+                    'remote_record_id' => $form_result_id,
                     'security_key' => $form_info ['security_key']
                 );
 
-                $record11 = array_merge($dataresultnew1, $tempary);
+                $record11 = array_merge($data_result_new1, $tempary);
                 $fields_string = '';
 
                 foreach ($record11 as $rec_key => $rec_val) {
@@ -2018,7 +2018,7 @@ public function saverecordsweb() {
                     $oldrecarray = array(
                         'post_status' => 'yes'
                     );
-                    $this->db->where('id', $form_result_id_new);
+                    $this->db->where('id', $form_result_id);
                     $this->db->update('zform_4575', $oldrecarray);
                 }
             } else {
@@ -2027,10 +2027,10 @@ public function saverecordsweb() {
                     'image' => $image_array_post,
                     'location' => $location,
                     'form_id' => $form_id,
-                    'remote_record_id' => $form_result_id_new,
+                    'remote_record_id' => $form_result_id,
                     'security_key' => $form_info ['security_key']
                 );
-                $record11 = array_merge($dataresultnew1, $tempary);
+                $record11 = array_merge($data_result_new1, $tempary);
                 $data_post_json = json_encode($record11);
                 $urlpost = urlencode($data_post_json);
                 $post_url = urlencode($post_url);
@@ -2040,7 +2040,7 @@ public function saverecordsweb() {
                     $oldrecarray = array(
                         'post_status' => 'yes'
                     );
-                    $this->db->where('id', $form_result_id_new);
+                    $this->db->where('id', $form_result_id);
                     $this->db->update('zform_' . $form_id, $oldrecarray);
                 }
             }
@@ -2795,7 +2795,7 @@ public function savetracking() {
         $gpsTime = date('Y-m-d H:i:s', strtotime($_REQUEST ['gpsTime']));
         $deviceTS = date('Y-m-d H:i:s', strtotime($_REQUEST ['deviceTS']));
         $created_datetime = date('Y-m-d H:i:s');
-        $dataresultnew = array(
+        $data_result_new = array(
             'app_id' => $app_id,
             'imei_no' => $imei_no,
             'location' => $location,
@@ -2813,7 +2813,7 @@ public function savetracking() {
         
         $tracking_temp = array(
             'app_id' => $app_id,
-            'data_save' => json_encode($dataresultnew),
+            'data_save' => json_encode($data_result_new),
             'data_type' => 'single'
             
         );
@@ -2844,9 +2844,9 @@ public function savetracking() {
          
         add_tracking_table($app_id);
         
-        $ret_ins = $this->db->insert( 'ztracking_'.$app_id, $dataresultnew );
+        $database_insert = $this->db->insert( 'ztracking_'.$app_id, $data_result_new );
                   
-        if(!$ret_ins){
+        if(!$database_insert){
             $err_msg = $this->db->_error_message();
             $this->form_results_model->update_mobile_tracking($tracking_inserted_id,array('error'=>$err_msg));
 
@@ -2905,7 +2905,7 @@ public function savetrackingbulk() {
             $gpsTime = date('Y-m-d H:i:s', strtotime($r_value['gpsTime']));
             $deviceTS = date('Y-m-d H:i:s', strtotime($r_value['deviceTS']));
             $created_datetime = date('Y-m-d H:i:s');
-            $dataresultnew = array(
+            $data_result_new = array(
                 'app_id' => $app_id,
                 'imei_no' => $imei_no,
                 'location' => $r_value['location'],
@@ -2919,9 +2919,9 @@ public function savetrackingbulk() {
                 'route_id' => $r_value['routeId'],
                 'created_datetime'=>$created_datetime
             );
-            $ret_ins = $this->db->insert( 'ztracking_'.$app_id, $dataresultnew );
+            $database_insert = $this->db->insert( 'ztracking_'.$app_id, $data_result_new );
                   
-            if(!$ret_ins){
+            if(!$database_insert){
                 $err_msg = $this->db->_error_message();
                 $this->form_results_model->update_mobile_tracking($tracking_inserted_id,array('error'=>$err_msg));
                 
diff --git a/application/controllers/apimaker.php b/application/controllers/apimaker.php
index c9ed413..63cfaed 100644
--- a/application/controllers/apimaker.php
+++ b/application/controllers/apimaker.php
@@ -164,12 +164,12 @@ public function add() {
                     if($department_id==0) {
                         $department_id = trim($this->input->post('department_id'));
                     }
-                    $apidata = array(
+                    $api_data = array(
                         'title' => $api_title,
                         'secret_key' => $rand_key,
                         'department_id' => $department_id
                     );
-                    $this->db->insert('api', $apidata);
+                    $this->db->insert('api', $api_data);
                     $api_id = $this->db->insert_id();
                     //upload api file   
                     $abs_path = './assets/data/';
@@ -178,9 +178,9 @@ public function add() {
                     umask($old);
                     if ($_FILES['userfile_addapi']['name'] != '') {
                     	$file_name = preg_replace("/[^A-Za-z0-9\.]/", "_",$_FILES['userfile_addapi']['name']);
-                        $iconName = $api_id.'_'.$file_name;
+                        $icon_name = $api_id.'_'.$file_name;
                         $config['upload_path'] = $abs_path;
-                        $config['file_name'] = $iconName;
+                        $config['file_name'] = $icon_name;
                         $config['overwrite'] = TRUE;
                         $config["allowed_types"] = 'csv';
                         $config["max_size"] = 15360;
@@ -197,7 +197,7 @@ public function add() {
                     } 
 
                     $change_file = array(
-                        'file_name' => $iconName,
+                        'file_name' => $icon_name,
                     );
                     $this->db->where('id', $api_id);
                     $this->db->update('api', $change_file);
@@ -241,21 +241,21 @@ public function edit($slug) {
                     if($department_id==0) {
                         $department_id = trim($this->input->post('department_id'));
                     }
-                    $apidata = array(
+                    $api_data = array(
                         'title' => $api_title,
                         'department_id' => $department_id,
                     );
                     $this->db->where('id', $api_id);
-                    $this->db->update('api', $apidata);
+                    $this->db->update('api', $api_data);
                     //upload api file   
                     $abs_path = './assets/data/';
                     $old = umask(0);
                     @mkdir($abs_path, 0777);
                     umask($old);
                     if ($_FILES['userfile_addapi']['name'] != '') {
-                        $iconName = $api_id.'_'.$_FILES['userfile_addapi']['name'];
+                        $icon_name = $api_id.'_'.$_FILES['userfile_addapi']['name'];
                         $config['upload_path'] = $abs_path;
-                        $config['file_name'] = $iconName;
+                        $config['file_name'] = $icon_name;
                         $config['overwrite'] = TRUE;
                         $config["allowed_types"] = 'csv';
                         $config["max_size"] = 15360;
@@ -268,7 +268,7 @@ public function edit($slug) {
                             //success
                         }
                         $change_file = array(
-                            'file_name' => $iconName,
+                            'file_name' => $icon_name,
                         );
                         $this->db->where('id', $api_id);
                         $this->db->update('api', $change_file);
diff --git a/application/controllers/app.php b/application/controllers/app.php
index a16b28f..aeab495 100644
--- a/application/controllers/app.php
+++ b/application/controllers/app.php
@@ -240,14 +240,14 @@ public function appassignusers($slug) {
                 $query = $this->db->get();
                 $already_asign = $query->result_array();
                 if (!$already_asign) {
-                    $appdata = array(
+                    $app_data = array(
                         'user_id' => $user_id,
                         'app_id' => $app_id
                     );
                     //array parameters : action, description, before, after, app_id, app_name, form_id, form_name
-                    $logary = array('action' => 'insert', 'description' => 'Assigned application to other user', 'after' => json_encode($appdata), 'app_id' => $app_id,);
+                    $logary = array('action' => 'insert', 'description' => 'Assigned application to other user', 'after' => json_encode($app_data), 'app_id' => $app_id,);
                     addlog($logary);
-                    $this->db->insert('users_app', $appdata);
+                    $this->db->insert('users_app', $app_data);
                     $this->session->set_flashdata('validate', array('message' => 'Application Assigned to User successfully', 'type' => 'success'));
                     redirect(base_url() . 'assign-applicatioin-users/' . $app_id);
                 } else {
@@ -343,7 +343,7 @@ public function appusers() {
                     $imei_no = $this->input->post('login_user');
                 }
 
-                $appdata = array(
+                $app_data = array(
                     'app_id' => $app_id,
                     'department_id' => $department_id,
                     'view_id' => $view_id,
@@ -357,10 +357,10 @@ public function appusers() {
                     'mobile_number' => $this->input->post('mobile_number')
                 );
                 //array parameters : action, description, before, after, app_id, app_name, form_id, form_name
-                $logary = array('action' => 'insert', 'description' => 'app-users', 'after' => json_encode($appdata), 'app_id' => $app_id,);
+                $logary = array('action' => 'insert', 'description' => 'app-users', 'after' => json_encode($app_data), 'app_id' => $app_id,);
                 addlog($logary);
 
-                $this->db->insert('app_users', $appdata);
+                $this->db->insert('app_users', $app_data);
                 $this->session->set_flashdata('validate', array('message' => 'Application User added successfully', 'type' => 'success'));
                 redirect(base_url() . 'applicatioin-users');
             }
@@ -928,16 +928,16 @@ public function add() {
                         }
                     }
 
-                    $appName = trim($this->input->post('app_name'));
-                    $appdata = array(
+                    $app_name = trim($this->input->post('app_name'));
+                    $app_data = array(
                         'department_id' => $department_id,
                         'user_id' => $data['login_user_id'],
                         'description' => '',
                         'full_description' => '',
                         'icon' => '',
-                        'name' => $appName
+                        'name' => $app_name
                     );
-                    $this->db->insert('app', $appdata);
+                    $this->db->insert('app', $app_data);
                     $app_id = $this->db->insert_id();
 
                     if (!$this->acl->hasSuperAdmin()) {
@@ -946,7 +946,7 @@ public function add() {
                     }
 
                     //array parameters : action, description, before, after, app_id, app_name, form_id, form_name
-                    $logary = array('action' => 'insert', 'description' => 'add new application', 'after' => json_encode($appdata), 'app_id' => $app_id, 'app_name' => $appName);
+                    $logary = array('action' => 'insert', 'description' => 'add new application', 'after' => json_encode($app_data), 'app_id' => $app_id, 'app_name' => $app_name);
                     addlog($logary);
 
                     //upload app icon
@@ -954,10 +954,10 @@ public function add() {
                     $old = umask(0);
                     @mkdir($abs_path, 0777);
                     umask($old);
-                    $iconName = 'appicon_' . $app_id . '.png';
+                    $icon_name = 'appicon_' . $app_id . '.png';
                     if ($_FILES['userfile_addapp']['name'] != '') {
                         $config['upload_path'] = $abs_path;
-                        $config['file_name'] = $iconName;
+                        $config['file_name'] = $icon_name;
                         $config['overwrite'] = TRUE;
                         $config["allowed_types"] = 'png';
                         $config["max_size"] = 1024;
@@ -970,12 +970,12 @@ public function add() {
                             $this->session->set_flashdata('validate', array('message' => $this->upload->display_errors() . ', Default icon has been embeded with your app.', 'type' => 'warning'));
                         } else {
                             //success
-                            $imageData=$this->upload->data();
+                            $image_data=$this->upload->data();
 //                            $this->load->library('image_lib');
                             $config['overwrite'] = TRUE;
                             $config['image_library'] = 'gd2';
-                            $config['source_image'] = $imageData['full_path'];
-                            $config['new_image'] = $imageData['full_path'];
+                            $config['source_image'] = $image_data['full_path'];
+                            $config['new_image'] = $image_data['full_path'];
 //                            $config['create_thumb'] = TRUE;
                             $config['maintain_ratio'] = FALSE;
                             $config['width'] = 200;
@@ -988,14 +988,14 @@ public function add() {
                     } else {
                         $abs_path = './assets/images/data/form_icons/' . $app_id . '/';
                         $from_path = FORM_IMG_DISPLAY_PATH . '../form_icons/default_app.png';
-                        @copy($from_path,$abs_path.$iconName);
+                        @copy($from_path,$abs_path.$icon_name);
                         
                         $from_path_splash = FORM_IMG_DISPLAY_PATH . '../form_icons/splash.png';
                         @copy($from_path_splash, $abs_path.'splash.png');
                     }
 
                     $change_icon = array(
-                        'icon' => $iconName,
+                        'icon' => $icon_name,
                         'splash_icon' => 'splash.png',
                         'user_id' => $data['login_user_id']
                     );
@@ -1086,18 +1086,18 @@ public function edit($slug) {
             session_to_page($session_data, $data);
             $department_id = $session_data['login_department_id'];
             if ($this->input->post()) {
-                $appName = trim($this->input->post('app_name'));
+                $app_name = trim($this->input->post('app_name'));
                 $selected_app = $this->app_model->get_app($app_id);
-                if ($appName == '') {
+                if ($app_name == '') {
                     $this->session->set_flashdata('validate', array('message' => 'Application name should not be empty.', 'type' => 'error'));
                     redirect(base_url() . 'app-landing-page/' . $app_id);
                 }
-                if ($this->app_model->app_already_exist($appName, $selected_app['department_id'], $app_id)) {
+                if ($this->app_model->app_already_exist($app_name, $selected_app['department_id'], $app_id)) {
                     $this->session->set_flashdata('validate', array('message' => 'This application name already exist for this department', 'type' => 'error'));
                     redirect(base_url() . 'app-landing-page/' . $app_id);
                 }
                 
-                $iconName = $selected_app['icon'];
+                $icon_name = $selected_app['icon'];
                 $splash_icon = $selected_app['splash_icon'];
                 //upload form icon
                 $abs_path = './assets/images/data/form_icons/' . $app_id;
@@ -1106,9 +1106,9 @@ public function edit($slug) {
                 umask($old);
                 if (!empty($_FILES['userfile']['name']))
                 {
-                        $iconName = 'appicon_' . $app_id . '.png';
+                        $icon_name = 'appicon_' . $app_id . '.png';
                         $config['upload_path'] = $abs_path;
-                        $config['file_name'] = $iconName;
+                        $config['file_name'] = $icon_name;
                         $config['overwrite'] = TRUE;
                         $config["allowed_types"] = 'png';
                         $config["max_size"] = 1024;
@@ -1116,17 +1116,17 @@ public function edit($slug) {
         //                $config["max_height"] = 400;
                         $this->load->library('upload', $config);
                         if (!$this->upload->do_upload()) {
-                            $iconName = $selected_app['icon'];
+                            $icon_name = $selected_app['icon'];
                             $this->data['error'] = $this->upload->display_errors();
                             $this->session->set_flashdata('validate', array('message' => $this->upload->display_errors() . ', Default icon has been embeded with your app.', 'type' => 'warning'));
                         } else {
                             //success
-                            $imageData=$this->upload->data();
+                            $image_data=$this->upload->data();
         //                            $this->load->library('image_lib');
                             $config['overwrite'] = TRUE;
                             $config['image_library'] = 'gd2';
-                            $config['source_image'] = $imageData['full_path'];
-                            $config['new_image'] = $imageData['full_path'];
+                            $config['source_image'] = $image_data['full_path'];
+                            $config['new_image'] = $image_data['full_path'];
         //                            $config['create_thumb'] = TRUE;
                             $config['maintain_ratio'] = FALSE;
                             $config['width'] = 200;
@@ -1157,12 +1157,12 @@ public function edit($slug) {
                             $this->session->set_flashdata('validate', array('message' => $this->upload->display_errors() . ', Default splash screen has been embeded with your app.', 'type' => 'warning'));
                         } else {
                             //success
-                            $imageData=$this->upload->data();
+                            $image_data=$this->upload->data();
         //                            $this->load->library('image_lib');
                             $config['overwrite'] = TRUE;
                             $config['image_library'] = 'gd2';
-                            $config['source_image'] = $imageData['full_path'];
-                            $config['new_image'] = $imageData['full_path'];
+                            $config['source_image'] = $image_data['full_path'];
+                            $config['new_image'] = $image_data['full_path'];
         //                            $config['create_thumb'] = TRUE;
                             $config['maintain_ratio'] = FALSE;
                             $config['width'] = 720;
@@ -1182,8 +1182,8 @@ public function edit($slug) {
                     $is_authorized = '0';
 
                 $change_icon = array(
-                    'name' => $appName,
-                    'icon' => $iconName,
+                    'name' => $app_name,
+                    'icon' => $icon_name,
                     'splash_icon' => $splash_icon,
                     'is_authorized' => $is_authorized,
                     'is_secure' => $is_secure
@@ -1228,9 +1228,9 @@ public function editpopup($slug) {
             session_to_page($session_data, $data);
             $department_id = $session_data['login_department_id'];
             if ($this->input->post('app_name')) {
-                $appName = trim($this->input->post('app_name'));
+                $app_name = trim($this->input->post('app_name'));
                 $selected_app = $this->app_model->get_app($app_id);
-                if ($this->app_model->app_already_exist($appName, $selected_app['department_id'], $app_id)) {
+                if ($this->app_model->app_already_exist($app_name, $selected_app['department_id'], $app_id)) {
                     $this->session->set_flashdata('validate', array('message' => 'This application name already exist for this department', 'type' => 'error'));
                     redirect(base_url() . 'app-landing-page/' . $app_id);
                 }
@@ -1239,11 +1239,11 @@ public function editpopup($slug) {
                 $old = umask(0);
                 @mkdir($abs_path, 0777);
                 umask($old);
-                $iconName = 'appicon_' . $app_id . '.png';
+                $icon_name = 'appicon_' . $app_id . '.png';
                 if (!empty($_FILES['userfile_popup']['name']))
                 {
                     $config['upload_path'] = $abs_path;
-                    $config['file_name'] = $iconName;
+                    $config['file_name'] = $icon_name;
                     $config['overwrite'] = TRUE;
                     $config["allowed_types"] = 'png';
                     $config["max_size"] = 1024;
@@ -1251,7 +1251,7 @@ public function editpopup($slug) {
                     $config["max_height"] = 400;
                     $this->load->library('upload', $config);
                     if (!$this->upload->do_upload('userfile_popup')) {
-                        $iconName = $selected_app['icon'];
+                        $icon_name = $selected_app['icon'];
                         $this->data['error'] = $this->upload->display_errors();
                         $this->session->set_flashdata('validate', array('message' => $this->upload->display_errors() . ', Default icon has been embeded with your app.', 'type' => 'warning'));
                     } else {
@@ -1293,12 +1293,12 @@ public function editpopup($slug) {
                             redirect(base_url() . 'app-landing-page/' . $app_id);
                         } else {
                             //success
-                            $imageData=$this->upload->data();
+                            $image_data=$this->upload->data();
         //$this->load->library('image_lib');
                             $config1['overwrite'] = TRUE;
                             $config1['image_library'] = 'gd2';
-                            $config1['source_image'] = $imageData['full_path'];
-                            $config1['new_image'] = $imageData['full_path'];
+                            $config1['source_image'] = $image_data['full_path'];
+                            $config1['new_image'] = $image_data['full_path'];
         //$config['create_thumb'] = TRUE;
                             $config1['maintain_ratio'] = FALSE;
                             $config1['width'] = 720;
@@ -1313,8 +1313,8 @@ public function editpopup($slug) {
                 }
 
                 $change_icon = array(
-                    'name' => $appName,
-                    'icon' => $iconName,
+                    'name' => $app_name,
+                    'icon' => $icon_name,
                     'splash_icon' => $splash_icon,
 
                 );
@@ -1601,7 +1601,7 @@ public function delete($slug) {
             }
 
             //array parameters : action, description, before, after, app_id, app_name, form_id, form_name
-            $logary = array('action' => 'delete', 'description' => 'delete application', 'after' => json_encode($data), 'app_id' => $app_id, 'app_name' => $appName);
+            $logary = array('action' => 'delete', 'description' => 'delete application', 'after' => json_encode($data), 'app_id' => $app_id, 'app_name' => $app_name);
             addlog($logary);
 
             $this->session->set_flashdata('validate', array('message' => 'Application deleted successfully.', 'type' => 'success'));
@@ -1735,16 +1735,16 @@ public function createapk($slug) {
             }
             
             $new_appname = trim($dataq['name']);
-            $appname = preg_replace("/[^A-Za-z0-9]/", "", strtolower($new_appname));
-            $folderName = rand(2, time());
-            $newProjectFolder = $appname . $folderName;
+            $app_name = preg_replace("/[^A-Za-z0-9]/", "", strtolower($new_appname));
+            $folder_name = rand(2, time());
+            $new_project_folder = $app_name . $folder_name;
 
-            //create new folder for this appname
+            //create new folder for this app_name
             $src = $directory_path . '/assets/android/godk_android';
-            $dst = $directory_path . '/assets/android/' . $newProjectFolder;
+            $dst = $directory_path . '/assets/android/' . $new_project_folder;
             $this->recurse_copy($src, $dst);
             //exit;
-            //change appname and add app_id
+            //change app_name and add app_id
 
             $path_string = $dst . '/res/values/strings.xml';
             $string_array = array(
@@ -1778,7 +1778,7 @@ public function createapk($slug) {
 
             //Copy all app_resources on build time
             $app_resource_src= $directory_path."/assets/android/app_resources";
-            $app_resource_dst = $directory_path."/assets/android/$newProjectFolder/assets/HTML";
+            $app_resource_dst = $directory_path."/assets/android/$new_project_folder/assets/HTML";
             $this->recurse_copy($app_resource_src, $app_resource_dst);
 
             //if build is secure then form will not create on build time
@@ -1788,7 +1788,7 @@ public function createapk($slug) {
                 if ($total_forms > 1) {
                     $selected_app = $this->app_model->get_app($app_id);
                     $appFullDescription = $selected_app['full_description'];
-                    $app_file = "$directory_path/assets/android/$newProjectFolder/assets/HTML/index.html";
+                    $app_file = "$directory_path/assets/android/$new_project_folder/assets/HTML/index.html";
                     $Handleapp = fopen($app_file, 'w');
                     fwrite($Handleapp, $appFullDescription);
                     fclose($Handleapp);
@@ -1798,9 +1798,9 @@ public function createapk($slug) {
                     $formName = $form['form_name'];
                     $formDescription = $form['full_description'];
                     if ($total_forms == 1) {
-                        $File = "$directory_path/assets/android/$newProjectFolder/assets/HTML/index.html";
+                        $File = "$directory_path/assets/android/$new_project_folder/assets/HTML/index.html";
                     } else {
-                        $File = "$directory_path/assets/android/$newProjectFolder/assets/HTML/" . $form['next'];
+                        $File = "$directory_path/assets/android/$new_project_folder/assets/HTML/" . $form['next'];
                     }
                     $Handle = fopen($File, 'w');
                     fwrite($Handle, $formDescription);
@@ -1810,11 +1810,11 @@ public function createapk($slug) {
 
             //copy the all image files
             $src1 = $directory_path . '/assets/images/data/form_icons/' . $app_id;
-            $dst1 = $directory_path . "/assets/android/$newProjectFolder/assets/HTML";
+            $dst1 = $directory_path . "/assets/android/$new_project_folder/assets/HTML";
             $this->recurse_copy($src1, $dst1);
 
             //Change directory
-            $path = $directory_path . '/assets/android/' . $newProjectFolder;
+            $path = $directory_path . '/assets/android/' . $new_project_folder;
             chdir($path);
             $cmd = "pushd $path";
             exec($cmd);
@@ -1824,7 +1824,7 @@ public function createapk($slug) {
             exec($envpath);
 
             //For Linux 1 for local and 4 for live
-            $command = "android update project --target $target --name $appname --path $directory_path/assets/android/" . $newProjectFolder;
+            $command = "android update project --target $target --name $app_name --path $directory_path/assets/android/" . $new_project_folder;
 
             exec($command, $output, $co);
 
@@ -1834,24 +1834,24 @@ public function createapk($slug) {
             exec($command, $output2, $co);
 
             //copy the apk file to app repository
-            $newFileName = $appname . '-' . $app_id . '-' . $version . 'v.apk';
-            copy("$directory_path/assets/android/$newProjectFolder/bin/$appname-release-unsigned.apk", "$directory_path/assets/android/apps/$appname-release-unsigned.apk");
-            rename("$directory_path/assets/android/apps/$appname-release-unsigned.apk", "$directory_path/assets/android/apps/unaligned_$newFileName");
+            $new_file_name = $ . '-' . $app_id . '-' . $version . 'v.apk';
+            copy("$directory_path/assets/android/$new_project_folder/bin/$app_name-release-unsigned.apk", "$directory_path/assets/android/apps/$app_name-release-unsigned.apk");
+            rename("$directory_path/assets/android/apps/$`app_name`-release-unsigned.apk", "$directory_path/assets/android/apps/unaligned_$new_file_name");
 
             //$keystore_command = "keytool -genkey -v -keystore $directory_path/assets/android/keystore/a_$app_id.keystore -alias DataPlug -keyalg RSA -keysize 2048 -validity 10000";
-            $signing_command = "jarsigner -verbose -digestalg SHA1 -sigalg MD5withRSA -keystore $directory_path/assets/android/keystore/DataPlug.keystore -storepass dataplug_pitb -keypass dataplug_pitb $directory_path/assets/android/apps/unaligned_$newFileName DataPlug";
+            $signing_command = "jarsigner -verbose -digestalg SHA1 -sigalg MD5withRSA -keystore $directory_path/assets/android/keystore/DataPlug.keystore -storepass dataplug_pitb -keypass dataplug_pitb $directory_path/assets/android/apps/unaligned_$new_file_name DataPlug";
             exec($signing_command, $output3, $co);
 
-            //$unalignedFileName = $appname .'-'. $app_id . '-' . $version . 'v-unaligned.apk';
-            //$signing_command = "jarsigner -verbose -keystore $directory_path/assets/android/keystore/DataPlug.keystore -storepass dataplug_pitb -keypass dataplug_pitb $directory_path/assets/android/apps/$newFileName DataPlug";
-            $zipaligned_command = "zipalign -v 4 $directory_path/assets/android/apps/unaligned_$newFileName $directory_path/assets/android/apps/$newFileName";
+            //$unalignedFileName = $app_name .'-'. $app_id . '-' . $version . 'v-unaligned.apk';
+            //$signing_command = "jarsigner -verbose -keystore $directory_path/assets/android/keystore/DataPlug.keystore -storepass dataplug_pitb -keypass dataplug_pitb $directory_path/assets/android/apps/$new_file_name DataPlug";
+            $zipaligned_command = "zipalign -v 4 $directory_path/assets/android/apps/unaligned_$new_file_name $directory_path/assets/android/apps/$new_file_name";
             exec($zipaligned_command, $output4, $co);
-            unlink("$directory_path/assets/android/apps/unaligned_$newFileName");
+            unlink("$directory_path/assets/android/apps/unaligned_$new_file_name");
 
             //QR code generation part, for this install QREncode package on server
 
-            $qr_code_file_name = $appname . '-' . $app_id . '-' . $version . 'v.png';
-            $qr_file_src = base_url().'assets/android/apps/'.$newFileName;
+            $qr_code_file_name = $app_name . '-' . $app_id . '-' . $version . 'v.png';
+            $qr_file_src = base_url().'assets/android/apps/'.$new_file_name;
             $qr_file_dest = $directory_path.'/assets/android/qr_code/'.$qr_code_file_name;
             $qr_code_command = "qrencode -o $qr_file_dest -s 6 $qr_file_src";
             exec($qr_code_command, $outputqr, $co);
@@ -1862,7 +1862,7 @@ public function createapk($slug) {
                 'app_name' => $new_appname,
                 'version_code' => $version_code,
                 'version' => $version,
-                'app_file' => $newFileName,
+                'app_file' => $new_file_name,
                 'qr_code_file' => $qr_code_file_name,
                 'release_note' => '1.0'
             );
@@ -1872,7 +1872,7 @@ public function createapk($slug) {
             $logary = array('action' => 'build', 'description' => 'Build New version of application', 'after' => json_encode($data), 'app_id' => $app_id, 'app_name' => $new_appname);
             addlog($logary);
 
-            //delete new folder for this appname
+            //delete new folder for this app_name
             $this->recurse_delete($dst, true);
             $this->session->set_flashdata('validate', array('message' => 'Android application created successfully.', 'type' => 'success'));
             //redirect(base_url() . 'app/releasedapk/' . $app_id);
@@ -2156,16 +2156,16 @@ public function newappsettings($slug,$iframe=''){
         $app_forms = $this->form_model->get_form_by_app_for_app_settings($app_id);
         $final_forms=array();
         $possible_and_defaults=array();
-        $possible_filters_array='';
+        $possible_filters='';
         $required_fields='';
         $schema_list='';
-        $i=1;
+        $counter=1;
         $general_settings_filter='';
-        $form_settings_filter='';
-        $result_view_settings_filter='';
-        $map_view_settings_filter='';
-        $graph_view_settings_filter='';
-        $sms_settings_filter='';
+        $form_settings='';
+        $result_view_settings='';
+        $map_view_settings='';
+        $graph_view_settings='';
+        $sms_settings='';
         $all_forms_columns=array();
         foreach($app_forms as $key=>$val){
 //            get table columns name...
@@ -2179,15 +2179,15 @@ public function newappsettings($slug,$iframe=''){
             $all_forms_columns[$val['id']]=$all_columns;
 
             $exclude_array = array('id', 'form_id','location_source','activity_datetime','created_datetime');
-            $possible_filters_array=array_diff($all_columns,$exclude_array);
-            if($i==1) {
-                $first_form_columns = $possible_filters_array;
+            $possible_filters=array_diff($all_columns,$exclude_array);
+            if($counter==1) {
+                $first_form_columns = $possible_filters;
             }
             $possible_and_defaults[$val['id']]['possible_filter_selected']=$possible_filter_selected;
             $possible_and_defaults[$val['id']]['default_filter_selected']=$default_filter_selected;
-            $filters_array[$val['id']]=$possible_filters_array+array("sent_by");
+            $filters_array[$val['id']]=$possible_filters+array("sent_by");
             $final_forms[$val['name']]=$val;
-            $i++;
+            $counter++;
         }
 
         if(!empty($settings_exist)){
@@ -2202,23 +2202,23 @@ public function newappsettings($slug,$iframe=''){
             }
             $result2=array_key_exists("FORM_SETTINGS",$settings_exist_new);
             if($result2!=''){
-                $form_settings_filter=$settings_exist_new['FORM_SETTINGS']['filters'];
+                $form_settings=$settings_exist_new['FORM_SETTINGS']['filters'];
             }
             $result3=array_key_exists("RESULT_VIEW_SETTINGS",$settings_exist_new);
             if($result3!=''){
-                $result_view_settings_filter=$settings_exist_new['RESULT_VIEW_SETTINGS']['filters'];
+                $result_view_settings=$settings_exist_new['RESULT_VIEW_SETTINGS']['filters'];
             }
             $result4=array_key_exists("MAP_VIEW_SETTINGS",$settings_exist_new);
             if($result4!=''){
-                $map_view_settings_filter=$settings_exist_new['MAP_VIEW_SETTINGS']['filters'];
+                $map_view_settings=$settings_exist_new['MAP_VIEW_SETTINGS']['filters'];
             }
             $result5=array_key_exists("GRAPH_VIEW_SETTINGS",$settings_exist_new);
             if($result5!=''){
-                $graph_view_settings_filter=$settings_exist_new['GRAPH_VIEW_SETTINGS']['filters'];
+                $graph_view_settings=$settings_exist_new['GRAPH_VIEW_SETTINGS']['filters'];
             }
             $result6=array_key_exists("SMS_SETTINGS",$settings_exist_new);
             if($result6!=''){
-                $sms_settings_filter=$settings_exist_new['SMS_SETTINGS']['filters'];
+                $sms_settings=$settings_exist_new['SMS_SETTINGS']['filters'];
             }
 
         }
@@ -2431,15 +2431,15 @@ public function newappsettings($slug,$iframe=''){
                 $data['pageTitle'] = "App Settings-" . PLATFORM_NAME;
                 $data['app_id'] = $app_id;
                 $data['general_settings_filter'] = $general_settings_filter;
-                $data['form_settings_filter'] = $form_settings_filter;
-                $data['result_view_settings_filter'] = $result_view_settings_filter;
-                $data['map_view_settings_filter'] = $map_view_settings_filter;
-                $data['graph_view_settings_filter'] = $graph_view_settings_filter;
-                $data['sms_settings_filter'] = $sms_settings_filter;
+                $data['form_settings'] = $form_settings;
+                $data['result_view_settings'] = $result_view_settings;
+                $data['map_view_settings'] = $map_view_settings;
+                $data['graph_view_settings'] = $graph_view_settings;
+                $data['sms_settings'] = $sms_settings;
                 $data['final_forms'] = $final_forms;
                 $data['filters_array'] = $filters_array;
                 $data['possible_and_defaults'] = $possible_and_defaults;
-                $data['possible_filters_array'] = $possible_filters_array;
+                $data['possible_filters'] = $possible_filters;
                 $data['first_form_columns'] = $first_form_columns;
                 $data['all_users'] = $all_users;
                 $data['required_fields'] = $required_fields;
@@ -2479,16 +2479,16 @@ public function newformsettings($slug,$iframe=''){
         $app_forms = $this->form_model->get_form_by_app_for_app_settings($app_id);
         $final_forms=array();
         $possible_and_defaults=array();
-        $possible_filters_array='';
+        $possible_filters='';
         $required_fields='';
         $schema_list='';
-        $i=1;
-        $general_settings_filter='';
-        $form_settings_filter='';
-        $result_view_settings_filter='';
-        $map_view_settings_filter='';
-        $graph_view_settings_filter='';
-        $sms_settings_filter='';
+        $counter=1;
+        $general_settings='';
+        $form_settings='';
+        $result_view_settings='';
+        $map_view_settings='';
+        $graph_view_settings='';
+        $sms_settings='';
         $all_forms_columns=array();
         foreach($app_forms as $key=>$val){
 //            get table columns name...
@@ -2502,15 +2502,15 @@ public function newformsettings($slug,$iframe=''){
             $all_forms_columns[$val['id']]=$all_columns;
 
             $exclude_array = array('id', 'form_id','location_source','activity_datetime','created_datetime');
-            $possible_filters_array=array_diff($all_columns,$exclude_array);
-            if($i==1) {
-                $first_form_columns = $possible_filters_array;
+            $possible_filters=array_diff($all_columns,$exclude_array);
+            if($counter==1) {
+                $first_form_columns = $possible_filters;
             }
             $possible_and_defaults[$val['id']]['possible_filter_selected']=$possible_filter_selected;
             $possible_and_defaults[$val['id']]['default_filter_selected']=$default_filter_selected;
-            $filters_array[$val['id']]=$possible_filters_array+array("sent_by");
+            $filters_array[$val['id']]=$possible_filters+array("sent_by");
             $final_forms[$val['name']]=$val;
-            $i++;
+            $counter++;
         }
 
         if(!empty($settings_exist)){
@@ -2525,23 +2525,23 @@ public function newformsettings($slug,$iframe=''){
             }
             $result2=array_key_exists("FORM_SETTINGS",$settings_exist_new);
             if($result2!=''){
-                $form_settings_filter=$settings_exist_new['FORM_SETTINGS']['filters'];
+                $form_settings=$settings_exist_new['FORM_SETTINGS']['filters'];
             }
             $result3=array_key_exists("RESULT_VIEW_SETTINGS",$settings_exist_new);
             if($result3!=''){
-                $result_view_settings_filter=$settings_exist_new['RESULT_VIEW_SETTINGS']['filters'];
+                $result_view_settings=$settings_exist_new['RESULT_VIEW_SETTINGS']['filters'];
             }
             $result4=array_key_exists("MAP_VIEW_SETTINGS",$settings_exist_new);
             if($result4!=''){
-                $map_view_settings_filter=$settings_exist_new['MAP_VIEW_SETTINGS']['filters'];
+                $map_view_settings=$settings_exist_new['MAP_VIEW_SETTINGS']['filters'];
             }
             $result5=array_key_exists("GRAPH_VIEW_SETTINGS",$settings_exist_new);
             if($result5!=''){
-                $graph_view_settings_filter=$settings_exist_new['GRAPH_VIEW_SETTINGS']['filters'];
+                $graph_view_settings=$settings_exist_new['GRAPH_VIEW_SETTINGS']['filters'];
             }
             $result6=array_key_exists("SMS_SETTINGS",$settings_exist_new);
             if($result6!=''){
-                $sms_settings_filter=$settings_exist_new['SMS_SETTINGS']['filters'];
+                $sms_settings=$settings_exist_new['SMS_SETTINGS']['filters'];
             }
 
         }
@@ -2605,15 +2605,15 @@ public function newformsettings($slug,$iframe=''){
                 $data['pageTitle'] = "App Settings-" . PLATFORM_NAME;
                 $data['app_id'] = $app_id;
                 $data['general_settings_filter'] = $general_settings_filter;
-                $data['form_settings_filter'] = $form_settings_filter;
-                $data['result_view_settings_filter'] = $result_view_settings_filter;
-                $data['map_view_settings_filter'] = $map_view_settings_filter;
-                $data['graph_view_settings_filter'] = $graph_view_settings_filter;
-                $data['sms_settings_filter'] = $sms_settings_filter;
+                $data['form_settings'] = $form_settings;
+                $data['result_view_settings'] = $result_view_settings;
+                $data['map_view_settings'] = $map_view_settings;
+                $data['graph_view_settings'] = $graph_view_settings;
+                $data['sms_settings'] = $sms_settings;
                 $data['final_forms'] = $final_forms;
                 $data['filters_array'] = $filters_array;
                 $data['possible_and_defaults'] = $possible_and_defaults;
-                $data['possible_filters_array'] = $possible_filters_array;
+                $data['possible_filters'] = $possible_filters;
                 $data['first_form_columns'] = $first_form_columns;
                 $data['all_users'] = $all_users;
                 $data['required_fields'] = $required_fields;
@@ -2635,13 +2635,13 @@ public function get_field_values(){
         $value=$_POST['value'];
         $table_name="zform_".$form_id;
         $result=$this->db->query("select distinct $column from $table_name where $column LIKE '%$value%'")->result_array();
-        $i=0;
+        $counter=0;
         $options=array();
         foreach($result as $key=>$val){
             $field_value = str_replace(" ", "_", $val[$column]);
-            $options[$i]['value']=$field_value;
-            $options[$i]['label']=$val[$column];
-            $i++;
+            $options[$counter]['value']=$field_value;
+            $options[$counter]['label']=$val[$column];
+            $counter++;
         }
         if(empty($options)){
             $options[0]['value']="";
@@ -2845,12 +2845,12 @@ public function get_form_columns(){
         $all_columns[]='sent_by';
 
         $exclude_array = array('id', 'form_id','location_source', 'activity_datetime','created_datetime','is_deleted');
-        $possible_filters_array=array_diff($all_columns,$exclude_array);
+        $possible_filters=array_diff($all_columns,$exclude_array);
         $option_string='';
         $final_array=array();
         $selected_options=array();
 
-        foreach($possible_filters_array as $key=>$val) {
+        foreach($possible_filters as $key=>$val) {
                 if (in_array($val, $filters)) {
                     $selected_options[]=$val;
                 }
@@ -2952,7 +2952,7 @@ public function buildSleep($app_id) {
         $max_request = 5;
         $execution_second = 60;
         $j = 0;
-        for ($i = $max_request; $i < $total_rec; $i = $i + $max_request) {
+        for ($counter = $max_request; $counter < $total_rec; $counter = $counter + $max_request) {
             $j++;
         }
         if ($j != 0) {
@@ -2968,7 +2968,7 @@ public function calculatetimebuild() {
         $max_request = 5;
         $sleap_time = $execution_second = 60;
         $j = 0;
-        for ($i = $max_request; $i < $total_rec; $i = $i + $max_request) {
+        for ($counter = $max_request; $counter < $total_rec; $counter = $counter + $max_request) {
             $j++;
         }
         if ($j != 0) {
@@ -3044,7 +3044,7 @@ public function testapk() {
             $directory_path = $site_settings['directory_path'];
             $target = '18'; //$site_settings['android_target'];
             $platform = 'testapkchecking';
-            $appname = 'testapp';
+            $app_name = 'testapp';
             //Change directory
             $path = $directory_path . '/assets/android/godk_android_test';
             chdir($path);
@@ -3065,7 +3065,7 @@ public function testapk() {
             }
             print "<br />";
             //For Linux 1 for local and 4 for live
-            echo $command = "android update project --target $target --name $appname --path $path";
+            echo $command = "android update project --target $target --name $app_name --path $path";
             print "<br />";
             exec($command, $output2, $co);
             if ($output2) {
@@ -3087,13 +3087,13 @@ public function testapk() {
             //copy the apk file to app repository
             echo 'Copping APK file after building.....';
             print "<br />";
-            copy("$directory_path/assets/android/godk_android_test/bin/$appname-release-unsigned.apk", "$directory_path/assets/android/apps/$appname-release-unsigned.apk");
+            copy("$directory_path/assets/android/godk_android_test/bin/$app_name-release-unsigned.apk", "$directory_path/assets/android/apps/$app_name-release-unsigned.apk");
             echo 'Renaming APK file after building.....';
             print "<br />";
-            rename("$directory_path/assets/android/apps/$appname-release-unsigned.apk", "$directory_path/assets/android/apps/unaligned_testapp.apk");
+            rename("$directory_path/assets/android/apps/$app_name-release-unsigned.apk", "$directory_path/assets/android/apps/unaligned_testapp.apk");
             echo 'Deleting APK file from bin.....';
             print "<br />";
-            unlink("$directory_path/assets/android/godk_android_test/bin/$appname-release-unsigned.apk");
+            unlink("$directory_path/assets/android/godk_android_test/bin/$app_name-release-unsigned.apk");
 
             //$keystore_command = "keytool -genkey -v -keystore $directory_path/assets/android/keystore/a_$app_id.keystore -alias DataPlug -keyalg RSA -keysize 2048 -validity 10000";
             echo $signing_command = "jarsigner -verbose -keystore $directory_path/assets/android/keystore/DataPlug.keystore -storepass dataplug_pitb -keypass dataplug_pitb $directory_path/assets/android/apps/unaligned_testapp.apk DataPlug";
@@ -3103,8 +3103,8 @@ public function testapk() {
                 print_r($output4);
             }
             print "<br />";
-            //$unalignedFileName = $appname .'-'. $app_id . '-' . $version . 'v-unaligned.apk';
-            //$signing_command = "jarsigner -verbose -keystore $directory_path/assets/android/keystore/DataPlug.keystore -storepass dataplug_pitb -keypass dataplug_pitb $directory_path/assets/android/apps/$newFileName DataPlug";
+            //$unalignedFileName = $app_name .'-'. $app_id . '-' . $version . 'v-unaligned.apk';
+            //$signing_command = "jarsigner -verbose -keystore $directory_path/assets/android/keystore/DataPlug.keystore -storepass dataplug_pitb -keypass dataplug_pitb $directory_path/assets/android/apps/$new_file_name DataPlug";
             echo $zipaligned_command = "zipalign -v 4 $directory_path/assets/android/apps/unaligned_testapp.apk $directory_path/assets/android/apps/testapp.apk";
             print "<br />";
             exec($zipaligned_command, $output5, $co);
@@ -3292,7 +3292,7 @@ function search_dynamic_filters(){
     }
 
     function in_array_r($item , $array){
-        return preg_match('/"'.$item.'"/i' , json_encode($array));
+        return preg_match('/"'.$item.'"/counter' , json_encode($array));
     }
 
 }
diff --git a/application/views/form/form_results_data_1.php b/application/views/form/form_results_data_1.php
index 4d920da..b857791 100644
--- a/application/views/form/form_results_data_1.php
+++ b/application/views/form/form_results_data_1.php
@@ -1,8 +1,10 @@
 <div class="tableContainer">
     <div class="success"></div>
     <div style="overflow: auto">
-        <form accept-charset="utf-8" enctype="multipart/form-data" method="post" action="<?= base_url() . 'form/edit_form_result_ajax'; ?>" id='form_edit'>
-            <table cellspacing="0" cellpadding="0" id="application-listing-listview" class="display">
+        <form accept-charset="utf-8" enctype="multipart/form-data" method="post" action="
+        <?= base_url() . 'form/edit_form_result_ajax'; ?>" id='form_edit'>
+            <table cellspacing="0" cellpadding="0" id="application-listing-listview"        
+             class="display">
                 <thead>
                     <tr>
                         <?php
@@ -28,7 +30,8 @@
 //                            print_r($new_headings);die;
                             foreach ($headings as $heading):
                                 if ($heading != 'is_take_picture'):
-                                    if($heading == 'activity_status' && $app_general_setting->activity_status_change==0){
+                                    if($heading == 'activity_status' && 
+                                    $app_general_setting->activity_status_change==0){
                                         continue;
                                     }
                                     ?>
@@ -74,13 +77,18 @@
                                         $padding = '0px ' . strlen($headings[$i]) . 'px' . ' 0px ' . strlen($headings[$i]) * 2 . 'px';
                                     }
                                     ?>
-                                    <td class="Category <?php echo $leftaligh; ?>" style="position:relative; padding: <?php echo $padding; ?> ;" >
+                                    <td class="Category <?php echo $leftaligh; ?>
+                                    " style="position:relative; padding: <?php echo $padding; ?> ;" >
                                         <?php
                                         if($headings[$i]=='activity_status'){
                                             //echo $form_item['actions'].'Pending';
                                             ?>
-                                                <div class="status edit_activity_status" id="<?php echo $form_item['actions']; ?>" form_id="<?php echo $form_item['form_id']; ?>">
-                                                    <span id="edit_activity_status_<?php echo $form_item['actions']; ?>" class="text_activity_status"><?php
+                                                <div class="status edit_activity_status" 
+                                                id="<?php echo $form_item['actions']; ?>"
+                                                    form_id=" <?php echo $form_item['form_id']; ?>">
+                                                    <span id="edit_activity_status_<
+                                                        ?php echo $form_item['actions']; ?>"
+                                                         class="text_activity_status"><?php
                                                         if ($form_item['activity_status'] == 'approved') {
                                                             echo 'Approved';
                                                         } else if ($form_item['activity_status'] == 'rejected') {
@@ -90,7 +98,9 @@
                                                             echo 'Pending';
                                                         }
                                                         ?></span>
-                                                    <select id="edit_activity_status_input_<?php echo $form_item['actions']; ?>" class="intxt2 edit_activity_status_box" style="display: none;width: 100%;">
+                                                    <select id="edit_activity_status_input_<?php echo $form_item['actions']; ?>"
+                                                     class="intxt2 edit_activity_status_box"
+                                                     style="display: none;width: 100%;">
                                                         <option <?php
                                                         if ($form_item['activity_status'] == '') {
                                                             echo 'selected';
@@ -123,8 +133,11 @@
                                                     $title = $form_item[$headings[$i]][0]['title'];
                                                 }
                                                 ?>
-                                                <a href="<?php echo $form_item[$headings[$i]][0]['image']; ?>" rel="lightbox['<?php echo $image_colorbox; ?>']" title='<b><?php echo $title; ?></b>'>
-                                                    <img align="left" src="<?php echo $form_item[$headings[$i]][0]['image']; ?>" width="50" height="50" alt="Record Images" title="<b>Record Images</b>" />
+                                                <a href="<?php echo $form_item[$headings[$i]][0]['image']; ?>"
+                                                 rel="lightbox['<?php echo $image_colorbox; ?>']" 
+                                                 title='<b><?php echo $title; ?></b>'>
+                                                    <img align="left" src="<?php echo $form_item[$headings[$i]][0]['image']; ?>
+                                                    " width="50" height="50" alt="Record Images" title="<b>Record Images</b>" />
                                                 </a>
                                                 <?php
 //                                                
@@ -139,31 +152,49 @@
                                                         echo $title_multi = $multi_image['title'];
                                                     }
                                                     ?>
-                                                    <a rel="lightbox['<?php echo $image_colorbox; ?>']" href="<?php echo $multi_image['image']; ?>" title="<b><?php echo $title_multi; ?></b>" name = " ITU Government of Punjab - Pakistan">
+                                                    <a rel="lightbox['<?php echo $image_colorbox; ?>']" 
+                                                    href="<?php echo $multi_image['image']; ?>"
+                                                    title="<b><?php echo $title_multi; ?> </b>"
+                                                    name = " ITU Government of Punjab - Pakistan">
                                                     </a>
                                                     <?php
                                                 }
                                             } elseif ($headings[$i] == 'actions') {
                                                 if ($this->acl->hasSuperAdmin()) {
                                                     ?>
-                                                    <img src="<?= base_url() ?>assets/images/tableLink3.png" alt=""  title='Delete' form_id = '<?php echo $form_item['form_id']; ?>' class='delete_icon'/>
-                                         <a class="edit_color_box" form_id = '<?php echo $form_item['form_id']; ?>' href="<?= base_url() . 'form/edit_form_partial'; ?>">
-                                                        <img src="<?= base_url() ?>assets/images/tableLink1.png" alt=""  title='Update' class='update_icosn'/>
+                                                    <img src="<?= base_url() ?>assets/images/tableLink3.png"
+                                                     alt=""  title='Delete' 
+                                                     form_id ='<?php echo $form_item['form_id']; ?>'
+                                                     class='delete_icon'/>
+                                         <a class="edit_color_box" form_id = '<?php echo $form_item['form_id']; ?>' 
+                                         href="<?= base_url() . 'form/edit_form_partial'; ?>">
+                                                        <img src="<?= base_url() ?>
+                                                        assets/images/tableLink1.png" alt="" 
+                                                         title='Update' class='update_icosn'/>
                                                     </a>
                                                     <?php
                                                 } else {
                                                     if ($this->acl->hasPermission('form', 'delete')) {
                                                         ?>
-                                                        <img src="<?= base_url() ?>assets/images/tableLink3.png" alt=""  title='Delete' form_id = '<?php echo $form_item['form_id']; ?>' class='delete_icon'/>
-                                          <a class="edit_color_box" form_id = '<?php echo $form_item['form_id']; ?>' href="<?= base_url() . 'form/edit_form_partial'; ?>">
-                                                            <img src="<?= base_url() ?>assets/images/tableLink1.png" alt=""  title='Update' class='update_icosn'/>
+                                                        <img src="<?= base_url() ?>assets/images/tableLink3.png" 
+                                                        alt=""  title='Delete' 
+                                                        form_id = '<?php echo $form_item['form_id']; ?>'
+                                                         class='delete_icon'/>
+                                          <a class="edit_color_box" 
+                                          form_id = '<?php echo $form_item['form_id']; ?>' 
+                                          href="<?= base_url() . 'form/edit_form_partial'; ?>">
+                                                            <img src="<?= base_url() ?>assets/images/tableLink1.png" 
+                                                            alt=""  title='Update' class='update_icosn'/>
                                                         </a>
                                                         <?php
                                                     }
                                                 }
                                                 ?>
 <!--                                                &nbsp;&nbsp;-->
-                                                <a href="<?= base_url() . 'single-record-map/' . $form_item['form_id'] . '-' . $form_item['actions']; ?>" target="_blank" >
+                                                <a href="<?= base_url() . 'single-record-map/'
+                                                 . $form_item['form_id'] . '-' 
+                                                 . $form_item['actions']; ?>
+                                                " target="_blank" >
                                                     <img src="<?= base_url() ?>assets/images/viewmap.png" alt=""  title='Map View'/>
                                                 </a>
 
@@ -176,7 +207,10 @@
 //                                                $data = ($headings[$i] != "Description") ? $form_item[$headings[$i]] : strtoupper($form_item[$headings[$i]]);
                                                 if($form_item[$headings[$i]]=="SHOW RECORDS"){
                                                 ?>
-                                                    <a rel="<?php echo "zform_".$form_item['form_id']."_".strtolower($headings[$i])."_".$form_item['actions'];  ?>" href="javascript:void(0)"  name = " ITU Government of Punjab - Pakistan" class="open_subtable">
+                                                    <a rel="<?php echo "zform_".$form_item['form_id'].
+                                                    "_".strtolower($headings[$i])."_".$form_item['actions'];  ?>
+                                                    " href="javascript:void(0)"  name = " ITU Government of Punjab - Pakistan" 
+                                                    class="open_subtable">
                                                         <?php echo "<b style='color:orange'>".$form_item[$headings[$i]]."</b>"; ?>
                                                     </a>
                                                 <?php
diff --git a/application/views/form/form_results_data_frame.php b/application/views/form/form_results_data_frame.php
index c5b51d9..bc84819 100644
--- a/application/views/form/form_results_data_frame.php
+++ b/application/views/form/form_results_data_frame.php
@@ -3,8 +3,10 @@
 <div class="tableContainer">
     <div class="success"></div>
     <div style="overflow: auto">
-        <form accept-charset="utf-8" enctype="multipart/form-data" method="post" action="<?= base_url() . 'form/edit_form_result_ajax'; ?>" id='form_edit'>
-            <table cellspacing="0" cellpadding="0" id="application-listing-listview" class="display">
+        <form accept-charset="utf-8" enctype="multipart/form-data" method="post" 
+        action="<?= base_url() . 'form/edit_form_result_ajax'; ?>" id='form_edit'>
+            <table cellspacing="0" cellpadding="0"
+             id="application-listing-listview" class="display">
                 <thead>
                     <tr>
                         <?php
@@ -46,7 +48,8 @@
                                         $padding = '0px ' . strlen($headings[$i]) . 'px' . ' 0px ' . strlen($headings[$i]) * 2 . 'px';
                                     }
                                     ?>
-                                    <td class="Category <?php echo $leftaligh; ?>" style="position:relative; padding: <?php echo $padding; ?> ;" >
+                                    <td class="Category <?php echo $leftaligh; ?>"
+                                     style="position:relative; padding: <?php echo $padding; ?> ;" >
                                         <?php
                                         if (isset($form_item[$headings[$i]])) {
                                             if ($headings[$i] == 'image') {
@@ -60,8 +63,11 @@
                                                     $title = $form_item[$headings[$i]][0]['title'];
                                                 }
                                                 ?>
-                                                <a href="<?php echo $form_item[$headings[$i]][0]['image']; ?>" rel="lightbox['<?php echo $image_colorbox; ?>']" title='<b><?php echo $title; ?></b>'>
-                                                    <img align="left" src="<?php echo $form_item[$headings[$i]][0]['image']; ?>" width="50" height="50" alt="Record Images" title="<b>Record Images</b>" />
+                                                <a href="<?php echo $form_item[$headings[$i]][0]['image']; ?>"
+                                                 rel="lightbox['<?php echo $image_colorbox; ?>']" 
+                                                 title='<b><?php echo $title; ?></b>'>
+                                                    <img align="left" src="<?php echo $form_item[$headings[$i]][0]['image']; ?>" 
+                                                    width="50" height="50" alt="Record Images" title="<b>Record Images</b>" />
                                                 </a>
                                                 <?php
 //                                                
@@ -76,7 +82,9 @@
                                                         echo $title_multi = $multi_image['title'];
                                                     }
                                                     ?>
-                                                    <a rel="lightbox['<?php echo $image_colorbox; ?>']" href="<?php echo $multi_image['image']; ?>" title="<b><?php echo $title_multi; ?></b>" name = " ITU Government of Punjab - Pakistan">
+                                                    <a rel="lightbox['<?php echo $image_colorbox; ?>']"
+                                                     href="<?php echo $multi_image['image']; ?>"
+                                                     title="<b><?php echo $title_multi; ?></b>" name = " ITU Government of Punjab - Pakistan">
                                                     </a>
                                                     <?php
                                                 }
diff --git a/application/views/listing/gallery_partial.php b/application/views/listing/gallery_partial.php
index d14341d..9b62cf2 100644
--- a/application/views/listing/gallery_partial.php
+++ b/application/views/listing/gallery_partial.php
@@ -1,8 +1,10 @@
 <div style="margin:0 0 0 49%;">
-    <img src="<?= base_url() . 'assets/images/degree_90.png'; ?>"  title='Rotate 360 Degree' id='rotate_360' >
+    <img src="<?= base_url() . 'assets/images/degree_90.png'; ?>" 
+    title='Rotate 360 Degree' id='rotate_360' >
 </div>
 <div style="margin:28% 0 0 0;float: left">
-    <img src="<?= base_url() . 'assets/images/degree_270.png'; ?>"  title='Rotate 270 Degree' id='rotate_270' >
+    <img src="<?= base_url() . 'assets/images/degree_270.png'; ?>" 
+    title='Rotate 270 Degree' id='rotate_270' >
 </div>
 <div id='gallery'>
     <!--    <a data-lightbox="roadtrip"  class="gallery_1" href="http://localhost/godk/assets/images/data/form-data/users_added1391150786.jpg">
@@ -33,10 +35,12 @@
 </style>
 <div style="margin:0 0 0 48%;">
 
-    <img src="<?= base_url() . 'assets/images/degree_180.png'; ?>"  title='Rotate 180 Degree' id='rotate_180' >
+    <img src="<?= base_url() . 'assets/images/degree_180.png'; ?>"  
+    title='Rotate 180 Degree' id='rotate_180' >
 </div>
 <div style="margin: -34% 0px 0px; float: right">
-    <img src="<?= base_url() . 'assets/images/degree_90.png'; ?>"  title='Rotate 90 Degree' id='rotate_90' >
+    <img src="<?= base_url() . 'assets/images/degree_90.png'; ?>"  
+    title='Rotate 90 Degree' id='rotate_90' >
 </div>
 <script type='text/javascript'>
 
diff --git a/application/views/map/map_partial.php b/application/views/map/map_partial.php
index 74ab919..3acd7ca 100644
--- a/application/views/map/map_partial.php
+++ b/application/views/map/map_partial.php
@@ -26,7 +26,8 @@
 
                     if (!empty($form_item[$filter_attribute_value])) {
                         if (!in_array($form_item[$filter_attribute_value], $filter_data)) {
-                            $filter_data = array_merge($filter_data, array($form_item[$filter_attribute_value] => $form_item[$filter_attribute_value]));
+                            $filter_data = array_merge($filter_data,
+                            array($form_item[$filter_attribute_value] => $form_item[$filter_attribute_value]));
                         }
                     }
                 }
@@ -36,7 +37,8 @@
                 echo '<tr><td><strong>';
                 echo 'Filter ' . ucwords(str_replace("_", " ", $filter_attribute_value));
                 echo '</strong></td><td>';
-                echo form_dropdown($filter_attribute_value, $arraylist, $selected, 'id="cat_filter" column_number="' . $column_number . '"') . '</br>';
+                echo form_dropdown($filter_attribute_value, $arraylist, $selected, 
+                'id="cat_filter" column_number="' . $column_number . '"') . '</br>';
                 echo '</td></tr>';
             }
             $exclude_array[] = array_push($exclude_array, $filter_attribute_value);
diff --git a/application/views/templates/footer_home.php b/application/views/templates/footer_home.php
index 8f9447f..ae6eb41 100644
--- a/application/views/templates/footer_home.php
+++ b/application/views/templates/footer_home.php
@@ -7,13 +7,18 @@
 
 
     <!-- Javascript Files -->
-    <script type="text/javascript" src="<?= base_url() ?>assets/home/DataPlug_files/jquery_004.js"></script>
-    <script type="text/javascript" src="<?= base_url() ?>assets/js/jquery.colorbox.js" ></script>
-    <script type="text/javascript" src="<?= base_url() ?>assets/js/jquery.validate.js" ></script>
+    <script type="text/javascript"
+     src="<?= base_url() ?>assets/home/DataPlug_files/jquery_004.js"></script>
+    <script type="text/javascript"
+     src="<?= base_url() ?>assets/js/jquery.colorbox.js" ></script>
+    <script type="text/javascript" 
+    src="<?= base_url() ?>assets/js/jquery.validate.js" ></script>
     <script src="<?= base_url() ?>assets/home/js/responsiveslides.min.js"></script>
     <script src="<?= base_url() ?>assets/home/js/common-function.js"></script>
     <script>
-        $(function(){$("#slider4").responsiveSlides({auto:true,pager:false,nav:false,speed:500,namespace:"callbacks",before:function(){$(".events").append("<li>before event fired.</li>")},after:function(){$(".events").append("<li>after event fired.</li>")}})});
+        $(function(){$("#slider4").responsiveSlides({auto:true,pager:false,nav:false,speed:500,
+        namespace:"callbacks",before:function(){$(".events").append("<li>before event fired.</li>")},
+        after:function(){$(".events").append("<li>after event fired.</li>")}})});
     </script>
 
 </body>
diff --git a/application/views/templates/header_login_page.php b/application/views/templates/header_login_page.php
index 1e176d3..65c82e4 100644
--- a/application/views/templates/header_login_page.php
+++ b/application/views/templates/header_login_page.php
@@ -3,8 +3,10 @@
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
         <title><?php echo PLATFORM_NAME;?></title>
-        <link rel="icon"  type="image/png" href="<?= base_url() ?>assets/images/logo-favicon.png" />
-        <link rel="stylesheet" type="text/css" href="<?= base_url() ?>assets/css/style_new.css" />
+        <link rel="icon"  type="image/png" 
+        href="<?= base_url() ?>assets/images/logo-favicon.png" />
+        <link rel="stylesheet" type="text/css"
+         href="<?= base_url() ?>assets/css/style_new.css" />
         <link href='http://fonts.googleapis.com/css?family=Varela+Round' rel='stylesheet' type='text/css'>
             <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js" type="text/javascript"></script>
     </head>
diff --git a/application/views/users/add_user.php b/application/views/users/add_user.php
index e15e0b9..73eebc2 100644
--- a/application/views/users/add_user.php
+++ b/application/views/users/add_user.php
@@ -3,7 +3,8 @@
         <div class="table-sec">
             <h2>Add New User</h2>
 
-            <table cellpadding="0" cellspacing="0" border="0" class="display" id="example" style="box-shadow: 0 0 6px rgba(0, 0, 0, 0.25);min-height: 330px;">
+            <table cellpadding="0" cellspacing="0" border="0" class="display" id="example" 
+            style="box-shadow: 0 0 6px rgba(0, 0, 0, 0.25);min-height: 330px;">
 
             </span>
                 <tbody>
@@ -63,7 +64,8 @@
                                     <strong><span style="color:red"> * </span>First Name </strong>
                                 </label>
                                 <div>
-                                    <input class="textBoxLogin" type="text" name="first_name" id="first_name" value="<?php echo set_value('first_name'); ?>" />
+                                    <input class="textBoxLogin" type="text" name="first_name" id="first_name" 
+                                    value="<?php echo set_value('first_name'); ?>" />
                                 </div>
                                 <?php echo $this->form_validation->error('first_name'); ?>
                             </div>
@@ -74,7 +76,8 @@
                                     <strong><span style="color:red"> * </span>Last Name </strong>
                                 </label>
                                 <div>
-                                    <input class="textBoxLogin" type="text" name="last_name" id="last_name" value="<?php echo set_value('last_name'); ?>" />
+                                    <input class="textBoxLogin" type="text" name="last_name" id="last_name" 
+                                    value="<?php echo set_value('last_name'); ?>" />
                                 </div>
                                 <?php echo $this->form_validation->error('last_name'); ?>
                             </div>
@@ -85,7 +88,8 @@
                                     <strong><span style="color:red"> * </span>Your Email </strong>
                                 </label>
                                 <div>
-                                    <input class="textBoxLogin" type="text" name="email" id="email" value="<?php echo set_value('email'); ?>" />
+                                    <input class="textBoxLogin" type="text" name="email" id="email" 
+                                    value="<?php echo set_value('email'); ?>" />
                                 </div>
                                 <?php echo $this->form_validation->error('email'); ?>
                             </div>
@@ -108,7 +112,8 @@
                                     <strong><span style="color:red"> * </span>Password </strong>
                                 </label>
                                 <div>
-                                    <input class="textBoxLogin" type="password" name="password" id="password" value="<?php echo set_value('password'); ?>" />
+                                    <input class="textBoxLogin" type="password" name="password" id="password"
+                                     value="<?php echo set_value('password'); ?>" />
                                 </div>
                                 <?php echo $this->form_validation->error('password'); ?>
                             </div>
@@ -119,7 +124,8 @@
                                     <strong><span style="color:red"> * </span>Confirm Password </strong>
                                 </label>
                                 <div>
-                                    <input class="textBoxLogin" type="password" name="conf_password" id="conf_password" value="<?php echo set_value('conf_password'); ?>" />
+                                    <input class="textBoxLogin" type="password" name="conf_password" id="conf_password" 
+                                    value="<?php echo set_value('conf_password'); ?>" />
                                 </div>
                                 <?php echo $this->form_validation->error('conf_password'); ?>
                             </div>
@@ -127,7 +133,8 @@
                             <div class="actions" style="clear: both;">
                                 <div class="right">
                                     <button class="genericBtn" style="margin-left: 158px;">Submit</button>
-                                    <a  href="<?= base_url() ?>users" class="genericBtn" style="height: 18px;padding: 5px;text-align: center;width: 54px;margin-left: 0px;">Back</a>
+                                    <a  href="<?= base_url() ?>users" class="genericBtn" 
+                                    style="height: 18px;padding: 5px;text-align: center;width: 54px;margin-left: 0px;">Back</a>
                                 </div>
 
                             </div>
diff --git a/application/views/users/groups.php b/application/views/users/groups.php
index fa7efe4..a4fa3e0 100644
--- a/application/views/users/groups.php
+++ b/application/views/users/groups.php
@@ -25,7 +25,9 @@
                             <td class="Category"><?php echo $group['name'] ?></td>
                             <td class="Links">
                                 <?php if ($this->acl->hasPermission('groups', 'edit')) { ?>
-                                <a style="color:blue"href="<?= base_url() ?>group-permission/<?php echo $group['id'] ?>" title="Add Group Permissions">Group Permissions</a>
+                                <a style="color:blue"href="<?= base_url() ?>
+                                group-permission/<?php echo $group['id'] ?>" 
+                                title="Add Group Permissions">Group Permissions</a>
                                 <?php }?>
                                 <br clear="all" />
                             </td>
diff --git a/application/views/users/groups_permissions.php b/application/views/users/groups_permissions.php
index f26103c..43dc13e 100644
--- a/application/views/users/groups_permissions.php
+++ b/application/views/users/groups_permissions.php
@@ -33,7 +33,11 @@
                                             $checktrue = 'checked="checked"';
                                         ?>
 
-                                        <input type="checkbox" class="permission_chkbox" <?php echo $checktrue; ?> name="<?php echo $module . '[]' ?>" id="<?php echo $module . '_' . $role; ?>" value="<?php echo $role; ?>" /><?php echo ucfirst($role); ?>
+                                        <input type="checkbox" class="permission_chkbox" <?php echo $checktrue; ?>
+                                         name="<?php echo $module . '[]' ?>" 
+                                         id="<?php echo $module . '_' . $role; ?>" 
+                                         value="<?php echo $role; ?>" />
+                                         <?php echo ucfirst($role); ?>
 
                                     </div>
                                     <?php
@@ -48,7 +52,8 @@
                             <div class="actions" style="margin-top: 30px;">
                                 <div class="right">
                                     <button class="genericBtn" name="submitpermission">Submit</button>
-                                    <a  href="<?= base_url() ?>groups" class="genericBtn" style="height: 18px;padding: 5px;text-align: center;width: 54px;">Back</a>
+                                    <a  href="<?= base_url() ?>groups" class="genericBtn"
+                                     style="height: 18px;padding: 5px;text-align: center;width: 54px;">Back</a>
                                 </div>
 
                             </div>
diff --git a/application/views/users/login.php b/application/views/users/login.php
index 936e6ab..28e9c77 100644
--- a/application/views/users/login.php
+++ b/application/views/users/login.php
@@ -1,11 +1,14 @@
 <div class="login">
     <div class="loginContent">
         <?php echo form_open('users/login_confirm'); ?>
-        <input type="text" size="20" class="textBox" id="username" name="username" placeholder="Email"/>
-        <input type="password" size="20" class="textBox" id="passowrd" name="password" placeholder="Password"/>
+        <input type="text" size="20" class="textBox" id="username" 
+        name="username" placeholder="Email"/>
+        <input type="password" size="20" class="textBox" id="passowrd" 
+        name="password" placeholder="Password"/>
         <p><input type="checkbox"  /> Remember me on this computer</p>
         <p>
-            <a style="text-decoration:none;" href="<?= base_url() ?>users/signup/"><input type="button"  value="SignUp" class="submit float_right" /></a>
+            <a style="text-decoration:none;" href="<?= base_url() ?>users/signup/">
+            <input type="button"  value="SignUp" class="submit float_right" /></a>
             <input type="submit"  value="Login" class="submit" />
             <?php echo form_close(); ?>
             <br clear="all" />
diff --git a/application/views/users/login_popup.php b/application/views/users/login_popup.php
index 380ea1b..d25338f 100644
--- a/application/views/users/login_popup.php
+++ b/application/views/users/login_popup.php
@@ -5,12 +5,16 @@
 
     <div class="loginContent">
         <?php echo form_open('users/login_confirm'); ?>
-        <input type="text" size="20" class="textBoxLogin" id="username" name="username" placeholder="Email"  value="<?php if(isset($_COOKIE['remember_me_username']))echo $_COOKIE['remember_me_username'];else echo ""; ?>"/>
+        <input type="text" size="20" class="textBoxLogin" id="username" name="username" placeholder="Email"  
+        value="<?php if(isset($_COOKIE['remember_me_username']))echo $_COOKIE['remember_me_username'];else echo ""; ?>"/>
         <br/>
-        <input type="password" size="20" class="textBoxLogin" id="passowrd" name="password" placeholder="Password" value="<?php if(isset($_COOKIE['remember_me_password']))echo $_COOKIE['remember_me_password'];else echo ""; ?>" />
+        <input type="password" size="20" class="textBoxLogin" id="passowrd" name="password" placeholder="Password" 
+        value="<?php if(isset($_COOKIE['remember_me_password']))echo $_COOKIE['remember_me_password'];else echo ""; ?>" />
         <br clear="all" />
         <p>
-            <input type="checkbox" class="textBoxLogin" name="remember_me" id="remember_me" <?php if(isset($_COOKIE['remember_me']) && $_COOKIE['remember_me']=='on')echo "checked"; ?> style="margin:2px 4px 0 0;" />
+            <input type="checkbox" class="textBoxLogin" name="remember_me" id="remember_me" 
+            <?php if(isset($_COOKIE['remember_me']) && $_COOKIE['remember_me']=='on')echo "checked"; ?> 
+            style="margin:2px 4px 0 0;" />
             Remember me on this computer
         </p>
         <p>
diff --git a/application/views/users/reset_password.php b/application/views/users/reset_password.php
index c579592..59a672f 100644
--- a/application/views/users/reset_password.php
+++ b/application/views/users/reset_password.php
@@ -21,7 +21,8 @@
                     </label>
                     <p>
 
-                        <input class="" type="password" name="password" id="password" value="<?php echo set_value('password'); ?>" />
+                        <input class="" type="password" name="password" id="password" 
+                        value="<?php echo set_value('password'); ?>" />
                         <?php echo $this->form_validation->error('password'); ?>
                     </p>
                 </li>
@@ -33,7 +34,8 @@
                     </label>
                     <p>
 
-                        <input class="" type="password" name="conf_password" id="conf_password" value="<?php echo set_value('conf_password'); ?>" />
+                        <input class="" type="password" name="conf_password" id="conf_password" 
+                        value="<?php echo set_value('conf_password'); ?>" />
                         <?php echo $this->form_validation->error('conf_password'); ?>
                     </p>
                 </li>
diff --git a/application/views/users/signup.php b/application/views/users/signup.php
index 93b862b..3d18937 100644
--- a/application/views/users/signup.php
+++ b/application/views/users/signup.php
@@ -40,7 +40,8 @@
                     </label>
                     <p>
 
-                        <input class="" type="text" name="department_name" id="department_name" value="<?php echo set_value('department_name'); ?>" />
+                        <input class="" type="text" name="department_name" id="department_name" 
+                        value="<?php echo set_value('department_name'); ?>" />
                         <?php echo $this->form_validation->error('department_name'); ?>
                     </p>
                 </li>
@@ -52,7 +53,8 @@
                     </label>
                     <p>
 
-                        <input class="" type="text" name="first_name" id="first_name" value="<?php echo set_value('first_name'); ?>" />
+                        <input class="" type="text" name="first_name" id="first_name" 
+                        value="<?php echo set_value('first_name'); ?>" />
                         <?php echo $this->form_validation->error('first_name'); ?>
                     </p>
                 </li>
@@ -64,7 +66,8 @@
                     </label>
                     <p>
 
-                        <input class="" type="text" name="last_name" id="last_name" value="<?php echo set_value('last_name'); ?>" />
+                        <input class="" type="text" name="last_name" id="last_name" 
+                        value="<?php echo set_value('last_name'); ?>" />
                         <?php echo $this->form_validation->error('last_name'); ?>
                     </p>
                 </li>
@@ -76,7 +79,8 @@
                     </label>
                     <p>
 
-                        <input class="" type="text" name="email" id="email" value="<?php echo set_value('email'); ?>" />
+                        <input class="" type="text" name="email" id="email" 
+                        value="<?php echo set_value('email'); ?>" />
                         <?php echo $this->form_validation->error('email'); ?>
                     </p>
                 </li>
@@ -88,7 +92,8 @@
                     </label>
                     <p>
 
-                        <input class="" type="password" name="password" id="password" value="<?php echo set_value('password'); ?>" />
+                        <input class="" type="password" name="password" id="password" 
+                        value="<?php echo set_value('password'); ?>" />
                         <?php echo $this->form_validation->error('password'); ?>
                     </p>
                 </li>
@@ -100,7 +105,8 @@
                     </label>
                     <p>
 
-                        <input class="" type="password" name="conf_password" id="conf_password" value="<?php echo set_value('conf_password'); ?>" />
+                        <input class="" type="password" name="conf_password" id="conf_password" 
+                        value="<?php echo set_value('conf_password'); ?>" />
                         <?php echo $this->form_validation->error('conf_password'); ?>
                     </p>
                 </li>
diff --git a/application/views/users/users_listing.php b/application/views/users/users_listing.php
index 049eb69..533825f 100644
--- a/application/views/users/users_listing.php
+++ b/application/views/users/users_listing.php
@@ -44,7 +44,8 @@
                                                 echo 'Active';
                                             }
                                             ?></span>
-                                        <select id="edit_status_input_<?php echo $user['id']; ?>" class="intxt2 edit_status_box" style="display: none;width: 100%;">
+                                        <select id="edit_status_input_<?php echo $user['id']; ?>" 
+                                        class="intxt2 edit_status_box" style="display: none;width: 100%;">
                                             <option <?php
                                             if ($user['status'] == '0') {
                                                 echo 'selected';
@@ -62,7 +63,8 @@
                             <td class="Links">
                                 <?php if ($this->acl->hasSuperAdmin()) { ?>
                                 <a href="<?= base_url() ?>users/autologin/<?php echo $user['id'] ?>">
-                                    <img src="<?= base_url() ?>assets/images/auto_login.png" alt="" width="24px" title ="Login" />
+                                    <img src="<?= base_url() ?>assets/images/auto_login.png" 
+                                    alt="" width="24px" title ="Login" />
                                 </a>
                                 <?php }?>
                                 <?php if ($this->acl->hasPermission('users', 'edit')) { ?>
@@ -72,16 +74,19 @@
                                 <?php }else{?>
                                 
                                 <a href="javascript:void(0)">
-                                        <img style="visibility: hidden;" src="<?= base_url() ?>assets/images/tableLink3.png" alt="" title="Edit"/>
+                                        <img style="visibility: hidden;" src="<?= base_url() ?>
+                                        assets/images/tableLink3.png" alt="" title="Edit"/>
                                     </a>
                                 <?php }?>
                                 <?php if ($this->acl->hasPermission('users', 'delete')) { ?>
                                 <a href="javascript:void(0)">
-                                    <img src="<?= base_url() ?>assets/images/tableLink3.png" alt="" user_id ="<?= $user['id'] ?>" class="delete_user" title ="Delete user" />
+                                    <img src="<?= base_url() ?>assets/images/tableLink3.png" alt="" 
+                                    user_id ="<?= $user['id'] ?>" class="delete_user" title ="Delete user" />
                                 </a>
                                 <?php }else{?>
                                 <a href="javascript:void(0)">
-                                        <img style="visibility: hidden;" src="<?= base_url() ?>assets/images/tableLink3.png" alt="" title="Delete"/>
+                                        <img style="visibility: hidden;" src="<?= base_url() ?>
+                                        assets/images/tableLink3.png" alt="" title="Delete"/>
                                     </a>
                                 <?php }?>
                                 <br clear="all" />