Fixed MANTIS-4125 (Google is giving out errors for our schema.org markup) (b130a912) · Commits · Composr ecosystem / Composr

sources/feedback.php

+3 −2

Original line number	Diff line number	Diff line
		@@ -330,7 +330,7 @@ function get_rating_simple_array($content_url, $content_title, $content_type, $c
		}
		} else {
		$likes = (get_option('likes') == '1');
		$all_rating_criteria[$content_type] = array('TITLE' => '', 'TYPE' => '', 'NUM_RATINGS' => '0', 'RATING' => '0');
		$all_rating_criteria[$content_type] = array('TITLE' => '', 'TYPE' => '', '_NUM_RATINGS' => '0', 'NUM_RATINGS' => '0', 'RATING' => '0');
		}

		// Fill in structure
		@@ -373,7 +373,7 @@ function get_rating_simple_array($content_url, $content_title, $content_type, $c
		$calculated_rating = intval(round($rating / floatval($num_ratings)));
		$overall_rating += $calculated_rating;

		$all_rating_criteria[$i] = array('NUM_RATINGS' => integer_format($num_ratings), 'RATING' => strval($calculated_rating)) + $all_rating_criteria[$i];
		$all_rating_criteria[$i] = array('_NUM_RATINGS' => strval($num_ratings), 'NUM_RATINGS' => integer_format($num_ratings), 'RATING' => strval($calculated_rating)) + $all_rating_criteria[$i];

		$extra_metadata = array();
		$extra_metadata['rating' . (($rating_criteria['TYPE'] == '') ? '' : ('_' . $rating_criteria['TYPE']))] = strval($calculated_rating);
		@@ -410,6 +410,7 @@ function get_rating_simple_array($content_url, $content_title, $content_type, $c
		'ID' => $content_id,
		'URL' => $rate_url,
		'ALL_RATING_CRITERIA' => $all_rating_criteria,
		'_OVERALL_NUM_RATINGS' => strval($overall_num_ratings),
		'OVERALL_NUM_RATINGS' => integer_format($overall_num_ratings),
		'OVERALL_RATING' => strval(intval($overall_rating / floatval(count($all_rating_criteria)))),
		'HAS_RATINGS' => $has_ratings,

sources/hooks/systems/addon_registry/core_feedback_features.php

+18 −1

Original line number	Diff line number	Diff line
		@@ -340,12 +340,16 @@ class Hook_addon_registry_core_feedback_features
		$review_titles = array();
		$review_titles[] = array(
		'REVIEW_TITLE' => lorem_phrase(),
		'REVIEW_RATING' => make_string_tempcode(float_format(10.0)),
		'_NUM_REVIEW_RATINGS' => placeholder_number(),
		'NUM_REVIEW_RATINGS' => placeholder_number(),
		'_REVIEW_RATING' => float_to_raw_string(10.0),
		'REVIEW_RATING' => float_format(10.0),
		);
		$comments = new Tempcode();
		foreach (placeholder_array() as $i => $comment) {
		$map = array(
		'INDIVIDUAL_REVIEW_RATINGS' => array(),
		'REVIEW_RATING' => strval(10),
		'HIGHLIGHT' => ($i == 1),
		'TITLE' => lorem_word(),
		'TIME_RAW' => placeholder_number(),
		@@ -497,6 +501,7 @@ class Hook_addon_registry_core_feedback_features
		$all_rating_criteria[] = array(
		'TITLE' => lorem_word(),
		'RATING' => make_string_tempcode('6'),
		'_NUM_RATINGS' => placeholder_number(),
		'NUM_RATINGS' => placeholder_number(),
		'TYPE' => lorem_word(),
		);
		@@ -507,6 +512,7 @@ class Hook_addon_registry_core_feedback_features
		'URL' => placeholder_url(),
		'ALL_RATING_CRITERIA' => $all_rating_criteria,
		'HAS_RATINGS' => true,
		'_OVERALL_NUM_RATINGS' => placeholder_number(),
		'OVERALL_NUM_RATINGS' => placeholder_number(),
		'SIMPLISTIC' => true,
		'ERROR' => '',
		@@ -516,12 +522,14 @@ class Hook_addon_registry_core_feedback_features

		return array(
		lorem_globalise(do_lorem_template('RATING_BOX', array(
		'_OVERALL_NUM_RATINGS' => placeholder_number(),
		'OVERALL_NUM_RATINGS' => placeholder_number(),
		'LIKES' => true,
		'CONTENT_TYPE' => 'downloads',
		'ID' => placeholder_id(),
		'HAS_RATINGS' => true,
		'ALL_RATING_CRITERIA' => $all_rating_criteria,
		'_NUM_RATINGS' => '10',
		'NUM_RATINGS' => '10',
		'RATING_FORM' => $rating_form,
		'ERROR' => '',
		@@ -543,6 +551,7 @@ class Hook_addon_registry_core_feedback_features
		$all_rating_criteria[] = array(
		'TITLE' => lorem_word(),
		'RATING' => '3',
		'_OVERALL_NUM_RATINGS' => placeholder_number(),
		'OVERALL_NUM_RATINGS' => placeholder_number(),
		'TYPE' => lorem_word() . strval($i),
		);
		@@ -565,7 +574,9 @@ class Hook_addon_registry_core_feedback_features
		'ID' => placeholder_id(),
		'ALL_RATING_CRITERIA' => $all_rating_criteria,
		'HAS_RATINGS' => true,
		'_NUM_RATINGS' => placeholder_number(),
		'NUM_RATINGS' => placeholder_number(),
		'_OVERALL_NUM_RATINGS' => placeholder_number(),
		'OVERALL_NUM_RATINGS' => placeholder_number(),
		'RATING_FORM' => $rating_form,
		'ERROR' => '',
		@@ -588,6 +599,7 @@ class Hook_addon_registry_core_feedback_features
		$all_rating_criteria[] = array(
		'TITLE' => lorem_word(),
		'RATING' => '3',
		'_OVERALL_NUM_RATINGS' => placeholder_number(),
		'OVERALL_NUM_RATINGS' => placeholder_number(),
		'TYPE' => lorem_word() . strval($i),
		);
		@@ -610,7 +622,9 @@ class Hook_addon_registry_core_feedback_features
		'ID' => placeholder_id(),
		'ALL_RATING_CRITERIA' => $all_rating_criteria,
		'HAS_RATINGS' => true,
		'_NUM_RATINGS' => placeholder_number(),
		'NUM_RATINGS' => placeholder_number(),
		'_OVERALL_NUM_RATINGS' => placeholder_number(),
		'OVERALL_NUM_RATINGS' => placeholder_number(),
		'RATING_FORM' => $rating_form,
		'ERROR' => '',
		@@ -633,6 +647,7 @@ class Hook_addon_registry_core_feedback_features
		$all_rating_criteria[] = array(
		'TITLE' => lorem_word(),
		'RATING' => '3',
		'_OVERALL_NUM_RATINGS' => placeholder_number(),
		'OVERALL_NUM_RATINGS' => placeholder_number(),
		'TYPE' => lorem_word() . strval($i),
		);
		@@ -656,7 +671,9 @@ class Hook_addon_registry_core_feedback_features
		'ID' => placeholder_id(),
		'ALL_RATING_CRITERIA' => $all_rating_criteria,
		'HAS_RATINGS' => true,
		'_NUM_RATINGS' => placeholder_number(),
		'NUM_RATINGS' => placeholder_number(),
		'_OVERALL_NUM_RATINGS' => placeholder_number(),
		'OVERALL_NUM_RATINGS' => placeholder_number(),
		'RATING_FORM' => $rating_form,
		'ERROR' => '',

sources/hooks/systems/addon_registry/wiki.php

+2 −0

Original line number	Diff line number	Diff line
		@@ -254,6 +254,7 @@ class Hook_addon_registry_wiki
		'ID' => placeholder_id(),
		'URL' => placeholder_url(),
		'ALL_RATING_CRITERIA' => $all_rating_criteria,
		'_OVERALL_NUM_RATINGS' => placeholder_number(),
		'OVERALL_NUM_RATINGS' => placeholder_number(),
		'HAS_RATINGS' => true,
		'SIMPLISTIC' => true,
		@@ -261,6 +262,7 @@ class Hook_addon_registry_wiki
		));

		$rating_details = do_lorem_template('WIKI_RATING', array(
		'_OVERALL_NUM_RATINGS' => placeholder_number(),
		'OVERALL_NUM_RATINGS' => placeholder_number(),
		'RATING_FORM' => $rating_inside,
		'ALL_RATING_CRITERIA' => $all_rating_criteria,

sources/topics.php

+10 −5

Original line number	Diff line number	Diff line
		@@ -188,10 +188,15 @@ class CMS_Topic
		$reviews_rating_criteria = array();
		if ((get_forum_type() == 'cns') && ($allow_reviews)) {
		foreach ($this->reviews_rating_criteria as $review_title) {
		$_rating = $GLOBALS['SITE_DB']->query_select_value('review_supplement', 'AVG(r_rating)', array('r_rating_type' => $review_title, 'r_topic_id' => $topic_id));
		$rating = mixed();
		$rating = is_null($_rating) ? null : $_rating;
		$reviews_rating_criteria[] = array('REVIEW_TITLE' => $review_title, 'REVIEW_RATING' => make_string_tempcode(is_null($rating) ? '' : float_format($rating)));
		$rating = $GLOBALS['SITE_DB']->query_select_value('review_supplement', 'AVG(r_rating)', array('r_rating_type' => $review_title, 'r_topic_id' => $topic_id));
		$rating_count = $GLOBALS['SITE_DB']->query_select_value('review_supplement', 'COUNT(r_rating)', array('r_rating_type' => $review_title, 'r_topic_id' => $topic_id));
		$reviews_rating_criteria[] = array(
		'REVIEW_TITLE' => $review_title,
		'_REVIEW_RATING' => ($rating === null) ? '' : float_to_raw_string($rating),
		'REVIEW_RATING' => ($rating === null) ? '' : float_format($rating),
		'_NUM_REVIEW_RATINGS' => ($rating === null) ? '' : strval($rating_count),
		'NUM_REVIEW_RATINGS' => ($rating === null) ? '' : integer_format($rating_count),
		);
		if (!is_null($rating)) {
		set_extra_request_metadata(array(
		'rating' => float_to_raw_string($rating),
		@@ -785,7 +790,7 @@ class CMS_Topic
		if ($potential_individual_review_rating['r_post_id'] == $post['id']) {
		$individual_review_ratings[$potential_individual_review_rating['r_rating_type']] = array(
		'REVIEW_TITLE' => $potential_individual_review_rating['r_rating_type'],
		'REVIEW_RATING' => float_to_raw_string($potential_individual_review_rating['r_rating']),
		'REVIEW_RATING' => strval($potential_individual_review_rating['r_rating']),
		);
		}
		}

themes/default/templates/CALENDAR_EVENT_SCREEN.tpl

+2 −0

Original line number	Diff line number	Diff line
		{$SET,supports_schema_ratings_and_reviews,1}
		<div class="vcalendar vevent" itemscope="itemscope" itemtype="http://schema.org/Event">
		{TITLE}

		@@ -188,3 +189,4 @@

		{+START,IF,{$CONFIG_OPTION,show_screen_actions}}{$BLOCK,failsafe=1,block=main_screen_actions,title={$METADATA,title}}{+END}
		</div>
		{$SET,supports_schema_reviews,0}