Move code pointers from SF to github.com
Merge pull request #1 from cpeel/move_to_github
features for comparing pages with formatting removed.
Update changelog with new release number
Restructure changelog to most recent first
Update db_schema with usersettings changes
We only announce major changes now
Rename change_log.txt to CHANGELOG.md
Add project_pages deprecation warning to changelog
Update get_desired_language() with better comments
Correctly set the user's phpBB language upon account creation
Consolidate userSettings get/set command and use common prefix
Approved
Consolidate userSettings get/set command and use common prefix
Check for corrupt PNGs as part of project quick check
Code looks good to me, Casey. Thanks.
approved
Check for corrupt PNGs as part of project quick check
Fix upload_text.php to enforce user permissions and stage validation
Approved
Fix upload_text.php to enforce user permissions and stage validation
Merge /u/rp75/dproofreaders/ branch state_warn_2 into master
Various changes to PM and Project search including separate configurations for PM and Search
These are great Ray, thanks for your patience working through my CR issues!
Approved
New branch to avoid having to undo so many earlier changes.
Various changes to PM and Project search including separate configurations for PM and Search
Various changes to PM and Project search including separate configurations for PM and Search
Yeah, the best practices are unclear on this. attr_safe() should only be used for escaping HTML attributes inside tags. Restricting them to this specific case allows us to change the underlying function without it impacting other places in the code. We should use html_safe() on user input and other strings that might contain rogue HTML we want to properly escape. and not render. For translated strings in HTML outside of attributes, we shouldn't wrap them in either -- we consider those coming from...
I have changed assert() as you suggested. I am puzzled by attr_safe and html_safe. It seems from misc.inc that the only difference is that attr_safe does not double-encode valid html entities such as might occur in translated strings so it would seem to be appropriate to use on translated strings such as those in the table headings even though they are not attributes. Also perhaps book titles and authors' names.
+ echo "<a href='$contact_url'>", attr_safe($name), "</a>"; attr_safe() is only for things output within HTML tag attributes. You want html_safe() for places elsewhere in HTML. This happens in a few places in your most recent commits. + if(!assert(($search_origin === 'PM') || ($search_origin === 'PS'))) + exit; Assume that assert() will die if called (even though it doesn't on TEST -- yet, but I'll fix that). So this should just be: + assert(($search_origin === 'PM') || ($search_origin === 'PS')...
Various changes to PM and Project search including separate configurations for PM and Search
Rejecting this. see request for state_warn_1
I have made the changes Casey suggested for the state_warn merge request and rejected that request and fixed another mistake I found and made some other changes intended to simplify the functions. I made this branch in order to fix a mistake I made in an earlier commit.
Various changes to PM and Project search including separate configurations for PM and Search
I have made these changes and fixed another mistake I found and made some other changes intended to simplify the functions. I made another branch in order to fix a mistake I made in an earlier commit.
Merge /u/rp75/dproofreaders/ branch gen_suppress into master
Allow warning for blank line before and after sidenote to be suppressed
Approve
Thanks Casey, I've made the changes you suggested to preview.inc. Javascript does let you define the variable in a for statement. I avoided doing this because the linting plugin in Notepad++ seriously objected to it -- it gave up looking for more problems if it found such a thing. I came across a way of doing the loops with foreach which seems better.
Update new user email to mention "Smart" punctuation
Please hold off on this one. The error at PG turned out to be far more complex and this would not solve it? Thanks
- echo "<th class='$this->css_class'>$label</th>\n"; + echo "<th class='$this->css_class' title='", $this->get_long_label(), "'>$label</th>\n"; $this->get_long_label() needs to be wrapped in attr_safe() so it is correctly escaped for non-English strings. (Later you change this to $this->get_tooltip(), which is fine, but it too needs escaping before being used in a title attribute.) + $warning = ''; + foreach($this->active_columns as $column) + { + $warning .= $column->get_warning(); + } + echo "\n<p>$warning</p>\n";...
- $char_before_start = html_safe($messages['charBeforeStart']); +// $char_before_start = html_safe($messages['charBeforeStart']); Please remove commented-out code. - <input type="checkbox" id="id_cbs">$char_before_start - </fieldset> +END; + foreach($supp_set as $supp_item) + { + echo "<label><input type='checkbox' id='$supp_item'>", html_safe($messages[$supp_item]), "</label><br>\n"; + } + echo <<<END +</fieldset> Instead of closing there HEREDOC, doing the for loop, and then doing another HEREDOC,...
Approved
Merge /u/rp75/dproofreaders/ branch float_bar into master
Use a floating box for PM links
Merge /u/rp75/dproofreaders/ branch link_fix into master
Show the link to Project Quick Check when it is available for user and project
Merge /u/rp75/dproofreaders/ branch undo_diacrit into master
Remove diacritical markup feture from preview
Approved
I'm a little sad that we're removing this, as it seemed like a good idea to me, but I can appreciate that if it's confusing it probably needs some changes. The good news is that we can easily pull it back in and update it later since the history is in git.
APPROVED
Approved
Fix Latin1/UTF-8 integration issues between DP and phpBB3 code
I'm going to reject this since it needs to be rebased off the latest master anyway. This work still needs to be done, but I'm not totally comfortable with how I solved it.
Withdraw "[title]--A Project Gutenberg eBook" as an allowed form.
Use a floating box for PM links
Force links bar on PM page to always be at right edge (if coconfigured for right in prefs)
Fix a credits edge case
I'm inclined to agree. Working on it.
Thanks Ray. Next time please do whitespace cleanup in a separate commit so it's easier to see real code changes. What you have is great for this MR.
That's a much better way to do it. I've changed the files accordingly. (I removed trailing spaces so it comes up with a lot of diffs).
user_can_do_PQC() would be better named user_can_do_quick_check since it's already in the Project object. Separately, consider this block of code: + $links = ''; + if($project->can_be_managed_by_current_user) + { + // can also do PQC so end with | + $links .= "<a href='$code_url/tools/project_manager/editproject.php?action=edit&project=$project->projectid&return=" . urlencode($_SERVER["REQUEST_URI"]) + . "'>" . _("Edit the above information") + . "</a>\n | <a href='$code_url/tools/project_manager/edit_project_word_lists.php?projectid=$project->projectid&return="...
I don't like this hack. Honestly, I'd prefer we stop pretending that the PM list of links is a sidebar because it isn't. I'd prefer we make it a floating box that fits inside the page contents like the other contents. This wouldn't require any hacking of theme.inc since we'd want the padding there anyway.
Force links bar on PM page to always be at right edge (if coconfigured for right in prefs)
Various changes to PM and Project search including separate configurations for PM and Search
Show the link to Project Quick Check when it is available for user and project
Remove diacritical markup feture from preview
Allow warning for blank line before and after sidenote to be suppressed
Merge /u/cpeel/dp/ branch remove_deprecated_middleware into master
Remove support for phpBB2 and MySQL 5.1
Adjust PM page layout so right statsbar stays at right edge on wide screens
There could be a better way to do this.
Looks good to me.
Adjust PM page layout so right statsbar stays at right edge on wide screens
New P1-reserve rules for English projects
approved
New P1-reserve rules for English projects
Approved
Remove support for phpBB2 and MySQL 5.1
Include theme.inc for output_header()
Re-add border to image
Merge /u/rp75/dproofreaders/ branch diacrit_b into master
Interpret diacritical marks and ligature oe in format preview
Merge branch 'rp31/access_word_list'
Handle error from unauthorised access etc.
This was merged manually.
Merge /u/rp75/dproofreaders/ branch postfix into master
Revise when saved post data is used
Ignore cache for graphs on "Project WordCheck Statistics" page
Ignore cache for graphs on "Project WordCheck Statistics" page
I've re-enabled 'search' for projectmgr.php and changed get_condition() to use a parameter to avoid the problem you identified. The description for this is (and was) not quite correct. It should say "Now the saved sql condition, made from get or post data, is always used to redraw the page (when changing sorting etc.) if the page was originally made using this data (rather than 'user active' etc.). In these internal links search is changed to p_search to enable this.
Your change in tools/project_manager/projectmgr.php to remove 'search' from the possible show values will mean that any old bookmarked URLs will no longer work. In pinc/ProjectSearchForm.inc, if $_GET('show') is not set, PHP will report a notice when trying to access it. use array_get() from misc.inc to avoid this.
Revise when saved post data is used
Fix (yet another) PQC noncvs link