Răsfoiți Sursa

Fix HTTPS with IP

causefx 8 ani în urmă
părinte
comite
1815c021b7
3 a modificat fișierele cu 55 adăugiri și 60 ștergeri
  1. 4 0
      ajax.php
  2. 51 0
      functions.php
  3. 0 60
      homepage.php

+ 4 - 0
ajax.php

@@ -126,6 +126,10 @@ switch ($_SERVER['REQUEST_METHOD']) {
                     case 'upload-images':
                         uploadFiles('images/', array('jpg', 'png', 'svg', 'jpeg', 'bmp', 'gif'));
                         sendNotification(true);
+                        break;
+					case 'upload-avatar':
+                        uploadAvatar(USER_HOME.$GLOBALS['USER']->username.'/', array('jpg', 'png', 'svg', 'jpeg', 'bmp', 'gif'));
+                        sendNotification(true);
                         break;
                     case 'remove-images':
                         removeFiles('images/'.(isset($_POST['file'])?$_POST['file']:''));

+ 51 - 0
functions.php

@@ -323,6 +323,10 @@ if (function_exists('curl_version')) :
 		curl_setopt($curlReq, CURLOPT_CUSTOMREQUEST, "POST"); 
 		curl_setopt($curlReq, CURLOPT_RETURNTRANSFER, true);
 		curl_setopt($curlReq, CURLOPT_CAINFO, getCert());
+		if(localURL($url)){
+			curl_setopt($curlReq, CURLOPT_SSL_VERIFYHOST, 0);
+			curl_setopt($curlReq, CURLOPT_SSL_VERIFYPEER, 0);
+		}
 		// Format Data
 		switch (isset($headers['Content-Type'])?$headers['Content-Type']:'') {
 			case 'application/json': 
@@ -361,6 +365,10 @@ if (function_exists('curl_version')) :
 		curl_setopt($curlReq, CURLOPT_RETURNTRANSFER, true);
 		curl_setopt($curlReq, CURLOPT_CAINFO, getCert());
   		curl_setopt($curlReq, CURLOPT_CONNECTTIMEOUT, 5);
+		if(localURL($url)){
+			curl_setopt($curlReq, CURLOPT_SSL_VERIFYHOST, 0);
+			curl_setopt($curlReq, CURLOPT_SSL_VERIFYPEER, 0);
+		}
 		// Format Headers
 		$cHeaders = array();
 		foreach ($headers as $k => $v) {
@@ -386,6 +394,10 @@ if (function_exists('curl_version')) :
 		curl_setopt($curlReq, CURLOPT_RETURNTRANSFER, true);
   		curl_setopt($curlReq, CURLOPT_CONNECTTIMEOUT, 5);
 		curl_setopt($curlReq, CURLOPT_CAINFO, getCert());
+		if(localURL($url)){
+			curl_setopt($curlReq, CURLOPT_SSL_VERIFYHOST, 0);
+			curl_setopt($curlReq, CURLOPT_SSL_VERIFYPEER, 0);
+		}
 		// Format Headers
 		$cHeaders = array();
 		foreach ($headers as $k => $v) {
@@ -1537,6 +1549,39 @@ function uploadFiles($path, $ext_mask = null) {
 		echo json_encode('No files submitted!');
 	}
 }
+// Process file uploads
+function uploadAvatar($path, $ext_mask = null) {
+	if (isset($_FILES) && count($_FILES)) {
+		require_once('class.uploader.php');
+
+		$uploader = new Uploader();
+		$data = $uploader->upload($_FILES['files'], array(
+			'limit' => 10,
+			'maxSize' => 10,
+			'extensions' => $ext_mask,
+			'required' => false,
+			'uploadDir' => str_replace('//','/',$path.'/'),
+			'title' => array('name'),
+			'removeFiles' => true,
+			'replace' => true,
+		));
+
+		if($data['isComplete']){
+			$files = $data['data'];
+   			writeLog("success", $files['metas'][0]['name']." was uploaded");
+			echo json_encode($files['metas'][0]['name']);
+		}
+
+		if($data['hasErrors']){
+			$errors = $data['errors'];
+   			writeLog("error", $files['metas'][0]['name']." was not able to upload");
+			echo json_encode($errors);
+		}
+	} else { 
+  		writeLog("error", "image was not uploaded");
+		echo json_encode('No files submitted!');
+	}
+}
 
 // Remove file
 function removeFiles($path) {
@@ -3880,6 +3925,12 @@ function getCalendar(){
 	return $calendarItems;
 }
 
+function localURL($url){
+	preg_match("/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/", $url, $result);
+	$result = (!empty($result) ? true : false);
+	return $result;
+}
+
 function orgEmail($header = "Message From Admin", $title = "Important Message", $user = "Organizr User", $mainMessage = "", $button = null, $buttonURL = null, $subTitle = "", $subMessage = ""){
 	$path = getServerPath();
 	return '

+ 0 - 60
homepage.php

@@ -748,64 +748,6 @@ foreach(loadAppearance() as $key => $value) {
             //RECENT ITEMS
             // each filter we click on
             $(".filter-recent-event > li").on("click", function() {
-                 /*   
-                // toggle the filter on/off
-                $(this).data( "filter-on" , !$(this).data("filter-on") );
-                
-                // set all the filter strings to empty
-                var filtersOn = "";
-                var filtersOff = "";
-                var allFilters = "";
-                
-                // loop through each filter
-                $(".filter-recent-event > li").each(function() {
-                    
-                    // set a variable to hold the value of the filter class
-                    // and also if the filter is on/off
-                    var filter = $(this).data("filter");
-                    var isOn = $(this).data("filter-on");
-
-                    // add the filter to the filtersOn / filtersOff collection
-                    if( isOn ) {
-                        filtersOn += "." + filter + ", ";
-                        var title=$(this).attr('data-filter').split('-')[1];
-                        if(title == "movie"){
-                            var titleOriginal = "Movies";
-                        }else if(title == "season"){
-                            var titleOriginal = "Shows";
-                        }else if(title == "album"){
-                            var titleOriginal = "Music";
-                        }
-                        
-                        $('.js-filter-'+title).text(titleOriginal+' Active');
-                    } else {
-                        filtersOff += "." + filter + ", ";
-                        var title=$(this).attr('data-filter').split('-')[1];
-                        if(title == "movie"){
-                            var titleOriginal = "Movies";
-                        }else if(title == "season"){
-                            var titleOriginal = "Shows";
-                        }else if(title == "album"){
-                            var titleOriginal = "Music";
-                        }
-                        $('.js-filter-'+title).text(titleOriginal);
-                    }
-
-                });
-                
-                // remove the last ", " from each filter collection.
-                filtersOn = filtersOn.replace(/, $/, "");
-                filtersOff = filtersOff.replace(/, $/, "");
-                
-                // remove all filters if none are on.
-                if( filtersOn === "" ) {
-                    filtersOn = "*";
-                    filtersOff = "";
-                }
-                
-                // combine the filters together ( on + off )
-                allFilters = filtersOn + ":not(" + filtersOff + ")";
-                console.log( allFilters );*/
                 var name = $(this).attr('data-name');
                 var filter = $(this).attr('data-filter');
                 $('#recentContent-title').text('Recently Added '+name);
@@ -818,7 +760,6 @@ foreach(loadAppearance() as $key => $value) {
                     $('.recentItems-recent')
                         .slick('slickUnfilter')
                 }
-
             });
             //PLAYLIST SHIT
              // each filter we click on
@@ -831,7 +772,6 @@ foreach(loadAppearance() as $key => $value) {
                 $('.recentItems-playlists')
                     .slick('slickUnfilter')
                     .slick('slickFilter' , '.'+filter );
-
             });
 
             $("body").niceScroll({