Changeset 1856680

Timestamp:

04/11/2018 07:16:30 PM (8 years ago)

Author:

jensmueller

Message:

version 3.1.0

Location:

easy-amazon-product-information/trunk

Files:

• eapi_amazon.php (modified) (3 diffs)
• eapi_handler.php (modified) (37 diffs)
• easy_amazon_product_information.css (modified) (1 diff)
• easy_amazon_product_information.php (modified) (1 diff)
• easy_amazon_product_information_admin.css (modified) (1 diff)
• images/eapi_logos.png (modified) (previous)
• languages/easy-amazon-product-information-de_DE.mo (modified) (previous)
• languages/easy-amazon-product-information-de_DE.po (modified) (5 diffs)
• readme.txt (modified) (4 diffs)

easy-amazon-product-information/trunk/eapi_amazon.php

@@ -95 +95 @@
                 $feature_arr = array();
                 foreach($xmlItem->ItemAttributes->Feature as $feature){
-                    array_push($feature_arr , (string)$feature);
-                }   
+                    array_push($feature_arr , htmlspecialchars(preg_replace('/✔/', '', (string)$feature)));
+                }
                 $arr['features'] = json_encode($feature_arr, JSON_UNESCAPED_UNICODE);
+            }
+            if(isset($xmlItem->ItemAttributes->EAN)){
+                $arr['ean'] = (String)$xmlItem->ItemAttributes->EAN;
+            }else if(isset($xmlItem->ItemAttributes->MPN)){
+                $arr['ean'] = (String)$xmlItem->ItemAttributes->MPN;
             }
             if(isset($xmlItem->ASIN)){
@@ -138 +143 @@
             'num_reviews' => '', 'rating' => ''
             ));
+            $arr['has_reviews'] = $has_reviews;
+            $arr['iframe_url'] = $iframe_url;
+            $arr['num_reviews'] = '';
+            $arr['rating'] = '';
             
             if(isset($xmlItem->Offers->Offer->OfferListing->IsEligibleForPrime)){
@@ -149 +158 @@
                 $arr['availability'] = 'now';
             }
