Subversion Repositories oidplus

Compare Revisions

Regard whitespace Rev 984 → Rev 985

/trunk/includes/oidplus_functions.js
30,6 → 30,8
// Source: https://stackoverflow.com/questions/22581345/click-button-copy-to-clipboard-using-jquery
// Modified (see below)
 
// TODO: this function causes the page to scroll!
 
// create hidden text element, if it doesn't already exist
var targetId = "_hiddenCopyText_";
var isInput = elem.tagName === "INPUT" || elem.tagName === "TEXTAREA";
/trunk/plugins/viathinksoft/database/mysqli/OIDplusDatabasePluginMySQLiSetup.js
63,8 → 63,8
 
$("#struct_1")[0].href = setupdir+'struct_empty.sql.php?plugin=mysql&prefix='+encodeURI($("#tablename_prefix")[0].value)+'&database='+encodeURI($("#mysql_database")[0].value)+'&slang=mysql';
$("#struct_2")[0].href = setupdir+'struct_with_examples.sql.php?plugin=mysql&prefix='+encodeURI($("#tablename_prefix")[0].value)+'&database='+encodeURI($("#mysql_database")[0].value)+'&slang=mysql';
$("#struct_cli_1")[0].innerHTML = '<br>'+_L('or via command line:')+'<br><code>curl -s "'+$("#struct_1")[0].href+'" | mysql -u '+$("#mysql_username")[0].value+' -p</code>';
$("#struct_cli_2")[0].innerHTML = '<br>'+_L('or via command line:')+'<br><code>curl -s "'+$("#struct_2")[0].href+'" | mysql -u '+$("#mysql_username")[0].value+' -p</code>';
$("#struct_cli_1")[0].innerHTML = '<br>'+_L('or via command line:')+'<br><code id="struct_cli_1_code">curl -s "'+$("#struct_1")[0].href+'" | mysql -u '+$("#mysql_username")[0].value+' -p</code><br><input type="button" value="'+_L('Copy to clipboard')+'" onClick="copyToClipboard(struct_cli_1_code)">';
$("#struct_cli_2")[0].innerHTML = '<br>'+_L('or via command line:')+'<br><code id="struct_cli_2_code">curl -s "'+$("#struct_2")[0].href+'" | mysql -u '+$("#mysql_username")[0].value+' -p</code><br><input type="button" value="'+_L('Copy to clipboard')+'" onClick="copyToClipboard(struct_cli_2_code)">';
 
