oidplusalarmingautosfxaysaliacalllibchecksum-toolscolormanagercryptochatcurrency_converterdecoderdelphiutilsdistributeddpcstudiodpg2fastphpfileformatsfilter_foundryforestgridgameht46f47_simulatorindexer_suiteipe_artfile_utilsjavautilsjumperlightgamelogviewermusikboxmystic_houseoidconverteroidinfo_apioidinfo_new_designpersonal-webbasephp_antispamphp_clientchallengephp_guestbookphp_utilsplumbersprependrecyclebinunitsimple_log_eventsokobanspacemissionstackmanuserdetect2uuid_mac_utilsvgwhoisvnagwebcounterwinbugtrackeryt_downloader

BlueGreycalmElegant

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → / @ 442

  → / @ 443

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Regard whitespace Rev 442 → Rev 443

/trunk/includes/classes/OIDplusMenuUtils.class.php
82,7 → 82,7
$confidential_oids = array();
$res = OIDplus::db()->query("select id from ###objects where confidential = '1'");
$res = OIDplus::db()->query("select id from ###objects where confidential = ?", array(true));
while ($row = $res->fetch_array()) {
$confidential_oids[] = $row['id'];
}

/trunk/includes/classes/OIDplusObject.class.php
145,7 → 145,7
$out = array();
if (!OIDplus::baseConfig()->getValue('OBJECT_CACHING', true)) {
$res = OIDplus::db()->query("select id from ###objects where confidential = '0' order by ".OIDplus::db()->natOrder('id'));
$res = OIDplus::db()->query("select id from ###objects where confidential = ? order by ".OIDplus::db()->natOrder('id'), array(false));
while ($row = $res->fetch_array()) {
$obj = self::parse($row['id']); // will be NULL if the object type is not registered

/trunk/includes/db_updates/update204.inc.php
94,8 → 94,8
" `privacy` INTEGER NOT NULL DEFAULT 0,".
" `salt` TEXT NULL,".
" `authkey` TEXT NULL,".
" `registered` TEXT, -- DateTime".
" `updated` TEXT, -- DateTime".
" `registered` TEXT,".
" `updated` TEXT,".
" `last_login` datetime".
");");
$db->query("INSERT INTO ###ra2 SELECT * FROM ###ra;");
109,8 → 109,8
" `description` TEXT NULL,".
" `ra_email` TEXT NULL REFERENCES `###ra`(`email`),".
" `confidential` boolean NOT NULL,".
" `created` TEXT, -- DateTime".
" `updated` TEXT, -- DateTime".
" `created` TEXT,".
" `updated` TEXT,".
" `comment` TEXT NULL,".
" PRIMARY KEY (`id`)".
");");

/trunk/plugins/adminPages/100_wellknown_oids/OIDplusPageAdminWellKnownOIDs.class.php
53,7 → 53,10
$out['text'] .= ' <th>'._L('IRI identifiers (comma sep.)').'</th>';
$out['text'] .= ' </tr>';
$res = OIDplus::db()->query("select a.oid from (select oid from ###asn1id where well_known = '1' union select oid from ###iri where well_known = '1') a order by ".OIDplus::db()->natOrder('oid'));
$res = OIDplus::db()->query("select a.oid from (".
"select oid from ###asn1id where well_known = ? union ".
"select oid from ###iri where well_known = ?) a ".
"order by ".OIDplus::db()->natOrder('oid'), array(true, true));
while ($row = $res->fetch_array()) {
$asn1ids = array();
$res2 = OIDplus::db()->query("select name, standardized from ###asn1id where oid = ?", array($row['oid']));

/trunk/plugins/adminPages/120_registration/OIDplusPageAdminRegistration.class.php
262,12 → 262,12
$res = OIDplus::db()->query("select id from ###objects where " .
"(parent = 'oid:' or " .
// The following two cases are special cases e.g. if there are multiple PEN or UUID-OIDs, and the system owner decides to use the IANA PEN as root OID, but actually, it is not "his" root then! The OIDs inside the IANA PEN root are his root then!
"parent in (select oid from ###asn1id where well_known = 1) or " .
"parent in (select oid from ###iri where well_known = 1)) and " .
"parent in (select oid from ###asn1id where well_known = ?) or " .
"parent in (select oid from ###iri where well_known = ?)) and " .
// We assume hereby that RAs of well-known OIDs (e.g. IANA) will not use OIDplus for allocating OIDs:
"id not in (select oid from ###asn1id where well_known = 1) and " .
"id not in (select oid from ###iri where well_known = 1) " .
"order by ".OIDplus::db()->natOrder('id'));
"id not in (select oid from ###asn1id where well_known = ?) and " .
"id not in (select oid from ###iri where well_known = ?) " .
"order by ".OIDplus::db()->natOrder('id'), array(true, true, true, true));
while ($row = $res->fetch_array()) {
$root_oids[] = substr($row['id'],strlen('oid:'));
}

/trunk/plugins/publicPages/000_objects/OIDplusPagePublicObjects.class.php
78,8 → 78,8
}
} while (true);
}
OIDplus::db()->query("delete from ###asn1id where well_known = '0' and oid not in (select id from ###objects where id like 'oid:%')");
OIDplus::db()->query("delete from ###iri where well_known = '0' and oid not in (select id from ###objects where id like 'oid:%')");
OIDplus::db()->query("delete from ###asn1id where well_known = ? and oid not in (select id from ###objects where id like 'oid:%')", array(false));
OIDplus::db()->query("delete from ###iri where well_known = ? and oid not in (select id from ###objects where id like 'oid:%')", array(false));
foreach (OIDplus::getPagePlugins() as $plugin) {
if ($plugin->implementsFeature('1.3.6.1.4.1.37476.2.5.2.3.3')) {