+            $arr['shop'] = 'amazon';
             if(($num_of_wanted_results == 1 AND $count_of_pushed_elemets < 1) OR
             ($num_of_wanted_results > 1 AND sizeof($ret_elements) < $num_of_wanted_results) ){

easy-amazon-product-information/trunk/eapi_handler.php

@@ -3 +3 @@
 //
 if(get_option('eapi_version') !=  EAPI_VERSION){
-        eapi_install();
+    eapi_install();
 }
 //error is fixed: now 'typ' or 'type' can be used.
@@ -12 +12 @@
 if(isset($atts['typ'])){
     $typ = $atts['typ'];
-    if(! in_array($typ, array("standard", "sidebar", "small", "negative", "price", "button", "picture", "link", "stars", "reviews", "prime"))){
+    if(! in_array($typ, array("standard", "sidebar", "negative", "price", "button", "picture", "link", "stars", "reviews", "prime"))){
         $typ = "standard";
     }
@@ -18 +18 @@
 else{
     $typ = "standard";
+}
+//amazon is set as default shop, if no shop is passed
+if(!isset($atts['shops'])){
+    $atts['shops'] = "amazon";
 }
 if(isset($atts['keyword'])){
@@ -38 +42 @@
 }
 //all other types can only display n=1
-if(!($typ === "standard" OR $typ === "small" OR $typ === "negative"OR $typ === "sidebar")){
+if(!($typ === "standard" OR $typ === "negative"OR $typ === "sidebar")){
     $atts['n'] = 1;
 }
@@ -81 +85 @@
 'eiig_border' => '',
 'eiig_shadow' => '',
-'eiig_start' => ''
+'eiig_start' => '',
+'ebay_keyword' => '',
+'shops' => ''
 );
 //exceptions are described in the statement below
@@ -89 +95 @@
     }
 }
-
-$data_from_local_WP = eapi_get_data_from_WP_database($keyword, $n);
+$passed_parameters['shops'] = explode(",", $passed_parameters['shops']);
+$data_from_local_WP = eapi_get_data_from_WP_database($keyword, $n, $passed_parameters);
 $ret = "";
 if(!($keyword == "NOKEYWORD" AND $typ == 'button')){
-    if(sizeof($data_from_local_WP) >= $n AND check_if_local_data_is_actual($data_from_local_WP)){
+    if(sizeof($data_from_local_WP) >= ($n + count($passed_parameters['shops']) - 1) AND check_if_local_data_is_actual($data_from_local_WP)){
+        $data_from_local_WP = eapi_merge_shops($data_from_local_WP, $passed_parameters);
         $ret .= eapi_build_output($data_from_local_WP, $typ, $passed_parameters);
     }else{
-        if($server_arr = json_decode(eapi_get_amazon_products(array('n' => $n, 'product' => $keyword, 'debug' => $passed_parameters['debug'])))){
+        $server_arr = [];
+        if(in_array("amazon", $passed_parameters['shops'])){
+            $server_arr = json_decode(eapi_get_amazon_products(array('n' => $n, 'product' => $keyword, 'debug' => $passed_parameters['debug'])));
+        }else if(in_array("ebay", $passed_parameters['shops'])){//case when no amazon and only ebay shop
+            $server_arr = json_decode(eapi_get_ebay_products(array('n' => $n, 'product' => $keyword, 'debug' => $passed_parameters['debug'], 'shops' =>  $passed_parameters['debug'])));
+        }
+        if(count($server_arr) > 0){
             if(sizeof($data_from_local_WP) > 0){
                 eapi_delete_with_this_keyword($keyword);
             }
+            if(in_array("ebay", $passed_parameters['shops']) &&
+                in_array("amazon", $passed_parameters['shops'])){
+                $ebay_return = array();
+                foreach($server_arr as $sa){
+                    if(isset($sa->ean)){
+                        $tmpp = json_decode(eapi_get_ebay_products(array('n' => $n, 'product' => $sa->ean, 'debug' => $passed_parameters['debug'], 'shops' =>  $passed_parameters['shops'])));
+                        if(count($tmpp) > 0){
+                            array_push($ebay_return, $tmpp[0]);
+                        }
+                    }
+                }
+                $server_arr = array_merge($server_arr, $ebay_return);
+            }
+            eapi_store_data_in_WP_database($keyword, $server_arr);
+            $server_arr = eapi_merge_shops($server_arr, $passed_parameters);
             $ret .= eapi_build_output($server_arr, $typ, $passed_parameters);
-            eapi_store_data_in_WP_database($keyword, $server_arr);
         }else{
             if(sizeof($data_from_local_WP) > 0){
+                
+                $data_from_local_WP = eapi_merge_shops($data_from_local_WP, $passed_parameters);
                 $ret .= eapi_build_output($data_from_local_WP, $typ, $passed_parameters);
             }
@@ -116 +145 @@
 }
 return $ret;
+}
+//merges the result of different shops according to ean number
+function eapi_merge_shops($arr, $passed_parameters){
+    $to_return = array();
+    if(count($passed_parameters['shops']) > 1){
+        for($i = 0; $i < count($arr); $i++){
+            if($arr[$i]->shop == "amazon"){
+                for($j = 0; $j < count($arr); $j++){
+                    if($arr[$j]->shop != "amazon" AND $arr[$j]->ean == $arr[$i]->ean ){
+                        $arr[$i]->ebay_price = $arr[$j]->new_price;
+                        $arr[$i]->ebay_id = $arr[$j]->asin;
+                    }
+                }
+                array_push($to_return, $arr[$i]);
+            }
+        }
+    }else{
+        $to_return = $arr;
+    }
+    return $to_return;
 }
 
@@ -244 +293 @@
         $ret .= "<div ";
         $entire_border_display = $typ_json->entire_border_display;
-        if($entire_border_display != "" OR $typ == "small"){
-            $ret .= "class='";
+        if($entire_border_display != ""){
             if($entire_border_display != ""){
-                $ret .= "eapi_entire_border ";
-            }
-            if($typ == "small"){
-                $ret .= " eapi_display_box ";
-            }
-            $ret .= "'";
+                $ret .= "class='eapi_entire_border '";
+            }
         }
         if($typ_json->entire_border_display != ""){
@@ -303 +347 @@
             }
             $url = eapi_build_url($sA, $passed_parameters);
+            if(isset($sA->ebay_price)){ 
+                $ebay_url = eapi_build_url($sA, $passed_parameters, "ebay");
+            }
             
             if(isset($sA->title)){
@@ -393 +440 @@
                     $ret.="eapi_custom_info";
                 }
-                $ret.="'>";
+                $ret .="'>";
+                if($typ != "sidebar"){
+                    $ret .= "<div class='eapi_shop_box'>";
+                }
                 $ret .= eapi_build_button_output($sA, $typ, $url, $passed_parameters, $typ_json);
                 $ret .= eapi_build_price_output($sA, $typ, $typ_json);
+                if($typ != "sidebar"){
+                    $ret .= "</div>";
+                }
+                if(isset($sA->ebay_price)){
+                    if($typ != "sidebar"){
+                        $ret .= "<div class='eapi_shop_box'>";  
+                    }
+                    $ret .= eapi_build_button_output($sA, $typ, $ebay_url, $passed_parameters, $typ_json, "ebay");
+                    $ret .= eapi_build_price_output($sA, $typ, $typ_json, "ebay");
+                    if($typ != "sidebar"){
+                        $ret .= "</div>";
+                    }
+                }
                 $ret .= "</div>";
             }
@@ -428 +491 @@
 //builds feature output
 function eapi_build_feature_output($sA, $typ, $url, $passed_parameters, $typ_json, $increasing_number){
+    
     $ret = "";
     if($increasing_number < 10){
@@ -441 +505 @@
     if(isset($sA->features)){
         if(!is_array($sA->features)){
+            $sA->features = stripslashes($sA->features);//needed, to prevent coding  issues
             $sA->features = json_decode($sA->features);
         }
-        $sA->features = preg_replace("#\[\-\]#", "\"", $sA->features);
         if(sizeof($sA->features) > 0){
             if($typ_json->feature_display != ""){
@@ -527 +591 @@
 
 function eapi_build_prime_output($sA, $typ, $passed_parameters, $typ_json){
+    if(!in_array('amazon', $passed_parameters['shops']) && in_array('ebay', $passed_parameters['shops'])){
+        $is_amazon = false;
+    }else{
+        $is_amazon = true;
+    }
     $ret = "";
     if(eapi_dominating_setting($typ_json->prime_display, $passed_parameters['prime'])){
@@ -537 +606 @@
         }
         else{
-            $ret .= "eapi_prime_wrapper";
-        }
-        $ret .="' ><img src='". plugins_url( 'images/eapi_logos.png', __FILE__ ) . "' class='eapi_prime_logo'
-        alt='prime logo' title='".__('prime logo', 'easy-amazon-product-information')."'></div>";
+            if($is_amazon){
+                $ret .= "eapi_prime_wrapper";
+            }else{
+                $ret .= "eapi_ebay_plus_wrapper";
+            }
+        }
+        $ret .="' ><img src='". plugins_url( 'images/eapi_logos.png', __FILE__ ) . "' class='";
+        if($is_amazon){
+            $ret .= "eapi_prime_logo ";
+        }else{
+            $ret .= "eapi_ebay_plus_logo ";
+        }
+        if($is_amazon){
+            $alt_or_title = __('prime logo', 'easy-amazon-product-information');
+        }else{
+            $alt_or_title = __('plus logo', 'easy-amazon-product-information');
+        }
+        $ret .= "'
+        alt='".$alt_or_title."' title='".$alt_or_title."'></div>";
         }
     }
@@ -602 +686 @@
                 $ret .= " style='float: left;' ";
             }           
-            $ret .="><a rel='nofollow' target='_blank' rel='nofollow' title='".__('amazon product ratings', 'easy-amazon-product-information')."' ";
+            $ret .="><a rel='nofollow' target='_blank' title='".__('amazon product ratings', 'easy-amazon-product-information')."' ";
             //set google analytics tag
             if(get_option('eapi_analytics_tracking') != ""){
@@ -649 +733 @@
 
 //builds the url: if product_link == '', it's an amazon-link, else it can be an extern or intern link (not amazon).
-function eapi_build_url($sA, $passed_parameters){
+function eapi_build_url($sA, $passed_parameters, $shop = "amazon"){
     //is an amazon-link
+    $sA->shop = $shop;
+    if(!(in_array("amazon", $passed_parameters['shops'])) AND (in_array("ebay", $passed_parameters['shops']))){
+        $sA->shop = "ebay";
+    }
     $url = "";
     if($passed_parameters['product_link'] == ''){
         if(isset($sA->asin)){
-            $affili_link = get_option("eapi_affiliate_link");
-            if($passed_parameters['product_affiliate'] == ""){
-                if(!($affili_link) OR $affili_link === ""){
-                    $affili_link = "eapi-21";
-                }
-            }else{
-                $affili_link = $passed_parameters['product_affiliate'];
-            }
+            if($sA->shop == "amazon"){
+                $affili_link = get_option("eapi_affiliate_link");
+                if($passed_parameters['product_affiliate'] == ""){
+                    if(!($affili_link) OR $affili_link === ""){
+                        $affili_link = "eapi-21";
+                    }
+                }else{
+                    $affili_link = $passed_parameters['product_affiliate'];
+                }
                 $url = "https://www.amazon.de/dp/$sA->asin/?tag=" . $affili_link;
-            }
+            }else if($sA->shop == "ebay"){
+                if(!isset($sA->ebay_id)){
+                    $itm_id = $sA->asin;
+                }else{
+                    $itm_id = $sA->ebay_id;
+                }
+                $campid = get_option('eapi_ebay_affiliate_id');
+                $url = "https://rover.ebay.com/rover/1/707-53477-19255-0/1?toolid=10001&campid=" . $campid . "&customid=&mpre=";
+                $url .= urldecode("https://www.ebay.de/itm/" . $itm_id  . "/");
+            }
+        }
     }else{//is not an amazon-link
         $url =  $passed_parameters['product_link'];
@@ -669 +768 @@
     return $url;
 }
-function eapi_build_button_output($sA, $typ, $url, $passed_parameters,  $typ_json){
+function eapi_build_button_output($sA, $typ, $url, $passed_parameters,  $typ_json_pass, $shop = "amazon"){
+    $typ_json = clone $typ_json_pass;
+    $sA->shop = $shop;
+    //when only ebay is displayed
+    if(!in_array('amazon', $passed_parameters['shops']) && in_array('ebay', ($passed_parameters['shops']))){
+        $sA->shop = "ebay";
+    }
+    
+    if($sA->shop == "ebay"){//Just overwrite the atts temporary. Makes the following code easier.
+        $typ_json->button_display = $typ_json->button_display_ebay;
+        $typ_json->button_amazon_style = false;
+        $typ_json->text_color = $typ_json->text_color_ebay;
+        $typ_json->color = $typ_json->color_ebay;
+        $typ_json->text = $typ_json->text_ebay;
+        if(isset($sA->ebay_price)){//when only ebay is displayed
+            $sA->new_price = $sA->ebay_price;
+        }
+    }
+    
     $ret = "";
     if($typ_json->button_display != "" or $typ_json->button_amazon_style != "" or $passed_parameters['button_style'] != ""){
@@ -683 +800 @@
             $ret .= " eapi_sidebar_button'";
         }else{
+            if(count($passed_parameters['shops']) > 1){
+                $ret .= " eapi_min_button_width";
+            }
             $ret .= "'";
         }
@@ -733 +853 @@
         if( $passed_parameters['product_button'] != ""){
             if(preg_match("#%1#", $passed_parameters['product_button'])){
-                $ret .= preg_replace("#%1#", eapi_build_formatted_price_display($sA->new_price) . " €" ,  $passed_parameters['product_button']);
+                $ret .= preg_replace("#%1#", eapi_build_formatted_price_display($sA->new_price) ,  $passed_parameters['product_button']);
             }else{
                 $ret .= $passed_parameters['product_button'];
@@ -739 +859 @@
         }else{
             if(preg_match("#%1#", $typ_json->text)){
-                $ret .= preg_replace("#%1#", eapi_build_formatted_price_display($sA->new_price) . " €" ,  $typ_json->text);
+                $ret .= preg_replace("#%1#", eapi_build_formatted_price_display($sA->new_price),  $typ_json->text);
             }else{
                 $ret .= $typ_json->text;
@@ -746 +866 @@
         $ret .= "</a>";
     }
-    
     return $ret;
 }
@@ -884 +1003 @@
             $picture_url = $picture_variant_to_display[$fall_attribute];
         }
-
+        $picture_url = preg_replace('/http(?!s)/', 'https', $picture_url);
         $picture_url = str_replace('http://ecx.', 'https://images-na.ssl-', $picture_url);
+        
 
         if($picture_url != ""){
@@ -929 +1049 @@
     return $ret;
 }
-function eapi_build_price_output($sA, $typ,$typ_json){
+function eapi_build_price_output($sA, $typ, $typ_json, $shop = "amazon"){
+    $sA->shop = $shop;
+    if($sA->shop == "ebay"){
+        $sA->new_price = $sA->ebay_price;
+        $sA->amount_saved = 0;
+    }
     $ret = "";
     if($typ_json->price_display != ""){
@@ -956 +1081 @@
                 $ret .= "<span>$price_pre_text</span>";
             }
-            $ret .=eapi_build_formatted_price_display($sA->new_price) .  " €" ;
+            $ret .= eapi_build_formatted_price_display($sA->new_price);
             if($price_after_text != ""){
                 $ret .= "<span>$price_after_text</span>";
@@ -983 +1108 @@
                 $temp_saved = eapi_build_formatted_price_display($sA->new_price, $sA->amount_saved);
                 
-                $ret .= "<s> ". $temp_saved. " €" . "</s>";
+                $ret .= "<s> ". $temp_saved. "</s>";
                 if($typ != "price"){
                     $ret .= "</span>";
@@ -995 +1120 @@
 //$opt_price2 ist optional and gets added to the first value
 function eapi_build_formatted_price_display($price1, $opt_price2 = null){
-    if($price1 == ""){
-        $price1 = 0.0;
+    if($price1 == "" OR $price1 == 0){
+        return "(Nicht verfügbar)";
     }
     if(isset($opt_price2)){
     return  number_format(str_replace(",", ".", trim(str_replace(array("EUR", "."), "", $opt_price2))) +
-                str_replace(",", ".", trim(str_replace(array("EUR", "."), "", $price1))), 2, ",", ".");
+                str_replace(",", ".", trim(str_replace(array("EUR", "."), "", $price1))), 2, ",", ".") . " €";
     }else{
-     return number_format(str_replace(",", ".", trim(str_replace(array("EUR", "."), "", $price1))), 2, ",", ".");
-    }
-}
-
-//builds the ownsite var.
-function eapi_get_own_site_url(){
-    return preg_replace(array("#^https?://|https://#", "#^www\.#"), "", get_option("siteurl"));
-}
-//returns the number of entries currently in the DB
-function eapi_get_number_of_entries_in_db(){
-    global $wpdb;
-    $table_name = $wpdb->prefix . 'easy_amazon_product_information_data';
-    $db_result = $wpdb->get_results( 'SELECT COUNT(*) as count FROM ' . $table_name );
-    return $db_result[0]->count;
-}
-// returns the donate-button.
-function eapi_get_donate_button(){
-    $ret = "<a style='width:100px; height:26px;' href='http://jensmueller.one/spenden/' title='".__('link to donate', 'easy-amazon-product-information')."' target='_blank' >".__('link to donate', 'easy-amazon-product-information')."</a>";
-    return $ret;
+     return number_format(str_replace(",", ".", trim(str_replace(array("EUR", "."), "", $price1))), 2, ",", ".") . " €";
+    }
 }
 
@@ -1028 +1136 @@
     }
     add_options_page( 'EAPI Adminportal', 'Easy Amazon Product Information', 'manage_options', 'easy_amazon_product_information', 'eapi_show_easy_amazon_product_information_options' );
-}
-
-function eapi_show_easy_amazon_product_information_options() {
-    global $wpdb;
-    if ( !current_user_can( 'manage_options' ) )  {
-        wp_die( __( 'You do not have sufficient permissions to access this page.' ) );
-    }
-    //save private key
-    if(isset($_POST['eapi_secret_access_key'])){
-        update_option("eapi_secret_access_key", trim($_POST['eapi_secret_access_key']));
-    }
-    if(isset($_POST['eapi_access_key_id'])){
-        update_option("eapi_access_key_id", trim($_POST['eapi_access_key_id']));
-    }
-    //save intervalltime
-    if(isset($_POST['inter_vall_time_in_hours'])){
-        if(is_numeric($_POST['inter_vall_time_in_hours'])){
-            if($_POST['inter_vall_time_in_hours'] < 1){
-                $_POST['inter_vall_time_in_hours'] = 1;
-            }
-            update_option("eapi_inter_vall_time_in_hours", $_POST['inter_vall_time_in_hours']);
-        }
-    }
-    //save affiliate link
-    if(isset($_POST['affiliate_link'])){
-        update_option("eapi_affiliate_link", $_POST['affiliate_link']);
-    }
-    //activate/deactivate click tracking
-    if(isset($_POST['eapi_top_area_submit'])){
-        if(!isset($_POST['eapi_analytics_tracking'])){
-            delete_option("eapi_analytics_tracking");
-        }else{
-            update_option("eapi_analytics_tracking", $_POST['eapi_analytics_tracking']);
-        }
-    }
-    //checks the api key, with a sample request to the api.
-    if(isset($_POST['check_api_key'])){
-        eapi_check_credentials(false);
-    }
-    //delete cache
-    if(isset($_POST['eapi_cache_clear'])){
-        delete_all_cached_data();
-    }
-    //builds affiliate link test for amazon partner net
-    $temp_obj = new stdClass();
-    $temp_obj->asin = "B0054PDOV8";
-    $link_for_affiliate_test = "https://partnernet.amazon.de/gp/associates/network/tools/link-checker/main.html?link=".eapi_build_url($temp_obj,array('product_link' => '', 'product_affiliate' => ''));
-
-    $typ_for_tabs = array("standard", "small", "sidebar", "negative", "price", "button", "picture", "link");
-    //checks for updates via $_POST submit.
-    eapi_check_For_tab_updates_in_post($typ_for_tabs);
-    
-    $eapi_error = get_option('eapi_error');
-    
-    echo '<div class="wrap">';
-    $own_site_url =  eapi_get_own_site_url();
-    echo "<h2 style='margin-bottom: 20px;'><a target='_blank' href='http://jensmueller.one/easy-amazon-product-information/'><img style='margin-bottom: -20px; margin-right: 20px;' src='". plugins_url( 'images/logo_top_120_61.png', __FILE__ ) . "' alt='Easy Amazon Product Information'></a>Easy Amazon Product Information</h2>";
-    echo "<form method='post' action='' >";
-    echo "<input type='hidden' name='check_api_key' value='1'>";
-    echo "<input type='hidden' name='eapi_top_area_submit' value='1'>";
-    if($eapi_error != ""){
-        echo "<div class='error'><p>$eapi_error</p></div>";
-        echo "<div class='error'><p>".get_option('eapi_personal_error')."</p></div>";
-    }
-    echo "<table>";
-    echo "<tr>";
-    echo "<td>".__('Access Key ID', 'easy-amazon-product-information').":</td><td><input name='eapi_access_key_id' type='text' value='".get_option("eapi_access_key_id")."'></td>";
-    if(! $eapi_error == ""){
-        echo "<td><img src='". plugins_url( 'images/eapi_false.png', __FILE__ ) . "' alt='EAPI Fehler!' title='EAPI Fehler!' ></td>";
-    }else{
-        echo "<td><img src='". plugins_url( 'images/eapi_ok.png', __FILE__ ) . "' alt='EAPI funktioniert!' title='EAPI funktioniert!' ></td>";
-    }
-    echo "<td>".__('Secret Access Key', 'easy-amazon-product-information').":</td><td><input name='eapi_secret_access_key' type='password' value='".get_option("eapi_secret_access_key")."'></td>";
-    if(! $eapi_error == ""){
-        echo "<td><img src='". plugins_url( 'images/eapi_false.png', __FILE__ ) . "' alt='EAPI Fehler!' title='EAPI Fehler!' ></td>";
-    }else{
-        echo "<td><img src='". plugins_url( 'images/eapi_ok.png', __FILE__ ) . "' alt='EAPI funktioniert!' title='EAPI funktioniert!' ></td>";
-    }
-    echo "<td>".__('Tracking ID', 'easy-amazon-product-information' ).":</td><td><input name='affiliate_link' type='text' value='".get_option("eapi_affiliate_link")."'></td>";
-    if(!$eapi_error == "" or get_option("eapi_affiliate_link") == ""){
-        echo "<td><img src='". plugins_url( 'images/eapi_false.png', __FILE__ ) . "' alt='EAPI Fehler!' title='EAPI Fehler!' ></td>";
-    }else{
-        echo "<td><img src='". plugins_url( 'images/eapi_ok.png', __FILE__ ) . "' alt='EAPI funktioniert!' title='EAPI funktioniert!' ></td>";
-    }
-    echo "</tr><tr>";
-    echo "<td>".__('analytics tracking', 'easy-amazon-product-information').":</td><td>
-    <input type='checkbox' value='on' name='eapi_analytics_tracking' ";
-    if(get_option("eapi_analytics_tracking") != ""){
-        echo "checked";
-    }
-    echo ">
-    </td><td></td><td>".__('interval time in hours', 'easy-amazon-product-information').":</td><td><input name='inter_vall_time_in_hours' type='text' value='".get_option("eapi_inter_vall_time_in_hours")."'></td>";
-    echo "
-    <td></td>
-    <td></td><td><input type='submit' value='".__('save', 'easy-amazon-product-information')."'></td></tr>";
-    echo "</table></form>";
-    echo "<table><tr><td><form  method='post' action=''><input type='hidden' value='1' name='eapi_cache_clear'><input type='submit' value='".__('delete cache', 'easy-amazon-product-information')."'></form></td>
-                <td><form action='".$link_for_affiliate_test."' target='_blank' method='post' ><input type='hidden' value='1' name='eapi_affiliate_test'><input title='".__('Checks with the amazon link tester, if you have inserted your valid affiliat tag. Leads to an extern url where amazon login is required.', 'easy-amazon-product-information')."'  type='submit' value='".__('affiliate link test', 'easy-amazon-product-information')."'></form></td>
-                </tr>";
-    echo "</table>";
-        
-    //richtige Tab laden:
-    $selected_tab = array();
-    $set_one = false;
-    foreach($typ_for_tabs as $key => $value){
-        if(isset($_POST[$value. "_form"])){
-            $selected_tab[$key]['tab'] = 'nav-tab-active';
-            $selected_tab[$key]['text'] = 'nav-text-visible';
-            $set_one = true;
-        }else{
-            $selected_tab[$key]['tab'] = "";
-            $selected_tab[$key]['text'] = "";
-        }
-    }
-    
-    //Array is empty -> load first tab as default
-    if(!($set_one)) {
-        $selected_tab[0]['tab'] = 'nav-tab-active';
-        $selected_tab[0]['text'] = 'nav-text-visible';
-    }
-    echo "<h2 class='nav-tab-wrapper'>
-    <a href='#' data-tab='0' class='nav-tab  ".$selected_tab[0]['tab']."'>".__('standard', 'easy-amazon-product-information')."</a>
-    <a href='#' data-tab='1' class='nav-tab ".$selected_tab[1]['tab']."'>".__('small', 'easy-amazon-product-information')."</a>
-    <a href='#' data-tab='2' class='nav-tab ".$selected_tab[2]['tab']."'>".__('sidebar', 'easy-amazon-product-information')."</a>
-    <a href='#' data-tab='3'  class='nav-tab ".$selected_tab[3]['tab']."'>".__('negative', 'easy-amazon-product-information')."</a>
-    <a href='#' data-tab='4'  class='nav-tab ".$selected_tab[4]['tab']."'>".__('price', 'easy-amazon-product-information')."</a>
-    <a href='#' data-tab='5'  class='nav-tab ".$selected_tab[5]['tab']."'>".__('button', 'easy-amazon-product-information')."</a>
-    <a href='#' data-tab='6'  class='nav-tab ".$selected_tab[6]['tab']."'>".__('picture', 'easy-amazon-product-information')."</a>
-    <a href='#' data-tab='7'  class='nav-tab ".$selected_tab[7]['tab']."'>".__('link', 'easy-amazon-product-information')."</a>
-    <a href='http://jensmueller.one/easy-amazon-product-information/' target='_blank' data-tab='9'  class='nav-tab '>".__('help', 'easy-amazon-product-information')."</a>
-    </h2>";
-    echo "<div data-id='0' class='nav-text ".$selected_tab[0]['text']."' >
-    ". eapi_build_tab_content("standard")."
-    </div>";
-    echo "<div data-id='1' class='nav-text  ".$selected_tab[1]['text']."' >
-    ". eapi_build_tab_content("small")."
-    </div>";
-    echo "<div data-id='2' class='nav-text  ".$selected_tab[2]['text']."' >
-    ". eapi_build_tab_content("sidebar")."
-    </div>";
-    echo "<div data-id='3' class='nav-text  ".$selected_tab[3]['text']."' >
-    ". eapi_build_tab_content("negative")."
-    </div>";
-    echo "<div data-id='4' class='nav-text  ".$selected_tab[4]['text']."' >
-    ". eapi_build_tab_content("price")."
-    </div>";
-    echo "<div data-id='5' class='nav-text  ".$selected_tab[5]['text']."' >
-    ". eapi_build_tab_content("button")."
-    </div>";
-    echo "<div data-id='6' class='nav-text  ".$selected_tab[6]['text']."' >
-    ". eapi_build_tab_content("picture")."
-    </div>";
-    echo "<div data-id='7' class='nav-text  ".$selected_tab[7]['text']."' >
-    ". eapi_build_tab_content("link")."
-    </div>";
-    echo "<p>" . sprintf(__('version: %1$s | <a href='."'"."http://jensmueller.one"."'"." target="."'"."_blank"."'".'>jensmueller.one</a> |', 'easy-amazon-product-information'), EAPI_VERSION);
-    echo eapi_get_donate_button() ." | <a href='https://www.amazon.de/?tag=jensmueller-21' target='_blank' >".__('support me with your next amazon buy', 'easy-amazon-product-information') ."</a> | " . eapi_get_number_of_entries_in_db(). ' ' .  __('entries in DB', 'easy-amazon-product-information') . ' | *'.__('Settings will consist.', 'easy-amazon-product-information') ;
-
-    echo  '</p>';
-    echo '</div>';              
 }
 
@@ -1201 +1149 @@
 }
 
-//checks for savings in the backend, in $_POST.
-function eapi_check_For_tab_updates_in_post($all_tab_types){
-    foreach($all_tab_types as $a){
-        if(isset($_POST[$a.'_form'])){
-            $opts = eapi_get_array_of_all_parameters(true);
-            foreach($opts as $o){
-                eapi_update_parameters($a,  $o);
-            }
-        }
-    }
-}
-function eapi_update_parameters($typ, $opt_name){
-    $db_string = get_option("eapi_" . $typ);
-    $db_entry = json_decode($db_string);
-        
-    if(isset($_POST[$typ ."_".  $opt_name])){
-        if($_POST[$typ  ."_".  $opt_name]){
-            $db_entry->$opt_name = $_POST[$typ  ."_".  $opt_name];
-        }else{
-            $db_entry->$opt_name = "";
-        }
-    }else{
-        $db_entry->$opt_name = "";
-    }
-    update_option("eapi_" . $typ, json_encode($db_entry));
-}
-
-//Builds the Backend.
-function eapi_build_tab_content($tab_name){
-    $opts_to_display = array();
-    $opts_to_display['price'] = array('price');
-    $opts_to_display['button'] = array('button');
-    $opts_to_display['picture'] = array('picture');
-    $opts_to_display['standard'] = array('allg', 'button', 'head', 'features', 'picture', 'amazon information','price', 'footer');
-    $opts_to_display['small'] = array('allg', 'button', 'head', 'features', 'picture', 'amazon information', 'price', 'footer');
-    $opts_to_display['negative'] = array('allg', 'button', 'head', 'features', 'picture', 'amazon information', 'price', 'footer');
-    $opts_to_display['sidebar'] = array('allg', 'button', 'head', 'picture', 'price', 'amazon information', 'footer');
-    $opts_to_display['link'] = array();
-    
-    $ret = "";
-    $ret .= "<form method='post' action='' >";
-    $ret .="<p>".__('name of tag', 'easy-amazon-product-information').": <b>[eapi type=$tab_name]</b></p>";
-    $typ_json = json_decode(get_option("eapi_" . $tab_name));
-    $typ_json = eapi_init_typ_json($typ_json);
-    
-    $ret .="
-    <input type='hidden' name='".$tab_name."_form' value='1'>
-    <table>";
-    
-    if(in_array('allg' , $opts_to_display[$tab_name])){
-            $ret .= "
-        <tr><td><h3>".__('general', 'easy-amazon-product-information')."</h3></td></tr>
-        <tr><td>".__('display border per product', 'easy-amazon-product-information').": </td><td><input type='checkbox' "; if($typ_json->border_display != ""){
-            $ret .= "checked";
-        } $ret .="  value='on' name='". $tab_name . "_border_display' ></td>
-        <td>".__('display all in border', 'easy-amazon-product-information').": </td><td><input type='checkbox' "; if($typ_json->entire_border_display != ""){
-            $ret .= "checked";
-        } $ret .="  value='on' name='". $tab_name . "_entire_border_display' ></td>
-        <td>".__('display numeration', 'easy-amazon-product-information').": </td><td><input type='checkbox' "; if($typ_json->number_display != ""){
-            $ret .= "checked";
-        } $ret .="  value='on' name='". $tab_name . "_number_display' ></td>
-        <td>".__('display procent savings', 'easy-amazon-product-information').": </td><td><input type='checkbox' "; if($typ_json->saving_display != ""){
-            $ret .= "checked";
-        } $ret .="  value='on' name='". $tab_name . "_saving_display' ></td>
-        </tr>
-        <tr>
-        <td>".__('background color', 'easy-amazon-product-information').":</td><td><input type='text' class='my-color-field'  name='". $tab_name . "_background_color' value='".$typ_json->background_color."' ></td>
-        <td>".__('border color', 'easy-amazon-product-information').":</td><td><input type='text' class='my-color-field'  name='". $tab_name . "_border_color' value='".$typ_json->border_color."' ></td>
-        <td>".__('display shadow', 'easy-amazon-product-information').": </td><td><input type='checkbox' "; if($typ_json->shadow_display != ""){
-            $ret .= "checked";
-        } $ret .="  value='on' name='". $tab_name . "_shadow_display' ></td>
-        </tr>
-        <tr>
-        <td>".__('display as &lt;p&gt; (else &lt;h4&gt;)', 'easy-amazon-product-information').": </td><td><input type='checkbox' "; if($typ_json->display_as_p != ""){
-            $ret .= "checked";
-        } $ret .="  value='on' name='". $tab_name . "_display_as_p' ></td>
-        </tr>
-        <tr>
-        <td>".__('headline text', 'easy-amazon-product-information').":</td><td><input type='text' name='".$tab_name. "_head_text' value='".$typ_json->head_text."' class='eapi_admin_input'></td>
-        <td>".__('headline text color', 'easy-amazon-product-information').":</td><td><input type='text' class='my-color-field'  name='". $tab_name . "_head_text_color' value='".$typ_json->head_text_color ."' ></td>
-        
-        </tr>";
-    }
-    if(in_array('head', $opts_to_display[$tab_name] )){
-    $ret .= "
-        <tr>
-        <td><h3>".__('headline', 'easy-amazon-product-information')."</h3></td></tr>
-        <tr><td>".__('headline text color', 'easy-amazon-product-information').":</td><td><input type='text' class='my-color-field'  name='". $tab_name . "_headline_text_color' value='".$typ_json->headline_text_color."' ></td>
-        <td>".__('number of characters', 'easy-amazon-product-information').":</td><td><input type='number' name='". $tab_name . "_headline_quant_char' value='".$typ_json->headline_quant_char."' ></td>
-        <td>".__('font size in %', 'easy-amazon-product-information').":</td><td><input type='number' min='1'  name='".$tab_name. "_headline_size' value='".$typ_json->headline_size."' class='eapi_admin_input'></td>
-        </tr>";
-    }
-    if(in_array( 'button' , $opts_to_display[$tab_name])){
-        $ret .=
-        "<tr><td><h3>".__('button', 'easy-amazon-product-information')."</h3></td></tr>
-        <tr>
-        <td>".__('display button', 'easy-amazon-product-information').": </td><td><input type='checkbox' "; if($typ_json->button_display != ""){
-            $ret .= "checked";
-        } $ret .="  value='on' name='". $tab_name . "_button_display' ></td>
-        <td>".__('display button in Amazon style', 'easy-amazon-product-information').": </td><td><input type='checkbox' "; if($typ_json->button_amazon_style != ""){
-            $ret .= "checked";
-        }$ret .="  value='on' name='". $tab_name . "_button_amazon_style' ></td>
-        </tr>
-        <tr>
-        <td>".__('text color', 'easy-amazon-product-information').":</td><td><input type='text' "; if($typ_json->button_amazon_style != ""){$ret .= " readonly='readonly' ";}else{ $ret .= "class='my-color-field' "; } $ret .= "  name='". $tab_name . "_text_color' value='".$typ_json->text_color."' ></td>
-        <td>".__('background color', 'easy-amazon-product-information').":</td><td><input type='text' "; if($typ_json->button_amazon_style != ""){$ret .= " readonly='readonly' ";}else{ $ret .= "class='my-color-field' "; } $ret .= "  name='". $tab_name . "_color' value='".$typ_json->color."' ></td>
-        <td>".__('text', 'easy-amazon-product-information').":</td><td><input type='text'  name='".$tab_name. "_text' value='".$typ_json->text."' class='eapi_admin_input'></td>
-        <td>".__('shipping picture', 'easy-amazon-product-information').":</td><td><select name='".$tab_name. "_button_picture'  >
-        <option value='_no_pic'"; if($typ_json->button_picture == "_no_pic")$ret.= " selected ";
-        $ret.=" >".__('no shipping picture', 'easy-amazon-product-information')."</option>
-        <option value='shipping_schwarz.png'"; if($typ_json->button_picture == "shipping_schwarz.png")$ret.= " selected ";
-        $ret.=">".__('black', 'easy-amazon-product-information')."</option>
-        <option value='shipping_weiss.png'"; if($typ_json->button_picture == "shipping_weiss.png")$ret.= " selected ";
-        $ret.=">".__('white', 'easy-amazon-product-information')."</option>
-        <option value='shipping_amazon.png'"; if($typ_json->button_picture == "shipping_amazon.png")$ret.= " selected ";
-        $ret.=">".__('Amazon big', 'easy-amazon-product-information')."</option>
-        </select></td>
-        </tr>
-        ";
-    }
-    if(in_array('features', $opts_to_display[$tab_name])){
-        $ret .= "
-        <tr>
-        <tr><td><h3>".__('features', 'easy-amazon-product-information')."</h3></td></tr>
-        <tr>
-        <td>".__('display features', 'easy-amazon-product-information').": </td><td><input type='checkbox' "; if($typ_json->feature_display != ""){
-            $ret .= "checked";
-        } $ret .="  value='on' name='". $tab_name . "_feature_display' ></td>
-        <td>".__('text color', 'easy-amazon-product-information')."</td><td><input type='text' class='my-color-field' name='". $tab_name . "_feature_text_color' value='".$typ_json->feature_text_color."' ></td>
-        <td>".__('number of features', 'easy-amazon-product-information')."</td><td><input type='number'  name='". $tab_name . "_feature_quant_char' value='".$typ_json->feature_quant_char."' ></td>
-        <td>".__('font size in %', 'easy-amazon-product-information').":</td><td><input type='number' min='1'   name='".$tab_name. "_feature_size' value='".$typ_json->feature_size."' class='eapi_admin_input'></td>
-        </tr>
-        <tr>
-        <td>".__('max height of features in px<br>(default: 200px)', 'easy-amazon-product-information').":</td><td><input type='number' min='50'  name='".$tab_name. "_max_feature_height'  value='".$typ_json->max_feature_height."' class='eapi_admin_input'></td>
-        </tr>
-        ";
-    }
-    if(in_array('picture', $opts_to_display[$tab_name])){
-        $ret .= "
-        <tr><td><h3>".__('picture', 'easy-amazon-product-information')."</h3></td></tr>
-        <td>".__('display pictures', 'easy-amazon-product-information').": </td><td><input type='checkbox' "; if($typ_json->picture_display != ""){
-            $ret .= "checked";
-        } $ret .="  value='on' name='". $tab_name . "_picture_display' ></td>
-        <td>".__('picture size', 'easy-amazon-product-information').":</td><td><select name='".$tab_name. "_picture_size'>
-        <option value='medium'"; if($typ_json->picture_size == "medium")$ret.= " selected ";
-        $ret.=">".__('medium', 'easy-amazon-product-information')."</option>
-        <option value='small'"; if($typ_json->picture_size == "small")$ret.= " selected ";
-        $ret.=">".__('small', 'easy-amazon-product-information')."</option>
-        </select></td>
-        <td>".__('picture resolution', 'easy-amazon-product-information').":</td><td><select name='".$tab_name. "_picture_resolution'>
-        <option value='large'"; if($typ_json->picture_resolution == "large")$ret.= " selected ";
-        $ret.=">".__('large', 'easy-amazon-product-information')."</option>
-        <option value='medium'"; if($typ_json->picture_resolution == "medium")$ret.= " selected ";
-        $ret.=">".__('medium', 'easy-amazon-product-information')."</option>
-        <option value='small'"; if($typ_json->picture_resolution == "small")$ret.= " selected ";
-        $ret.=">".__('small', 'easy-amazon-product-information')."</option>
-        </select></td>  
-        </tr>";
-    }
-    if(in_array( 'amazon information', $opts_to_display[$tab_name])){
-        $ret .= "
-        <tr><td><h3>".__('amazon information', 'easy-amazon-product-information')."</h3></td></tr>
-        <tr>
-        <td>".__('display product review', 'easy-amazon-product-information').": </td><td><input type='checkbox' "; if($typ_json->product_review_display != ""){
-            $ret .= "checked";
-        } $ret .="  value='on' name='". $tab_name . "_product_review_display' ></td>
-        <td>".__('display number of ratings', 'easy-amazon-product-information').": </td><td><input type='checkbox' "; if($typ_json->num_reviews_display != ""){
-            $ret .= "checked";
-        } $ret .="  value='on' name='". $tab_name . "_num_reviews_display' ></td>
-        <td>".__('display prime', 'easy-amazon-product-information').": </td><td><input type='checkbox' "; if($typ_json->prime_display != ""){
-            $ret .= "checked";
-        } $ret .="  value='on' name='". $tab_name . "_prime_display' ></td>
-        </tr>
-        ";
-    }
-    if(in_array( 'price', $opts_to_display[$tab_name])){
-    $ret .= "
-        <tr><td><h3>".__('price', 'easy-amazon-product-information')."</h3></td></tr>
-        <tr>
-        <td>".__('display price', 'easy-amazon-product-information').": </td><td><input type='checkbox' "; if($typ_json->price_display != ""){
-            $ret .= "checked";
-        } $ret .="  value='on' name='". $tab_name . "_price_display' ></td>
-        <td>".__('color of price', 'easy-amazon-product-information').":</td><td><input type='text' class='my-color-field'  name='". $tab_name . "_price_color' value='".$typ_json->price_color."' ></td>
-        <td>".__('price pre text', 'easy-amazon-product-information').":</td><td><input type='text' name='".$tab_name. "_price_pre_text' value='".$typ_json->price_pre_text."' class='eapi_admin_input'></td>
-        <td>".__('price after text', 'easy-amazon-product-information').":</td><td><input type='text' name='".$tab_name. "_price_after_text' value='".$typ_json->price_after_text."' class='eapi_admin_input'></td>
-        </tr>
-        <tr>
-        <td>".__('crossed out price', 'easy-amazon-product-information')."</td><td><input type='checkbox' "; if($typ_json->saving_text != ""){
-            $ret .= "checked";
-        } $ret .="  value='on' name='". $tab_name . "_saving_text' ></td>
-        <td>".__('saving pre text', 'easy-amazon-product-information').":</td><td><input type='text' name='".$tab_name. "_saving_pre_text' value='".$typ_json->saving_pre_text."' class='eapi_admin_input'></td>
-        
-        </tr>
-        ";
-    }
-    if(in_array('footer', $opts_to_display[$tab_name])){
-        $ret .= "
-        <tr><td><h3>".__('footer', 'easy-amazon-product-information')."</h3></td></tr>
-        <tr>
-        <td>".__('display last update', 'easy-amazon-product-information').": </td><td><input type='checkbox' "; if($typ_json->last_update != ""){
-            $ret .= "checked";
-        } $ret .="  value='on' name='". $tab_name . "_last_update' ></td>
-        <td>".__('text of footer', 'easy-amazon-product-information').":</td><td ><input  type='text' name='".$tab_name. "_foot_text' value='".$typ_json->foot_text."' class='eapi_admin_input'></td>
-        </tr>";
-    }
-    if($tab_name != "link"  ){
-        $ret .="
-    <tr><td><input type='submit' value='".__('change', 'easy-amazon-product-information')."'></td></tr>";
-    }
-    $ret .="
-    </table>
-    </form>";
-    return $ret;
-}
-
-function eapi_mw_enqueue_color_picker( $hook_suffix ) {
-    //Admin-JS will get loaded
-    wp_enqueue_style( 'wp-color-picker' );
-    wp_enqueue_script( 'my-script-handle', plugins_url('easy_amazon_product_information.js', __FILE__ ), array( 'wp-color-picker' ), false, true );
-    //Admin-stylesheet will get loaded
-    wp_register_style( 'prefix-style', plugins_url('easy_amazon_product_information_admin.css', __FILE__) );
-    wp_enqueue_style( 'prefix-style' );
-}
-
 function eapi_load_css(){
     wp_register_style( 'prefix-style', plugins_url('easy_amazon_product_information.css', __FILE__) );
@@ -1476 +1200 @@
 }
 //return the entries in db, matching $keyword, limited to the given $count
