[Fusionforge-commits] r11693 - in trunk: . plugins/coclico/soapadmin/include plugins/old/webcalendar/common plugins/templates/helloworld/include plugins/templates/scmcpold/common src/common/docman src/common/docman/include src/common/docman/views src/common/forum src/common/include src/common/pm src/common/tracker src/docs src/plugins/aselectextauth/include src/plugins/blocks/common src/plugins/contribtracker/common src/plugins/cvssyncmail/common src/plugins/cvstracker/common src/plugins/extratabs/common src/plugins/fckeditor/common src/plugins/forumml/include src/plugins/globalsearch/common src/plugins/hudson/include src/plugins/ldapextauth/include src/plugins/mailman/include src/plugins/mantis/include src/plugins/mantisbt/common src/plugins/mediawiki/common src/plugins/online_help/common src/plugins/oslc/include src/plugins/projectlabels/common src/plugins/projects_hierarchy/common src/plugins/quota_management/common src/plugins/scmccase/common src/plugins/svncommitemail/common src/plugins/svntracker/common src/plugins/wiki/www/doc src/utils/fixscripts src/www/docman src/www/docman/scripts src/www/forum/admin src/www/pm/admin src/www/register src/www/tracker/admin tests/func/Testing tests/scripts

Roland Mas lolando at libremir.placard.fr.eu.org
Fri Dec 3 12:58:58 CET 2010


Author: lolando
Date: 2010-12-03 12:58:57 +0100 (Fri, 03 Dec 2010)
New Revision: 11693

Modified:
   trunk/
   trunk/plugins/coclico/soapadmin/include/soapadminPlugin.class.php
   trunk/plugins/old/webcalendar/common/webcalendarPlugin.class.php
   trunk/plugins/templates/helloworld/include/helloworldPlugin.class.php
   trunk/plugins/templates/scmcpold/common/CpoldPlugin.class.php
   trunk/src/common/docman/Document.class.php
   trunk/src/common/docman/include/utils.php
   trunk/src/common/docman/views/admin.php
   trunk/src/common/docman/views/menu.php
   trunk/src/common/docman/views/tree.php
   trunk/src/common/forum/Forum.class.php
   trunk/src/common/include/Group.class.php
   trunk/src/common/include/Plugin.class.php
   trunk/src/common/include/PluginManager.class.php
   trunk/src/common/include/SCMPlugin.class.php
   trunk/src/common/include/User.class.php
   trunk/src/common/include/config-vars.php
   trunk/src/common/pm/ProjectGroup.class.php
   trunk/src/common/tracker/Artifact.class.php
   trunk/src/common/tracker/ArtifactFile.class.php
   trunk/src/common/tracker/ArtifactType.class.php
   trunk/src/docs/fusionforge.doxygen
   trunk/src/plugins/aselectextauth/include/ASelectAuthPlugin.class.php
   trunk/src/plugins/blocks/common/blocksPlugin.class.php
   trunk/src/plugins/contribtracker/common/ContribTrackerPlugin.class.php
   trunk/src/plugins/cvssyncmail/common/CVSSyncMailPlugin.class.php
   trunk/src/plugins/cvstracker/common/cvstrackerPlugin.class.php
   trunk/src/plugins/extratabs/common/ExtraTabsPlugin.class.php
   trunk/src/plugins/fckeditor/common/fckeditorPlugin.class.php
   trunk/src/plugins/forumml/include/forummlPlugin.class.php
   trunk/src/plugins/globalsearch/common/GlobalsearchPlugin.class.php
   trunk/src/plugins/hudson/include/hudsonPlugin.class.php
   trunk/src/plugins/ldapextauth/include/LdapExtAuthPlugin.class.php
   trunk/src/plugins/mailman/include/mailmanPlugin.class.php
   trunk/src/plugins/mantis/include/MantisPlugin.class.php
   trunk/src/plugins/mantisbt/common/MantisBTPlugin.class.php
   trunk/src/plugins/mediawiki/common/MediaWikiPlugin.class.php
   trunk/src/plugins/online_help/common/online_helpPlugin.class.php
   trunk/src/plugins/oslc/include/oslcPlugin.class.php
   trunk/src/plugins/projectlabels/common/ProjectLabelsPlugin.class.php
   trunk/src/plugins/projects_hierarchy/common/projects_hierarchyPlugin.class.php
   trunk/src/plugins/quota_management/common/quota_managementPlugin.class.php
   trunk/src/plugins/scmccase/common/CCasePlugin.class.php
   trunk/src/plugins/svncommitemail/common/SVNCommitEmailPlugin.class.php
   trunk/src/plugins/svntracker/common/svntrackerPlugin.class.php
   trunk/src/plugins/wiki/www/doc/phpwiki.doxygen
   trunk/src/utils/fixscripts/normalize_roles.php
   trunk/src/www/docman/index.php
   trunk/src/www/docman/scripts/DocManController.js
   trunk/src/www/forum/admin/index.php
   trunk/src/www/pm/admin/index.php
   trunk/src/www/register/index.php
   trunk/src/www/tracker/admin/ind.php
   trunk/tests/func/Testing/TarSeleniumRemoteSuite.php
   trunk/tests/scripts/fusionforge-build-and-test-source.sh
