Merge branch 'release-1.3' into develop

AUTHORS

@@ -7,6 +7,7 @@ Much appreciated contributors (in alphabetical order):
     Andrew Nguyen <andrew-git-indefero@na-consulting.net>
     Baptiste Durand-Bret <bathizte@ozazar.org>
     Baptiste Michaud <bactisme@gmail.com>           - Subversion sync
+    Benjamin Danon <benjamin@sphax3d.org>           - French translation
     Benjamin Jorand <benjamin.jorand@gmail.com>     - Mercurial support
     Brenda Wallace <shiny@cpan.org>
     Brian Armstrong <brianar>

NEWS.mdtext

@@ -6,13 +6,17 @@
   you filter and search by overdue issues (fixes issue 584,
   thanks to Simon Holywell!)
 
-# InDefero 1.3.3 - xxx xxx xx xx:xx 2012 UTC
+# InDefero 1.3.3 - Sun Nov 18 22:54:00 UTC 2012
 
 **ATTENTION**: InDefero needs Pluf [a45dc195](http://projects.ceondo.com/p/pluf/source/commit/a45dc195)
 or newer to run properly!
 
 ## Bugfixes
 
+- A long standing bug in the Mercurial plugin that lead to corruption
+  of boolean configuration values in the `hgrc` of the served repository
+  has been fixed (issue 523).
+ 
 - If an anonymous or authenticated user had no access to any project in a 
   forge, all projects were listed for him (but still no one was actually
   accessible). This has been fixed. 
@@ -28,6 +32,19 @@ or newer to run properly!
   foreign key relation. Adding project tags was not possible for a similar
   reason. This has been fixed (issue 800, continued).
 
+- If a project was created based on the settings of an existing project,
+  not all settings, like for example the new notification settings, have
+  been copied. This has been changed insofar that now all properties except
+  the project's URL, logo and individual SCM settings are copied by default.
+
+- Wiki pages couldn't be properly saved with E_NOTICE enabled because
+  of a syntax error (fixes issue 808).
+
+- Indefero now shows detected copies in git changesets.
+
+- A user is no longer redirected to the Help page if he enters 'H' in the
+  password text field on the login page (fixes issue 821).
+
 # InDefero 1.3.2 - Wed May 09 20:05 2012 UTC
 
 ## Bugfixes

src/IDF/Conf.php

@@ -44,9 +44,9 @@ class IDF_Conf extends Pluf_Model
                             array(
                                   'type' => 'Pluf_DB_Field_Sequence',
                                   //It is automatically added.
-                                  'blank' => true, 
+                                  'blank' => true,
                                   ),
-                            'project' => 
+                            'project' =>
                             array(
                                   'type' => 'Pluf_DB_Field_Foreignkey',
                                   'model' => 'IDF_Project',
@@ -84,7 +84,7 @@ class IDF_Conf extends Pluf_Model
 
     function initCache()
     {
-        $this->datacache = new ArrayObject();
+        $this->datacache = array();
         $sql = new Pluf_SQL('project=%s', $this->_project->id);
         foreach ($this->getList(array('filter' => $sql->gen())) as $val) {
             $this->datacache[$val->vkey] = $val->vdesc;
@@ -97,7 +97,7 @@ class IDF_Conf extends Pluf_Model
      */
     function setVal($key, $value)
     {
-        if (!is_null($this->getVal($key, null)) 
+        if (!is_null($this->getVal($key, null))
             and $value == $this->getVal($key)) {
             return;
         }
@@ -129,4 +129,12 @@ class IDF_Conf extends Pluf_Model
             $this->initCache();
         }
     }
+
+    function getKeys()
+    {
+        if ($this->datacache === null) {
+            $this->initCache();
+        }
+        return array_keys($this->datacache);
+    }
 }

src/IDF/Form/Admin/ProjectCreate.php

@@ -360,45 +360,35 @@ class IDF_Form_Admin_ProjectCreate extends Pluf_Form
 
         $conf = new IDF_Conf();
         $conf->setProject($project);
-        $keys = array('scm', 'svn_remote_url', 'svn_username',
+
-                      'svn_password', 'mtn_master_branch', 'external_project_url');
-        foreach ($keys as $key) {
-            $this->cleaned_data[$key] = (!empty($this->cleaned_data[$key])) ?
-                $this->cleaned_data[$key] : '';
-            $conf->setVal($key, $this->cleaned_data[$key]);
-        }
         if ($this->cleaned_data['template'] != '--') {
             $tmplconf = new IDF_Conf();
             $tmplconf->setProject($tmpl);
-            // We need to get all the configuration variables we want from
+
-            // the old project and put them into the new project.
+            $allKeys =  $tmplconf->getKeys();
-            $props = array(
+            $scm = $this->cleaned_data['scm'];
-                           'labels_download_predefined' => IDF_Form_UploadConf::init_predefined,
+            $ignoreKeys = array('scm', 'external_project_url', 'logo');
-                           'labels_download_one_max' => IDF_Form_UploadConf::init_one_max,
+
-                           'labels_wiki_predefined' => IDF_Form_WikiConf::init_predefined,
+            // copy over all existing variables, except scm-related data and
-                           'labels_wiki_one_max' => IDF_Form_WikiConf::init_one_max,
+            // the project url / logo
-                           'labels_issue_template' => IDF_Form_IssueTrackingConf::init_template,
+            foreach ($allKeys as $key) {
-                           'labels_issue_open' => IDF_Form_IssueTrackingConf::init_open,
+                if (in_array($key, $ignoreKeys) || strpos($key, $scm.'_') === 0) {
-                           'labels_issue_closed' => IDF_Form_IssueTrackingConf::init_closed,
+                    continue;
-                           'labels_issue_predefined' =>  IDF_Form_IssueTrackingConf::init_predefined,
+                }
-                           'labels_issue_one_max' => IDF_Form_IssueTrackingConf::init_one_max,
+                $conf->setVal($key, $tmplconf->getVal($key));
-                           'issue_relations' => IDF_Form_IssueTrackingConf::init_relations,
-                           'webhook_url' => '',
-                           'downloads_access_rights' => 'all',
-                           'review_access_rights' => 'all',
-                           'wiki_access_rights' => 'all',
-                           'source_access_rights' => 'all',
-                           'issues_access_rights' => 'all',
-                           'downloads_notification_email' => '',
-                           'review_notification_email' => '',
-                           'wiki_notification_email' => '',
-                           'source_notification_email' => '',
-                           'issues_notification_email' => '',
-                           );
-            foreach ($props as $prop => $def) {
-                $conf->setVal($prop, $tmplconf->getVal($prop, $def));
             }
         }
+
+        $keys = array(
+            'scm', 'svn_remote_url', 'svn_username',
+            'svn_password', 'mtn_master_branch',
+            'external_project_url'
+        );
+        foreach ($keys as $key) {
+            $this->cleaned_data[$key] = !empty($this->cleaned_data[$key]) ?
+                $this->cleaned_data[$key] : '';
+            $conf->setVal($key, $this->cleaned_data[$key]);
+        }
         $project->created();
 
         if ($this->cleaned_data['template'] == '--') {

src/IDF/Plugin/SyncMercurial.php

@@ -178,7 +178,10 @@ class IDF_Plugin_SyncMercurial
 
         // Generate hgrc content 
         if (is_file($hgrc_file)) {
-            $tmp_content = parse_ini_file($hgrc_file, true);
+            $tmp_content = @parse_ini_file($hgrc_file, true, INI_SCANNER_RAW);
+            if ($tmp_content === false) {
+              throw new Exception('could not parse "'.$hgrc_file.'" because of syntax problems');
+            }
             $tmp_content['web']['allow_push'] = $allow_push;
         }
         else {

src/IDF/Scm/Git.php

@@ -52,11 +52,11 @@ class IDF_Scm_Git extends IDF_Scm
      * A       doc/Guide utilisateur/images/ftp-nautilus.png
      * M       doc/Guide utilisateur/textes/log_boot_PEGASE.txt
      *
-     * Status letters mean : Added (A), Deleted (D), Modified (M), Renamed (R)
+     * Status letters mean : Added (A), Copied (C), Deleted (D), Modified (M), Renamed (R)
      */
     public function getChanges($commit)
     {
-        $cmd = sprintf('GIT_DIR=%s '.Pluf::f('git_path', 'git').' show %s --name-status --pretty="format:" --diff-filter="[A|D|M|R]" -M',
+        $cmd = sprintf('GIT_DIR=%s '.Pluf::f('git_path', 'git').' show %s --name-status --pretty="format:" --diff-filter="[A|C|D|M|R]" -C -C',
                    escapeshellarg($this->repo),
                    escapeshellarg($commit));
         $out = array();
@@ -89,6 +89,9 @@ class IDF_Scm_Git extends IDF_Scm
                 } else if ($action == 'R') {
                     $matches = preg_split("/\t/", $line);
                     $return->renames[$matches[1]] = $matches[2];
+                } else if ($action == 'C') {
+                    $matches = preg_split("/\t/", $line);
+                    $return->copies[$matches[1]] = $matches[2];
                 }
             }
         }

src/IDF/Wiki/PageRevision.php

@@ -167,7 +167,7 @@ class IDF_Wiki_PageRevision extends Pluf_Model
             if (count($matches) > 1 && count($matches[1]) > 0) {
                 foreach ($matches[1] as $resourceName) {
                     $sql = new Pluf_SQL('project=%s AND title=%s',
-                                        array($prj->id, $resourceName));
+                                        array($page->get_project()->id, $resourceName));
                     $resources = Pluf::factory('IDF_Wiki_Resource')->getList(array('filter'=>$sql->gen()));
                     if ($resources->count() == 0)
                         continue;

www/media/idf/js/jquery.hotkeys.js

@@ -44,7 +44,7 @@
 	
 		handleObj.handler = function( event ) {
 			// Don't fire in text-accepting inputs that we didn't directly bind to
-			if ( this !== event.target && (/textarea|select/i.test( event.target.nodeName ) ||
+			if ( this !== event.target && (/textarea|select|input/i.test( event.target.nodeName ) ||
 				 event.target.type === "text" || $(event.target).prop('contenteditable') == 'true' )) {
 				return;
 			}