-function eapi_get_data_from_WP_database($keyword, $count)
+function eapi_get_data_from_WP_database($keyword, $count, $passed_parameters)
 {
     global $wpdb;
     $table_name = $wpdb->prefix . 'easy_amazon_product_information_data';
-    $db_result = $wpdb->get_results($wpdb->prepare( "SELECT * FROM $table_name
-    WHERE keyword = %s
-    limit $count", $keyword));
+    $sql_arr = array();
+    foreach($passed_parameters['shops'] as $shop){
+        $sql = $wpdb->prepare(
+        "(SELECT * FROM $table_name
+        WHERE keyword = %s
+        AND shop = %s
+        limit $count)", $keyword, $shop);
+        array_push($sql_arr, $sql);
+    }
+    $db_result = $wpdb->get_results(implode(" UNION ", $sql_arr));
     return $db_result;
 }
@@ -1492 +1223 @@
     title, small_image, medium_image, large_image, description,
     features, amount_saved, new_price, review_information,
-    has_prime, availability) values";
+    has_prime, availability, shop, ean) values";
     $arr = array();
     foreach($product_array as $pA){
-    if(!isset($pA->features)){
-        $pA->features = "";
-    }else{
-        $json_test = true;
-        if(!is_array($pA->features)){
-            json_decode($pA->features);
-            $json_test = false;
-        }//it must be prevented that the 'preg_replace' function is executed twice on a json object
-        if(!(json_last_error() == JSON_ERROR_NONE) || ($json_test)){
-            $pA->features = preg_replace("#\"#", "[-]" ,$pA->features);
-            $pA->features = json_encode( $pA->features, JSON_UNESCAPED_UNICODE);
-        }
-    }
-    if(!isset($pA->title)){
-        $pA->title = "";
-    }
-    if(!isset($pA->description)){
-        $pA->description = "";
-    }
-    if(!isset($pA->amount_saved)){
-        $pA->amount_saved = "";
-    }
-    if(!isset($pA->small_image)){
-        $pA->small_image = "";
-    }
-    if(!isset($pA->medium_image)){
-        $pA->medium_image = "";
-    }
-    if(!isset($pA->large_image)){
-        $pA->large_image = "";
-    }
-    if(!isset($pA->has_reviews)){
-        $pA->has_reviews = 0;
-    }
-    if(!isset($pA->iframe_url)){
-        $pA->iframe_url = "";
-    }
-    if(!isset($pA->num_reviews)){
-        $pA->num_reviews = 0;
-    }
-    if(!isset($pA->rating)){
-        $pA->rating = "";
-    }
-    $pA->review_information = json_encode(array('has_reviews' => $pA->has_reviews,  'iframe_url' => $pA->iframe_url, 
-    'num_reviews' => $pA->num_reviews, 'rating' => $pA->rating));
-    if(!isset($pA->has_prime)){
-        $pA->has_prime = 0;
-    }
-    if(!isset($pA->availability)){
-        $pA->availability = "";
-    }
-    if(!isset($pA->new_price)){
-        $pA->new_price = "";
-    }
-    //remove some characters
-    $pA->title = esc_sql( $pA->title);
-    $pA->description = esc_sql( $pA->description);
-    $pA->features = esc_sql($pA->features);
-        array_push($arr, "('', '" .current_time( 'mysql'). "', '$pA->asin', '$keyword',
-        '$pA->title', '$pA->small_image', '$pA->medium_image', '$pA->large_image',
-        '$pA->description','$pA->features', '$pA->amount_saved', '$pA->new_price',
-        '$pA->review_information', '$pA->has_prime', '$pA->availability')");
+        if(!isset($pA->features)){
+            $pA->features = "";
+        }else{
+            $json_test = true;
+            if(!is_array($pA->features)){
+                json_decode($pA->features);
+                $json_test = false;
+            }//it must be prevented that the 'preg_replace' function is executed twice on a json object
+            if(!(json_last_error() == JSON_ERROR_NONE) || ($json_test)){
+                $pA->features = preg_replace("#\"#", "[-]" ,$pA->features);
+                $pA->features = json_encode( $pA->features, JSON_UNESCAPED_UNICODE);
+            }
+        }
+        if(!isset($pA->title)){
+            $pA->title = "";
+        }
+        if(!isset($pA->description)){
+            $pA->description = "";
+        }
+        if(!isset($pA->amount_saved)){
+            $pA->amount_saved = "";
+        }
+        if(!isset($pA->small_image)){
+            $pA->small_image = "";
+        }
+        if(!isset($pA->medium_image)){
+            $pA->medium_image = "";
+        }
+        if(!isset($pA->large_image)){
+            $pA->large_image = "";
+        }
+        if(!isset($pA->has_reviews)){
+            $pA->has_reviews = 0;
+        }
+        if(!isset($pA->iframe_url)){
+            $pA->iframe_url = "";
+        }
+        if(!isset($pA->num_reviews)){
+            $pA->num_reviews = 0;
+        }
+        if(!isset($pA->rating)){
+            $pA->rating = "";
+        }
+        if(!isset($pA->has_prime)){
+            $pA->has_prime = 0;
+        }
+        if(!isset($pA->availability)){
+            $pA->availability = "";
+        }
+        if(!isset($pA->shop)){
+            $pA->shop = "";
+        }
+        if(!isset($pA->ean)){
+            $pA->ean = "";
+        }
+        if(!isset($pA->ean)){
+            $pA->ean = "";
+        }
+        if(!isset($pA->review_information)){
+            $pA->review_information = json_encode(array());
+        }
+        //remove some characters
+        $pA->title = esc_sql( $pA->title);
+        $pA->description = esc_sql( $pA->description);
+        $pA->features = esc_sql($pA->features);
+            array_push($arr, "('', '" .current_time( 'mysql'). "', '$pA->asin', '$keyword',
+            '$pA->title', '$pA->small_image', '$pA->medium_image', '$pA->large_image',
+            '$pA->description','$pA->features', '$pA->amount_saved', '$pA->new_price',
+            '$pA->review_information', '$pA->has_prime', '$pA->availability', '$pA->shop',
+            '$pA->ean')");
     }
     $sql .= implode($arr, ", ");
