diff options
Diffstat (limited to 'modules/core')
| -rw-r--r-- | modules/core/hooks/hook_sanitycheck.php | 5 | ||||
| -rw-r--r-- | modules/core/lib/ModuleDefinition.php | 4 | ||||
| -rw-r--r-- | modules/core/lib/ModuleInstaller.php | 5 | ||||
| -rw-r--r-- | modules/core/lib/Storage/SQLPermanentStorage.php | 6 | ||||
| -rw-r--r-- | modules/core/www/show_metadata.php | 4 |
5 files changed, 4 insertions, 20 deletions
diff --git a/modules/core/hooks/hook_sanitycheck.php b/modules/core/hooks/hook_sanitycheck.php index d81ef25..b0848d3 100644 --- a/modules/core/hooks/hook_sanitycheck.php +++ b/modules/core/hooks/hook_sanitycheck.php @@ -23,12 +23,12 @@ function core_hook_sanitycheck(&$hookinfo) { $hookinfo['info'][] = '[core] In config.php technicalcontact_email is set properly'; } - if (version_compare(phpversion(), '5.2', '>=')) { + if (version_compare(phpversion(), '5.3', '>=')) { $hookinfo['info'][] = '[core] You are running PHP version ' . phpversion() . '. Great.'; } elseif( version_compare(phpversion(), '5.1.2', '>=')) { $hookinfo['info'][] = '[core] You are running PHP version ' . phpversion() . '. It\'s recommended to upgrade to >= 5.2'; } else { - $hookinfo['errors'][] = '[core] You are running PHP version ' . phpversion() . '. SimpleSAMLphp requires version >= 5.1.2, and reccomends version >= 5.2. Please upgrade!'; + $hookinfo['errors'][] = '[core] You are running PHP version ' . phpversion() . '. SimpleSAMLphp requires version >= 5.3. Please upgrade!'; } $info = array(); @@ -40,7 +40,6 @@ function core_hook_sanitycheck(&$hookinfo) { foreach($info AS $mi => $i) { if (isset($i['dependencies']) && is_array($i['dependencies'])) { foreach ($i['dependencies'] AS $dep) { - // $hookinfo['info'][] = '[core] Module ' . $mi . ' requires ' . $dep; if (!in_array($dep, $availmodules)) { $hookinfo['errors'][] = '[core] Module dependency not met: ' . $mi . ' requires ' . $dep; } diff --git a/modules/core/lib/ModuleDefinition.php b/modules/core/lib/ModuleDefinition.php index 64106e6..f633096 100644 --- a/modules/core/lib/ModuleDefinition.php +++ b/modules/core/lib/ModuleDefinition.php @@ -110,9 +110,7 @@ class sspmod_core_ModuleDefinition { $remoteDef = self::load($this->def['definition'], 'remote'); $remoteVersion = $remoteDef->getVersion($branch); - - #echo ' Comparing versions local [' . $thisVersion . '] and remote [' . $remoteVersion . ']' . "\n"; - + return version_compare($remoteVersion, $thisVersion, '>'); } diff --git a/modules/core/lib/ModuleInstaller.php b/modules/core/lib/ModuleInstaller.php index a35cc3d..5dde6fe 100644 --- a/modules/core/lib/ModuleInstaller.php +++ b/modules/core/lib/ModuleInstaller.php @@ -20,11 +20,6 @@ class sspmod_core_ModuleInstaller { $access = $this->module->getAccess($branch); switch($access['type']) { - // case 'svn' : - // $this->requireInstalled(); - // $this->remove($access); - // break; - default: $this->requireInstalled(); $this->removeModuleDir($access); diff --git a/modules/core/lib/Storage/SQLPermanentStorage.php b/modules/core/lib/Storage/SQLPermanentStorage.php index 1496657..0a1a925 100644 --- a/modules/core/lib/Storage/SQLPermanentStorage.php +++ b/modules/core/lib/Storage/SQLPermanentStorage.php @@ -99,8 +99,6 @@ class sspmod_core_Storage_SQLPermanentStorage { "key2 = '" . sqlite_escape_string($key2) . "' AND " . "type = '" . sqlite_escape_string($type) . "'"; $results = $this->db->queryExec($query); - # echo $query; - # echo $this->db>changes; return $results; } @@ -109,9 +107,7 @@ class sspmod_core_Storage_SQLPermanentStorage { $condition = self::getCondition($type, $key1, $key2); $query = "SELECT * FROM data WHERE " . $condition; $results = $this->db->arrayQuery($query, SQLITE_ASSOC); - -# echo '<pre>type: ' . $type . ' key1:' . $key1 . ' ' . $query; print_r($results); exit; - + if (count($results) !== 1) return NULL; $res = $results[0]; diff --git a/modules/core/www/show_metadata.php b/modules/core/www/show_metadata.php index 5e90a8b..8c20104 100644 --- a/modules/core/www/show_metadata.php +++ b/modules/core/www/show_metadata.php @@ -21,10 +21,6 @@ $metadata = SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler(); $m = $metadata->getMetadata($_REQUEST['entityid'], $_REQUEST['set']); -// echo('<pre>'); print_r($m); -// exit; - - $t = new SimpleSAML_XHTML_Template($config, 'core:show_metadata.tpl.php'); $t->data['pageid'] = 'show_metadata'; $t->data['header'] = 'simpleSAMLphp Show Metadata'; |