- Development - lists.drupal.org

Re: [drupal-devel] Re: [contributions(DRUPAL-4-5):sheldon]
by K B 04 Apr '05

04 Apr '05

After the initial message in this thread, I went in and checked cvs.drupal.org using viewcvs at http://cvs.drupal.org/viewcvs/drupal/contributions/ I checked a couple of my modules and themes, and it seems that the tags were not messed up. For example, http://cvs.drupal.org/viewcvs/drupal/contributions/modules/stock/stock.modu… This shows that the DRUPAL-4-5 tag is from 1 Feb for version 1.3 So I don't know if someone fixed it or what, but it does not seem messed up. -- Date: Mon, 4 Apr 2005 10:55:59 +0200 From: Dries Buytaert <dries(a)buytaert.net> Subject: Re: [drupal-devel] Re: [contributions(DRUPAL-4-5):sheldon] To: drupal-devel(a)drupal.org Message-ID: <c2a4d5c356f2f4edb6e1d049316bd811(a)buytaert.net> Content-Type: text/plain; charset=US-ASCII; format=flowed On 04 Apr 2005, at 10:40, Gabor Hojtsy wrote: >> This is my mistake. I apologize. I was trying to simply tag my >> interwiki module, and got confused by the program I'm using (CVL on >> Mac OS X). It has a "Tag Files" command in its "Work Area" menu, so I >> selected the interwiki module in my work area and then selected the >> "Tag Files" command. To my surprise, it started iterating through all >> of contrib, and I didn't know how to stop it. >> After this happened, I realized that there's a separate "Tag" command >> in CVL's "File" menu. I'm guessing that this is what I should have >> used. >> I'm new to CVS and to CVL, and this isn't the first frustrating >> experience I've had with it. However, it's the first time that >> something like this has negatively affected Drupal's contributions >> repository. >> Once again, I apologize, but in my defense, the interface to CVL is >> pretty damn confusing. I'd like to find a simple tutorial so I can >> learn how to just use CVS directly from my terminal command line. Can >> someone point me to one? Does that mean all Drupal 4.5 releases are messed up now? Err. -- Dries Buytaert :: http://www.buytaert.net/

2 2

[drupal-devel] image_import.module ready for early testing
by Scott Courtney 04 Apr '05

04 Apr '05

