docs: Fix some typos in helpers/form_helper.rst - #8915

Closed
obozdag wants to merge 0 commit into
codeigniter4:developfrom
obozdag:patch-9
Closed

docs: Fix some typos in helpers/form_helper.rst#8915
obozdag wants to merge 0 commit into
codeigniter4:developfrom
obozdag:patch-9

Conversation

@obozdag

Copy link
Copy Markdown
Contributor

Description
docs: Fix some typos in helpers/form_helper.rst

Checklist:

  • Securely signed commits
  • Component(s) with PHPDoc blocks, only if necessary or adds value
  • Unit testing, with >80% coverage
  • User guide updated
  • Conforms to style guide

@kenjiskenjis added the documentation Pull requests for documentation only label May 27, 2024
Comment threaduser_guide_src/source/helpers/form_helper.rst Outdated
for POST/PUT/DELETE/PATCH requests, but even for GET requests, CSRF filters must be enabled for pages that display Forms.

If you enable CSRF filter with [$globals] https://codeigniter4.github.io/CodeIgniter4/incoming/filters.html#globals), it will be active for all request types.
But if you enable CSRF filter with public array $methods = ['POST' => ['csrf']];, the hidden CSRF field will not be added in GET requests.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please fix the RST format.

Screenshot 2024-05-31 17 12 12

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kenjis I hope it is fixed now. I don't know how to preview before commit.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still not good.
Screenshot 2024-06-01 8 19 06

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please apply this patch:

--- a/user_guide_src/source/helpers/form_helper.rst+++ b/user_guide_src/source/helpers/form_helper.rst@@ -112,12 +112,17 @@ The following functions are available:
<form action="http://example.com/index.php/u/sign-up" method="post" accept-charset="utf-8">
<input type="hidden" id="my-id" name="csrf_test_name" value="964ede6e0ae8a680f7b8eab69136717d">
- .. note:: To use auto-generation of CSRF field, you need to turn on the :ref:`CSRF filter <enable-csrf-protection>` in **app/Config/Filters.php** file.- In most cases the form page is requested using the GET method. Normally, CSRF protection is required- for POST/PUT/DELETE/PATCH requests, but even for GET requests, CSRF filters must be enabled for pages that display Forms.-- If you enable CSRF filter with `$globals <https://codeigniter4.github.io/CodeIgniter4/incoming/filters.html#globals>`, it will be active for all request types.- But if you enable CSRF filter with public array $methods = ['POST' => ['csrf']];, the hidden CSRF field will not be added in GET requests.+ .. note:: To use auto-generation of CSRF field, you need to turn on the+ :ref:`CSRF filter <enable-csrf-protection>` in **app/Config/Filters.php**+ file. In most cases the form page is requested using the GET method.+ Normally, CSRF protection is required for POST/PUT/DELETE/PATCH requests,+ but even for GET requests, CSRF filters must be enabled for pages+ that display Forms.++ If you enable CSRF filter with :ref:`filters-globals`, it will be+ active for all request types. But if you enable CSRF filter with+ ``public array $methods = ['POST' => ['csrf']];``, the hidden CSRF+ field will not be added in GET requests.
**Adding Hidden Input Fields**
diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst
index 303f80b551..4425ce03d3 100644
--- a/user_guide_src/source/incoming/filters.rst+++ b/user_guide_src/source/incoming/filters.rst@@ -139,6 +139,8 @@ Filters can be specified by adding their alias to either the ``before`` or ``aft
.. literalinclude:: filters/013.php
+.. _filters-globals:+
$globals
--------

Comment threaduser_guide_src/source/helpers/form_helper.rst Outdated
@kenjis

Copy link
Copy Markdown
Member

Thank you for updating.
We don't use merge commits in PR branches.
We use git rebase. See https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md#updating-your-branch
Can you remove the merge commit in the last?

@obozdag

Copy link
Copy Markdown
ContributorAuthor

@kenjis I had problems having my branches in local computer. That is why, when I want to fix something in the guide while reading it on the internet, there is a button "Edit this page", I just click it, edit the file, and commit. This way it creates a new branch each time. After sending form_helper (pacth-9) PR, there was a link on top to update the branch and I clicked. That was wrong as I understand now. But unfortunately I don't know how to roll it back on github. (I work completely on github. No local files or folders on my computer.) So can you please lead me how to do? Or I can delete this patch and close the PR and recreate it.

@kenjis

Copy link
Copy Markdown
Member

@obozdag
Have you ever used git command on your local computer?
The detailed workflow is explained in https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md.
Can you follow the documentation?

@obozdag

Copy link
Copy Markdown
ContributorAuthor

@kenjis I followed the documentation. I ran following commands:

  • gh repo clone obozdag/CodeIgniter4
  • cd CodeIgniter4
  • git fetch upstream
  • git switch develop
  • git merge upstream/develop
  • git push origin develop
  • git switch patch-9
  • git rebase upstream/develop
  • git push --force-with-lease origin patch-9

But the PR is automatically closed. So it means I couldn't remove the merge commit in the last?

@kenjis

kenjis commented Jun 4, 2024

Copy link
Copy Markdown
Member

It seems the patch-9 branch is exactly the same as upstream/develop.
So this PR was closed automatically?

Your commands seem no problem. I'm not sure why both branches are the same.
Did you got an error when you ran git rebase upstream/develop?

@kenjis

kenjis commented Jun 5, 2024

Copy link
Copy Markdown
Member

I've found your repository'sdevelop is not the same as the upstream.
But I don't know this is the reason why this PR was closed.
Screenshot 2024-06-05 11 01 05

I recommend you make the develop exactly the same as upstream/develop:

$ git checkout patch-9
$ git branch -D develop
$ git checkout --track upstream/develop
$ git push --force-with-lease origin develop

@obozdag

Copy link
Copy Markdown
ContributorAuthor

@kenjis Run those commands. But no difference I think. So I will redo changes from scratch and small changes for each PR this time. Thanks for your effort.

@kenjis

Copy link
Copy Markdown
Member

Your https://github.com/obozdag/CodeIgniter4/tree/develop is now up to date with codeigniter4/CodeIgniter4:develop.
But yes, this has nothing to do with the close of this PR.

@kenjis

kenjis commented Jun 5, 2024

Copy link
Copy Markdown
Member

I uploaded my local patch-9 branch to https://github.com/kenjis/CodeIgniter4/tree/patch-9 for reference.
It may not be the latest one.

@kenjiskenjis mentioned this pull request Jun 5, 2024
5 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentationPull requests for documentation only

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@obozdag@kenjis
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

docs: Fix some typos in helpers/form_helper.rst - #8915

Closed
obozdag wants to merge 0 commit into
codeigniter4:developfrom
obozdag:patch-9
Closed

docs: Fix some typos in helpers/form_helper.rst#8915
obozdag wants to merge 0 commit into
codeigniter4:developfrom
obozdag:patch-9

Conversation

@obozdag

Copy link
Copy Markdown
Contributor

Description
docs: Fix some typos in helpers/form_helper.rst

Checklist:

  • Securely signed commits
  • Component(s) with PHPDoc blocks, only if necessary or adds value
  • Unit testing, with >80% coverage
  • User guide updated
  • Conforms to style guide

@kenjiskenjis added the documentation Pull requests for documentation only label May 27, 2024
Comment threaduser_guide_src/source/helpers/form_helper.rst Outdated
for POST/PUT/DELETE/PATCH requests, but even for GET requests, CSRF filters must be enabled for pages that display Forms.

If you enable CSRF filter with [$globals] https://codeigniter4.github.io/CodeIgniter4/incoming/filters.html#globals), it will be active for all request types.
But if you enable CSRF filter with public array $methods = ['POST' => ['csrf']];, the hidden CSRF field will not be added in GET requests.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please fix the RST format.

Screenshot 2024-05-31 17 12 12

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kenjis I hope it is fixed now. I don't know how to preview before commit.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still not good.
Screenshot 2024-06-01 8 19 06

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please apply this patch:

--- a/user_guide_src/source/helpers/form_helper.rst+++ b/user_guide_src/source/helpers/form_helper.rst@@ -112,12 +112,17 @@ The following functions are available:
<form action="http://example.com/index.php/u/sign-up" method="post" accept-charset="utf-8">
<input type="hidden" id="my-id" name="csrf_test_name" value="964ede6e0ae8a680f7b8eab69136717d">
- .. note:: To use auto-generation of CSRF field, you need to turn on the :ref:`CSRF filter <enable-csrf-protection>` in **app/Config/Filters.php** file.- In most cases the form page is requested using the GET method. Normally, CSRF protection is required- for POST/PUT/DELETE/PATCH requests, but even for GET requests, CSRF filters must be enabled for pages that display Forms.-- If you enable CSRF filter with `$globals <https://codeigniter4.github.io/CodeIgniter4/incoming/filters.html#globals>`, it will be active for all request types.- But if you enable CSRF filter with public array $methods = ['POST' => ['csrf']];, the hidden CSRF field will not be added in GET requests.+ .. note:: To use auto-generation of CSRF field, you need to turn on the+ :ref:`CSRF filter <enable-csrf-protection>` in **app/Config/Filters.php**+ file. In most cases the form page is requested using the GET method.+ Normally, CSRF protection is required for POST/PUT/DELETE/PATCH requests,+ but even for GET requests, CSRF filters must be enabled for pages+ that display Forms.++ If you enable CSRF filter with :ref:`filters-globals`, it will be+ active for all request types. But if you enable CSRF filter with+ ``public array $methods = ['POST' => ['csrf']];``, the hidden CSRF+ field will not be added in GET requests.
**Adding Hidden Input Fields**
diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst
index 303f80b551..4425ce03d3 100644
--- a/user_guide_src/source/incoming/filters.rst+++ b/user_guide_src/source/incoming/filters.rst@@ -139,6 +139,8 @@ Filters can be specified by adding their alias to either the ``before`` or ``aft
.. literalinclude:: filters/013.php
+.. _filters-globals:+
$globals
--------

Comment threaduser_guide_src/source/helpers/form_helper.rst Outdated
@kenjis

Copy link
Copy Markdown
Member

Thank you for updating.
We don't use merge commits in PR branches.
We use git rebase. See https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md#updating-your-branch
Can you remove the merge commit in the last?

@obozdag

Copy link
Copy Markdown
ContributorAuthor

@kenjis I had problems having my branches in local computer. That is why, when I want to fix something in the guide while reading it on the internet, there is a button "Edit this page", I just click it, edit the file, and commit. This way it creates a new branch each time. After sending form_helper (pacth-9) PR, there was a link on top to update the branch and I clicked. That was wrong as I understand now. But unfortunately I don't know how to roll it back on github. (I work completely on github. No local files or folders on my computer.) So can you please lead me how to do? Or I can delete this patch and close the PR and recreate it.

@kenjis

Copy link
Copy Markdown
Member

@obozdag
Have you ever used git command on your local computer?
The detailed workflow is explained in https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md.
Can you follow the documentation?

@obozdag

Copy link
Copy Markdown
ContributorAuthor

@kenjis I followed the documentation. I ran following commands:

  • gh repo clone obozdag/CodeIgniter4
  • cd CodeIgniter4
  • git fetch upstream
  • git switch develop
  • git merge upstream/develop
  • git push origin develop
  • git switch patch-9
  • git rebase upstream/develop
  • git push --force-with-lease origin patch-9

But the PR is automatically closed. So it means I couldn't remove the merge commit in the last?

@kenjis

kenjis commented Jun 4, 2024

Copy link
Copy Markdown
Member

It seems the patch-9 branch is exactly the same as upstream/develop.
So this PR was closed automatically?

Your commands seem no problem. I'm not sure why both branches are the same.
Did you got an error when you ran git rebase upstream/develop?

@kenjis

kenjis commented Jun 5, 2024

Copy link
Copy Markdown
Member

I've found your repository'sdevelop is not the same as the upstream.
But I don't know this is the reason why this PR was closed.
Screenshot 2024-06-05 11 01 05

I recommend you make the develop exactly the same as upstream/develop:

$ git checkout patch-9
$ git branch -D develop
$ git checkout --track upstream/develop
$ git push --force-with-lease origin develop

@obozdag

Copy link
Copy Markdown
ContributorAuthor

@kenjis Run those commands. But no difference I think. So I will redo changes from scratch and small changes for each PR this time. Thanks for your effort.

@kenjis

Copy link
Copy Markdown
Member

Your https://github.com/obozdag/CodeIgniter4/tree/develop is now up to date with codeigniter4/CodeIgniter4:develop.
But yes, this has nothing to do with the close of this PR.

@kenjis

kenjis commented Jun 5, 2024

Copy link
Copy Markdown
Member

I uploaded my local patch-9 branch to https://github.com/kenjis/CodeIgniter4/tree/patch-9 for reference.
It may not be the latest one.

@kenjiskenjis mentioned this pull request Jun 5, 2024
5 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentationPull requests for documentation only

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@obozdag@kenjis
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

docs: Fix some typos in helpers/form_helper.rst - #8915

Closed
obozdag wants to merge 0 commit into
codeigniter4:developfrom
obozdag:patch-9
Closed

docs: Fix some typos in helpers/form_helper.rst#8915
obozdag wants to merge 0 commit into
codeigniter4:developfrom
obozdag:patch-9

Conversation

@obozdag

Copy link
Copy Markdown
Contributor

Description
docs: Fix some typos in helpers/form_helper.rst

Checklist:

  • Securely signed commits
  • Component(s) with PHPDoc blocks, only if necessary or adds value
  • Unit testing, with >80% coverage
  • User guide updated
  • Conforms to style guide

@kenjiskenjis added the documentation Pull requests for documentation only label May 27, 2024
Comment threaduser_guide_src/source/helpers/form_helper.rst Outdated
for POST/PUT/DELETE/PATCH requests, but even for GET requests, CSRF filters must be enabled for pages that display Forms.

If you enable CSRF filter with [$globals] https://codeigniter4.github.io/CodeIgniter4/incoming/filters.html#globals), it will be active for all request types.
But if you enable CSRF filter with public array $methods = ['POST' => ['csrf']];, the hidden CSRF field will not be added in GET requests.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please fix the RST format.

Screenshot 2024-05-31 17 12 12

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kenjis I hope it is fixed now. I don't know how to preview before commit.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still not good.
Screenshot 2024-06-01 8 19 06

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please apply this patch:

--- a/user_guide_src/source/helpers/form_helper.rst+++ b/user_guide_src/source/helpers/form_helper.rst@@ -112,12 +112,17 @@ The following functions are available:
<form action="http://example.com/index.php/u/sign-up" method="post" accept-charset="utf-8">
<input type="hidden" id="my-id" name="csrf_test_name" value="964ede6e0ae8a680f7b8eab69136717d">
- .. note:: To use auto-generation of CSRF field, you need to turn on the :ref:`CSRF filter <enable-csrf-protection>` in **app/Config/Filters.php** file.- In most cases the form page is requested using the GET method. Normally, CSRF protection is required- for POST/PUT/DELETE/PATCH requests, but even for GET requests, CSRF filters must be enabled for pages that display Forms.-- If you enable CSRF filter with `$globals <https://codeigniter4.github.io/CodeIgniter4/incoming/filters.html#globals>`, it will be active for all request types.- But if you enable CSRF filter with public array $methods = ['POST' => ['csrf']];, the hidden CSRF field will not be added in GET requests.+ .. note:: To use auto-generation of CSRF field, you need to turn on the+ :ref:`CSRF filter <enable-csrf-protection>` in **app/Config/Filters.php**+ file. In most cases the form page is requested using the GET method.+ Normally, CSRF protection is required for POST/PUT/DELETE/PATCH requests,+ but even for GET requests, CSRF filters must be enabled for pages+ that display Forms.++ If you enable CSRF filter with :ref:`filters-globals`, it will be+ active for all request types. But if you enable CSRF filter with+ ``public array $methods = ['POST' => ['csrf']];``, the hidden CSRF+ field will not be added in GET requests.
**Adding Hidden Input Fields**
diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst
index 303f80b551..4425ce03d3 100644
--- a/user_guide_src/source/incoming/filters.rst+++ b/user_guide_src/source/incoming/filters.rst@@ -139,6 +139,8 @@ Filters can be specified by adding their alias to either the ``before`` or ``aft
.. literalinclude:: filters/013.php
+.. _filters-globals:+
$globals
--------

Comment threaduser_guide_src/source/helpers/form_helper.rst Outdated
@kenjis

Copy link
Copy Markdown
Member

Thank you for updating.
We don't use merge commits in PR branches.
We use git rebase. See https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md#updating-your-branch
Can you remove the merge commit in the last?

@obozdag

Copy link
Copy Markdown
ContributorAuthor

@kenjis I had problems having my branches in local computer. That is why, when I want to fix something in the guide while reading it on the internet, there is a button "Edit this page", I just click it, edit the file, and commit. This way it creates a new branch each time. After sending form_helper (pacth-9) PR, there was a link on top to update the branch and I clicked. That was wrong as I understand now. But unfortunately I don't know how to roll it back on github. (I work completely on github. No local files or folders on my computer.) So can you please lead me how to do? Or I can delete this patch and close the PR and recreate it.

@kenjis

Copy link
Copy Markdown
Member

@obozdag
Have you ever used git command on your local computer?
The detailed workflow is explained in https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md.
Can you follow the documentation?

@obozdag

Copy link
Copy Markdown
ContributorAuthor

@kenjis I followed the documentation. I ran following commands:

  • gh repo clone obozdag/CodeIgniter4
  • cd CodeIgniter4
  • git fetch upstream
  • git switch develop
  • git merge upstream/develop
  • git push origin develop
  • git switch patch-9
  • git rebase upstream/develop
  • git push --force-with-lease origin patch-9

But the PR is automatically closed. So it means I couldn't remove the merge commit in the last?

@kenjis

kenjis commented Jun 4, 2024

Copy link
Copy Markdown
Member

It seems the patch-9 branch is exactly the same as upstream/develop.
So this PR was closed automatically?

Your commands seem no problem. I'm not sure why both branches are the same.
Did you got an error when you ran git rebase upstream/develop?

@kenjis

kenjis commented Jun 5, 2024

Copy link
Copy Markdown
Member

I've found your repository'sdevelop is not the same as the upstream.
But I don't know this is the reason why this PR was closed.
Screenshot 2024-06-05 11 01 05

I recommend you make the develop exactly the same as upstream/develop:

$ git checkout patch-9
$ git branch -D develop
$ git checkout --track upstream/develop
$ git push --force-with-lease origin develop

@obozdag

Copy link
Copy Markdown
ContributorAuthor

@kenjis Run those commands. But no difference I think. So I will redo changes from scratch and small changes for each PR this time. Thanks for your effort.

@kenjis

Copy link
Copy Markdown
Member

Your https://github.com/obozdag/CodeIgniter4/tree/develop is now up to date with codeigniter4/CodeIgniter4:develop.
But yes, this has nothing to do with the close of this PR.

@kenjis

kenjis commented Jun 5, 2024

Copy link
Copy Markdown
Member

I uploaded my local patch-9 branch to https://github.com/kenjis/CodeIgniter4/tree/patch-9 for reference.
It may not be the latest one.

@kenjiskenjis mentioned this pull request Jun 5, 2024
5 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentationPull requests for documentation only

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@obozdag@kenjis
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

docs: Fix some typos in helpers/form_helper.rst - #8915

Closed
obozdag wants to merge 0 commit into
codeigniter4:developfrom
obozdag:patch-9
Closed

docs: Fix some typos in helpers/form_helper.rst#8915
obozdag wants to merge 0 commit into
codeigniter4:developfrom
obozdag:patch-9

Conversation

@obozdag

Copy link
Copy Markdown
Contributor

Description
docs: Fix some typos in helpers/form_helper.rst

Checklist:

  • Securely signed commits
  • Component(s) with PHPDoc blocks, only if necessary or adds value
  • Unit testing, with >80% coverage
  • User guide updated
  • Conforms to style guide

@kenjiskenjis added the documentation Pull requests for documentation only label May 27, 2024
Comment threaduser_guide_src/source/helpers/form_helper.rst Outdated
for POST/PUT/DELETE/PATCH requests, but even for GET requests, CSRF filters must be enabled for pages that display Forms.

If you enable CSRF filter with [$globals] https://codeigniter4.github.io/CodeIgniter4/incoming/filters.html#globals), it will be active for all request types.
But if you enable CSRF filter with public array $methods = ['POST' => ['csrf']];, the hidden CSRF field will not be added in GET requests.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please fix the RST format.

Screenshot 2024-05-31 17 12 12

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kenjis I hope it is fixed now. I don't know how to preview before commit.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still not good.
Screenshot 2024-06-01 8 19 06

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please apply this patch:

--- a/user_guide_src/source/helpers/form_helper.rst+++ b/user_guide_src/source/helpers/form_helper.rst@@ -112,12 +112,17 @@ The following functions are available:
<form action="http://example.com/index.php/u/sign-up" method="post" accept-charset="utf-8">
<input type="hidden" id="my-id" name="csrf_test_name" value="964ede6e0ae8a680f7b8eab69136717d">
- .. note:: To use auto-generation of CSRF field, you need to turn on the :ref:`CSRF filter <enable-csrf-protection>` in **app/Config/Filters.php** file.- In most cases the form page is requested using the GET method. Normally, CSRF protection is required- for POST/PUT/DELETE/PATCH requests, but even for GET requests, CSRF filters must be enabled for pages that display Forms.-- If you enable CSRF filter with `$globals <https://codeigniter4.github.io/CodeIgniter4/incoming/filters.html#globals>`, it will be active for all request types.- But if you enable CSRF filter with public array $methods = ['POST' => ['csrf']];, the hidden CSRF field will not be added in GET requests.+ .. note:: To use auto-generation of CSRF field, you need to turn on the+ :ref:`CSRF filter <enable-csrf-protection>` in **app/Config/Filters.php**+ file. In most cases the form page is requested using the GET method.+ Normally, CSRF protection is required for POST/PUT/DELETE/PATCH requests,+ but even for GET requests, CSRF filters must be enabled for pages+ that display Forms.++ If you enable CSRF filter with :ref:`filters-globals`, it will be+ active for all request types. But if you enable CSRF filter with+ ``public array $methods = ['POST' => ['csrf']];``, the hidden CSRF+ field will not be added in GET requests.
**Adding Hidden Input Fields**
diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst
index 303f80b551..4425ce03d3 100644
--- a/user_guide_src/source/incoming/filters.rst+++ b/user_guide_src/source/incoming/filters.rst@@ -139,6 +139,8 @@ Filters can be specified by adding their alias to either the ``before`` or ``aft
.. literalinclude:: filters/013.php
+.. _filters-globals:+
$globals
--------

Comment threaduser_guide_src/source/helpers/form_helper.rst Outdated
@kenjis

Copy link
Copy Markdown
Member

Thank you for updating.
We don't use merge commits in PR branches.
We use git rebase. See https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md#updating-your-branch
Can you remove the merge commit in the last?

@obozdag

Copy link
Copy Markdown
ContributorAuthor

@kenjis I had problems having my branches in local computer. That is why, when I want to fix something in the guide while reading it on the internet, there is a button "Edit this page", I just click it, edit the file, and commit. This way it creates a new branch each time. After sending form_helper (pacth-9) PR, there was a link on top to update the branch and I clicked. That was wrong as I understand now. But unfortunately I don't know how to roll it back on github. (I work completely on github. No local files or folders on my computer.) So can you please lead me how to do? Or I can delete this patch and close the PR and recreate it.

@kenjis

Copy link
Copy Markdown
Member

@obozdag
Have you ever used git command on your local computer?
The detailed workflow is explained in https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md.
Can you follow the documentation?

@obozdag

Copy link
Copy Markdown
ContributorAuthor

@kenjis I followed the documentation. I ran following commands:

  • gh repo clone obozdag/CodeIgniter4
  • cd CodeIgniter4
  • git fetch upstream
  • git switch develop
  • git merge upstream/develop
  • git push origin develop
  • git switch patch-9
  • git rebase upstream/develop
  • git push --force-with-lease origin patch-9

But the PR is automatically closed. So it means I couldn't remove the merge commit in the last?

@kenjis

kenjis commented Jun 4, 2024

Copy link
Copy Markdown
Member

It seems the patch-9 branch is exactly the same as upstream/develop.
So this PR was closed automatically?

Your commands seem no problem. I'm not sure why both branches are the same.
Did you got an error when you ran git rebase upstream/develop?

@kenjis

kenjis commented Jun 5, 2024

Copy link
Copy Markdown
Member

I've found your repository'sdevelop is not the same as the upstream.
But I don't know this is the reason why this PR was closed.
Screenshot 2024-06-05 11 01 05

I recommend you make the develop exactly the same as upstream/develop:

$ git checkout patch-9
$ git branch -D develop
$ git checkout --track upstream/develop
$ git push --force-with-lease origin develop

@obozdag

Copy link
Copy Markdown
ContributorAuthor

@kenjis Run those commands. But no difference I think. So I will redo changes from scratch and small changes for each PR this time. Thanks for your effort.

@kenjis

Copy link
Copy Markdown
Member

Your https://github.com/obozdag/CodeIgniter4/tree/develop is now up to date with codeigniter4/CodeIgniter4:develop.
But yes, this has nothing to do with the close of this PR.

@kenjis

kenjis commented Jun 5, 2024

Copy link
Copy Markdown
Member

I uploaded my local patch-9 branch to https://github.com/kenjis/CodeIgniter4/tree/patch-9 for reference.
It may not be the latest one.

@kenjiskenjis mentioned this pull request Jun 5, 2024
5 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentationPull requests for documentation only

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@obozdag@kenjis
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

docs: Fix some typos in helpers/form_helper.rst - #8915

Closed
obozdag wants to merge 0 commit into
codeigniter4:developfrom
obozdag:patch-9
Closed

docs: Fix some typos in helpers/form_helper.rst#8915
obozdag wants to merge 0 commit into
codeigniter4:developfrom
obozdag:patch-9

Conversation

@obozdag

Copy link
Copy Markdown
Contributor

Description
docs: Fix some typos in helpers/form_helper.rst

Checklist:

  • Securely signed commits
  • Component(s) with PHPDoc blocks, only if necessary or adds value
  • Unit testing, with >80% coverage
  • User guide updated
  • Conforms to style guide

@kenjiskenjis added the documentation Pull requests for documentation only label May 27, 2024
Comment threaduser_guide_src/source/helpers/form_helper.rst Outdated
for POST/PUT/DELETE/PATCH requests, but even for GET requests, CSRF filters must be enabled for pages that display Forms.

If you enable CSRF filter with [$globals] https://codeigniter4.github.io/CodeIgniter4/incoming/filters.html#globals), it will be active for all request types.
But if you enable CSRF filter with public array $methods = ['POST' => ['csrf']];, the hidden CSRF field will not be added in GET requests.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please fix the RST format.

Screenshot 2024-05-31 17 12 12

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kenjis I hope it is fixed now. I don't know how to preview before commit.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still not good.
Screenshot 2024-06-01 8 19 06

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please apply this patch:

--- a/user_guide_src/source/helpers/form_helper.rst+++ b/user_guide_src/source/helpers/form_helper.rst@@ -112,12 +112,17 @@ The following functions are available:
<form action="http://example.com/index.php/u/sign-up" method="post" accept-charset="utf-8">
<input type="hidden" id="my-id" name="csrf_test_name" value="964ede6e0ae8a680f7b8eab69136717d">
- .. note:: To use auto-generation of CSRF field, you need to turn on the :ref:`CSRF filter <enable-csrf-protection>` in **app/Config/Filters.php** file.- In most cases the form page is requested using the GET method. Normally, CSRF protection is required- for POST/PUT/DELETE/PATCH requests, but even for GET requests, CSRF filters must be enabled for pages that display Forms.-- If you enable CSRF filter with `$globals <https://codeigniter4.github.io/CodeIgniter4/incoming/filters.html#globals>`, it will be active for all request types.- But if you enable CSRF filter with public array $methods = ['POST' => ['csrf']];, the hidden CSRF field will not be added in GET requests.+ .. note:: To use auto-generation of CSRF field, you need to turn on the+ :ref:`CSRF filter <enable-csrf-protection>` in **app/Config/Filters.php**+ file. In most cases the form page is requested using the GET method.+ Normally, CSRF protection is required for POST/PUT/DELETE/PATCH requests,+ but even for GET requests, CSRF filters must be enabled for pages+ that display Forms.++ If you enable CSRF filter with :ref:`filters-globals`, it will be+ active for all request types. But if you enable CSRF filter with+ ``public array $methods = ['POST' => ['csrf']];``, the hidden CSRF+ field will not be added in GET requests.
**Adding Hidden Input Fields**
diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst
index 303f80b551..4425ce03d3 100644
--- a/user_guide_src/source/incoming/filters.rst+++ b/user_guide_src/source/incoming/filters.rst@@ -139,6 +139,8 @@ Filters can be specified by adding their alias to either the ``before`` or ``aft
.. literalinclude:: filters/013.php
+.. _filters-globals:+
$globals
--------

Comment threaduser_guide_src/source/helpers/form_helper.rst Outdated
@kenjis

Copy link
Copy Markdown
Member

Thank you for updating.
We don't use merge commits in PR branches.
We use git rebase. See https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md#updating-your-branch
Can you remove the merge commit in the last?

@obozdag

Copy link
Copy Markdown
ContributorAuthor

@kenjis I had problems having my branches in local computer. That is why, when I want to fix something in the guide while reading it on the internet, there is a button "Edit this page", I just click it, edit the file, and commit. This way it creates a new branch each time. After sending form_helper (pacth-9) PR, there was a link on top to update the branch and I clicked. That was wrong as I understand now. But unfortunately I don't know how to roll it back on github. (I work completely on github. No local files or folders on my computer.) So can you please lead me how to do? Or I can delete this patch and close the PR and recreate it.

@kenjis

Copy link
Copy Markdown
Member

@obozdag
Have you ever used git command on your local computer?
The detailed workflow is explained in https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md.
Can you follow the documentation?

@obozdag

Copy link
Copy Markdown
ContributorAuthor

@kenjis I followed the documentation. I ran following commands:

  • gh repo clone obozdag/CodeIgniter4
  • cd CodeIgniter4
  • git fetch upstream
  • git switch develop
  • git merge upstream/develop
  • git push origin develop
  • git switch patch-9
  • git rebase upstream/develop
  • git push --force-with-lease origin patch-9

But the PR is automatically closed. So it means I couldn't remove the merge commit in the last?

@kenjis

kenjis commented Jun 4, 2024

Copy link
Copy Markdown
Member

It seems the patch-9 branch is exactly the same as upstream/develop.
So this PR was closed automatically?

Your commands seem no problem. I'm not sure why both branches are the same.
Did you got an error when you ran git rebase upstream/develop?

@kenjis

kenjis commented Jun 5, 2024

Copy link
Copy Markdown
Member

I've found your repository'sdevelop is not the same as the upstream.
But I don't know this is the reason why this PR was closed.
Screenshot 2024-06-05 11 01 05

I recommend you make the develop exactly the same as upstream/develop:

$ git checkout patch-9
$ git branch -D develop
$ git checkout --track upstream/develop
$ git push --force-with-lease origin develop

@obozdag

Copy link
Copy Markdown
ContributorAuthor

@kenjis Run those commands. But no difference I think. So I will redo changes from scratch and small changes for each PR this time. Thanks for your effort.

@kenjis

Copy link
Copy Markdown
Member

Your https://github.com/obozdag/CodeIgniter4/tree/develop is now up to date with codeigniter4/CodeIgniter4:develop.
But yes, this has nothing to do with the close of this PR.

@kenjis

kenjis commented Jun 5, 2024

Copy link
Copy Markdown
Member

I uploaded my local patch-9 branch to https://github.com/kenjis/CodeIgniter4/tree/patch-9 for reference.
It may not be the latest one.

@kenjiskenjis mentioned this pull request Jun 5, 2024
5 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentationPull requests for documentation only

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@obozdag@kenjis
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

docs: Fix some typos in helpers/form_helper.rst - #8915

Closed
obozdag wants to merge 0 commit into
codeigniter4:developfrom
obozdag:patch-9
Closed

docs: Fix some typos in helpers/form_helper.rst#8915
obozdag wants to merge 0 commit into
codeigniter4:developfrom
obozdag:patch-9

Conversation

@obozdag

Copy link
Copy Markdown
Contributor

Description
docs: Fix some typos in helpers/form_helper.rst

Checklist:

  • Securely signed commits
  • Component(s) with PHPDoc blocks, only if necessary or adds value
  • Unit testing, with >80% coverage
  • User guide updated
  • Conforms to style guide

@kenjiskenjis added the documentation Pull requests for documentation only label May 27, 2024
Comment threaduser_guide_src/source/helpers/form_helper.rst Outdated
for POST/PUT/DELETE/PATCH requests, but even for GET requests, CSRF filters must be enabled for pages that display Forms.

If you enable CSRF filter with [$globals] https://codeigniter4.github.io/CodeIgniter4/incoming/filters.html#globals), it will be active for all request types.
But if you enable CSRF filter with public array $methods = ['POST' => ['csrf']];, the hidden CSRF field will not be added in GET requests.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please fix the RST format.

Screenshot 2024-05-31 17 12 12

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kenjis I hope it is fixed now. I don't know how to preview before commit.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still not good.
Screenshot 2024-06-01 8 19 06

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please apply this patch:

--- a/user_guide_src/source/helpers/form_helper.rst+++ b/user_guide_src/source/helpers/form_helper.rst@@ -112,12 +112,17 @@ The following functions are available:
<form action="http://example.com/index.php/u/sign-up" method="post" accept-charset="utf-8">
<input type="hidden" id="my-id" name="csrf_test_name" value="964ede6e0ae8a680f7b8eab69136717d">
- .. note:: To use auto-generation of CSRF field, you need to turn on the :ref:`CSRF filter <enable-csrf-protection>` in **app/Config/Filters.php** file.- In most cases the form page is requested using the GET method. Normally, CSRF protection is required- for POST/PUT/DELETE/PATCH requests, but even for GET requests, CSRF filters must be enabled for pages that display Forms.-- If you enable CSRF filter with `$globals <https://codeigniter4.github.io/CodeIgniter4/incoming/filters.html#globals>`, it will be active for all request types.- But if you enable CSRF filter with public array $methods = ['POST' => ['csrf']];, the hidden CSRF field will not be added in GET requests.+ .. note:: To use auto-generation of CSRF field, you need to turn on the+ :ref:`CSRF filter <enable-csrf-protection>` in **app/Config/Filters.php**+ file. In most cases the form page is requested using the GET method.+ Normally, CSRF protection is required for POST/PUT/DELETE/PATCH requests,+ but even for GET requests, CSRF filters must be enabled for pages+ that display Forms.++ If you enable CSRF filter with :ref:`filters-globals`, it will be+ active for all request types. But if you enable CSRF filter with+ ``public array $methods = ['POST' => ['csrf']];``, the hidden CSRF+ field will not be added in GET requests.
**Adding Hidden Input Fields**
diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst
index 303f80b551..4425ce03d3 100644
--- a/user_guide_src/source/incoming/filters.rst+++ b/user_guide_src/source/incoming/filters.rst@@ -139,6 +139,8 @@ Filters can be specified by adding their alias to either the ``before`` or ``aft
.. literalinclude:: filters/013.php
+.. _filters-globals:+
$globals
--------

Comment threaduser_guide_src/source/helpers/form_helper.rst Outdated
@kenjis

Copy link
Copy Markdown
Member

Thank you for updating.
We don't use merge commits in PR branches.
We use git rebase. See https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md#updating-your-branch
Can you remove the merge commit in the last?

@obozdag

Copy link
Copy Markdown
ContributorAuthor

@kenjis I had problems having my branches in local computer. That is why, when I want to fix something in the guide while reading it on the internet, there is a button "Edit this page", I just click it, edit the file, and commit. This way it creates a new branch each time. After sending form_helper (pacth-9) PR, there was a link on top to update the branch and I clicked. That was wrong as I understand now. But unfortunately I don't know how to roll it back on github. (I work completely on github. No local files or folders on my computer.) So can you please lead me how to do? Or I can delete this patch and close the PR and recreate it.

@kenjis

Copy link
Copy Markdown
Member

@obozdag
Have you ever used git command on your local computer?
The detailed workflow is explained in https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md.
Can you follow the documentation?

@obozdag

Copy link
Copy Markdown
ContributorAuthor

@kenjis I followed the documentation. I ran following commands:

  • gh repo clone obozdag/CodeIgniter4
  • cd CodeIgniter4
  • git fetch upstream
  • git switch develop
  • git merge upstream/develop
  • git push origin develop
  • git switch patch-9
  • git rebase upstream/develop
  • git push --force-with-lease origin patch-9

But the PR is automatically closed. So it means I couldn't remove the merge commit in the last?

@kenjis

kenjis commented Jun 4, 2024

Copy link
Copy Markdown
Member

It seems the patch-9 branch is exactly the same as upstream/develop.
So this PR was closed automatically?

Your commands seem no problem. I'm not sure why both branches are the same.
Did you got an error when you ran git rebase upstream/develop?

@kenjis

kenjis commented Jun 5, 2024

Copy link
Copy Markdown
Member

I've found your repository'sdevelop is not the same as the upstream.
But I don't know this is the reason why this PR was closed.
Screenshot 2024-06-05 11 01 05

I recommend you make the develop exactly the same as upstream/develop:

$ git checkout patch-9
$ git branch -D develop
$ git checkout --track upstream/develop
$ git push --force-with-lease origin develop

@obozdag

Copy link
Copy Markdown
ContributorAuthor

@kenjis Run those commands. But no difference I think. So I will redo changes from scratch and small changes for each PR this time. Thanks for your effort.

@kenjis

Copy link
Copy Markdown
Member

Your https://github.com/obozdag/CodeIgniter4/tree/develop is now up to date with codeigniter4/CodeIgniter4:develop.
But yes, this has nothing to do with the close of this PR.

@kenjis

kenjis commented Jun 5, 2024

Copy link
Copy Markdown
Member

I uploaded my local patch-9 branch to https://github.com/kenjis/CodeIgniter4/tree/patch-9 for reference.
It may not be the latest one.

@kenjiskenjis mentioned this pull request Jun 5, 2024
5 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentationPull requests for documentation only

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@obozdag@kenjis
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

docs: Fix some typos in helpers/form_helper.rst - #8915

Closed
obozdag wants to merge 0 commit into
codeigniter4:developfrom
obozdag:patch-9
Closed

docs: Fix some typos in helpers/form_helper.rst#8915
obozdag wants to merge 0 commit into
codeigniter4:developfrom
obozdag:patch-9

Conversation

@obozdag

Copy link
Copy Markdown
Contributor

Description
docs: Fix some typos in helpers/form_helper.rst

Checklist:

  • Securely signed commits
  • Component(s) with PHPDoc blocks, only if necessary or adds value
  • Unit testing, with >80% coverage
  • User guide updated
  • Conforms to style guide

@kenjiskenjis added the documentation Pull requests for documentation only label May 27, 2024
Comment threaduser_guide_src/source/helpers/form_helper.rst Outdated
for POST/PUT/DELETE/PATCH requests, but even for GET requests, CSRF filters must be enabled for pages that display Forms.

If you enable CSRF filter with [$globals] https://codeigniter4.github.io/CodeIgniter4/incoming/filters.html#globals), it will be active for all request types.
But if you enable CSRF filter with public array $methods = ['POST' => ['csrf']];, the hidden CSRF field will not be added in GET requests.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please fix the RST format.

Screenshot 2024-05-31 17 12 12

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kenjis I hope it is fixed now. I don't know how to preview before commit.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still not good.
Screenshot 2024-06-01 8 19 06

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please apply this patch:

--- a/user_guide_src/source/helpers/form_helper.rst+++ b/user_guide_src/source/helpers/form_helper.rst@@ -112,12 +112,17 @@ The following functions are available:
<form action="http://example.com/index.php/u/sign-up" method="post" accept-charset="utf-8">
<input type="hidden" id="my-id" name="csrf_test_name" value="964ede6e0ae8a680f7b8eab69136717d">
- .. note:: To use auto-generation of CSRF field, you need to turn on the :ref:`CSRF filter <enable-csrf-protection>` in **app/Config/Filters.php** file.- In most cases the form page is requested using the GET method. Normally, CSRF protection is required- for POST/PUT/DELETE/PATCH requests, but even for GET requests, CSRF filters must be enabled for pages that display Forms.-- If you enable CSRF filter with `$globals <https://codeigniter4.github.io/CodeIgniter4/incoming/filters.html#globals>`, it will be active for all request types.- But if you enable CSRF filter with public array $methods = ['POST' => ['csrf']];, the hidden CSRF field will not be added in GET requests.+ .. note:: To use auto-generation of CSRF field, you need to turn on the+ :ref:`CSRF filter <enable-csrf-protection>` in **app/Config/Filters.php**+ file. In most cases the form page is requested using the GET method.+ Normally, CSRF protection is required for POST/PUT/DELETE/PATCH requests,+ but even for GET requests, CSRF filters must be enabled for pages+ that display Forms.++ If you enable CSRF filter with :ref:`filters-globals`, it will be+ active for all request types. But if you enable CSRF filter with+ ``public array $methods = ['POST' => ['csrf']];``, the hidden CSRF+ field will not be added in GET requests.
**Adding Hidden Input Fields**
diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst
index 303f80b551..4425ce03d3 100644
--- a/user_guide_src/source/incoming/filters.rst+++ b/user_guide_src/source/incoming/filters.rst@@ -139,6 +139,8 @@ Filters can be specified by adding their alias to either the ``before`` or ``aft
.. literalinclude:: filters/013.php
+.. _filters-globals:+
$globals
--------

Comment threaduser_guide_src/source/helpers/form_helper.rst Outdated
@kenjis

Copy link
Copy Markdown
Member

Thank you for updating.
We don't use merge commits in PR branches.
We use git rebase. See https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md#updating-your-branch
Can you remove the merge commit in the last?

@obozdag

Copy link
Copy Markdown
ContributorAuthor

@kenjis I had problems having my branches in local computer. That is why, when I want to fix something in the guide while reading it on the internet, there is a button "Edit this page", I just click it, edit the file, and commit. This way it creates a new branch each time. After sending form_helper (pacth-9) PR, there was a link on top to update the branch and I clicked. That was wrong as I understand now. But unfortunately I don't know how to roll it back on github. (I work completely on github. No local files or folders on my computer.) So can you please lead me how to do? Or I can delete this patch and close the PR and recreate it.

@kenjis

Copy link
Copy Markdown
Member

@obozdag
Have you ever used git command on your local computer?
The detailed workflow is explained in https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md.
Can you follow the documentation?

@obozdag

Copy link
Copy Markdown
ContributorAuthor

@kenjis I followed the documentation. I ran following commands:

  • gh repo clone obozdag/CodeIgniter4
  • cd CodeIgniter4
  • git fetch upstream
  • git switch develop
  • git merge upstream/develop
  • git push origin develop
  • git switch patch-9
  • git rebase upstream/develop
  • git push --force-with-lease origin patch-9

But the PR is automatically closed. So it means I couldn't remove the merge commit in the last?

@kenjis

kenjis commented Jun 4, 2024

Copy link
Copy Markdown
Member

It seems the patch-9 branch is exactly the same as upstream/develop.
So this PR was closed automatically?

Your commands seem no problem. I'm not sure why both branches are the same.
Did you got an error when you ran git rebase upstream/develop?

@kenjis

kenjis commented Jun 5, 2024

Copy link
Copy Markdown
Member

I've found your repository'sdevelop is not the same as the upstream.
But I don't know this is the reason why this PR was closed.
Screenshot 2024-06-05 11 01 05

I recommend you make the develop exactly the same as upstream/develop:

$ git checkout patch-9
$ git branch -D develop
$ git checkout --track upstream/develop
$ git push --force-with-lease origin develop

@obozdag

Copy link
Copy Markdown
ContributorAuthor

@kenjis Run those commands. But no difference I think. So I will redo changes from scratch and small changes for each PR this time. Thanks for your effort.

@kenjis

Copy link
Copy Markdown
Member

Your https://github.com/obozdag/CodeIgniter4/tree/develop is now up to date with codeigniter4/CodeIgniter4:develop.
But yes, this has nothing to do with the close of this PR.

@kenjis

kenjis commented Jun 5, 2024

Copy link
Copy Markdown
Member

I uploaded my local patch-9 branch to https://github.com/kenjis/CodeIgniter4/tree/patch-9 for reference.
It may not be the latest one.

@kenjiskenjis mentioned this pull request Jun 5, 2024
5 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentationPull requests for documentation only

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@obozdag@kenjis
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

docs: Fix some typos in helpers/form_helper.rst - #8915

Closed
obozdag wants to merge 0 commit into
codeigniter4:developfrom
obozdag:patch-9
Closed

docs: Fix some typos in helpers/form_helper.rst#8915
obozdag wants to merge 0 commit into
codeigniter4:developfrom
obozdag:patch-9

Conversation

@obozdag

Copy link
Copy Markdown
Contributor

Description
docs: Fix some typos in helpers/form_helper.rst

Checklist:

  • Securely signed commits
  • Component(s) with PHPDoc blocks, only if necessary or adds value
  • Unit testing, with >80% coverage
  • User guide updated
  • Conforms to style guide

@kenjiskenjis added the documentation Pull requests for documentation only label May 27, 2024
Comment threaduser_guide_src/source/helpers/form_helper.rst Outdated
for POST/PUT/DELETE/PATCH requests, but even for GET requests, CSRF filters must be enabled for pages that display Forms.

If you enable CSRF filter with [$globals] https://codeigniter4.github.io/CodeIgniter4/incoming/filters.html#globals), it will be active for all request types.
But if you enable CSRF filter with public array $methods = ['POST' => ['csrf']];, the hidden CSRF field will not be added in GET requests.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please fix the RST format.

Screenshot 2024-05-31 17 12 12

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kenjis I hope it is fixed now. I don't know how to preview before commit.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still not good.
Screenshot 2024-06-01 8 19 06

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please apply this patch:

--- a/user_guide_src/source/helpers/form_helper.rst+++ b/user_guide_src/source/helpers/form_helper.rst@@ -112,12 +112,17 @@ The following functions are available:
<form action="http://example.com/index.php/u/sign-up" method="post" accept-charset="utf-8">
<input type="hidden" id="my-id" name="csrf_test_name" value="964ede6e0ae8a680f7b8eab69136717d">
- .. note:: To use auto-generation of CSRF field, you need to turn on the :ref:`CSRF filter <enable-csrf-protection>` in **app/Config/Filters.php** file.- In most cases the form page is requested using the GET method. Normally, CSRF protection is required- for POST/PUT/DELETE/PATCH requests, but even for GET requests, CSRF filters must be enabled for pages that display Forms.-- If you enable CSRF filter with `$globals <https://codeigniter4.github.io/CodeIgniter4/incoming/filters.html#globals>`, it will be active for all request types.- But if you enable CSRF filter with public array $methods = ['POST' => ['csrf']];, the hidden CSRF field will not be added in GET requests.+ .. note:: To use auto-generation of CSRF field, you need to turn on the+ :ref:`CSRF filter <enable-csrf-protection>` in **app/Config/Filters.php**+ file. In most cases the form page is requested using the GET method.+ Normally, CSRF protection is required for POST/PUT/DELETE/PATCH requests,+ but even for GET requests, CSRF filters must be enabled for pages+ that display Forms.++ If you enable CSRF filter with :ref:`filters-globals`, it will be+ active for all request types. But if you enable CSRF filter with+ ``public array $methods = ['POST' => ['csrf']];``, the hidden CSRF+ field will not be added in GET requests.
**Adding Hidden Input Fields**
diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst
index 303f80b551..4425ce03d3 100644
--- a/user_guide_src/source/incoming/filters.rst+++ b/user_guide_src/source/incoming/filters.rst@@ -139,6 +139,8 @@ Filters can be specified by adding their alias to either the ``before`` or ``aft
.. literalinclude:: filters/013.php
+.. _filters-globals:+
$globals
--------

Comment threaduser_guide_src/source/helpers/form_helper.rst Outdated
@kenjis

Copy link
Copy Markdown
Member

Thank you for updating.
We don't use merge commits in PR branches.
We use git rebase. See https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md#updating-your-branch
Can you remove the merge commit in the last?

@obozdag

Copy link
Copy Markdown
ContributorAuthor

@kenjis I had problems having my branches in local computer. That is why, when I want to fix something in the guide while reading it on the internet, there is a button "Edit this page", I just click it, edit the file, and commit. This way it creates a new branch each time. After sending form_helper (pacth-9) PR, there was a link on top to update the branch and I clicked. That was wrong as I understand now. But unfortunately I don't know how to roll it back on github. (I work completely on github. No local files or folders on my computer.) So can you please lead me how to do? Or I can delete this patch and close the PR and recreate it.

@kenjis

Copy link
Copy Markdown
Member

@obozdag
Have you ever used git command on your local computer?
The detailed workflow is explained in https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md.
Can you follow the documentation?

@obozdag

Copy link
Copy Markdown
ContributorAuthor

@kenjis I followed the documentation. I ran following commands:

  • gh repo clone obozdag/CodeIgniter4
  • cd CodeIgniter4
  • git fetch upstream
  • git switch develop
  • git merge upstream/develop
  • git push origin develop
  • git switch patch-9
  • git rebase upstream/develop
  • git push --force-with-lease origin patch-9

But the PR is automatically closed. So it means I couldn't remove the merge commit in the last?

@kenjis

kenjis commented Jun 4, 2024

Copy link
Copy Markdown
Member

It seems the patch-9 branch is exactly the same as upstream/develop.
So this PR was closed automatically?

Your commands seem no problem. I'm not sure why both branches are the same.
Did you got an error when you ran git rebase upstream/develop?

@kenjis

kenjis commented Jun 5, 2024

Copy link
Copy Markdown
Member

I've found your repository'sdevelop is not the same as the upstream.
But I don't know this is the reason why this PR was closed.
Screenshot 2024-06-05 11 01 05

I recommend you make the develop exactly the same as upstream/develop:

$ git checkout patch-9
$ git branch -D develop
$ git checkout --track upstream/develop
$ git push --force-with-lease origin develop

@obozdag

Copy link
Copy Markdown
ContributorAuthor

@kenjis Run those commands. But no difference I think. So I will redo changes from scratch and small changes for each PR this time. Thanks for your effort.

@kenjis

Copy link
Copy Markdown
Member

Your https://github.com/obozdag/CodeIgniter4/tree/develop is now up to date with codeigniter4/CodeIgniter4:develop.
But yes, this has nothing to do with the close of this PR.

@kenjis

kenjis commented Jun 5, 2024

Copy link
Copy Markdown
Member

I uploaded my local patch-9 branch to https://github.com/kenjis/CodeIgniter4/tree/patch-9 for reference.
It may not be the latest one.

@kenjiskenjis mentioned this pull request Jun 5, 2024
5 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentationPull requests for documentation only

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@obozdag@kenjis