Log:
Merged a dozen commits from 5.1, mostly fixes


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:8721-8727
/branches/Branch_4_7:6879,6881,6884,6897,6899,6902,6904,6906,6909,6911,6922,6932,6936,6939,6942,6944,6946-6948,6954,6956,6959,7000-7001,7012,7111,7130-7131,7133-7134,7138,7140-7142,7147-7148,7159-7160,7163,7168,7177,7179,7203,7205,7207,7210,7212,7251-7253,7255,7284,7287,7291,7293,7295-7296,7300,7355,7365-7366,7375-7376,7378,7395,7423-7426,7435,7458,7504,7567,7577,7623-7624,7638,7659-7660,7662,7665,7668,7674,7699,7746-7748,7771,7774,7786,7838
/branches/Branch_5_1:11607-11609,11621,11625,11627,11631,11638,11644,11647-11651
/branches/Branch_4_8:7334-7335,7344-7345,7382,7387,7389-7390,7396,7398,7401-7402,7428-7429,7437,7440,7443,7449-7455,7459,7462,7466,7469-7470,7476-7478,7480,7485,7490-7492,7505,7540,7556-7560,7568,7570-7571,7573,7576,7580,7609-7611,7613,7615,7618,7621-7622,7625-7627,7639,7658,7661,7663-7664,7666-7667,7673,7675,7678,7680,7685,7688-7689,7693,7700,7706-7708,7713,7725,7728-7742,7760,7763-7764,7767,7769-7770,7773,7776,7784-7785,7791,7797,7799,7802-7808,7810-7811,7816,7818,7825-7828,7839,7846-7847,7850,7894,7902,7920-7922,7927-7928,7932,7936-7937,7939,7942,7944-7945,7947,7951,7956,7958,7960,8064,8079-8080,8108,8113,8119,8121,8127-8128,8145,8197,8201-8202,8216,8224,8226,8228,8247-8250,8252,8271-8272,8310-8311,8328,8337,8339-8357,8361,8371,8373-8375,8378-8379,8383-8396,8415,8427-8431,8438-8441,8449,8452-8453,8458,8461,8477-8478,8480,8482,8492,8514,8530,8604-8605,8608,8637,8662,8674,8751,8754,8756,8760-8761,8812,8850,8945,8995,8998,9004-9006,9124,9137,9141,9317,9443,9469,9670,9701,9726,9934,10013
/branches/Branch_5_0:8892,8895,8897-8898,8900,8903-8904,8906-8907,8910,8915,8922,8924,8926,8929,8931-8933,8941,8946,8951,8955,8972-8977,8981,8997,8999,9002,9031-9032,9050,9080-9081,9084-9086,9093-9095,9102-9104,9108,9113-9115,9117-9118,9123,9125,9127-9131,9135-9136,9139,9146,9148-9150,9179-9191,9193-9195,9198,9200,9202,9204,9207,9209,9211,9213,9215,9220-9222,9231,9234-9235,9243,9251,9254,9259,9287,9315,9318,9347-9349,9358,9396,9427,9429,9431-9433,9441-9442,9444-9445,9462,9464,9468,9522-9523,9549,9551-9552,9576-9577,9579,9615,9633-9634,9672-9673,9675-9676,9684,9686-9687,9689,9699,9727,9729,9731,9930-9932,9935,9956,9980,10005-10006,10021,10024,10027,10064,10081-10082,10273,10285,10820-10824,10868,10872,10876-10878,10880,10918,11015,11017,11058-11060,11085-11086,11160-11165,11252-11253,11287,11294,11581,11619-11620

   + /trunk:8721-8727
/branches/Branch_5_0:8892,8895,8897-8898,8900,8903-8904,8906-8907,8910,8915,8922,8924,8926,8929,8931-8933,8941,8946,8951,8955,8972-8977,8981,8997,8999,9002,9031-9032,9050,9080-9081,9084-9086,9093-9095,9102-9104,9108,9113-9115,9117-9118,9123,9125,9127-9131,9135-9136,9139,9146,9148-9150,9179-9191,9193-9195,9198,9200,9202,9204,9207,9209,9211,9213,9215,9220-9222,9231,9234-9235,9243,9251,9254,9259,9287,9315,9318,9347-9349,9358,9396,9427,9429,9431-9433,9441-9442,9444-9445,9462,9464,9468,9522-9523,9549,9551-9552,9576-9577,9579,9615,9633-9634,9672-9673,9675-9676,9684,9686-9687,9689,9699,9727,9729,9731,9930-9932,9935,9956,9980,10005-10006,10021,10024,10027,10064,10081-10082,10273,10285,10820-10824,10868,10872,10876-10878,10880,10918,11015,11017,11058-11060,11085-11086,11160-11165,11252-11253,11287,11294,11581,11619-11620,11679
/branches/Branch_4_8:7334-7335,7344-7345,7382,7387,7389-7390,7396,7398,7401-7402,7428-7429,7437,7440,7443,7449-7455,7459,7462,7466,7469-7470,7476-7478,7480,7485,7490-7492,7505,7540,7556-7560,7568,7570-7571,7573,7576,7580,7609-7611,7613,7615,7618,7621-7622,7625-7627,7639,7658,7661,7663-7664,7666-7667,7673,7675,7678,7680,7685,7688-7689,7693,7700,7706-7708,7713,7725,7728-7742,7760,7763-7764,7767,7769-7770,7773,7776,7784-7785,7791,7797,7799,7802-7808,7810-7811,7816,7818,7825-7828,7839,7846-7847,7850,7894,7902,7920-7922,7927-7928,7932,7936-7937,7939,7942,7944-7945,7947,7951,7956,7958,7960,8064,8079-8080,8108,8113,8119,8121,8127-8128,8145,8197,8201-8202,8216,8224,8226,8228,8247-8250,8252,8271-8272,8310-8311,8328,8337,8339-8357,8361,8371,8373-8375,8378-8379,8383-8396,8415,8427-8431,8438-8441,8449,8452-8453,8458,8461,8477-8478,8480,8482,8492,8514,8530,8604-8605,8608,8637,8662,8674,8751,8754,8756,8760-8761,8812,8850,8945,8995,8998,9004-9006,9124,9137,9141,9317,9443,9469,9670,9701,9726,9934,10013
/branches/Branch_5_1:11607-11609,11621,11625,11627,11631,11638,11644,11647-11651,11677,11680-11681,11683-11684
/branches/Branch_4_7:6879,6881,6884,6897,6899,6902,6904,6906,6909,6911,6922,6932,6936,6939,6942,6944,6946-6948,6954,6956,6959,7000-7001,7012,7111,7130-7131,7133-7134,7138,7140-7142,7147-7148,7159-7160,7163,7168,7177,7179,7203,7205,7207,7210,7212,7251-7253,7255,7284,7287,7291,7293,7295-7296,7300,7355,7365-7366,7375-7376,7378,7395,7423-7426,7435,7458,7504,7567,7577,7623-7624,7638,7659-7660,7662,7665,7668,7674,7699,7746-7748,7771,7774,7786,7838