It's not done yet, but the image_import module that works with walkah's new (and wonderful!) image module is feature-complete and ready for functional testing to begin. I tested it last night by importing batches of images ranging from 1 file to 50+ files, with and without auxiliary caption files, and although there are some things I still want to improve (such as adding really "deep" clickable help links within the module, and fixing a minor menu annoyance), it is working correctly. The code is *not* yet compliant with Drupal standards for tabs and indents and such, so don't yell at me yet for that. I happen to prefer editing with tab indents rather than spaces, so I typically use a global replace to convert the code to space indents only after I'm done with it. My CVS commit notice has hit the drupal-devel list, but I'm contacting the two of you individually because I would very much value your input and testing assistance, if you have the time, since my module specifically interacts with both of yours. James, I would also like to ask a favor of you with regard to your code. I found myself having to call _image_build_derivatives() from my code, because there just wasn't any other good way to get the resizing task done. All the higher-level published functions that call that one do a security check to see if the file came from the $_FILES[] global HTTP variable, and since my import images are pre-uploaded using FTP, SCP, etc., I can't pass that security test. So what I'm asking is, would you consider making that function non-private, a supported part of the API for your module, so that I can [reasonably] rely on it in future releases? Alternatively, would you consider exposing a new public function that accepts a skeletal $node object, with attributes of type ('image'), body, teaser, uid, title, and file (all of which I can supply), but which has not yet been created as a node in the database? The function I propose would add the node, retaining any pre-supplied attributes, and would return either $nid (integer) or the $node object itself (with new attributes, especially nid, populated). In effect, this would migrate about 25 lines of code from import_image.module to image.module, and would be a hook that other importing modules could use if their image files came from a non-HTTP source. If you aren't interested in making these changes, I'll abide with what you have now, and just risk that I might have to do a rewrite in the future. But I think the image_build_derivatives() [non-private] and/or the other proposed function [which might be called image_build_node() for example) might have value to other developers. For instance, a module might someday exist that takes PDF or PS files, renders the first page as a PNG or JPG, and turns that into an image node for placement in a book hierarchy along with a download attachment of the original file. How do I know this is plausible? Well, my boss asked me just last week if such a thing were possible, because we may have a customer willing to pay me to develop it and release the code as GPL when it's done. :-) [This is by no means a certainty; we're just exploring options. The customer has an extremely large document library of PDF/PS files and they are wanting to webify access to it.] I would very much appreciate and respect your opinions, testing reports, suggestions, and constructive criticism of my module so far. I'm looking to get it polished up in the next couple of days and then move it from sandbox to contributions/modules. I've also submitted a project node for it, but experience says it may be a week or more before that gets approved (my last one was a week ago and still isn't on drupal.org yet). The code repository is at: http://cvs.drupal.org/viewcvs/drupal/contributions/sandbox/syscrusher/image… Kind regards, Scott (drupal.org "syscrusher") -- -----------------------+------------------------------------------------------ Scott Courtney | "I don't mind Microsoft making money. I mind them scott(a)4th.com | having a bad operating system." -- Linus Torvalds http://4th.com/ | ("The Rebel Code," NY Times, 21 February 1999) | PGP Public Key at http://4th.com/keys/scott.pubkey

2 6

[drupal-devel] Re: [contributions(DRUPAL-4-5):sheldon]
by Sheldon Rampton 04 Apr '05

04 Apr '05

Jim Riggs wrote: >So what's up with all of contrib being tagged for 4.5 this morning? >Did that mess up the branching of a lot of contrib? All of my >modules look fine, because they already had 4.5 branches. Items that >didn't, though, may now be branched even though they don't work with >4.5. Looks like some repair work may be in order... This is my mistake. I apologize. I was trying to simply tag my interwiki module, and got confused by the program I'm using (CVL on Mac OS X). It has a "Tag Files" command in its "Work Area" menu, so I selected the interwiki module in my work area and then selected the "Tag Files" command. To my surprise, it started iterating through all of contrib, and I didn't know how to stop it. After this happened, I realized that there's a separate "Tag" command in CVL's "File" menu. I'm guessing that this is what I should have used. I'm new to CVS and to CVL, and this isn't the first frustrating experience I've had with it. However, it's the first time that something like this has negatively affected Drupal's contributions repository. Once again, I apologize, but in my defense, the interface to CVL is pretty damn confusing. I'd like to find a simple tutorial so I can learn how to just use CVS directly from my terminal command line. Can someone point me to one? --Sheldon

4 3

[drupal-devel] Re: [contributions(DRUPAL-4-5):baudolino] contributions/modules/atom
by Dries Buytaert 04 Apr '05

04 Apr '05

On 04 Apr 2005, at 08:23, drupal-cvs(a)drupal.org wrote: > User: baudolino Branch: DRUPAL-4-5 Date: Mon, 4 Apr 2005 06:23:04 > +0000 > > Log message: > > - Added DRUPAL-4-5. baudoline, I blocked your CVS access. Randomly branching modules is _not_ a good idea. -- Dries Buytaert :: http://www.buytaert.net/

1 0

[drupal-devel] [bug] buffering not stopped after buffer done with
by willmoy 04 Apr '05

04 Apr '05

Issue status update for http://drupal.org/node/19933 Project: Drupal Version: cvs Component: base system Category: bug reports Priority: normal Assigned to: willmoy Reported by: willmoy Updated by: willmoy Status: patch Attachment: http://drupal.org/files/issues/bootstrap.inc_1.patch (547 bytes) When visiting a page which is being buffered so it can be cached, the output buffer is not flushed when buffering is done with (i.e. when the cache is saved, before hook_exit is invoked). The page is not returned to the client until after hook_exit. Adding ob_end_flush solves that and maintains php 4.* compatibility. (Most ob_* functions came in php 4.2) willmoy

2 1

[drupal-devel] Re: [contributions(DRUPAL-4-5):baudolino] contributions/docs/developer
by Jonathan Chaffer 04 Apr '05

04 Apr '05

On Apr 4, 2005, at 2:22 AM, drupal-cvs(a)drupal.org wrote: > User: baudolino Branch: DRUPAL-4-5 Date: Mon, 4 Apr 2005 06:22:53 > +0000 > > Log message: > > - Added DRUPAL-4-5. Did this mistake happen *twice* in two days? Kjartan, can we roll back to before this mess? -- Jonathan Chaffer Applications Developer, structure:interactive (616) 364-7423 http://www.structureinteractive.com/

1 0

[drupal-devel] [feature] Multiple translations of the same strings
by Olen 04 Apr '05

04 Apr '05

Issue status update for http://drupal.org/node/19425 Project: Drupal Version: cvs Component: locale.module Category: feature requests Priority: normal Assigned to: Anonymous Reported by: Olen Updated by: Olen Status: patch In many langages the same english string can (and should) be translated differently, depending on context. Here are two patches, one for locale.inc and one for locale.module that allows the same string to be translated more than once. It adds the correct path (filename) and line number of the translated string as "location" instead of the url where it was first seen. It will also allow you to download the .po-file for only one module at the time. These two improvements makes it a lot easier to find the correct context for the translation. It will use a "best effort" when finding translations, first trying to match on file:line, then only file and at last, any translated string with the same 'source'. Be aware that the first few page loads after a new translation is added are really slow, until the database has been updated with all the new strings and locations. Also note that this will lead to several "unused" strings in the database. I have an idea about some sort of timestamp to check when a string was last used, and a cron job that removes old, unused strings, but I think this could cause more problems than it fixes. Anyway, here are the patches. Let me know if you want them as attachments instead. locale.module: --- locale.module.orig 2005-03-23 08:42:29.000000000 +0100 +++ locale.module 2005-03-25 10:10:39.180616160 +0100 @@ -142,29 +142,67 @@ // We don't have this translation cached, so get it from the DB else { - $result = db_query("SELECT s.lid, t.translation FROM {locales_source} s INNER JOIN {locales_target} t ON s.lid = t.lid WHERE s.source = '%s' AND t.locale = '%s'", $string, $locale); + $caller = debug_backtrace(); + $docroot = realpath($_SERVER['DOCUMENT_ROOT']); + $file = ereg_replace($docroot, '', $caller[1]['file']); + $basefile = basename($file); + $line = $caller[1]['line']; + $origstring = $string; + $result = db_query("SELECT s.lid, s.location, t.translation FROM {locales_source} s INNER JOIN {locales_target} t ON s.lid = t.lid WHERE s.source = '%s' AND t.locale = '%s'", $string, $locale); // Translation found - if ($trans = db_fetch_object($result)) { + while ($trans = db_fetch_object($result)) { if (!empty($trans->translation)) { - $locale_t[$string] = $trans->translation; - $string = $trans->translation; + if ($trans->location == "$file:$line") { + // We have 100% match + $locale_t[$string] = $trans->translation; + $string = $trans->translation; + $match = $trans->lid; + $rate = 100; + break; + } + elseif (eregi($basefile, $trans->location) && ($rate < 100)) { + // We have a match in the same file, but on a different line + $locale_t[$string] = $trans->translation; + $string = $trans->translation; + $match = $trans->lid; + $rate = 75; + } + elseif ($rate < 50) { + // We have a match in another file + $locale_t[$string] = $trans->translation; + $string = $trans->translation; + $match = $trans->lid; + $rate = 50; + } + } + } + // We have a translation, but not a full file:line match + if (($match) && ($rate < 100)) { + // Lets update source and target with the correct location + db_query("INSERT INTO {locales_source} (location, source) VALUES ('%s', '%s')", "$file:$line", $origstring); + if ($locale) { + $lid = db_fetch_object(db_query("SELECT lid FROM {locales_source} WHERE source = '%s' AND location = '%s'", $origstring, "$file:$line")); + db_query("INSERT INTO {locales_target} (lid, locale, translation) VALUES (%d, '%s', '%s')", $lid->lid, $locale, $string); } } // Either we have no such source string, or no translation - else { - $result = db_query("SELECT lid, source FROM {locales_source} WHERE source = '%s'", $string); - // We have no such translation + elseif (!$match) { + $result = db_query("SELECT lid, source FROM {locales_source} WHERE source = '%s' AND location = '%s'", $origstring, "$file:$line"); if ($obj = db_fetch_object($result)) { if ($locale) { - db_query("INSERT INTO {locales_target} (lid, locale) VALUES (%d, '%s')", $obj->lid, $locale); + $trans = db_fetch_object(db_query("SELECT lid FROM {locales_target} WHERE lid = '%d' AND locale = '%s'"", $obj->lid, $locale)); + // We have no such translation + if (!$trans) { + db_query("INSERT INTO {locales_target} (lid, locale) VALUES (%d, '%s')", $obj->lid, $locale); + } } } // We have no such source string else { - db_query("INSERT INTO {locales_source} (location, source) VALUES ('%s', '%s')", request_uri(), $string); + db_query("INSERT INTO {locales_source} (location, source) VALUES ('%s', '%s')", "$file:$line", $string); if ($locale) { - $lid = db_fetch_object(db_query("SELECT lid FROM {locales_source} WHERE source = '%s'", $string)); + $lid = db_fetch_object(db_query("SELECT lid FROM {locales_source} WHERE source = '%s' AND location = '%s'", $string, "$file:$line")); db_query("INSERT INTO {locales_target} (lid, locale) VALUES (%d, '%s')", $lid->lid, $locale); } } @@ -410,7 +448,7 @@ include_once 'includes/locale.inc'; switch ($_POST['op']) { case t('Export'): - _locale_export_po($_POST['edit']['langcode']); + _locale_export_po($_POST['edit']['langcode'], $_POST['edit']['filename']); break; } print theme('page', _locale_admin_export_screen()); And for locale.inc --- locale.inc.orig 2005-03-23 18:03:27.000000000 +0100 +++ locale.inc 2005-03-25 09:58:22.433809358 +0100 @@ -176,11 +176,9 @@ if ($key == 0) { $plid = 0; } - $loc = db_fetch_object(db_query("SELECT lid FROM {locales_source} WHERE source = '%s'", $english[$key])); + $loc = db_fetch_object(db_query("SELECT lid FROM {locales_source} WHERE source = '%s' AND location = '%s'", $english[$key], $comments)); if ($loc->lid) { // a string exists $lid = $loc->lid; - // update location field - db_query("UPDATE {locales_source} SET location = '%s' WHERE lid = %d", $comments, $lid); $trans2 = db_fetch_object(db_query("SELECT lid, translation, plid, plural FROM {locales_target} WHERE lid = %d AND locale = '%s'", $lid, $lang)); if (!$trans2->lid) { // no translation in current language db_query("INSERT INTO {locales_target} (lid, locale, translation, plid, plural) VALUES (%d, '%s', '%s', %d, %d)", $lid, $lang, $trans, $plid, $key); @@ -198,7 +196,7 @@ } else { // no string db_query("INSERT INTO {locales_source} (location, source) VALUES ('%s', '%s')", $comments, $english[$key]); - $loc = db_fetch_object(db_query("SELECT lid FROM {locales_source} WHERE source = '%s'", $english[$key])); + $loc = db_fetch_object(db_query("SELECT lid FROM {locales_source} WHERE source = '%s' AND location = '%s'", $english[$key], $comments)); $lid = $loc->lid; db_query("INSERT INTO {locales_target} (lid, locale, translation, plid, plural) VALUES (%d, '%s', '%s', %d, %d)", $lid, $lang, $trans, $plid, $key); if ($trans != '') { @@ -213,11 +211,10 @@ else { $english = $value['msgid']; $translation = $value['msgstr']; - $loc = db_fetch_object(db_query("SELECT lid FROM {locales_source} WHERE source = '%s'", $english)); + $loc = db_fetch_object(db_query("SELECT lid FROM {locales_source} WHERE source = '%s' AND location = '%s'", $english, $comments)); if ($loc->lid) { // a string exists $lid = $loc->lid; // update location field - db_query("UPDATE {locales_source} SET location = '%s' WHERE source = '%s'", $comments, $english); $trans = db_fetch_object(db_query("SELECT lid, translation FROM {locales_target} WHERE lid = %d AND locale = '%s'", $lid, $lang)); if (!$trans->lid) { // no translation in current language db_query("INSERT INTO {locales_target} (lid, locale, translation) VALUES (%d, '%s', '%s')", $lid, $lang, $translation); @@ -662,7 +659,7 @@ while(strlen($comm) < 128 && count($comment)) { $comm .= substr(array_shift($comment), 1) .', '; } - return substr($comm, 0, -2); + return trim(substr($comm, 0, -2)); } /** @@ -689,18 +686,37 @@ } /** + * Get a list of all files with at least one translatable string + */ +function _locale_active_modules() { + $loc = db_query("SELECT location FROM {locales_source}"); + $filenames[''] = t('All files'); + while ($locat = db_fetch_object($loc)) { + $basename = basename(preg_replace('/:.*/', '', $locat->location)); + if ($basename) { + $filenames[$basename] = $basename; + } + } + ksort($filenames); + return $filenames; +} + +/** * User interface for the translation export screen */ function _locale_admin_export_screen() { $languages = locale_supported_languages(FALSE, TRUE); $languages = array_map("t", $languages['name']); unset($languages['en']); + $filenames = _locale_active_modules(); + $output = ''; // Offer language specific export if any language is set up if (count($languages)) { $output .= '<h2>'. t('Export translation') .'</h2>'; $form = form_select(t('Language name'), 'langcode', '', $languages, t('Select the language you would like to export in gettext Portable Object (.po) format.')); + $form .= form_select(t('File name'), 'filename', '', $filenames, t('Select the file you would like to export strings from.')); $form .= form_submit(t('Export')); $output .= form($form); } @@ -719,13 +735,21 @@ * * @param $language Selects a language to generate the output for */ -function _locale_export_po($language) { +function _locale_export_po($language, $filename = NULL) { global $user; + if ($filename) { + $filename = "/%$filename%"; + $sort = '(substring_index(s.location, ":", -1)+0)'; + } + else { + $filename = '/%'; + $sort = 'substring_index(s.location, ":", 1), (substring_index(s.location, ":", -1)+0)'; + } // Get language specific strings, or all strings if ($language) { $meta = db_fetch_object(db_query("SELECT * FROM {locales_meta} WHERE locale = '%s'", $language)); - $result = db_query("SELECT s.lid, s.source, s.location, t.translation, t.plid, t.plural FROM {locales_source} s INNER JOIN {locales_target} t ON s.lid = t.lid WHERE t.locale = '%s' ORDER BY t.plid, t.plural", $language); + $result = db_query("SELECT s.lid, s.source, s.location, t.translation, t.plid, t.plural FROM {locales_source} s INNER JOIN {locales_target} t ON s.lid = t.lid WHERE t.locale = '%s' and s.location like '%s' ORDER BY t.plid, t.plural, $sort, s.source, s.lid", $language, $filename); } else { $result = db_query("SELECT s.lid, s.source, s.location, t.plid, t.plural FROM {locales_source} s INNER JOIN {locales_target} t ON s.lid = t.lid GROUP BY s.lid ORDER BY t.plid, t.plural"); @@ -750,7 +774,14 @@ // Generating Portable Object file for a language if ($language) { - $filename = $language .'.po'; + if ($filename) { + $filename = preg_replace('/[^A-z0-9\.\-_]/', '', $filename); + if (!$filename) { + $filename = 'all'; + } + $filename .= '.'; + } + $filename .= $language .'.po'; $header .= "# $meta->name translation of ". variable_get('site_name', 'Drupal') ."\n"; $header .= '# Copyright (c) '. date('Y') .' '. $user->name .' <'. $user->mail .">\n"; $header .= "#\n"; Olen

4 9

[drupal-devel] [bug] Cannot delete users
by asimmonds 04 Apr '05

04 Apr '05

Issue status update for http://drupal.org/node/19750 Project: Drupal Version: cvs Component: user.module Category: bug reports Priority: critical Assigned to: Anonymous Reported by: AtomicMaestro Updated by: asimmonds Status: patch There are two methods to enter the user edit page as a admin: 1/ View a user, then select the edit tab. 2/ Click 'edit' for the user in the admin/user list. The 2nd method sets destination=admin/user in the URL, when the user edit page is shown. If the Delete button is clicked, it calls drupal_goto("user/$account->uid/delete") (the code's comment mentions this is done to make the tabs disappear). As destination is already set, drupal_goto() redirects to that ie. "admin/user" instead of "user/$account->uid/delete" If after successfully deleting a user, the code calls drupal_goto("admin/user"). I looked at how node.module does the node delete/confirm sequence and it has this unset($_REQUEST['destination']) in there as well. Maybe this delete/confirm sequence pattern needs a re-think for 4.7 asimmonds Previous comments: ------------------------------------------------------------------------ March 31, 2005 - 21:33 : AtomicMaestro I can't seem to delete users. To reproduce: 1. Create a user. 2. View the user created in 1. 3. Click Delete I would expect to be told I have to block the user first, but instead, I'm sent back to the user report. There's no message, nothing in the log. ------------------------------------------------------------------------ April 1, 2005 - 19:40 : asimmonds Attachment: http://drupal.org/files/issues/fix_delete_user.patch (581 bytes) Patch attached to fix this, the delete code in node.module works the same way ------------------------------------------------------------------------ April 4, 2005 - 02:15 : moshe weitzman when one deletes a user from list of users in admin, he expects to return back to that list after successfully deleting. thats the intent of the $_REQUEST['destination']. I think this patch will defeat that behavior. There certainly is a bug here, but I don't think we have found the right fix yet. I suggest testing a delete from both admin and user/edit pages. make sure you arrive at the expected page after a successful delete.

1 0

[drupal-devel] [feature] Let other module use the block matcher
by chx 04 Apr '05

04 Apr '05

Issue status update for http://drupal.org/node/19694 Project: Drupal Version: cvs Component: block.module Category: feature requests Priority: normal Assigned to: chx Reported by: chx Updated by: chx Status: patch Attachment: http://drupal.org/files/issues/blocks_regions.patch (1.74 KB) This patch makes sure that block.module deals by default only with regions 0 and 1 as it does now but lets you use block_list with any region you define. This opens many possibilites. You may do a multi region module, with your admin UI using the blocks table as storage and the block_list matcher. Or you may do a sections module using the block matcher without cluttering the current blocks list. block_list has a phpdoc: * @param $region main|left|right but I have not found anything regarding 'main' so I changed this to left|right|all where all means (left or right). As the current block module would treat 'main' the same as 'right' I doubt it had any usage. In short: no functionality is harmed, lots of possibilities are opened, so please commit. chx

3 5

[drupal-devel] [bug] have db_prefix_tables() handle 'default' key not being set
by danielc 04 Apr '05

04 Apr '05

Issue status update for http://drupal.org/node/19609 Project: Drupal Version: cvs Component: base system Category: bug reports Priority: normal Assigned to: Anonymous Reported by: danielc Updated by: danielc Status: patch I tested the db_prefix_tables() function in two configurations. With my first patch applied and with my second patch applied. The second patch is 5% faster than the first. This improvement is the same for both the string and array formats of $db_url. danielc Previous comments: ------------------------------------------------------------------------ March 28, 2005 - 16:24 : danielc Attachment: http://drupal.org/files/issues/database.diff (720 bytes) The db_prefix_tables() function in includes/database.inc generates notices if $db_prefix['default'] is not set. This patch fixes that problem. This has a side benefit of making $db_prefix easier to use. ------------------------------------------------------------------------ March 28, 2005 - 17:06 : moshe weitzman nice ... this has been a bit a pimple for a while. ------------------------------------------------------------------------ March 29, 2005 - 10:40 : danielc Attachment: http://drupal.org/files/issues/database2.diff (1.17 KB) I've come up with a new version of the patch that optimizes the speed of the whole function. ------------------------------------------------------------------------ March 29, 2005 - 10:56 : danielc Change Version from "4.5.2" to "cvs". ------------------------------------------------------------------------ March 29, 2005 - 11:01 : danielc Pardon me, I'm testing if this goes the drupal-dev list now that the version is "cvs." ------------------------------------------------------------------------ April 3, 2005 - 07:45 : Dries Any idea of how much faster the second patch is? I don't think it makes a real difference in which case I'd favor the first patch. ------------------------------------------------------------------------ April 3, 2005 - 13:40 : danielc The speed increase is 5%. ------------------------------------------------------------------------ April 3, 2005 - 13:52 : Dries 5% compared to what? What did you measure?

1 0