return !error;
});
/trunk/plugins/viathinksoft/database/odbc/OIDplusDatabasePluginODBCSetup.js
54,11 → 54,11
$("#struct_1")[0].href = setupdir+'struct_empty.sql.php?plugin=odbc&prefix='+encodeURI($("#tablename_prefix")[0].value)+'&slang='+encodeURI($("#odbc_slang")[0].value);
$("#struct_2")[0].href = setupdir+'struct_with_examples.sql.php?plugin=odbc&prefix='+encodeURI($("#tablename_prefix")[0].value)+'&slang='+encodeURI($("#odbc_slang")[0].value);
if ($("#odbc_slang")[0].value == 'mysql') {
$("#struct_cli_1")[0].innerHTML = '<br>'+_L('or via command line:')+'<br><code>curl -s "'+$("#struct_1")[0].href+'" | mysql -u '+$("#odbc_username")[0].value+' -p</code>';
$("#struct_cli_2")[0].innerHTML = '<br>'+_L('or via command line:')+'<br><code>curl -s "'+$("#struct_2")[0].href+'" | mysql -u '+$("#odbc_username")[0].value+' -p</code>';
$("#struct_cli_1")[0].innerHTML = '<br>'+_L('or via command line:')+'<br><code id="struct_cli_1_code">curl -s "'+$("#struct_1")[0].href+'" | mysql -u '+$("#odbc_username")[0].value+' -p</code><br><input type="button" value="'+_L('Copy to clipboard')+'" onClick="copyToClipboard(struct_cli_1_code)">';
$("#struct_cli_2")[0].innerHTML = '<br>'+_L('or via command line:')+'<br><code id="struct_cli_2_code">curl -s "'+$("#struct_2")[0].href+'" | mysql -u '+$("#odbc_username")[0].value+' -p</code><br><input type="button" value="'+_L('Copy to clipboard')+'" onClick="copyToClipboard(struct_cli_2_code)">';
} else if ($("#odbc_slang")[0].value == 'pgsql') {
$("#struct_cli_1")[0].innerHTML = '<br>'+_L('or via command line:')+'<br><code>curl -s "'+$("#struct_1")[0].href+'" | psql -h <font color="red">localhost</font> -U '+$("#odbc_username")[0].value+' -d <font color="red">oidplus</font> -a</code>';
$("#struct_cli_2")[0].innerHTML = '<br>'+_L('or via command line:')+'<br><code>curl -s "'+$("#struct_2")[0].href+'" | psql -h <font color="red">localhost</font> -U '+$("#odbc_username")[0].value+' -d <font color="red">oidplus</font> -a</code>';
$("#struct_cli_1")[0].innerHTML = '<br>'+_L('or via command line:')+'<br><code id="struct_cli_1_code">curl -s "'+$("#struct_1")[0].href+'" | psql -h <font color="red">localhost</font> -U '+$("#odbc_username")[0].value+' -d <font color="red">oidplus</font> -a</code><br><input type="button" value="'+_L('Copy to clipboard')+'" onClick="copyToClipboard(struct_cli_1_code)">';
$("#struct_cli_2")[0].innerHTML = '<br>'+_L('or via command line:')+'<br><code id="struct_cli_2_code">curl -s "'+$("#struct_2")[0].href+'" | psql -h <font color="red">localhost</font> -U '+$("#odbc_username")[0].value+' -d <font color="red">oidplus</font> -a</code><br><input type="button" value="'+_L('Copy to clipboard')+'" onClick="copyToClipboard(struct_cli_2_code)">';
} else {
$("#struct_cli_1")[0].innerHTML = '';
$("#struct_cli_2")[0].innerHTML = '';
/trunk/plugins/viathinksoft/database/pdo/OIDplusDatabasePluginPDOSetup.js
54,11 → 54,11
$("#struct_1")[0].href = setupdir+'struct_empty.sql.php?plugin=pdo&prefix='+encodeURI($("#tablename_prefix")[0].value)+'&slang='+encodeURI($("#pdo_slang")[0].value);
$("#struct_2")[0].href = setupdir+'struct_with_examples.sql.php?plugin=pdo&prefix='+encodeURI($("#tablename_prefix")[0].value)+'&slang='+encodeURI($("#pdo_slang")[0].value);
if ($("#pdo_slang")[0].value == 'mysql') {
$("#struct_cli_1")[0].innerHTML = '<br>'+_L('or via command line:')+'<br><code>curl -s "'+$("#struct_1")[0].href+'" | mysql -u '+$("#pdo_username")[0].value+' -p</code>';
$("#struct_cli_2")[0].innerHTML = '<br>'+_L('or via command line:')+'<br><code>curl -s "'+$("#struct_2")[0].href+'" | mysql -u '+$("#pdo_username")[0].value+' -p</code>';
$("#struct_cli_1")[0].innerHTML = '<br>'+_L('or via command line:')+'<br><code id="struct_cli_1_code">curl -s "'+$("#struct_1")[0].href+'" | mysql -u '+$("#pdo_username")[0].value+' -p</code><br><input type="button" value="'+_L('Copy to clipboard')+'" onClick="copyToClipboard(struct_cli_1_code)">';
$("#struct_cli_2")[0].innerHTML = '<br>'+_L('or via command line:')+'<br><code id="struct_cli_2_code">curl -s "'+$("#struct_2")[0].href+'" | mysql -u '+$("#pdo_username")[0].value+' -p</code><br><input type="button" value="'+_L('Copy to clipboard')+'" onClick="copyToClipboard(struct_cli_2_code)">';
} else if ($("#pdo_slang")[0].value == 'pgsql') {
$("#struct_cli_1")[0].innerHTML = '<br>'+_L('or via command line:')+'<br><code>curl -s "'+$("#struct_1")[0].href+'" | psql -h <font color="red">localhost</font> -U '+$("#pdo_username")[0].value+' -d <font color="red">oidplus</font> -a</code>';
$("#struct_cli_2")[0].innerHTML = '<br>'+_L('or via command line:')+'<br><code>curl -s "'+$("#struct_2")[0].href+'" | psql -h <font color="red">localhost</font> -U '+$("#pdo_username")[0].value+' -d <font color="red">oidplus</font> -a</code>';
$("#struct_cli_1")[0].innerHTML = '<br>'+_L('or via command line:')+'<br><code id="struct_cli_1_code">curl -s "'+$("#struct_1")[0].href+'" | psql -h <font color="red">localhost</font> -U '+$("#pdo_username")[0].value+' -d <font color="red">oidplus</font> -a</code><br><input type="button" value="'+_L('Copy to clipboard')+'" onClick="copyToClipboard(struct_cli_1_code)">';
$("#struct_cli_2")[0].innerHTML = '<br>'+_L('or via command line:')+'<br><code id="struct_cli_2_code">curl -s "'+$("#struct_2")[0].href+'" | psql -h <font color="red">localhost</font> -U '+$("#pdo_username")[0].value+' -d <font color="red">oidplus</font> -a</code><br><input type="button" value="'+_L('Copy to clipboard')+'" onClick="copyToClipboard(struct_cli_2_code)">';
} else {
$("#struct_cli_1")[0].innerHTML = '';
$("#struct_cli_2")[0].innerHTML = '';
/trunk/plugins/viathinksoft/database/pgsql/OIDplusDatabasePluginPgSqlSetup.js
63,8 → 63,8
 
$("#struct_1")[0].href = setupdir+'struct_empty.sql.php?plugin=pgsql&prefix='+encodeURI($("#tablename_prefix")[0].value)+'&database='+encodeURI($("#pgsql_database")[0].value)+'&slang=pgsql';
$("#struct_2")[0].href = setupdir+'struct_with_examples.sql.php?plugin=pgsql&prefix='+encodeURI($("#tablename_prefix")[0].value)+'&database='+encodeURI($("#pgsql_database")[0].value)+'&slang=pgsql';
$("#struct_cli_1")[0].innerHTML = '<br>'+_L('or via command line:')+'<br><code>curl -s "'+$("#struct_1")[0].href+'" | psql <!-- TODO: split host/port -h '+$("#pgsql_host")[0].value+' --> -U '+$("#pgsql_username")[0].value+' -d '+$("#pgsql_database")[0].value+' -a</code>';
$("#struct_cli_2")[0].innerHTML = '<br>'+_L('or via command line:')+'<br><code>curl -s "'+$("#struct_2")[0].href+'" | psql <!-- TODO: split host/port -h '+$("#pgsql_host")[0].value+' --> -U '+$("#pgsql_username")[0].value+' -d '+$("#pgsql_database")[0].value+' -a</code>';
$("#struct_cli_1")[0].innerHTML = '<br>'+_L('or via command line:')+'<br><code id="struct_cli_1_code">curl -s "'+$("#struct_1")[0].href+'" | psql <!-- TODO: split host/port -h '+$("#pgsql_host")[0].value+' --> -U '+$("#pgsql_username")[0].value+' -d '+$("#pgsql_database")[0].value+' -a</code><br><input type="button" value="'+_L('Copy to clipboard')+'" onClick="copyToClipboard(struct_cli_1_code)">';
$("#struct_cli_2")[0].innerHTML = '<br>'+_L('or via command line:')+'<br><code id="struct_cli_2_code">curl -s "'+$("#struct_2")[0].href+'" | psql <!-- TODO: split host/port -h '+$("#pgsql_host")[0].value+' --> -U '+$("#pgsql_username")[0].value+' -d '+$("#pgsql_database")[0].value+' -a</code><br><input type="button" value="'+_L('Copy to clipboard')+'" onClick="copyToClipboard(struct_cli_2_code)">';
 
return !error;
});
/trunk/plugins/viathinksoft/database/sqlite3/OIDplusDatabasePluginSQLite3Setup.js
43,8 → 43,8
 