Modified: svk:merge
   - 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7001
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7012
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7291
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7458
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7623
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7624
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7786
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7838
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:10013
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7335
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7344
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7345
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7402
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7455
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7459
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7469
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7470
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7476
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7480
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7505
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7540
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7557
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7559
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7560
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7580
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7609
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7615
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7618
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7621
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7622
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7626
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7627
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7708
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7713
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7725
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7729
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7730
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7731
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7732
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7733
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7734
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7737
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7738
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7739
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7742
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7760
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7763
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7764
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7767
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7769
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7773
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7776
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7784
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7785
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7797
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7799
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7811
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7826
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7827
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7828
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7839
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7951
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7958
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7960
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8108
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8113
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8119
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8128
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8145
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8202
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8216
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8224
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8226
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8250
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8337
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8357
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8371
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8375
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8379
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8415
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8427
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8431
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8441
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8449
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8453
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8530
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8604
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8605
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8608
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8637
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8751
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8756
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8761
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:9141
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10006
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10021
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10064
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10082
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10824
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11017
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11060
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11165
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11253
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11294
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:8895
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:8898
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:8900
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:8941
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9115
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9118
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9131
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9136
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9139
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9150
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9188
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9195
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9198
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9202
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9207
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9209
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9213
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9243
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9254
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9358
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9427
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9433
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9549
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9552
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9579
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9634
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9675
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9676
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9729
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9731
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9932
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9980
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11621
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11627
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11631
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11638
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11651
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/trunk:8727

   + 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7001
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7012
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7291
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7458
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7623
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7624
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7786
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7838
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:10013
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7335
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7344
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7345
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7402
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7455
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7459
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7469
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7470
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7476
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7480
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7505
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7540
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7557
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7559
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7560
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7580
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7609
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7615
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7618
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7621
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7622
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7626
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7627
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7708
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7713
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7725
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7729
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7730
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7731
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7732
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7733
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7734
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7737
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7738
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7739
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7742
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7760
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7763
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7764
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7767
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7769
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7773
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7776
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7784
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7785
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7797
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7799
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7811
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7826
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7827
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7828
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7839
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7951
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7958
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7960
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8108
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8113
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8119
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8128
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8145
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8202
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8216
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8224
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8226
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8250
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8337
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8357
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8371
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8375
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8379
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8415
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8427
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8431
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8441
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8449
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8453
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8530
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8604
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8605
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8608
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8637
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8751
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8756
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8761
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:9141
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10006
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10021
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10064
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10082
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10824
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11017
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11060
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11165
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11253
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11294
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:8895
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:8898
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:8900
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:8941
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9115
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9118
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9131
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9136
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9139
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9150
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9188
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9195
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9198
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9202
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9207
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9209
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9213
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9243
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9254
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9358
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9427
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9433
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9549
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9552
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9579
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9634
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9675
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9676
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9729
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9731
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9932
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9980
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11621
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11627
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11631
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11638
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11651
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11684
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/trunk:8727


Modified: trunk/plugins/coclico/soapadmin/include/soapadminPlugin.class.php
===================================================================
--- trunk/plugins/coclico/soapadmin/include/soapadminPlugin.class.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/plugins/coclico/soapadmin/include/soapadminPlugin.class.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -36,7 +36,7 @@
 		$this->_addHook("project_admin_plugins"); // to show up in the admin page fro group
 	}
 
-	function CallHook ($hookname, $params) {
+	function CallHook ($hookname, &$params) {
 		global $use_soapadminplugin,$G_SESSION,$HTML;
 		if ($hookname == "usermenu") {
 			$text = $this->text; // this is what shows in the tab

Modified: trunk/plugins/old/webcalendar/common/webcalendarPlugin.class.php
===================================================================
--- trunk/plugins/old/webcalendar/common/webcalendarPlugin.class.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/plugins/old/webcalendar/common/webcalendarPlugin.class.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -57,7 +57,7 @@
 		$this->hooks[] = "list_roles_by_permission";
 	}
 
-	function CallHook ($hookname, $params) {
+	function CallHook ($hookname, &$params) {
 		global $use_webcalendarplugin,$G_SESSION,$HTML;
 		if ($hookname == "usermenu") {
 			$text = $this->text; // this is what shows in the tab

Modified: trunk/plugins/templates/helloworld/include/helloworldPlugin.class.php
===================================================================
--- trunk/plugins/templates/helloworld/include/helloworldPlugin.class.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/plugins/templates/helloworld/include/helloworldPlugin.class.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -36,7 +36,7 @@
 		$this->_addHook("project_admin_plugins"); // to show up in the admin page fro group
 	}
 
-	function CallHook ($hookname, $params) {
+	function CallHook ($hookname, &$params) {
 		global $use_helloworldplugin,$G_SESSION,$HTML;
 		if ($hookname == "usermenu") {
 			$text = $this->text; // this is what shows in the tab

Modified: trunk/plugins/templates/scmcpold/common/CpoldPlugin.class.php
===================================================================
--- trunk/plugins/templates/scmcpold/common/CpoldPlugin.class.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/plugins/templates/scmcpold/common/CpoldPlugin.class.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -42,7 +42,7 @@
 		$this->register () ;
 	}
 	
-	function CallHook ($hookname, $params) {
+	function CallHook ($hookname, &$params) {
 		global $HTML;
 		
 		switch ($hookname) {

Modified: trunk/src/common/forum/Forum.class.php
===================================================================
--- trunk/src/common/forum/Forum.class.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/common/forum/Forum.class.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -227,8 +227,6 @@
 		}
 		db_commit();
 
-		$this->Group->normalizeAllRoles () ;
-
 		return true;
 	}
 

Modified: trunk/src/common/include/Group.class.php
===================================================================
--- trunk/src/common/include/Group.class.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/common/include/Group.class.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -2438,6 +2438,8 @@
 			}
 		}
 
+		$this->normalizeAllRoles () ;
+
 		// Switch back to user preference
 		session_set_internal ($saved_session->getID()) ;
 		setup_gettext_from_context();
@@ -2611,7 +2613,7 @@
 			return false;
 		}
 		
-		$admins = RBACEngine::getInstance()->getUsersByAllowedAction ('project_approve', -1) ;
+		$admins = RBACEngine::getInstance()->getUsersByAllowedAction ('approve_projects', -1) ;
 
 		if (count($admins) < 1) {
 			$this->setError(_("There is no administrator to send the mail to."));

Modified: trunk/src/common/include/Plugin.class.php
===================================================================
--- trunk/src/common/include/Plugin.class.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/common/include/Plugin.class.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -104,7 +104,7 @@
 	 * @param hookname - the "handle" of the hook
 	 * @param params - array of parameters to pass the hook
 	 */
-	function CallHook ($hookname, $params) {
+	function CallHook ($hookname, &$params) {
 		return true ; 
 	}
 

Modified: trunk/src/common/include/PluginManager.class.php
===================================================================
--- trunk/src/common/include/PluginManager.class.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/common/include/PluginManager.class.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -170,6 +170,7 @@
 						}
 					}
 					unset($this->plugins_data[$p_id]);
+					return false ;
 				}
 			}
 		}

Modified: trunk/src/common/include/SCMPlugin.class.php
===================================================================
--- trunk/src/common/include/SCMPlugin.class.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/common/include/SCMPlugin.class.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -44,7 +44,7 @@
 		# scm_update_repolist
 	}
 