@@ -1568 +1307 @@
             "entire_border_display", "price_pre_text", "price_after_text", "saving_pre_text", "picture_size",
             "max_feature_height", "price_display", "picture_resolution", "display_intext_link", "button_amazon_style",
-            "prime_display", "product_review_display", "num_reviews_display", "border_color","shadow_display"
+            "prime_display", "product_review_display", "num_reviews_display", "border_color","shadow_display",
+            "text_color_ebay", "button_display_ebay", "color_ebay", "text_ebay"
             );
     //sometimes not all paramets should be returned: These paremetes can't be set by the user.
@@ -1581 +1321 @@
 function eapi_install() {
     $arr_of_all_params = eapi_get_array_of_all_parameters(false);
-    $all_start_options_in_one_array  = array('standard' => array(), 'sidebar'=> array(), 'negative'=> array(), 'small'=> array(), 'button'=> array(), 'picture'=> array(), 'price'=> array(), 'link' => array());
+    $all_start_options_in_one_array  = array('standard' => array(), 'sidebar'=> array(), 'negative'=> array(), 'button'=> array(), 'picture'=> array(), 'price'=> array(), 'link' => array());
     
     foreach($all_start_options_in_one_array as $key => $value){
@@ -1625 +1365 @@
         $all_start_options_in_one_array['negative']['color'] = '#FFFFFF';
         
-        $all_start_options_in_one_array['small']['display_as_p'] = 'on';
-        $all_start_options_in_one_array['small']['feature_display'] = '';
-        $all_start_options_in_one_array['small']['picture_display'] = '';
-        $all_start_options_in_one_array['small']['entire_border_display'] = 'on';
-        $all_start_options_in_one_array['small']['price_display'] = '';
-        
         $all_start_options_in_one_array['price']['display_intext_price'] = 'on';
         $all_start_options_in_one_array['price']['price_display'] = 'on';
@@ -1686 +1420 @@
         $all_start_options_in_one_array['standard']['border_color'] = '#c1baba';
         $all_start_options_in_one_array['negative']['border_color'] = '#c1baba';
-        $all_start_options_in_one_array['small']['border_color'] = '#c1baba';
         $all_start_options_in_one_array['sidebar']['border_color'] = '#c1baba';
     }
@@ -1702 +1435 @@
         delete_option('eapi_mail_sender');
         delete_option("eapi_mail_receiver");
+    }
+    if( version_compare(get_option('eapi_version'), "3.1.0") < 0){
+        $all_start_options_in_one_array['standard']['button_display_ebay'] = '1';
+        $all_start_options_in_one_array['negative']['button_display_ebay'] = '1';
+        $all_start_options_in_one_array['sidebar']['button_display_ebay'] = '1';
+        $all_start_options_in_one_array['button']['button_display_ebay'] = '1';
+        $all_start_options_in_one_array['standard']['text_ebay'] = 'Bei Ebay kaufen!';
+        $all_start_options_in_one_array['negative']['text_ebay'] = 'Bei Ebay kaufen!';
+        $all_start_options_in_one_array['sidebar']['text_ebay'] = 'Bei Ebay kaufen!';
+        $all_start_options_in_one_array['standard']['color_ebay'] = '#3d94f6';
+        $all_start_options_in_one_array['negative']['color_ebay'] = '#000';
+        $all_start_options_in_one_array['sidebar']['color_ebay'] = '#3d94f6';
+        $all_start_options_in_one_array['standard']['text_color_ebay'] = '#fff';
+        $all_start_options_in_one_array['sidebar']['text_color_ebay'] = '#fff';
+        $all_start_options_in_one_array['button']['text_color_ebay'] = '#fff';
+        $all_start_options_in_one_array['negative']['text_color_ebay'] = '#fff';
+        delete_option('eapi_small');
     }
     //saving all these options in db
