| ../irclogs/#mantishelp.2009-12-15.log | ||
| --- scribe started --- | 00:00 | |
| kirillka | paul__: around? | 09:38 |
|---|---|---|
| kirillka | nuclear_eclipse: John? | 10:00 |
| kirillka | Anyone know how git.mantisforge.org work? | 10:03 |
| * kirillka slaps paul__ around a bit with a large trout | 12:14 | |
| * kirillka slaps paul__ around a bit with a large trout | 14:15 | |
| kirillka | nuclear_eclipse: John, around? | 14:29 |
| paul__ | lo | 14:36 |
| kirillka | paul__: lo | 14:37 |
| paul__ | what? | 14:37 |
| kirillka | paul__: Remember me, how you set mantisforge.org | 14:37 |
| kirillka | You sometime talk me how you set up, that users don't create in machine but on web exists | 14:38 |
| kirillka | But I can found on irclog | 14:38 |
| paul__ | it uses the source available from http://repo.or.cz/ | 14:39 |
| paul__ | which recently got updated | 14:39 |
| kirillka | Yes. But default I have pure gitweb without user registration and work with one login git | 14:40 |
| kirillka | but on mantisforge I login with own login | 14:41 |
| kirillka | git+ssh://kirill@git.mantisforge.org | 14:41 |
| paul__ | which uses some funky logic written by http://repo.or.cz/ people | 14:41 |
| kirillka | yes | 14:42 |
| paul__ | might also be worth while looking at something like http://www.gitorious.org/gitorious | 14:43 |
| paul__ | There's a number of git hosting sites/projects etc listed at http://git.or.cz/gitwiki/GitHosting | 14:43 |
| kirillka | this better than gitweb with exchange? | 14:48 |
| paul__ | no idea | 14:56 |
| paul__ | I just picked one and tried to set it up.. | 14:56 |
| kirillka | paul__: You talk about isolated system, but I forgot how you call this | 14:58 |
| paul__ | repo.or.cz code runs in a chroot environment | 14:58 |
| paul__ | and was a pain to get setup | 14:58 |
| paul__ | took myself + a friend a fair amount of fiddling to get working | 14:58 |
| kirillka | :( I don't understand | 15:00 |
| kirillka | gitorious run on RoR | 15:00 |
| kirillka | :( I haven't RoR | 15:00 |
| kirillka | :( | 15:06 |
| paul__ | splitty today | 18:09 |
| paul__ | nuclear_eclipse: `mo | 19:36 |
| nuclear_eclipse | hi paul__ | 20:35 |
| paul__ | lo | 20:36 |
| paul__ | 2 more days | 20:41 |
| paul__ | :) | 20:41 |
| paul__ | nuclear_eclipse: did we ever revert the html api changes pulling out stringdisplay? | 20:54 |
| nuclear_eclipse | no | 20:56 |
| paul__ | let me do that then | 20:57 |
| paul__ | nuclear_eclipse: still there? | 21:25 |
| nuclear_eclipse | yo | 21:28 |
| paul__ | can you look at ldap_Escape_string? | 21:29 |
| nuclear_eclipse | what about it? | 21:31 |
| nuclear_eclipse | other than inefficient? | 21:31 |
| paul__ | function ldap_escape_string( $p_string ) { $t_find = array( '\\', '*', '(', ')', '/', "\0" ); $t_replace = array( '\5c', '\2a', '\28', '\29', '\2f', "\\00" ); | 21:32 |
| paul__ | $t_string = str_replace( $t_find, $t_replace, $t_string ); | 21:32 |
| paul__ | return $t_string; | 21:32 |
| paul__ | } | 21:32 |
| nuclear_eclipse | considering I know nothing about how ldap works or escapes things, I guess? :P | 21:33 |
| paul__ | well,zend do: | 21:33 |
| paul__ | for ($si = 0; $si < $len; $si++) { | 21:33 |
| paul__ | $ch = $str[$si]; | 21:33 |
| paul__ | $ord = ord($ch); | 21:33 |
| paul__ | if ($ord < 0x20 || $ord > 0x7e || strstr('*()\/', $ch)) { | 21:33 |
| paul__ | $ch = '\\' . dechex($ord); | 21:33 |
| paul__ | } | 21:34 |
| paul__ | $ret .= $ch; | 21:34 |
| paul__ | $t_find = array( '\\', '*', '(', ')', '/', "\x00" ); | 21:40 |
| paul__ | $t_replace = array( '\5c', '\2a', '\28', '\29', '\2f', "\\00" ); | 21:40 |
| paul__ | $t_string = str_replace( $t_find, $t_replace, $t_string ); | 21:41 |
| paul__ | think that | 21:41 |
| nuclear_eclipse | worksforme? :P | 21:43 |
| paul__ | $t_find = array( '\\', '*', '(', ')', '/', "\x00" ); | 21:51 |
| paul__ | $t_replace = array( '\5c', '\2a', '\28', '\29', '\2f', '\00' ); | 21:51 |
| paul__ | or that even | 21:51 |
| paul__ | "\\00" can be '\00' | 21:51 |
| paul__ | nuclear_eclipse: did we ever make core formatting an enforced plugin? | 22:15 |
| dhx_m | paul__: it's not so easy... we can't just remove string_display_line/htmlentities from being used to output PHP variables | 22:32 |
| paul__ | i've put string display back in html api | 22:34 |
| paul__ | and customised how error api uses html api | 22:34 |
| dhx_m | paul__: and string_display_line needs to have some sort of logic in it to do it's own escaping of special HTML characters | 22:34 |
| paul__ | that's already there | 22:35 |
| paul__ | ? | 22:35 |
| dhx_m | all I'm saying is that we can't just separate output sanitisation from pretty formatting of text | 22:35 |
| dhx_m | as we need to allow some HTML characters through from the pretty formatting stage | 22:36 |
| dhx_m | also string_display_* is the wrong one to use within html_api | 22:36 |
| dhx_m | because we don't want to pretty format any text there... we only want to sanitise it | 22:36 |
| dhx_m | what John and myself discussed the other day was reserving string_display and string_display_line for times when we want to pretty format text | 22:37 |
| paul__ | mm | 22:37 |
| dhx_m | and for everything else, use some sort of html_sanitise_... function | 22:37 |
| paul__ | I dont think we can just call htmlentities or whatever | 22:37 |
| paul__ | so string_display is 'safer' | 22:37 |
| paul__ | we might need a string_sanitise type function as you say ;p | 22:37 |
| dhx_m | it doesn't make any sense, we never want to apply special formatting to things like the page title | 22:38 |
| dhx_m | and more to the point, we should really be escaping all variables for HTML output (when that is the mode in use) even when MantisCoreFormatting is not activated | 22:39 |
| paul__ | dhx_m: well | 22:45 |
| paul__ | hmm | 22:45 |
| paul__ | atm, i've modified html/error api to use string display as that's one discussion we had :P | 22:45 |
| paul__ | then there was a 2nd discussion | 22:45 |
| dhx_m | but it's wrong to do that :p | 22:45 |
| paul__ | I think we might need more then just html entities | 22:45 |
| dhx_m | we should be using a sanitisation function rather than a formatting function | 22:45 |
| dhx_m | if it's a multi-line text field then yes... otherwise, not really | 22:46 |
| * paul__ sighs | 22:52 | |
| paul__ | how do i drop that commit now ;/ | 22:52 |
| dhx_m | have you made other commits since? | 22:52 |
| paul__ | ofc! | 22:53 |
| paul__ | I'm going to keep the error api change part though | 22:53 |
| dhx_m | using string_display? | 22:54 |
| paul__ | breaking html_page_top down into a sensible set of things to actually run | 22:54 |
| paul__ | or more, removing some stuff | 22:54 |
| dhx_m | yeah that's good | 22:54 |
| paul__ | for example | 22:54 |
| dhx_m | less coupling for error_api the better | 22:54 |
| paul__ | I dont think we need project selector on error page | 22:54 |
| dhx_m | nope | 22:55 |
| paul__ | anyway how do I pull this commit? | 22:55 |
| dhx_m | I think you may have to revert it | 22:55 |
| dhx_m | with git revert {commitid} | 22:55 |
| paul__ | I tried to cherry pick it | 22:55 |
| dhx_m | cherry-pick merges a single commit | 22:55 |
| paul__ | oh | 22:56 |
| paul__ | hmm | 22:56 |
| dhx_m | if you want to go backwards from your last commit | 22:56 |
| paul__ | brb | 22:56 |
| paul__ | need to pick up father | 22:56 |
| dhx_m | use git reset --hard {commitid} | 22:56 |
| dhx_m | and it'll remove all changes/commits more recent in your branch than {commitid} | 22:56 |
| dhx_m | you could make a new branch, merge master into it | 22:56 |
| paul__ | can i erase the revert history | 22:57 |
| dhx_m | hmm | 22:57 |
| dhx_m | actually | 22:58 |
| dhx_m | maybe you can rebase your branch | 22:58 |
| dhx_m | move the revert commit to the top | 22:58 |
| dhx_m | and move the html_api commit to 2nd place | 22:59 |
| dhx_m | then squash both of them down into the last commit? | 22:59 |
| dhx_m | http://stackoverflow.com/questions/495345/git-removing-selected-commits-from-repository | 22:59 |
| paul__ | mm | 23:17 |
| paul__ | right done something | 23:19 |
| paul__ | dhx_m: you still there? | 23:49 |
| dhx_m | paul__: yep | 23:49 |
| paul__ | nm | 23:52 |
Generated by irclog2html.py