$("#struct_1")[0].href = setupdir+'struct_empty.sql.php?plugin=sqlite&prefix='+encodeURI($("#tablename_prefix")[0].value)+'&slang=sqlite';
$("#struct_2")[0].href = setupdir+'struct_with_examples.sql.php?plugin=sqlite&prefix='+encodeURI($("#tablename_prefix")[0].value)+'&slang=sqlite';
$("#struct_cli_1")[0].innerHTML = '<br>'+_L('or via command line:')+'<br><code>curl -s "'+$("#struct_1")[0].href+'" | sqlite3 '+$("#sqlite3_file")[0].value+'<!-- TODO: encryption key? --></code>';
$("#struct_cli_2")[0].innerHTML = '<br>'+_L('or via command line:')+'<br><code>curl -s "'+$("#struct_2")[0].href+'" | sqlite3 '+$("#sqlite3_file")[0].value+'<!-- TODO: encryption key? --></code>';
$("#struct_cli_1")[0].innerHTML = '<br>'+_L('or via command line:')+'<br><code id="struct_cli_1_code">curl -s "'+$("#struct_1")[0].href+'" | sqlite3 '+$("#sqlite3_file")[0].value+'<!-- TODO: encryption key? --></code><br><input type="button" value="'+_L('Copy to clipboard')+'" onClick="copyToClipboard(struct_cli_1_code)">';
$("#struct_cli_2")[0].innerHTML = '<br>'+_L('or via command line:')+'<br><code id="struct_cli_2_code">curl -s "'+$("#struct_2")[0].href+'" | sqlite3 '+$("#sqlite3_file")[0].value+'<!-- TODO: encryption key? --></code><br><input type="button" value="'+_L('Copy to clipboard')+'" onClick="copyToClipboard(struct_cli_2_code)">';
 
