Subversion Repositories oidplus

Compare Revisions

Regard whitespace Rev 1049 → Rev 1050

/trunk/setup/includes/setup_base.js
108,6 → 108,8
'<i>// If you don\'t want to run setup again, you can also change most of the settings directly in this file.</i><br>' + // do not translate
'<i>// List of possible values: doc/config_values.txt</i><br>' + // do not translate
'<br>' +
'use ViaThinkSoft\\OIDplus\\OIDplus;<br>' +
'<br>' +
'OIDplus::baseConfig()->setValue(\'CONFIG_VERSION\', 2.1);<br>' +
'<br>' +
// Passwords are Base64 encoded to avoid that passwords can be read upon first sight,
123,7 → 125,7
}
}
$("#config")[0].innerHTML = $("#config")[0].innerHTML +
'<br>' +
//'<br>' +
'OIDplus::baseConfig()->setValue(\'TABLENAME_PREFIX\', \''+$("#tablename_prefix")[0].value+'\');<br>' +
'<br>' +
'OIDplus::baseConfig()->setValue(\'SERVER_SECRET\', \''+generateRandomString(32)+'\');<br>' +
/trunk/setup/index.php
17,6 → 17,11
* limitations under the License.
*/
 
use ViaThinkSoft\OIDplus\OIDplus;
use ViaThinkSoft\OIDplus\OIDplusDatabasePlugin;
use ViaThinkSoft\OIDplus\OIDplusSqlSlangPlugin;
use ViaThinkSoft\OIDplus\OIDplusCaptchaPlugin;
 
require_once __DIR__ . '/../includes/oidplus.inc.php';
 
define('BASECONFIG_FILE', 'userdata/baseconfig/config.inc.php');
90,7 → 95,7
 
echo _L('Database plugin').': <select name="db_plugin" onChange="dbplugin_changed()" id="db_plugin">';
 
OIDplus::registerAllPlugins('database', 'OIDplusDatabasePlugin', array('OIDplus','registerDatabasePlugin'));
OIDplus::registerAllPlugins('database', OIDplusDatabasePlugin::class, array(OIDplus::class,'registerDatabasePlugin'));
foreach (OIDplus::getDatabasePlugins() as $plugin) {
$selected = $plugin::id() == 'MySQL' ? ' selected="true"' : '';
echo '<option value="'.htmlentities($plugin::id()).'"'.$selected.'>'.htmlentities($plugin::id()).'</option>';
100,7 → 105,7
 
echo '<div style="margin-left:50px">';
 
OIDplus::registerAllPlugins('sqlSlang', 'OIDplusSqlSlangPlugin', array('OIDplus','registerSqlSlangPlugin'));
OIDplus::registerAllPlugins('sqlSlang', OIDplusSqlSlangPlugin::class, array(OIDplus::class,'registerSqlSlangPlugin'));
$sql_slang_selection = array();
foreach (OIDplus::getSqlSlangPlugins() as $plugin) {
$slang_id = $plugin::id();
111,7 → 116,7
$sql_slang_selection = implode("\n", $sql_slang_selection);
 
$found_db_plugins = 0;
//OIDplus::registerAllPlugins('database', 'OIDplusDatabasePlugin', array('OIDplus','registerDatabasePlugin'));
//OIDplus::registerAllPlugins('database', OIDplusDatabasePlugin::class, array(OIDplus::class,'registerDatabasePlugin'));
foreach (OIDplus::getDatabasePlugins() as $plugin) {
$found_db_plugins++;
$cont = $plugin->setupHTML();
135,7 → 140,7
 
echo _L('CAPTCHA plugin').': <select name="captcha_plugin" onChange="captchaplugin_changed()" id="captcha_plugin">';
 
OIDplus::registerAllPlugins('captcha', 'OIDplusCaptchaPlugin', array('OIDplus','registerCaptchaPlugin'));
OIDplus::registerAllPlugins('captcha', OIDplusCaptchaPlugin::class, array(OIDplus::class,'registerCaptchaPlugin'));
foreach (OIDplus::getCaptchaPlugins() as $plugin) {
$selected = strtolower($plugin::id()) === strtolower('None') ? ' selected="true"' : ''; // select "None" by default
echo '<option value="'.htmlentities($plugin::id()).'"'.$selected.'>'.htmlentities($plugin::id()).'</option>';
/trunk/setup/setup.min.css.php
18,6 → 18,7
*/
 
use MatthiasMullie\Minify;
use ViaThinkSoft\OIDplus\OIDplus;
 
require_once __DIR__ . '/../includes/oidplus.inc.php';
 
/trunk/setup/setup.min.js.php
17,6 → 17,8
* limitations under the License.
*/
 
use ViaThinkSoft\OIDplus\OIDplus;
use ViaThinkSoft\OIDplus\OIDplusLanguagePlugin;
use MatthiasMullie\Minify;
 
require_once __DIR__ . '/../includes/oidplus.inc.php';
33,7 → 35,7
 
$files[] = 'var DEFAULT_LANGUAGE = '.json_encode(OIDplus::getDefaultLang()).';';
 
OIDplus::registerAllPlugins('language', 'OIDplusLanguagePlugin', null);
OIDplus::registerAllPlugins('language', OIDplusLanguagePlugin::class, null);
$translation_array = OIDplus::getTranslationArray();
$files[] = 'var language_messages = '.json_encode($translation_array).';';
 
/trunk/setup/struct_empty.sql.php
17,6 → 17,9
* limitations under the License.
*/
 
use ViaThinkSoft\OIDplus\OIDplus;
use ViaThinkSoft\OIDplus\OIDplusSqlSlangPlugin;
 
include_once __DIR__ . '/../includes/oidplus.inc.php';
 
$prefix = isset($_REQUEST['prefix']) ? $_REQUEST['prefix'] : '';
23,7 → 26,7
$database = isset($_REQUEST['database']) ? $_REQUEST['database'] : '';
$slang = isset($_REQUEST['slang']) ? $_REQUEST['slang'] : 'mysql';
 
OIDplus::registerAllPlugins('sqlSlang', 'OIDplusSqlSlangPlugin', array('OIDplus','registerSqlSlangPlugin'));
OIDplus::registerAllPlugins('sqlSlang', OIDplusSqlSlangPlugin::class, array(OIDplus::class,'registerSqlSlangPlugin'));
$slang_plugin = null;
foreach (OIDplus::getSqlSlangPlugins() as $plugin) {
if ($plugin::id() === $slang) {
/trunk/setup/struct_with_examples.sql.php
17,6 → 17,9
* limitations under the License.
*/
 
use ViaThinkSoft\OIDplus\OIDplus;
use ViaThinkSoft\OIDplus\OIDplusSqlSlangPlugin;
 
include_once __DIR__ . '/../includes/oidplus.inc.php';
 
$prefix = isset($_REQUEST['prefix']) ? $_REQUEST['prefix'] : '';
23,7 → 26,7
$database = isset($_REQUEST['database']) ? $_REQUEST['database'] : '';
$slang = isset($_REQUEST['slang']) ? $_REQUEST['slang'] : 'mysql';
 
OIDplus::registerAllPlugins('sqlSlang', 'OIDplusSqlSlangPlugin', array('OIDplus','registerSqlSlangPlugin'));
OIDplus::registerAllPlugins('sqlSlang', OIDplusSqlSlangPlugin::class, array(OIDplus::class,'registerSqlSlangPlugin'));
$slang_plugin = null;
foreach (OIDplus::getSqlSlangPlugins() as $plugin) {
if ($plugin::id() === $slang) {