-	function CallHook ($hookname, $params) {
+	function CallHook ($hookname, &$params) {
 		global $HTML ;
 		
 		switch ($hookname) {

Modified: trunk/src/common/include/User.class.php
===================================================================
--- trunk/src/common/include/User.class.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/common/include/User.class.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -1153,7 +1153,7 @@
 				}
 			}
 		}
-		return group_get_objects(array_unique($ids)) ;
+		return group_get_objects(array_values(array_unique($ids))) ;
 	}
 
 	/**

Modified: trunk/src/common/include/config-vars.php
===================================================================
--- trunk/src/common/include/config-vars.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/common/include/config-vars.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -29,6 +29,9 @@
 forge_set_config_item_bool ('user_registration_restricted', 'core') ;
 forge_define_config_item ('project_registration_restricted', 'core', $GLOBALS['sys_project_reg_restricted']) ;
 forge_set_config_item_bool ('project_registration_restricted', 'core') ;
+forge_define_config_item ('project_auto_approval', 'core', false) ;
+forge_set_config_item_bool ('project_auto_approval', 'core') ;
+forge_define_config_item ('project_auto_approval_user', 'core', 'admin') ;
 forge_define_config_item ('web_host', 'core', $GLOBALS['sys_default_domain']) ;
 forge_define_config_item ('apache_user', 'core', $GLOBALS['sys_apache_user']) ;
 forge_define_config_item ('apache_group', 'core', $GLOBALS['sys_apache_group']) ;

Modified: trunk/src/common/pm/ProjectGroup.class.php
===================================================================
--- trunk/src/common/pm/ProjectGroup.class.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/common/pm/ProjectGroup.class.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -179,8 +179,6 @@
 
 		db_commit();
 
-		$this->Group->normalizeAllRoles () ;
-
 		return true;
 	}
 

Modified: trunk/src/common/tracker/Artifact.class.php
===================================================================
--- trunk/src/common/tracker/Artifact.class.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/common/tracker/Artifact.class.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -46,7 +46,6 @@
  * TOGETHER WITH THE SOFTWARE TO WHICH THE CONTRIBUTION RELATES OR ON A STAND
  * ALONE BASIS."
  */
-
 require_once $gfcommon.'include/Error.class.php';
 require_once $gfcommon.'tracker/ArtifactMessage.class.php';
 require_once $gfcommon.'tracker/ArtifactExtraField.class.php';
@@ -179,8 +178,7 @@
 			}
 		}
 	}
-
-
+	
 	/**
 	 *	create - construct a new Artifact in the database.
 	 *
@@ -189,12 +187,14 @@
 	 *	@param	int		The ID of the user to which this artifact is to be assigned.
 	 *	@param	int		The artifacts priority.
 	 *	@param	array	Array of extra fields like: array(15=>'foobar',22=>'1');
+	 *	@param	array	Array of data to change submitter and time of submit like: array('user' => 127, 'time' => 1234556789)	
 	 *  @return id on success / false on failure.
 	 */