return !error;
});
/trunk/plugins/viathinksoft/language/dede/messages.xml
1910,6 → 1910,14
</message>
<message>
<source><![CDATA[
Enforcement of a secure connection:
]]></source>
<target><![CDATA[
Erzwingung einer sicheren Verbindung:
]]></target>
</message>
<message>
<source><![CDATA[
Enter your domain username and your password to log in as Registration Authority.
]]></source>
<target><![CDATA[
5606,14 → 5614,6
</message>
<message>
<source><![CDATA[
SSL enforcement
]]></source>
<target><![CDATA[
SSL-Erzwingung
]]></target>
</message>
<message>
<source><![CDATA[
SUPOID logger mask requires OID
]]></source>
<target><![CDATA[
/trunk/setup/index.php
146,7 → 146,7
 
$is_ssl = OIDplus::isSSL();
echo '<h3>'._L('Secure connection (HTTPS)').'</h3>';
echo '<p>'._L('SSL enforcement').'<br><select name="enforce_ssl" id="enforce_ssl" onchange="rebuild()">';
echo '<p>'._L('Enforcement of a secure connection:').'<br><select name="enforce_ssl" id="enforce_ssl" onchange="rebuild()">';
echo '<option value="OIDplus::ENFORCE_SSL_NO">'._L('No SSL available (don\'t redirect)').'</option>';
echo '<option value="OIDplus::ENFORCE_SSL_YES"'.($is_ssl ? ' selected' : '').'>'._L('Enforce SSL (always redirect)').'</option>';
echo '<option value="OIDplus::ENFORCE_SSL_AUTO"'.(!$is_ssl ? ' selected' : '').'>'._L('Intelligent SSL detection (redirect if port 443 is open)').'</option>';