diff --git a/src/controllers/components/AdvertisementComponent.php b/src/controllers/components/AdvertisementComponent.php index 1ce312347..ce5dcb9ed 100644 --- a/src/controllers/components/AdvertisementComponent.php +++ b/src/controllers/components/AdvertisementComponent.php @@ -119,8 +119,12 @@ class AdvertisementComponent extends Component tl('advertisement_component_invalid_credit_quantity'), []); } - $translate_holder = tl('advertisement_component_buy_credits'); - $translate_holder = tl('advertisement_component_init_ledger'); + /* string to translate stored in column of 32 chars + so not writing advertisement_component + */ + $strings_to_translate_for_model = [ + tl('advertisement_buy_credits'), + tl('advertisement_init_ledger')]; $token = $parent->clean($_REQUEST['CREDIT_TOKEN'], "string"); if (!($user_id == C\ROOT_ID && C\ALLOW_FREE_ROOT_CREDIT_PURCHASE)) { @@ -140,7 +144,7 @@ class AdvertisementComponent extends Component } $credit_model->updateCredits($user_id, $data['COST_AMOUNTS'][$num_dollars], - 'advertisement_component_buy_credits'); + 'advertisement_buy_credits'); return $parent->redirectWithMessage( tl('advertisement_component_credits_purchased'), []); @@ -275,12 +279,13 @@ class AdvertisementComponent extends Component array_merge(['arg'], $request_fields)); } $message = ""; - $translate_holder = tl('advertisement_component_buy_ad'); + $strings_to_translate_for_model = + [tl('advertisement_buy_ad')]; $advertisement_model->addAdvertisement($advertisement, $data["AD_KEYWORDS"], $data['AD_MIN_BID'], $user_id); $credit_model->updateCredits($user_id, -$data["BUDGET"], - 'advertisement_component_buy_ad'); + 'advertisement_buy_ad'); $preserve = []; if (!empty($_REQUEST['context'])) { $_REQUEST['arg'] = 'search'; @@ -476,4 +481,4 @@ class AdvertisementComponent extends Component { $value = trim($value); } -} \ No newline at end of file +} diff --git a/src/controllers/components/CrawlComponent.php b/src/controllers/components/CrawlComponent.php index 77d0f7a6c..9d9b8b83e 100644 --- a/src/controllers/components/CrawlComponent.php +++ b/src/controllers/components/CrawlComponent.php @@ -1886,7 +1886,6 @@ class CrawlComponent extends Component implements CrawlConstants tl('crawl_component_media_source_deleted'), $request_fields); break; - case "deletesubsearch": if (!isset($_REQUEST['fn'])) { return $parent->redirectWithMessage( diff --git a/src/controllers/components/SystemComponent.php b/src/controllers/components/SystemComponent.php index 2745107dd..84e9fecb5 100755 --- a/src/controllers/components/SystemComponent.php +++ b/src/controllers/components/SystemComponent.php @@ -561,19 +561,28 @@ class SystemComponent extends Component $business_id = $role_model->getRoleId('Business User'); $ad_id = $activity_model->getActivityIdFromMethodName( 'manageAdvertisements'); + $credit_id = $activity_model->getActivityIdFromMethodName( + 'manageCredits'); if (isset($data['ADVERTISEMENT_TYPE']) && in_array($data['ADVERTISEMENT_TYPE'], ['no_advertisements', 'external_advertisements'])) { if ($business_id) { $role_model->deleteActivityRole($business_id, $ad_id); + $role_model->deleteActivityRole($business_id, + $credit_id); } $role_model->deleteActivityRole(C\ADMIN_ROLE, $ad_id); + $role_model->deleteActivityRole(C\ADMIN_ROLE, + $credit_id); } else { if ($business_id) { $role_model->addActivityRole($business_id, $ad_id); + $role_model->addActivityRole($business_id, + $credit_id); } $role_model->addActivityRole(C\ADMIN_ROLE, $ad_id); + $role_model->addActivityRole(C\ADMIN_ROLE, $credit_id); } } $db_problem = false; diff --git a/src/library/indexing_plugins/RecipePlugin.php b/src/library/indexing_plugins/RecipePlugin.php index 21bbd64f1..38cb454c4 100644 --- a/src/library/indexing_plugins/RecipePlugin.php +++ b/src/library/indexing_plugins/RecipePlugin.php @@ -96,9 +96,11 @@ class RecipePlugin extends IndexingPlugin implements CrawlConstants $page = preg_replace('@<script[^>]*?>.*?</script>@si', ' ', $page); $page = preg_replace('/>/', '> ', $page); $dom = HtmlProcessor::dom($page); - if ($dom == null) return null; - + if ($dom == null) { + return null; + } $xpath = new \DOMXPath($dom); + //detect recipes $recipes_per_page = $xpath->evaluate( /*allr, f.com, brec, fnet*/ "/html//ul[@class = 'ingredient-wrap']| diff --git a/src/locale/ar/configure.ini b/src/locale/ar/configure.ini index 8e813b7e2..aadc4f3dc 100755 --- a/src/locale/ar/configure.ini +++ b/src/locale/ar/configure.ini @@ -104,8 +104,8 @@ advertisement_component_month = "" advertisement_component_year = "" advertisement_component_script_failure = "" advertisement_component_invalid_credit_quantity = "" -advertisement_component_buy_credits = "" -advertisement_component_init_ledger = "" +advertisement_buy_credits = "" +advertisement_init_ledger = "" advertisement_component_credit_token_empty = "" advertisement_component_processing_error = "" advertisement_component_credits_purchased = "" @@ -120,7 +120,7 @@ advertisement_component_duration_cannot_be_empty = "" advertisement_component_enter_keywords = "" advertisement_component_bid_too_low = "" advertisement_component_too_few_credits = "" -advertisement_component_buy_ad = "" +advertisement_buy_ad = "" advertisement_component_ad_created = "" advertisement_component_status_changed = "" advertisement_component_ad_updated = "" @@ -1238,8 +1238,8 @@ security_element_auth_captcha = "" security_element_authentication_type = "" security_element_zero_unavailable = "" security_element_captcha_type = "" -security_element_save = "" security_element_recovery_type = "" +security_element_save = "" security_element_captcha_recovery_questions = "" security_element_edit_recovery = "" security_element_edit_captcha = "" diff --git a/src/locale/bn/configure.ini b/src/locale/bn/configure.ini index 7eff5356a..28c21356f 100755 --- a/src/locale/bn/configure.ini +++ b/src/locale/bn/configure.ini @@ -104,8 +104,8 @@ advertisement_component_month = "" advertisement_component_year = "" advertisement_component_script_failure = "" advertisement_component_invalid_credit_quantity = "" -advertisement_component_buy_credits = "" -advertisement_component_init_ledger = "" +advertisement_buy_credits = "" +advertisement_init_ledger = "" advertisement_component_credit_token_empty = "" advertisement_component_processing_error = "" advertisement_component_credits_purchased = "" @@ -120,7 +120,7 @@ advertisement_component_duration_cannot_be_empty = "" advertisement_component_enter_keywords = "" advertisement_component_bid_too_low = "" advertisement_component_too_few_credits = "" -advertisement_component_buy_ad = "" +advertisement_buy_ad = "" advertisement_component_ad_created = "" advertisement_component_status_changed = "" advertisement_component_ad_updated = "" @@ -1238,8 +1238,8 @@ security_element_auth_captcha = "" security_element_authentication_type = "" security_element_zero_unavailable = "" security_element_captcha_type = "" -security_element_save = "" security_element_recovery_type = "" +security_element_save = "" security_element_captcha_recovery_questions = "" security_element_edit_recovery = "" security_element_edit_captcha = "" diff --git a/src/locale/de/configure.ini b/src/locale/de/configure.ini index cf6d06b20..3f3e0b7b6 100755 --- a/src/locale/de/configure.ini +++ b/src/locale/de/configure.ini @@ -104,8 +104,8 @@ advertisement_component_month = "" advertisement_component_year = "" advertisement_component_script_failure = "" advertisement_component_invalid_credit_quantity = "" -advertisement_component_buy_credits = "" -advertisement_component_init_ledger = "" +advertisement_buy_credits = "" +advertisement_init_ledger = "" advertisement_component_credit_token_empty = "" advertisement_component_processing_error = "" advertisement_component_credits_purchased = "" @@ -120,7 +120,7 @@ advertisement_component_duration_cannot_be_empty = "" advertisement_component_enter_keywords = "" advertisement_component_bid_too_low = "" advertisement_component_too_few_credits = "" -advertisement_component_buy_ad = "" +advertisement_buy_ad = "" advertisement_component_ad_created = "" advertisement_component_status_changed = "" advertisement_component_ad_updated = "" @@ -1238,8 +1238,8 @@ security_element_auth_captcha = "" security_element_authentication_type = "" security_element_zero_unavailable = "" security_element_captcha_type = "" -security_element_save = "" security_element_recovery_type = "" +security_element_save = "" security_element_captcha_recovery_questions = "" security_element_edit_recovery = "" security_element_edit_captcha = "" diff --git a/src/locale/en_US/configure.ini b/src/locale/en_US/configure.ini index 6996d15c2..3e138acb5 100644 --- a/src/locale/en_US/configure.ini +++ b/src/locale/en_US/configure.ini @@ -104,8 +104,8 @@ advertisement_component_month = "Month" advertisement_component_year = "Year" advertisement_component_script_failure = "No Working Credit Card Script Found!" advertisement_component_invalid_credit_quantity = "Invalid Credit Purchase Quantity" -advertisement_component_buy_credits = "Credit Purchase" -advertisement_component_init_ledger = "Starting Balance" +advertisement_buy_credits = "Buy Credits" +advertisement_init_ledger = "Starting Balance" advertisement_component_credit_token_empty = "Error: No Credit Token Received!" advertisement_component_processing_error = "Payment Processing Error %s" advertisement_component_credits_purchased = "Credit purchase complete!" @@ -120,7 +120,7 @@ advertisement_component_duration_cannot_be_empty = "Ad Duration Cannot Be Empty! advertisement_component_enter_keywords = "Please enter keywords" advertisement_component_bid_too_low = "Bid too low! Calculate and bid again!" advertisement_component_too_few_credits = "Insufficient ad credits! Please purchase more credits! " -advertisement_component_buy_ad = "Buy Ad" +advertisement_buy_ad = "Buy Ad" advertisement_component_ad_created = "Advertisement created" advertisement_component_status_changed = "Ad status changed!" advertisement_component_ad_updated = "Advertisement Updated" @@ -1238,8 +1238,8 @@ security_element_auth_captcha = "Authentication and Captcha Types" security_element_authentication_type = "Authentication Type" security_element_zero_unavailable = "BC Math nZero Knowledge Authentication Needs OpenSSL or BC Math!" security_element_captcha_type = "Captcha Type" -security_element_save = "Save" security_element_recovery_type = "Recovery Type" +security_element_save = "Save" security_element_captcha_recovery_questions = "Captcha and Recovery Questions" security_element_edit_recovery = "Edit Account Recovery Questions" security_element_edit_captcha = "Edit Text Captcha Questions" diff --git a/src/locale/es/configure.ini b/src/locale/es/configure.ini index d98df3774..05f6589c9 100755 --- a/src/locale/es/configure.ini +++ b/src/locale/es/configure.ini @@ -104,8 +104,8 @@ advertisement_component_month = "" advertisement_component_year = "" advertisement_component_script_failure = "" advertisement_component_invalid_credit_quantity = "" -advertisement_component_buy_credits = "" -advertisement_component_init_ledger = "" +advertisement_buy_credits = "" +advertisement_init_ledger = "" advertisement_component_credit_token_empty = "" advertisement_component_processing_error = "" advertisement_component_credits_purchased = "" @@ -120,7 +120,7 @@ advertisement_component_duration_cannot_be_empty = "" advertisement_component_enter_keywords = "" advertisement_component_bid_too_low = "" advertisement_component_too_few_credits = "" -advertisement_component_buy_ad = "" +advertisement_buy_ad = "" advertisement_component_ad_created = "" advertisement_component_status_changed = "" advertisement_component_ad_updated = "" @@ -1238,8 +1238,8 @@ security_element_auth_captcha = "" security_element_authentication_type = "" security_element_zero_unavailable = "" security_element_captcha_type = "" -security_element_save = "" security_element_recovery_type = "" +security_element_save = "" security_element_captcha_recovery_questions = "" security_element_edit_recovery = "" security_element_edit_captcha = "" diff --git a/src/locale/fa/configure.ini b/src/locale/fa/configure.ini index 529a2fb8c..6129749c6 100755 --- a/src/locale/fa/configure.ini +++ b/src/locale/fa/configure.ini @@ -104,8 +104,8 @@ advertisement_component_month = "" advertisement_component_year = "" advertisement_component_script_failure = "" advertisement_component_invalid_credit_quantity = "" -advertisement_component_buy_credits = "" -advertisement_component_init_ledger = "" +advertisement_buy_credits = "" +advertisement_init_ledger = "" advertisement_component_credit_token_empty = "" advertisement_component_processing_error = "" advertisement_component_credits_purchased = "" @@ -120,7 +120,7 @@ advertisement_component_duration_cannot_be_empty = "" advertisement_component_enter_keywords = "" advertisement_component_bid_too_low = "" advertisement_component_too_few_credits = "" -advertisement_component_buy_ad = "" +advertisement_buy_ad = "" advertisement_component_ad_created = "" advertisement_component_status_changed = "" advertisement_component_ad_updated = "" @@ -1238,8 +1238,8 @@ security_element_auth_captcha = "" security_element_authentication_type = "" security_element_zero_unavailable = "" security_element_captcha_type = "" -security_element_save = "" security_element_recovery_type = "" +security_element_save = "" security_element_captcha_recovery_questions = "" security_element_edit_recovery = "" security_element_edit_captcha = "" diff --git a/src/locale/fr_FR/configure.ini b/src/locale/fr_FR/configure.ini index f3efbd61b..f8bed7731 100755 --- a/src/locale/fr_FR/configure.ini +++ b/src/locale/fr_FR/configure.ini @@ -104,8 +104,8 @@ advertisement_component_month = "" advertisement_component_year = "" advertisement_component_script_failure = "" advertisement_component_invalid_credit_quantity = "" -advertisement_component_buy_credits = "" -advertisement_component_init_ledger = "" +advertisement_buy_credits = "" +advertisement_init_ledger = "" advertisement_component_credit_token_empty = "" advertisement_component_processing_error = "" advertisement_component_credits_purchased = "" @@ -120,7 +120,7 @@ advertisement_component_duration_cannot_be_empty = "" advertisement_component_enter_keywords = "" advertisement_component_bid_too_low = "" advertisement_component_too_few_credits = "" -advertisement_component_buy_ad = "" +advertisement_buy_ad = "" advertisement_component_ad_created = "" advertisement_component_status_changed = "" advertisement_component_ad_updated = "" @@ -1238,8 +1238,8 @@ security_element_auth_captcha = "" security_element_authentication_type = "" security_element_zero_unavailable = "" security_element_captcha_type = "" -security_element_save = "" security_element_recovery_type = "" +security_element_save = "" security_element_captcha_recovery_questions = "" security_element_edit_recovery = "" security_element_edit_captcha = "" diff --git a/src/locale/he/configure.ini b/src/locale/he/configure.ini index 892ec3311..d16b88e7d 100755 --- a/src/locale/he/configure.ini +++ b/src/locale/he/configure.ini @@ -104,8 +104,8 @@ advertisement_component_month = "" advertisement_component_year = "" advertisement_component_script_failure = "" advertisement_component_invalid_credit_quantity = "" -advertisement_component_buy_credits = "" -advertisement_component_init_ledger = "" +advertisement_buy_credits = "" +advertisement_init_ledger = "" advertisement_component_credit_token_empty = "" advertisement_component_processing_error = "" advertisement_component_credits_purchased = "" @@ -120,7 +120,7 @@ advertisement_component_duration_cannot_be_empty = "" advertisement_component_enter_keywords = "" advertisement_component_bid_too_low = "" advertisement_component_too_few_credits = "" -advertisement_component_buy_ad = "" +advertisement_buy_ad = "" advertisement_component_ad_created = "" advertisement_component_status_changed = "" advertisement_component_ad_updated = "" @@ -1238,8 +1238,8 @@ security_element_auth_captcha = "" security_element_authentication_type = "" security_element_zero_unavailable = "" security_element_captcha_type = "" -security_element_save = "" security_element_recovery_type = "" +security_element_save = "" security_element_captcha_recovery_questions = "" security_element_edit_recovery = "" security_element_edit_captcha = "" diff --git a/src/locale/hi/configure.ini b/src/locale/hi/configure.ini index 79a695c1b..cdf282562 100755 --- a/src/locale/hi/configure.ini +++ b/src/locale/hi/configure.ini @@ -104,8 +104,8 @@ advertisement_component_month = "" advertisement_component_year = "" advertisement_component_script_failure = "" advertisement_component_invalid_credit_quantity = "" -advertisement_component_buy_credits = "" -advertisement_component_init_ledger = "" +advertisement_buy_credits = "" +advertisement_init_ledger = "" advertisement_component_credit_token_empty = "" advertisement_component_processing_error = "" advertisement_component_credits_purchased = "" @@ -120,7 +120,7 @@ advertisement_component_duration_cannot_be_empty = "" advertisement_component_enter_keywords = "" advertisement_component_bid_too_low = "" advertisement_component_too_few_credits = "" -advertisement_component_buy_ad = "" +advertisement_buy_ad = "" advertisement_component_ad_created = "" advertisement_component_status_changed = "" advertisement_component_ad_updated = "" @@ -1238,8 +1238,8 @@ security_element_auth_captcha = "" security_element_authentication_type = "" security_element_zero_unavailable = "" security_element_captcha_type = "" -security_element_save = "" security_element_recovery_type = "" +security_element_save = "" security_element_captcha_recovery_questions = "" security_element_edit_recovery = "" security_element_edit_captcha = "" diff --git a/src/locale/in_ID/configure.ini b/src/locale/in_ID/configure.ini index ed733eaea..ebbf18d6b 100755 --- a/src/locale/in_ID/configure.ini +++ b/src/locale/in_ID/configure.ini @@ -104,8 +104,8 @@ advertisement_component_month = "" advertisement_component_year = "" advertisement_component_script_failure = "" advertisement_component_invalid_credit_quantity = "" -advertisement_component_buy_credits = "" -advertisement_component_init_ledger = "" +advertisement_buy_credits = "" +advertisement_init_ledger = "" advertisement_component_credit_token_empty = "" advertisement_component_processing_error = "" advertisement_component_credits_purchased = "" @@ -120,7 +120,7 @@ advertisement_component_duration_cannot_be_empty = "" advertisement_component_enter_keywords = "" advertisement_component_bid_too_low = "" advertisement_component_too_few_credits = "" -advertisement_component_buy_ad = "" +advertisement_buy_ad = "" advertisement_component_ad_created = "" advertisement_component_status_changed = "" advertisement_component_ad_updated = "" @@ -1238,8 +1238,8 @@ security_element_auth_captcha = "" security_element_authentication_type = "" security_element_zero_unavailable = "" security_element_captcha_type = "" -security_element_save = "" security_element_recovery_type = "" +security_element_save = "" security_element_captcha_recovery_questions = "" security_element_edit_recovery = "" security_element_edit_captcha = "" diff --git a/src/locale/it/configure.ini b/src/locale/it/configure.ini index 20dff2bdb..b21149156 100755 --- a/src/locale/it/configure.ini +++ b/src/locale/it/configure.ini @@ -104,8 +104,8 @@ advertisement_component_month = "" advertisement_component_year = "" advertisement_component_script_failure = "" advertisement_component_invalid_credit_quantity = "" -advertisement_component_buy_credits = "" -advertisement_component_init_ledger = "" +advertisement_buy_credits = "" +advertisement_init_ledger = "" advertisement_component_credit_token_empty = "" advertisement_component_processing_error = "" advertisement_component_credits_purchased = "" @@ -120,7 +120,7 @@ advertisement_component_duration_cannot_be_empty = "" advertisement_component_enter_keywords = "" advertisement_component_bid_too_low = "" advertisement_component_too_few_credits = "" -advertisement_component_buy_ad = "" +advertisement_buy_ad = "" advertisement_component_ad_created = "" advertisement_component_status_changed = "" advertisement_component_ad_updated = "" @@ -1238,8 +1238,8 @@ security_element_auth_captcha = "" security_element_authentication_type = "" security_element_zero_unavailable = "" security_element_captcha_type = "" -security_element_save = "" security_element_recovery_type = "" +security_element_save = "" security_element_captcha_recovery_questions = "" security_element_edit_recovery = "" security_element_edit_captcha = "" diff --git a/src/locale/ja/configure.ini b/src/locale/ja/configure.ini index 6cb42ec2f..b50c69ada 100755 --- a/src/locale/ja/configure.ini +++ b/src/locale/ja/configure.ini @@ -104,8 +104,8 @@ advertisement_component_month = "" advertisement_component_year = "" advertisement_component_script_failure = "" advertisement_component_invalid_credit_quantity = "" -advertisement_component_buy_credits = "" -advertisement_component_init_ledger = "" +advertisement_buy_credits = "" +advertisement_init_ledger = "" advertisement_component_credit_token_empty = "" advertisement_component_processing_error = "" advertisement_component_credits_purchased = "" @@ -120,7 +120,7 @@ advertisement_component_duration_cannot_be_empty = "" advertisement_component_enter_keywords = "" advertisement_component_bid_too_low = "" advertisement_component_too_few_credits = "" -advertisement_component_buy_ad = "" +advertisement_buy_ad = "" advertisement_component_ad_created = "" advertisement_component_status_changed = "" advertisement_component_ad_updated = "" @@ -1238,8 +1238,8 @@ security_element_auth_captcha = "" security_element_authentication_type = "" security_element_zero_unavailable = "" security_element_captcha_type = "" -security_element_save = "" security_element_recovery_type = "" +security_element_save = "" security_element_captcha_recovery_questions = "" security_element_edit_recovery = "" security_element_edit_captcha = "" diff --git a/src/locale/kn/configure.ini b/src/locale/kn/configure.ini index a98651d56..aace29e9b 100755 --- a/src/locale/kn/configure.ini +++ b/src/locale/kn/configure.ini @@ -104,8 +104,8 @@ advertisement_component_month = "" advertisement_component_year = "" advertisement_component_script_failure = "" advertisement_component_invalid_credit_quantity = "" -advertisement_component_buy_credits = "" -advertisement_component_init_ledger = "" +advertisement_buy_credits = "" +advertisement_init_ledger = "" advertisement_component_credit_token_empty = "" advertisement_component_processing_error = "" advertisement_component_credits_purchased = "" @@ -120,7 +120,7 @@ advertisement_component_duration_cannot_be_empty = "" advertisement_component_enter_keywords = "" advertisement_component_bid_too_low = "" advertisement_component_too_few_credits = "" -advertisement_component_buy_ad = "" +advertisement_buy_ad = "" advertisement_component_ad_created = "" advertisement_component_status_changed = "" advertisement_component_ad_updated = "" @@ -1238,8 +1238,8 @@ security_element_auth_captcha = "" security_element_authentication_type = "" security_element_zero_unavailable = "" security_element_captcha_type = "" -security_element_save = "" security_element_recovery_type = "" +security_element_save = "" security_element_captcha_recovery_questions = "" security_element_edit_recovery = "" security_element_edit_captcha = "" diff --git a/src/locale/ko/configure.ini b/src/locale/ko/configure.ini index 737794e3f..e0d0dfdb1 100755 --- a/src/locale/ko/configure.ini +++ b/src/locale/ko/configure.ini @@ -104,8 +104,8 @@ advertisement_component_month = "" advertisement_component_year = "" advertisement_component_script_failure = "" advertisement_component_invalid_credit_quantity = "" -advertisement_component_buy_credits = "" -advertisement_component_init_ledger = "" +advertisement_buy_credits = "" +advertisement_init_ledger = "" advertisement_component_credit_token_empty = "" advertisement_component_processing_error = "" advertisement_component_credits_purchased = "" @@ -120,7 +120,7 @@ advertisement_component_duration_cannot_be_empty = "" advertisement_component_enter_keywords = "" advertisement_component_bid_too_low = "" advertisement_component_too_few_credits = "" -advertisement_component_buy_ad = "" +advertisement_buy_ad = "" advertisement_component_ad_created = "" advertisement_component_status_changed = "" advertisement_component_ad_updated = "" @@ -1238,8 +1238,8 @@ security_element_auth_captcha = "" security_element_authentication_type = "" security_element_zero_unavailable = "" security_element_captcha_type = "" -security_element_save = "" security_element_recovery_type = "" +security_element_save = "" security_element_captcha_recovery_questions = "" security_element_edit_recovery = "" security_element_edit_captcha = "" diff --git a/src/locale/nl/configure.ini b/src/locale/nl/configure.ini index 2f0877343..4e1fbd348 100644 --- a/src/locale/nl/configure.ini +++ b/src/locale/nl/configure.ini @@ -104,8 +104,8 @@ advertisement_component_month = "" advertisement_component_year = "" advertisement_component_script_failure = "" advertisement_component_invalid_credit_quantity = "" -advertisement_component_buy_credits = "" -advertisement_component_init_ledger = "" +advertisement_buy_credits = "" +advertisement_init_ledger = "" advertisement_component_credit_token_empty = "" advertisement_component_processing_error = "" advertisement_component_credits_purchased = "" @@ -120,7 +120,7 @@ advertisement_component_duration_cannot_be_empty = "" advertisement_component_enter_keywords = "" advertisement_component_bid_too_low = "" advertisement_component_too_few_credits = "" -advertisement_component_buy_ad = "" +advertisement_buy_ad = "" advertisement_component_ad_created = "" advertisement_component_status_changed = "" advertisement_component_ad_updated = "" @@ -1238,8 +1238,8 @@ security_element_auth_captcha = "Authenticatie en Captcha Soorten" security_element_authentication_type = "Verificatietype" security_element_zero_unavailable = "BC Math Nnul Kennis Authentication Needs OpenSSL of BC Math!" security_element_captcha_type = "captcha Type" -security_element_save = "Opslaan" security_element_recovery_type = "" +security_element_save = "Opslaan" security_element_captcha_recovery_questions = "Captcha and Recovery Vragen" security_element_edit_recovery = "Wijzig Account Recovery Vragen" security_element_edit_captcha = "Tekst bewerken Captcha Vragen" diff --git a/src/locale/pl/configure.ini b/src/locale/pl/configure.ini index 3482d6c0e..e04a4b0b6 100755 --- a/src/locale/pl/configure.ini +++ b/src/locale/pl/configure.ini @@ -104,8 +104,8 @@ advertisement_component_month = "" advertisement_component_year = "" advertisement_component_script_failure = "" advertisement_component_invalid_credit_quantity = "" -advertisement_component_buy_credits = "" -advertisement_component_init_ledger = "" +advertisement_buy_credits = "" +advertisement_init_ledger = "" advertisement_component_credit_token_empty = "" advertisement_component_processing_error = "" advertisement_component_credits_purchased = "" @@ -120,7 +120,7 @@ advertisement_component_duration_cannot_be_empty = "" advertisement_component_enter_keywords = "" advertisement_component_bid_too_low = "" advertisement_component_too_few_credits = "" -advertisement_component_buy_ad = "" +advertisement_buy_ad = "" advertisement_component_ad_created = "" advertisement_component_status_changed = "" advertisement_component_ad_updated = "" @@ -1238,8 +1238,8 @@ security_element_auth_captcha = "" security_element_authentication_type = "" security_element_zero_unavailable = "" security_element_captcha_type = "" -security_element_save = "" security_element_recovery_type = "" +security_element_save = "" security_element_captcha_recovery_questions = "" security_element_edit_recovery = "" security_element_edit_captcha = "" diff --git a/src/locale/pt/configure.ini b/src/locale/pt/configure.ini index 8e5a99fa8..e65cd614a 100755 --- a/src/locale/pt/configure.ini +++ b/src/locale/pt/configure.ini @@ -104,8 +104,8 @@ advertisement_component_month = "" advertisement_component_year = "" advertisement_component_script_failure = "" advertisement_component_invalid_credit_quantity = "" -advertisement_component_buy_credits = "" -advertisement_component_init_ledger = "" +advertisement_buy_credits = "" +advertisement_init_ledger = "" advertisement_component_credit_token_empty = "" advertisement_component_processing_error = "" advertisement_component_credits_purchased = "" @@ -120,7 +120,7 @@ advertisement_component_duration_cannot_be_empty = "" advertisement_component_enter_keywords = "" advertisement_component_bid_too_low = "" advertisement_component_too_few_credits = "" -advertisement_component_buy_ad = "" +advertisement_buy_ad = "" advertisement_component_ad_created = "" advertisement_component_status_changed = "" advertisement_component_ad_updated = "" @@ -1238,8 +1238,8 @@ security_element_auth_captcha = "" security_element_authentication_type = "" security_element_zero_unavailable = "" security_element_captcha_type = "" -security_element_save = "" security_element_recovery_type = "" +security_element_save = "" security_element_captcha_recovery_questions = "" security_element_edit_recovery = "" security_element_edit_captcha = "" diff --git a/src/locale/ru/configure.ini b/src/locale/ru/configure.ini index cf90f6d75..86ec54aa1 100755 --- a/src/locale/ru/configure.ini +++ b/src/locale/ru/configure.ini @@ -104,8 +104,8 @@ advertisement_component_month = "" advertisement_component_year = "" advertisement_component_script_failure = "" advertisement_component_invalid_credit_quantity = "" -advertisement_component_buy_credits = "" -advertisement_component_init_ledger = "" +advertisement_buy_credits = "" +advertisement_init_ledger = "" advertisement_component_credit_token_empty = "" advertisement_component_processing_error = "" advertisement_component_credits_purchased = "" @@ -120,7 +120,7 @@ advertisement_component_duration_cannot_be_empty = "" advertisement_component_enter_keywords = "" advertisement_component_bid_too_low = "" advertisement_component_too_few_credits = "" -advertisement_component_buy_ad = "" +advertisement_buy_ad = "" advertisement_component_ad_created = "" advertisement_component_status_changed = "" advertisement_component_ad_updated = "" @@ -1238,8 +1238,8 @@ security_element_auth_captcha = "" security_element_authentication_type = "" security_element_zero_unavailable = "" security_element_captcha_type = "" -security_element_save = "" security_element_recovery_type = "" +security_element_save = "" security_element_captcha_recovery_questions = "" security_element_edit_recovery = "" security_element_edit_captcha = "" diff --git a/src/locale/te/configure.ini b/src/locale/te/configure.ini index 7f36b6d8a..a6ec061cb 100644 --- a/src/locale/te/configure.ini +++ b/src/locale/te/configure.ini @@ -104,8 +104,8 @@ advertisement_component_month = "" advertisement_component_year = "" advertisement_component_script_failure = "" advertisement_component_invalid_credit_quantity = "" -advertisement_component_buy_credits = "" -advertisement_component_init_ledger = "" +advertisement_buy_credits = "" +advertisement_init_ledger = "" advertisement_component_credit_token_empty = "" advertisement_component_processing_error = "" advertisement_component_credits_purchased = "" @@ -120,7 +120,7 @@ advertisement_component_duration_cannot_be_empty = "" advertisement_component_enter_keywords = "" advertisement_component_bid_too_low = "" advertisement_component_too_few_credits = "" -advertisement_component_buy_ad = "" +advertisement_buy_ad = "" advertisement_component_ad_created = "" advertisement_component_status_changed = "" advertisement_component_ad_updated = "" @@ -1238,8 +1238,8 @@ security_element_auth_captcha = "" security_element_authentication_type = "" security_element_zero_unavailable = "" security_element_captcha_type = "" -security_element_save = "సేవ్ చేయి" security_element_recovery_type = "" +security_element_save = "సేవ్ చేయి" security_element_captcha_recovery_questions = "" security_element_edit_recovery = "" security_element_edit_captcha = "" diff --git a/src/locale/th/configure.ini b/src/locale/th/configure.ini index add52ca2f..8b0908a9a 100755 --- a/src/locale/th/configure.ini +++ b/src/locale/th/configure.ini @@ -104,8 +104,8 @@ advertisement_component_month = "" advertisement_component_year = "" advertisement_component_script_failure = "" advertisement_component_invalid_credit_quantity = "" -advertisement_component_buy_credits = "" -advertisement_component_init_ledger = "" +advertisement_buy_credits = "" +advertisement_init_ledger = "" advertisement_component_credit_token_empty = "" advertisement_component_processing_error = "" advertisement_component_credits_purchased = "" @@ -120,7 +120,7 @@ advertisement_component_duration_cannot_be_empty = "" advertisement_component_enter_keywords = "" advertisement_component_bid_too_low = "" advertisement_component_too_few_credits = "" -advertisement_component_buy_ad = "" +advertisement_buy_ad = "" advertisement_component_ad_created = "" advertisement_component_status_changed = "" advertisement_component_ad_updated = "" @@ -1238,8 +1238,8 @@ security_element_auth_captcha = "" security_element_authentication_type = "" security_element_zero_unavailable = "" security_element_captcha_type = "" -security_element_save = "" security_element_recovery_type = "" +security_element_save = "" security_element_captcha_recovery_questions = "" security_element_edit_recovery = "" security_element_edit_captcha = "" diff --git a/src/locale/tr/configure.ini b/src/locale/tr/configure.ini index d74067cca..73bcf790a 100755 --- a/src/locale/tr/configure.ini +++ b/src/locale/tr/configure.ini @@ -104,8 +104,8 @@ advertisement_component_month = "" advertisement_component_year = "" advertisement_component_script_failure = "" advertisement_component_invalid_credit_quantity = "" -advertisement_component_buy_credits = "" -advertisement_component_init_ledger = "" +advertisement_buy_credits = "" +advertisement_init_ledger = "" advertisement_component_credit_token_empty = "" advertisement_component_processing_error = "" advertisement_component_credits_purchased = "" @@ -120,7 +120,7 @@ advertisement_component_duration_cannot_be_empty = "" advertisement_component_enter_keywords = "" advertisement_component_bid_too_low = "" advertisement_component_too_few_credits = "" -advertisement_component_buy_ad = "" +advertisement_buy_ad = "" advertisement_component_ad_created = "" advertisement_component_status_changed = "" advertisement_component_ad_updated = "" @@ -1238,8 +1238,8 @@ security_element_auth_captcha = "" security_element_authentication_type = "" security_element_zero_unavailable = "" security_element_captcha_type = "" -security_element_save = "" security_element_recovery_type = "" +security_element_save = "" security_element_captcha_recovery_questions = "" security_element_edit_recovery = "" security_element_edit_captcha = "" diff --git a/src/locale/vi_VN/configure.ini b/src/locale/vi_VN/configure.ini index 0cd1d60b5..51cf0164f 100755 --- a/src/locale/vi_VN/configure.ini +++ b/src/locale/vi_VN/configure.ini @@ -104,8 +104,8 @@ advertisement_component_month = "" advertisement_component_year = "" advertisement_component_script_failure = "" advertisement_component_invalid_credit_quantity = "" -advertisement_component_buy_credits = "" -advertisement_component_init_ledger = "" +advertisement_buy_credits = "" +advertisement_init_ledger = "" advertisement_component_credit_token_empty = "" advertisement_component_processing_error = "" advertisement_component_credits_purchased = "" @@ -120,7 +120,7 @@ advertisement_component_duration_cannot_be_empty = "" advertisement_component_enter_keywords = "" advertisement_component_bid_too_low = "" advertisement_component_too_few_credits = "" -advertisement_component_buy_ad = "" +advertisement_buy_ad = "" advertisement_component_ad_created = "" advertisement_component_status_changed = "" advertisement_component_ad_updated = "" @@ -1238,8 +1238,8 @@ security_element_auth_captcha = "" security_element_authentication_type = "" security_element_zero_unavailable = "" security_element_captcha_type = "" -security_element_save = "" security_element_recovery_type = "" +security_element_save = "" security_element_captcha_recovery_questions = "" security_element_edit_recovery = "" security_element_edit_captcha = "" diff --git a/src/locale/zh_CN/configure.ini b/src/locale/zh_CN/configure.ini index fec14539c..7efc4e6d5 100755 --- a/src/locale/zh_CN/configure.ini +++ b/src/locale/zh_CN/configure.ini @@ -104,8 +104,8 @@ advertisement_component_month = "" advertisement_component_year = "" advertisement_component_script_failure = "" advertisement_component_invalid_credit_quantity = "" -advertisement_component_buy_credits = "" -advertisement_component_init_ledger = "" +advertisement_buy_credits = "" +advertisement_init_ledger = "" advertisement_component_credit_token_empty = "" advertisement_component_processing_error = "" advertisement_component_credits_purchased = "" @@ -120,7 +120,7 @@ advertisement_component_duration_cannot_be_empty = "" advertisement_component_enter_keywords = "" advertisement_component_bid_too_low = "" advertisement_component_too_few_credits = "" -advertisement_component_buy_ad = "" +advertisement_buy_ad = "" advertisement_component_ad_created = "" advertisement_component_status_changed = "" advertisement_component_ad_updated = "" @@ -1238,8 +1238,8 @@ security_element_auth_captcha = "" security_element_authentication_type = "" security_element_zero_unavailable = "" security_element_captcha_type = "" -security_element_save = "" security_element_recovery_type = "" +security_element_save = "" security_element_captcha_recovery_questions = "" security_element_edit_recovery = "" security_element_edit_captcha = "" diff --git a/src/models/AdvertisementModel.php b/src/models/AdvertisementModel.php index 6ab0807ac..81690d0b1 100644 --- a/src/models/AdvertisementModel.php +++ b/src/models/AdvertisementModel.php @@ -214,7 +214,8 @@ class AdvertisementModel extends Model SELECT B.KEYWORD AS KEYWORD, SUM(B.BID_AMOUNT) AS TOTAL_AMOUNT FROM ADVERTISEMENT A, ACCEPTED_AD_BIDS B WHERE A.ID = B.AD_ID AND B.KEYWORD = ? AND BID_DATE = ? - AND A.STATUS=".C\ADVERTISEMENT_ACTIVE_STATUS; + AND A.STATUS=" . C\ADVERTISEMENT_ACTIVE_STATUS . " + GROUP BY B.KEYWORD"; $result = $db->execute($total_sql, [$query, $today_date]); $total_row = false; if ($result) { @@ -368,4 +369,4 @@ class AdvertisementModel extends Model $result = $this->db->execute($sql, [$ad_id, mb_strtoupper( $keyword), $bid_amount, $bid_date]); } -} \ No newline at end of file +} diff --git a/src/models/CreditModel.php b/src/models/CreditModel.php index 41e7a4056..eec2e5c0c 100644 --- a/src/models/CreditModel.php +++ b/src/models/CreditModel.php @@ -94,7 +94,7 @@ class CreditModel extends Model } else { $time = time(); $init_sql = "INSERT INTO CREDIT_LEDGER VALUES (?, 0, - 'advertisement_model_init_ledger', 0, $time)"; + 'advertisement_init_ledger', 0, $time)"; $db->execute($init_sql, [$user_id]); } return 0; @@ -117,4 +117,4 @@ class CreditModel extends Model $db->execute($ledger_sql, [$user_id, $amount, $type, $balance + $amount, $time]); } -} \ No newline at end of file +}