Fix for statistics field presentation when name was not set. and added som parameters in config template

andreassolberg · andreassolberg · commit 1b1bdbdf9c8c · 2009-05-15T11:27:33.000Z
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1506 44740490-163a-0410-bde0-09ae8108e29a
diff --git a/modules/statistics/config-templates/module_statistics.php b/modules/statistics/config-templates/module_statistics.php
@@ -5,14 +5,15 @@
 
 $config = array (
 
-	// Access control on statistics page.
 	'protected' => FALSE,
+	'auth' => 'admin',
+	'useridattr' => 'eduPersonPrincipalName',
 	
-	/*
-	 * Which authenticatino source should be used for authentication exception from admin module.
-	 * Set to NULL if only using admin auth.
-	 */
-	//'auth' => 'feide',
+	'default' => 'sso_hoursweek',
+	
+	'allowedUsers' => array(
+		'admin'
+	),
 	
 	'default' => 'sso_hoursweek',
 	
diff --git a/modules/statistics/lib/Statistics/FieldPresentation/Entity.php b/modules/statistics/lib/Statistics/FieldPresentation/Entity.php
@@ -9,8 +9,11 @@ public function getPresentation() {
 		
 		$translation = array('_' => 'All services');
 		foreach($this->fields AS $field) {
-			if (array_key_exists($field, $metadata))
-				$translation[$field] = $this->template->t($metadata[$field]['name'], array(), FALSE);
+			if (array_key_exists($field, $metadata)) {
+				if (array_key_exists('name', $metadata[$field])) {
+					$translation[$field] = $this->template->t($metadata[$field]['name'], array(), FALSE);
+				}
+			}
 		}
 		return $translation;
 	}

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,11 @@ public function getPresentation() {`
`9`	`9`
`10`	`10`	`$translation = array('_' => 'All services');`
`11`	`11`	`foreach($this->fields AS $field) {`
`12`		`- if (array_key_exists($field, $metadata))`
`13`		`- $translation[$field] = $this->template->t($metadata[$field]['name'], array(), FALSE);`
	`12`	`+ if (array_key_exists($field, $metadata)) {`
	`13`	`+ if (array_key_exists('name', $metadata[$field])) {`
	`14`	`+ $translation[$field] = $this->template->t($metadata[$field]['name'], array(), FALSE);`
	`15`	`+ }`
	`16`	`+ }`
`14`	`17`	`}`
`15`	`18`	`return $translation;`
`16`	`19`	`}`