RocketGit

catalinux / rocketgit (public) (License: Affero GPLv3) (since 2015-03-19) (hash sha1)

Main RocketGit repo

Clone URLs: https://rocketgit.com/user/catalinux/rocketgit ssh://rocketgit@ssh.rocketgit.com/user/catalinux/rocketgit git://git.rocketgit.com/user/catalinux/rocketgit

List of commits:

Subject	Hash	Author	Date (UTC)
Fixed edit_no_check's pass field usage	ebd3ff1f73009bcf5943589e19ee8a573d80f6ac	Catalin(ux) M. BOIE	2017-11-26 14:20:45
Small fix for typos in test runner	a85032bd5854816c8df6e8d23a1817e462a6f31e	Catalin(ux) M. BOIE	2017-11-26 13:47:18
We must set oversize_diff, even if also_patch is false	c347c23a5ecc022a4354cfa27088fe3db5cddeea	Catalin(ux) M. BOIE	2017-11-26 13:43:31
Added debug for rg_cache_merge function	740eb3b5dbd19ff8ab852ff745c4cad4b1b1a4fb	Catalin(ux) M. BOIE	2017-11-26 13:42:38
Improved a little bit the way the tests are run	c169ce030975bd0580d867a806df9c401a2b38e8	Catalin(ux) M. BOIE	2017-11-26 13:42:06
Latest git breaks anonymous push - fix it by using 'guest' user instead of the empty one	b3d1265cc9b44786c0fd7aa2988c5614f62db978	Catalin(ux) M. BOIE	2017-11-26 12:39:43
Lots of changes, but mostly LDAP support	029d34fdc14587b9ef6eb9e87ac36f66caefdacf	Catalin(ux) M. BOIE	2017-11-24 19:35:59
Fix state bug which triggered a not needed update of the structure	f6118c456bfc960782a53b9dc090046d542f9db9	Catalin(ux) M. BOIE	2017-11-24 19:12:38
Some free_result and unlock only if successfully locked	64666ca1371c004f74376fce2e2a67ee9f608a34	Catalin(ux) M. BOIE	2017-10-01 06:10:47
If git_log_simple returns error, just return error	acbbacda0947a3f8496c9b15870db574c08db715	Catalin(ux) M. BOIE	2017-08-31 03:43:25
Be less verbose in rg_rights_test	3cb2d12960b059b61f7c2c47c6198fbbdee8bccd	Catalin(ux) M. BOIE	2017-08-10 04:19:34
Remove rg_log_buf stuff because of performance issues	e85f70b38c197d44a9b4878dcff78da4f4f56562	Catalin(ux) M. BOIE	2017-08-08 20:08:56
Use a more efficient way to log multi line strings	67923e6760bf26923bd7ce9c9bced7a3f526cecf	Catalin(ux) M. BOIE	2017-08-08 19:54:00
css: make border more visible	378b328cde875d1584f3df6d8635b340ee23207a	Catalin(ux) M. BOIE	2017-07-22 23:27:29
struct: add itime for commit_labels	67d189b9d3330ab4dc3b6a0580a736522b6c1d36	Catalin(ux) M. BOIE	2017-07-22 23:05:02
wh: builder: we need repo info for clone_url_ssh info	6e95861b22476b0857f98a49025fc060302c2a3f	Catalin(ux) M. BOIE	2017-07-22 12:35:52
hints: ssh: make more clear that ssh must be restarted	8c35f89b323d3ea28fad79f4c32d78aadc8618f6	Catalin(ux) M. BOIE	2017-07-22 08:17:37
rg_authorize must be run as rocketgit user - fix permissions to 0755	80db46ae953b72ba521b3cd96c91602e127fc8f8	Catalin(ux) M. BOIE	2017-07-22 08:07:56
build_jobs: Columns with no defaults must be specified	bbb1c0036be3c6180d84e0641f41aa60ae1905f1	Catalin(ux) M. BOIE	2017-07-20 20:34:32
Show the suggestion to use https correctly	9656ff5ec3bfe65fc7a573fae254483c31d88501	Catalin(ux) M. BOIE	2017-07-10 20:57:26

Commit ebd3ff1f73009bcf5943589e19ee8a573d80f6ac - Fixed edit_no_check's pass field usage
Author: Catalin(ux) M. BOIE
Author date (UTC): 2017-11-26 14:20
Committer name: Catalin(ux) M. BOIE
Committer date (UTC): 2017-11-26 14:20
Parent(s): a85032bd5854816c8df6e8d23a1817e462a6f31e
Signer:
Signing key:
Signing status: N
Tree: 298f96e60fb20e8ddb2b5e75b8a5f476ea445055

