Cleaning controllers

[eurich]

yet another cleaning PR, controllers this time..

• removed lots of unused globals
• some minor fixes like missing globals, typos in var names etc.
• several todo remarks. I'd expect bugs there, so please check..

[eurich]

mhh, I've used git cherry-pick 7eba297.. and the code seems changed, however the author is me, not you (as expected).. Is this related to the conflict I had to solve in order to get it merged?

[norv]

It sounds like it (but I'm a bit surprised tbh.) Well, I don't feel it's relevant in this case, but if you wish the commit can be amended to change author.
(sorry for commenting on-the-run, hopefully tomorrow I can come back on it and the rest of notes :))

[eurich]

I believe it's again related to my IDE (Netbeans).. I had some conflicts to solve in order to get it merged. After resolving the conflicts I used "commit" from the GUI in Netbeans which automatically adds my sign-off and the author params (that's probably the reason)

--amend can AFAIK be used with the latest commit in that branch? In theory I'd need to reset to 749e4ef, use --amend on 749e4ef and then re-apply d4ca718 ?

[norv]

Yes, that's how I'd do it, reset first, --amend and re-apply (cherry) :) Playing with them git! :D

[emanuele45]

Or rebase -i (should work that way too)

[eurich]

oki, finally I got it.. changed my own edits back to its original state, then cherry-picked Norv's commit without getting conflicts :) the last commit 6d37940 is a new one, was too lazy to cherry-pick the old one..