'.$axe_tag['description'].'
'; + + // Now lets put it all together into the Equalify format. + array_push( + $tags, array( + 'title' => $axe_tag['title'], + 'category' => $axe_tag['category'], + 'description' => $description, + + // axe-core uses periods, which get screwed up + // when equalify serializes them, so we're + // just not going to use periods + 'slug' => str_replace('.', '', $axe_tag['slug']) + + ) + ); + + } + } + + // Return tags. + return $tags; + +} + + /** + * Axe URLs + * Maps site URLs to Axe URLs for processing. + */ +function axe_urls($page_url) { + + // Require axe_uri + $axe_uri = DataAccess::get_meta_value('axe_uri'); + if(empty($axe_uri)){ + throw new Exception('axe-core URI is not entered. Please add the URI in the integration settings.'); + }else{ + return $axe_uri.$page_url; + } + +} + +/** + * Axe Alerts + * @param string response_body + * @param string page_url + */ +function axe_alerts($response_body, $page_url){ + + // Our goal is to return alerts. + $axe_alerts = []; + $axe_json = $response_body; + + // Decode JSON. + $axe_json_decoded = json_decode($axe_json); + + // Sometimes Axe can't read the json. + if(empty($axe_json_decoded)){ + + // And add an alert. + $alert = array( + 'source' => 'axe', + 'url' => $page_url, + 'message' => 'axe-core cannot reach the page.', + ); + array_push($axe_alerts, $alert); + + }else{ + + // We're add a lit of violations. + $axe_violations = array(); + + // Show axe violations + foreach($axe_json_decoded[0]->violations as $violation){ + + // Only show violations. + $axe_violations[] = $violation; + + } + + // Add alerts. + if(!empty($axe_violations)) { + + // Setup alert variables. + foreach($axe_violations as $violation){ + + // Default variables. + $alert = array(); + $alert['source'] = 'axe'; + $alert['url'] = $page_url; + + // Setup tags. + $alert['tags'] = ''; + if(!empty($violation->tags)){ + + // We need to get rid of periods so Equalify + // wont convert them to underscores and they + // need to be comma separated. + $tags = $violation->tags; + $copy = $tags; + foreach($tags as $tag){ + $alert['tags'].= str_replace('.', '', $tag); + if (next($copy )) + $alert['tags'].= ','; + } + } + + // Setup message. + $alert['message'] = '"'.$violation->id.'" violation: '.$violation->help; + + // Setup more info. + $alert['more_info'] = ''; + if($violation->nodes) + $alert['more_info'] = $violation->nodes; + + // Push alert. + $axe_alerts[] = $alert; + + } + + } + + } + // Return alerts. + return $axe_alerts; + +} \ No newline at end of file diff --git a/integrations/axe/logo.jpg b/integrations/axe/logo.jpg new file mode 100644 index 00000000..6422f29d Binary files /dev/null and b/integrations/axe/logo.jpg differ diff --git a/integrations/drupal/functions.php b/integrations/drupal/functions.php deleted file mode 100644 index f227e039..00000000 --- a/integrations/drupal/functions.php +++ /dev/null @@ -1,7 +0,0 @@ - \ No newline at end of file diff --git a/integrations/drupal/logo.jpg b/integrations/drupal/logo.jpg deleted file mode 100644 index 8daaed15..00000000 Binary files a/integrations/drupal/logo.jpg and /dev/null differ diff --git a/integrations/pantheon/functions.php b/integrations/pantheon/functions.php deleted file mode 100644 index 74e28385..00000000 --- a/integrations/pantheon/functions.php +++ /dev/null @@ -1,10 +0,0 @@ -WAVE Report'; + $alert['message'] = $wave_item['description'].$appended_text.' - WAVE Report (opens in a new tab)'; // Push alert. $wave_alerts[] = $alert; diff --git a/integrations/wordpress/functions.php b/integrations/wordpress/functions.php deleted file mode 100644 index 5c610b1a..00000000 --- a/integrations/wordpress/functions.php +++ /dev/null @@ -1,6 +0,0 @@ -id "; @@ -750,6 +751,7 @@ public static function create_alerts_table(){ `url` text, `message` text, `tags` text, + `more_info` text, `archived` BOOLEAN NOT NULL DEFAULT 0, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;"; @@ -806,6 +808,7 @@ public static function create_queued_alerts_table(){ `url` text, `message` text, `tags` text, + `more_info` text, `archived` BOOLEAN NOT NULL DEFAULT 0, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;"; @@ -836,34 +839,35 @@ public static function create_meta_table(){ // Query 1 self::query($sql_1, $params, false); - // Now, create the content in the meta table. + // Now, create the content in the meta table with axe + // as the default integration. $sql_2 = " INSERT INTO `meta` (meta_name, meta_value) VALUES ('active_integrations', ?), - ('wave_key', ?), ('scan_status', ?), ('scan_schedule', ?), ('scan_log', ?), ('scannable_pages', ?), + ('axe_key', ?), ('pages_scanned', ?), ('last_scan_time', ?); "; - $default_active_integrations = serialize(array('wave')); - $default_wave_key = $GLOBALS['wave_key']; + $default_active_integrations = serialize(array('axe')); $default_scan_status = ''; $default_scan_schedule = 'manually'; $default_scan_log = ''; $default_scannable_pages = serialize(array()); + $default_axe_key = ''; $default_last_scan_time = ''; $default_pages_scanned = 0; $params = array( $default_active_integrations, - $default_wave_key, $default_scan_status, $default_scan_schedule, $default_scan_log, $default_scannable_pages, + $default_axe_key, $default_pages_scanned, $default_last_scan_time ); diff --git a/models/view_components.php b/models/view_components.php index 74c922a5..e542c39c 100644 --- a/models/view_components.php +++ b/models/view_components.php @@ -61,10 +61,8 @@ function the_active_class($selection){ } // We need to return active for the default view. - }elseif(empty($_GET['view']) && $selection == 'alerts'){ - + }elseif(empty($_GET['view']) && $selection == 'reports'){ echo 'active'; - }else{ return null; } diff --git a/sample-config.php b/sample-config.php index 01985a20..270efb73 100644 --- a/sample-config.php +++ b/sample-config.php @@ -23,6 +23,9 @@ // Visit https://wave.webaim.org/api/ to get a WAVE key. $GLOBALS['wave_key'] = ''; +// Visit https://github.com/bbertucc/axe-equalify for more info. +$GLOBALS['axe_uri'] = ''; + // Additional options. $GLOBALS['page_limit'] = '2222'; $GLOBALS['scan_concurrency'] = '6'; diff --git a/test.php b/test.php index f35a8efd..884aaefd 100644 --- a/test.php +++ b/test.php @@ -1,3 +1,83 @@ request('GET', 'https://wave.webaim.org/api/docs?format=json'); +$response = $client->request('GET', 'https://axe.equalify.app/index.php?url=decubing.com'); + +$axe_json = $response->getBody()->getContents(); +$axe_json_decoded = json_decode($axe_json); + +$page_url = 'test.com'; + +// START PLUGIN + +// Decode JSON. +$axe_json_decoded = json_decode($axe_json); + +// Sometimes Axe can't read the json. +if(empty($axe_json_decoded)){ + + // And add an alert. + $alert = array( + 'source' => 'axe-core', + 'url' => $page_url, + 'message' => 'axe-core cannot reach the page.', + ); + array_push($axe_alerts, $alert); + +}else{ + + // We're add a lit of violations. + $axe_violations = array(); + + // Show axe violations + foreach($axe_json_decoded[0]->violations as $violation){ + + // Only show violations. + $axe_violations[] = $violation; + + } + + // Add alerts. + if(!empty($axe_violations)) { + + // Setup alert variables. + foreach($axe_violations as $violation){ + + // Default variables. + $alert = array(); + $alert['source'] = 'axe-core'; + $alert['url'] = $page_url; + + // Setup tags. + $alert['tags'] = $violation->tags; + + // Setup message. + $alert['message'] = '"'.$violation->id.'" violation: '.$violation->help; + + // Push alert. + $axe_alerts[] = $alert; + + } + + } + +} + +// Test to make sure it works +echo ''; +print_r($axe_alerts); +echo ''; +die; + +// Return everything +// return $axe_alerts; \ No newline at end of file diff --git a/theme.css b/theme.css index 6d342f90..d2ba4eb7 100644 --- a/theme.css +++ b/theme.css @@ -66,4 +66,11 @@ pre code{ white-space: -pre-wrap; /* Opera 4-6 */ white-space: -o-pre-wrap; /* Opera 7 */ word-wrap: break-word; /* Internet Explorer 5.5+ */ -} \ No newline at end of file +} +.screen-reader-only { + position: absolute; + width: 1px; + clip: rect(0 0 0 0); + overflow: hidden; + white-space: nowrap; + } \ No newline at end of file diff --git a/views/integration_settings.php b/views/integration_settings.php index ecabf3e0..04d1e637 100644 --- a/views/integration_settings.php +++ b/views/integration_settings.php @@ -46,13 +46,13 @@ $settings = $settings['meta']; foreach($settings as $setting): $name = $setting['name']; - $report = $setting['report']; + $label = $setting['label']; $type = $setting['type']; ?>
+ + + +
+ + + +'.$info->html.'