Subversion Repositories oidplus

Compare Revisions

Regard whitespace Rev 1063 → Rev 1064

/trunk/plugins/viathinksoft/adminPages/920_nostalgia/OIDplusPageAdminNostalgia.class.php
42,9 → 42,8
$out['text'] .= '<ul>';
$out['text'] .= '<li><a href="'.OIDplus::webpath(__DIR__,OIDplus::PATH_RELATIVE).'export_dos.php">'._L('Download OIDplus for DOS').'</a>, '._L('including your database* (only OIDs)').'</li>';
$out['text'] .= '<li><a href="https://www.viathinksoft.de/download/252/oidplus_dos.zip">'._L('Download OIDplus for DOS').'</a>, '._L('without data').'</li>';
$out['text'] .= '<li><a href="'.OIDplus::webpath(__DIR__,OIDplus::PATH_RELATIVE).'export_win.php">'._L('Download OIDplus for Windows 3.11').'</a>, '._L('including your database* (only OIDs)').'</li>';
$out['text'] .= '<li><a href="'.OIDplus::webpath(__DIR__,OIDplus::PATH_RELATIVE).'export_win.php">'._L('Download OIDplus for Windows 3.11, 95, or later').'</a>, '._L('including your database* (only OIDs)').'</li>';
$out['text'] .= '<li><a href="https://www.viathinksoft.de/download/254/oidplus_win311.zip">'._L('Download OIDplus for Windows 3.11').'</a>, '._L('without data').'</li>';
$out['text'] .= '<li><a href="'.OIDplus::webpath(__DIR__,OIDplus::PATH_RELATIVE).'export_win.php">'._L('Download OIDplus for Windows 95 or later').'</a>, '._L('including your database* (only OIDs)').'</li>';
$out['text'] .= '<li><a href="https://www.viathinksoft.de/download/253/oidplus_win95.zip">'._L('Download OIDplus for Windows 95 or later').'</a>, '._L('without data').'</li>';
$out['text'] .= '</ul>';
$out['text'] .= '<p>'._L('* Please note that the download might be delayed since your OID database is exported and added to the ZIP file.').'</p>';
/trunk/plugins/viathinksoft/adminPages/920_nostalgia/export_dos.php
64,8 → 64,8
$dos_ids[$oid] = str_pad(strval($i++), 8, '0', STR_PAD_LEFT);
fill_asn1($oid, $asn1);
fill_iri($oid, $iri);
$title[$oid] = $row->title;
$description[$oid] = $row->description;
$title[$oid] = vts_utf8_decode($row->title);
$description[$oid] = vts_utf8_decode($row->description);
 
if ((oid_len($oid) > 1) && ($parent_oid == '')) {
do {
81,8 → 81,8
$description[$real_parent] = '';
$res2 = OIDplus::db()->query("select * from ###objects where id = 'oid:$real_parent'");
while ($row2 = $res2->fetch_object()) {
$title[$real_parent] = $row2->title;
$description[$real_parent] = $row2->description;
$title[$real_parent] = vts_utf8_decode($row2->title);
$description[$real_parent] = vts_utf8_decode($row2->description);
}
 
// next
/trunk/plugins/viathinksoft/adminPages/920_nostalgia/export_win.php
66,8 → 66,8
$dos_ids[$oid] = str_pad(strval($i++), 8, '0', STR_PAD_LEFT);
fill_asn1($oid, $asn1);
//fill_iri($oid, $iri);
$title[$oid] = $row->title;
$description[$oid] = $row->description;
$title[$oid] = vts_utf8_decode($row->title);
$description[$oid] = vts_utf8_decode($row->description);
$created[$oid] = $row->created;
$updated[$oid] = $row->updated;
 
87,8 → 87,8
$updated[$real_parent] = '';
$res2 = OIDplus::db()->query("select * from ###objects where id = 'oid:$real_parent'");
while ($row2 = $res2->fetch_object()) {
$title[$real_parent] = $row2->title;
$description[$real_parent] = $row2->description;
$title[$real_parent] = vts_utf8_decode($row2->title);
$description[$real_parent] = vts_utf8_decode($row2->description);
$created[$real_parent] = $row2->created;
$updated[$real_parent] = $row2->updated;
}
122,7 → 122,7
$i++;
}
}
$cont .= "delegates=".($i-1)."\n";
$cont .= "delegates=".($i-1)."\r\n";
 
if ($oid != '') {
$asnids = array();
/trunk/plugins/viathinksoft/language/dede/messages.xml
1878,6 → 1878,14
</message>
<message>
<source><![CDATA[
Download OIDplus for Windows 3.11, 95, or later
]]></source>
<target><![CDATA[
OIDplus für Windows 3.11, 95 oder neuer herunterladen
]]></target>
</message>
<message>
<source><![CDATA[
Download OIDplus for Windows 95 or later
]]></source>
<target><![CDATA[
/trunk/vendor/danielmarschall/php_utils/misc_functions.inc.php
107,6 → 107,19
return $res;
}
 
function vts_utf8_decode($text) {
$enc = mb_detect_encoding($text, null, true);
if ($enc === false) $enc = mb_detect_encoding($text, ['ASCII', 'UTF-8', 'Windows-1252', 'ISO-8859-1'], true);
if ($enc === false) $enc = null;
 
if ($enc !== 'UTF-8') return $text;
 
$res = mb_convert_encoding($text, 'Windows-1252', $enc);
if ($res === false) $res = iconv('Windows-1252', 'Windows-1252//IGNORE', $text);
 
return $res;
}
 
function stripHtmlComments($html) {
// https://stackoverflow.com/questions/11337332/how-to-remove-html-comments-in-php
$html = preg_replace("~<!--(?!<!)[^\[>].*?-->~s", "", $html);