Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Commits for review: Add php Error Reporting Functionality to PMA (Rebased) #1219

Merged
merged 35 commits into from Jun 16, 2014
Merged

Commits for review: Add php Error Reporting Functionality to PMA (Rebased) #1219

merged 35 commits into from Jun 16, 2014

Conversation

JayNakrani
Copy link
Contributor

In continuation with Pull#1207.
Things Done:

  • Rebasing with upstream. (There were few conflicts which I had to resolve.)
  • Some displayed message improvements.
  • Found & stopped one more false alarm.

Things yet TODO: Done now

  • Remove inline JavaScripts as suggested in Pull#1207.

Will push TODO changes soon. Done now

Till then, kindly review other parts. 😃

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.02%) when pulling 9349dc1 on dhananjay92:dhananjay-gsoc-rebased into ee063a6 on phpmyadmin:master.

nijel
nijel reviewed Jun 11, 2014
View reviewed changes
error_report.php
}

?>
Copy link
Contributor

Choose a reason for hiding this comment

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

Is it really needed to have separate code paths for both submissions? To me it looks like the code should be same. The rate limiting makes sense for javascript errors as well as those can happen during submission.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Some code is common and can be merged together. But I think it won't make much difference. Still let me try merging the paths and see. 😄

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.03%) when pulling 064100f on dhananjay92:dhananjay-gsoc-rebased into 2ca9001 on phpmyadmin:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.03%) when pulling 064100f on dhananjay92:dhananjay-gsoc-rebased into 2ca9001 on phpmyadmin:master.

@JayNakrani
Copy link
Contributor Author

I've pushed some commits as per following suggestions. The ones already pushed are marked done.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.03%) when pulling 20c3129 on dhananjay92:dhananjay-gsoc-rebased into 2ca9001 on phpmyadmin:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.04%) when pulling 3192e29 on dhananjay92:dhananjay-gsoc-rebased into 2ca9001 on phpmyadmin:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.14%) when pulling 4be7e73 on dhananjay92:dhananjay-gsoc-rebased into 2ca9001 on phpmyadmin:master.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.0%) when pulling 6e3cc86 on dhananjay92:dhananjay-gsoc-rebased into 2ca9001 on phpmyadmin:master.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.01%) when pulling fd7fd25 on dhananjay92:dhananjay-gsoc-rebased into 2ca9001 on phpmyadmin:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.02%) when pulling 34bf8c4 on dhananjay92:dhananjay-gsoc-rebased into a7bc3a7 on phpmyadmin:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.02%) when pulling 34bf8c4 on dhananjay92:dhananjay-gsoc-rebased into a7bc3a7 on phpmyadmin:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.02%) when pulling 359d773 on dhananjay92:dhananjay-gsoc-rebased into b857076 on phpmyadmin:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.02%) when pulling 429c4c8 on dhananjay92:dhananjay-gsoc-rebased into b857076 on phpmyadmin:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.02%) when pulling 429c4c8 on dhananjay92:dhananjay-gsoc-rebased into b857076 on phpmyadmin:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.02%) when pulling d32bbfa on dhananjay92:dhananjay-gsoc-rebased into d4809ce on phpmyadmin:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.03%) when pulling d32bbfa on dhananjay92:dhananjay-gsoc-rebased into d4809ce on phpmyadmin:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.02%) when pulling d32bbfa on dhananjay92:dhananjay-gsoc-rebased into d4809ce on phpmyadmin:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.17%) when pulling d32bbfa on dhananjay92:dhananjay-gsoc-rebased into d4809ce on phpmyadmin:master.

@JayNakrani
Add script that will report all the errors of current-script-run. Thi…
087f7b7 
…s script is intended to be used same as common.inc.php, but at the end of each script.

Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
@JayNakrani
Include error reporitng script at the end of index.php. Corrosponding…
9ef2231 
… error local & temporary log file.

Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
@JayNakrani
Add standard pma code for the library files. Add comments explaining …
64451c5 
…file usage.

Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
@JayNakrani
Add another parameter to existing js error reporting code.
8bfa0be 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
@JayNakrani
Report errors based on user preference. All the cases taken care of.
e74cd6e 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
@JayNakrani
Add appropriate msgs & js functions to handle user actions.
026209d 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
@JayNakrani
Fix Syntax errors.
43e1aa5 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
@JayNakrani
Fix failing existing PHPUnit tests.
7393745 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
@JayNakrani
Remove unnecessary code. A deliberate error & local error-reporting-s…
ed564f4 
…erver URL.

Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
@JayNakrani
Improve Error Message.
d4bdddd 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
@JayNakrani
Include error reporting script at the end of all the 'relevant' scripts.
e9d5523 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
@JayNakrani
Stop false alarms (displaying prompts-reporting form and reporting fo…
86b3f35 
…r 'false' (user warnings) errors).

Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
@JayNakrani
Move error reporting code to a separate function 'PMA_Error_Handler::…
e1ee8d2 
…reportError()'. Hook it in 'PMA_Footer::getErrorMessages()'.

Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
@JayNakrani
Remove included 'common_error_reporting.php' script and its inclusion…
9a1fb90 
… from all the scripts.

Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
@JayNakrani
Make automatic php error report submission ('sendErrorReport'='always…
0b9439a 
…') aysnchronous. Stop infinite auto error reporting loop.

Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
@JayNakrani
Display appropriate msg while automatically submitting php error report.
c83457f 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
@JayNakrani
Fix coding style issues.
e37616a 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
@JayNakrani
Stop one more 'false alarm', case of non-AJAX request.
006f041 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
@JayNakrani
Display error automatically being submitted message in non-AJAX case …
d013238 
…too.

Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
@JayNakrani
Rename function to a sensible name.
30d1a03 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
@JayNakrani
Remove trailing whitespaces.
bc76f04 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
@JayNakrani
Move inline JS to 'binded' JS.
caaacef 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
@JayNakrani
Make return values of PMA_getReportData() consistent.
b2e3164 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
@JayNakrani
Remove unnecessarily added empty lines.
bfef3e8 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
@JayNakrani
Merge paths for 'php'& 'js' error reporting.
b621ab9 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
@JayNakrani
Enable 'Send error reports automatically next time' option in php err…
627873f 
…or reporting form.

Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
@JayNakrani
Change hardcoded indexing to dynamic one.
c00d1d5 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
@JayNakrani
Make Syntax compatible with php-5.3
8b09aa7 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
@JayNakrani
Minor Interface improvements. Scroll down & show 'working' icon.
68de01a 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
@JayNakrani
Add test cases for'PMA_Error::getBacktrace()'.
e65b678 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
@JayNakrani
Fix coding style issues.
83d63d2 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.02%) when pulling 83d63d2 on dhananjay92:dhananjay-gsoc-rebased into 626c1ec on phpmyadmin:master.

@scrutinizer-notifier
Copy link

The inspection completed: 11 new issues, 9 updated code elements

@nijel
Copy link
Contributor

nijel commented Jun 16, 2014

Looks good now, I'm merging your commits.

nijel added a commit that referenced this pull request Jun 16, 2014
@nijel
Merge pull request #1219 from dhananjay92/dhananjay-gsoc-rebased
d78e41d 
Commits for review: Add php Error Reporting Functionality to PMA (Rebased)
@nijel nijel merged commit d78e41d into phpmyadmin:master Jun 16, 2014
@pma-import pma-import mentioned this pull request Jul 24, 2015
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@JayNakrani @coveralls @scrutinizer-notifier @nijel @phpmyadmin-bot