';
- h += '';
- h += '';
- $('.contentanalysis-report-' + aid + ' label').append(h);
- }
- }
- // call any modules post analysis hooks
- for(var i in analyzers_arr) {
- var aid = analyzers_arr[i];
- var module = Drupal.settings.contentanalysis.analyzer_modules[aid].module;
- if (eval('typeof ' + module + '_contentanalysis_analysis_success == "function"')) {
- eval(module + '_contentanalysis_analysis_success')(aid, data);
- }
- }
- if(typeof Drupal.behaviors.collapse == 'function') {
- Drupal.behaviors.collapse();
- }
- $('.ahah-progress-throbber').remove();
- $('#contentanalysis-buttons').show();
- },
- error: function(xhr, status) {
- alert(xhr.responseText.toString());
- $('.ahah-progress-throbber').remove();
- $('#contentanalysis-buttons').show();
- }
- });
- return false;
- }
- });
+ contentanalysis_analyze: function(analyzer_override) {
+ // if TinyMCE is used, turn off and on to save body text to textarea
+ var data = {
+ 'nid': -1,
+ 'node_type': -1,
+ 'source': -1,
+ 'analyzers':-1,
+ 'title': -1,
+ 'body': -1,
+ 'body_summary': -1,
+ 'page_title':-1,
+ 'meta_title':-1,
+ 'meta_keywords':-1,
+ 'meta_description':-1,
+ 'path_alias': -1,
+ 'path_pathauto': -1,
+ 'url': -1,
+ 'page': -1,
+ 'body_input_filter': -1,
+ 'hidden': -1,
+ 'code': Drupal.settings.contentanalysis.code,
+ 'action': -1
+ };
+ if(analyzer_override) {
+ data.action = 'refresh';
+ }
+ if ($('#contentanalysis-page-analyzer-form').html()) {
+ data.source = 'admin-form';
+ data.body = $('[name=input]').val()
+ data.nid = $('[name=input_nid]').val()
+ data.url = $('[name=input_url]').val()
+ if(data.body == '') {
+ data.body = -1;
+ }
+ if(data.nid == '') {
+ data.nid = -1;
+ }
+ if(data.url == '') {
+ data.url = -1;
+ }
+ } else if ($('.node-form').html()) {
+ data.source = 'node-edit-form';
+ // Turn off TinyMCE if enabled
+ if(typeof tinyMCE == 'object') {
+ tinyMCE.get('edit-body-und-0-value').hide();
+ }
+ // Turn off CKEditor if any.
+ var ckeditor = false;
+ if ($('#cke_edit-body-und-0-value').html()) {
+ $('#wysiwyg-toggle-edit-body-und-0-value').click();
+ ckeditor = true;
+ }
+
+ data.title = $('#edit-title').val();
+ data.body = $('#edit-body-und-0-value').val();
+ if ($('#edit-body-und-0-summary').val() != null) {
+ data.body_summary = $('#edit-body-und-0-summary').val();
+ }
+ data.nid = Drupal.settings.contentanalysis.nid
+ data.node_type = Drupal.settings.contentanalysis.node_type
+ data.body_input_filter = $("select[name='body[und][0][format]'] option:selected").val();
+
+ if ($('#edit-page-title').val() != null) {
+ data.page_title = $('#edit-page-title').val();
+ }
+ // check if metatag module fields exist
+ if ($('#edit-metatags-title-value').val() != null) {
+ data.meta_title = $('#edit-metatags-title-value').val();
+ }
+ if ($('#edit-metatags-keywords-value').val() != null) {
+ data.meta_keywords = $('#edit-metatags-keywords-value').val();
+ }
+ if ($('#edit-metatags-description-value').val() != null) {
+ data.meta_description = $('#edit-metatags-description-value').val();
+ }
+ if ($('#edit-path-alias').val() != null) {
+ data.url = window.location.host + Drupal.settings.contentanalysis.base_path + $('#edit-path-alias').val();
+ data.path_alias = $('#edit-path-alias').val();
+ }
+ if ($("input[name='path[pathauto]']:checked").val() != null) {
+ data.path_pathauto = 1;
+ }
+ // Turn back on tinyMCE
+ if(typeof tinyMCE == 'object') {
+ tinyMCE.get('edit-body-und-0-value').show();
+ }
+ // Turn back on CKEditor if needed.
+ if (ckeditor) {
+ $('#wysiwyg-toggle-edit-body-und-0-value').click();
+ }
+
+ } else {
+ data.source = 'page-link';
+ data.page = $('html').html()
+ data.url = window.location.href
+ }
+ if(Drupal.settings.contentanalysis.hidden != null) {
+ data.hidden = Drupal.settings.contentanalysis.hidden;
+ }
+
+ //alert('data.nid ' + data.nid)
+ var analyzers_arr = new Array();
+ if(analyzer_override) {
+ data.analyzers = analyzer_override;
+ analyzers_arr[0] = data.analyzers;
+ }
+ else if($('#contentanalysis_analyzers_override input').val() != null) {
+ data.analyzers = $('#contentanalysis_analyzers_override input').val();
+ analyzers_arr[0] = data.analyzers;
+ }
+ else {
+ var i = 0;
+ $('#contentanalysis_analyzers .form-checkbox:checked').each ( function () {
+ var expr = new RegExp(/\[[^\]]+\]/);
+ analyzers_arr[i] = expr.exec($(this).attr('name'))[0].replace(']', '').replace('[','');
+ i++;
+ })
+ data.analyzers = analyzers_arr.join(',');
+ }
+ // call contentanalysis_data for enabed analyzers
+ for(var i in analyzers_arr) {
+ var aid = analyzers_arr[i];
+ var module = Drupal.settings.contentanalysis.analyzer_modules[aid].module;
+ if (eval('typeof ' + module + '_contentanalysis_data == "function"')) {
+ d = eval(module + '_contentanalysis_data')(aid, data);
+ for(var k in d) {
+ eval('data.ao_'+aid+'_'+k+' = "'+d[k]+'";');
+ }
+ }
+ }
+ $('#contentanalysis-buttons').hide();
+ $.ajax({
+ type: 'POST',
+ url: Drupal.settings.contentanalysis.analyze_callback,
+ data: data,
+ dataType: 'json',
+ success: function(data, textStatus) {
+ analyzers_arr = data.inputs['analyzers'].split(",");
+ if(Drupal.settings.contentanalysis.display_dialog == 1) {
+ $('#analysis-modal').append(data.main['output']);
+ $('#analysis-modal .progress').remove();
+ //Drupal.behaviors.contentanalysisui();
+ $$.contentanalysis_contentanalysisui()
+ }
+ // display inline if enabled
+ if(Drupal.settings.contentanalysis.display_inline == 1) {
+ if(data.inputs['action'] == 'refresh') {
+ //if($('.contentanalysis_section_analysis').length > 0)
+ for(i in analyzers_arr) {
+ aid = analyzers_arr[i];
+ $('.contentanalysis-report-'+aid+'-page_title').replaceWith(data.page_title['output']);
+ $('.contentanalysis-report-'+aid+'-body').replaceWith(data.body['output']);
+ $('.contentanalysis-report-'+aid+'-meta_description').replaceWith(data.meta_description['output']);
+ $('.contentanalysis-report-'+aid+'-meta_keywords').replaceWith(data.meta_keywords['output']);
+ }
+ }
+ else {
+ var show_title = true;
+ if($('.form-item-metatags-title-value').length > 0) {
+ $('.form-item-metatags-title-value > .contentanalysis_section_analysis').remove();
+ $('.form-item-metatags-title-value').append(data.page_title['output']);
+ // check if metatag-title contains [node:title] token
+ if ($('#edit-metatags-title-value').val() != null) {
+ var meta_title = $('#edit-metatags-title-value').val();
+ if(meta_title.indexOf("[node:title]") == -1) {
+ //show_title = false;
+ }
+ }
+ }
+ if (show_title) {
+ $('.form-item-title > .contentanalysis_section_analysis').remove();
+ $('.form-item-title').append(data.page_title['output']);
+ }
+
+ $('#edit-body > .contentanalysis_section_analysis').remove();
+ $('#edit-body').append(data.body['output']);
+ // check newer nodewords format
+ if(($('.form-item-metatags-description-value').length > 0) && data.meta_description != null) {
+ $('.form-item-metatags-description-value > .contentanalysis_section_analysis').remove();
+ $('.form-item-metatags-description-value').append(data.meta_description['output']);
+ }
+
+ if(($('.form-item-metatags-keywords-value').length > 0) && data.meta_keywords != null) {
+ $('.form-item-metatags-keywords-value > .contentanalysis_section_analysis').remove();
+ $('.form-item-metatags-keywords-value').append(data.meta_keywords['output']);
+ }
+ }
+ for(var i in analyzers_arr) {
+ var aid = analyzers_arr[i];
+ h = '';
+ h += '';
+ h += '';
+ $('.contentanalysis-report-' + aid + ' label').append(h);
+ }
+ }
+ // call any modules post analysis hooks
+ for(var i in analyzers_arr) {
+ var aid = analyzers_arr[i];
+ var module = Drupal.settings.contentanalysis.analyzer_modules[aid].module;
+ if (eval('typeof ' + module + '_contentanalysis_analysis_success == "function"')) {
+ eval(module + '_contentanalysis_analysis_success')(aid, data);
+ }
+ }
+ if(typeof Drupal.behaviors.collapse == 'function') {
+ Drupal.behaviors.collapse();
+ }
+ $('.ahah-progress-throbber').remove();
+ $('#contentanalysis-buttons').show();
+ },
+ error: function(xhr, status) {
+ alert(xhr.responseText.toString());
+ $('.ahah-progress-throbber').remove();
+ $('#contentanalysis-buttons').show();
+ }
+ });
+ return false;
+ }
+ });
- Drupal.behaviors.contentanalysisui = {
- attach: function (context, settings) {
- $$.init();
- }
- };
-
- Sliders = {};
-
- Sliders.changeHandle = function(e,ui) {
- var id = jQuery(ui.handle).parents('div.slider-widget-container').attr('id');
- if (typeof(ui.values) != 'undefined') {
- jQuery.each(ui.values, function(i,val) {
- jQuery("#"+id+"_value_"+i).val(val);
- jQuery("#"+id+"_nr_"+i).text(val);
- });
- } else {
- jQuery("#"+id+"_value_0").val(ui.value);
- jQuery("#"+id+"_nr_0").text(ui.value);
- }
- };
+ Drupal.behaviors.contentanalysisui = {
+ attach: function (context, settings) {
+ $$.init();
+ }
+ };
+
+ Sliders = {};
+
+ Sliders.changeHandle = function(e,ui) {
+ var id = jQuery(ui.handle).parents('div.slider-widget-container').attr('id');
+ if (typeof(ui.values) != 'undefined') {
+ jQuery.each(ui.values, function(i,val) {
+ jQuery("#"+id+"_value_"+i).val(val);
+ jQuery("#"+id+"_nr_"+i).text(val);
+ });
+ } else {
+ jQuery("#"+id+"_value_0").val(ui.value);
+ jQuery("#"+id+"_nr_0").text(ui.value);
+ }
+ };
})(jQuery, contentanalysis);
diff --git a/contentanalysis.module b/contentanalysis.module
index bdb8a8d..c0ea5ad 100644
--- a/contentanalysis.module
+++ b/contentanalysis.module
@@ -1,6 +1,4 @@
'node',
'entity' => $node,
@@ -327,13 +325,13 @@ function contentanalysis_analysis_form($form_state, $analysis = array(), $node =
if ($report_style == 'both') {
$form['clickme'] = array(
'#type' => 'markup',
- '#markup' => ''
+ '#markup' => ''
);
}
elseif ($report_style == 'dialog') {
$form['clickme'] = array(
'#type' => 'markup',
- '#markup' => ''
+ '#markup' => ''
);
}
elseif ($report_style == 'inline') {
@@ -550,34 +548,34 @@ function contentanalysis_analyze_js() {
function contentanalysis_save_status($analysis) {
$aid = isset($analysis['#context']['aid']) ? $analysis['#context']['aid'] : NULL;
if (!$aid) {
- return;
+ return;
}
foreach ($analysis AS $anid => $analysisi) {
if (substr($anid, 0, 1)=='#' || !is_array($analysisi)) {
continue;
}
- if((isset($analysisi['#status']) && ($analysisi['#status'] != 'status')) || ($analysisi['#score'])) {
- $statusi = array(
- 'error' => 0,
- 'warning' => 1,
- 'complete' => 2,
- );
- $fields = array(
- 'status' => $analysisi['#status'],
- 'statusi' => $statusi[$analysisi['#status']],
- );
- if($analysisi['#score']) {
- $fields['score'] = $analysisi['#score'];
- }
- $keys = array(
+ if ((isset($analysisi['#status']) && ($analysisi['#status'] != 'status')) || ($analysisi['#score'])) {
+ $statusi = array(
+ 'error' => 0,
+ 'warning' => 1,
+ 'complete' => 2,
+ );
+ $fields = array(
+ 'status' => $analysisi['#status'],
+ 'statusi' => $statusi[$analysisi['#status']],
+ );
+ if ($analysisi['#score']) {
+ $fields['score'] = $analysisi['#score'];
+ }
+ $keys = array(
'aid' => $aid,
- 'analyzer' => $anid,
- );
- $query = db_merge('contentanalysis_status')
- ->key($keys)
- ->fields($fields);
-
- $updated = $query->execute();
+ 'analyzer' => $anid,
+ );
+ $query = db_merge('contentanalysis_status')
+ ->key($keys)
+ ->fields($fields);
+
+ $updated = $query->execute();
}
}
}
@@ -673,9 +671,9 @@ function contentanalysis_parse_context_node_edit($context, &$analysis) {
$context['node']->body[$context['node']->language][0]['value'] = $context['body'];
// get teaser trim length if available from field
if ($context['inputs']['body_summary']) {
- $context['node']->body[$context['node']->language][0]['summary'] = $context['inputs']['body_summary'];
+ $context['node']->body[$context['node']->language][0]['summary'] = $context['inputs']['body_summary'];
}
- else if ($items = field_get_items('node', $context['node'], 'body')) {
+ elseif ($items = field_get_items('node', $context['node'], 'body')) {
$instance = field_info_instance('node', 'body', $context['node']->type);
$context['node']->body[$context['node']->language][0]['summary'] = text_summary($context['body'], $context['inputs']['body_input_filter'], $instance['display']['teaser']['settings']['trim_length']);
}
@@ -745,22 +743,22 @@ function contentanalysis_parse_context_node_edit($context, &$analysis) {
* A normalized context array
*/
function contentanalysis_parse_context_node_load($context, &$analysis) {
- if (isset($context['node']) && is_object($context['node'])) {
- $node = $context['node'];
+ if (isset($context['node']) && is_object($context['node'])) {
+ $node = $context['node'];
}
elseif ($context['nid']) {
$node = node_load($context['nid']);
if (!$node) {
- $msg = t('Nid @nid is invalid.', array('@nid' => $context['nid']));
- $analysis['messages'][] = contentanalysis_format_message($msg, 'error');
- return $context;
+ $msg = t('Nid @nid is invalid.', array('@nid' => $context['nid']));
+ $analysis['messages'][] = contentanalysis_format_message($msg, 'error');
+ return $context;
}
$context['node'] = $node;
}
else {
$msg = t('A valid node/nid was not submitted.');
$analysis['messages'][] = contentanalysis_format_message($msg, 'error');
- return $context;
+ return $context;
}
$context['node_type'] = $node->type;
@@ -770,7 +768,7 @@ function contentanalysis_parse_context_node_load($context, &$analysis) {
$context_title = $context['title'];
$context_page_title = $context['title'];
if (module_exists('page_title')) {
- $page_title_pattern = variable_get('page_title_type_'. (isset($node->type) ? $node->type : ''), '');
+ $page_title_pattern = variable_get('page_title_type_' . (isset($node->type) ? $node->type : ''), '');
if (empty($page_title_pattern)) {
$page_title_pattern = variable_get('page_title_default', '[current-page:page-title] | [site:name]');
@@ -815,7 +813,7 @@ function contentanalysis_parse_context_node_load($context, &$analysis) {
// get metatag context
if (isset($node->metatags['keywords']['value'])) {
- $context['meta_keywords'] = $node->metatags['keywords']['value'];
+ $context['meta_keywords'] = $node->metatags['keywords']['value'];
}
if (isset($node->metatags['description']['value'])) {
$context['meta_description'] = $node->metatags['description']['value'];
@@ -879,7 +877,7 @@ function contentanalysis_parse_context_page($context, &$analysis) {
}
function contentanalysis_parse_context_metatags($context) {
- if (module_exists('metatag')) {
+ if (module_exists('metatag')) {
$options = array(
'entity_type' => 'node',
'entity' => $context['node'],
@@ -891,7 +889,7 @@ function contentanalysis_parse_context_metatags($context) {
);
$metatags = array();
if (trim($context['meta_title'])) {
- $metatags['title'] = array(
+ $metatags['title'] = array(
'value' => $context['meta_title'],
);
}
@@ -919,14 +917,14 @@ function contentanalysis_parse_context_metatags($context) {
$context['meta_description'] = $nodemeta['description']['#attached']['drupal_add_html_head'][0][0]['#value'];
}
if (!$context['meta_keywords'] && isset($globalmeta['keywords']['#attached']['drupal_add_html_head'][0][0]['#value'])) {
- $context['meta_keywords'] = $globalmeta['keywords']['#attached']['drupal_add_html_head'][0][0]['#value'];
+ $context['meta_keywords'] = $globalmeta['keywords']['#attached']['drupal_add_html_head'][0][0]['#value'];
}
if (!$context['meta_description'] && isset($globalmeta['description']['#attached']['drupal_add_html_head'][0][0]['#value'])) {
$context['meta_description'] = $globalmeta['description']['#attached']['drupal_add_html_head'][0][0]['#value'];
}
}
- else if(!isset($context['meta_title'])) {
- $context['meta_title'] = $context['title'];
+ elseif (!isset($context['meta_title'])) {
+ $context['meta_title'] = $context['title'];
}
return $context;
}
@@ -937,7 +935,7 @@ function contentanalysis_get_analyzer_settings($analyzer_name) {
$all_settings = variable_get('contentanalysis_analyzer_settings', array());
if (isset($all_settings[$analyzer_name]) && is_array($all_settings[$analyzer_name])) {
$settings = $all_settings[$analyzer_name];
- }
+ }
if (isset($analyzer_defs[$analyzer_name]['settings'])) {
$settings += $analyzer_defs[$analyzer_name]['settings'];
}
@@ -956,7 +954,7 @@ function contentanalysis_get_analyzer_settings($analyzer_name) {
*/
function contentanalysis_do_analysis($context, $analyzers = NULL, $analyzers_params = array()) {
$analysis = array();
- $analysis_struc = array(
+ $analysis_struc = array(
'#title' => '',
'#status' => 'status',
'content' => array(),
@@ -981,9 +979,9 @@ function contentanalysis_do_analysis($context, $analyzers = NULL, $analyzers_par
$context = contentanalysis_parse_context($context, $analysis);
// get analyzer settings
- foreach($analyzers AS $analyzer_name => $analyzer) {
- $settings = contentanalysis_get_analyzer_settings($analyzer_name);
- $context['analyzers'][$analyzer_name]['settings'] = $settings;
+ foreach ($analyzers AS $analyzer_name => $analyzer) {
+ $settings = contentanalysis_get_analyzer_settings($analyzer_name);
+ $context['analyzers'][$analyzer_name]['settings'] = $settings;
}
// allow modules to alter context
@@ -1167,7 +1165,7 @@ function contentanalysis_build_analysis_content($analysis) {
uasort($analysisi['content'], "element_sort");
$i = 0;
- $con = '