No OneTemporary
Actions

Size

66 KB

Subscribers

None

View Options

	diff --git a/.hgignore b/.hgignore
	new file mode 100644
	--- /dev/null
	+++ b/.hgignore
	@@ -0,0 +1,2 @@
	+.project
	+.settings
	diff --git a/ajax/settings.php b/ajax/settings.php
	--- a/ajax/settings.php
	+++ b/ajax/settings.php
	@@ -1,39 +1,47 @@
	<?php

	// Init owncloud

	// Check if we are a user
	OCP\User::checkAdminUser();
	OCP\JSON::checkAppEnabled('user_sql');

	// CSRF checks
	OCP\JSON::callCheck();

	$l = new OC_L10N('use_sql');

	-$params = array('sql_host', 'sql_user', 'sql_database', 'sql_password',
	- 'sql_table', 'sql_column_username', 'sql_column_password',
	- 'sql_type', 'sql_column_active', 'strip_domain', 'default_domain',
	- 'crypt_type', 'sql_column_displayname', 'domain_settings', 'map_array', 'domain_array');
	+$params = array('sql_host', 'sql_user', 'sql_database', 'sql_password',
	+ 'sql_table', 'sql_column_username', 'sql_column_password', 'sql_type',
	+ 'sql_column_active', 'strip_domain', 'default_domain', 'crypt_type',
	+ 'sql_column_displayname', 'domain_settings', 'map_array', 'domain_array');

	-if (isset($_POST['appname']) && $_POST['appname'] == "user_sql") {
	- foreach ($params as $param) {
	- if (isset($_POST[$param])) {
	- if ($param === 'strip_domain') {
	- OCP\Config::setAppValue('user_sql', 'strip_domain', true);
	- } else {
	- OCP\Config::setAppValue('user_sql', $param, $_POST[$param]);
	- }
	- } else {
	- if ($param === 'strip_domain') {
	- OCP\Config::setAppValue('user_sql', 'strip_domain', false);
	- }
	+if(isset($_POST['appname']) && $_POST['appname'] == "user_sql")
	+{
	+ foreach($params as $param)
	+ {
	+ if(isset($_POST[$param]))
	+ {
	+ if($param === 'strip_domain')
	+ {
	+ OCP\Config::setAppValue('user_sql', 'strip_domain', true);
	+ } else
	+ {
	+ OCP\Config::setAppValue('user_sql', $param, $_POST[$param]);
	+ }
	+ } else
	+ {
	+ if($param === 'strip_domain')
	+ {
	+ OCP\Config::setAppValue('user_sql', 'strip_domain', false);
	+ }
	+ }
	}
	- }
	-} else {
	- OC_JSON::error(array("data" => array( "message" => $l->t("Not submitted for us.") )));
	- return false;
	+} else
	+{
	+ OC_JSON::error(array("data" => array("message" => $l -> t("Not submitted for us."))));
	+ return false;
	}

	-OCP\JSON::success(array('data' => array( 'message' => $l->t('Application settings successfully stored.') )));
	+OCP\JSON::success(array('data' => array('message' => $l -> t('Application settings successfully stored.'))));
	return true;
	diff --git a/js/settings.js b/js/settings.js
	--- a/js/settings.js
	+++ b/js/settings.js
	@@ -1,131 +1,158 @@
	// declare namespace
	-var user_sql = user_sql \|\| {};
	+var user_sql = user_sql \|\|
	+{
	+};

	-user_sql.adminSettingsCheckRadio = function() {
	- if($('#domain_none').attr("checked") == "checked")
	- {
	- $('#default_domain').attr("disabled", true);
	+user_sql.adminSettingsCheckRadio = function()
	+{
	+ if($('#domain_none').attr("checked") == "checked")
	+ {
	+ $('#default_domain').attr("disabled", true);
	$('#inputServerDomain').attr("disabled", true);
	$('#inputMapDomain').attr("disabled", true);
	$('#domainAddMap').attr("disabled", true);
	- }
	- else if($('#domain_server').attr("checked") == "checked")
	- {
	- $('#default_domain').attr("disabled", true);
	+ } else if($('#domain_server').attr("checked") == "checked")
	+ {
	+ $('#default_domain').attr("disabled", true);
	$('#inputServerDomain').attr("disabled", true);
	$('#inputMapDomain').attr("disabled", true);
	$('#domainAddMap').attr("disabled", true);
	- }
	- else if($('#domain_mapping').attr("checked") == "checked")
	- {
	- $('#default_domain').attr("disabled", true);
	+ } else if($('#domain_mapping').attr("checked") == "checked")
	+ {
	+ $('#default_domain').attr("disabled", true);
	$('#inputServerDomain').removeAttr("disabled");
	$('#inputMapDomain').removeAttr("disabled");
	$('#domainAddMap').removeAttr("disabled");
	- }
	- else if($('#domain_default').attr("checked") == "checked")
	- {
	- $('#default_domain').removeAttr("disabled");
	+ } else if($('#domain_default').attr("checked") == "checked")
	+ {
	+ $('#default_domain').removeAttr("disabled");
	$('#inputServerDomain').attr("disabled", true);
	$('#inputMapDomain').attr("disabled", true);
	$('#domainAddMap').attr("disabled", true);
	- }
	+ }
	};
	/**
	* init admin settings view
	*/
	-user_sql.adminSettingsUI = function() {
	+user_sql.adminSettingsUI = function()
	+{

	- if ($('#sql').length > 0) {
	- // enable tabs on settings page
	- $('#sql').tabs();
	+ if($('#sql').length > 0)
	+ {
	+ // enable tabs on settings page
	+ $('#sql').tabs();

	- $('#sqlSubmit').click(function(event) {
	- event.preventDefault();
	+ $('#sqlSubmit').click(function(event)
	+ {
	+ event.preventDefault();

	- var self = $(this);
	- var post = $('#sqlForm').serializeArray();
	- var domainArr = new Array();
	- var mapArr = new Array();
	- $('#domain_map_entries tr').each(function() {
	- var d = $(this).find("td:first").html();
	- var m = $(this).find("td").eq(1).html();
	- if(d != undefined && m != undefined)
	- {
	- mapArr.push(m);
	- domainArr.push(d);
	- }
	- });
	- post.push({name: 'map_array', value: mapArr});
	- post.push({name: 'domain_array', value: domainArr});
	- $('#sql_update_message').show();
	- $('#sql_success_message').hide();
	- $('#sql_error_message').hide();
	- // Ajax foobar
	- $.post(OC.filePath('user_sql', 'ajax', 'settings.php'), post, function(data) {
	- $('#sql_update_message').hide();
	- if (data.status == 'success') {
	- $('#sql_success_message').html(data.data.message);
	- $('#sql_success_message').show();
	- window.setTimeout(function() {
	- $('#sql_success_message').hide();
	- }, 10000);
	- } else {
	- $('#sql_error_message').html(data.data.message);
	- $('#sql_error_message').show();
	- }
	- }, 'json');
	- return false;
	- });
	-
	- $('#domain_none').click(function(event) {
	- user_sql.adminSettingsCheckRadio();
	- });
	-
	- $('#domain_server').click(function(event) {
	- user_sql.adminSettingsCheckRadio();
	- });
	-
	- $('#domain_mapping').click(function(event) {
	- user_sql.adminSettingsCheckRadio();
	- });
	-
	- $('#domain_default').click(function(event) {
	- user_sql.adminSettingsCheckRadio();
	- });
	-
	- $('#domainAddMap').click(function(event) {
	- event.preventDefault();
	- var newDomain = $('#inputServerDomain').val();
	- var newMap = $('#inputMapDomain').val();
	- $('#domain_map_entries > tbody:last').append('<tr><td>' + newDomain + '</td><td>' + newMap + '</td><td><a class="deleteLink" href="#" >delete</a></td></tr>');
	- $('#inputServerDomain').val("");
	- $('#inputMapDomain').val("");
	- $("#domain_map_entries .deleteLink").on("click",function() {
	- var tr = $(this).closest('tr');
	- tr.css("background-color","#FF3700");
	- tr.fadeOut(400, function(){
	- tr.remove();
	- });
	- return false;
	- });
	- });
	- }
	+ var self = $(this);
	+ var post = $('#sqlForm').serializeArray();
	+ var domainArr = new Array();
	+ var mapArr = new Array();
	+ $('#domain_map_entries tr').each(function()
	+ {
	+ var d = $(this).find("td:first").html();
	+ var m = $(this).find("td").eq(1).html();
	+ if(d != undefined && m != undefined)
	+ {
	+ mapArr.push(m);
	+ domainArr.push(d);
	+ }
	+ });
	+ post.push(
	+ {
	+ name : 'map_array',
	+ value : mapArr
	+ });
	+ post.push(
	+ {
	+ name : 'domain_array',
	+ value : domainArr
	+ });
	+ $('#sql_update_message').show();
	+ $('#sql_success_message').hide();
	+ $('#sql_error_message').hide();
	+ // Ajax foobar
	+ $.post(OC.filePath('user_sql', 'ajax', 'settings.php'), post, function(data)
	+ {
	+ $('#sql_update_message').hide();
	+ if(data.status == 'success')
	+ {
	+ $('#sql_success_message').html(data.data.message);
	+ $('#sql_success_message').show();
	+ window.setTimeout(function()
	+ {
	+ $('#sql_success_message').hide();
	+ }, 10000);
	+ } else
	+ {
	+ $('#sql_error_message').html(data.data.message);
	+ $('#sql_error_message').show();
	+ }
	+ }, 'json');
	+ return false;
	+ });
	+
	+ $('#domain_none').click(function(event)
	+ {
	+ user_sql.adminSettingsCheckRadio();
	+ });
	+
	+ $('#domain_server').click(function(event)
	+ {
	+ user_sql.adminSettingsCheckRadio();
	+ });
	+
	+ $('#domain_mapping').click(function(event)
	+ {
	+ user_sql.adminSettingsCheckRadio();
	+ });
	+
	+ $('#domain_default').click(function(event)
	+ {
	+ user_sql.adminSettingsCheckRadio();
	+ });
	+
	+ $('#domainAddMap').click(function(event)
	+ {
	+ event.preventDefault();
	+ var newDomain = $('#inputServerDomain').val();
	+ var newMap = $('#inputMapDomain').val();
	+ $('#domain_map_entries > tbody:last').append('<tr><td>' + newDomain + '</td><td>' + newMap + '</td><td><a class="deleteLink" href="#" >delete</a></td></tr>');
	+ $('#inputServerDomain').val("");
	+ $('#inputMapDomain').val("");
	+ $("#domain_map_entries .deleteLink").on("click", function()
	+ {
	+ var tr = $(this).closest('tr');
	+ tr.css("background-color", "#FF3700");
	+ tr.fadeOut(400, function()
	+ {
	+ tr.remove();
	+ });
	+ return false;
	+ });
	+ });
	+ }
	};

	-$(document).ready(function() {
	- if ($('#sql')) {
	- user_sql.adminSettingsUI();
	- user_sql.adminSettingsCheckRadio();
	-
	- $("#domain_map_entries .deleteLink").on("click",function() {
	- var tr = $(this).closest('tr');
	- tr.css("background-color","#FF3700");
	- tr.fadeOut(400, function(){
	- tr.remove();
	- });
	- return false;
	- });
	- }
	+$(document).ready(function()
	+{
	+ if($('#sql'))
	+ {
	+ user_sql.adminSettingsUI();
	+ user_sql.adminSettingsCheckRadio();
	+
	+ $("#domain_map_entries .deleteLink").on("click", function()
	+ {
	+ var tr = $(this).closest('tr');
	+ tr.css("background-color", "#FF3700");
	+ tr.fadeOut(400, function()
	+ {
	+ tr.remove();
	+ });
	+ return false;
	+ });
	+ }
	});

	diff --git a/settings.php b/settings.php
	--- a/settings.php
	+++ b/settings.php
	@@ -1,61 +1,60 @@
	<?php

	/**
	* ownCloud - user_sql
	*
	* @author Andreas Böhler
	* @copyright 2012 Andreas Böhler <andreas (at) aboehler (dot) at>
	*
	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
	* License as published by the Free Software Foundation; either
	* version 3 of the License, or any later version.
	*
	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
	*
	* You should have received a copy of the GNU Affero General Public
	* License along with this library. If not, see <http://www.gnu.org/licenses/>.
	*
	*/
	-$params = array('sql_host', 'sql_user', 'sql_database', 'sql_password',
	- 'sql_table', 'sql_column_username', 'sql_column_password',
	- 'sql_type', 'sql_column_active', 'strip_domain', 'default_domain',
	- 'crypt_type', 'sql_column_displayname', 'domain_map', 'domain_settings');
	+$params = array('sql_host', 'sql_user', 'sql_database', 'sql_password', 'sql_table',
	+ 'sql_column_username', 'sql_column_password', 'sql_type', 'sql_column_active',
	+ 'strip_domain', 'default_domain', 'crypt_type', 'sql_column_displayname', 'domain_map', 'domain_settings');

	OCP\Util::addStyle('user_sql', 'settings');
	OCP\Util::addScript('user_sql', 'settings');
	OCP\User::checkAdminUser();

	// fill template
	-$tmpl = new OCP\Template( 'user_sql', 'settings');
	-foreach($params as $param){
	- $value = htmlentities(OCP\Config::getAppValue('user_sql', $param,''));
	- $tmpl->assign($param, $value);
	+$tmpl = new OCP\Template('user_sql', 'settings');
	+foreach($params as $param)
	+{
	+ $value = htmlentities(OCP\Config::getAppValue('user_sql', $param, ''));
	+ $tmpl -> assign($param, $value);
	}

	// settings with default values
	-$tmpl->assign( 'sql_host', OCP\Config::getAppValue('user_sql', 'sql_host', OC_USER_BACKEND_SQL_DEFAULT_HOST));
	-$tmpl->assign( 'sql_user', OCP\Config::getAppValue('user_sql', 'sql_user', OC_USER_BACKEND_SQL_DEFAULT_USER));
	-$tmpl->assign( 'sql_database', OCP\Config::getAppValue( 'user_sql', 'sql_database', OC_USER_BACKEND_SQL_DEFAULT_DB));
	-$tmpl->assign( 'sql_password', OCP\Config::getAppValue( 'user_sql', 'sql_password', OC_USER_BACKEND_SQL_DEFAULT_PASSWORD));
	-$tmpl->assign( 'sql_table', OCP\Config::getAppValue( 'user_sql', 'sql_table', OC_USER_BACKEND_SQL_DEFAULT_TABLE));
	-$tmpl->assign( 'sql_column_password', OCP\Config::getAppValue( 'user_sql', 'sql_column_password', OC_USER_BACKEND_SQL_DEFAULT_PW_COLUMN));
	-$tmpl->assign( 'sql_column_username', OCP\Config::getAppValue( 'user_sql', 'sql_column_username', OC_USER_BACKEND_SQL_DEFAULT_USER_COLUMN));
	-$tmpl->assign( 'sql_type', OCP\Config::getAppValue( 'user_sql', 'sql_type', OC_USER_BACKEND_SQL_DEFAULT_DRIVER));
	-$tmpl->assign( 'sql_column_active', OCP\Config::getAppValue( 'user_sql', 'sql_column_active', ''));
	-$tmpl->assign( 'strip_domain', OCP\Config::getAppValue( 'user_sql', 'strip_domain', 0));
	-$tmpl->assign( 'default_domain', OCP\Config::getAppValue( 'user_sql', 'default_domain', ''));
	-$tmpl->assign( 'crypt_type', OCP\Config::getAppValue( 'user_sql', 'crypt_type', 'mysql_encrypt'));
	-$tmpl->assign( 'sql_column_displayname', OCP\Config::getAppValue( 'user_sql', 'sql_column_displayname', ''));
	-$tmpl->assign( 'map_array', OCP\Config::getAppValue( 'user_sql', 'map_array', ''));
	-$tmpl->assign( 'domain_array', OCP\Config::getAppValue( 'user_sql', 'domain_array', ''));
	-$tmpl->assign( 'domain_settings', OCP\Config::getAppValue( 'user_sql', 'domain_settings', ''));
	+$tmpl -> assign('sql_host', OCP\Config::getAppValue('user_sql', 'sql_host', OC_USER_BACKEND_SQL_DEFAULT_HOST));
	+$tmpl -> assign('sql_user', OCP\Config::getAppValue('user_sql', 'sql_user', OC_USER_BACKEND_SQL_DEFAULT_USER));
	+$tmpl -> assign('sql_database', OCP\Config::getAppValue('user_sql', 'sql_database', OC_USER_BACKEND_SQL_DEFAULT_DB));
	+$tmpl -> assign('sql_password', OCP\Config::getAppValue('user_sql', 'sql_password', OC_USER_BACKEND_SQL_DEFAULT_PASSWORD));
	+$tmpl -> assign('sql_table', OCP\Config::getAppValue('user_sql', 'sql_table', OC_USER_BACKEND_SQL_DEFAULT_TABLE));
	+$tmpl -> assign('sql_column_password', OCP\Config::getAppValue('user_sql', 'sql_column_password', OC_USER_BACKEND_SQL_DEFAULT_PW_COLUMN));
	+$tmpl -> assign('sql_column_username', OCP\Config::getAppValue('user_sql', 'sql_column_username', OC_USER_BACKEND_SQL_DEFAULT_USER_COLUMN));
	+$tmpl -> assign('sql_type', OCP\Config::getAppValue('user_sql', 'sql_type', OC_USER_BACKEND_SQL_DEFAULT_DRIVER));
	+$tmpl -> assign('sql_column_active', OCP\Config::getAppValue('user_sql', 'sql_column_active', ''));
	+$tmpl -> assign('strip_domain', OCP\Config::getAppValue('user_sql', 'strip_domain', 0));
	+$tmpl -> assign('default_domain', OCP\Config::getAppValue('user_sql', 'default_domain', ''));
	+$tmpl -> assign('crypt_type', OCP\Config::getAppValue('user_sql', 'crypt_type', 'mysql_encrypt'));
	+$tmpl -> assign('sql_column_displayname', OCP\Config::getAppValue('user_sql', 'sql_column_displayname', ''));
	+$tmpl -> assign('map_array', OCP\Config::getAppValue('user_sql', 'map_array', ''));
	+$tmpl -> assign('domain_array', OCP\Config::getAppValue('user_sql', 'domain_array', ''));
	+$tmpl -> assign('domain_settings', OCP\Config::getAppValue('user_sql', 'domain_settings', ''));
	// workaround to detect OC version
	$ocVersion = @reset(OCP\Util::getVersion());
	-$tmpl->assign('ocVersion', $ocVersion);
	+$tmpl -> assign('ocVersion', $ocVersion);

	-
	-return $tmpl->fetchPage();
	+return $tmpl -> fetchPage();
	diff --git a/templates/settings.php b/templates/settings.php
	--- a/templates/settings.php
	+++ b/templates/settings.php
	@@ -1,97 +1,111 @@
	-<?php
	-$ocVersion = $_['ocVersion'];
	+<?php $ocVersion = $_['ocVersion'];
	$cfgClass = $ocVersion >= 7 ? 'section' : 'personalblock';
	-
	?>


	<form id="sqlForm" action="#" method="post" class="<?php echo $cfgClass; ?>">

	<div id="sql" class="<?php echo $cfgClass; ?>">
	- <legend><strong><?php echo $l->t('SQL'); ?></strong></legend>
	+ <legend><strong><?php echo $l -> t('SQL'); ?></strong></legend>
	<ul>
	<li><a id="sqlBasicSettings" href="#sql-1"><?php echo $l -> t('Database Settings'); ?></a></li>
	- <li><a id="sqlAdvSettings" href="#sql-2"><?php echo $l->t('Column/Password Settings'); ?></a></li>
	- <li><a id="sqlDomainSettings" href="#sql-3"><?php echo $l->t('Domain Settings'); ?></a></li>
	+ <li><a id="sqlAdvSettings" href="#sql-2"><?php echo $l -> t('Column/Password Settings'); ?></a></li>
	+ <li><a id="sqlDomainSettings" href="#sql-3"><?php echo $l -> t('Domain Settings'); ?></a></li>
	</ul>

	<fieldset id="sql-1">
	<table>
	- <tr><td><label for="sql_type"><?php echo $l->t('SQL Driver');?></label></td>
	- <?php $db_driver = array('mysql' => 'MySQL', 'pgsql' => 'PostgreSQL');?>
	+ <tr><td><label for="sql_type"><?php echo $l -> t('SQL Driver'); ?></label></td>
	+ <?php $db_driver = array('mysql' => 'MySQL', 'pgsql' => 'PostgreSQL'); ?>
	<td><select id="sql_type" name="sql_type">
	<?php
	foreach ($db_driver as $driver => $name):
	echo $_['sql_type'];
	if($_['sql_type'] == $driver): ?>
	<option selected="selected" value="<?php echo $driver; ?>"><?php echo $name; ?></option>
	<?php else: ?>
	<option value="<?php echo $driver; ?>"><?php echo $name; ?></option>
	<?php endif;
	- endforeach; ?>
	+ endforeach;
	+ ?>
	</select></td>
	</tr>

	- <tr><td><label for="sql_host"><?php echo $l->t('Host');?></label></td><td><input type="text" id="sql_host" name="sql_host" value="<?php echo $_['sql_host']; ?>"></td></tr>
	- <tr><td><label for="sql_user"><?php echo $l->t('Username');?></label></td><td><input type="text" id="sql_user" name="sql_user" value="<?php echo $_['sql_user']; ?>" /></td></tr>
	- <tr><td><label for="sql_database"><?php echo $l->t('Database');?></label></td><td><input type="text" id="sql_database" name="sql_database" value="<?php echo $_['sql_database']; ?>" /></td></tr>
	- <tr><td><label for="sql_password"><?php echo $l->t('Password');?></label></td><td><input type="password" id="sql_password" name="sql_password" value="<?php echo $_['sql_password']; ?>" /></td></tr>
	- <tr><td><label for="sql_table"><?php echo $l->t('Table');?></label></td><td><input type="text" id="sql_table" name="sql_table" value="<?php echo $_['sql_table']; ?>" /></td></tr>
	+ <tr><td><label for="sql_host"><?php echo $l -> t('Host'); ?></label></td><td><input type="text" id="sql_host" name="sql_host" value="<?php echo $_['sql_host']; ?>"></td></tr>
	+ <tr><td><label for="sql_user"><?php echo $l -> t('Username'); ?></label></td><td><input type="text" id="sql_user" name="sql_user" value="<?php echo $_['sql_user']; ?>" /></td></tr>
	+ <tr><td><label for="sql_database"><?php echo $l -> t('Database'); ?></label></td><td><input type="text" id="sql_database" name="sql_database" value="<?php echo $_['sql_database']; ?>" /></td></tr>
	+ <tr><td><label for="sql_password"><?php echo $l -> t('Password'); ?></label></td><td><input type="password" id="sql_password" name="sql_password" value="<?php echo $_['sql_password']; ?>" /></td></tr>
	+ <tr><td><label for="sql_table"><?php echo $l -> t('Table'); ?></label></td><td><input type="text" id="sql_table" name="sql_table" value="<?php echo $_['sql_table']; ?>" /></td></tr>
	</table>
	</fieldset>
	<fieldset id="sql-2">
	<table>
	- <tr><td><label for="sql_column_username"><?php echo $l->t('Username Column');?></label></td><td><input type="text" id="sql_column_username" name="sql_column_username" value="<?php echo $_['sql_column_username']; ?>" /></td></tr>
	- <tr><td><label for="sql_column_password"><?php echo $l->t('Password Column');?></label></td><td><input type="text" id="sql_column_password" name="sql_column_password" value="<?php echo $_['sql_column_password']; ?>" /></td></tr>
	- <tr><td><label for="sql_column_displayname"><?php echo $l->t('Real Name Column');?></label></td><td><input type="text" id="sql_column_displayname" name="sql_column_displayname" value="<?php echo $_['sql_column_displayname']; ?>" /></td></tr>
	- <tr><td><label for="crypt_type"><?php echo $l->t('Encryption Type');?></label></td>
	- <?php $crypt_types = array('md5' => 'MD5', 'md5crypt' => 'MD5 Crypt', 'cleartext' => 'Cleartext', 'mysql_encrypt' => 'mySQL ENCRYPT()', 'system' => 'System (crypt)', 'mysql_password' => 'mySQL PASSWORD()', 'joomla' => 'Joomla MD5 Encryption');?>
	+ <tr><td><label for="sql_column_username"><?php echo $l -> t('Username Column'); ?></label></td><td><input type="text" id="sql_column_username" name="sql_column_username" value="<?php echo $_['sql_column_username']; ?>" /></td></tr>
	+ <tr><td><label for="sql_column_password"><?php echo $l -> t('Password Column'); ?></label></td><td><input type="text" id="sql_column_password" name="sql_column_password" value="<?php echo $_['sql_column_password']; ?>" /></td></tr>
	+ <tr><td><label for="sql_column_displayname"><?php echo $l -> t('Real Name Column'); ?></label></td><td><input type="text" id="sql_column_displayname" name="sql_column_displayname" value="<?php echo $_['sql_column_displayname']; ?>" /></td></tr>
	+ <tr><td><label for="crypt_type"><?php echo $l -> t('Encryption Type'); ?></label></td>
	+ <?php $crypt_types = array('md5' => 'MD5', 'md5crypt' => 'MD5 Crypt', 'cleartext' => 'Cleartext', 'mysql_encrypt' => 'mySQL ENCRYPT()', 'system' => 'System (crypt)', 'mysql_password' => 'mySQL PASSWORD()', 'joomla' => 'Joomla MD5 Encryption'); ?>
	<td><select id="crypt_type" name="crypt_type">
	<?php
	foreach ($crypt_types as $driver => $name):
	echo $_['crypt_type'];
	if($_['crypt_type'] == $driver): ?>
	<option selected="selected" value="<?php echo $driver; ?>"><?php echo $name; ?></option>
	<?php else: ?>
	<option value="<?php echo $driver; ?>"><?php echo $name; ?></option>
	<?php endif;
	- endforeach; ?>
	+ endforeach;
	+ ?>
	</select></td>
	</tr>
	- <tr><td><label for="sql_column_active"><?php echo $l->t('User Active Column');?></label></td><td><input type="text" id="sql_column_active" name="sql_column_active" value="<?php echo $_['sql_column_active']; ?>" /></td></tr>
	+ <tr><td><label for="sql_column_active"><?php echo $l -> t('User Active Column'); ?></label></td><td><input type="text" id="sql_column_active" name="sql_column_active" value="<?php echo $_['sql_column_active']; ?>" /></td></tr>
	</table>
	</fieldset>
	<fieldset id="sql-3">
	<table>
	- <tr><td><label for="domain_settings"><?php echo $l->t('Domain Settings');?></label></td><td><table>
	- <tr><td><input type="radio" name="domain_settings" id="domain_none" value="none" <?php if($_['domain_settings'] == "") echo 'checked="checked"'; ?>><?php echo $l->t('No Mapping') ?></td></tr>
	- <tr><td><input type="radio" name="domain_settings" id="domain_server" value="server" <?php if($_['domain_settings'] == "server") echo 'checked="checked"'; ?>><?php echo $l->t('Append Server Hostname') ?></td><td></td></tr>
	- <tr><td><input type="radio" name="domain_settings" id="domain_default" value="default" <?php if($_['domain_settings'] == "default") echo 'checked="checked"'; ?>><?php echo $l->t('Append Default') ?></td><td><input type="text" id="default_domain" name="default_domain" value="<?php echo $_['default_domain']; ?>" /></td></tr>
	- <tr><td><input type="radio" name="domain_settings" id="domain_mapping" value="mapping" <?php if($_['domain_settings'] == "mapping") echo 'checked="checked"'; ?>><?php echo $l->t('Map Domains') ?></td><td>
	+ <tr><td><label for="domain_settings"><?php echo $l -> t('Domain Settings'); ?></label></td><td><table>
	+ <tr><td><input type="radio" name="domain_settings" id="domain_none" value="none" <?php
	+ if($_['domain_settings'] == "")
	+ echo 'checked="checked"';
	+ ?>><?php echo $l->t('No Mapping') ?></td></tr>
	+ <tr><td><input type="radio" name="domain_settings" id="domain_server" value="server" <?php
	+ if($_['domain_settings'] == "server")
	+ echo 'checked="checked"';
	+ ?>><?php echo $l->t('Append Server Hostname') ?></td><td></td></tr>
	+ <tr><td><input type="radio" name="domain_settings" id="domain_default" value="default" <?php
	+ if($_['domain_settings'] == "default")
	+ echo 'checked="checked"';
	+ ?>><?php echo $l->t('Append Default') ?></td><td><input type="text" id="default_domain" name="default_domain" value="<?php echo $_['default_domain']; ?>" /></td></tr>
	+ <tr><td><input type="radio" name="domain_settings" id="domain_mapping" value="mapping" <?php
	+ if($_['domain_settings'] == "mapping")
	+ echo 'checked="checked"';
	+ ?>><?php echo $l->t('Map Domains') ?></td><td>
	<table id="domain_map_entries" cellspacing="2" cellpadding="2">
	<tbody>
	- <tr><th><input type="text" placeholder="Server Domain" id="inputServerDomain"></th><th><input type="text" placeholder="Map to Domain" id="inputMapDomain"></th><th><input id="domainAddMap" type="submit" value="<?php echo $l->t('Add Entry'); ?>" /></th></tr>
	- <?php
	- $domains = explode(",", $_['domain_array']);
	- $maps = explode(",", $_['map_array']);
	- for($i=0;$i<count($domains);$i++)
	- {
	- if(trim($domains[$i]) != "" && trim($domains[$i]) != "")
	- echo "<tr><td>".htmlspecialchars($domains[$i])."</td><td>".htmlspecialchars($maps[$i])."</td><td><a class=\"deleteLink\" href=\"#\" >delete</a></td></tr>";
	- }
	+ <tr><th><input type="text" placeholder="Server Domain" id="inputServerDomain"></th><th><input type="text" placeholder="Map to Domain" id="inputMapDomain"></th><th><input id="domainAddMap" type="submit" value="<?php echo $l -> t('Add Entry'); ?>" /></th></tr>
	+ <?php $domains = explode(",", $_['domain_array']);
	+ $maps = explode(",", $_['map_array']);
	+ for($i = 0; $i < count($domains); $i++)
	+ {
	+ if(trim($domains[$i]) != "" && trim($domains[$i]) != "")
	+ echo "<tr><td>" . htmlspecialchars($domains[$i]) . "</td><td>" . htmlspecialchars($maps[$i]) . "</td><td><a class=\"deleteLink\" href=\"#\" >delete</a></td></tr>";
	+ }
	?>
	</tbody>
	</table></td></tr>
	</table></td></tr>
	- <tr><td><label for="strip_domain"><?php echo $l->t('Strip Domain Part from Username');?></label></td><td><input type="checkbox" id="strip_domain" name="strip_domain" value="1"<?php if($_['strip_domain']) echo ' checked'; ?> title="Strip Domain Part from Username when logging in and retrieving username lists"></td></tr>
	+ <tr><td><label for="strip_domain"><?php echo $l -> t('Strip Domain Part from Username'); ?></label></td><td><input type="checkbox" id="strip_domain" name="strip_domain" value="1"<?php
	+ if($_['strip_domain'])
	+ echo ' checked';
	+ ?> title="Strip Domain Part from Username when logging in and retrieving username lists"></td></tr>

	</table>
	</fieldset>
	<input type="hidden" name="requesttoken" value="<?php echo $_['requesttoken'] ?>" id="requesttoken" />
	<input type="hidden" name="appname" value="user_sql" />
	- <input id="sqlSubmit" type="submit" value="<?php echo $l->t('Save'); ?>" />
	- <div id="sql_update_message" class="statusmessage"><?php echo $l->t('Saving...'); ?></div>
	+ <input id="sqlSubmit" type="submit" value="<?php echo $l -> t('Save'); ?>" />
	+ <div id="sql_update_message" class="statusmessage"><?php echo $l -> t('Saving...'); ?></div>
	<div id="sql_error_message" class="errormessage"></div>
	<div id="sql_success_message" class="successmessage"></div>
	</div>
	</form>
	diff --git a/user_sql.php b/user_sql.php
	--- a/user_sql.php
	+++ b/user_sql.php
	@@ -1,642 +1,648 @@
	<?php

	/**
	* ownCloud - user_sql
	*
	* @author Andreas Böhler and contributors
	* @copyright 2012/2013 Andreas Böhler <andreas (at) aboehler (dot) at>
	*
	* credits go to Ed W for several SQL injection fixes and caching support
	* credits go to Frédéric France for providing Joomla support
	- * credits go to
	+ * credits go to
	*
	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
	* License as published by the Free Software Foundation; either
	* version 3 of the License, or any later version.
	*
	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
	*
	* You should have received a copy of the GNU Affero General Public
	* License along with this library. If not, see <http://www.gnu.org/licenses/>.
	*
	*/

	-class OC_USER_SQL extends OC_User_Backend implements OC_User_Interface {
	+class OC_USER_SQL extends OC_User_Backend implements OC_User_Interface
	+{
	protected $cache;
	// cached settings
	protected $sql_host;
	protected $sql_username;
	protected $sql_database;
	protected $sql_password;
	protected $sql_table;
	protected $sql_column_username;
	protected $sql_column_password;
	protected $sql_column_active;
	protected $sql_column_displayname;
	protected $sql_type;
	protected $db_conn;
	protected $db;
	protected $default_domain;
	protected $strip_domain;
	protected $crypt_type;
	- protected $domain_settings;
	- protected $domain_array;
	- protected $map_array;
	+ protected $domain_settings;
	+ protected $domain_array;
	+ protected $map_array;

	- public function __construct()
	+ public function __construct()
	{
	- $this->db_conn = false;
	- $this->cache = \OC\Cache::getGlobalCache();
	- $this->sql_host = OCP\Config::getAppValue('user_sql', 'sql_host', '');
	- $this->sql_username = OCP\Config::getAppValue('user_sql', 'sql_user', '');
	- $this->sql_database = OCP\Config::getAppValue('user_sql', 'sql_database', '');
	- $this->sql_password = OCP\Config::getAppValue('user_sql', 'sql_password', '');
	- $this->sql_table = OCP\Config::getAppValue('user_sql', 'sql_table', '');
	- $this->sql_column_username = OCP\Config::getAppValue('user_sql', 'sql_column_username', '');
	- $this->sql_column_password = OCP\Config::getAppValue('user_sql', 'sql_column_password', '');
	- $this->sql_column_displayname = OCP\Config::getAppValue('user_sql', 'sql_column_displayname', '');
	- $this->sql_column_active = OCP\Config::getAppValue('user_sql', 'sql_column_active', '');
	- $this->sql_type = OCP\Config::getAppValue('user_sql', 'sql_type', '');
	- $this->default_domain = OCP\Config::getAppValue('user_sql', 'default_domain', '');
	- $this->strip_domain = OCP\Config::getAppValue('user_sql', 'strip_domain', 0);
	- $this->crypt_type = OCP\Config::getAppValue('user_sql', 'crypt_type', 'md5crypt');
	- $this->domain_settings = OCP\Config::getAppValue('user_sql', 'domain_settings', 'none');
	- $this->domain_array = explode(",", OCP\Config::getAppValue('user_sql', 'domain_array', array()));
	- $this->map_array = explode(",", OCP\Config::getAppValue('user_sql', 'map_array', array()));
	- $dsn = $this->sql_type.":host=".$this->sql_host.";dbname=".$this->sql_database;
	- try
	+ $this -> db_conn = false;
	+ $this -> cache = \OC\Cache::getGlobalCache();
	+ $this -> sql_host = OCP\Config::getAppValue('user_sql', 'sql_host', '');
	+ $this -> sql_username = OCP\Config::getAppValue('user_sql', 'sql_user', '');
	+ $this -> sql_database = OCP\Config::getAppValue('user_sql', 'sql_database', '');
	+ $this -> sql_password = OCP\Config::getAppValue('user_sql', 'sql_password', '');
	+ $this -> sql_table = OCP\Config::getAppValue('user_sql', 'sql_table', '');
	+ $this -> sql_column_username = OCP\Config::getAppValue('user_sql', 'sql_column_username', '');
	+ $this -> sql_column_password = OCP\Config::getAppValue('user_sql', 'sql_column_password', '');
	+ $this -> sql_column_displayname = OCP\Config::getAppValue('user_sql', 'sql_column_displayname', '');
	+ $this -> sql_column_active = OCP\Config::getAppValue('user_sql', 'sql_column_active', '');
	+ $this -> sql_type = OCP\Config::getAppValue('user_sql', 'sql_type', '');
	+ $this -> default_domain = OCP\Config::getAppValue('user_sql', 'default_domain', '');
	+ $this -> strip_domain = OCP\Config::getAppValue('user_sql', 'strip_domain', 0);
	+ $this -> crypt_type = OCP\Config::getAppValue('user_sql', 'crypt_type', 'md5crypt');
	+ $this -> domain_settings = OCP\Config::getAppValue('user_sql', 'domain_settings', 'none');
	+ $this -> domain_array = explode(",", OCP\Config::getAppValue('user_sql', 'domain_array', array()));
	+ $this -> map_array = explode(",", OCP\Config::getAppValue('user_sql', 'map_array', array()));
	+ $dsn = $this -> sql_type . ":host=" . $this -> sql_host . ";dbname=" . $this -> sql_database;
	+ try
	{
	- $this->db = new PDO($dsn, $this->sql_username, $this->sql_password);
	- $this->db_conn = true;
	- }
	- catch (PDOException $e)
	+ $this -> db = new PDO($dsn, $this -> sql_username, $this -> sql_password);
	+ $this -> db_conn = true;
	+ } catch (PDOException $e)
	{
	- OC_Log::write('OC_USER_SQL', 'Failed to connect to the database: ' . $e->getMessage(), OC_Log::ERROR);
	+ OC_Log::write('OC_USER_SQL', 'Failed to connect to the database: ' . $e -> getMessage(), OC_Log::ERROR);
	}
	return false;
	}

	- private function doUserDomainMapping($uid)
	- {
	- $uid = trim($uid);
	-
	- switch($this->domain_settings)
	- {
	- case "none":
	- OC_Log::write('OC_USER_SQL', "No mapping", OC_Log::DEBUG);
	- break;
	- case "default":
	- OC_Log::write('OC_USER_SQL', "Default mapping", OC_Log::DEBUG);
	- if($this->default_domain && (strpos($uid, '@') === false))
	- $uid .= "@".$this->default_domain;
	- break;
	- case "server":
	- OC_Log::write('OC_USER_SQL', "Server based mapping", OC_Log::DEBUG);
	- if(strpos($uid, '@') === false)
	- $uid .= "@".$_SERVER['SERVER_NAME'];
	- break;
	- case "mapping":
	- OC_Log::write('OC_USER_SQL', 'Domain mapping selected', OC_Log::DEBUG);
	- if(strpos($uid, '@') === false)
	- {
	- for($i=0;$i<count($this->domain_array);$i++)
	- {
	- OC_Log::write('OC_USER_SQL', 'Checking domain in mapping: '.$this->domain_array[$i], OC_Log::DEBUG);
	- if($_SERVER['SERVER_NAME'] == trim($this->domain_array[$i]))
	- {
	- OC_Log::write('OC_USER_SQL', 'Found domain in mapping: '.$this->domain_array[$i], OC_Log::DEBUG);
	- $uid .= "@".trim($this->map_array[$i]);
	- break;
	- }
	- }
	- }
	- break;
	- }
	-
	+ private function doUserDomainMapping($uid)
	+ {
	+ $uid = trim($uid);

	- $uid = strtolower($uid);
	- OC_Log::write('OC_USER_SQL', 'Returning mapped UID: '.$uid, OC_Log::DEBUG);
	- return $uid;
	- }
	+ switch($this->domain_settings)
	+ {
	+ case "default" :
	+ OC_Log::write('OC_USER_SQL', "Default mapping", OC_Log::DEBUG);
	+ if($this -> default_domain && (strpos($uid, '@') === false))
	+ $uid .= "@" . $this -> default_domain;
	+ break;
	+ case "server" :
	+ OC_Log::write('OC_USER_SQL', "Server based mapping", OC_Log::DEBUG);
	+ if(strpos($uid, '@') === false)
	+ $uid .= "@" . $_SERVER['SERVER_NAME'];
	+ break;
	+ case "mapping" :
	+ OC_Log::write('OC_USER_SQL', 'Domain mapping selected', OC_Log::DEBUG);
	+ if(strpos($uid, '@') === false)
	+ {
	+ for($i = 0; $i < count($this -> domain_array); $i++)
	+ {
	+ OC_Log::write('OC_USER_SQL', 'Checking domain in mapping: ' . $this -> domain_array[$i], OC_Log::DEBUG);
	+ if($_SERVER['SERVER_NAME'] == trim($this -> domain_array[$i]))
	+ {
	+ OC_Log::write('OC_USER_SQL', 'Found domain in mapping: ' . $this -> domain_array[$i], OC_Log::DEBUG);
	+ $uid .= "@" . trim($this -> map_array[$i]);
	+ break;
	+ }
	+ }
	+ }
	+ break;
	+ case "none" :
	+ default :
	+ OC_Log::write('OC_USER_SQL', "No mapping", OC_Log::DEBUG);
	+ break;
	+ }

	- public function implementsAction($actions)
	+ $uid = strtolower($uid);
	+ OC_Log::write('OC_USER_SQL', 'Returning mapped UID: ' . $uid, OC_Log::DEBUG);
	+ return $uid;
	+ }
	+
	+ public function implementsAction($actions)
	{
	return (bool)((OC_USER_BACKEND_CHECK_PASSWORD \| OC_USER_BACKEND_GET_DISPLAYNAME) & $actions);
	}

	- public function hasUserListings() {
	+ public function hasUserListings()
	+ {
	return true;
	}

	- public function createUser() {
	+ public function createUser()
	+ {
	// Can't create user
	OC_Log::write('OC_USER_SQL', 'Not possible to create local users from web frontend using SQL user backend', OC_Log::ERROR);
	return false;
	}

	- public function deleteUser( $uid )
	+ public function deleteUser($uid)
	{
	// Can't delete user
	OC_Log::write('OC_USER_SQL', 'Not possible to delete local users from web frontend using SQL user backend', OC_Log::ERROR);
	return false;
	}

	- public function setPassword ( $uid, $password ) {
	- // Update the user's password - this might affect other services, that user the same database, as well
	+ public function setPassword($uid, $password)
	+ {
	+ // Update the user's password - this might affect other services, that
	+ // user the same database, as well
	OC_Log::write('OC_USER_SQL', "Entering setPassword for UID: $uid", OC_Log::DEBUG);
	- if(!$this->db_conn)
	+ if(!$this -> db_conn)
	{
	return false;
	}
	- $uid = $this->doUserDomainMapping($uid);
	+ $uid = $this -> doUserDomainMapping($uid);

	$query = "SELECT $this->sql_column_password FROM $this->sql_table WHERE $this->sql_column_username = :uid";
	OC_Log::write('OC_USER_SQL', "Preparing query: $query", OC_Log::DEBUG);
	- $result = $this->db->prepare($query);
	- $result->bindParam(":uid", $uid);
	+ $result = $this -> db -> prepare($query);
	+ $result -> bindParam(":uid", $uid);
	OC_Log::write('OC_USER_SQL', "Executing query...", OC_Log::DEBUG);
	- if(!$result->execute())
	+ if(!$result -> execute())
	{
	return false;
	}
	OC_Log::write('OC_USER_SQL', "Fetching result...", OC_Log::DEBUG);
	- $row = $result->fetch();
	+ $row = $result -> fetch();
	if(!$row)
	{
	return false;
	}
	- $old_password = $row[$this->sql_column_password];
	- $enc_password = $this->pacrypt($password, $old_password);
	+ $old_password = $row[$this -> sql_column_password];
	+ $enc_password = $this -> pacrypt($password, $old_password);
	$query = "UPDATE $this->sql_table SET $this->sql_column_password = :enc_password WHERE $this->sql_column_username = :uid";
	OC_Log::write('OC_USER_SQL', "Preapring query: $query", OC_Log::DEBUG);
	- $result = $this->db->prepare($query);
	- $result->bindParam(":enc_password", $enc_password);
	- $result->bindParam(":uid", $uid);
	+ $result = $this -> db -> prepare($query);
	+ $result -> bindParam(":enc_password", $enc_password);
	+ $result -> bindParam(":uid", $uid);
	OC_Log::write('OC_USER_SQL', "Executing query...", OC_Log::DEBUG);
	- if(!$result->execute())
	+ if(!$result -> execute())
	{
	- $err = $result->errorInfo();
	- OC_Log::write('OC_USER_SQL', "Query failed: ".$err[2], OC_Log::DEBUG);
	+ $err = $result -> errorInfo();
	+ OC_Log::write('OC_USER_SQL', "Query failed: " . $err[2], OC_Log::DEBUG);
	OC_Log::write('OC_USER_SQL', "Could not update password!", OC_Log::ERROR);
	return false;
	}
	OC_Log::write('OC_USER_SQL', "Updated password successfully, return true", OC_Log::DEBUG);
	return true;
	}

	/**
	- * @brief Check if the password is correct
	- * @param $uid The username
	- * @param $password The password
	- * @returns true/false
	- *
	- * Check if the password is correct without logging in the user
	- */
	+ * @brief Check if the password is correct
	+ * @param $uid The username
	+ * @param $password The password
	+ * @returns true/false
	+ *
	+ * Check if the password is correct without logging in the user
	+ */
	public function checkPassword($uid, $password)
	{
	OC_Log::write('OC_USER_SQL', "Entering checkPassword() for UID: $uid", OC_Log::DEBUG);
	- if(!$this->db_conn)
	+ if(!$this -> db_conn)
	{
	return false;
	}
	- $uid = $this->doUserDomainMapping($uid);
	-
	+ $uid = $this -> doUserDomainMapping($uid);
	+
	$query = "SELECT $this->sql_column_username, $this->sql_column_password FROM $this->sql_table WHERE $this->sql_column_username = :uid";
	- if($this->sql_column_active != '')
	+ if($this -> sql_column_active != '')
	$query .= " AND $this->sql_column_active = 1";
	OC_Log::write('OC_USER_SQL', "Preparing query: $query", OC_Log::DEBUG);
	- $result = $this->db->prepare($query);
	- $result->bindParam(":uid", $uid);
	+ $result = $this -> db -> prepare($query);
	+ $result -> bindParam(":uid", $uid);
	OC_Log::write('OC_USER_SQL', "Executing query...", OC_Log::DEBUG);
	- if(!$result->execute())
	+ if(!$result -> execute())
	{
	- $err = $result->errorInfo();
	- OC_Log::write('OC_USER_SQL', "Query failed: ".$err[2], OC_Log::DEBUG);
	+ $err = $result -> errorInfo();
	+ OC_Log::write('OC_USER_SQL', "Query failed: " . $err[2], OC_Log::DEBUG);
	return false;
	}
	OC_Log::write('OC_USER_SQL', "Fetching row...", OC_Log::DEBUG);
	- $row = $result->fetch();
	+ $row = $result -> fetch();
	if(!$row)
	{
	OC_Log::write('OC_USER_SQL', "Got no row, return false", OC_Log::DEBUG);
	return false;
	}
	OC_Log::write('OC_USER_SQL', "Encrypting and checking password", OC_Log::DEBUG);
	- if($this->pacrypt($password, $row[$this->sql_column_password]) == $row[$this->sql_column_password])
	+ if($this -> pacrypt($password, $row[$this -> sql_column_password]) == $row[$this -> sql_column_password])
	{
	OC_Log::write('OC_USER_SQL', "Passwords matching, return true", OC_Log::DEBUG);
	- if($this->strip_domain)
	+ if($this -> strip_domain)
	{
	$uid = explode("@", $uid);
	$uid = $uid[0];
	}
	return $uid;
	- }
	- else
	+ } else
	{
	OC_Log::write('OC_USER_SQL', "Passwords do not match, return false", OC_Log::DEBUG);
	return false;
	}
	}

	/**
	- * @brief Get a list of all users
	- * @returns array with all uids
	- *
	- * Get a list of all users.
	- */
	+ * @brief Get a list of all users
	+ * @returns array with all uids
	+ *
	+ * Get a list of all users.
	+ */

	public function getUsers($search = '', $limit = null, $offset = null)
	{
	- OC_Log::write('OC_USER_SQL', "Entering getUsers() with Search: $search, Limit: $limit, Offset: $offset", OC_Log::DEBUG);
	- $users = array();
	- if(!$this->db_conn)
	- {
	- return false;
	- }
	- $query = "SELECT $this->sql_column_username FROM $this->sql_table";
	- if($search != '')
	- $query .= " WHERE $this->sql_column_username LIKE :search";
	- if($this->sql_column_active != '')
	+ OC_Log::write('OC_USER_SQL', "Entering getUsers() with Search: $search, Limit: $limit, Offset: $offset", OC_Log::DEBUG);
	+ $users = array();
	+ if(!$this -> db_conn)
	+ {
	+ return false;
	+ }
	+ $query = "SELECT $this->sql_column_username FROM $this->sql_table";
	+ if($search != '')
	+ $query .= " WHERE $this->sql_column_username LIKE :search";
	+ if($this -> sql_column_active != '')
	{
	if($search != '')
	$query .= " AND";
	else
	$query .= " WHERE";
	$query .= " $this->sql_column_active = 1";
	}
	- $query .= " ORDER BY $this->sql_column_username";
	- if($limit != null)
	- {
	- $limit = intval($limit);
	- $query .= " LIMIT $limit";
	- }
	- if($offset != null)
	- {
	- $offset = intval($offset);
	- $query .= " OFFSET $offset";
	- }
	- OC_Log::write('OC_USER_SQL', "Preparing query: $query", OC_Log::DEBUG);
	- $result = $this->db->prepare($query);
	- if($search != '')
	- {
	- $search = "%$search%";
	- $result->bindParam(":search", $search);
	- }
	- OC_Log::write('OC_USER_SQL', "Executing query...", OC_Log::DEBUG);
	- if(!$result->execute())
	- {
	- $err = $result->errorInfo();
	- OC_Log::write('OC_USER_SQL', "Query failed: ".$err[2], OC_Log::DEBUG);
	- return array();
	- }
	- OC_Log::write('OC_USER_SQL', "Fetching results...", OC_Log::DEBUG);
	- while($row = $result->fetch())
	- {
	- $uid = $row[$this->sql_column_username];
	- if($this->strip_domain)
	- {
	- $uid = explode("@", $uid);
	- $uid = $uid[0];
	- }
	- $users[] = strtolower($uid);
	- }
	- OC_Log::write('OC_USER_SQL', "Return list of results", OC_Log::DEBUG);
	- return $users;
	+ $query .= " ORDER BY $this->sql_column_username";
	+ if($limit != null)
	+ {
	+ $limit = intval($limit);
	+ $query .= " LIMIT $limit";
	+ }
	+ if($offset != null)
	+ {
	+ $offset = intval($offset);
	+ $query .= " OFFSET $offset";
	+ }
	+ OC_Log::write('OC_USER_SQL', "Preparing query: $query", OC_Log::DEBUG);
	+ $result = $this -> db -> prepare($query);
	+ if($search != '')
	+ {
	+ $search = "%$search%";
	+ $result -> bindParam(":search", $search);
	+ }
	+ OC_Log::write('OC_USER_SQL', "Executing query...", OC_Log::DEBUG);
	+ if(!$result -> execute())
	+ {
	+ $err = $result -> errorInfo();
	+ OC_Log::write('OC_USER_SQL', "Query failed: " . $err[2], OC_Log::DEBUG);
	+ return array();
	+ }
	+ OC_Log::write('OC_USER_SQL', "Fetching results...", OC_Log::DEBUG);
	+ while($row = $result -> fetch())
	+ {
	+ $uid = $row[$this -> sql_column_username];
	+ if($this -> strip_domain)
	+ {
	+ $uid = explode("@", $uid);
	+ $uid = $uid[0];
	+ }
	+ $users[] = strtolower($uid);
	+ }
	+ OC_Log::write('OC_USER_SQL', "Return list of results", OC_Log::DEBUG);
	+ return $users;
	}

	/**
	- * @brief check if a user exists
	- * @param string $uid the username
	- * @return boolean
	- */
	+ * @brief check if a user exists
	+ * @param string $uid the username
	+ * @return boolean
	+ */

	public function userExists($uid)
	{

	$cacheKey = 'sql_user_exists_' . $uid;
	- $cacheVal = $this->cache->get($cacheKey);
	- if(!is_null($cacheVal)) return (bool)$cacheVal;
	+ $cacheVal = $this -> cache -> get($cacheKey);
	+ if(!is_null($cacheVal))
	+ return (bool)$cacheVal;

	OC_Log::write('OC_USER_SQL', "Entering userExists() for UID: $uid", OC_Log::DEBUG);
	- if(!$this->db_conn)
	+ if(!$this -> db_conn)
	{
	return false;
	}
	- $uid = $this->doUserDomainMapping($uid);
	+ $uid = $this -> doUserDomainMapping($uid);
	$query = "SELECT $this->sql_column_username FROM $this->sql_table WHERE $this->sql_column_username = :uid";
	- if($this->sql_column_active != '')
	+ if($this -> sql_column_active != '')
	$query .= " AND $this->sql_column_active = 1";
	OC_Log::write('OC_USER_SQL', "Preparing query: $query", OC_Log::DEBUG);
	- $result = $this->db->prepare($query);
	- $result->bindParam(":uid", $uid);
	+ $result = $this -> db -> prepare($query);
	+ $result -> bindParam(":uid", $uid);
	OC_Log::write('OC_USER_SQL', "Executing query...", OC_Log::DEBUG);
	- if(!$result->execute())
	+ if(!$result -> execute())
	{
	- $err = $result->errorInfo();
	- OC_Log::write('OC_USER_SQL', "Query failed: ".$err[2], OC_Log::DEBUG);
	+ $err = $result -> errorInfo();
	+ OC_Log::write('OC_USER_SQL', "Query failed: " . $err[2], OC_Log::DEBUG);
	return false;
	}
	OC_Log::write('OC_USER_SQL', "Fetching results...", OC_Log::DEBUG);
	-
	- $exists = (bool)$result->fetch();
	- $this->cache->set($cacheKey, $exists, 60);
	+
	+ $exists = (bool)$result -> fetch();
	+ $this -> cache -> set($cacheKey, $exists, 60);

	if(!$exists)
	{
	OC_Log::write('OC_USER_SQL', "Empty row, user does not exists, return false", OC_Log::DEBUG);
	return false;
	- }
	- else
	+ } else
	{
	OC_Log::write('OC_USER_SQL', "User exists, return true", OC_Log::DEBUG);
	return true;
	}

	}

	public function getDisplayName($uid)
	{
	OC_Log::write('OC_USER_SQL', "Entering getDisplayName() for UID: $uid", OC_Log::DEBUG);
	- if(!$this->db_conn)
	+ if(!$this -> db_conn)
	{
	return false;
	}
	- $uid = $this->doUserDomainMapping($uid);
	-
	- if(!$this->userExists($uid))
	+ $uid = $this -> doUserDomainMapping($uid);
	+
	+ if(!$this -> userExists($uid))
	{
	return false;
	}

	$query = "SELECT $this->sql_column_displayname FROM $this->sql_table WHERE $this->sql_column_username = :uid";
	- if($this->sql_column_active != '')
	+ if($this -> sql_column_active != '')
	$query .= " AND $this->sql_column_active = 1";
	OC_Log::write('OC_USER_SQL', "Preparing query: $query", OC_Log::DEBUG);
	- $result = $this->db->prepare($query);
	- $result->bindParam(":uid", $uid);
	+ $result = $this -> db -> prepare($query);
	+ $result -> bindParam(":uid", $uid);
	OC_Log::write('OC_USER_SQL', "Executing query...", OC_Log::DEBUG);
	- if(!$result->execute())
	+ if(!$result -> execute())
	{
	- $err = $result->errorInfo();
	- OC_Log::write('OC_USER_SQL', "Query failed: ".$err[2], OC_Log::DEBUG);
	+ $err = $result -> errorInfo();
	+ OC_Log::write('OC_USER_SQL', "Query failed: " . $err[2], OC_Log::DEBUG);
	return false;
	}
	OC_Log::write('OC_USER_SQL', "Fetching results...", OC_Log::DEBUG);
	- $row = $result->fetch();
	+ $row = $result -> fetch();
	if(!$row)
	{
	OC_Log::write('OC_USER_SQL', "Empty row, user has no display name or does not exist, return false", OC_Log::DEBUG);
	return false;
	- }
	- else
	+ } else
	{
	OC_Log::write('OC_USER_SQL', "User exists, return true", OC_Log::DEBUG);
	- $displayName = utf8_encode($row[$this->sql_column_displayname]);
	- return $displayName;;
	+ $displayName = utf8_encode($row[$this -> sql_column_displayname]);
	+ return $displayName; ;
	}
	return false;
	}

	public function getDisplayNames($search = '', $limit = null, $offset = null)
	{
	- $uids = $this->getUsers($search, $limit, $offset);
	+ $uids = $this -> getUsers($search, $limit, $offset);
	$displayNames = array();
	foreach($uids as $uid)
	{
	- $displayNames[$uid] = $this->getDisplayName($uid);
	+ $displayNames[$uid] = $this -> getDisplayName($uid);
	}
	return $displayNames;
	}
	-
	- /**
	- * The following functions were directly taken from PostfixAdmin and just slightly modified
	+
	+ /**
	+ * The following functions were directly taken from PostfixAdmin and just
	+ * slightly modified
	* to suit our needs.
	- * Encrypt a password, using the apparopriate hashing mechanism as defined in
	- * config.inc.php ($this->crypt_type).
	- * When wanting to compare one pw to another, it's necessary to provide the salt used - hence
	+ * Encrypt a password, using the apparopriate hashing mechanism as defined in
	+ * config.inc.php ($this->crypt_type).
	+ * When wanting to compare one pw to another, it's necessary to provide the
	+ * salt used - hence
	* the second parameter ($pw_db), which is the existing hash from the DB.
	*
	* @param string $pw
	* @param string $encrypted password
	* @return string encrypted password.
	*/
	- private function pacrypt ($pw, $pw_db="")
	+ private function pacrypt($pw, $pw_db = "")
	{
	OC_Log::write('OC_USER_SQL', "Entering private pacrypt()", OC_Log::DEBUG);
	$pw = stripslashes($pw);
	$password = "";
	$salt = "";

	- if ($this->crypt_type == 'md5crypt') {
	- $split_salt = preg_split ('/\$/', $pw_db);
	- if (isset ($split_salt[2])) {
	+ if($this -> crypt_type == 'md5crypt')
	+ {
	+ $split_salt = preg_split('/\$/', $pw_db);
	+ if(isset($split_salt[2]))
	+ {
	$salt = $split_salt[2];
	}
	- $password = $this->md5crypt ($pw, $salt);
	- }
	-
	- elseif ($this->crypt_type == 'md5') {
	+ $password = $this -> md5crypt($pw, $salt);
	+ } elseif($this -> crypt_type == 'md5')
	+ {
	$password = md5($pw);
	- }
	-
	- elseif ($this->crypt_type == 'system') { // We never generate salts, as user creation is not allowed here
	- $password = crypt ($pw, $pw_db);
	- }
	-
	- elseif ($this->crypt_type == 'cleartext') {
	+ } elseif($this -> crypt_type == 'system')
	+ {
	+ // We never generate salts, as user creation is not allowed here
	+ $password = crypt($pw, $pw_db);
	+ } elseif($this -> crypt_type == 'cleartext')
	+ {
	$password = $pw;
	}

	- // See https://sourceforge.net/tracker/?func=detail&atid=937966&aid=1793352&group_id=191583
	+ // See
	+ // https://sourceforge.net/tracker/?func=detail&atid=937966&aid=1793352&group_id=191583
	// this is apparently useful for pam_mysql etc.
	- elseif ($this->crypt_type == 'mysql_encrypt')
	+ elseif($this -> crypt_type == 'mysql_encrypt')
	{
	- if(!$this->db_conn)
	+ if(!$this -> db_conn)
	{
	return false;
	- }
	- if ($pw_db!="") {
	- $salt=substr($pw_db,0,2);
	+ }
	+ if($pw_db != "")
	+ {
	+ $salt = substr($pw_db, 0, 2);
	$query = "SELECT ENCRYPT(:pw, :salt);";
	- } else {
	+ } else
	+ {
	$query = "SELECT ENCRYPT(:pw);";
	}

	- $result = $this->db->prepare($query);
	- $result->bindParam(":pw", $pw);
	+ $result = $this -> db -> prepare($query);
	+ $result -> bindParam(":pw", $pw);
	if($pw_db != "")
	- $result->bindParam(":salt", $salt);
	- if(!$result->execute())
	+ $result -> bindParam(":salt", $salt);
	+ if(!$result -> execute())
	+ {
	+ return false;
	+ }
	+ $row = $result -> fetch();
	+ if(!$row)
	{
	return false;
	}
	- $row = $result->fetch();
	+ $password = $row[0];
	+ } elseif($this -> crypt_type == 'mysql_password')
	+ {
	+ if(!$this -> db_conn)
	+ {
	+ return false;
	+ }
	+ $query = "SELECT PASSWORD(:pw);";
	+
	+ $result = $this -> db -> prepare($query);
	+ $result -> bindParam(":pw", $pw);
	+ if(!$result -> execute())
	+ {
	+ return false;
	+ }
	+ $row = $result -> fetch();
	if(!$row)
	{
	return false;
	}
	$password = $row[0];
	}

	- elseif($this->crypt_type == 'mysql_password')
	+ // The following is by Frédéric France
	+ elseif($this -> crypt_type == 'joomla')
	{
	- if(!$this->db_conn)
	- {
	- return false;
	- }
	- $query = "SELECT PASSWORD(:pw);";
	-
	- $result = $this->db->prepare($query);
	- $result->bindParam(":pw", $pw);
	- if(!$result->execute())
	- {
	- return false;
	- }
	- $row = $result->fetch();
	- if(!$row)
	- {
	- return false;
	- }
	- $password = $row[0];
	- }
	-
	- // The following is by Frédéric France
	- elseif($this->crypt_type == 'joomla')
	- {
	- $split_salt = preg_split ('/:/', $pw_db);
	- if(isset($split_salt[1]))
	+ $split_salt = preg_split('/:/', $pw_db);
	+ if(isset($split_salt[1]))
	{
	$salt = $split_salt[1];
	}
	- $password = ($salt) ? md5($pw.$salt) : md5($pw);
	- $password.= ':'.$salt;
	- }
	-
	- else {
	+ $password = ($salt) ? md5($pw . $salt) : md5($pw);
	+ $password .= ':' . $salt;
	+ } else
	+ {
	OC_Log::write('OC_USER_SQL', "unknown/invalid crypt_type settings: $this->crypt_type", OC_Log::ERROR);
	- die ('unknown/invalid Encryption type setting: ' . $this->crypt_type);
	+ die('unknown/invalid Encryption type setting: ' . $this -> crypt_type);
	}
	OC_Log::write('OC_USER_SQL', "pacrypt() done, return", OC_Log::DEBUG);
	return $password;
	}

	//
	// md5crypt
	// Action: Creates MD5 encrypted password
	// Call: md5crypt (string cleartextpassword)
	//

	- private function md5crypt ($pw, $salt="", $magic="")
	+ private function md5crypt($pw, $salt = "", $magic = "")
	{
	$MAGIC = "$1$";

	- if ($magic == "") $magic = $MAGIC;
	- if ($salt == "") $salt = $this->create_salt ();
	- $slist = explode ("$", $salt);
	- if ($slist[0] == "1") $salt = $slist[1];
	-
	- $salt = substr ($salt, 0, 8);
	- $ctx = $pw . $magic . $salt;
	- $final = $this->pahex2bin (md5 ($pw . $salt . $pw));
	+ if($magic == "")
	+ $magic = $MAGIC;
	+ if($salt == "")
	+ $salt = $this -> create_salt();
	+ $slist = explode("$", $salt);
	+ if($slist[0] == "1")
	+ $salt = $slist[1];

	- for ($i=strlen ($pw); $i>0; $i-=16)
	+ $salt = substr($salt, 0, 8);
	+ $ctx = $pw . $magic . $salt;
	+ $final = $this -> pahex2bin(md5($pw . $salt . $pw));
	+
	+ for($i = strlen($pw); $i > 0; $i -= 16)
	{
	- if ($i > 16)
	+ if($i > 16)
	{
	- $ctx .= substr ($final,0,16);
	- }
	- else
	+ $ctx .= substr($final, 0, 16);
	+ } else
	{
	- $ctx .= substr ($final,0,$i);
	+ $ctx .= substr($final, 0, $i);
	}
	}
	- $i = strlen ($pw);
	+ $i = strlen($pw);

	- while ($i > 0)
	+ while($i > 0)
	{
	- if ($i & 1) $ctx .= chr (0);
	- else $ctx .= $pw[0];
	- $i = $i >> 1;
	+ if($i & 1)
	+ $ctx .= chr(0);
	+ else
	+ $ctx .= $pw[0];
	+ $i = $i>>1;
	}
	- $final = $this->pahex2bin (md5 ($ctx));
	+ $final = $this -> pahex2bin(md5($ctx));

	- for ($i=0;$i<1000;$i++)
	+ for($i = 0; $i < 1000; $i++)
	{
	$ctx1 = "";
	- if ($i & 1)
	+ if($i & 1)
	+ {
	+ $ctx1 .= $pw;
	+ } else
	+ {
	+ $ctx1 .= substr($final, 0, 16);
	+ }
	+ if($i % 3)
	+ $ctx1 .= $salt;
	+ if($i % 7)
	+ $ctx1 .= $pw;
	+ if($i & 1)
	+ {
	+ $ctx1 .= substr($final, 0, 16);
	+ } else
	{
	$ctx1 .= $pw;
	}
	- else
	- {
	- $ctx1 .= substr ($final,0,16);
	- }
	- if ($i % 3) $ctx1 .= $salt;
	- if ($i % 7) $ctx1 .= $pw;
	- if ($i & 1)
	- {
	- $ctx1 .= substr ($final,0,16);
	- }
	- else
	- {
	- $ctx1 .= $pw;
	- }
	- $final = $this->pahex2bin (md5 ($ctx1));
	+ $final = $this -> pahex2bin(md5($ctx1));
	}
	$passwd = "";
	- $passwd .= $this->to64 (((ord ($final[0]) << 16) \| (ord ($final[6]) << 8) \| (ord ($final[12]))), 4);
	- $passwd .= $this->to64 (((ord ($final[1]) << 16) \| (ord ($final[7]) << 8) \| (ord ($final[13]))), 4);
	- $passwd .= $this->to64 (((ord ($final[2]) << 16) \| (ord ($final[8]) << 8) \| (ord ($final[14]))), 4);
	- $passwd .= $this->to64 (((ord ($final[3]) << 16) \| (ord ($final[9]) << 8) \| (ord ($final[15]))), 4);
	- $passwd .= $this->to64 (((ord ($final[4]) << 16) \| (ord ($final[10]) << 8) \| (ord ($final[5]))), 4);
	- $passwd .= $this->to64 (ord ($final[11]), 2);
	+ $passwd .= $this -> to64(((ord($final[0])<<16) \| (ord($final[6])<<8) \| (ord($final[12]))), 4);
	+ $passwd .= $this -> to64(((ord($final[1])<<16) \| (ord($final[7])<<8) \| (ord($final[13]))), 4);
	+ $passwd .= $this -> to64(((ord($final[2])<<16) \| (ord($final[8])<<8) \| (ord($final[14]))), 4);
	+ $passwd .= $this -> to64(((ord($final[3])<<16) \| (ord($final[9])<<8) \| (ord($final[15]))), 4);
	+ $passwd .= $this -> to64(((ord($final[4])<<16) \| (ord($final[10])<<8) \| (ord($final[5]))), 4);
	+ $passwd .= $this -> to64(ord($final[11]), 2);
	return "$magic$salt\$$passwd";
	}

	- private function create_salt ()
	+ private function create_salt()
	{
	- srand ((double) microtime ()*1000000);
	- $salt = substr (md5 (rand (0,9999999)), 0, 8);
	+ srand((double) microtime() * 1000000);
	+ $salt = substr(md5(rand(0, 9999999)), 0, 8);
	return $salt;
	}
	-
	- private function pahex2bin ($str)
	+
	+ private function pahex2bin($str)
	{
	if(function_exists('hex2bin'))
	{
	return hex2bin($str);
	- }
	- else
	+ } else
	{
	- $len = strlen ($str);
	+ $len = strlen($str);
	$nstr = "";
	- for ($i=0;$i<$len;$i+=2)
	+ for($i = 0; $i < $len; $i += 2)
	{
	- $num = sscanf (substr ($str,$i,2), "%x");
	- $nstr.=chr ($num[0]);
	+ $num = sscanf(substr($str, $i, 2), "%x");
	+ $nstr .= chr($num[0]);
	}
	return $nstr;
	}
	}

	- private function to64 ($v, $n)
	+ private function to64($v, $n)
	{
	$ITOA64 = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
	$ret = "";
	- while (($n - 1) >= 0)
	+ while(($n - 1) >= 0)
	{
	$n--;
	$ret .= $ITOA64[$v & 0x3f];
	- $v = $v >> 6;
	+ $v = $v>>6;
	}
	return $ret;
	}

	}
	-
	?>

File Metadata

Mime Type: text/x-diff
Expires: Fri, Jan 24, 3:11 AM (1 d, 13 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 532490
Default Alt Text: (66 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions