Merge pull request #200 from globaldyne/v12.3

globaldyne · web-flow · commit e1a2006d015c · 2024-12-21T14:26:54.000Z
V12.3
diff --git a/.gitignore b/.gitignore
@@ -8,5 +8,5 @@ inc/config.php
 *.swp
 t.php
 tests/
-modules/suppliers/pvOnlineBK.json
-modules/suppliers/pvOnlineBK.php
+modules/suppliers/pvLibraryBK.json
+modules/suppliers/pvLibraryBK.php
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,8 @@
 # CHANGELOG
+### Version 12.3
+- Fix API log file
+- PV Online has been renamed to PV Library
+
 ### Version 12.2
 - Docker file update
 - Fixed document upload for ingredients returning incorrect results
diff --git a/VERSION.md b/VERSION.md
@@ -1 +1 @@
-12.2
+12.3
diff --git a/api.php b/api.php
@@ -1,7 +1,7 @@
 <?php
 define('pvault_panel', TRUE);
 define('__ROOT__', dirname(__FILE__));
-define('LOG_PATH', __ROOT__ . '/logs/');
+define('LOG_PATH', '/tmp/logs/');
 define('DEFAULT_IMAGE', __ROOT__ . '/img/pv_molecule.png');
 define('LOG_API_FILE', 'pv-api.log');
 
diff --git a/core/core.php b/core/core.php
@@ -7,7 +7,7 @@
 require_once(__ROOT__.'/inc/product.php');
 require_once(__ROOT__.'/func/labelMap.php');
 require_once(__ROOT__.'/func/get_formula_notes.php');
-require_once(__ROOT__.'/func/pvOnline.php');
+require_once(__ROOT__.'/func/pvPost.php');
 require_once(__ROOT__.'/func/pvFileGet.php');
 require_once(__ROOT__.'/func/validateInput.php');
 require_once(__ROOT__.'/func/sanChar.php');
@@ -558,11 +558,11 @@
 
 }
 
