X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fextensions-functions.php;h=acd01be780c418c1a35bcf3d581f8a5c5d84a0e5;hb=b0ed0547ba277e815ca38b3333b191149a88019c;hp=184df7cd0241086ba31ec8380413012b2a4f8f61;hpb=771a678b35cf29540fccf550adc5d3b63feefc7e;p=mailer.git

diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php
index 184df7cd02..acd01be780 100644
--- a/inc/extensions-functions.php
+++ b/inc/extensions-functions.php
@@ -1042,7 +1042,8 @@ function createNewExtensionTask ($ext_name) {
 	$taskId = determineTaskIdBySubject($subject);
 
 	// Not installed and do we have created a task for the admin?
-	if (($taskId == '0') && (!isExtensionInstalled($ext_name))) {
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',taskId[' . gettype($taskId) . ']=' . $taskId);
+	if (((is_null($taskId)) || ($taskId == '0')) && (!isExtensionInstalled($ext_name))) {
 		// Set default message if ext-foo is missing
 		$message = '{%message,ADMIN_EXTENSION_TEXT_FILE_MISSING=' . $ext_name . '%}';
 
@@ -1079,7 +1080,8 @@ function createExtensionDeactivationTask ($ext_name) {
 	$taskId = determineTaskIdBySubject($subject);
 
 	// Not installed and do we have created a task for the admin?
-	if (($taskId == '0') && (isExtensionInstalled($ext_name))) {
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',taskId[' . gettype($taskId) . ']=' . $taskId);
+	if (((is_null($taskId)) || ($taskId == '0')) && (isExtensionInstalled($ext_name))) {
 		// Task not created so add it
 		$taskId = createNewTask($subject, SQL_ESCAPE(loadTemplate('task_EXTENSION_deactivated', true, $ext_name)), 'EXTENSION_DEACTIVATION');
 	} // END - if
@@ -1571,7 +1573,7 @@ function addExtensionSql ($sql) {
 	} // END - if
 
 	// Add it
-	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . getCurrentExtensionName() . ',ext_version=' . getCurrentExtensionVersion() . ',sql=' . $sql);
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . getCurrentExtensionName() . ',ext_version=' . getCurrentExtensionVersion() . ',sql=' . $sql);
 	array_push($GLOBALS['ext_sqls'][getCurrentExtensionName()][getCurrentExtensionVersion()], $sql);
 }
 
@@ -2033,6 +2035,62 @@ function addConfigChangeSql ($oldColumnName, $newColumnName, $columnSql) {
 	addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_config` CHANGE `' . $oldColumnName . '` `' . $newColumnName . '` ' . $columnSql);
 }
 
+/**
+ * Checks if given subject is found and if not, adds an SQL query to the
+ * extension registration queue.
+ */
+function registerExtensionPointsData ($subject, $columnName, $lockedMode, $paymentMethod) {
+	// Default is old extension version
+	$add = '';
+
+	// Is the extension equal or newer 0.8.9?
+	if (((isInstallationPhase()) && ((getExtensionMode() == 'register') || (getExtensionMode() == 'update'))) || (isExtensionInstalledAndNewer('sql_patches', '0.8.9'))) {
+		// Then add provider
+		$add = " AND `account_provider`='EXTENSION'";
+	} // END - if
+
+	// Is the 'subject' there?
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ifSqlTableExists(points_data)=' . ifSqlTableExists('points_data') . ',getExtensionMode()=' . getExtensionMode() . ',add=' . $add);
+	if (((!ifSqlTableExists('points_data')) && ((getExtensionMode() == 'register') || (getExtensionMode() == 'update'))) || (countSumTotalData($subject, 'points_data', 'id', 'subject', true, $add) == 0)) {
+		// Not found so:
+		if ((isset($GLOBALS['previous_extension'][getCurrentExtensionName()])) && (!ifSqlTableExists('points_data'))) {
+			$dummy = $GLOBALS['previous_extension'][getCurrentExtensionName()];
+			reportBug(__FUNCTION__, __LINE__, 'previous_extension[' . gettype($dummy) . ']=' . $dummy . ',getCurrentExtensionName()=' . getCurrentExtensionName() . ' - Under development, please report this!');
+		} // END - if
+
+		// ... add an SQL query
+		addExtensionSql(sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_points_data` (`subject`,`column_name`,`locked_mode`,`payment_method`) VALUES ('%s','%s','%s','%s')",
+			$subject,
+			$columnName,
+			$lockedMode,
+			$paymentMethod
+		));
+	} // END - if
+}
+
+/**
+ * Checks if given subject is found and if so, adds an SQL query to the
+ * extension unregistration queue.
+ */
+function unregisterExtensionPointsData ($subject) {
+	// Default is old extension version
+	$add = '';
+
+	// Is the extension equal or newer 0.8.9?
+	if (isExtensionInstalledAndNewer('sql_patches', '0.8.9')) {
+		// Then add provider
+		$add = " AND `account_provider`='EXTENSION'";
+	} // END - if
+
+	// Is the 'subject' there?
+	if (countSumTotalData($subject, 'points_data', 'id', 'subject', true, $add) == 1) {
+		// Found one or more, so add an SQL query
+		addExtensionSql(sprintf("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_points_data` WHERE `subject`='%s'" . $add . " LIMIT 1",
+			$subject
+		));
+	} // END - if
+}
+
 // Enables/disables productive mode for current extension (used only while
 // registration).
 // @TODO This should be rewrittten to allow, more development states, e.g. 'planing','alpha','beta','beta2','stable'