@@ -1736 +1486 @@
         has_prime boolean,
         availability varchar(100),
+        shop varchar(50),
+        ean varchar(50),
         UNIQUE KEY id (id)
     ) $charset_collate;";
@@ -1741 +1493 @@
     update_option('eapi_version', EAPI_VERSION);
     dbDelta( $sql );
-    
 }
 function eapi_delete_eapi_database(){

easy-amazon-product-information/trunk/easy_amazon_product_information.css

@@ -1 @@
-.eapi_shadow{box-shadow:0 1px 2px rgba(0,0,0,.25),0 0 39px rgba(0,0,0,.1) inset}.eapi_foot_text{font-size:.6em;float:right}.eapi_entire_border{border: 1px solid rgba(0, 0, 0, 0.72);}@media (max-width:600px){.eapi_display_box{float:none!important;width:99%!important;margin-left:0!important}}.eapi_display_box{float:right;width:50%;margin-left:10px}.eapi_saving_procent{right:0;top:0;position:absolute;background-color:green;color:#fff;padding:6px;border-radius:0 0 0 10px}.eapi_shipping_pic{max-height:15px;margin:-4px 7px 0 0!important;display:inline!important;border:none!important}.eapi_product_title{text-decoration:none!important;border-bottom:hidden!important;font-size:.9em}.eapi_product_image{width:50%;margin-right:25%;margin-left:25%;margin-bottom:5px}.eapi_product_image_box{float:left;width:auto;height:auto;max-width:15%;max-height:250px;margin-left:15px;margin-bottom:15px}.eapi_admin_input{float:left}.eapi_feature_list{float:left;width:80%;margin-left:2%;font-size:.9em}.eapi_price_field{margin-bottom:0!important}.eapi_price_field_center{margin-top:4px!important;display:inline-block}.eapi_price_field_box{float:right;margin-right:20px!important;margin-top:2px!important}.eapi_price_amount_saved{margin-top:3px!important;font-size:.8em}.eapi_price_amount_saved_box{float:right;margin-right:20px!important}.eapi_number_rating_box{float:right;margin-top:1px}.eapi_feature_div{overflow:hidden;max-height:200px;margin-bottom:10px}.eapi_around{overflow:hidden;padding:20px;margin-bottom:5px;position:relative}.eapi_title_around{margin-top:0!important}.eapi_title_around_box{margin-left:15px}.eapi_title_around_box_top{margin-top:25px!important}.eapi_title_around_box_correct{margin-top:15px!important}.eapi_amazon_button_individual{border-radius:10px;-webkit-border-radius:10px;-moz-border-radius:10px;display:inline-block;font-family:Arial;font-size:14px;font-weight:700;font-style:italic;height:34px;line-height:34px;padding-left:10px;padding-right:10px;text-align:center;float:right;text-decoration:none!important}.eapi_amazon_button_style{-box-shadow:inset 0 1px 0 0 #f9eacf;-webkit-box-shadow:inset 0 1px 0 0 #f9eacf;box-shadow:inset 0 1px 0 0 #f9eacf;background:-webkit-gradient(linear,left top,left bottom,color-stop(.05,#F6DD9F),color-stop(1,#F0C24D));background:-moz-linear-gradient(center top,#F6DD9F 5%,#F0C24D 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=’#F6DD9F‘, endColorstr=’#F0C24D‘);background-color:#f5d78a;-moz-border-radius-topleft:3px;-moz-border-radius-topright:3px;-moz-border-radius-bottomright:3px;-moz-border-radius-bottomleft:3px;text-indent:0;border:1px solid #cbaa5c;display:inline-block;color:#111!important;font-size:13px;font-weight:400;font-style:normal;height:25px;line-height:25px;width:180px;text-decoration:none;text-align:center;padding:2px;float:right;-webkit-box-sizing:initial!important;-moz-box-sizing:initial!important;box-sizing:initial!important;-webkit-border-radius:3px;border-radius:3px}.eapi_rating_wrapper,.eapi_rating_wrapper_center{width:90px;overflow:hidden;position:relative;height:18px}.eapi_amazon_button_style:hover{background:-webkit-gradient(linear,left top,left bottom,color-stop(.05,#F5D589),color-stop(1,#EEBA35));background:-moz-linear-gradient(center top,#F5D589 5%,#EEBA35 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=’#F5D589′, endColorstr=’#EEBA35′);background-color:#eeba35!important}.eapi_amazon_button_style:active{position:relative;top:1px}.eapi_rating_wrapper{margin-top:6px;float:right;margin-left:20px}.eapi_rating_wrapper_center{margin:auto}.eapi_rating{height:36px;width:360px!important;position:absolute;max-width:none!important}.eapi_prime_wrapper,.eapi_prime_wrapper_center{position:relative;width:63px;overflow:hidden;height:18px}.eapi_prime_wrapper{margin-top:9px;float:right;margin-left:20px}.eapi_prime_wrapper_center{margin:9px auto 3px}.eapi_prime_intext{position:relative;width:63px;overflow:hidden;height:18px;margin:auto}.eapi_prime_logo{left:0;top:-20px;height:36px;width:360px;position:absolute;max-width:none!important;margin:auto!important;border:none!important}.eapi_custom_info{width:60%;display:inline-block;margin-bottom:15px;margin-top:5px;margin-right:10px;position:relative;float:right}.eapi_custom_info_center{width:50%;margin:auto auto 10px;text-align:center}.eapi_sidebar_button{width:100%;padding-right:0!important;padding-left:0!important}.eapi_rating_link{text-decoration:none!important}.eapi_badget{margin-top: -20px;margin-left: -20px;background-color: #E67A00;float: left;color: white;padding-right: 10px;padding-left: 10px;font-size: 160%;line-height:1.5!important}.eapi_badget_triangle{ color: #E67A00; width: 0;height: 0;border-right: 20px solid transparent;border-top: 2.4em solid;margin-top: -20px;float: left;}
+.eapi_shadow{box-shadow:0 1px 2px rgba(0,0,0,.25),0 0 39px rgba(0,0,0,.1) inset}.eapi_foot_text{font-size:.6em;float:right}.eapi_entire_border{border:1px solid rgba(0,0,0,.72)}@media (max-width:600px){.eapi_display_box{float:none!important;width:99%!important;margin-left:0!important}}.eapi_display_box{float:right;width:50%;margin-left:10px}.eapi_saving_procent{right:0;top:0;position:absolute;background-color:green;color:#fff;padding:6px;border-radius:0 0 0 4px}.eapi_shipping_pic{max-height:15px;margin:-4px 7px 0 0!important;display:inline!important;border:none!important}.eapi_product_title{text-decoration:none!important;border-bottom:hidden!important;font-size:.9em}.eapi_product_image{width:50%;margin-right:25%;margin-left:25%;margin-bottom:5px}.eapi_product_image_box{float:left;width:auto;height:auto;max-width:15%;max-height:250px;margin-left:15px;margin-bottom:15px}.eapi_admin_input{float:left}.eapi_feature_list{float:left;width:80%;margin-left:2%;font-size:.9em}.eapi_price_field{margin-bottom:0!important}.eapi_price_field_center{margin-top:4px!important;display:block}.eapi_price_field_box{float:right;margin-right:20px!important;margin-top:2px!important}.eapi_price_amount_saved{margin-top:3px!important;font-size:.8em}.eapi_price_amount_saved_box{float:right;margin-right:20px!important}.eapi_number_rating_box{float:right;margin-top:1px}.eapi_feature_div{overflow:hidden;max-height:200px;margin-bottom:10px}.eapi_around{overflow:hidden;padding:20px;margin-bottom:5px;position:relative}.eapi_title_around{margin-top:0!important}.eapi_title_around_box{margin-left:15px}.eapi_title_around_box_top{margin-top:25px!important}.eapi_title_around_box_correct{margin-top:15px!important}.eapi_amazon_button_individual{border-radius:2px;-webkit-border-radius:2px;-moz-border-radius:2px;display:inline-block;font-family:Arial;font-size:14px;font-weight:700;font-style:italic;height:34px;line-height:34px;padding-left:10px;padding-right:10px;text-align:center;float:right;text-decoration:none!important}.eapi_amazon_button_style{-box-shadow:inset 0 1px 0 0 #f9eacf;-webkit-box-shadow:inset 0 1px 0 0 #f9eacf;box-shadow:inset 0 1px 0 0 #f9eacf;background:-webkit-gradient(linear,left top,left bottom,color-stop(.05,#F6DD9F),color-stop(1,#F0C24D));background:-moz-linear-gradient(center top,#F6DD9F 5%,#F0C24D 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=’#F6DD9F‘, endColorstr=’#F0C24D‘);background-color:#f5d78a;-moz-border-radius-topleft:3px;-moz-border-radius-topright:3px;-moz-border-radius-bottomright:3px;-moz-border-radius-bottomleft:3px;text-indent:0;border:1px solid #cbaa5c;display:inline-block;color:#111!important;font-size:13px;font-weight:400;font-style:normal;height:25px;line-height:25px;width:180px;text-decoration:none;text-align:center;padding:2px;float:right;-webkit-box-sizing:initial!important;-moz-box-sizing:initial!important;box-sizing:initial!important;-webkit-border-radius:3px;border-radius:3px}.eapi_rating_wrapper,.eapi_rating_wrapper_center{width:90px;overflow:hidden;position:relative;height:18px}.eapi_amazon_button_style:hover{background:-webkit-gradient(linear,left top,left bottom,color-stop(.05,#F5D589),color-stop(1,#EEBA35));background:-moz-linear-gradient(center top,#F5D589 5%,#EEBA35 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=’#F5D589′, endColorstr=’#EEBA35′);background-color:#eeba35!important}.eapi_amazon_button_style:active{position:relative;top:1px}.eapi_rating_wrapper{margin-top:6px;float:right;margin-left:20px}.eapi_rating_wrapper_center{margin:auto}.eapi_rating{height:36px;width:360px!important;position:absolute;max-width:none!important}.eapi_prime_intext,.eapi_prime_wrapper,.eapi_prime_wrapper_center{position:relative;width:63px;height:18px;overflow:hidden}.eapi_prime_wrapper{margin-top:9px;float:right;margin-left:20px}.eapi_prime_wrapper_center{margin:9px auto 3px}.eapi_prime_intext{margin:auto}.eapi_prime_logo{left:0;top:-20px;height:36px;width:360px;position:absolute;max-width:none!important;margin:auto!important;border:none!important}.eapi_custom_info{width:60%;display:inline-block;margin-bottom:15px;margin-top:5px;margin-right:10px;position:relative;float:right}.eapi_custom_info_center{width:50%;margin:auto auto 10px;text-align:center}.eapi_sidebar_button{width:100%;padding-right:0!important;padding-left:0!important}.eapi_rating_link{text-decoration:none!important}.eapi_badget{margin-top:-20px;margin-left:-20px;background-color:#E67A00;float:left;color:#fff;padding-right:10px;padding-left:10px;font-size:160%;line-height:1.5!important}.eapi_badget_triangle{color:#E67A00;width:0;height:0;border-right:20px solid transparent;border-top:2.4em solid;margin-top:-20px;float:left}.eapi_shop_box{display:block;float:right;padding:5px 0}.eapi_min_button_width{min-width:250px}.eapi_ebay_plus_logo{left:-100px;top:-20px;height:36px;width:360px;position:absolute;max-width:none!important;margin:auto!important;border:none!important}.eapi_ebay_plus_wrapper{position:relative;width:90px;overflow:hidden;height:18px;float:right}

easy-amazon-product-information/trunk/easy_amazon_product_information.php

@@ -4 +4 @@
  * Plugin URI: http://jensmueller.one/easy-amazon-product-information/
  * Description: Mit EAPI können Sie aus der Amazon API zahlreiche Produktinformationen auslesen und in Ihre Webseite einbinden. Die Anzeige auf der Webseite kann individuell nach Ihren Bedürfnissen angepasst werden.
- * Version: 3.0.0
+ * Version: 3.1.0
  * Author: Jens Müller
  * Author URI: http://jensmueller.one
  * Text Domain: easy-amazon-product-information
  */
-define('EAPI_VERSION', '3.0.0');
+define('EAPI_VERSION', '3.1.0');
 define('EAPI_PLUGIN_DIR',  plugin_dir_path( __FILE__ ));
-define('BUILD_VERSION',  '5');
+define('BUILD_VERSION',  '6');
 
 require_once(  EAPI_PLUGIN_DIR . 'eapi_handler.php' );
 include_once(  EAPI_PLUGIN_DIR . 'eapi_amazon.php' );
+include_once(  EAPI_PLUGIN_DIR . 'eapi_dashboard.php' );
+//has the ebay API
+if( file_exists( EAPI_PLUGIN_DIR . 'eapi_ebay.php') ) {
+    include_once(  EAPI_PLUGIN_DIR . 'eapi_ebay.php' );
+    define('HAS_EAPI_PLUS',  true);
+}else{
+    define('HAS_EAPI_PLUS',  false);
+}
 
 //replaces the tag

easy-amazon-product-information/trunk/easy_amazon_product_information_admin.css

@@ -1 +1 @@
 .nav-text{
-display:none;
+    display:none;
 }
 .nav-text-visible{
-display:block;
+    display:block;
 }
+.eapi_buy_plus{
+    font-weight: bold;
+    position: absolute;
+    top: 30px;
+    left: 550px;
+    transform: rotate(-10deg);
+    background-color: #56cc5f;
+    padding: 9px;
+    color: white;
+    border-radius: 10px;
+}

easy-amazon-product-information/trunk/languages/easy-amazon-product-information-de_DE.po

@@ -2 +2 @@
 msgstr ""
 "Project-Id-Version: easy-amazon-product-information\n"
-"POT-Creation-Date: 2017-06-01 21:42+0100\n"
-"PO-Revision-Date: 2017-06-01 21:44+0100\n"
+"POT-Creation-Date: 2018-03-23 22:46+0100\n"
+"PO-Revision-Date: 2018-03-23 22:48+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -16 +16 @@
 "X-Poedit-SearchPath-0: ..\n"
 
-#: ../eapi_handler.php:376 ../eapi_handler.php:383
-#, php-format
-msgid " last update on: %1$s at %2$s o'clock. "
-msgstr "Zuletzt aktualisiert am: %1$s um %2$s Uhr."
-
-#: ../eapi_handler.php:501
-msgid "prime logo"
-msgstr "Prime Logo"
-
-#: ../eapi_handler.php:510 ../eapi_handler.php:536
-msgid "ratings"
-msgstr "Bewertungen"
-
-#: ../eapi_handler.php:534
-msgid "rating"
-msgstr "Bewertung"
-
-#: ../eapi_handler.php:563 ../eapi_handler.php:575
-msgid "amazon product ratings"
-msgstr "Amazon Produktbewertungen"
-
-#: ../eapi_handler.php:969
-msgid "donate button"
-msgstr "Spende Button"
-
-#: ../eapi_handler.php:969
-msgid "link to donate"
-msgstr "Link zur Spendenseite"
-
-#: ../eapi_handler.php:983
+#: ../eapi_dashboard.php:6
 msgid "You do not have sufficient permissions to access this page."
 msgstr "Sie haben nicht ausreichend Berechtigungen, diese Seite zu sehen."
 
-#: ../eapi_handler.php:1061
+#: ../eapi_dashboard.php:87
 msgid "Access Key ID"
 msgstr "Access Key ID"
 
-#: ../eapi_handler.php:1067
+#: ../eapi_dashboard.php:93
 msgid "Secret Access Key"
 msgstr "Secret Access Key"
 
-#: ../eapi_handler.php:1073
+#: ../eapi_dashboard.php:99
 msgid "Tracking ID"
 msgstr "Tracking ID (Affiliate-Tag)"
 
-#: ../eapi_handler.php:1080
+#: ../eapi_dashboard.php:108
+msgid "Ebay App ID"
+msgstr "Ebay App ID"
+
+#: ../eapi_dashboard.php:114
+msgid "Ebay Affiliate ID"
+msgstr "Ebay Affiliate ID"
+
+#: ../eapi_dashboard.php:122
 msgid "analytics tracking"
 msgstr "Analytics Tracking"
 
-#: ../eapi_handler.php:1086
+#: ../eapi_dashboard.php:128
 msgid "interval time in hours"
-msgstr "Intervallzeit in Stunden"
-
-#: ../eapi_handler.php:1092
-msgid "activate url cloaking"
-msgstr "URL Cloaking"
-
-#: ../eapi_handler.php:1101
-msgid "cloaking link"
-msgstr "Cloaking Link"
-
-#: ../eapi_handler.php:1105
-msgid "Please provide a cloak."
-msgstr "Bitte geben Sie einen Cloaking Link an."
-
-#: ../eapi_handler.php:1107
-msgid "Successfully provided a cloak."
-msgstr "Erfolgreich URL Cloaking eingerichtet."
-
-#: ../eapi_handler.php:1112
+msgstr "Aktualisierungsintervall (Std.)"
+
+#: ../eapi_dashboard.php:131
 msgid "save"
-msgstr "Speichern"
-
-#: ../eapi_handler.php:1116
+msgstr "Speichern & Verbindung testen"
+
+#: ../eapi_dashboard.php:133
 msgid "delete cache"
 msgstr "Cache leeren*"
 
-#: ../eapi_handler.php:1117
+#: ../eapi_dashboard.php:134
 msgid ""
 "Checks with the amazon link tester, if you have inserted your valid affiliat "
@@ -101 +64 @@
 "einem neuen Fenster auf. (Amazon-Login ist dort erforderlich.)"
 
-#: ../eapi_handler.php:1117
+#: ../eapi_dashboard.php:134
 msgid "affiliate link test"
 msgstr "Affiliate Link testen"
 
-#: ../eapi_handler.php:1141
+#: ../eapi_dashboard.php:158
 msgid "standard"
 msgstr "Standard"
 
-#: ../eapi_handler.php:1142 ../eapi_handler.php:1340 ../eapi_handler.php:1348
-msgid "small"
-msgstr "Klein"
-
-#: ../eapi_handler.php:1143
+#: ../eapi_dashboard.php:159
 msgid "sidebar"
 msgstr "Sidebar"
 
-#: ../eapi_handler.php:1144
+#: ../eapi_dashboard.php:160
 msgid "negative"
 msgstr "Negativ"
 
-#: ../eapi_handler.php:1145 ../eapi_handler.php:1370
+#: ../eapi_dashboard.php:161 ../eapi_dashboard.php:360
 msgid "price"
 msgstr "Preis"
 
-#: ../eapi_handler.php:1146 ../eapi_handler.php:1287
+#: ../eapi_dashboard.php:162 ../eapi_dashboard.php:256
 msgid "button"
 msgstr "Button"
 
-#: ../eapi_handler.php:1147 ../eapi_handler.php:1332
+#: ../eapi_dashboard.php:163 ../eapi_dashboard.php:322
 msgid "picture"
 msgstr "Bild"
 
-#: ../eapi_handler.php:1148
+#: ../eapi_dashboard.php:164
 msgid "link"
 msgstr "Link"
 
-#: ../eapi_handler.php:1149
+#: ../eapi_dashboard.php:165
 msgid "help"
 msgstr "Hilfe"
 
-#: ../eapi_handler.php:1175
+#: ../eapi_dashboard.php:188
 #, php-format
 msgid ""
@@ -150 +109 @@
 "one</a> |"
 
-#: ../eapi_handler.php:1176
+#: ../eapi_dashboard.php:189
 msgid "support me with your next amazon buy"
 msgstr "Unterstütze den Entwickler beim nächsten Amazon-Einkauf"
 
-#: ../eapi_handler.php:1176
+#: ../eapi_dashboard.php:189
 msgid "entries in DB"
 msgstr "Einträge in der DB"
 
-#: ../eapi_handler.php:1176
+#: ../eapi_dashboard.php:189
 msgid "Settings will consist."
 msgstr "Einstellungen bleiben erhalten."
 
-#: ../eapi_handler.php:1186
+#: ../eapi_dashboard.php:208
+msgid "name of tag"
+msgstr "Tagname"
+
+#: ../eapi_dashboard.php:218
+msgid "general"
+msgstr "Allgemein"
+
+#: ../eapi_dashboard.php:219
+msgid "display border per product"
+msgstr "Zeige Rahmen an (pro Produkt)"
+
+#: ../eapi_dashboard.php:222
+msgid "display all in border"
+msgstr "Zeige alles im einem Rahmen an"
+
+#: ../eapi_dashboard.php:225
+msgid "display numeration"
+msgstr "Zeige Nummerierung an"
+
+#: ../eapi_dashboard.php:228
+msgid "display procent savings"
+msgstr "Zeige Prozente an"
+
+#: ../eapi_dashboard.php:233 ../eapi_dashboard.php:268
+#: ../eapi_dashboard.php:295
+msgid "background color"
+msgstr "Hintergrundfarbe"
+
+#: ../eapi_dashboard.php:234
+msgid "border color"
+msgstr "Rahmenfarbe"
+
+#: ../eapi_dashboard.php:235
+msgid "display shadow"
+msgstr "Zeige In-Box-Schatten an"
+
+#: ../eapi_dashboard.php:240
+msgid "headline text"
+msgstr "Text der Überschrift"
+
+#: ../eapi_dashboard.php:241 ../eapi_dashboard.php:249
+msgid "headline text color"
+msgstr "Farbe der Überschrift"
+
+#: ../eapi_dashboard.php:248
+msgid "headline"
+msgstr "Überschrift"
+
+#: ../eapi_dashboard.php:250
+msgid "number of characters"
+msgstr "Anzahl der Zeichen"
+
+#: ../eapi_dashboard.php:251 ../eapi_dashboard.php:313
+msgid "font size in %"
+msgstr "Schriftgröße in %"
+
+#: ../eapi_dashboard.php:259
+msgid "display button"
+msgstr "Zeige Button an"
+
+#: ../eapi_dashboard.php:262
+msgid "display button in Amazon style"
+msgstr "Zeige Button im Amazon-Style an"
+
+#: ../eapi_dashboard.php:267 ../eapi_dashboard.php:293
+#: ../eapi_dashboard.php:311
+msgid "text color"
+msgstr "Textfarbe"
+
+#: ../eapi_dashboard.php:269 ../eapi_dashboard.php:298
+msgid "text"
+msgstr "Text"
+
+#: ../eapi_dashboard.php:270
+msgid "shipping picture"
+msgstr "Shipping Bild"
+
+#: ../eapi_dashboard.php:272
+msgid "no shipping picture"
+msgstr "Kein Bild"
+
+#: ../eapi_dashboard.php:274
+msgid "black"
+msgstr "schwarz"
+
+#: ../eapi_dashboard.php:276
+msgid "white"
+msgstr "weiß"
+
+#: ../eapi_dashboard.php:278
+msgid "Amazon big"
+msgstr "Amazon gr."
+
+#: ../eapi_dashboard.php:287
+msgid "display ebay button"
+msgstr "Zeige Button an"
+
+#: ../eapi_dashboard.php:306
+msgid "features"
+msgstr "Features"
+
+#: ../eapi_dashboard.php:308
+msgid "display features"
+msgstr "Zeige Features an"
+
+#: ../eapi_dashboard.php:312
+msgid "number of features"
+msgstr "Anzahl der Features"
+
+#: ../eapi_dashboard.php:316
+msgid "max height of features in px<br>(default: 200px)"
+msgstr "Max. Höhe der Features in px <br>(alt.: 200px)"
+
+#: ../eapi_dashboard.php:323
+msgid "display pictures"
+msgstr "Zeige Bild an"
+
+#: ../eapi_dashboard.php:326
+msgid "picture size"
+msgstr "Bildgröße"
+
+#: ../eapi_dashboard.php:328 ../eapi_dashboard.php:336
+msgid "medium"
+msgstr "mittel"
+
+#: ../eapi_dashboard.php:330 ../eapi_dashboard.php:338
+msgid "small"
+msgstr "Klein"
+
+#: ../eapi_dashboard.php:332
+msgid "picture resolution"
+msgstr "Bildauflösung"
+
+#: ../eapi_dashboard.php:334
+msgid "large"
+msgstr "groß"
+
+#: ../eapi_dashboard.php:344
+msgid "amazon information"
+msgstr "Amazon Informationen"
+
+#: ../eapi_dashboard.php:346
+msgid "display product review"
+msgstr "Zeige Produktbewertung an"
+
+#: ../eapi_dashboard.php:349
+msgid "display number of ratings"
+msgstr "Zeige Anzahl der Rezensionen an"
+
+#: ../eapi_dashboard.php:352
+msgid "display prime"
+msgstr "Zeige Prime an"
+
+#: ../eapi_dashboard.php:362
+msgid "display price"
+msgstr "Zeige Preis an"
+
+#: ../eapi_dashboard.php:365
+msgid "color of price"
+msgstr "Farbe des Preises"
+
+#: ../eapi_dashboard.php:366
+msgid "price pre text"
+msgstr "Text vor Preis"
+
+#: ../eapi_dashboard.php:367
+msgid "price after text"
+msgstr "Text nach Preis"
+
+#: ../eapi_dashboard.php:370
+msgid "crossed out price"
+msgstr "Streichpreis"
+
+#: ../eapi_dashboard.php:373
+msgid "saving pre text"
+msgstr "Text vor Streichpreis"
+
+#: ../eapi_dashboard.php:380
+msgid "footer"
+msgstr "Fußbereich"
+
+#: ../eapi_dashboard.php:382
+msgid "display last update"
+msgstr "Zeige letzte Aktualisierung"
+
+#: ../eapi_dashboard.php:385
+msgid "text of footer"
+msgstr "Footertext"
+
+#: ../eapi_dashboard.php:390
+msgid "change"
+msgstr "Änderung übernehmen"
+
+#: ../eapi_dashboard.php:428
+msgid "link to donate"
+msgstr "Link zur Spendenseite"
+
+#: ../eapi_ebay.php:73
+msgid "ERROR: Please check your ebay credentials"
+msgstr ""
+"ERROR: Bitte überprüfen Sie Ihre Ebay APP ID. Derzeit ist keine Verbindung "
+"zur API möglich."
+
+#: ../eapi_ebay.php:74 ../eapi_handler.php:1144
+msgid "More information to find the mistake."
+msgstr "Mehr Informationen zur Fehlersuche."
+
+#: ../eapi_handler.php:475 ../eapi_handler.php:482
+#, php-format
+msgid " last update on: %1$s at %2$s o'clock. "
+msgstr "Zuletzt aktualisiert am: %1$s um %2$s Uhr."
+
+#: ../eapi_handler.php:621
+msgid "prime logo"
+msgstr "Prime Logo"
+
+#: ../eapi_handler.php:623
+msgid "plus logo"
+msgstr "Ebay Plus Logo"
+
+#: ../eapi_handler.php:635 ../eapi_handler.php:661
+msgid "ratings"
+msgstr "Bewertungen"
+
+#: ../eapi_handler.php:659
+msgid "rating"
+msgstr "Bewertung"
+
+#: ../eapi_handler.php:688 ../eapi_handler.php:700
+msgid "amazon product ratings"
+msgstr "Amazon Produktbewertungen"
+
+#: ../eapi_handler.php:1143
 msgid ""
 "WARNING: Please check if you access Key ID, Secret Access Key and/or your "
@@ -171 +363 @@
 "um es zu überprüfen."
 
-#: ../eapi_handler.php:1187
-msgid "More information to find the mistake."
-msgstr "Mehr Informationen zur Fehlersuche."
-
-#: ../eapi_handler.php:1234
-msgid "name of tag"
-msgstr "Tagname"
-
-#: ../eapi_handler.php:1244
-msgid "general"
-msgstr "Allgemein"
-
-#: ../eapi_handler.php:1245
-msgid "display border per product"
-msgstr "Zeige Rahmen an (pro Produkt)"
-
-#: ../eapi_handler.php:1248
-msgid "display all in border"
-msgstr "Zeige alles im einem Rahmen an"
-
-#: ../eapi_handler.php:1251
-msgid "display numeration"
-msgstr "Zeige Nummerierung an"
-
-#: ../eapi_handler.php:1254
-msgid "display procent savings"
-msgstr "Zeige Prozente an"
-
-#: ../eapi_handler.php:1259 ../eapi_handler.php:1298
-msgid "background color"
-msgstr "Hintergrundfarbe"
-
-#: ../eapi_handler.php:1260
-msgid "border color"
-msgstr "Rahmenfarbe"
-
-#: ../eapi_handler.php:1261
-msgid "display shadow"
-msgstr "Zeige In-Box-Schatten an"
-
-#: ../eapi_handler.php:1266
-msgid "display as &lt;p&gt; (else &lt;h4&gt;)"
-msgstr "Zeige als &lt;p&gt; an (sonst &lt;h4&gt;)"
-
-#: ../eapi_handler.php:1271
-msgid "headline text"
-msgstr "Text der Überschrift"
-
-#: ../eapi_handler.php:1272 ../eapi_handler.php:1280
-msgid "headline text color"
-msgstr "Farbe der Überschrift"
-
-#: ../eapi_handler.php:1279
-msgid "headline"
-msgstr "Überschrift"
-
-#: ../eapi_handler.php:1281
-msgid "number of characters"
-msgstr "Anzahl der Zeichen"
-
-#: ../eapi_handler.php:1282 ../eapi_handler.php:1323
-msgid "font size in %"
-msgstr "Schriftgröße in %"
-
-#: ../eapi_handler.php:1289
-msgid "display button"
-msgstr "Zeige Button an"
-
-#: ../eapi_handler.php:1292
-msgid "display button in Amazon style"
-msgstr "Zeige Button im Amazon-Style an"
-
-#: ../eapi_handler.php:1297 ../eapi_handler.php:1321
-msgid "text color"
-msgstr "Textfarbe"
-
-#: ../eapi_handler.php:1299
-msgid "text"
-msgstr "Text"
-
-#: ../eapi_handler.php:1300
-msgid "shipping picture"
-msgstr "Shipping Bild"
-
-#: ../eapi_handler.php:1302
-msgid "no shipping picture"
-msgstr "Kein Bild"
-
-#: ../eapi_handler.php:1304
-msgid "black"
-msgstr "schwarz"
-
-#: ../eapi_handler.php:1306
-msgid "white"
-msgstr "weiß"
-
-#: ../eapi_handler.php:1308
-msgid "Amazon big"
-msgstr "Amazon gr."
-
-#: ../eapi_handler.php:1316
-msgid "features"
-msgstr "Features"
-
-#: ../eapi_handler.php:1318
-msgid "display features"
-msgstr "Zeige Features an"
-
-#: ../eapi_handler.php:1322
-msgid "number of features"
-msgstr "Anzahl der Features"
-
-#: ../eapi_handler.php:1326
-msgid "max height of features in px<br>(default: 200px)"
-msgstr "Max. Höhe der Features in px <br>(alt.: 200px)"
-
-#: ../eapi_handler.php:1333
-msgid "display pictures"
-msgstr "Zeige Bild an"
-
-#: ../eapi_handler.php:1336
-msgid "picture size"
-msgstr "Bildgröße"
-
-#: ../eapi_handler.php:1338 ../eapi_handler.php:1346
-msgid "medium"
-msgstr "mittel"
-
-#: ../eapi_handler.php:1342
-msgid "picture resolution"
-msgstr "Bildauflösung"
-
-#: ../eapi_handler.php:1344
-msgid "large"
-msgstr "groß"
-
-#: ../eapi_handler.php:1354
-msgid "amazon information"
-msgstr "Amazon Informationen"
-
-#: ../eapi_handler.php:1356
-msgid "display product review"
-msgstr "Zeige Produktbewertung an"
-
-#: ../eapi_handler.php:1359
-msgid "display number of ratings"
-msgstr "Zeige Anzahl der Rezensionen an"
-
-#: ../eapi_handler.php:1362
-msgid "display prime"
-msgstr "Zeige Prime an"
-
-#: ../eapi_handler.php:1372
-msgid "display price"
-msgstr "Zeige Preis an"
-
-#: ../eapi_handler.php:1375
-msgid "color of price"
-msgstr "Farbe des Preises"
-
-#: ../eapi_handler.php:1376
-msgid "price pre text"
-msgstr "Text vor Preis"
-
-#: ../eapi_handler.php:1377
-msgid "price after text"
-msgstr "Text nach Preis"
-
-#: ../eapi_handler.php:1380
-msgid "crossed out price"
-msgstr "Streichpreis"
-
-#: ../eapi_handler.php:1383
-msgid "saving pre text"
-msgstr "Text vor Streichpreis"
-
-#: ../eapi_handler.php:1390
-msgid "footer"
-msgstr "Fußbereich"
-
-#: ../eapi_handler.php:1392
-msgid "display last update"
-msgstr "Zeige letzte Aktualisierung"
-
-#: ../eapi_handler.php:1395
-msgid "text of footer"
-msgstr "Footertext"
-
-#: ../eapi_handler.php:1400
-msgid "change"
-msgstr "Änderung übernehmen"
-
-#: ../eapi_handler.php:1628
+#: ../eapi_handler.php:1374
 msgid "Buy on Amazon!"
 msgstr "Bei Amazon kaufen!"
+
+#~ msgid "display as &lt;p&gt; (else &lt;h4&gt;)"
+#~ msgstr "Zeige als &lt;p&gt; an (sonst &lt;h4&gt;)"
+
+#~ msgid "donate button"
+#~ msgstr "Spende Button"
+
+#~ msgid "activate url cloaking"
+#~ msgstr "URL Cloaking"
+
+#~ msgid "cloaking link"
+#~ msgstr "Cloaking Link"
+
+#~ msgid "Please provide a cloak."
+#~ msgstr "Bitte geben Sie einen Cloaking Link an."
+
+#~ msgid "Successfully provided a cloak."
+#~ msgstr "Erfolgreich URL Cloaking eingerichtet."
 
 #~ msgid "Successfully send the test mail!"

easy-amazon-product-information/trunk/readme.txt

@@ -7 +7 @@
 Stable tag: trunk
 Requires at least: 4.0
-Tested up to: 4.8.1
+Tested up to: 4.9.5
 
 Mit diesem Plugin können Sie Produktdaten aus der Amazon-API auslesen und automatisiert in Ihre Webseite einbinden.
@@ -28 +28 @@
 *  Vordefinierte Darstellungstypen: standard, small, negative, sidebar, price, button, picture (können angepasst werden.)
 *  Intext-Ausgabe der Produktbilder oder Preise
-*  Integrierter Cache der Produktdaten mit Angabe des Aktualisierungsintervalls
-*  Anpassung der Darstellung
+*  Cache der Produktdaten mit regelmäßiger Aktualisiserung
 *  Verwendung der Buttons auch für Nicht-Affiliatelinks (interne Links, andere externe Links)
 *  Anzeige eines bestimmten Produkts mit Angabe der ASIN
@@ -35 +34 @@
 *  Anzeige von Bestsellerlisten
 *  Einbindung von Google Analytics zum Tracken von Klicks
-*  Anzeige der Produktbewertungen
-*  Anzeige der Primeverfügbarkeit
+*  Anzeige der Produktbewertungen sowie Prime
 *  Kombination mit [Easy Integrated Image Gallery](http://jensmueller.one/easy-integrated-image-gallery/)
 *  Viele Weitere: [Easy Amazon Product Information](http://jensmueller.one/easy-amazon-product-information/)
+*  Anbindung weiterer Shops (z.B.: Ebay): [EAPI PLUS](http://jensmueller.one/eapi-plus/)
 
 
@@ -92 +91 @@
 == Changelog ==
 
+3.1.0:
+
+*  [EAPI PLUS](http://jensmueller.one/eapi-plus/)
+*  Anbindung weiterer Shops, beispielsweise Ebay
+
+
 3.0.0: