Merge pull request #18 from php-kchat/dev

GaneshKandu · web-flow · commit 8921fcf21f85 · 2023-05-06T18:40:11.000+05:30
Dev
diff --git a/app/Http/Controllers/KchatController.php b/app/Http/Controllers/KchatController.php
@@ -192,7 +192,10 @@ function attachments(Request $request){
         $tmp = DB::table('settings')->where(['key' => 'uploadpath'])->get();
         
         if(!count($tmp)){
-            return false;
+            if($request->role == 'admin'){
+                return json_encode(['error' => 'File upload path is not set']);
+            }
+            return json_encode(['error' => 'File upload Failed']);
         }
         
         $uploadpath = $tmp[0]->value;
diff --git a/app/Http/Controllers/SettingController.php b/app/Http/Controllers/SettingController.php
@@ -51,6 +51,10 @@ function AddDepartment(Request $request){
 			return false;
         }
 		
+        if($request->adddepartment == null){
+            return json_encode(array('error' => 'Department field is empty'));
+        }
+        
 		DB::table('departments')->insert(
 			['department' => $request->adddepartment]
 		);
@@ -76,6 +80,10 @@ function uploadpath(Request $request){
 			return false;
         }
 		
+        if($request->uploadpath == null){
+            return json_encode(array('error' => 'Upload path field is empty'));
+        }
+        
 		\Settings::set('uploadpath',$request->uploadpath);
 		
 		ActivityLog::log()->save('Setting','You have set upload path to '.$request->uploadpath.'.');
diff --git a/public/js/kchat.js b/public/js/kchat.js
@@ -1,4 +1,20 @@
 
+gfunc = null;
+
+$('#alert-ok').on('click', function() {
+    gfunc();
+});
+
+function kchat_alert(body,func){
+    if(body == undefined){
+        func();
+        return true;
+    }
+    $("#alertbody").html(body);
+    $("#alertmodel").click();
+    gfunc = func;
+}
+
 if(localStorage.getItem('selected') == null){
     localStorage.setItem('selected', "");
 }
@@ -48,9 +64,23 @@ Ajax call
 ---------------------------------------------------------------------
 */
 
+tmp = {};
+
+tmp.set = function(param){
+    tmp.value = param;
+}
+
+tmp.get = function(){
+    return tmp.value;
+}
+
 $( "[ajax_post]" ).on( "click", function () {
 	
-		form = $(this).attr('form');
+    tmp.set($(this));
+    
+    kchat_alert(tmp.get().attr('data-msg'),(function(){
+        
+		form = tmp.get().attr('form');
 		
 		row = $('.' + form).get();
 		
@@ -70,12 +100,17 @@ $( "[ajax_post]" ).on( "click", function () {
 		
 		$.ajax({
 			type: "POST",
-			url: $(this).attr('action'),
+			url: tmp.get().attr('action'),
 			data: Data,
 			processData: false,
 			contentType: false,
 			success: function(result){
-				location.reload();
+                result = $.parseJSON(result);
+                if(result['error'] == undefined){
+                    location.reload();
+                }else{
+                    kchat_alert(result['error'],(function(){}));
+                }
 			},
 			error: function(result){
 				alert_msg = [];
@@ -86,7 +121,7 @@ $( "[ajax_post]" ).on( "click", function () {
 				$('#' + form + '-error').html(alert_msg.join("<br>")).css("display", "block");
 			}
 		});
-		
+	}));
 });
 
 /*
@@ -273,7 +308,12 @@ function __post(url,posts){
 		url: url,
 		data: Data,
 		success: function(result){
-			location.reload();
+            result = $.parseJSON(result);
+            if(result['error'] == undefined){
+                location.reload();
+            }else{
+                kchat_alert(result['error'],(function(){}));
+            }
 		}
 	});
 }
@@ -337,4 +377,4 @@ function setSelectedCount(){
     } 
 }
 
-setSelectedCount();
+setSelectedCount();
diff --git a/public/js/kchat.msg.js b/public/js/kchat.msg.js
@@ -427,16 +427,17 @@ $(document).ready (function(){
             Data.append('files[]', files[i]);
 		}
         
-		//console.log(Data);
-        
 		$.ajax({
 			type: "POST",
 			url: '/messages/attachments',
 			data: Data,
 			processData: false,
 			contentType: false,
 			success: function(result){
-				console.log(result);
+				result = $.parseJSON(result);
+                if(result.error != undefined){
+                    kchat_alert(result.error,(function(){}));
+                }
 			},
 			error: function(result){
 
diff --git a/public/js/members.js b/public/js/members.js
@@ -1,64 +1,64 @@
 
 function delete_users(){
-	__post('/members/delete_users',getSelectedID());
+	kchat_alert("Are you sure you want to <strong>delete</strong> users?",(function(){__post('/members/delete_users',getSelectedID());}));
 }
 
 function set_inactive_users(){
-	__post('/members/set_inactive_users',getSelectedID());
+	kchat_alert("Are you sure you want to set <strong>inactive</strong>?",(function(){__post('/members/set_inactive_users',getSelectedID());}));
 }
 
 function set_active_users(){
-	__post('/members/set_active_users',getSelectedID());
+	kchat_alert("Are you sure you want to set <strong>active</strong>?",(function(){__post('/members/set_active_users',getSelectedID());}));
 }
 
 function block_users(){
-	__post('/members/block_users',getSelectedID());
+	kchat_alert("Are you sure you want to <strong>block</strong> users?",(function(){__post('/members/block_users',getSelectedID());}));
 }
 
 function unblock_users(){
-	__post('/members/unblock_users',getSelectedID());
+	kchat_alert("Are you sure you want to <strong>unblock</strong> users?",(function(){__post('/members/unblock_users',getSelectedID());}));
 }
 
 function NewConversation(){
-	__post('/members/newconversation',getSelectedID(),{
+	kchat_alert("Are you sure you want to start new <strong>Conversation</strong>?",(function(){__post('/members/newconversation',getSelectedID(),{
         'grpname' : $('#grpname').val()
-    });
+    });}));
 }
 
 function revoke_admins(){
-	__post('/members/revokeadmin',getSelectedID());
+	kchat_alert("Are you sure you want to revoke <strong>admin privileges</strong>?",(function(){__post('/members/revokeadmin',getSelectedID());}));
 }
 
 function make_admins(){
-	__post('/members/makeadmin',getSelectedID());
+	kchat_alert("Are you sure you want to grant <strong>admin privileges</strong>?",(function(){__post('/members/makeadmin',getSelectedID());}));
 }
 
 function delete_user(){
-	__post('/members/delete_users',[$('#m_user').val()]);
+	kchat_alert("Are you sure you want to <strong>delete</strong> users?",(function(){__post('/members/delete_users',[$('#m_user').val()]);}));
 }
 
 function set_inactive_user(){
-	__post('/members/set_inactive_users',[$('#m_user').val()]);
+	kchat_alert("Are you sure you want to set <strong>inactive</strong>?",(function(){__post('/members/set_inactive_users',[$('#m_user').val()]);}));
 }
 
 function set_active_user(){
-	__post('/members/set_active_users',[$('#m_user').val()]);
+	kchat_alert("Are you sure you want to set <strong>active</strong>?",(function(){__post('/members/set_active_users',[$('#m_user').val()]);}));
 }
 
 function block_user(){
-	__post('/members/block_users',[$('#m_user').val()]);
+	kchat_alert("Are you sure you want to <strong>block</strong> user?",(function(){__post('/members/block_users',[$('#m_user').val()]);}));
 }
 
 function unblock_user(){
-	__post('/members/unblock_users',[$('#m_user').val()]);
+	kchat_alert("Are you sure you want to <strong>unblock</strong> user?",(function(){__post('/members/unblock_users',[$('#m_user').val()]);}));
 }
 
 function make_admin(){
-	__post('/members/makeadmin',[$('#m_user').val()]);
+	kchat_alert("Are you sure you want to grant <strong>admin privileges</strong>?",(function(){__post('/members/makeadmin',[$('#m_user').val()]);}));
 }
 
 function revoke_admin(){
-	__post('/members/revokeadmin',[$('#m_user').val()]);
+	kchat_alert("Are you sure you want to revoke <strong>admin privileges</strong>?",(function(){__post('/members/revokeadmin',[$('#m_user').val()]);}));
 }
 
 $(document).ready(function(){
diff --git a/resources/views/admin/activities.blade.php b/resources/views/admin/activities.blade.php
@@ -51,7 +51,7 @@
                                 </button>
                                 <div class="dropdown-menu dropdown-menu-right">
 									<input type="hidden" class="act{{ $info->id }}" id="id" value="{{ $info->id }}" />
-                                    <button class="dropdown-item" type="button" ajax_post action="/activity/delete" form="act{{ $info->id }}" ><i class="mdi mdi-delete"></i> Delete</button>
+                                    <button class="dropdown-item" type="button" ajax_post data-msg="Are you sure you want to delete activities?" action="/activity/delete" form="act{{ $info->id }}" ><i class="mdi mdi-delete"></i> Delete</button>
                                 </div>
                             </div>
                             <br />
@@ -67,7 +67,7 @@
 @section('script')
 <script>
 	function delete_activity(){
-		__post('/activity/delete',getSelectedID());
+		kchat_alert("Are you sure you want to delete <strong>Activities</strong>?",(function(){__post('/activity/delete',getSelectedID());}));
 	}
 </script>
 @endsection
diff --git a/resources/views/admin/master.blade.php b/resources/views/admin/master.blade.php
@@ -62,6 +62,25 @@
             </div>
          </div>
       </div>
+      <!-- Alert Modal -->
+      <input type="hidden" id="alertmodel" data-toggle="modal" data-target="#alert-model" />
+      <div class="modal fade" id="alert-model" tabindex="-1" role="dialog" aria-labelledby="alertModel" aria-hidden="true">
+      <div class="modal-dialog modal-dialog-centered" role="document">
+        <div class="modal-content">
+          <div class="modal-header">
+            <h5 class="modal-title" >Alert</h5>
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+              <span aria-hidden="true">&times;</span>
+            </button>
+          </div>
+            <p class="p-3" id="alertbody"></p>
+          <div class="modal-footer">
+            <button type="button" id="alert-ok" class="btn btn-secondary" data-dismiss="modal">Ok</button>
+            <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+          </div>
+        </div>
+      </div>
+    </div>
       @yield('script')
 	  <script src="/js/kchat.js"></script>
       @yield('javascript')
diff --git a/resources/views/admin/members.blade.php b/resources/views/admin/members.blade.php
@@ -212,5 +212,5 @@
 @endsection
 				  
 @section('script')
-
+<!-- No Script -->
 @endsection
diff --git a/resources/views/admin/notifications.blade.php b/resources/views/admin/notifications.blade.php
@@ -51,7 +51,7 @@
                                 </button>
                                 <div class="dropdown-menu dropdown-menu-right">
 									<input type="hidden" class="not{{ $info->id }}" id="id" value="{{ $info->id }}" />
-                                    <button class="dropdown-item" type="button" ajax_post action="/notification/delete" form="not{{ $info->id }}"><i class="mdi mdi-delete"></i> Delete</button>
+                                    <button class="dropdown-item" type="button" ajax_post data-msg="Are you sure you want to delete notifications?" action="/notification/delete" form="not{{ $info->id }}"><i class="mdi mdi-delete"></i> Delete</button>
                                 </div>
                             </div>
                             <br />
@@ -67,7 +67,7 @@
 @section('script')
 <script>
 	function delete_notificatios(){
-		__post('/notification/delete',getSelectedID());
+		kchat_alert("Are you sure you want to delete <strong>Notifications</strong>?",(function(){__post('/notification/delete',getSelectedID());}));
 	}
 </script>
 @endsection
diff --git a/resources/views/admin/profile.blade.php b/resources/views/admin/profile.blade.php
@@ -94,7 +94,7 @@
                         </div>
                      </div>
                      <div class="row">
-                        <div class="col d-flex justify-content-end"> <button class="btn btn-primary" type="submit" ajax_post action="/profile" form="profile" >Save Changes</button></div>
+                        <div class="col d-flex justify-content-end"> <button class="btn btn-primary" type="submit" ajax_post data-msg="Are you sure you want to update your profile?" action="/profile" form="profile" >Save Changes</button></div>
                      </div>
                </div>
             </div>
diff --git a/resources/views/admin/settings.blade.php b/resources/views/admin/settings.blade.php
@@ -19,15 +19,15 @@
 	<p>Add and Delete Department</p>
 	<div class="mt-3"> <label class="small mb-1" for="twoFactorSMS">Add Department</label>
 		<input class="form-control savedpt" id="adddepartment" placeholder="Department" >
-		<button class="btn btn-primary mt-3" type="button" ajax_post action="/setting/savedpt" form="savedpt" >Add Department</button>
+		<button class="btn btn-primary mt-3" type="button" ajax_post  data-msg="Are you sure you want to add department?" action="/setting/savedpt" form="savedpt" >Add Department</button>
 	</div>
 	<div class="mt-3"> <label class="small mb-1" for="twoFactorSMS">Delete Department</label>
 		<select class="form-control deletedpt" type="text" id="deletedepartment" >
 			@foreach($departments as $department)
 				<option value="{{ $department->department }}">{{ $department->department }}</option>
 			@endforeach
 		</select>
-		<button class="btn btn-danger mt-3" type="button" ajax_post action="/setting/deletedpt" form="deletedpt" >Delete Department</button>
+		<button class="btn btn-danger mt-3" type="button" ajax_post  data-msg="Are you sure you want to delete department?" action="/setting/deletedpt" form="deletedpt" >Delete Department</button>
 	</div>
   </div>
 </div>
@@ -40,7 +40,7 @@
 				<option value="{{ $tz }}" @if($tz == $settings['Timezone']) selected @endif>{{ $tz }}</option>
 			@endforeach
 		</select>
-		<button class="btn btn-primary mt-3" type="button" ajax_post action="/setting/timezone" form="timezone" >Update Timezone</button>
+		<button class="btn btn-primary mt-3" type="button" ajax_post  data-msg="Are you sure you want to update timezone?" action="/setting/timezone" form="timezone" >Update Timezone</button>
 	</div>
   </div>
 </div>
@@ -49,7 +49,7 @@
    <div class="card-body">
       <p class="small text-muted">Place it outside the webroot means that the files will not be publicly exposed.</p>
 	  <input class="form-control uploadpath" id="uploadpath" placeholder="/home/user/files" value="{{ $settings['uploadpath'] }}" >
-      <button class="btn btn-primary mt-3" type="button" ajax_post action="/setting/uploadpath" form="uploadpath" >Update Timezone</button>
+      <button class="btn btn-primary mt-3" type="button" ajax_post  data-msg="Are you sure you want to update upload path?" action="/setting/uploadpath" form="uploadpath" >Update Timezone</button>
    </div>
 </div>
 <!--div class="card mb-4">
diff --git a/resources/views/common/msg.blade.php b/resources/views/common/msg.blade.php
@@ -46,7 +46,7 @@
 	</div>
  </div>
  <div class="chat-history" id="Msgs" style="min-height: 50%;" >
-    <image id="loading" src="/assets/loading.gif"></image>
+    <image id="loading" src="/assets/loading.gif"/>
 	<ul class="pl-3 pr-3" id="Messages"></ul>
     <button type="button" id="gotobottom" class="btn btn-outline-secondary"><i class="fa fa-chevron-down"></i></button>
  </div>
@@ -86,7 +86,7 @@
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-        <button type="button" class="btn btn-primary" ajax_post action="/messages/update" form="updategroup" >Update Group</button>
+        <button type="button" class="btn btn-primary" ajax_post  data-msg="Are you sure you want to update group profile?" action="/messages/update" form="updategroup" >Update Group</button>
       </div>
     </div>
   </div>
diff --git a/resources/views/user/activities.blade.php b/resources/views/user/activities.blade.php
@@ -51,7 +51,7 @@
                                 </button>
                                 <div class="dropdown-menu dropdown-menu-right">
 									<input type="hidden" class="act{{ $info->id }}" id="id" value="{{ $info->id }}" />
-                                    <button class="dropdown-item" type="button" ajax_post action="/activity/delete" form="act{{ $info->id }}" ><i class="mdi mdi-delete"></i> Delete</button>
+                                    <button class="dropdown-item" type="button" ajax_post  data-msg="Are you sure you want to delete activities?" action="/activity/delete" form="act{{ $info->id }}" ><i class="mdi mdi-delete"></i> Delete</button>
                                 </div>
                             </div>
                             <br />
@@ -67,7 +67,7 @@
 @section('script')
 <script>
 	function delete_activity(){
-		__post('/activity/delete',getSelectedID());
+		kchat_alert("Are you sure you want to delete <strong>Activities</strong>?",(function(){__post('/activity/delete',getSelectedID());}));
 	}
 </script>
 @endsection
diff --git a/resources/views/user/master.blade.php b/resources/views/user/master.blade.php
diff --git a/resources/views/user/notifications.blade.php b/resources/views/user/notifications.blade.php
diff --git a/resources/views/user/profile.blade.php b/resources/views/user/profile.blade.php

Original file line number	Diff line number	Diff line change
`@@ -1,64 +1,64 @@`
`1`	`1`
`2`	`2`	`function delete_users(){`
`3`		`- __post('/members/delete_users',getSelectedID());`
	`3`	`+ kchat_alert("Are you sure you want to <strong>delete</strong> users?",(function(){__post('/members/delete_users',getSelectedID());}));`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`function set_inactive_users(){`
`7`		`- __post('/members/set_inactive_users',getSelectedID());`
	`7`	`+ kchat_alert("Are you sure you want to set <strong>inactive</strong>?",(function(){__post('/members/set_inactive_users',getSelectedID());}));`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`function set_active_users(){`
`11`		`- __post('/members/set_active_users',getSelectedID());`
	`11`	`+ kchat_alert("Are you sure you want to set <strong>active</strong>?",(function(){__post('/members/set_active_users',getSelectedID());}));`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`function block_users(){`
`15`		`- __post('/members/block_users',getSelectedID());`
	`15`	`+ kchat_alert("Are you sure you want to <strong>block</strong> users?",(function(){__post('/members/block_users',getSelectedID());}));`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`function unblock_users(){`
`19`		`- __post('/members/unblock_users',getSelectedID());`
	`19`	`+ kchat_alert("Are you sure you want to <strong>unblock</strong> users?",(function(){__post('/members/unblock_users',getSelectedID());}));`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`function NewConversation(){`
`23`		`- __post('/members/newconversation',getSelectedID(),{`
	`23`	`+ kchat_alert("Are you sure you want to start new <strong>Conversation</strong>?",(function(){__post('/members/newconversation',getSelectedID(),{`
`24`	`24`	`'grpname' : $('#grpname').val()`
`25`		`- });`
	`25`	`+ });}));`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`function revoke_admins(){`
`29`		`- __post('/members/revokeadmin',getSelectedID());`
	`29`	`+ kchat_alert("Are you sure you want to revoke <strong>admin privileges</strong>?",(function(){__post('/members/revokeadmin',getSelectedID());}));`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`function make_admins(){`
`33`		`- __post('/members/makeadmin',getSelectedID());`
	`33`	`+ kchat_alert("Are you sure you want to grant <strong>admin privileges</strong>?",(function(){__post('/members/makeadmin',getSelectedID());}));`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`function delete_user(){`
`37`		`- __post('/members/delete_users',[$('#m_user').val()]);`
	`37`	`+ kchat_alert("Are you sure you want to <strong>delete</strong> users?",(function(){__post('/members/delete_users',[$('#m_user').val()]);}));`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`function set_inactive_user(){`
`41`		`- __post('/members/set_inactive_users',[$('#m_user').val()]);`
	`41`	`+ kchat_alert("Are you sure you want to set <strong>inactive</strong>?",(function(){__post('/members/set_inactive_users',[$('#m_user').val()]);}));`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`function set_active_user(){`
`45`		`- __post('/members/set_active_users',[$('#m_user').val()]);`
	`45`	`+ kchat_alert("Are you sure you want to set <strong>active</strong>?",(function(){__post('/members/set_active_users',[$('#m_user').val()]);}));`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`function block_user(){`
`49`		`- __post('/members/block_users',[$('#m_user').val()]);`
	`49`	`+ kchat_alert("Are you sure you want to <strong>block</strong> user?",(function(){__post('/members/block_users',[$('#m_user').val()]);}));`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`function unblock_user(){`
`53`		`- __post('/members/unblock_users',[$('#m_user').val()]);`
	`53`	`+ kchat_alert("Are you sure you want to <strong>unblock</strong> user?",(function(){__post('/members/unblock_users',[$('#m_user').val()]);}));`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`function make_admin(){`
`57`		`- __post('/members/makeadmin',[$('#m_user').val()]);`
	`57`	`+ kchat_alert("Are you sure you want to grant <strong>admin privileges</strong>?",(function(){__post('/members/makeadmin',[$('#m_user').val()]);}));`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`function revoke_admin(){`
`61`		`- __post('/members/revokeadmin',[$('#m_user').val()]);`
	`61`	`+ kchat_alert("Are you sure you want to revoke <strong>admin privileges</strong>?",(function(){__post('/members/revokeadmin',[$('#m_user').val()]);}));`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`$(document).ready(function(){`