diff --git a/organic-search-analytics/css/gwt.css b/organic-search-analytics/css/gwt.css deleted file mode 100644 index ce00edb..0000000 --- a/organic-search-analytics/css/gwt.css +++ /dev/null @@ -1,103 +0,0 @@ -body { - font-family: sans-serif; - background-color: #FCFCFC; - padding: 0; - margin: 0; -} - -body #siteContent { - padding:0 20px; -} - -.clear { clear:both; } -.floatleft { float:left; } -.floatright { float:right; } - -header { - background-color: #303076; - padding: 10px; -} -header, header a { color: #FFFFFF; } - -header div > span:not(:last-child):after { - content: '|'; - margin: 0 10px; -} - -.donate { display: inline-block; } -.donate form { margin: 0; } - -.serverResponse { - border-color: black; - border-style:solid; - border-width:1px; - padding: 10px; - margin-bottom: 20px; -} - -.success { - background-color: #4DAE42; - color: #FFF; -} - -.error { - background-color: #CB1616; - color: #FFF; -} - - -.button { - display: inline-block; - cursor: pointer; - border: 1px solid #737373; - background-color: #DDE8E1; - padding: 2px 5px; -} - - - -.filelist a { - margin-bottom: 1%; - display: block; -} - -#results { - height:200px; - width: 700; - overflow: auto; - border: 1px solid black; -} -#results span { display: block; } - -.sidebysidetable { float: left; } - -.processing { - font-weight: bold; - color: #1000FF; - font-style: italic; - margin-left: 10px; - text-decoration: none; -} - - -.col { float:left; } -.col40 { width: 40%; } -.col60 { width: 60%; } -.clear { clear:both; } - - -footer { margin-top: 50px; padding: 20px 20px 15px; background-color:#DDDDDD; } - - -/* Alert Box */ -.alert { margin-top: .5%; padding: .5%; } -.alert a, .alert a:hover, .alert a:visited, .alert a:active { color: inherit; } - -#siteContent div.alert.warning { - background-color: #F00; - color: #FF0; -} -#siteContent div.alert.success { - background-color: #008813; - color: #FFF; -} \ No newline at end of file diff --git a/organic-search-analytics/css/styles.css b/organic-search-analytics/css/styles.css index 35d8c87..98252b9 100644 --- a/organic-search-analytics/css/styles.css +++ b/organic-search-analytics/css/styles.css @@ -164,4 +164,6 @@ footer { margin-top: 50px; padding: 20px 20px 15px; background-color:#DDDDDD; } .inputButtonSave { background-color: green; color: white; -} \ No newline at end of file +} + +#upgradeVersion { margin-left: 5px; color: #FF5400; } \ No newline at end of file diff --git a/organic-search-analytics/inc/code/dataCapture.php b/organic-search-analytics/inc/code/dataCapture.php index a7a3cce..d382bd4 100644 --- a/organic-search-analytics/inc/code/dataCapture.php +++ b/organic-search-analytics/inc/code/dataCapture.php @@ -11,7 +11,7 @@ class DataCapture { - + const GOOGLE_SEARCH_ANALYTICS_MAX_DATE_OFFSET = 4; const GOOGLE_SEARCH_ANALYTICS_MAX_DAYS = 90; @@ -23,7 +23,7 @@ class DataCapture 'dimensions' => array('query','device'), 'row_limit' => 5000 /* Number of rows to capture from Google. Valid options: 1-5000 */ ); - + /** * Get authorized sites from Google Search Console * @@ -65,10 +65,12 @@ public function getSitesBingWebmaster($enabledCheck = FALSE) { $bingSites = json_decode( $bing->requestApi( config::CREDENTIALS_BING_API_KEY, 'GetUserSites' ) ); $return = array(); - foreach( $bingSites->d as $site ) { - $return[] = array( 'url' => $site->Url ); + if( $bingSites ) { + foreach( $bingSites->d as $site ) { + $return[] = array( 'url' => $site->Url ); + } } - + return $return; } diff --git a/organic-search-analytics/inc/html/_foot.php b/organic-search-analytics/inc/html/_foot.php index 470d437..77555de 100644 --- a/organic-search-analytics/inc/html/_foot.php +++ b/organic-search-analytics/inc/html/_foot.php @@ -3,12 +3,10 @@