From 76d12babd2a9d963c89466490d844944246f2834 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 25 Nov 2012 00:06:20 +0000 Subject: [PATCH] More HTML/EL code fixes, removed assertition as it was to strict (didn't work in points accounts) --- inc/functions.php | 3 --- inc/wrapper-functions.php | 2 +- .../de/html/admin/admin_add_surfbar_url.tpl | 8 ++++---- .../html/admin/admin_delete_user_subids_row.tpl | 2 +- .../admin_edit_config_network_type_form.tpl | 12 ++++++------ .../de/html/admin/admin_edit_forced_ads_row.tpl | 16 ++++++++-------- .../admin/admin_edit_forced_campaigns_row.tpl | 17 ++++++++++------- .../html/admin/admin_edit_forced_costs_row.tpl | 7 ++++--- .../html/admin/admin_edit_points_data_row.tpl | 10 +++++----- .../admin/admin_edit_surfbar_actions_row.tpl | 6 +++--- .../html/admin/admin_edit_surfbar_urls_row.tpl | 8 ++++---- .../html/admin/admin_edit_user_subids_row.tpl | 2 +- 12 files changed, 47 insertions(+), 46 deletions(-) diff --git a/inc/functions.php b/inc/functions.php index 5d255e12bf..ab8907f080 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -1344,9 +1344,6 @@ function handleExtraValues ($filterFunction, $value, $extraValue) { // Tries to determine if call-back functions and/or extra values shall be parsed function doHandleExtraValues ($filterFunctions, $extraValues, $key, $entries, $userIdColumn, $search, $id = NULL) { - // $search shall not be NULL - assert(!is_null($search)); - // Debug mode enabled? if (isDebugModeEnabled()) { // Debug message diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php index 2e500b1617..0d7c400d1d 100644 --- a/inc/wrapper-functions.php +++ b/inc/wrapper-functions.php @@ -2866,7 +2866,7 @@ function search_array ($array, $key, $value, $parentIndex = NULL) { // Search for whole array foreach ($array as $idx => $dummy) { //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',value=' . $value . ',idx=' . $idx . ',parentIndex[' . gettype($parentIndex) . ']=' . $parentIndex); - //* DEBUG: */ print 'idx=' . $idx . ',parentIndex[' . gettype($parentIndex) . ']=' . $parentIndex . ',key=' . $key . ',value=' . $value . ',array=
'.print_r($array, TRUE).'
'; + /* DEBUG: */ print 'idx=' . $idx . ',parentIndex[' . gettype($parentIndex) . ']=' . $parentIndex . ',key=' . $key . ',value=' . $value . ',array=
'.print_r($array, TRUE).'
'; // Is dummy an array? if ((is_array($dummy)) && ((is_null($parentIndex)) || ($parentIndex === $value))) { // Then search again diff --git a/templates/de/html/admin/admin_add_surfbar_url.tpl b/templates/de/html/admin/admin_add_surfbar_url.tpl index 7517ffd775..e6f4b9bc81 100644 --- a/templates/de/html/admin/admin_add_surfbar_url.tpl +++ b/templates/de/html/admin/admin_add_surfbar_url.tpl @@ -6,23 +6,23 @@
- {--ADMIN_ENTER_SURFBAR_URL--} +
- {--ADMIN_ENTER_SURFBAR_LIMIT--} +
{--ADMIN_ENTER_SURFBAR_LIMIT_NOTICE--}
- {--ADMIN_SELECT_SURFBAR_WAITING--} + $content[waiting]
- {--ADMIN_SELECT_SURFBAR_RELOAD--} + $content[reload]
diff --git a/templates/de/html/admin/admin_delete_user_subids_row.tpl b/templates/de/html/admin/admin_delete_user_subids_row.tpl index d9fa7ee6a6..98ef9ab8de 100644 --- a/templates/de/html/admin/admin_delete_user_subids_row.tpl +++ b/templates/de/html/admin/admin_delete_user_subids_row.tpl @@ -4,7 +4,7 @@ - {--SUBID_VALUE--} + $content[subid] diff --git a/templates/de/html/admin/admin_edit_config_network_type_form.tpl b/templates/de/html/admin/admin_edit_config_network_type_form.tpl index 35edd3f624..50dc745be7 100644 --- a/templates/de/html/admin/admin_edit_config_network_type_form.tpl +++ b/templates/de/html/admin/admin_edit_config_network_type_form.tpl @@ -11,32 +11,32 @@
- {--ADMIN_CONFIG_NETWORK_HANDLER_SET_ALL--} + {%template,NoYesSelectionBox=set_all%}
- {--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MAX_RELOAD_TIME--} ({--TIME_UNIT--}) + $content[network_max_reload_time] ({%pipe,translateTimeUnit=$content[network_type_reload_time_unit]%})
- {--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MIN_WAITING_TIME +
- {--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MIN_REMAIN_CLICKS +
- {--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MIN_PAYMENT +
- {--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_ALLOW_EROTIC +
diff --git a/templates/de/html/admin/admin_edit_forced_ads_row.tpl b/templates/de/html/admin/admin_edit_forced_ads_row.tpl index 9892c4a9b8..a5612df339 100644 --- a/templates/de/html/admin/admin_edit_forced_ads_row.tpl +++ b/templates/de/html/admin/admin_edit_forced_ads_row.tpl @@ -5,37 +5,37 @@ $content[forced_ads_added] - {--ADMIN_CHANGE_FORCED_ADS_AD_URL--} + - {--ADMIN_CHANGE_FORCED_ADS_ALTERNATE_TEXT--} + - {--ADMIN_CHANGE_FORCED_ADS_CLICK_URL--} + - {--ADMIN_CHANGE_FORCED_ADS_WIDTH--} + - {--ADMIN_CHANGE_FORCED_ADS_HEIGHT--} + - {--ADMIN_CHANGE_FORCED_ADS_USERID--} + $content[forced_ads_userid] - {--ADMIN_CHANGE_FORCED_ADS_TYPE--} + @@ -43,7 +43,7 @@ - {--ADMIN_CHANGE_FORCED_ADS_FRAMEBREAKER--} + diff --git a/templates/de/html/admin/admin_edit_forced_campaigns_row.tpl b/templates/de/html/admin/admin_edit_forced_campaigns_row.tpl index 386e198540..74c80f1ccc 100644 --- a/templates/de/html/admin/admin_edit_forced_campaigns_row.tpl +++ b/templates/de/html/admin/admin_edit_forced_campaigns_row.tpl @@ -5,38 +5,41 @@ $content[forced_campaign_created] - {--ADMIN_CHANGE_FORCED_CAMPAIGN_ORDERED_CLICKS--} + + - {--ADMIN_CHANGE_FORCED_CAMPAIGN_PAYMENT_API--} + - {--ADMIN_CHANGE_FORCED_CAMPAIGN_RELOAD_LOCK--} + $content[forced_campaign_reload_lock] + - {--ADMIN_CHANGE_FORCED_CAMPAIGN_MINIMUM_STAY--} + - {--ADMIN_CHANGE_FORCED_CAMPAIGN_ADS_ID--} + {%template,ForcedAdSelectionBox=$content[forced_ads_id]%} + - {--ADMIN_CHANGE_FORCED_CAMPAIGN_USERID--} + $content[forced_campaign_userid] - {--ADMIN_CHANGE_FORCED_CAMPAIGN_COSTS_ID--} + {%template,ForcedCostsSelectionBox=$content[forced_costs_id]%} diff --git a/templates/de/html/admin/admin_edit_forced_costs_row.tpl b/templates/de/html/admin/admin_edit_forced_costs_row.tpl index 43d37ab645..ea6925fed8 100644 --- a/templates/de/html/admin/admin_edit_forced_costs_row.tpl +++ b/templates/de/html/admin/admin_edit_forced_costs_row.tpl @@ -1,17 +1,18 @@ - {--ADMIN_CHANGE_FORCED_COSTS_PRICE_CLICK--} + ({?POINTS?}) - {--ADMIN_CHANGE_FORCED_COSTS_PAYMENT_CLICK--} + ({?POINTS?}) + - {--ADMIN_CHANGE_FORCED_COSTS_VISIBILITY--} + diff --git a/templates/de/html/admin/admin_edit_points_data_row.tpl b/templates/de/html/admin/admin_edit_points_data_row.tpl index 81da17b8a9..411e2db5da 100644 --- a/templates/de/html/admin/admin_edit_points_data_row.tpl +++ b/templates/de/html/admin/admin_edit_points_data_row.tpl @@ -5,20 +5,20 @@
({%pipe,translatePointsSubject=$content[subject]%})
- {--ADMIN_POINTS_ACCOUNT_COLUMN_NAME + {%pipe,translatePointsAccountType=$content[column_name]%} - {--ADMIN_CHANGE_POINTS_LOCKED_MODE + - {--ADMIN_CHANGE_POINTS_PAYMENT_METHOD + @@ -27,13 +27,13 @@ - {--ADMIN_CHANGE_POINTS_NOTIFY_RECIPIENT + - {--ADMIN_POINTS_ACCOUNT_PROVIDER + {%pipe,translatePointsAccountProvider=$content[account_provider]%} diff --git a/templates/de/html/admin/admin_edit_surfbar_actions_row.tpl b/templates/de/html/admin/admin_edit_surfbar_actions_row.tpl index c3b0490366..a08ee60916 100644 --- a/templates/de/html/admin/admin_edit_surfbar_actions_row.tpl +++ b/templates/de/html/admin/admin_edit_surfbar_actions_row.tpl @@ -5,18 +5,18 @@ $content[actions_id] - {--ADMIN_CHANGE_SURFBAR_ACTIONS_STATUS--} + {%template,SurfbarActionsStatusSelectionBox=$content[actions_id]%} - {--ADMIN_CHANGE_SURFBAR_ACTIONS_ACTION--} + {%template,SurfbarActionsActionSelectionBox=$content[actions_id]%} - {--ADMIN_CHANGE_SURFBAR_ACTIONS_NEW_STATUS--} + {%template,SurfbarActionsNewStatusSelectionBox=$content[actions_id]%} diff --git a/templates/de/html/admin/admin_edit_surfbar_urls_row.tpl b/templates/de/html/admin/admin_edit_surfbar_urls_row.tpl index d7f9c3b6c3..aa705846e7 100644 --- a/templates/de/html/admin/admin_edit_surfbar_urls_row.tpl +++ b/templates/de/html/admin/admin_edit_surfbar_urls_row.tpl @@ -1,23 +1,23 @@ - {--_USERID--} + $content[url_userid] - {--ADMIN_TEST_URL--} + - {--ADMIN_CHANGE_SURFBAR_FIXED_RELOAD--} + $content[url_fixed_reload] - {--ADMIN_CHANGE_SURFBAR_FIXED_RELOAD--} + $content[url_fixed_waiting] diff --git a/templates/de/html/admin/admin_edit_user_subids_row.tpl b/templates/de/html/admin/admin_edit_user_subids_row.tpl index 0c59f7088c..279a607709 100644 --- a/templates/de/html/admin/admin_edit_user_subids_row.tpl +++ b/templates/de/html/admin/admin_edit_user_subids_row.tpl @@ -4,7 +4,7 @@ - {--ADMIN_CHANGE_USER_SUBID--} + -- 2.39.5