-	function create( $summary, $details, $assigned_to=100, $priority=3, $extra_fields=array()) {
+	function create( $summary, $details, $assigned_to=100, $priority=3, $extra_fields=array(), $importData = array()) {
 		//
 		//	make sure this person has permission to add artifacts
 		//
+		
 		if (!$this->ArtifactType->isPublic()) {
 			//
 			//	Only admins can post/modify private artifacts
@@ -211,16 +211,22 @@
 		//
 		//	get the user_id
 		//
-		if (session_loggedin()) {
-			$user=user_getid();
+		
+		if(array_key_exists('user', $importData)){
+				$user = $importData['user'];
 		} else {
-			if ($this->ArtifactType->allowsAnon()) {
-				$user=100;
+			if (session_loggedin()) {
+				$user=user_getid();
 			} else {
-				$this->setError(_('Artifact: This ArtifactType Does Not Allow Anonymous Submissions. Please Login.'));
-				return false;
+				if ($this->ArtifactType->allowsAnon()) {
+					$user=100;
+				} else {
+					$this->setError(_('Artifact: This ArtifactType Does Not Allow Anonymous Submissions. Please Login.'));
+					return false;
+				}
 			}
-		}
+		}	
+			
 
 		//
 		//	data validation
@@ -254,7 +260,11 @@
 		}
 
 		db_begin();
-
+		if (array_key_exists('time',$importData)){
+			$time = $importData['time'];
+		} else {
+			$time = time();
+		}
 		$res = db_query_params ('INSERT INTO artifact 
 			(group_artifact_id,status_id,priority,
 			submitted_by,assigned_to,open_date,summary,details) 
@@ -264,7 +274,7 @@
 					       $priority,
 					       $user,
 					       $assigned_to,
-					       time(),
+					       $time,
 					       htmlspecialchars($summary),
 					       htmlspecialchars($details))) ;
 		if (!$res) {
@@ -773,24 +783,71 @@
 	 *
 	 *  @param	string	The name of the field in the database being modified.
 	 *  @param	string	The former value of this field.
+	 *  @param      array   Array of data to change submitter and time of submit like: array('user' => 127, 'time' => 1234556789)
 	 *  @access private
 	 *  @return	boolean	success.
 	 */
-	function addHistory($field_name,$old_value) {
-		if (!session_loggedin()) {
-			$user=100;
+	function addHistory($field_name,$old_value, $importData = array()) {
+		if (array_key_exists('user', $importData)){
+			$user = $importData['user'];
 		} else {
-			$user=user_getid();
+			if (!session_loggedin()) {
+				$user=100;
+			} else {
+				$user=user_getid();
+			}
 		}
+		if (array_key_exists('time',$importData)){
+			$time = $importData['time'];
+		} else {
+			$time = time();
+		}
 		return db_query_params ('INSERT INTO artifact_history(artifact_id,field_name,old_value,mod_by,entrydate) VALUES ($1,$2,$3,$4,$5)',
 					array ($this->getID(),
 					       $field_name,
 					       addslashes($old_value),
 					       $user,
-					       time())) ;
+					       $time)) ;
 	}
 
 	/**
+	 *      setStatus - set the status of this artifact.
+	 *
+	 *      @param  int             The artifact status ID.
+	 *      @param  int             Closing date if status = 1
+	 *
+	 *      @return boolean success.
+	 */
+	function setStatus($status_id, $closingTime=False) {
+		db_begin();
+		$qpa = db_construct_qpa (false, 'UPDATE artifact SET status_id=$1', array ($status_id)) ;
+		if ($closingTime && $status_id != 1) {
+			$time=$closingTime;
+			$qpa = db_construct_qpa ($qpa, ', close_date=$1 ', array ($time)) ;
+		}
+		$qpa = db_construct_qpa ($qpa,
+					 'WHERE artifact_id=$1 AND group_artifact_id=$2',
+					 array ($this->getID(), $artifact_type_id)) ;
+		$result=db_query_qpa($qpa);
+
+		if (!$result || db_affected_rows($result) < 1) {
+			$this->setError('Error - update failed!'.db_error());
+			db_rollback();
+			return false;
+		} else {
+			if (!$this->fetchData($this->getID())) {
+				db_rollback();
+				return false;
+			}
+		}
+               
+               
+		//commiting changes
+		db_commit();
+		return true;
+	}
+
+	/**
 	 *	update - update the fields in this artifact.
 	 *
 	 *	@param	int		The artifact priority.

Modified: trunk/src/common/tracker/ArtifactFile.class.php
===================================================================
--- trunk/src/common/tracker/ArtifactFile.class.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/common/tracker/ArtifactFile.class.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -113,9 +113,10 @@
 	 *	@param	string	Item filesize.
 	 *	@param	binary	Binary item data.
 	 *	@param	string	Item description.
-	 *  @return id on success / false on failure.
+	 *	@param	array	Array of data to change submitter and time of submit like: array('user' => 127, 'time' => 1234556789)
+	 *  	@return id on success / false on failure.
 	 */
-	function create($filename, $filetype, $filesize, $bin_data, $description='None') {
+	function create($filename, $filetype, $filesize, $bin_data, $description='None', $importData = array()) {
 		// Some browsers don't supply mime type if they don't know it
 		if (!$filetype) {
 			// Let's be on safe side?
@@ -131,12 +132,23 @@
 			return false;
 		}
 
-		if (session_loggedin()) {
-			$userid=user_getid();
+		if (array_key_exists('user', $importData)){
+			$userid = $importData['user'];
 		} else {
-			$userid=100;
+			if (session_loggedin()) {
+				$userid=user_getid();
+			} else {
+				$userid=100;
+			}
 		}
 
+		if (array_key_exists('time',$importData)){
+			$time = $importData['time'];
+		} else {
+			$time = time();
+		}
+		
+
 		// If $filetype is "text/plain", $bin_data convert UTF-8 encoding.
 		if (strcasecmp($filetype,"text/plain") === 0 &&
 		    function_exists('mb_convert_encoding') &&
@@ -156,7 +168,7 @@
 					       $filename,
 					       $filesize,
 					       $filetype,
-					       time(),
+					       $time,
 					       $userid)) ; 
 
 		$id=db_insertid($res,'artifact_file','id');
@@ -166,20 +178,11 @@
 			$this->setError('ArtifactFile: '.db_error());
 			return false;
 		} else {
-/*
-//
-//	skip this unless we need it later - save a db query
-//
-			//
-			//	Now set up our internal data structures
-			//
-			if (!$this->fetchData($id)) {
-				db_rollback();
-				return false;
+			db_commit();
+			// If time is set, no need to add to history, will be done in batch
+			if (!array_key_exists('time', $importData)){
+				$this->Artifact->addHistory('File Added',$id.': '.$filename);
 			}
-*/
-			db_commit();
-			$this->Artifact->addHistory('File Added',$id.': '.$filename);
 			$this->Artifact->UpdateLastModifiedDate();
 			$this->clearError();
 			return $id;

Modified: trunk/src/common/tracker/ArtifactType.class.php
===================================================================
--- trunk/src/common/tracker/ArtifactType.class.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/common/tracker/ArtifactType.class.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -262,7 +262,6 @@
 				return false;
 			} else {
 				db_commit();
-				$this->Group->normalizeAllRoles () ;
 				return $id;
 		}
 	}

Modified: trunk/src/plugins/aselectextauth/include/ASelectAuthPlugin.class.php
===================================================================
--- trunk/src/plugins/aselectextauth/include/ASelectAuthPlugin.class.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/plugins/aselectextauth/include/ASelectAuthPlugin.class.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -29,7 +29,7 @@
 		$this->hooks[] = "session_set_entry";	
 	}
 	
-	function CallHook ($hookname, $params) {
+	function CallHook ($hookname, &$params) {
 		global $HTML ;
 		
 		switch ($hookname) {

Modified: trunk/src/plugins/blocks/common/blocksPlugin.class.php
===================================================================
--- trunk/src/plugins/blocks/common/blocksPlugin.class.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/plugins/blocks/common/blocksPlugin.class.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -57,7 +57,7 @@
 		$this->hooks[] = "blocks"; // to show up in the admin page fro group
 	}
 
-	function CallHook ($hookname, $params) {
+	function CallHook ($hookname, &$params) {
 		if ($hookname == "project_admin_plugins") {
 			// this displays the link in the project admin options page to it's  blocks administration
 			$group_id = $params['group_id'];

Modified: trunk/src/plugins/contribtracker/common/ContribTrackerPlugin.class.php
===================================================================
--- trunk/src/plugins/contribtracker/common/ContribTrackerPlugin.class.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/plugins/contribtracker/common/ContribTrackerPlugin.class.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -35,7 +35,7 @@
                 $this->hooks[] = "site_admin_option_hook"; // to show in the site admin page
 	}
 
-	function CallHook ($hookname, $params) {
+	function CallHook ($hookname, &$params) {
 		if ($hookname == "groupmenu") {
 			$group_id=$params['group'];
 			$project = &group_get_object($group_id);

Modified: trunk/src/plugins/cvssyncmail/common/CVSSyncMailPlugin.class.php
===================================================================
--- trunk/src/plugins/cvssyncmail/common/CVSSyncMailPlugin.class.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/plugins/cvssyncmail/common/CVSSyncMailPlugin.class.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -31,7 +31,7 @@
 		$this->hooks[] = "groupisactivecheckboxpost" ; //
 	}
 
-	function CallHook ($hookname, $params) {
+	function CallHook ($hookname, &$params) {
 		global $use_cvssyncmailplugin,$G_SESSION,$HTML;
 		$group_id=$params['group'];
 		if ($hookname == "groupisactivecheckbox") {

Modified: trunk/src/plugins/cvstracker/common/cvstrackerPlugin.class.php
===================================================================
--- trunk/src/plugins/cvstracker/common/cvstrackerPlugin.class.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/plugins/cvstracker/common/cvstrackerPlugin.class.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -258,7 +258,7 @@
 	* @param    String  $params    The params of the Hook
 	*
 	*/
-	function CallHook ($hookname, $params) {
+	function CallHook ($hookname, &$params) {
 		global $group_id, $G_SESSION, $HTML, $use_cvstrackerplugin,$aid ;
 		$use_cvstrackerplugin = getIntFromRequest('use_cvstrackerplugin');
 		if ($hookname == "groupisactivecheckbox") {

Modified: trunk/src/plugins/extratabs/common/ExtraTabsPlugin.class.php
===================================================================
--- trunk/src/plugins/extratabs/common/ExtraTabsPlugin.class.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/plugins/extratabs/common/ExtraTabsPlugin.class.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -36,7 +36,7 @@
 		$this->hooks[] = "groupmenu" ;  // To put into the project tabs
 	}
 
-	function CallHook ($hookname, $params) {
+	function CallHook ($hookname, &$params) {
 		global $HTML;
 		
 		if ($hookname == "project_admin_plugins") {

Modified: trunk/src/plugins/fckeditor/common/fckeditorPlugin.class.php
===================================================================
--- trunk/src/plugins/fckeditor/common/fckeditorPlugin.class.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/plugins/fckeditor/common/fckeditorPlugin.class.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -45,7 +45,7 @@
 	* @param    String  $params    The params of the Hook
 	*
 	*/
-	function CallHook ($hookname, $params) {
+	function CallHook ($hookname, &$params) {
 		global $group_id;
 
 		if (file_exists ("/usr/share/fckeditor/fckeditor.php")) {

Modified: trunk/src/plugins/forumml/include/forummlPlugin.class.php
===================================================================
--- trunk/src/plugins/forumml/include/forummlPlugin.class.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/plugins/forumml/include/forummlPlugin.class.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -48,7 +48,7 @@
 		$this->allowedForProject = array();
 	}
 
-	function CallHook ($hookname, $params) {
+	function CallHook ($hookname, &$params) {
 		global $use_mailmanplugin,$G_SESSION,$HTML,$gfcommon,$gfwww,$gfplugins;
 		if ($hookname == "usermenu") {
 			$text = $this->text; // this is what shows in the tab

Modified: trunk/src/plugins/globalsearch/common/GlobalsearchPlugin.class.php
===================================================================
--- trunk/src/plugins/globalsearch/common/GlobalsearchPlugin.class.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/plugins/globalsearch/common/GlobalsearchPlugin.class.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -31,7 +31,7 @@
 		$this->hooks[] = "features_boxes_top" ;
 	}
 
-	function CallHook ($hookname, $params) {
+	function CallHook ($hookname, &$params) {
 		global $Language, $G_SESSION, $HTML, $group_id;
 
 		if ($hookname == "site_admin_option_hook") {

Modified: trunk/src/plugins/hudson/include/hudsonPlugin.class.php
===================================================================
--- trunk/src/plugins/hudson/include/hudsonPlugin.class.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/plugins/hudson/include/hudsonPlugin.class.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -38,7 +38,7 @@
 		$this->_addHook('get_available_reference_natures', 'getAvailableReferenceNatures', false);
 		$this->_addHook('ajax_reference_tooltip', 'ajax_reference_tooltip', false);
 	}
-	function CallHook ($hookname, $params) {
+	function CallHook ($hookname, &$params) {
 		global $use_hudsonplugin,$G_SESSION,$HTML,$gfcommon,$gfwww,$gfplugins;
 		if ($hookname == "usermenu") {
 			$text = $this->text; // this is what shows in the tab

Modified: trunk/src/plugins/ldapextauth/include/LdapExtAuthPlugin.class.php
===================================================================
--- trunk/src/plugins/ldapextauth/include/LdapExtAuthPlugin.class.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/plugins/ldapextauth/include/LdapExtAuthPlugin.class.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -70,7 +70,7 @@
 		}
 	}
 	
-	function CallHook ($hookname, $params) {
+	function CallHook ($hookname, &$params) {
 		global $HTML ;
 		
 		$loginname = $params['loginname'] ;

Modified: trunk/src/plugins/mailman/include/mailmanPlugin.class.php
===================================================================
--- trunk/src/plugins/mailman/include/mailmanPlugin.class.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/plugins/mailman/include/mailmanPlugin.class.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -70,7 +70,7 @@
 		return $this->pluginInfo;
 	}
 	
-	function CallHook ($hookname, $params) {
+	function CallHook ($hookname, &$params) {
 		global $use_mailmanplugin,$G_SESSION,$HTML,$gfcommon,$gfwww,$gfplugins;
 		if ($hookname == "usermenu") {
 			$text = $this->text; // this is what shows in the tab

Modified: trunk/src/plugins/mantis/include/MantisPlugin.class.php
===================================================================
--- trunk/src/plugins/mantis/include/MantisPlugin.class.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/plugins/mantis/include/MantisPlugin.class.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -42,7 +42,7 @@
 		$this->hooks[] = "project_admin_plugins"; // to show up in the admin page fro group
 	}
 
-	function CallHook ($hookname, $params) {
+	function CallHook ($hookname, &$params) {
 		global $use_mantisplugin,$G_SESSION,$HTML;
 		if ($hookname == "usermenu") {
 			$text = $this->text; // this is what shows in the tab

Modified: trunk/src/plugins/mantisbt/common/MantisBTPlugin.class.php
===================================================================
--- trunk/src/plugins/mantisbt/common/MantisBTPlugin.class.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/plugins/mantisbt/common/MantisBTPlugin.class.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -53,7 +53,7 @@
 		$this->hooks[] = "group_update";
 	}
 
-	function CallHook ($hookname, $params) {
+	function CallHook ($hookname, &$params) {
 		global $G_SESSION, $HTML;
 		switch ($hookname) {
 			case "usermenu": {

Modified: trunk/src/plugins/mediawiki/common/MediaWikiPlugin.class.php
===================================================================
--- trunk/src/plugins/mediawiki/common/MediaWikiPlugin.class.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/plugins/mediawiki/common/MediaWikiPlugin.class.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -51,7 +51,7 @@
 		$this->hooks[] = "project_admin_plugins"; // to show up in the admin page for group
 	}
 
-	function CallHook ($hookname, $params) {
+	function CallHook ($hookname, &$params) {
 		if (isset($params['group_id'])) {
 			$group_id=$params['group_id'];
 		} elseif (isset($params['group'])) {

Modified: trunk/src/plugins/online_help/common/online_helpPlugin.class.php
===================================================================
--- trunk/src/plugins/online_help/common/online_helpPlugin.class.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/plugins/online_help/common/online_helpPlugin.class.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -37,7 +37,7 @@
 		$this->hooks[] = "headermenu"; // to show up in the admin page fro group
 	}
 
-	function CallHook ($hookname, $params) {
+	function CallHook ($hookname, &$params) {
 		global $G_SESSION,$HTML;
 		if ($hookname == "headermenu") {
 			$guide = util_make_url('/plugins/online_help/');

Modified: trunk/src/plugins/oslc/include/oslcPlugin.class.php
===================================================================
--- trunk/src/plugins/oslc/include/oslcPlugin.class.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/plugins/oslc/include/oslcPlugin.class.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -36,7 +36,7 @@
 		$this->_addHook("project_admin_plugins"); // to show up in the admin page fro group
 	}
 
-	function CallHook ($hookname, $params) {
+	function CallHook ($hookname, &$params) {
 		global $use_oslcplugin,$G_SESSION,$HTML;
 		if ($hookname == "usermenu") {
 			$text = $this->text; // this is what shows in the tab

Modified: trunk/src/plugins/projectlabels/common/ProjectLabelsPlugin.class.php
===================================================================
--- trunk/src/plugins/projectlabels/common/ProjectLabelsPlugin.class.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/plugins/projectlabels/common/ProjectLabelsPlugin.class.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -9,7 +9,7 @@
 		$this->hooks[] = "site_admin_option_hook" ;
 	}
 
-	function CallHook ($hookname, $params) {
+	function CallHook ($hookname, &$params) {
 		global $HTML;
 		
 		if ($hookname == "site_admin_option_hook") {

Modified: trunk/src/plugins/projects_hierarchy/common/projects_hierarchyPlugin.class.php
===================================================================
--- trunk/src/plugins/projects_hierarchy/common/projects_hierarchyPlugin.class.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/plugins/projects_hierarchy/common/projects_hierarchyPlugin.class.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -40,7 +40,7 @@
 		$this->hooks[] = "delete_link"; // to delete link
 	}
 
-	function CallHook ($hookname, $params) {
+	function CallHook ($hookname, &$params) {
 		global $use_projects_hierarchyplugin,$G_SESSION,$HTML;
 		if ($hookname == "usermenu") {
 			$text = $this->text; // this is what shows in the tab

Modified: trunk/src/plugins/quota_management/common/quota_managementPlugin.class.php
===================================================================
--- trunk/src/plugins/quota_management/common/quota_managementPlugin.class.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/plugins/quota_management/common/quota_managementPlugin.class.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -39,7 +39,7 @@
 		$this->hooks[] = "quota_link_project_admin"; // to show in admin project
 	}
 
-	function CallHook ($hookname, $params) {
+	function CallHook ($hookname, &$params) {
 		global $use_quota_managementplugin,$G_SESSION,$HTML;
 		if ($hookname == "usermenu") {
 			$text = $this->text; // this is what shows in the tab

Modified: trunk/src/plugins/scmccase/common/CCasePlugin.class.php
===================================================================
--- trunk/src/plugins/scmccase/common/CCasePlugin.class.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/plugins/scmccase/common/CCasePlugin.class.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -42,7 +42,7 @@
 		$this->register () ;
 	}
 
-	function CallHook ($hookname, $params) {
+	function CallHook ($hookname, &$params) {
 		global $HTML ;
 		
 		switch ($hookname) {

Modified: trunk/src/plugins/svncommitemail/common/SVNCommitEmailPlugin.class.php
===================================================================
--- trunk/src/plugins/svncommitemail/common/SVNCommitEmailPlugin.class.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/plugins/svncommitemail/common/SVNCommitEmailPlugin.class.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -31,7 +31,7 @@
 		$this->hooks[] = "groupisactivecheckboxpost" ; //
 	}
 
-	function CallHook ($hookname, $params) {
+	function CallHook ($hookname, &$params) {
 		global $use_svncommitemailplugin,$G_SESSION,$HTML;
 		$group_id=$params['group'];
 		if ($hookname == "groupisactivecheckbox") {

Modified: trunk/src/plugins/svntracker/common/svntrackerPlugin.class.php
===================================================================
--- trunk/src/plugins/svntracker/common/svntrackerPlugin.class.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/plugins/svntracker/common/svntrackerPlugin.class.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -226,7 +226,7 @@
 	* @param    String  $params    The params of the Hook
 	*
 	*/
-	function CallHook ($hookname, $params) {
+	function CallHook ($hookname, &$params) {
 		global $group_id, $G_SESSION, $HTML, $use_svntrackerplugin,$aid ;
 		if ($hookname == "groupisactivecheckbox") {
 			//Check if the group is active

Modified: trunk/src/utils/fixscripts/normalize_roles.php
===================================================================
--- trunk/src/utils/fixscripts/normalize_roles.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/utils/fixscripts/normalize_roles.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -32,19 +32,16 @@
 setup_plugin_manager () ;
 session_set_admin () ;
 
-$res = db_query_params ('SELECT group_id, group_name FROM groups',
+$res = db_query_params ('SELECT role_id FROM pfo_role ORDER BY role_id',
 			array ());
 
 $rows=db_numrows($res);
 
 for ($i=0; $i<$rows; $i++) {
-	echo "Normalizing roles for group ".db_result($res,$i,'group_name')."\n" ;
-
-	$group = group_get_object(db_result($res,$i,'group_id')) ;
-
-	if ($group && !$group->isError()) {
-		$group->normalizeAllRoles () ;
-	}
+	$role = RBACEngine::getInstance()->getRoleById (db_result($res,$i,'role_id')) ;
+	echo "Normalizing role ".$role->getDisplayableName()."\n" ;
+	
+	$role->normalizeData() ;
 }
 
 ?>

Modified: trunk/src/www/forum/admin/index.php
===================================================================
--- trunk/src/www/forum/admin/index.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/www/forum/admin/index.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -76,6 +76,7 @@
 		if (check_email_available($g, $g->getUnixName() . '-' . getStringFromRequest('forum_name'), $error_msg)) {
 			$fa = new ForumAdmin($group_id);
 			$feedback .= $fa->ExecuteAction("add_forum");
+			$g->normalizeAllRoles () ;
 		}
 	} else if (getStringFromRequest('change_status')) {
 		$fa = new ForumAdmin($group_id);

Modified: trunk/src/www/pm/admin/index.php
===================================================================
--- trunk/src/www/pm/admin/index.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/www/pm/admin/index.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -79,6 +79,7 @@
 		} else {
 			$feedback .= _('Subproject Inserted');
 			$warning_msg .= _("Please configure also the roles (by default, it's 'No Access')");
+			$g->normalizeAllRoles () ;
 		}
 
 	} else if ($add_cat) {

Modified: trunk/src/www/register/index.php
===================================================================
--- trunk/src/www/register/index.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/www/register/index.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -79,10 +79,12 @@
 			}
 		}
 
-		if ( !$purpose && ($sys_project_reg_autoapprove == true) ) {
+		if ( !$purpose && forge_get_config ('project_auto_approval') ) {
 			$purpose = 'No purpose given, autoapprove was on';
 		}
 
+		$send_mail = ! forge_get_config ('project_auto_approval') ;
+
 		$group = new Group();
 		$u =& session_get_user();
 		$res = $group->create(
@@ -93,7 +95,8 @@
 			$purpose,
 			'shell1',
 			$scm_host,
-			$is_public
+			$is_public,
+			$send_mail
 		);
 		if ($res && forge_get_config('use_scm') && $plugin) {
 			$group->setUsesSCM (true) ;
@@ -108,14 +111,14 @@
 		} else {
 			$HTML->header(array('title'=>_('Registration complete')));
 
-			if ( $sys_project_reg_autoapprove != true ) {
+			if ( ! forge_get_config ('project_auto_approval') ) {
 				printf(_('<p>Your project has been submitted to the %1$s administrators. Within 72 hours, you will receive notification of their decision and further instructions.<p/>Thank you for choosing %1$s</p>'), forge_get_config ('forge_name'));
 			} else if ($group->isError()) {
 				printf(_('<div class="error">ERROR: %1$s</div>'), $group->getErrorMessage() );
 			} else {
 				printf(_('Approving Project: %1$s'), $group->getUnixName()).'<br />';
 
-				if (!$group->approve( user_get_object_by_name ( $sys_project_reg_autoapprove_user ) ) ) {
+				if (!$group->approve( user_get_object_by_name ( forge_get_config ('project_auto_approval_user') ) ) ) {
 					printf(_('<div class="error">Approval ERROR: %1$s</div>'), $group->getErrorMessage() );
 				} else {
 					printf(_('<p>Your project has been automatically approved.  You should receive an email containing further information shortly.<p/>Thank you for choosing %1$s</p>'), forge_get_config ('forge_name'));
@@ -156,7 +159,7 @@
 
 <?php
 // Don't display Project purpose if auto approval is on, because it won't be used.
-if ( $sys_project_reg_autoapprove != true ) {
+if ( !forge_get_config ('project_auto_approval') ) {
 	$index++;
 	echo '<h3>'.$index.'. '._('Project Purpose And Summarization').'</h3>';
 	echo '<p>';

Modified: trunk/src/www/tracker/admin/ind.php
===================================================================
--- trunk/src/www/tracker/admin/ind.php	2010-12-03 08:48:44 UTC (rev 11692)
+++ trunk/src/www/tracker/admin/ind.php	2010-12-03 11:58:57 UTC (rev 11693)
@@ -50,7 +50,7 @@
             $feedback .= '<br/>';
 			$feedback .= _('Please configure also the roles (by default, it\'s \'No Access\')');
 		}
-
+		$group->normalizeAllRoles () ;
 	}
 }
 




More information about the Fusionforge-commits mailing list