X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fnetwork_functions.php;h=3e03193f13607976c293c4b38bf4e23d089a1fd5;hp=c59214f677583a9bf3b5a02640f900b2f1707841;hb=5150d830f669eaf05b1c57354dafe124ae35c8b5;hpb=1bacd30abeb24cbdff3f2f220c047444cf034f7c

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index c59214f677..3e03193f13 100644
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -226,7 +226,7 @@ function isNetworkArrayTranslationValid ($key, $networkTypeId, $networkId) {
 }
 
 // "Getter" for a network's data by provided id number
-function getNetworkDataById ($networkId, $column = '') {
+function getNetworkDataFromId ($networkId, $column = '') {
 	// Ids lower one are not accepted
 	if (!isValidId($networkId)) {
 		// Not good, should be fixed
@@ -395,7 +395,7 @@ LIMIT 1',
 }
 
 // "Getter" for all network type data by provided id number
-function getNetworkTypeDataById ($networkId) {
+function getNetworkTypeDataFromId ($networkId) {
 	// Ids lower one are not accepted
 	if (!isValidId($networkId)) {
 		// Not good, should be fixed
@@ -441,7 +441,7 @@ ORDER BY
 }
 
 // "Getter" for a network request parameter data by provided id number
-function getNetworkRequestParamsDataById ($networkRequestId) {
+function getNetworkRequestParamsDataFromId ($networkRequestId) {
 	// Ids lower one are not accepted
 	if (!isValidId($networkRequestId)) {
 		// Not good, should be fixed
@@ -480,7 +480,7 @@ LIMIT 1',
 }
 
 // "Getter" for a network array translation data by provided id number
-function getNetworkArrayTranslationsDataById ($networkTranslationId) {
+function getNetworkArrayTranslationsDataFromId ($networkTranslationId) {
 	// Ids lower one are not accepted
 	if (!isValidId($networkTranslationId)) {
 		// Not good, should be fixed
@@ -875,9 +875,9 @@ function generateNetworkTypesAvailableOptions ($defaultType = NULL) {
 				'skyscraper',
 				'skyscraper_click',
 				'skyscraper_view',
-				'halfbanner',
-				'halfbanner_click',
-				'halfbanner_view',
+				'half_banner',
+				'half_banner_click',
+				'half_banner_view',
 				'layer',
 				'layer_click',
 				'layer_view',
@@ -1293,7 +1293,7 @@ function countNetworkApiRequest ($networkData) {
  */
 function generateMetworkReferralLinkById ($networkId) {
 	// Simple output (no need for template!)
-	$output = '<a href="{%network,getNetworkDataById,network_reflink=' . $networkId . '%}" target="_blank" title="{%network,getNetworkDataById,network_title=' . $networkId . '%}">{%network,getNetworkDataById,network_title=' . $networkId . '%}</a>';
+	$output = '<a href="{%network,getNetworkDataFromId,network_reflink=' . $networkId . '%}" target="_blank" title="{%network,getNetworkDataFromId,network_title=' . $networkId . '%}">{%network,getNetworkDataFromId,network_title=' . $networkId . '%}</a>';
 
 	// Return it
 	return $output;
@@ -1827,7 +1827,7 @@ function doAdminNetworkProcessAddNetwork () {
 	SQL_QUERY(getInsertSqlFromArray(postRequestArray(), 'network_data'), __FUNCTION__, __LINE__);
 
 	// Add the id for output only
-	setPostRequestElement('network_id', SQL_INSERTID());
+	setPostRequestElement('network_id', SQL_INSERT_ID());
 
 	// Output message
 	if (!SQL_HASZEROAFFECTED()) {
@@ -1849,7 +1849,7 @@ function doAdminNetworkProcessHandleNetworks () {
 			// Is this selected?
 			if ($sel == 1) {
 				// Load this network's data
-				$networkData = getNetworkDataById($networkId);
+				$networkData = getNetworkDataFromId($networkId);
 
 				// Is there found the network?
 				if (count($networkData) > 0) {
@@ -1883,7 +1883,7 @@ function doAdminNetworkProcessHandleNetworkTypes () {
 	// Is there selections?
 	if (ifPostContainsSelections()) {
 		// Load network data
-		$networkData = getNetworkDataById(getRequestElement('network_id'));
+		$networkData = getNetworkDataFromId(getRequestElement('network_id'));
 
 		// Something has been selected, so start displaying one by one
 		$OUT = '';
@@ -1944,7 +1944,7 @@ function doAdminNetworkProcessHandleRequestParams () {
 		$GLOBALS['network_request_params_disabled'] = array();
 
 		// Load network data
-		$networkData = getNetworkDataById(getRequestElement('network_id'));
+		$networkData = getNetworkDataFromId(getRequestElement('network_id'));
 
 		// Something has been selected, so start displaying one by one
 		$OUT = '';
@@ -1952,7 +1952,7 @@ function doAdminNetworkProcessHandleRequestParams () {
 			// Is this selected?
 			if ($sel == 1) {
 				// Load this network's data
-				$networkRequestData = getNetworkRequestParamsDataById($networkId);
+				$networkRequestData = getNetworkRequestParamsDataFromId($networkId);
 
 				// Is there found the network?
 				if (count($networkRequestData) > 0) {
@@ -2431,7 +2431,7 @@ function doAdminNetworkProcessHandleArrayTranslations () {
 		$GLOBALS['network_array_translation_disabled'] = array();
 
 		// Load network data
-		$networkData = getNetworkDataById(getRequestElement('network_id'));
+		$networkData = getNetworkDataFromId(getRequestElement('network_id'));
 
 		// Something has been selected, so start displaying one by one
 		$OUT = '';
@@ -2439,7 +2439,7 @@ function doAdminNetworkProcessHandleArrayTranslations () {
 			// Is this selected?
 			if ($sel == 1) {
 				// Load this network's data
-				$networkTranslationsData = getNetworkArrayTranslationsDataById($networkId);
+				$networkTranslationsData = getNetworkArrayTranslationsDataFromId($networkId);
 
 				// Is there found the network?
 				if (count($networkTranslationsData) > 0) {
@@ -3111,7 +3111,7 @@ function doAjaxAdminNetworkListById () {
 	}
 
 	// Load all network type handlers by given network id and extract only network_type_id
-	$networkTypes = getArrayFromArrayIndex(getNetworkTypeDataById(postRequestElement('network_id')), 'network_type_id');
+	$networkTypes = getArrayFromArrayIndex(getNetworkTypeDataFromId(postRequestElement('network_id')), 'network_type_id');
 
 	// Set generated array
 	setAjaxReplyContent(encodeJson($networkTypes));