Squash changes containing private information

There were a lot of changes since the previous commit, but a lot of them
contained personnal information about users. All thos changes got
stashed into a single commit (history is kept in a different place) and
private information was moved in a separate private repository

8 files changed, 0 insertions, 239 deletions

diff --git a/pkgs/webapps/mantisbt_2/bug_report.php.diff b/pkgs/webapps/mantisbt_2/bug_report.php.diff
deleted file mode 100644
index 2924252..0000000
--- a/pkgs/webapps/mantisbt_2/bug_report.php.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/bug_report.php    2019-05-06 12:06:44.265508011 +0200
-+++ b/bug_report.php    2019-05-06 12:09:40.106952738 +0200
-@@ -67,6 +67,17 @@
-        'copy_files' => $f_copy_attachments_from_parent
- );
- 
-+# begin captcha check for anon user
-+if ( current_user_is_anonymous() && get_gd_version() > 0 ) {
-+  $f_captcha = gpc_get_string( 'captcha', '' );
-+  $f_captcha = utf8_strtolower( trim( $f_captcha ) );
-+
-+  $t_securimage = new Securimage();
-+  if( $t_securimage->check( $f_captcha ) == false ) {
-+    trigger_error( ERROR_SIGNUP_NOT_MATCHING_CAPTCHA, ERROR );
-+  }
-+}
-+
- if( $f_master_bug_id > 0 ) {
-        bug_ensure_exists( $f_master_bug_id );
- 
diff --git a/pkgs/webapps/mantisbt_2/bug_report_page.php.diff b/pkgs/webapps/mantisbt_2/bug_report_page.php.diff
deleted file mode 100644
index 80dea91..0000000
--- a/pkgs/webapps/mantisbt_2/bug_report_page.php.diff
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/bug_report_page.php       2018-02-10 21:29:27.000000000 +0100
-+++ b/bug_report_page.php       2018-03-03 15:04:19.622499678 +0100
-@@ -708,7 +708,50 @@
-                                <span class="lbl padding-6"><?php echo lang_get( 'check_report_more_bugs' ) ?></span>
-                        </label>
-                </td>
-        </tr>
-+<?php
-+       # captcha image requires GD library and related option to ON
-+       if( current_user_is_anonymous() && get_gd_version() > 0 ) {
-+               $t_securimage_path = 'vendor/dapphp/securimage';
-+               $t_securimage_show = $t_securimage_path . '/securimage_show.php';
-+               $t_securimage_play = $t_securimage_path . '/securimage_play.swf?'
-+                       . http_build_query( array(
-+                               'audio_file' => $t_securimage_path . '/securimage_play.php',
-+                               'bgColor1=' => '#fff',
-+                               'bgColor2=' => '#fff',
-+                               'iconColor=' => '#777',
-+                               'borderWidth=' => 1,
-+                               'borderColor=' => '#000',
-+                       ) );
-+?>
-+       <tr>
-+               <th class="category">CAPTCHA</th>
-+               <td>
-+
-+                               <label for="captcha-field" class="block clearfix">
-+                                       <strong><?php echo lang_get( 'signup_captcha_request_label' ); ?></strong>
-+                               </label>
-+                               <span id="captcha-input" class="input">
-+                                       <?php print_captcha_input( 'captcha' ); ?>
-+
-+                                       <span id="captcha-image" class="captcha-image" style="padding-right:3px;">
-+                                               <img src="<?php echo $t_securimage_show; ?>" alt="visual captcha" />
-+                                               <ul id="captcha-refresh"><li><a href="#"><?php
-+                                                       echo lang_get( 'signup_captcha_refresh' );
-+                                               ?></a></li></ul>
-+                                       </span>
-+
-+                                       <object type="application/x-shockwave-flash" width="19" height="19"
-+                                               data="<?php echo $t_securimage_play; ?>">
-+                                               <param name="movie" value="<?php echo $t_securimage_play; ?>" />
-+                                       </object>
-+                               </span>
-+                </td>
-+        </tr>
-+<?php
-+                       }
-+?>
-+
- </table>
- </div>
- </div>
diff --git a/pkgs/webapps/mantisbt_2/bugnote_add.php.diff b/pkgs/webapps/mantisbt_2/bugnote_add.php.diff
deleted file mode 100644
index 4509f0a..0000000
--- a/pkgs/webapps/mantisbt_2/bugnote_add.php.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/bugnote_add.php   2018-02-10 21:29:27.000000000 +0100
-+++ b/bugnote_add.php   2018-03-03 15:13:12.439919511 +0100
-@@ -44,6 +44,17 @@
- 
- $t_query = array( 'issue_id' => $f_bug_id );
- 
-+# begin captcha check for anon user
-+if ( current_user_is_anonymous() && get_gd_version() > 0 ) {
-+  $f_captcha = gpc_get_string( 'captcha', '' );
-+  $f_captcha = utf8_strtolower( trim( $f_captcha ) );
-+
-+  $t_securimage = new Securimage();
-+  if( $t_securimage->check( $f_captcha ) == false ) {
-+    trigger_error( ERROR_SIGNUP_NOT_MATCHING_CAPTCHA, ERROR );
-+  }
-+}
-+
- if( count( $f_files ) > 0 && is_blank( $f_text ) && helper_duration_to_minutes( $f_duration ) == 0 ) {
-        $t_payload = array(
-                'files' => helper_array_transpose( $f_files )
diff --git a/pkgs/webapps/mantisbt_2/bugnote_add_inc.php.diff b/pkgs/webapps/mantisbt_2/bugnote_add_inc.php.diff
deleted file mode 100644
index a8589c7..0000000
--- a/pkgs/webapps/mantisbt_2/bugnote_add_inc.php.diff
+++ /dev/null
@@ -1,52 +0,0 @@
---- a/bugnote_add_inc.php       2018-02-10 21:29:27.000000000 +0100
-+++ b/bugnote_add_inc.php       2018-03-03 15:14:27.332428557 +0100
-@@ -119,6 +119,49 @@
-                                        <textarea name="bugnote_text" id="bugnote_text" class="<?php echo $t_bugnote_class ?>" rows="7"></textarea>
-                                </td>
-                        </tr>
-+<?php
-+       # captcha image requires GD library and related option to ON
-+       if( current_user_is_anonymous() && get_gd_version() > 0 ) {
-+               $t_securimage_path = 'vendor/dapphp/securimage';
-+               $t_securimage_show = $t_securimage_path . '/securimage_show.php';
-+               $t_securimage_play = $t_securimage_path . '/securimage_play.swf?'
-+                       . http_build_query( array(
-+                               'audio_file' => $t_securimage_path . '/securimage_play.php',
-+                               'bgColor1=' => '#fff',
-+                               'bgColor2=' => '#fff',
-+                               'iconColor=' => '#777',
-+                               'borderWidth=' => 1,
-+                               'borderColor=' => '#000',
-+                       ) );
-+?>
-+       <tr>
-+               <th class="category">CAPTCHA</th>
-+               <td>
-+
-+                               <label for="captcha-field" class="block clearfix">
-+                                       <strong><?php echo lang_get( 'signup_captcha_request_label' ); ?></strong>
-+                               </label>
-+                               <span id="captcha-input" class="input">
-+                                       <?php print_captcha_input( 'captcha' ); ?>
-+
-+                                       <span id="captcha-image" class="captcha-image" style="padding-right:3px;">
-+                                               <img src="<?php echo $t_securimage_show; ?>" alt="visual captcha" />
-+                                               <ul id="captcha-refresh"><li><a href="#"><?php
-+                                                       echo lang_get( 'signup_captcha_refresh' );
-+                                               ?></a></li></ul>
-+                                       </span>
-+
-+                                       <object type="application/x-shockwave-flash" width="19" height="19"
-+                                               data="<?php echo $t_securimage_play; ?>">
-+                                               <param name="movie" value="<?php echo $t_securimage_play; ?>" />
-+                                       </object>
-+                               </span>
-+                </td>
-+        </tr>
-+<?php
-+                       }
-+?>
-+
- 
- <?php
-        if( config_get( 'time_tracking_enabled' ) ) {
diff --git a/pkgs/webapps/mantisbt_2/default.nix b/pkgs/webapps/mantisbt_2/default.nix
deleted file mode 100644
index 5aa04d1..0000000
--- a/pkgs/webapps/mantisbt_2/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ mantis_config ? "/etc/mantisbt/config_inc.php", stdenv, fetchurl, lib, callPackage}:
-let
-  pluginNames = [ "slack" "source-integration" ];
-  allPlugins = lib.attrsets.genAttrs pluginNames
-    (name: callPackage (./plugins + "/${name}") {});
-  toPassthru = pkg: plugins: {
-    inherit plugins allPlugins;
-    withPlugins = withPlugins pkg;
-  };
-  withPlugins = pkg: toPlugins:
-    let
-      plugins = toPlugins allPlugins;
-      toInstallPlugin = n:
-        if builtins.hasAttr "selector" n then
-          "ln -sf ${n}/${n.selector} $out/plugins/"
-        else
-          "ln -sf ${n} $out/plugins/${n.pluginName}";
-      newMantisbt = pkg.overrideAttrs(old: {
-        installPhase = old.installPhase + "\n" + builtins.concatStringsSep "\n" (map toInstallPlugin plugins);
-        passthru = toPassthru newMantisbt (pkg.plugins ++ plugins);
-      });
-    in newMantisbt;
-  package = stdenv.mkDerivation rec {
-    name = "mantisbt-${version}";
-    version = "2.21.0";
-    src = fetchurl {
-      url = "https://downloads.sourceforge.net/project/mantisbt/mantis-stable/${version}/${name}.tar.gz";
-      sha256 = "13lx569dp1gibq5daqp7dj6gsqic85rrix1s7xkp60gwpzk8wiw5";
-    };
-    patches = [
-      ./bug_report.php.diff
-      ./bug_report_page.php.diff
-      ./bugnote_add.php.diff
-      ./bugnote_add_inc.php.diff
-    ];
-    installPhase = ''
-    cp -a . $out
-    ln -s ${mantis_config} $out/config/config_inc.php
-    '';
-
-    passthru = toPassthru package [];
-  };
-in package
diff --git a/pkgs/webapps/mantisbt_2/plugins/slack/default.nix b/pkgs/webapps/mantisbt_2/plugins/slack/default.nix
deleted file mode 100644
index 61ed15f..0000000
--- a/pkgs/webapps/mantisbt_2/plugins/slack/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
-  passthru = {
-    pluginName = "Slack";
-  };
-  version = "9286d2e-master";
-  name = "mantisbt-plugin-slack-${version}";
-  src = fetchFromGitHub {
-    owner = "mantisbt-plugins";
-    repo = "Slack";
-    rev = "9286d2eeeb8a986ed949e378711fef5f0bf182dc";
-    sha256 = "0nn0v4jc967giilkzrppi5svd04m2hnals75xxp0iabcdjnih0mn";
-  };
-  installPhase = ''
-          sed -i -e "s/return '@' . \\\$username;/return \\\$username;/" Slack.php
-          cp -a . $out
-  '';
-}
diff --git a/pkgs/webapps/mantisbt_2/plugins/source-integration/Source.API.php.diff b/pkgs/webapps/mantisbt_2/plugins/source-integration/Source.API.php.diff
deleted file mode 100644
index c355144..0000000
--- a/pkgs/webapps/mantisbt_2/plugins/source-integration/Source.API.php.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- b/Source/Source.API.php     2017-09-18 00:50:32.000000000 +0200
-+++ a/Source/Source.API.php     2018-03-04 19:00:25.578889039 +0100
-@@ -452,6 +452,9 @@
-        # Allow other plugins to post-process commit data
-        event_signal( 'EVENT_SOURCE_COMMITS', array( $p_changesets ) );
-        event_signal( 'EVENT_SOURCE_FIXED', array( $t_fixed_bugs ) );
-+       foreach( $t_fixed_bugs as $t_bug_id => $t_changeset ) {
-+          event_signal( 'EVENT_BUG_ACTION', array('RESOLVE', $t_bug_id) );
-+        }
- }
- 
- /**
diff --git a/pkgs/webapps/mantisbt_2/plugins/source-integration/default.nix b/pkgs/webapps/mantisbt_2/plugins/source-integration/default.nix
deleted file mode 100644
index dc6c7de..0000000
--- a/pkgs/webapps/mantisbt_2/plugins/source-integration/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
-  version = "v2.2.0";
-  name = "mantisbt-plugin-source-integration-${version}";
-  src = fetchFromGitHub {
-    owner = "mantisbt-plugins";
-    repo = "source-integration";
-    rev = "44fc9e2e770aff4f40f56833f26a86ce0e2deb76";
-    sha256 = "0gcm6kqqijnv303sk59zn27adwx5vkr545mwzyaq2nrpxnkwdy5b";
-  };
-  patches = [
-    ./Source.API.php.diff
-  ];
-  installPhase = ''
-    mkdir $out
-    cp -a Source* $out/
-    '';
-  passthru = {
-    selector = "Source*";
-  };
-}