File	Lines added	Lines deleted
inc/user.inc.php	10	8

File inc/user.inc.php changed (mode: 100644) (index f7656db..a78b788)
...	...	function rg_user_edit_no_check($db, $d)
512	512	$ret['errmsg'] = 'passwords are not the same';	$ret['errmsg'] = 'passwords are not the same';
513	513	break;	break;
514	514	}	}
	515		// We do not need it anymore
	516		unset($d['pass2']);
515	517
516	518	if (rg_user_pass_ok($d['pass']) !== TRUE) {	if (rg_user_pass_ok($d['pass']) !== TRUE) {
517	519	$ret['errmsg'] = rg_user_error();	$ret['errmsg'] = rg_user_error();

...	...	function rg_user_edit_no_check($db, $d)
519	521	}	}
520	522
521	523	$d['salt'] = rg_id(40);	$d['salt'] = rg_id(40);
522		$d['pass_crypted'] = rg_user_pass($d['salt'], $d['pass']);
	524		$d['pass'] = rg_user_pass($d['salt'], $d['pass']);
	525		} else {
	526		// No need to keep them in memory
	527		unset($d['pass']);
	528		unset($d['pass2']);
523	529	}	}
524	530
525		// No need to keep them in memory
526		unset($d['pass']);
527		unset($d['pass2']);
528
529	531	if ($add) {	if ($add) {
530	532	$d['itime'] = time();	$d['itime'] = time();
531	533	if (!isset($d['suspended']))	if (!isset($d['suspended']))

...	...	function rg_user_edit_no_check($db, $d)
540	542	. ', suspended, last_seen, disk_used_mb'	. ', suspended, last_seen, disk_used_mb'
541	543	. ', deleted)'	. ', deleted)'
542	544	. ' VALUES (@@username@@, @@realname@@, @@salt@@'	. ' VALUES (@@username@@, @@realname@@, @@salt@@'
543		. ', @@pass_crypted@@, @@email@@, @@itime@@'
	545		. ', @@pass@@, @@email@@, @@itime@@'
544	546	. ', @@is_admin@@, @@rights@@, @@session_time@@'	. ', @@is_admin@@, @@rights@@, @@session_time@@'
545	547	. ', @@confirmed@@, @@confirm_token@@, @@plan_id@@'	. ', @@confirmed@@, @@confirm_token@@, @@plan_id@@'
546	548	. ', @@suspended@@, @@last_seen@@'	. ', @@suspended@@, @@last_seen@@'

...	...	function rg_user_edit_no_check($db, $d)
552	554	} else { // edit	} else { // edit
553	555	$salt_pass_add = "";	$salt_pass_add = "";
554	556	if ($update_pass)	if ($update_pass)
555		$salt_pass_add = ', pass = @@pass_crypted@@'
	557		$salt_pass_add = ', pass = @@pass@@'
556	558	. ', salt = @@salt@@';	. ', salt = @@salt@@';
557	559
558	560	$sql = 'UPDATE users'	$sql = 'UPDATE users'

...	...	function rg_user_edit_no_check($db, $d)
592	594	rg_cache_set('user' . '::' . $d['uid'] . '::' . 'info',	rg_cache_set('user' . '::' . $d['uid'] . '::' . 'info',
593	595	$d, RG_SOCKET_NO_WAIT);	$d, RG_SOCKET_NO_WAIT);
594	596
595		// we need to be able to send the welcome mail
596	597	$d2 = $d;	$d2 = $d;
	598		// we need to be able to send the welcome mail
597	599	$d2['ignore_confirmed'] = 1;	$d2['ignore_confirmed'] = 1;
598	600
599	601	$event = array(	$event = array(

Hints:
Before first commit, do not forget to setup your git environment:

git config --global user.name "your_name_here"
git config --global user.email "your@email_here"

Clone this repository using HTTP(S):

git clone https://rocketgit.com/user/catalinux/rocketgit

Clone this repository using ssh (do not forget to upload a key first):

git clone ssh://rocketgit@ssh.rocketgit.com/user/catalinux/rocketgit

Clone this repository using git:

git clone git://git.rocketgit.com/user/catalinux/rocketgit

You are allowed to anonymously push to this repository.
This means that your pushed commits will automatically be transformed into a merge request:

... clone the repository ...
... make some changes and some commits ...
git push origin main