Non-core contributed modules

MRBS: Update MRBS block from MRBS 1.2.3 to 1.2.5

Details

  • Type: Task Task
  • Status: Closed Closed
  • Priority: Major Major
  • Resolution: Fixed
  • Affects Version/s: 1.8
  • Fix Version/s: None
  • Component/s: Block: Mrbs
  • Labels:
    None
  • Affected Branches:
    MOODLE_18_STABLE

Description

In order to incorporate bug fixes made in the CVS core, I would like to update the MRBS block to use MRBS 1.2.5 instead of the older 1.2.3.

Attachments

  1. File
    mrbs_125merged_head123.diff
    02/Aug/08 12:41 PM
    183 kB
    Anthony Borrow
  2. File
    mrbs125_head125.diff
    02/Aug/08 12:41 PM
    888 kB
    Anthony Borrow
  3. File
    mrbs125_mrbs123.diff
    02/Aug/08 12:41 PM
    191 kB
    Anthony Borrow
  4. File
    mrbs125_mrbshead.diff
    02/Aug/08 8:46 PM
    395 kB
    Anthony Borrow

Issue Links

This issue will be resolved by:
CONTRIB-180 Embed MRBS window within Moodle and eliminate possibility of a cascading of the header and breadcrumbs Minor Closed
CONTRIB-628 MRBS: Remove irrelevant files Minor Closed
CONTRIB-629 MRBS: Change database manipulation to native Moodle functions Minor Closed
CONTRIB-630 MRBS: Change mail calls to Moodle native calls such as email_to_user Minor Closed
CONTRIB-422 Block: MRBS - use settings.php to set values for config.inc.php Major Closed
CONTRIB-624 UTF-8 lang code for MRBS Block Minor Closed

Activity

Ascending order - Click to sort in descending order
Hide
Permalink
Jesus Martin added a comment -

+1 for this task.
What about the lang code? Actually it isn't utf-8
Thanks

Show
Jesus Martin added a comment - +1 for this task. What about the lang code? Actually it isn't utf-8 Thanks
Hide
Permalink
Anthony Borrow added a comment -

Thanks for your support (+1) and for letting me know about the lang code. Actually, would you mind making a separate issue for that? The more I look at the code, the more I see that ought to be done. Ultimately it needs to be Moodle-ized a great deal more but that will have to happen one step at a time. Gracias - Antonio

Show
Anthony Borrow added a comment - Thanks for your support (+1) and for letting me know about the lang code. Actually, would you mind making a separate issue for that? The more I look at the code, the more I see that ought to be done. Ultimately it needs to be Moodle-ized a great deal more but that will have to happen one step at a time. Gracias - Antonio
Hide
Permalink
Anthony Borrow added a comment -

I had initially thought of trying to keep the MRBS block up to date with MRBS HEAD; however, beginning with 1.2.6 there was a change in all of the db calls to use mdb. I will not incorporate these db changes. Instead, I would rather work toward using Moodle functions such as get_records, update_record, etc. My plan at this point is to bring the MRBS block up to MRBS 1.2.5 and then see if there are other not db related fixes for HEAD. While I may try to keep some tabs on what is happening with the MRBS project, once we move toward using Moodle db calls we really should consider the MRBS block a fork of the MRBS project. Peace - Anthony

Show
Anthony Borrow added a comment - I had initially thought of trying to keep the MRBS block up to date with MRBS HEAD; however, beginning with 1.2.6 there was a change in all of the db calls to use mdb. I will not incorporate these db changes. Instead, I would rather work toward using Moodle functions such as get_records, update_record, etc. My plan at this point is to bring the MRBS block up to MRBS 1.2.5 and then see if there are other not db related fixes for HEAD. While I may try to keep some tabs on what is happening with the MRBS project, once we move toward using Moodle db calls we really should consider the MRBS block a fork of the MRBS project. Peace - Anthony
Hide
Permalink
Anthony Borrow added a comment -

Stephen - I've added you as a watcher since you serve as my admonitor on the MRBS block. Let's see if I can explain what I have done. I started by generating a patch (mrbs125_mrbs123.diff) between MRBS code versions 1.2.3 and 1.2.5 to get a complete list of all that had been modified between those versions. I then, for each file that had been modified, copied the MRBS 1.2.5 version on top of the CONTRIB version (i.e. /contrib/blocks/mrbs/web/{modified_file}). That allowed me to do a compare between the MRBS 1.2.5 version and what we had in HEAD for the MRBS block. I merged in any changes that I recognized as my own (i.e. changing file names from .inc to .php, the work to prevent sql injection attacks, the latest work on strings, etc.). If I could do it again, I would have worked on this part first and then done the strings but that's water under the bridge. In any case, I was able to verify with the patch file I created between the 1.2.5 and 1.2.3 branches that all of the changes are now in our version and merged in all of our changes. Then I generated another diff file (mrbs_125merge_head123.diff) which should essentially contain the same information as the other patch file (mrbs125_mrbs123.diff) [with a few minor exceptions of small things I caught while working on it]. The result I believe is that we now have all of the changes made between 1.2.3 to 1.2.5 now in HEAD (well as soon as I commit it). I've done preliminary testing and as best as I can tell I have not totally broken things; however, as you might well imagine any change of this magnitude will likely have a couple glitches. The third file is something I should have generated a long time ago which is a patch between the MRBS block and the MRBS originating code both based off of version 1.2.5. I'm going to mark this issue resolved; however, please report any problems that you might encounter. Peace - Anthony

Show
Anthony Borrow added a comment - Stephen - I've added you as a watcher since you serve as my admonitor on the MRBS block. Let's see if I can explain what I have done. I started by generating a patch (mrbs125_mrbs123.diff) between MRBS code versions 1.2.3 and 1.2.5 to get a complete list of all that had been modified between those versions. I then, for each file that had been modified, copied the MRBS 1.2.5 version on top of the CONTRIB version (i.e. /contrib/blocks/mrbs/web/{modified_file}). That allowed me to do a compare between the MRBS 1.2.5 version and what we had in HEAD for the MRBS block. I merged in any changes that I recognized as my own (i.e. changing file names from .inc to .php, the work to prevent sql injection attacks, the latest work on strings, etc.). If I could do it again, I would have worked on this part first and then done the strings but that's water under the bridge. In any case, I was able to verify with the patch file I created between the 1.2.5 and 1.2.3 branches that all of the changes are now in our version and merged in all of our changes. Then I generated another diff file (mrbs_125merge_head123.diff) which should essentially contain the same information as the other patch file (mrbs125_mrbs123.diff) [with a few minor exceptions of small things I caught while working on it]. The result I believe is that we now have all of the changes made between 1.2.3 to 1.2.5 now in HEAD (well as soon as I commit it). I've done preliminary testing and as best as I can tell I have not totally broken things; however, as you might well imagine any change of this magnitude will likely have a couple glitches. The third file is something I should have generated a long time ago which is a patch between the MRBS block and the MRBS originating code both based off of version 1.2.5. I'm going to mark this issue resolved; however, please report any problems that you might encounter. Peace - Anthony
Hide
Permalink
Anthony Borrow added a comment -

All changes between MRBS 1.2.3 and 1.2.5 have been merged with MRBS block in HEAD ... whew! Please do some testing and let me know how many problems this introduces. Peace - Anthony

Show
Anthony Borrow added a comment - All changes between MRBS 1.2.3 and 1.2.5 have been merged with MRBS block in HEAD ... whew! Please do some testing and let me know how many problems this introduces. Peace - Anthony
Hide
Permalink
Jesus Martin added a comment -

Fan-tas-tic!
Pretty good work.
I have installed the block without problems... All seems to work smoothly.

Only one question:
I downloaded the block from http://download.moodle.org/plugins/blocks/ (02-Aug-2008 08:22).
With this date I thought that it was MRBS 1.2.5 but when I saw the url "About MRBS" this is the information:

Gestor de Reserva de Salas - MRBS 1.2.3
Base de datos: MySQL 5.0.51a-3ubuntu5.1
Sistema: Linux jesmar-laptop 2.6.24-19-generic #1 SMP Fri Jul 11 23:41:49 UTC 2008 i686
PHP: 5.2.4-2ubuntu5.3

¿MRBS 1.2.3?

Thanks again

Show
Jesus Martin added a comment - Fan-tas-tic! Pretty good work. I have installed the block without problems... All seems to work smoothly. Only one question: I downloaded the block from http://download.moodle.org/plugins/blocks/ (02-Aug-2008 08:22). With this date I thought that it was MRBS 1.2.5 but when I saw the url "About MRBS" this is the information: Gestor de Reserva de Salas - MRBS 1.2.3 Base de datos: MySQL 5.0.51a-3ubuntu5.1 Sistema: Linux jesmar-laptop 2.6.24-19-generic #1 SMP Fri Jul 11 23:41:49 UTC 2008 i686 PHP: 5.2.4-2ubuntu5.3 ¿MRBS 1.2.3? Thanks again
Hide
Permalink
Anthony Borrow added a comment -

Jesús - It looks like you do not have the latest, latest version. You can tell as their should be a file called /blocks/mrbs/web/version.php. I just checked the zip file and it is not there so it may not have auto-generated. The version.php file was written at: Sat Aug 2 12:44:16 2008. Peace - Anthony

Show
Anthony Borrow added a comment - Jesús - It looks like you do not have the latest, latest version. You can tell as their should be a file called /blocks/mrbs/web/version.php. I just checked the zip file and it is not there so it may not have auto-generated. The version.php file was written at: Sat Aug 2 12:44:16 2008. Peace - Anthony
Hide
Permalink
Anthony Borrow added a comment -

Here is a patch file showing differences between HEAD->version 1.2.5. Besides the obvious database changes (to use mdb, n.b. not mdb2), whitespace and comments, etc., there are very few changes but at some point I will try to go through and shorten this down to just those changes and then see if they are worth merging into our code. Peace - Anthony

Show
Anthony Borrow added a comment - Here is a patch file showing differences between HEAD->version 1.2.5. Besides the obvious database changes (to use mdb, n.b. not mdb2), whitespace and comments, etc., there are very few changes but at some point I will try to go through and shorten this down to just those changes and then see if they are worth merging into our code. Peace - Anthony
Hide
Permalink
Anthony Borrow added a comment -

I'm going to use this as the meta-issue to keep track of various improvements to make the MRBS block more Moodle-like. In spirit with the Moodle 2.0 release, I want to trim this block down by getting read of files that are not necessary. This includes all of the language file, the various session and authentication options, and moving some files around.

Show
Anthony Borrow added a comment - I'm going to use this as the meta-issue to keep track of various improvements to make the MRBS block more Moodle-like. In spirit with the Moodle 2.0 release, I want to trim this block down by getting read of files that are not necessary. This includes all of the language file, the various session and authentication options, and moving some files around.
Hide
Permalink
Anthony Borrow added a comment -

all of the major fixes for MRBS block are completed to my satisfaction - let me know how things can be improved or fixed

Show
Anthony Borrow added a comment - all of the major fixes for MRBS block are completed to my satisfaction - let me know how things can be improved or fixed
Hide
Permalink
Anthony Borrow added a comment -

Closing all of my resolved issues. Peace - Anthony

Show
Anthony Borrow added a comment - Closing all of my resolved issues. Peace - Anthony

People

Vote (0)
Watch (1)

Dates

  • Created:
    Updated:
    Resolved:
Atlassian JIRA (v4.4.3#663-r165197) | Report a problem
Powered by a free Atlassian JIRA open source license for Moodle. Try JIRA - bug tracking software for your team.