-//PVOnline Single Import						
-if($_POST['action'] == 'import' && $_POST['source'] == 'PVOnline' && $_POST['kind'] == 'ingredient' && $_POST['ing_id']){
+//PVLibrary Single Import						
+if($_POST['action'] == 'import' && $_POST['source'] == 'PVLibrary' && $_POST['kind'] == 'ingredient' && $_POST['ing_id']){
 	$id = mysqli_real_escape_string($conn, $_POST['ing_id']);
 	
-	$jAPI = $pvOnlineAPI.'?request=ingredients&src=PV_PRO&id='.$id;
+	$jAPI = $pvLibraryAPI.'?request=ingredients&src=PV_PRO&id='.$id;
     $jsonData = json_decode(pv_file_get_contents($jAPI), true);
 
     if($jsonData['error']){
@@ -3064,7 +3064,7 @@ function formatVal($num){
 	
 	$id = mysqli_real_escape_string($conn, $_POST['fid']);
 	
-	$jAPI = $pvOnlineAPI.'?request=MarketPlace&action=get&id='.$id;
+	$jAPI = $pvLibraryAPI.'?request=MarketPlace&action=get&id='.$id;
     $jsonData = json_decode(pv_file_get_contents($jAPI), true);
 
     if($jsonData['error']){
@@ -3147,7 +3147,7 @@ function formatVal($num){
 		 'contactReason' => $contactReason
 		 ];
 	
-    $req = json_decode(pvPost($pvOnlineAPI, $data));
+    $req = json_decode(pvPost($pvLibraryAPI, $data));
 	if($req->success){
 		$response['success'] = $req->success;
 	}else{
@@ -3191,7 +3191,7 @@ function formatVal($num){
 		 'reportReason' => $reportReason
 		 ];
 	
-    $req = json_decode(pvPost($pvOnlineAPI, $data));
+    $req = json_decode(pvPost($pvLibraryAPI, $data));
 	if($req->success){
 		$response['success'] = $req->success;
 	}else if($req->error){
diff --git a/db/pvault.sql b/db/pvault.sql
@@ -342,7 +342,7 @@ CREATE TABLE `settings` (
   `multi_dim_perc` INT NOT NULL DEFAULT '0', 
   `defCatClass` VARCHAR(255) NOT NULL DEFAULT 'cat4',
   `defPercentage` VARCHAR(255) NOT NULL DEFAULT 'max_percentage',
-  `pv_online_api_url` varchar(255) COLLATE utf8_general_ci NOT NULL DEFAULT 'https://online.perfumersvault.com/api-data/api.php',
+  `pv_library_api_url` varchar(255) COLLATE utf8_general_ci NOT NULL DEFAULT 'https://library.perfumersvault.com/api-data/api.php',
   `api` INT NOT NULL DEFAULT '0',
   `api_key` VARCHAR(255) NULL,
   `editor` int(11) NOT NULL DEFAULT 1 COMMENT '1 = Inline, 2 = Advanced',
diff --git a/db/schema.ver b/db/schema.ver
@@ -1 +1 @@
-12.2
+12.3
diff --git a/db/updates/update_12.2-12.3.sql b/db/updates/update_12.2-12.3.sql
@@ -0,0 +1,2 @@
+UPDATE `settings` SET `pv_online_api_url` = 'https://library.perfumersvault.com/api-data/api.php' WHERE `settings`.`id` = 1;
+ALTER TABLE `settings` CHANGE `pv_online_api_url` `pv_library_api_url` VARCHAR(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL DEFAULT 'https://library.perfumersvault.com/api.php';
diff --git a/func/pvPost.php b/func/pvPost.php
diff --git a/inc/settings.php b/inc/settings.php
@@ -7,5 +7,5 @@
 
 
 $pubChemApi = 'https://pubchem.ncbi.nlm.nih.gov/rest';
-$pvOnlineAPI = $settings['pv_online_api_url'];
+$pvLibraryAPI = $settings['pv_library_api_url'];
 ?>
diff --git a/index.php b/index.php
@@ -285,7 +285,7 @@ function chkUpdate() {
       } elseif ($_GET['do'] == 'settings') {
           require_once(__ROOT__.'/pages/settings.php');
       } elseif ($_GET['do'] == 'marketplace') {
-          require_once(__ROOT__.'/pages/views/pvOnline/marketPlace.php');
+          require_once(__ROOT__.'/pages/views/pvLibrary/marketPlace.php');
       } elseif ($_GET['do'] == 'statistics') {
           require_once(__ROOT__.'/pages/statistics.php');
       } elseif ($_GET['do'] == 'IFRA') {
diff --git a/js/settings.tabs.js b/js/settings.tabs.js
@@ -37,8 +37,8 @@ $(document).ready(function() {
 		get_maintenance();
 	});
 		
-	$('#pvOnline_tab').on( 'click', function () {
-		get_pvonline();
+	$('#pvLibrary_tab').on( 'click', function () {
+		get_pvlibrary();
 	});
 	
 	$('#api_tab').on( 'click', function () {
diff --git a/modules/suppliers/pvLibrary.json b/modules/suppliers/pvLibrary.json
@@ -0,0 +1,8 @@
+{
+	"id":"pvLibrary",
+	"name":"PV Library",
+	"slug":"pvLibary",
+	"version":"1.0.1",
+	"fileName":"pvLibrary",
+	"icon":"fas fa-cloud"
+}
diff --git a/modules/suppliers/pvLibrary.php b/modules/suppliers/pvLibrary.php
@@ -4,7 +4,7 @@
 require_once(__ROOT__.'/inc/sec.php');
 require_once(__ROOT__.'/inc/opendb.php');
 require_once(__ROOT__.'/inc/settings.php');
-require_once(__ROOT__.'/func/pvOnline.php');
+require_once(__ROOT__.'/func/pvPost.php');
 
 
 $row = isset($_POST['start']) ? (int)$_POST['start'] : 0;
@@ -27,7 +27,7 @@
 ];
 
 // Make API request and decode the JSON response
-$output = json_decode(pvPost($pvOnlineAPI, $data));
+$output = json_decode(pvPost($pvLibraryAPI, $data));
 
 // Initialize response array
 $rx = [];
@@ -78,7 +78,7 @@
 
 // Prepare final response
 $response = [
-    'source' => 'PVOnline',
+    'source' => 'PVLibrary',
     'draw' => isset($_POST['draw']) ? (int) $_POST['draw'] : 0,
     'recordsTotal' => (int) ($output->ingredientsTotal ?? 0),
     'recordsFiltered' => (int) ($output->ingredientsFiltered ?? 0),
diff --git a/modules/suppliers/pvOnline.json b/modules/suppliers/pvOnline.json
diff --git a/pages/ingredients.php b/pages/ingredients.php
@@ -201,7 +201,7 @@
 	});
 	
 	list_ingredients();
-	var pvOnlineAPI = '<?php echo $pvOnlineAPI; ?>';
+	var pvLibraryAPI = '<?php echo $pvLibraryAPI; ?>';
 	$(function () {
 		$(".input-group-btn .dropdown-menu li a").click(function () {
 			var selText = $(this).html();
diff --git a/pages/listIngredients.php b/pages/listIngredients.php
@@ -320,7 +320,7 @@ function iProfile(data, type, row, meta){
 				return '<img src="/img/pv_molecule.png" class="img_ing_prof"/>';
 			}
 		}else{
-			return '<i class="pv_point_gen" rel="tip" title="Not available in PV Online">N/A</i>';
+			return '<i class="pv_point_gen" rel="tip" title="Not available in PV Library">N/A</i>';
 		}
 	};
 	
@@ -333,7 +333,7 @@ function iStock(data, type, row, meta){
 		if(meta.settings.json.source == 'local'){
 			return '<a class="popup-link" rel="tip" title="'+ingUnit+'" href="/pages/views/ingredients/ingSuppliers.php?id=' + row.id + '&standAlone=1">' + data + '</a>';
 		}else{
-			return '<i class="pv_point_gen" rel="tip" title="Not available in PV Online">N/A</i>';
+			return '<i class="pv_point_gen" rel="tip" title="Not available in PV Library">N/A</i>';
 		}
 	};
 	
@@ -400,7 +400,7 @@ function iDocs(data, type, row){
 	
 	
 	function actions(data, type, row, meta){
-		if(meta.settings.json.source == 'PVOnline'){
+		if(meta.settings.json.source == 'PVLibrary'){
 			data = '<div class="dropdown">' +
 				'<button type="button" class="btn" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-ellipsis-v"></i></button>' +
 					'<ul class="dropdown-menu dropdown-menu-right">' + 
@@ -474,7 +474,7 @@ function actions(data, type, row, meta){
 		
 		bootbox.dialog({
 		   title: "Confirm ingredient import",
-		   message : 'Import <strong>'+ ing.Name +'</strong>\'s data from PVOnline? <hr/><div class="alert alert-warning"><strong>Please note: data maybe incorrect and/or incomplete, you should validate them after import.</strong></div>',
+		   message : 'Import <strong>'+ ing.Name +'</strong>\'s data from PVLibrary? <hr/><div class="alert alert-warning"><strong>Please note: data maybe incorrect and/or incomplete, you should validate them after import.</strong></div>',
 		   buttons :{
 			   main: {
 				   label : "Import",
@@ -486,7 +486,7 @@ className : "btn-warning",
 						type: 'POST',
 						data: {
 							action: "import",
-							source: "PVOnline",
+							source: "PVLibrary",
 							kind: "ingredient",
 							ing_id: ing.ID,
 						},
diff --git a/pages/views/pvLibrary/marketPlace.php b/pages/views/pvLibrary/marketPlace.php
@@ -133,7 +133,7 @@ function extrasShow() {
 	
 	var tableMarket = $("#all-table-market").DataTable({
 		ajax: {
-			url: '<?=$pvOnlineAPI?>',
+			url: '<?=$pvLibraryAPI?>',
 		   	type: 'POST',
 		   	dataType: 'json',
 		   	timeout: 5000,
diff --git a/releasenotes.md b/releasenotes.md
@@ -1,10 +1,4 @@
-Whats New in v12.2
+Whats New in v12.3
 --------------------------
-- IMPORTANT: User has to be recreated after updating to this release
-- Added available API calls endpoint table
-- Forgot password wording update
-- User password is now using a stronger encryption algorithm
-- Fixed document upload for ingredients returning incorrect results
-- Update login method
-- Major re-write and improvements for the API
+- PV Online has been renamed to PV Library
 - This release may include more changes, for full details please refer to the CHANGELOG

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+UPDATE `settings` SET `pv_online_api_url` = 'https://library.perfumersvault.com/api-data/api.php' WHERE `settings`.`id` = 1;
	`2`	+ALTER TABLE `settings` CHANGE `pv_online_api_url` `pv_library_api_url` VARCHAR(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL DEFAULT 'https://library.perfumersvault.com/api.php';