[Evolvis-commits] r420: Solved conflicts arising from 2.6 import/merge. ↵

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Feb 25 14:22:25 CET 2010


Author: mirabilos
Date: 2010-02-25 13:22:24 +0000 (Thu, 25 Feb 2010)
New Revision: 420

Removed:
   trunk/gforge_base/evolvisforge/gforge/www/ChangeLog
   trunk/gforge_base/evolvisforge/gforge/www/admin/groupedit-add.php
   trunk/gforge_base/evolvisforge/gforge/www/admin/grouplist.php
   trunk/gforge_base/evolvisforge/gforge/www/admin/lastlogins.php
   trunk/gforge_base/evolvisforge/gforge/www/admin/newgroup.php
   trunk/gforge_base/evolvisforge/gforge/www/admin/newprojectmail.php
   trunk/gforge_base/evolvisforge/gforge/www/admin/user_changepw.php
   trunk/gforge_base/evolvisforge/gforge/www/admin/userlist.php
   trunk/gforge_base/evolvisforge/gforge/www/download.php
   trunk/gforge_base/evolvisforge/gforge/www/export/bug_dump.php
   trunk/gforge_base/evolvisforge/gforge/www/export/patch_dump.php
   trunk/gforge_base/evolvisforge/gforge/www/pm/pm_data.php
   trunk/gforge_base/evolvisforge/gforge/www/stats/oldindex.php
Modified:
   trunk/gforge_base/evolvisforge/
   trunk/gforge_base/evolvisforge/gforge/www/admin/approve-pending.php
   trunk/gforge_base/evolvisforge/gforge/www/admin/index.php
   trunk/gforge_base/evolvisforge/gforge/www/admin/search.php
   trunk/gforge_base/evolvisforge/gforge/www/softwaremap/trove_list.php
   trunk/gforge_base/evolvisforge/gforge/www/stats/graphs.php
   trunk/gforge_base/evolvisforge/gforge/www/stats/views_graph.png
Log:
Solved conflicts arising from 2.6 import/merge.



Property changes on: trunk/gforge_base/evolvisforge
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2001-11-02 15:21:19.000000000 +0000
committer: lo-lan-do

   + timestamp: 2001-11-02 15:37:26.000000000 +0000
committer: lo-lan-do

Name: bzr:file-ids
   - gforge/www/include/Layout.class	2 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fwww%2Finclude%2FLayout.class
gforge/www/include/Theme.class	2 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fwww%2Finclude%2FTheme.class
gforge/www/include/cache.php	2 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fwww%2Finclude%2Fcache.php
gforge/www/include/features_boxes.php	2 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fwww%2Finclude%2Ffeatures_boxes.php
gforge/www/include/frs.class	2 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fwww%2Finclude%2Ffrs.class
gforge/www/include/html.php	2 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fwww%2Finclude%2Fhtml.php
gforge/www/include/menu.php	2 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fwww%2Finclude%2Fmenu.php
gforge/www/include/osdn.php	2 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fwww%2Finclude%2Fosdn.php
gforge/www/include/pre.php	2 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fwww%2Finclude%2Fpre.php
gforge/www/include/project_home.php	2 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fwww%2Finclude%2Fproject_home.php
gforge/www/include/squal_pre.php	2 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fwww%2Finclude%2Fsqual_pre.php
gforge/www/include/theme.php	2 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fwww%2Finclude%2Ftheme.php
gforge/www/include/user_home.php	2 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fwww%2Finclude%2Fuser_home.php
gforge/www/include/vote_function.php	2 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fwww%2Finclude%2Fvote_function.php

   + gforge/www/admin/approve-pending.php	2 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fwww%2Fadmin%2Fapprove-pending.php
gforge/www/admin/index.php	2 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fwww%2Fadmin%2Findex.php
gforge/www/admin/search.php	2 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fwww%2Fadmin%2Fsearch.php
gforge/www/softwaremap/trove_list.php	2 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fwww%2Fsoftwaremap%2Ftrove_list.php
gforge/www/stats/graphs.php	2 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fwww%2Fstats%2Fgraphs.php
gforge/www/stats/views_graph.png	2 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fwww%2Fstats%2Fviews_graph.png

Name: bzr:revision-id:v4
   - 1 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:1
2 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:2
3 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:7
4 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:9
5 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:10
6 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:11
7 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:12
8 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:13
9 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:14
10 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:15
11 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:16
12 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:17
13 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:18
14 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:19
15 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:20
16 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:21
17 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:22
18 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:23
19 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:24
20 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:25
21 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:26
22 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:27
23 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:28
24 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:29
25 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:30
26 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:31
27 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:32
28 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:33
29 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:34
30 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:35
31 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:36
32 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:37
33 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:38
34 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:39
35 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:40
36 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:41
37 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:42
38 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:43
39 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:44
40 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:45
41 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:46
42 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:47
43 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:48
44 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:49
45 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:50
46 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:51
47 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:52
48 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:53
49 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:54
50 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:55
51 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:56
52 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:57
53 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:58
54 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:59
55 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:60
56 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:61
57 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:62
58 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:63
59 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:64
60 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:65
61 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:66
62 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:67
63 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:68
64 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:69
65 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:70
66 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:71
67 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:72
68 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:73
69 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:74
70 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:75
71 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:76
72 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:77
73 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:78
74 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:79
75 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:80
76 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:81
77 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:82
78 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:83
79 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:84
80 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:85
81 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:86
82 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:87
83 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:88
84 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:89
85 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:90
86 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:91
87 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:92
88 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:93
89 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:94
90 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:95
91 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:96
92 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:97
93 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:98
94 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:99
95 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:100
96 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:101
97 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:102
98 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:103
99 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:104
100 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:105
101 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:106
102 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:107
103 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:108
104 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:109
105 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:110
106 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:111
107 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:112
108 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:113
109 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:114
110 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:115
111 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:116
112 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:117
113 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:118
114 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:119
115 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:120
116 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:121
117 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:122
118 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:123
119 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:124
120 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:125
121 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:126
122 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:127
123 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:128
124 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:129
125 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:130
126 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:131
127 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:132
128 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:133
129 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:134
130 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:135
131 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:136
132 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:137
133 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:138
134 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:139
135 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:140
136 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:141
137 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:142
138 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:143
139 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:144
140 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:145
141 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:146
142 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:147
143 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:148
144 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:149
145 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:150
146 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:151
147 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:152
148 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:153
149 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:154
150 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:155
151 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:156
152 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:157
153 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:158
154 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:159
155 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:160
156 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:161
157 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:162
158 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:163
159 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:164
160 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:165
161 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:166
162 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:167
163 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:168
164 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:169
165 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:170
166 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:172
167 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:173
168 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:174
169 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:175
170 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:176
171 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:180
172 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:184
173 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:186
174 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:187
175 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:188
176 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:189
177 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:190
178 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:191
179 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:192
180 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:193
181 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:194
182 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:195
183 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:196
184 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:197
185 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:198

   + 1 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:1
2 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:2
3 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:7
4 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:9
5 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:10
6 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:11
7 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:12
8 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:13
9 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:14
10 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:15
11 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:16
12 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:17
13 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:18
14 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:19
15 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:20
16 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:21
17 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:22
18 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:23
19 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:24
20 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:25
21 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:26
22 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:27
23 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:28
24 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:29
25 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:30
26 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:31
27 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:32
28 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:33
29 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:34
30 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:35
31 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:36
32 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:37
33 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:38
34 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:39
35 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:40
36 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:41
37 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:42
38 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:43
39 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:44
40 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:45
41 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:46
42 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:47
43 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:48
44 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:49
45 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:50
46 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:51
47 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:52
48 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:53
49 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:54
50 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:55
51 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:56
52 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:57
53 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:58
54 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:59
55 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:60
56 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:61
57 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:62
58 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:63
59 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:64
60 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:65
61 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:66
62 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:67
63 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:68
64 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:69
65 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:70
66 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:71
67 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:72
68 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:73
69 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:74
70 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:75
71 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:76
72 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:77
73 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:78
74 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:79
75 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:80
76 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:81
77 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:82
78 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:83
79 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:84
80 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:85
81 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:86
82 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:87
83 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:88
84 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:89
85 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:90
86 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:91
87 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:92
88 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:93
89 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:94
90 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:95
91 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:96
92 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:97
93 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:98
94 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:99
95 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:100
96 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:101
97 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:102
98 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:103
99 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:104
100 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:105
101 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:106
102 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:107
103 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:108
104 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:109
105 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:110
106 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:111
107 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:112
108 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:113
109 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:114
110 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:115
111 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:116
112 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:117
113 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:118
114 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:119
115 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:120
116 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:121
117 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:122
118 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:123
119 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:124
120 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:125
121 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:126
122 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:127
123 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:128
124 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:129
125 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:130
126 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:131
127 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:132
128 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:133
129 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:134
130 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:135
131 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:136
132 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:137
133 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:138
134 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:139
135 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:140
136 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:141
137 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:142
138 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:143
139 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:144
140 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:145
141 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:146
142 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:147
143 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:148
144 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:149
145 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:150
146 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:151
147 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:152
148 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:153
149 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:154
150 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:155
151 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:156
152 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:157
153 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:158
154 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:159
155 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:160
156 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:161
157 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:162
158 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:163
159 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:164
160 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:165
161 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:166
162 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:167
163 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:168
164 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:169
165 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:170
166 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:172
167 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:173
168 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:174
169 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:175
170 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:176
171 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:180
172 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:184
173 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:186
174 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:187
175 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:188
176 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:189
177 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:190
178 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:191
179 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:192
180 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:193
181 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:194
182 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:195
183 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:196
184 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:197
185 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:198
186 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:199

Name: bzr:text-parents
   - gforge/www/include/Layout.class	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:7
gforge/www/include/Theme.class	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:7
gforge/www/include/cache.php	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:145
gforge/www/include/features_boxes.php	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:7
gforge/www/include/frs.class	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:132
gforge/www/include/html.php	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:7
gforge/www/include/menu.php	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:7
gforge/www/include/osdn.php	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:128
gforge/www/include/pre.php	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:7
gforge/www/include/project_home.php	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:7
gforge/www/include/squal_pre.php	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:7
gforge/www/include/theme.php	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:147
gforge/www/include/user_home.php	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:7
gforge/www/include/vote_function.php	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:7

   + gforge/www/admin/approve-pending.php	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:7
gforge/www/admin/index.php	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:7
gforge/www/admin/search.php	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:141
gforge/www/softwaremap/trove_list.php	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:9
gforge/www/stats/graphs.php	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:7
gforge/www/stats/views_graph.png	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:7


Deleted: trunk/gforge_base/evolvisforge/gforge/www/ChangeLog
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/ChangeLog	2010-02-25 13:22:22 UTC (rev 419)
+++ trunk/gforge_base/evolvisforge/gforge/www/ChangeLog	2010-02-25 13:22:24 UTC (rev 420)
@@ -1,132 +0,0 @@
-2000-12-06  Paul Sokolovsky  <pfalcon at sourceforge.net>
-
-	* bugs/bug_data.php,index.php: Fix bug when any bug update
-        by bug admin resulted in two mail notifications: once for
-        properties change and once for comment.
-
-        * search/index.php: Added parameter aliases and defaults.
-        Finished RSS exports.
-
-2000-12-05  Paul Sokolovsky  <pfalcon at sourceforge.net>
-
-	* account/index.php: Add "remember me" checkbox.
-        * account/updateprefs.php: Depending on its value, either
-        set 'sf_user_hash' cookie or clear it.
-        * my/index.php: if sf_user_hash cookie set with correct hash,
-        allow user to view the page.
-
-        * include/User.class: Added getMD5Passwd() method.
-
-2000-11-27  Paul Sokolovsky  <pfalcon at sourceforge.net>
-
-	* include/Group.php, project/admin/userperms.php: Member role
-        selection based on help wanted categories.
-
-2000-11-22  Paul Sokolovsky  <pfalcon at sourceforge.net>
-
-	* project/admin/editpackages.php,editreleases.php,index.php,
-        newrelease.php, project_admin_utils.php: Functionality of the
-        file release privilege: 1. Allow any project member to access
-        admin page, but allow only admin to perfom tasks; 2. Allow
-        user with file release privilege access Add/Edit Release page,
-	but allow only to modify releases, not packages.
-
-        * include/html.php: fix obscure bug when static error message
-        was shoen instead of real one.
-
-2000-11-21  Paul Sokolovsky  <pfalcon at sourceforge.net>
-	
-	* include/Group.php, project/admin/userperms.php: File release
-        privilege storing and UI.
-
-2000-11-13  Paul Sokolovsky  <pfalcon at sourceforge.net>
-
-	* include/HTML_Graphs.php: horizontal_multisection_graph(): render
-        horizontal graph consisting of multiple colored sections.
-        graph_calculate_scale(): calculate scale for such graphs.
-
-        * project/stats/project_stats_utils.php: period2seconds(),
-        period2sql(): functions to deal with time periods.
-
-        * include/tool_reports.php: library for tool reporting.
-
-2000-11-09  Paul Sokolovsky  <pfalcon at sourceforge.net>
-
-	* include/utils.php: util_result_columns_to_assoc(): converts
-        db result set into associative array.
-
-2000-10-27  Paul Sokolovsky  <pfalcon at users.sourceforge.net>
-
-	* project/admin/index.php: make fact that admins cannot be
-	deleted explicitly visible by showing crossed trash icon.
-
-2000-10-20  Paul Sokolovsky  <pfalcon at users.sourceforge.net>
-
-	* include/User.class: getUnixStatus() added.
-
-        * admin/approve_pending.php: Added LDAP support. For this,
-        update each group individually instead of in mass. Also, some
-        UI tweaks: now it's possible to approve projects individually,
-        fields are shown somewhat cleaner. Since data now doubled
-        between SQL and LDAP, steps to detect inconsistencies are
-        performed with (hopefully) proper diagnostics (including
-        preserving LDAP error descriptions in status_comment of
-        group) and rudimentary auto-repair.
-
-        * include/Error.class: Allow error messages to accumulate.
-
-        * include/Group.class: addUser() and removeUser() LDAPized.
-
-        * admin/groupedit.php: LDAPized.
-
-
-2000-10-19  Geoffrey Herteg  <gherteg at users.sourceforge.net>
-
-	* pm/pm_util.php: added mail_followup() to mail followups to 
-			  task owner and assigned developers...
-
-	* pm/pm_data.php: modified pm_data_create_task() and
-			  pm_data_update_task() to call mail_followup()
-			  if create/update successful.
-
-2000-10-19  Paul Sokolovsky  <pfalcon at users.sourceforge.net>
-
-	* include/ldap.php: module for LDAP support.
-
-        * DB: groups: new column 'status_comment', should provide
-        some explaination (for human) while group in given status.
-
-2000-10-18  Paul Sokolovsky  <pfalcon at users.sourceforge.net>
-
-	* include/User.class: user_get_object() can take either
-        $user_id or $res.
-
-2000-10-17  Paul Sokolovsky  <pfalcon at users.sourceforge.net>
-
-        * DB: user_group: add 'cvs_flags' column to hold CVS
-        permissions.
-	* project/admin/userperms.php: Add CVS access selector
-        for read, write, admin permissions (accumulated).
-        Reformat and add more roles descriptions.
-        * include/Group.class: make updateUser() method take
-        additional argument - cvs permissions (0,1,2 for read,
-        write, admin).
-	
-2000-10-15  Paul Sokolovsky  <pfalcon at users.sourceforge.net>
-
-	* include/menu.php: Make docs link bold.
-	* account/first.php: Make docs link bold.
-
-2000-10-14  Paul Sokolovsky  <pfalcon at users.sourceforge.net>
-
-	* pre.php: If run without supported_languages table,
-	mod_php died on including the directory instead of
-	language class. Bad behaviour, almost as segfault of
-	C app. Fixed.
-
-2000-10-11  Paul Sokolovsky  <pfalcon at users.sourceforge.net>
-
-	* Russian.class: File submitted by me was magically
-        converted to windows-1251 encoding. Turn back to
-        iso-8859-5.
-

Modified: trunk/gforge_base/evolvisforge/gforge/www/admin/approve-pending.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/admin/approve-pending.php	2010-02-25 13:22:22 UTC (rev 419)
+++ trunk/gforge_base/evolvisforge/gforge/www/admin/approve-pending.php	2010-02-25 13:22:24 UTC (rev 420)
@@ -1,93 +1,84 @@
 <?php
-//
-// SourceForge: Breaking Down the Barriers to Open Source Development
-// Copyright 1999-2000 (c) The SourceForge Crew
-// http://sourceforge.net
-//
-// $Id$
+/**
+  *
+  * Site Admin page for approving/rejecting new projects
+  *
+  * SourceForge: Breaking Down the Barriers to Open Source Development
+  * Copyright 1999-2001 (c) VA Linux Systems
+  * http://sourceforge.net
+  *
+  * @version   $Id$
+  *
+  */
 
-require ('pre.php');	 
-require ('vars.php');
-require ('account.php');
-require ('proj_email.php');
-require ('canned_responses.php');
-require($DOCUMENT_ROOT.'/admin/admin_utils.php');
-require($DOCUMENT_ROOT.'/project/admin/project_admin_utils.php');
-global $feedback;
 
+// Show no more pending projects per page than specified here
+$LIMIT = 50;
+
+require_once('pre.php');	 
+require_once('common/include/vars.php');
+require_once('common/include/account.php');
+require_once('www/include/proj_email.php');
+require_once('www/include/canned_responses.php');
+require_once('www/admin/admin_utils.php');
+require_once('www/project/admin/project_admin_utils.php');
+require_once('common/tracker/ArtifactTypes.class');
+require_once('www/forum/forum_utils.php');
+
 session_require(array('group'=>'1','admin_flags'=>'A'));
 
 function activate_group($group_id) {
 	global $feedback;
-	//echo("activate_group($group_id)<br>");	
 
-	if (sf_ldap_create_group($group_id,0)) {
-		db_query("UPDATE groups ".
-		"SET status='A' ".
-		"WHERE group_id=$group_id");
+	$group =& group_get_object($group_id);
 
-		/*
-			Make founding admin be an active member of the project
-		*/
-		 
-		$admin_res=db_query("SELECT * ".
-			"FROM users,user_group ".
-			"WHERE user_group.group_id=$group_id ".
-			"AND user_group.admin_flags='A' ".
-			"AND users.user_id=user_group.user_id ");
+	if (!$group || !is_object($group)) {
+		$feedback .= 'Error creating group object<br> ';
+		return false;
+	} else if ($group->isError()) {
+		$feedback .= $group->getErrorMessage();
+		return false;
+	}
 
-		if (db_numrows($admin_res) > 0) {
-			$group=&group_get_object($group_id);
+	$feedback .= '<BR>Approving Group: '.$group->getUnixName().' ';
 
-//
-//	user_get_object should really have a valid user_id passed in
-//	or you are defeating the purpose of the object pooling
-//
-			$admin=&user_get_object(db_result($admin_res,0,'user_id'),$admin_res);
-
-			if ($group->addUser($admin->getUnixName())) {
-				/*
-					Now send the project approval emails
-				*/
-				group_add_history ('approved','x',$group_id);
-				send_new_project_email($group_id);
-				usleep(250000); // TODO: This is dirty. If sendmail required pause, let send_new... handle it
-			} else {
-				$feedback=$group->getErrorMessage();
-			}
-		} else {
-			echo db_error();
-		}
-	} else {
-		/* There was error creating LDAP entry */
-		group_add_history ('ldap:',sf_ldap_get_error_msg(),$group_id);
+	if (!$group->approve(session_get_user())) {
+		$feedback .= $group->getErrorMessage();
+		return false;
 	}
+	
+	return true;
 }
 
-// group public choice
 if ($action=='activate') {
-	/*
-		update the project flag to active
-	*/
 
-	$groups=explode(',',$list_of_groups);
-	array_walk($groups,'activate_group');
+	$groups=explode(',', $list_of_groups);
+	array_walk($groups, 'activate_group');
 
 } else if ($action=='delete') {
-	group_add_history ('deleted','x',$group_id);
-	db_query("UPDATE groups ".
-		 "SET status='D' ".
-		 "WHERE group_id='$group_id'");
 
+	$group =& group_get_object($group_id);
+	exit_assert_object($group, 'Group');
+
+	if (!$group->setStatus(session_get_user(), 'D')) {
+		exit_error(
+			'Error during group rejection',
+			$this->getErrorMessage()
+		);
+	}
+
+	$group->addHistory('rejected', 'x');
+
 	// Determine whether to send a canned or custom rejection letter and send it
 	if( $response_id == 100 ) {
-		send_project_rejection($group_id, 0, $response_text);
 
+                $group->sendRejectionEmail(0, $response_text);
+
 		if( $add_to_can ) {
 			add_canned_response($response_title, $response_text);
 		}
 	} else {
-		send_project_rejection($group_id, $response_id);
+		$group->sendRejectionEmail($response_id);
 	}
 }
 
@@ -95,15 +86,23 @@
 site_admin_header(array('title'=>'Approving Pending Projects'));
 
 // get current information
-$res_grp = db_query("SELECT * FROM groups WHERE status='P'");
+$res_grp = db_query("SELECT * FROM groups WHERE status='P'", $LIMIT);
 
-if (db_numrows($res_grp) < 1) {
+$rows = db_numrows($res_grp);
+
+if ($rows < 1) {
 	print "<h1>None Found</h1>";
 	print "<p>No Pending Projects to Approve</p>";
 	site_admin_footer(array());
 	exit;
 }
 
+if ($rows > $LIMIT) {
+	print "<p>Pending projects: $LIMIT+ ($LIMIT shown)</p>";
+} else {
+	print "<p>Pending projects: $rows</p>";
+}
+
 while ($row_grp = db_fetch_array($res_grp)) {
 
 	?>
@@ -131,14 +130,14 @@
 	<INPUT TYPE="HIDDEN" NAME="action" VALUE="delete">
 	<INPUT TYPE="HIDDEN" NAME="group_id" VALUE="<?php print $row_grp['group_id']; ?>">
 	Canned responses<br>
-<?php print get_canned_responses(); ?>
+	<?php print get_canned_responses(); ?> <a href="responses_admin.php">(manage responses)</a>
 	<br><br>
-	Custom response tilte and text<br>
+	Custom response title and text<br>
 	<input type="text" name="response_title" size="30" max="25"><br>
 	<textarea name="response_text" rows="10" cols="50"></textarea>
-	<input type="checkbox" name="add_to_can" value="yes">Add this custom response to to canned responses
+	<input type="checkbox" name="add_to_can" value="yes">Add this custom response to canned responses
 	<br>
-	<INPUT type="submit" name="submit" value="Delete">
+	<INPUT type="submit" name="submit" value="Reject">
 	</FORM>
 	</td></tr>
 	</table>
@@ -152,15 +151,6 @@
 	<br>
 	&nbsp;
 	<?php
-	$res_cat = db_query("SELECT category.category_id AS category_id,"
-		. "category.category_name AS category_name FROM category,group_category "
-		. "WHERE category.category_id=group_category.category_id AND "
-		. "group_category.group_id=$row_grp[group_id]");
-	while ($row_cat = db_fetch_array($res_cat)) {
-		print "<br>$row_cat[category_name] "
-		. "<A href=\"groupedit.php?group_id=$row_grp[group_id]&group_idrm=$row_grp[group_id]&form_catrm=$row_cat[category_id]\">"
-		. "[Remove from Category]</A>";
-	}
 
 	// ########################## OTHER INFO
 

Deleted: trunk/gforge_base/evolvisforge/gforge/www/admin/groupedit-add.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/admin/groupedit-add.php	2010-02-25 13:22:22 UTC (rev 419)
+++ trunk/gforge_base/evolvisforge/gforge/www/admin/groupedit-add.php	2010-02-25 13:22:24 UTC (rev 420)
@@ -1,13 +0,0 @@
-<?php
-//
-// SourceForge: Breaking Down the Barriers to Open Source Development
-// Copyright 1999-2000 (c) The SourceForge Crew
-// http://sourceforge.net
-//
-// $Id: groupedit-add.php,v 1.21 2000/10/17 19:59:10 tperdue Exp $
-
-?>
-<H1>Page Removed</H1>
-<P>
-You should add groups using the registration process.
-

Deleted: trunk/gforge_base/evolvisforge/gforge/www/admin/grouplist.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/admin/grouplist.php	2010-02-25 13:22:22 UTC (rev 419)
+++ trunk/gforge_base/evolvisforge/gforge/www/admin/grouplist.php	2010-02-25 13:22:24 UTC (rev 420)
@@ -1,96 +0,0 @@
-<?php
-//
-// SourceForge: Breaking Down the Barriers to Open Source Development
-// Copyright 1999-2000 (c) The SourceForge Crew
-// http://sourceforge.net
-//
-// $Id$
-
-require "pre.php";    
-require($DOCUMENT_ROOT.'/admin/admin_utils.php');
-
-session_require(array('group'=>'1','admin_flags'=>'A'));
-
-site_admin_header(array('title'=>$GLOBALS['system_name'].": Group List"));
-
-// start from root if root not passed in
-if (!$form_catroot) {
-	$form_catroot = 1;
-}
-
-print "<br><a href=\"groupedit-add.php\">[Add Group]</a>";
-print "<p>".$GLOBALS['system_name']." Group List for Category: ";
-
-if ($form_catroot == 1) {
-
-	if (isset($group_name_search)) {
-		print "<b>Groups that begin with $group_name_search</b>\n";
-		// [RM] LIKE is case-sensitive, and we don't want that
-		// $res = db_query("SELECT group_name,unix_group_name,group_id,is_public,status,license "
-		// . "FROM groups WHERE group_name LIKE '$group_name_search%' "
-		// . ($form_pending?"AND WHERE status='P' ":"")
-		// . " ORDER BY group_name");
-		$res = db_query("SELECT group_name,unix_group_name,group_id,is_public,status,license "
-			. "FROM groups WHERE group_name ~* '^$group_name_search%' "
-			. ($form_pending?"AND WHERE status='P' ":"")
-			. " ORDER BY group_name");
-	} else {
-		print "<b>All Categories</b>\n";
-		$res = db_query("SELECT group_name,unix_group_name,group_id,is_public,status,license "
-			. "FROM groups "
-			. ($status?"WHERE status='$status' ":"")
-			. "ORDER BY group_name");
-	}
-} else {
-	print "<b>" . category_fullname($form_catroot) . "</b>\n";
-
-	$res = db_query("SELECT groups.group_name,groups.unix_group_name,groups.group_id,"
-		. "groups.is_public,"
-		. "groups.license,"
-		. "groups.status "
-		. "FROM groups,group_category "
-		. "WHERE groups.group_id=group_category.group_id AND "
-		. "group_category.category_id=$GLOBALS[form_catroot] ORDER BY groups.group_name");
-}
-?>
-
-<P>
-<TABLE width=100% border=1>
-<TR>
-<TD><b>Group Name (click to edit)</b></TD>
-<TD><b>UNIX Name</b></TD>
-<TD><b>Status</b></TD>
-<TD><b>Public?</b></TD>
-<TD><b>License</b></TD>
-<TD><b>Categories</b></TD>
-<TD><B>Members</B></TD>
-</TR>
-
-<?php
-while ($grp = db_fetch_array($res)) {
-	print "<tr>";
-	print "<td><a href=\"groupedit.php?group_id=$grp[group_id]\">$grp[group_name]</a></td>";
-	print "<td>$grp[unix_group_name]</td>";
-	print "<td>$grp[status]</td>";
-	print "<td>$grp[is_public]</td>";
-	print "<td>$grp[license]</td>";
-	
-	// categories
-	$count = db_query("SELECT group_id FROM group_category WHERE "
-                . "group_id=$grp[group_id]");
-        print ("<td>" . db_numrows($count) . "</td>");
-
-	// members
-	$res_count = db_query("SELECT user_id FROM user_group WHERE group_id=$grp[group_id]");
-	print "<TD>" . db_numrows($res_count) . "</TD>";
-
-	print "</tr>\n";
-}
-?>
-
-</TABLE>
-
-<?php
-site_admin_footer(array());
-
-?>

Modified: trunk/gforge_base/evolvisforge/gforge/www/admin/index.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/admin/index.php	2010-02-25 13:22:22 UTC (rev 419)
+++ trunk/gforge_base/evolvisforge/gforge/www/admin/index.php	2010-02-25 13:22:24 UTC (rev 420)
@@ -1,42 +1,53 @@
 <?php
-//
-// SourceForge: Breaking Down the Barriers to Open Source Development
-// Copyright 1999-2000 (c) The SourceForge Crew
-// http://sourceforge.net
-//
-// $Id$
+/**
+  *
+  * SourceForge Site Admin main page
+  *
+  * This pages lists all global administration facilities for the
+  * site, including user/group properties editing, maintanance of
+  * site meta-information (Trove maps, metadata for file releases),
+  * etc.
+  *
+  * SourceForge: Breaking Down the Barriers to Open Source Development
+  * Copyright 1999-2001 (c) VA Linux Systems
+  * http://sourceforge.net
+  *
+  * @version   $Id$
+  *
+  */
 
-require "pre.php";
-require($DOCUMENT_ROOT.'/admin/admin_utils.php');
 
+require_once('pre.php');
+require_once('www/admin/admin_utils.php');
+
 session_require(array('group'=>'1','admin_flags'=>'A'));
 
-site_admin_header(array('title'=>$GLOBALS['system_name']." Admin"));
+site_admin_header(array('title'=>"Site Admin"));
 
 $abc_array = array('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z','0','1','2','3','4','5','6','7','8','9');
 
+
 ?>
  
-<p>Administrative Functions
 <p><i><b>Warning!</b> These functions currently have minimal error checking,
 if any. They are fine to play with but may not act as expected if you leave
 fields blank, etc... Also, navigating the admin functions with the 
 <b>back</b> button is highly unadvised.</i>
 
-<p><B>User/Group/Category Maintenance</B>
+<p><B>User/Group Maintenance</B>
 <ul>
 <li><a href="userlist.php">Display Full User List/Edit Users</a>&nbsp;&nbsp;
 <li>Display Users Beginning with : 
 <?php
 	for ($i=0; $i < count($abc_array); $i++) {
-		echo "<a href=\"userlist.php?user_name_search=$abc_array[$i]\">$abc_array[$i]</a>|";
+		echo "<a href=\"search.php?usersearch=1&search=$abc_array[$i]%\">$abc_array[$i]</a>|";
 	}
 ?>
 <br>
-Search <i>(email,username,realname,userid)</i>:
-<br>
 <form name="usersrch" action="search.php" method="POST">
+Search <i>(userid, username, realname, email)</i>:
   <input type="text" name="search">
+  <input type="hidden" name="substr" value="1">
   <input type="hidden" name="usersearch" value="1">
   <input type="submit" value="get">
 </form>
@@ -46,14 +57,13 @@
 <li>Display Groups Beginning with : 
 <?php
 	for ($i=0; $i < count($abc_array); $i++) {
-		echo "<a href=\"grouplist.php?group_name_search=$abc_array[$i]\">$abc_array[$i]</a>|";
+		echo "<a href=\"search.php?groupsearch=1&search=$abc_array[$i]%\">$abc_array[$i]</a>|";
 	}
 ?>
-<br>
-Search <i>(groupid,groupunixname,groupname)</i>:
-<br>
 <form name="gpsrch" action="search.php" method="POST">
+Search <i>(groupid, group unix name, full name)</i>:
   <input type="text" name="search">
+  <input type="hidden" name="substr" value="1">
   <input type="hidden" name="groupsearch" value="1">
   <input type="submit" value="get">
 </form>
@@ -61,9 +71,10 @@
 <p>
 
 
-<LI>Groups in <a href="grouplist.php?status=I"><B>I</B> (incomplete) Status</A>
-<LI>Groups in <a href="approve-pending.php"><B>P</B> (pending) Status</A> <i>(New Project Approval)</i>
-<LI>Groups in <a href="grouplist.php?status=D"><B>D</B> (deleted) Status</A>
+<LI>Groups with <a href="approve-pending.php"><B>P</B> (pending) Status</A> <i>(New Project Approval)</i>
+<LI>Groups with <a href="search.php?groupsearch=1&search=%&status=I"><B>I</B> (incomplete) Status</A>
+<LI>Groups with <a href="search.php?groupsearch=1&search=%&status=D"><B>D</B> (deleted) Status</A>
+<LI><a href="search.php?groupsearch=1&search=%&is_public=0">Private Groups </A>
 </ul>
 
 <p><b>Trove</b>
@@ -72,34 +83,41 @@
 <li><a href="trove/trove_cat_add.php">Add to the Trove Map</a>
 </ul>
 
-<P><B>Statistics</B>
-<ul>
-<li><a href="lastlogins.php">View Most Recent Logins</A>
-</ul>
-
 <P><B>Site Utilities</B>
 <UL>
 <LI><A href="massmail.php">Mail Engine for SourceForge Subscribers (MESS)</A>
-<LI><A HREF="add_language.php">Add Supported Language</A>
+<LI><A href="unsubscribe.php">SourceForge Site Mailings Maintanance</A>
+<LI><A HREF="edit_supported_languages.php">Add, Delete, or Edit Supported Languages</A>
+<LI><A HREF="edit_frs_filetype.php">Add, Delete, or Edit File Types</A>
+<LI><A HREF="edit_frs_processor.php">Add, Delete, or Edit Processors</A>
 </UL>
 
-<P><B>Site Stats</B>
+<P><B>Global Admin Tools / Mass Insert Tools</B>
+<UL>
+<LI><A HREF="vhost.php">Virtual Host Administration Tool</A>
+<LI><A HREF="database.php">Project Database Administration</A>
+</UL>
+
+<P><B>Quick Site Statistics</B></P>
+
 <?php
-	$res=db_query("SELECT count(*) AS count FROM users WHERE status='A'");
-	$row = db_fetch_array($res);
-	print "<P>Registered active site users: <B>$row[count]</B>";
 
-	$res=db_query("SELECT count(*) AS count FROM groups");
-	$row = db_fetch_array($res);
-	print "<BR>Registered projects: <B>$row[count]</B>";
+$res=db_query("SELECT count(*) AS count FROM users WHERE status='A'");
+$row = db_fetch_array($res);
+print "<P>Active site users: <B>$row[count]</B>";
 
-	$res=db_query("SELECT count(*) AS count FROM groups WHERE status='A'");
-	$row = db_fetch_array($res);
-	print "<BR>Registered/hosted projects: <B>$row[count]</B>";
+$res=db_query("SELECT count(*) AS count FROM groups");
+$row = db_fetch_array($res);
+print "<BR>Registered projects: <B>$row[count]</B>";
 
-	$res=db_query("SELECT count(*) AS count FROM groups WHERE status='P'");
-	$row = db_fetch_array($res);
-	print "<BR>Pending projects: <B>$row[count]</B>";
+$res=db_query("SELECT count(*) AS count FROM groups WHERE status='A'");
+$row = db_fetch_array($res);
+print "<BR>Active projects: <B>$row[count]</B>";
+
+$res=db_query("SELECT count(*) AS count FROM groups WHERE status='P'");
+$row = db_fetch_array($res);
+print "<BR>Pending projects: <B>$row[count]</B>";
+
 site_admin_footer(array());
 
 ?>

Deleted: trunk/gforge_base/evolvisforge/gforge/www/admin/lastlogins.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/admin/lastlogins.php	2010-02-25 13:22:22 UTC (rev 419)
+++ trunk/gforge_base/evolvisforge/gforge/www/admin/lastlogins.php	2010-02-25 13:22:24 UTC (rev 420)
@@ -1,38 +0,0 @@
-<?php
-//
-// SourceForge: Breaking Down the Barriers to Open Source Development
-// Copyright 1999-2000 (c) The SourceForge Crew
-// http://sourceforge.net
-//
-// $Id: lastlogins.php,v 1.11 2000/10/17 19:56:55 tperdue Exp $
-
-require "pre.php";    
-session_require(array('group'=>'1','admin_flags'=>'A'));
-
-$res_logins = db_query("SELECT session.user_id AS user_id,"
-	. "session.ip_addr AS ip_addr,"
-	. "session.time AS time,"
-	. "users.user_name AS user_name FROM session,users "
-	. "WHERE session.user_id=users.user_id AND "
-	. "session.user_id>0 AND session.time>0 ORDER BY session.time DESC",50);
-if (db_numrows($res_logins) < 1) exit_error("No records found","There must be an error somewhere.");
-
-$HTML->header(array('title'=>"Last Logins"));
-
-print '<P><B>Most Recent Sessions with Logins</B>';
-print "\n<P>";
-print '<TABLE width=100% cellpadding=0 cellspacing=0 border=0>';
-
-while ($row_logins = db_fetch_array($res_logins)) {
-	print '<TR>';
-	print "<TD>$row_logins[user_name]</TD>";
-	print "<TD>$row_logins[ip_addr]</TD>";
-	print "<TD>" . date("Y/m/d G:i",$row_logins['time']) . "</TD>";
-	print '</TR>';
-}
-
-print '</TABLE>';
-
-$HTML->footer(array());
-
-?>

Deleted: trunk/gforge_base/evolvisforge/gforge/www/admin/newgroup.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/admin/newgroup.php	2010-02-25 13:22:22 UTC (rev 419)
+++ trunk/gforge_base/evolvisforge/gforge/www/admin/newgroup.php	2010-02-25 13:22:24 UTC (rev 420)
@@ -1,56 +0,0 @@
-<?php
-//
-// SourceForge: Breaking Down the Barriers to Open Source Development
-// Copyright 1999-2000 (c) The SourceForge Crew
-// http://sourceforge.net
-//
-// $Id: newgroup.php,v 1.14 2000/08/31 06:07:52 gherteg Exp $
-
-require "pre.php";    
-session_require(array('group'=>'1','admin_flags'=>'A'));
-
-// ###### function submit_valid()
-// ###### checks for valid submit from form post
-
-function submit_valid()	{
-	global $HTTP_POST_VARS;
-
-	if (!$HTTP_POST_VARS["Submit"]) {
-		return 0;
-	}
-	
-	if ($HTTP_POST_VARS['form_groupname']) {
-		db_query("INSERT INTO groups (group_name,is_public) "
-			. "values ('$HTTP_POST_VARS[form_groupname]',$HTTP_POST_VARS[form_public])");
-		return 1;
-	} else {
-		return 0;
-	}
-}
-
-// ###### first check for valid login, if so, congratulate
-
-if (submit_valid()) {
-	session_redirect("/admin/index.php");
-} else { // not valid registration, or first time to page
-	$HTML->header(array('title'=>$GLOBALS['system_name'].": Admin: New Group"));
-
-?>
-<p><b><? echo $GLOBALS['system_name']; ?> New Group Creation</b>
-<?php if ($submit_error) print "<p>$submit_error"; ?>
-<form action="newgroup.php" method="post">
-<p>Group Name:
-<br><input type="text" name="form_groupname">
-<p>Publicly browseable?:
-<br><SELECT name="form_public">
-<OPTION value="1">Yes
-<OPTION selected value="0">No
-</SELECT>
-<p><input type="submit" name="Submit" value="Submit">
-</form>
-
-<?php
-}
-$HTML->footer(array());
-
-?>

Deleted: trunk/gforge_base/evolvisforge/gforge/www/admin/newprojectmail.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/admin/newprojectmail.php	2010-02-25 13:22:22 UTC (rev 419)
+++ trunk/gforge_base/evolvisforge/gforge/www/admin/newprojectmail.php	2010-02-25 13:22:24 UTC (rev 420)
@@ -1,21 +0,0 @@
-<?php
-//
-// SourceForge: Breaking Down the Barriers to Open Source Development
-// Copyright 1999-2000 (c) The SourceForge Crew
-// http://sourceforge.net
-//
-// $Id: newprojectmail.php,v 1.9 2000/08/31 06:07:52 gherteg Exp $
-
-require ('pre.php');
-require('proj_email.php');
-
-session_require(array('group'=>'1','admin_flags'=>'A'));
-
-$HTML->header(array('title'=>"Project Intro email"));
-
-send_new_project_email($group_id);
-
-print "<P>Mail successfully sent.";
-
-$HTML->footer(array());
-?>

Modified: trunk/gforge_base/evolvisforge/gforge/www/admin/search.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/admin/search.php	2010-02-25 13:22:22 UTC (rev 419)
+++ trunk/gforge_base/evolvisforge/gforge/www/admin/search.php	2010-02-25 13:22:24 UTC (rev 420)
@@ -1,22 +1,49 @@
 <?php
-//
-// SourceForge: Breaking Down the Barriers to Open Source Development
-// Copyright 1999-2000 (c) The SourceForge Crew
-// http://sourceforge.net
-//
+/**
+  *
+  * Site Admin generic user/group search page
+  *
+  * This is the single page for searching/selection of users/groups for
+  * Site Admin. Currently, it supports querying by (sub)string match in
+  * string user/group properties (names, fullnames, email) and status.
+  * If new search criteria will be required, they should be added here,
+  * not any other (new) page.
+  *
+  * SourceForge: Breaking Down the Barriers to Open Source Development
+  * Copyright 1999-2001 (c) VA Linux Systems
+  * http://sourceforge.net
+  *
+  * @version   $Id$
+  *
+  */
 
-require "pre.php";
+
+require_once('pre.php');
+require_once('www/admin/admin_utils.php');
+
 session_require(array('group'=>'1','admin_flags'=>'A'));
 
-$HTML->header(array('title'=>$GLOBALS['system_name']." Admin"));
+site_admin_header(array('title'=>'Admin Search Results'));
 
-?>
+function format_name($name, $status) {
+	if ($status == 'D') {
+		return "<b><strike>$name</strike></b>";
+	} else if ($status == 'S') {
+		return "<b><u>$name</u></b>";
+	} else if ($status == 'H') {
+		return "<b><u>$name</u></b>";
+	} else if ($status == 'P') {
+		return "<b><i>$name</i></b>";
+	} else if ($status == 'I') {
+		return "<b><i>$name</i></b>";
+	}
 
-<p>Administrative Functions
+	return $name;
+}
 
-<p><B>User/Group/Category Maintenance</B>
-<br>
-<b> Search Criteria: </b> <?php print " \"%$search%\" <p>"; 
+/*
+	Main code
+*/
 
 if ($search == "") {
 
@@ -24,22 +51,51 @@
 
 }
 
+if ($substr) {
+	$search = "%$search%";
+}
 
+
 if ($usersearch) {
 
-	$sql = "select distinct * from users where user_id ilike '%$search%' or user_name ilike '%$search%' or email ilike '%$search%' or realname ilike '%$search%'";
-	$result = db_query($sql); 
+	$result = db_query("
+	    SELECT DISTINCT * 
+	    FROM users
+	    WHERE user_id ILIKE '$search'
+	    OR user_name ILIKE '%$search%'
+	    OR email ILIKE '%$search%'
+	    OR realname ILIKE '%$search%'
+	"); 
+
+	print '<p><b>User search with criteria "<i>'.$search.'</i>": '
+	      .db_numrows($result).' matches.</b></p>';
+
 	if (db_numrows($result) < 1) {
-		print "No matches.<p><a href=\"/admin/\">Back</a>";
+		echo db_error();
+	} else {
 
-	}
-	else {
 
-		print "<table border=\"1\">";
-		print "<tr><th>UserName</th><th>User's Name</th></tr>\n\n";
+		$title=array();
+		$title[]='ID';
+		$title[]='Username';
+		$title[]='Real Name';
+		$title[]='Email';
+		$title[]='Member since';
+		$title[]='Status (Web/Unix)';
+					 
+		echo html_build_list_table_top($title);
 
 		while ($row = db_fetch_array($result)) {
-			print "<tr><td><a href=\"usergroup.php?user_id=$row[user_id]\">$row[user_name]</a></td><td>$row[realname]</td></tr>\n"; 
+			print '
+				<tr bgcolor="'.html_get_alt_row_color($i++).'">
+				<td><a href="useredit.php?user_id='.$row['user_id'].'">'.$row['user_id'].'</a></td>
+				<td>'.format_name($row['user_name'], $row['status']).'</td>
+				<td>'.$row['realname'].'</td>
+				<td>'.$row['email'].'</td>
+				<td>'.date($sys_datefmt, $row['add_date']).'</td>
+				<td align="center">'.format_name($row['status'].'/'.$row['unix_status'], $row['status']).'</td>
+				</tr>
+			'; 
 		}
 		print "</table>";
 
@@ -49,20 +105,59 @@
 
 if ($groupsearch) {
 
-	$sql = "select distinct * from groups where group_id ilike '%$search%' or unix_group_name ilike '%$search%' or group_name ilike '%$search%'";
-	$result = db_query($sql); 
+	if ($status) {
+		$crit_sql  .= " AND status='$status'";
+		$crit_desc .= " status=$status";
+	}
+	if (isset($is_public)) {
+		$crit_sql  .= " AND is_public='$is_public'";
+		$crit_desc .= " is_public=$is_public";
+	}
 
+	$result = db_query("
+		SELECT DISTINCT *
+		FROM groups
+		WHERE (group_id ILIKE '%$search%'
+		OR unix_group_name ILIKE '%$search%'
+		OR group_name ILIKE '%$search%')
+		$crit_sql
+	"); 
+
+	if ($crit_desc) {
+		$crit_desc = "($crit_desc )";
+	}
+	print '<p><b>Group search with criteria "<i>'.$search.'</i>" '.$crit_desc.': '
+	      .db_numrows($result).' matches.</b></p>';
+
 	if (db_numrows($result) < 1) {
+		echo db_error();
+	} else {
 
-		print "No matches.<p><a href=\"/admin/\">Back</a>";
+		$title=array();
+		$title[]='ID';
+		$title[]='Unix Name';
+		$title[]='Full Name';
+		$title[]='Registered';
+		$title[]='Status';
 
-	}
-	else {
+		echo html_build_list_table_top($title);
 
-		print "<table border=\"1\">";
-		print "<tr><th>GroupUnixName</th><th>Group's Name</th></tr>\n\n";
 		while ($row = db_fetch_array($result)) {
-			print "<tr><td><a href=\"groupedit.php?group_id=$row[group_id]\">$row[unix_group_name]</a></td><td>$row[group_name]</td></tr>\n";
+
+			$extra_status = "";
+			if (!$row['is_public']) {
+				$extra_status = "/PRV";
+			}
+			
+			print '
+				<tr bgcolor="'.html_get_alt_row_color($i++).'">
+				<td><a href="groupedit.php?group_id='.$row['group_id'].'">'.$row['group_id'].'</a></td>
+				<td>'.format_name($row['unix_group_name'], $row['status']).'</td>
+				<td>'.$row['group_name'].'</td>
+				<td>'.date($sys_datefmt, $row['register_time']).'</td>
+				<td align="center">'.format_name($row['status'].$extra_status, $row['status']).'</td>
+				</tr>
+			';
 					
 		}
 		
@@ -73,6 +168,6 @@
 
 } //end if($groupsearch)
 
+site_admin_footer(array());
 
-$HTML->footer(array());
 ?>

Deleted: trunk/gforge_base/evolvisforge/gforge/www/admin/user_changepw.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/admin/user_changepw.php	2010-02-25 13:22:22 UTC (rev 419)
+++ trunk/gforge_base/evolvisforge/gforge/www/admin/user_changepw.php	2010-02-25 13:22:24 UTC (rev 420)
@@ -1,75 +0,0 @@
-<?php
-//
-// SourceForge: Breaking Down the Barriers to Open Source Development
-// Copyright 1999-2000 (c) The SourceForge Crew
-// http://sourceforge.net
-//
-// $Id: user_changepw.php,v 1.13 2000/11/06 21:14:18 pfalcon Exp $
-
-require "pre.php";    
-require "account.php";
-session_require(array('group'=>'1','admin_flags'=>'A'));
-
-// ###### function register_valid()
-// ###### checks for valid register from form post
-
-function register_valid()	{
-	global $form_user;
-
-	if (!$GLOBALS["Update"]) {
-		return 0;
-	}
-	
-	// check against old pw
-	db_query("SELECT user_pw FROM users WHERE user_id=$form_user");
-
-	if (!$GLOBALS['form_pw']) {
-		$GLOBALS['register_error'] = "You must supply a password.";
-		return 0;
-	}
-	if ($GLOBALS['form_pw'] != $GLOBALS['form_pw2']) {
-		$GLOBALS['register_error'] = "Passwords do not match.";
-		return 0;
-	}
-	if (!account_pwvalid($GLOBALS['form_pw'])) {
-		return 0;
-	}
-	
-	// if we got this far, it must be good
-        $user=user_get_object(user_getid());
-	if (!$user->setPasswd($GLOBALS[form_pw])) {
-		$GLOBALS['register_error'] = $user->getErrorMessage();
-		return 0;
-	}
-	return 1;
-}
-
-// ###### first check for valid login, if so, congratulate
-
-if (register_valid()) {
-	$HTML->header(array(title=>$GLOBALS['system_name'].": Change Password"));
-?>
-<p><b>SourceForge Change Confirmation</b>
-<p>Congratulations, genius. You have managed to change this user's password.
-<p>You should now <a href="/admin/userlist.php">Return to UserList</a>.
-<?php
-} else { // not valid registration, or first time to page
-	$HTML->header(array(title=>"Change Password"));
-
-?>
-<p><b>SourceForge Password Change</b>
-<?php if ($register_error) print "<p>$register_error"; ?>
-<form action="user_changepw.php" method="post">
-<p>New Password:
-<br><input type="password" name="form_pw">
-<p>New Password (repeat):
-<br><input type="password" name="form_pw2">
-<INPUT type=hidden name="form_user" value="<?php print $form_user; ?>">
-<p><input type="submit" name="Update" value="Update">
-</form>
-
-<?php
-}
-$HTML->footer(array());
-
-?>

Deleted: trunk/gforge_base/evolvisforge/gforge/www/admin/userlist.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/admin/userlist.php	2010-02-25 13:22:22 UTC (rev 419)
+++ trunk/gforge_base/evolvisforge/gforge/www/admin/userlist.php	2010-02-25 13:22:24 UTC (rev 420)
@@ -1,127 +0,0 @@
-<?php
-//
-// SourceForge: Breaking Down the Barriers to Open Source Development
-// Copyright 1999-2000 (c) The SourceForge Crew
-// http://sourceforge.net
-//
-// $Id$
-
-require "pre.php";    
-session_require(array('group'=>'1','admin_flags'=>'A'));
-$HTML->header(array('title'=>$GLOBALS['system_name'].': User List'));
-
-function show_users_list ($result) {
-	echo '<P>Key:
-		<B>Active</B>
-		<I>Deleted</I>
-		Suspended
-		(*)Pending
-		<P>
-		<TABLE width=100% cellspacing=0 cellpadding=0 BORDER="1">';
-
-	while ($usr = db_fetch_array($result)) {
-		print "\n<TR><TD><a href=\"useredit.php?user_id=$usr[user_id]\">";
-		if ($usr[status] == 'A') print "<B>";
-		if ($usr[status] == 'D') print "<I>";
-		if ($usr[status] == 'P') print "*";
-		print "$usr[user_name]</A>";
-		if ($usr[status] == 'A') print "</B></TD>";
-		if ($usr[status] == 'D') print "</I></TD>";
-		if ($usr[status] == 'S') print "</TD>";
-		if ($usr[status] == 'P') print "</TD>";
-		print "\n<TD><A HREF=\"/developer/?form_dev=$usr[user_id]\">[DevProfile]</A></TD>";
-		print "\n<TD><A HREF=\"userlist.php?action=activate&user_id=$usr[user_id]\">[Activate]</A></TD>";
-		print "\n<TD><A HREF=\"userlist.php?action=delete&user_id=$usr[user_id]\">[Delete]</A></TD>";
-		print "\n<TD><A HREF=\"userlist.php?action=suspend&user_id=$usr[user_id]\">[Suspend]</A></TD>";
-		print "</TR>";
-	}
-	print "</TABLE>";
-
-}
-
-// Administrative functions
-
-/*
-	Set this user to delete
-*/
-if ($action=='delete') {
-	db_query("UPDATE users SET status='D' WHERE user_id='$user_id'");
-	echo '<H2>User Updated to DELETE Status</H2>';
-}
-
-/*
-	Activate their account
-*/
-if ($action=='activate') {
-	db_query("UPDATE users SET status='A' WHERE user_id='$user_id'");
-	echo '<H2>User Updated to ACTIVE status</H2>';
-}
-
-/*
-	Suspend their account
-*/
-if ($action=='suspend') {
-	db_query("UPDATE users SET status='S' WHERE user_id='$user_id'");
-	echo '<H2>User Updated to SUSPEND Status</H2>';
-}
-
-/*
-	Add a user to this group
-*/
-if ($action=='add_to_group') {
-	db_query("INSERT INTO user_group (user_id,group_id) VALUES ($user_id,$group_id)");
-}
-
-/*
-	Show list of users
-*/
-print "<p>Alexandria user List for Group: ";
-if (!$group_id) {
-	print "<b>All Groups</b>";
-	print "\n<p>";
-	
-	if ($user_name_search) {
-	  // [RM] LIKE is case-sensitive, and we don't want that
-	  //		$result = db_query("SELECT user_name,user_id,status FROM users WHERE user_name LIKE '$user_name_search%' ORDER BY user_name");
-		$result = db_query("SELECT user_name,user_id,status FROM users WHERE user_name ~* '^$user_name_search' ORDER BY user_name");
-	} else {
-		$result = db_query("SELECT user_name,user_id,status FROM users ORDER BY user_name");
-	}
-	show_users_list ($result);
-} else {
-	/*
-		Show list for one group
-	*/
-	print "<b>" . group_getname($group_id) . "</b>";
-	
-	print "\n<p>";
-
-	$result = db_query("SELECT users.user_id AS user_id,users.user_name AS user_name,users.status AS status "
-		. "FROM users,user_group "
-		. "WHERE users.user_id=user_group.user_id AND "
-		. "user_group.group_id=$group_id ORDER BY users.user_name");
-	show_users_list ($result);
-
-	/*
-        	Show a form so a user can be added to this group
-	*/
-	?>
-	<hr>
-	<P>
-	<form action="<?php echo $PHP_SELF; ?>" method="post">
-	<input type="HIDDEN" name="action" VALUE="add_to_group">
-	<input name="user_id" type="TEXT" value="">
-	<p>
-	Add User to Group (<?php print group_getname($group_id); ?>):
-	<br>
-	<input type="HIDDEN" name="group_id" VALUE="<?php print $group_id; ?>">
-	<p>
-	<input type="submit" name="Submit" value="Submit">
-	</form>
-
-	<?php	
-}
-
-$HTML->footer(array());
-
-?>

Deleted: trunk/gforge_base/evolvisforge/gforge/www/download.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/download.php	2010-02-25 13:22:22 UTC (rev 419)
+++ trunk/gforge_base/evolvisforge/gforge/www/download.php	2010-02-25 13:22:24 UTC (rev 420)
@@ -1,15 +0,0 @@
-<?php
-//
-// SourceForge: Breaking Down the Barriers to Open Source Development
-// Copyright 1999-2000 (c) The SourceForge Crew
-// http://sourceforge.net
-//
-// $Id$
-
-echo '<H1>This File is obsolete</H1>
-	<P>
-	Please browse for files using the <A HREF="/softwaremap/">trove software map.</A>
-	<P>
-	<A HREF="/softwaremap/">Trove</A>';
-
-?>

Deleted: trunk/gforge_base/evolvisforge/gforge/www/export/bug_dump.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/export/bug_dump.php	2010-02-25 13:22:22 UTC (rev 419)
+++ trunk/gforge_base/evolvisforge/gforge/www/export/bug_dump.php	2010-02-25 13:22:24 UTC (rev 420)
@@ -1,73 +0,0 @@
-<?php
-// ## export bugs for a specific project
-include "pre.php";
-
-header("Content-Type: text/plain");
-print("<?xml version=\"1.0\"?>
-<!DOCTYPE sf_bugs SYSTEM \"http://$sys_default_domain/export/sf_bugs_0.1.dtd\">
-<bugs>
-");
-
-if( !isset($group_id) ) {
-	print("    <error>Group ID Not Set</error>\n");
-} else {
-	$project=group_get_object($group_id);
-	if( !$project->userIsAdmin() ) {
-		print("    <error>You are not an administrator for this project</error>\n");
-		print("</bugs>\n");
-		exit;
-	}
-
-	$query = "SELECT 
-				b.*
-			  FROM 
-				bug b
-			  WHERE 
-				b.group_id='$group_id'";
-	$res = db_query($query);
-
-	while( $row = db_fetch_array($res) ) {
-		$submitted_by = db_result(db_query("SELECT user_name FROM users WHERE user_id='" . $row["submitted_by"] . "'"),0,"user_name");
-		$assigned_to = db_result(db_query("SELECT user_name FROM users WHERE user_id='" . $row["assigned_to"] . "'"),0,"user_name");
-		print("    <bug id='" . $row["bug_id"] . "'>\n");
-		print("        <group_id>$group_id</group_id>\n");
-		print("        <status_id>" . $row["status_id"] . "</status_id>\n");
-		print("        <priority>" . $row["priority"] . "</priority>\n");
-		print("        <category_id>" . $row["category_id"] . "</category_id>\n");
-		print("        <submitted_by id='" . $row["submitted_by"] . "' name='$submitted_by'/>\n");
-		print("        <assigned_to id='" . $row["assigned_to"] . "' name='$assigned_to'/>\n");
-		print("        <date>" . $row["date"] . "</date>\n");
-		print("        <summary>" . $row["summary"] . "</summary>\n");
-		print("        <details>" . $row["details"] . "</details>\n");
-		print("        <close_date>" . $row["close_date"] . "</close_date>\n");
-		print("        <bug_group_id>" . $row["bug_group_id"] . "</bug_group_id>\n");
-		print("        <resolution>" . $row["resolution"] . "</resolution>\n");
-
-		$res_deps = db_query("SELECT * FROM bug_bug_dependencies WHERE bug_id='" . $row["bug_id"] . "'");
-		while( $row2=db_fetch_array($res_deps) ) {
-				print("        <dependency id='" . $row2["bug_depend_id"] . "'>\n");
-				print("            <dep_id>" . $row2["is_dependent_on_bug_id"] . "</dep_id>\n");
-				print("        </dependency>\n");
-		}
-
-		$res_hist = db_query("SELECT * FROM bug_history WHERE bug_id='" . $row["bug_id"] . "'");
-		while( $row3=db_fetch_array($res_hist) ) {
-				print("        <history id='" . $row3["bug_history_id"] . "'>\n");
-				print("            <field_name>" . $row3["field_name"] . "</field_name>\n");
-				print("            <old_value>" . $row3["old_value"] . "</old_value>\n");
-				print("            <mod_by>" . $row3["mod_by"] . "</mod_by>\n");
-				print("            <date>" . $row3["date"] . "</date>\n");
-				print("        </history>\n");
-		}
-
-		$res_task = db_query("SELECT * FROM bug_task_dependencies WHERE bug_id='" . $row["bug_id"] . "'");
-		while( $row4=db_fetch_array($res_task) ) {
-				print("        <task_dependency id='" . $row4["bug_depend_id"] . "'>\n");
-				print("            <dep_on_task_id>" . $row4["is_dependent_on_task_id"] . "</dep_on_task_id>\n");
-				print("        </task_dependency>\n");
-		}
-		print("    </bug>\n");
-	}
-}
-?>
-</bugs>

Deleted: trunk/gforge_base/evolvisforge/gforge/www/export/patch_dump.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/export/patch_dump.php	2010-02-25 13:22:22 UTC (rev 419)
+++ trunk/gforge_base/evolvisforge/gforge/www/export/patch_dump.php	2010-02-25 13:22:24 UTC (rev 420)
@@ -1,56 +0,0 @@
-<?php
-// ## export patches for a specific project
-include "pre.php";
-
-header("Content-Type: text/plain");
-print("<?xml version=\"1.0\"?>
-<!DOCTYPE sf_bugs SYSTEM \"http://$sys_default_domain/export/sf_patches_0.1.dtd\">
-<patches>
-");
-
-if( !isset($group_id) ) {
-	print("	<error>Group ID Not Set</error>\n");
-} else {
-	$project=group_get_object($group_id);
-	if( !$project->userIsAdmin() ) {
-		print("    <error>You are not an administrator for this project</error>\n");
-		print("</bugs>\n");
-		exit;
-	}
-
-	$query = "SELECT 
-				p.*
-			  FROM 
-				patch p
-			  WHERE 
-				p.group_id='$group_id'";
-	$res = db_query($query);
-
-	while( $row = db_fetch_array($res) ) {
-		$submitted_by = db_result(db_query("SELECT user_name FROM users WHERE user_id='" . $row["submitted_by"] . "'"),0,"user_name");
-		$assigned_to = db_result(db_query("SELECT user_name FROM users WHERE user_id='" . $row["assigned_to"] . "'"),0,"user_name");
-		print("    <patch id='" . $row["patch_id"] . "'>\n");
-		print("        <group_id>" . $row["group_id"] . "</group_id>\n");
-		print("        <status_id>" . $row["status_id"] . "</status_id>\n");
-		print("        <category_id>" . $row["category_id"] . "</category_id>\n");
-		print("        <submitted_by id='" . $row["submitted_by"] . "' name='$submitted_by'/>\n");
-		print("        <assigned_to id='" . $row["assigned_to"] . "' name='$assigned_to'/>\n");
-		print("        <open_date>" . $row["open_date"] . "</open_date>\n");
-		print("        <summary>" . $row["summary"] . "</summary>\n");
-		print("        <code>" . $row["code"] . "</code>\n");
-		print("        <close_date>" . $row["close_date"] . "</close_date>\n");
-
-		$res_hist = db_query("SELECT * FROM patch_history WHERE patch_id='" . $row["patch_id"] . "'");
-		while( $row2=db_fetch_array($res_hist) ) {
-				print("        <history id='" . $row2["patch_history_id"] . "'>\n");
-				print("            <field_name>" . $row2["field_name"] . "</field_name>\n");
-				print("            <old_value>" . $row2["old_value"] . "</old_value>\n");
-				print("            <mod_by>" . $row2["mod_by"] . "</mod_by>\n");
-				print("            <date>" . $row2["date"] . "</date>\n");
-				print("        </history>\n");
-		}
-		print("    </patch>\n");
-	}
-}
-?>
-</patches>

Deleted: trunk/gforge_base/evolvisforge/gforge/www/pm/pm_data.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/pm/pm_data.php	2010-02-25 13:22:22 UTC (rev 419)
+++ trunk/gforge_base/evolvisforge/gforge/www/pm/pm_data.php	2010-02-25 13:22:24 UTC (rev 420)
@@ -1,523 +0,0 @@
-<?php
-//
-// SourceForge: Breaking Down the Barriers to Open Source Development
-// Copyright 1999-2000 (c) The SourceForge Crew
-// http://sourceforge.net
-//
-// $Id: pm_data.php,v 1.37 2000/12/09 19:54:14 tperdue Exp $
-
-/**
- *	return a result set of the 100 most recent tasks in this subproject
- */
-function pm_data_get_tasks ($group_project_id) {
-	global $pm_data_tasks;
-	if (!$pm_data_tasks["$group_project_id"]) {
-		$sql="SELECT project_task_id,summary ".
-			"FROM project_task ".
-			"WHERE group_project_id='$group_project_id' ".
-			"AND status_id <> '3' ORDER BY project_task_id DESC";
-		$pm_data_tasks["$group_project_id"]=db_query($sql,100);
-	}
-	return $pm_data_tasks["$group_project_id"];
-}
-
-/**
- *	return a result set of subprojects for this group
- */
-function pm_data_get_subprojects ($group_id) {
-	global $pm_data_subprojects;
-	if (!$pm_data_subprojects["$group_id"]) {
-		$sql="SELECT group_project_id,project_name ".
-			"FROM project_group_list WHERE group_id='$group_id'";
-		$pm_data_subprojects["$group_id"]=db_query($sql);
-	}
-	return $pm_data_subprojects["$group_id"];
-}
-
-/**
- *	return a result set of tasks in this subproject that do not equal 
- *	the passed in task_id
- */
-function pm_data_get_other_tasks ($group_project_id,$project_task_id) {
-	$sql="SELECT project_task_id,summary ".
-		"FROM project_task ".
-		"WHERE group_project_id='$group_project_id' ".
-		"AND status_id <> '3' ".
-		"AND project_task_id <> '$project_task_id' ORDER BY project_task_id DESC";
-	return db_query($sql,100);
-}
-
-/**
- *	return a result set of pm technicians in this group
- */
-function pm_data_get_technicians ($group_id) {
-	global $pm_data_technicians;
-	if (!$pm_data_technicians["$group_id"]) {
-		$sql="SELECT users.user_id,users.user_name ".
-			"FROM users,user_group ".
-			"WHERE users.user_id=user_group.user_id ".
-			"AND user_group.group_id='$group_id' ".
-			"AND user_group.project_flags IN (1,2) ".
-			"ORDER BY users.user_name";
-		$pm_data_technicians["$group_id"]=db_query($sql);
-	}
-	return $pm_data_technicians["$group_id"];
-}
-
-/**
- *	return result set of ids of tasks tasks that are dependent on this task
- */
-function pm_data_get_dependent_tasks ($project_task_id) {
-	$sql="SELECT is_dependent_on_task_id ".
-		"FROM project_dependencies ".
-		"WHERE project_task_id='$project_task_id'";
-	return db_query($sql);
-}
-
-/**
- *	return result set of user_ids that are assigned this task
- */
-function pm_data_get_assigned_to ($project_task_id) {
-	$sql="SELECT assigned_to_id ".
-		"FROM project_assigned_to ".
-		"WHERE project_task_id='$project_task_id'";
-	return db_query($sql);
-}
-
-/**
- *	return result set of statuses
- */
-function pm_data_get_statuses () {
-	global $pm_data_statuses;
-	if (!$pm_data_statuses) {
-		$sql='SELECT * FROM project_status';
-		$pm_data_statuses=db_query($sql);
-	}
-	return $pm_data_statuses;
-}
-
-function pm_data_get_status_name($string) {
-	/*
-		simply return status_name from bug_status
-	*/
-	$sql="SELECT * FROM project_status WHERE status_id='$string'";
-	$result=db_query($sql);
-	if ($result && db_numrows($result) > 0) {
-		return db_result($result,0,'status_name');
-	} else {
-		return 'Error - Not Found';
-	}
-}
-
-function pm_data_get_group_name($group_project_id) {
-	/*
-		Simply return the resolution name for this id
-	*/
-
-	$sql="SELECT * FROM project_group_list WHERE group_project_id='$group_project_id'";
-	$result=db_query($sql);
-	if ($result && db_numrows($result) > 0) {
-		return db_result($result,0,'project_name');
-	} else {
-		return 'Error - Not Found';
-	}
-}
-
-function pm_data_create_history ($field_name,$old_value,$project_task_id) {
-	global $feedback;
-	/*
-		handle the insertion of history for these parameters
-	*/
-	$sql="insert into project_history(project_task_id,field_name,old_value,mod_by,date) ".
-		"VALUES ('$project_task_id','$field_name','$old_value','".user_getid()."','".time()."')";
-	$result=db_query($sql);
-	if (!$result) {
-		$feedback .= ' ERROR IN AUDIT TRAIL - '.db_error();
-		return false;
-	} else {
-		return true;
-	}
-}
-
-function pm_data_insert_assigned_to($array,$project_task_id) {
-	global $feedback;
-	/*
-		Insert the people this task is assigned to
-	*/
-	$user_count=count($array);
-	if ($user_count < 1) {
-		//if no users selected, insert user "none"
-		$sql="INSERT INTO project_assigned_to (project_task_id,assigned_to_id) 
-			VALUES ('$project_task_id','100')";
-		$result=db_query($sql);
-		if (!$result) {
-			return false;
-		} else {
-			return true;
-		}
-	} else {
-		for ($i=0; $i<$user_count; $i++) {
-			if (($user_count > 1) && ($array[$i]==100)) {
-				//don't insert the row if there's more 
-				//than 1 item selected and this item is the "none user"
-			} else {
-				$sql="INSERT INTO project_assigned_to (project_task_id,assigned_to_id) 
-					VALUES ('$project_task_id','$array[$i]')";
-				//echo "\n$sql";
-				$result=db_query($sql);
-				if (!$result) {
-					$feedback .= ' ERROR inserting project_assigned_to '.db_error();
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-}
-
-function pm_data_update_assigned_to($array,$project_task_id) {
-	/*
-		DELETE THEN Insert the people this task is assigned to
-	*/
-	$toss=db_query("DELETE FROM project_assigned_to WHERE project_task_id='$project_task_id'");
-	return pm_data_insert_assigned_to($array,$project_task_id);
-}
-
-function pm_data_insert_dependent_tasks($array,$project_task_id) {
-	global $feedback;
-	/*
-		Insert the list of dependencies
-	*/
-	$depend_count=count($array);
-	if ($depend_count < 1) {
-		//if no tasks selected, insert task "none"
-		$sql="INSERT INTO project_dependencies (project_task_id,is_dependent_on_task_id) 
-			VALUES ('$project_task_id','100')";
-		$result=db_query($sql);
-		if (!$result) {
-			return false;
-		} else {
-			return true;
-		}
-	} else {
-		for ($i=0; $i<$depend_count; $i++) {
-			if (($depend_count > 1) && ($array[$i]==100)) {
-				//don't insert the row if there's more
-				//than 1 item selected and this item is the "none task"
-			} else {
-				$sql="INSERT INTO project_dependencies (project_task_id,is_dependent_on_task_id) 
-					VALUES ('$project_task_id','$array[$i]')";
-				//echo "\n$sql";
-				$result=db_query($sql);
-	
-				if (!$result) {
-					$feedback .= ' ERROR inserting dependent_tasks '.db_error();
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-}
-
-function pm_data_update_dependent_tasks($array,$project_task_id) {
-	/*
-		DELETE THEN Insert the list of dependencies
-	*/
-	$toss=db_query("DELETE FROM project_dependencies WHERE project_task_id='$project_task_id'");
-	return pm_data_insert_dependent_tasks($array,$project_task_id);
-}
-
-/*
-
-	Creates a new task in the task mgr
-
-	Returns new project_task_id or false and $feedback
-
-	DOES NOT HANDLE SECURITY
-
-*/
-
-function pm_data_create_task ($group_project_id,$start_month,$start_day,$start_year,$end_month,$end_day,
-		$end_year,$summary,$details,$percent_complete,$priority,$hours,$assigned_to,$dependent_on) {
-
-	global $feedback;
-	if (!$group_project_id || !$start_month || !$start_day || !$start_year || !$end_month || !$end_day || 
-		!$end_year || !$summary || !$details || !$priority) {
-		$feedback .= ' ERROR - Missing Required Parameters ';
-		return false;
-	}
-
-	if (mktime(0,0,0,$start_month,$start_day,$start_year) > mktime(0,0,0,$end_month,$end_day,$end_year)) {
-		exit_error('Error','End Date Must Be Greater Than Begin Date');
-	}
-
-	$sql="INSERT INTO project_task (group_project_id,summary,details,percent_complete,".
-		"priority,hours,start_date,end_date,".
-		"created_by,status_id) VALUES ('$group_project_id','".htmlspecialchars($summary)."',".
-		"'".htmlspecialchars($details)."','$percent_complete','$priority','$hours','".
-		mktime(0,0,0,$start_month,$start_day,$start_year)."','".
-		mktime(0,0,0,$end_month,$end_day,$end_year)."','".user_getid()."','1')";
-
-	db_begin();
-
-	$result=db_query($sql);
-	$project_task_id=db_insertid($result,'project_task','project_task_id');
-
-	if (!$result || !$project_task_id) {
-		$feedback .= ' ERROR INSERTING ROW '.db_error();
-		db_rollback();
-		return false;
-	} else {
-		$feedback .= ' Successfully added task ';
-		if (!pm_data_insert_assigned_to($assigned_to,$project_task_id)) {
-			db_rollback();
-			$feedback .= ' ERROR inserting assigned to ';
-			return false;
-		}
-		if (!pm_data_insert_dependent_tasks($dependent_on,$project_task_id)) {
-			db_rollback();
-			$feedback .= ' ERROR inserting assigned to ';
-			return false;
-		}
-		mail_followup($project_task_id,$group_project_id);
-		db_commit();
-		return $project_task_id;
-	}
-}
-
-/*
-
-	Update a task
-
-	Returns true/false and $feedback string
-
-	DOES NOT HANDLE SECURITY AT THIS TIME *************
-	This assumes that you have verified this $group_project_id truly belongs to this $group_id
-	AND that this user is a project_task_admin
-
-*/
-
-function pm_data_update_task ($group_project_id,$project_task_id,$start_month,$start_day,$start_year,
-		$end_month,$end_day,$end_year,$summary,$details,$percent_complete,$priority,$hours,
-		$status_id,$assigned_to,$dependent_on,$new_group_project_id,$group_id) {
-
-	global $feedback;
-	if (!$group_project_id || !$project_task_id || !$status_id || !$start_month || !$start_day || !$start_year || 
-		!$end_month || !$end_day || !$end_year || !$summary || !$priority || !$new_group_project_id || !$group_id) {
-		$feedback .= ' ERROR - Missing Parameters ';
-		return false;
-	}
-	$sql="SELECT * FROM project_task WHERE project_task_id='$project_task_id' AND group_project_id='$group_project_id'";
-
-	$result=db_query($sql);
-
-	if (db_numrows($result) < 1) {
-		$feedback .= ' ERROR - Task Doesn\'t Exist In This Subproject ';
-		return false;
-	}
-
-	/*
-		Enforce start date > end date
-	*/
-	if (mktime(0,0,0,$start_month,$start_day,$start_year) > mktime(0,0,0,$end_month,$end_day,$end_year)) {
-		$feedback .= ' ERROR - End Date Must Be Greater Than Start Date ';
-		return false;
-	}
-
-	db_begin();
-
-	/*
-		If changing subproject, verify the new subproject belongs to this project
-	*/
-	if ($group_project_id != $new_group_project_id) {
-		$sql = "SELECT group_id FROM project_group_list WHERE group_project_id='$new_group_project_id'";
-		
-		if (db_result(db_query($sql),0,'group_id') != $group_id) {
-			$feedback .= ' You can not put this task into the subproject of another group. ';
-			db_rollback();
-			return false;
-		} else {
-			pm_data_create_history ('subproject_id',$group_project_id,$project_task_id);
-		}
-	}
-
-	/*
-		See which fields changed during the modification
-		and create audit trail
-	*/
-
-	if (db_result($result,0,'status_id') != $status_id)
-		{ pm_data_create_history ('status_id',db_result($result,0,'status_id'),$project_task_id);  }
-
-	if (db_result($result,0,'priority') != $priority)
-		{ pm_data_create_history ('priority',db_result($result,0,'priority'),$project_task_id);  }
-
-	if (db_result($result,0,'summary') != htmlspecialchars(stripslashes($summary)))
-		{ pm_data_create_history ('summary',addslashes(db_result($result,0,'summary')),$project_task_id);  }
-
-	if (db_result($result,0,'percent_complete') != $percent_complete)
-		{ pm_data_create_history ('percent_complete',db_result($result,0,'percent_complete'),$project_task_id);  }
-
-	if (db_result($result,0,'hours') != $hours)
-		{ pm_data_create_history ('hours',db_result($result,0,'hours'),$project_task_id);  }
-
-	if (db_result($result,0,'start_date') != mktime(0,0,0,$start_month,$start_day,$start_year))
-		{ pm_data_create_history ('start_date',db_result($result,0,'start_date'),$project_task_id);  }
-
-	if (db_result($result,0,'end_date') != mktime(0,0,0,$end_month,$end_day,$end_year))
-		{ pm_data_create_history ('end_date',db_result($result,0,'end_date'),$project_task_id);  }
-
-	/*
-		Details field is handled a little differently
-
-		Details are comments attached to bugs
-		They are still stored in the project_history (audit trail)
-		system, but they are not shown in the regular audit trail
-
-		Someday, these should technically be split into their own table.
-	*/
-	if ($details != '') 
-		{ pm_data_create_history ('details',htmlspecialchars($details),$project_task_id);  }
-
-	if (!pm_data_update_dependent_tasks($dependent_on,$project_task_id)) {
-		db_rollback();
-		$feedback .= ' ERROR updating dependent tasks ';
-		return false;
-	}
-	if (!pm_data_update_assigned_to($assigned_to,$project_task_id)) {
-		db_rollback();
-		$feedback .= ' ERROR updating assigned to ';
-		return false;
-	}
-
-	/*
-		Update the actual db record
-	*/
-	$sql="UPDATE project_task SET status_id='$status_id', priority='$priority',".
-		"summary='".htmlspecialchars($summary)."',start_date='".
-		mktime(0,0,0,$start_month,$start_day,$start_year)."',end_date='".
-		mktime(0,0,0,$end_month,$end_day,$end_year)."',hours='$hours',".
-		"percent_complete='$percent_complete', ".
-		"group_project_id='$new_group_project_id' ".
-		"WHERE project_task_id='$project_task_id' AND group_project_id='$group_project_id'";
-
-	$result=db_query($sql);
-	if (!$result) {
-		$feedback .= ' ERROR - Database Update Failed '.db_error();
-		db_rollback();
-		return false;
-	} else {
-		$feedback .= ' Successfully Modified Task ';
-		mail_followup($project_task_id,$new_group_project_id);
-		db_commit();
-		return true;
-	}
-
-}
-
-function mail_followup($project_task_id,$group_project_id,$more_addresses=false,$new_task=0) {
-	global $sys_datefmt,$feedback;
-	/*
-	
-		Send a message to the person who opened this task and the person(s) it is assigned to
-
-		Accepts the unique id of a task, its group project id and optionally a list of additional addresses to send to
-
-	*/
-
-	$sql="SELECT project_task.*, project_group_list.*, groups.group_name,groups.new_task_address, ".
-		"groups.send_all_tasks,project_status.status_name,users.email, ".
-                "users.user_name AS creator_name ".
-		"FROM project_task,project_group_list,project_status,users,groups ".
-		"WHERE project_task_id='$project_task_id' ".
-		"AND project_task.group_project_id='$group_project_id' ".
-		"AND project_task.status_id=project_status.status_id ".
-		"AND project_task.group_project_id=project_group_list.group_project_id ".
-		"AND groups.group_id=project_group_list.group_id ".
-		"AND project_task.created_by=users.user_id";
-		
-	$result=db_query($sql);
-	
-	if ($result && db_numrows($result) > 0) {
-	
-		// Send a message to the task creator
-		$to = db_result($result,0,'email');
-
-		// Build the list of developers assigned this task
-		$sql="SELECT users.email AS Email,users.user_name ".
-			"FROM users,project_assigned_to ".
-			"WHERE project_assigned_to.project_task_id='$project_task_id' ".
-			"AND users.user_id=project_assigned_to.assigned_to_id";
-
-		$result3=db_query($sql);
-		$rows=db_numrows($result3);
-		if ($result3 && $rows > 0) {
-                        $to .= ', ';
-			$to .= implode(result_column_to_array($result3),', ');
-		}
-
-		$body = "Task #".db_result($result,0,"project_task_id")." has been updated. ".
-			"\n\nProject: ".db_result($result,0,'group_name').
-			"\nSubproject: ".db_result($result,0,'project_name').
-			"\nSummary: ".util_unconvert_htmlspecialchars(db_result($result,0,'summary')).
-			"\nPercent Complete: ".db_result($result,0,'percent_complete')."%".
-			"\nStatus: ".db_result($result,0,'status_name').
-			"\nAuthority  : ".db_result($result,0,'creator_name').
-			"\nAssigned to: ".$assignees.
-			"\n\nDescription: ".db_result($result,0,'details');
-			
-		/*      
-			Now get the followups to this task
-		*/
-		$sql="SELECT project_history.field_name,project_history.old_value,project_history.date,users.user_name ".
-			"FROM project_history,users ".
-			"WHERE project_history.mod_by=users.user_id AND project_history.field_name = 'details' ".
-			"AND project_task_id='$project_task_id' ORDER BY project_history.date DESC";
-		$result2=db_query($sql);
-		$rows=db_numrows($result2);
-		if ($result2 && $rows > 0) {
-			$body .= "\n\nFollow-Ups:";
-			for ($i=0; $i<$rows;$i++) {
-				$body .= "\n\n-------------------------------------------------------";
-				$body .= "\nDate: ".date($sys_datefmt,db_result($result2,$i,'date'));
-				$body .= "\nBy: ".db_result($result2,$i,'user_name');
-				$body .= "\n\nComment:\n".util_unconvert_htmlspecialchars(db_result($result2,$i,'old_value'));
-			}
-		}
-		$body .= "\n\n-------------------------------------------------------".
-			"\nFor more info, visit:".
-			"\n\nhttp://$GLOBALS[sys_default_domain]/pm/task.php?func=detailtask&project_task_id=".
-				db_result($result,0,'project_task_id')."&group_id=".
-				db_result($result,0,'group_id')."&group_project_id=".db_result($result,0,'group_project_id');
-		
-		$subject="[Task #".db_result($result,0,'project_task_id').'] '.
-			util_unconvert_htmlspecialchars(db_result($result,0,'summary'));
-		
-		
-		// Append the list of additional receiptients
-		if ($more_addresses) {
-			$to .= ', ' . $more_addresses;
-		}
-		
-		// If this is a new task, or if send all tasks == 1,
-		// append the new_task_address for the group
-		if (($new_task && db_result($result,0,'new_task_address')) || db_result($result,0,'send_all_tasks')) {
-			$to .= ', ' . db_result($result,0,'new_task_address');
-		}
-		
-		$more='From: noreply@'.$GLOBALS['sys_default_domain'];
-		
-		mail($to,$subject,$body,$more);
-		
-		$feedback .= " Task Update Sent ";
-		
-	} else {	
-	
-		$feedback .= " Could Not Send Task Update ";
-		echo db_error();
-		
-	}       
-}       
-
-?>

Modified: trunk/gforge_base/evolvisforge/gforge/www/softwaremap/trove_list.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/softwaremap/trove_list.php	2010-02-25 13:22:22 UTC (rev 419)
+++ trunk/gforge_base/evolvisforge/gforge/www/softwaremap/trove_list.php	2010-02-25 13:22:24 UTC (rev 420)
@@ -1,30 +1,43 @@
 <?php
-//
-// SourceForge: Breaking Down the Barriers to Open Source Development
-// Copyright 1999-2000 (c) The SourceForge Crew
-// http://sourceforge.net
-//
-// $Id$
+/**
+  *
+  * SourceForge Trove Software Map
+  *
+  * SourceForge: Breaking Down the Barriers to Open Source Development
+  * Copyright 1999-2001 (c) VA Linux Systems
+  * http://sourceforge.net
+  *
+  * @version   $Id$
+  *
+  */
 
-require "pre.php";    
-require "vars.php";
-require "trove.php";
 
-$HTML->header(array('title'=>'Software Map'));
+require_once('pre.php');    
+require_once('common/include/vars.php');
+require_once('www/include/trove.php');
+
+$HTML->header(array('title'=>'Software Map','pagename'=>'softwaremap'));
+
 echo'
-	<FONT face="arial, helvetica" size="5"><B>Software Map</B></FONT>
-	<HR NoShade>
-';
+	<HR NoShade>';
 
 // assign default. 18 is 'topic'
-if (!$form_cat) $form_cat = 18;
+if (!$form_cat) 
+	$form_cat = 18;
+
 $form_cat = intval($form_cat);
 
 // get info about current folder
-$res_trove_cat = db_query('SELECT * FROM trove_cat WHERE trove_cat_id='.$form_cat);
+$res_trove_cat = db_query("
+	SELECT *
+	FROM trove_cat
+	WHERE trove_cat_id='$form_cat'");
+
 if (db_numrows($res_trove_cat) < 1) {
-	echo db_error();
-	exit_error('Invalid Trove Category','That Trove category does not exist.');
+	exit_error(
+		'Invalid Trove Category',
+		'That Trove category does not exist: '.db_error()
+	);
 }
 $row_trove_cat = db_fetch_array($res_trove_cat);
 
@@ -46,8 +59,8 @@
 	$discrim_url = '&discrim=';
 
 	$lims=sizeof($expl_discrim);
-	if ($lims > 2) {
-		$lims=2;
+	if ($lims > 6) {
+		$lims=6;
 	}
 
 	// one per argument	
@@ -133,14 +146,20 @@
 }
 
 // print subcategories
-$res_sub = db_query('SELECT trove_cat.trove_cat_id AS trove_cat_id,'
-	.'trove_cat.fullname AS fullname,'
-	.'trove_treesums.subprojects AS subprojects FROM trove_cat '
-	.'LEFT JOIN trove_treesums USING (trove_cat_id) '
-	.'WHERE (trove_treesums.limit_1=0 '
-	.'OR trove_treesums.limit_1 IS NULL) AND ' // need no discriminators
-	.'trove_cat.parent='.$form_cat.' ORDER BY fullname');
+$res_sub = db_query("
+	SELECT trove_cat.trove_cat_id AS trove_cat_id,
+		trove_cat.fullname AS fullname,
+		trove_treesums.subprojects AS subprojects
+	FROM trove_cat LEFT JOIN trove_treesums USING (trove_cat_id) 
+	WHERE (
+		trove_treesums.limit_1=0 
+		OR trove_treesums.limit_1 IS NULL
+	) AND " // need no discriminators
+	."trove_cat.parent='$form_cat'
+	ORDER BY fullname
+", -1, 0, SYS_DB_TROVE);
 echo db_error();
+
 while ($row_sub = db_fetch_array($res_sub)) {
 	for ($sp=0;$sp<($folders_len*2);$sp++) {
 		print " &nbsp; ";
@@ -154,9 +173,13 @@
 // ########### right column: root level
 print '</TD><TD><FONT face="arial, helvetica" size="3">';
 // here we print list of root level categories, and use open folder for current
-$res_rootcat = db_query('SELECT trove_cat_id,fullname FROM trove_cat WHERE '
-	.'parent=0 ORDER BY fullname');
+$res_rootcat = db_query("
+	SELECT trove_cat_id,fullname
+	FROM trove_cat
+	WHERE parent=0
+	ORDER BY fullname");
 echo db_error();
+
 print 'Browse by:';
 while ($row_rootcat = db_fetch_array($res_rootcat)) {
 	// print open folder if current, otherwise closed
@@ -180,97 +203,14 @@
 <?php
 // one listing for each project
 
-// $query_projlist = "SELECT * 
-// 	FROM trove_agg
-// 	$discrim_queryalias
-// 	WHERE trove_agg.trove_cat_id='$form_cat'
-// 	$discrim_queryand";
-
-// [RM]
-$query_projlist = "SELECT trove_group_link.trove_cat_id, trove_group_link.group_id,
-                   groups.group_name, groups.unix_group_name, groups.status,
-                   groups.register_time, groups.short_description
-	FROM trove_group_link, groups
+$res_grp = db_query("
+	SELECT * 
+	FROM trove_agg
 	$discrim_queryalias
-	WHERE trove_group_link.trove_cat_id='$form_cat'
-        AND trove_group_link.group_id = groups.group_id
-	$discrim_queryand";
-
-/*
-
-//old query
-$query_projlist = "SELECT groups.group_id, "
-	. "groups.group_name, "
-	. "groups.unix_group_name, "
-	. "groups.status, "
-	. "groups.register_time, "
-	. "groups.short_description, "
-	. "project_metric.percentile, "
-	. "project_metric.ranking "
-	. "FROM groups "
-	. "LEFT JOIN project_metric USING (group_id) "
-	. ", trove_group_link "
-	. $discrim_queryalias
-	. "WHERE trove_group_link.group_id=groups.group_id AND "
-	. "(groups.is_public=1) AND "
-	. "(groups.type=1) AND "
-	. "(groups.status='A') AND "
-	. "trove_group_link.trove_cat_id=$form_cat "
-	. $discrim_queryand
-//	. "GROUP BY groups.group_id "
-	. "ORDER BY groups.group_name ";
-*/
-/*
-
-//nightly aggregation query
-CREATE TABLE trove_agg AS
-SELECT tgl.trove_cat_id, g.group_id, g.group_name, g.unix_group_name, g.status, g.register_time, g.short_description, 
-        project_metric.percentile, project_metric.ranking 
-        FROM groups g
-        LEFT JOIN project_metric USING (group_id) , 
-        trove_group_link tgl 
-        WHERE 
-        tgl.group_id=g.group_id 
-        AND (g.is_public=1) 
-        AND (g.type=1) 
-        AND (g.status='A') 
-	ORDER BY g.group_name;
-
-CREATE INDEX troveagg_trovecatid ON trove_agg(trove_cat_id);
-
-SELECT * 
-	FROM trove_agg ,
-	trove_group_link trove_group_link_0 ,
-	trove_group_link trove_group_link_1 
-	WHERE trove_agg.trove_cat_id='20' 
-	AND trove_group_link_0.trove_cat_id=7 
-	AND trove_group_link_0.group_id=trove_agg.group_id 
-	AND trove_group_link_1.trove_cat_id=226 
-	AND trove_group_link_1.group_id=trove_agg.group_id LIMIT 300 OFFSET 0
-
-SELECT g.group_id, g.group_name, g.unix_group_name, g.status, g.register_time, g.short_description, 
-	project_metric.percentile, project_metric.ranking 
-	FROM groups 
-	LEFT JOIN project_metric USING (group_id) , 
-	trove_group_link ,
-	trove_group_link trove_group_link_0 ,
-	trove_group_link trove_group_link_1 
-	WHERE 
-	trove_group_link.group_id=groups.group_id 
-	AND (groups.is_public=1) 
-	AND (groups.type=1) 
-	AND (groups.status='A') 
-	AND trove_group_link.trove_cat_id=7 
-	AND trove_group_link_0.trove_cat_id=7 
-	AND trove_group_link_0.group_id=groups.group_id 
-	AND trove_group_link_1.trove_cat_id=233 
-	AND trove_group_link_1.group_id=groups.group_id 
-	ORDER BY groups.group_name 
-	LIMIT 300 OFFSET 0
-
-*/
-
-$res_grp = db_query($query_projlist,$TROVE_HARDQUERYLIMIT);
+	WHERE trove_agg.trove_cat_id='$form_cat'
+	$discrim_queryand
+	ORDER BY trove_agg.trove_cat_id ASC, trove_agg.ranking ASC
+", $TROVE_HARDQUERYLIMIT, 0, SYS_DB_TROVE);
 echo db_error();
 $querytotalcount = db_numrows($res_grp);
 	
@@ -291,7 +231,7 @@
 
 // only display pages stuff if there is more to display
 if ($querytotalcount > $TROVE_BROWSELIMIT) {
-	$html_limit .= ' Displaying '.$TROVE_BROWSELIMIT.' per page.<BR>';
+	$html_limit .= ' Displaying '.$TROVE_BROWSELIMIT.' per page. Projects sorted by activity ranking.<BR>';
 
 	// display all the numbers
 	for ($i=1;$i<=ceil($querytotalcount/$TROVE_BROWSELIMIT);$i++) {
@@ -341,8 +281,8 @@
 		trove_getcatlisting($row_grp['group_id'],1,0);
 
 		print '</TD>'."\n".'<TD align="right"><FONT face="arial, helvetica" size="3">'; // now the right side of the display
-		print 'Activity Percentile: <B>'.$row_grp['percentile'].'</B>';
-		print '<BR>Activity Ranking: <B>'.$row_grp['ranking'].'</B>';
+		print 'Activity Percentile: <B>'. number_format($row_grp['percentile'],2) .'</B>';
+		print '<BR>Activity Ranking: <B>'. number_format($row_grp['ranking'],2) .'</B>';
 		print '<BR>Register Date: <B>'.date($sys_datefmt,$row_grp['register_time']).'</B>';
 		print '</TD></TR>';
 /*

Modified: trunk/gforge_base/evolvisforge/gforge/www/stats/graphs.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/stats/graphs.php	2010-02-25 13:22:22 UTC (rev 419)
+++ trunk/gforge_base/evolvisforge/gforge/www/stats/graphs.php	2010-02-25 13:22:24 UTC (rev 420)
@@ -1,17 +1,24 @@
 <?php
-//
-// SourceForge: Breaking Down the Barriers to Open Source Development
-// Copyright 1999-2000 (c) The SourceForge Crew
-// http://sourceforge.net
-//
-// $Id$ 
-require('pre.php');
-require('site_stats_utils.php');
+/**
+  *
+  * SourceForge Sitewide Statistics
+  *
+  * SourceForge: Breaking Down the Barriers to Open Source Development
+  * Copyright 1999-2001 (c) VA Linux Systems
+  * http://sourceforge.net
+  *
+  * @version   $Id$
+  *
+  */
 
-   // require you to be a member of the sfstats group (group_id = 11084)
+
+require_once('pre.php');
+require_once('site_stats_utils.php');
+
+// require you to be a member of the sfstats group (group_id = 11084)
 session_require( array('group'=>$sys_stats_group) );
 
-$HTML->header(array('title'=>"SourceForge Site Statistics "));
+$HTML->header(array('title'=>"SourceForge Site Statistics"));
 
 //
 // BEGIN PAGE CONTENT CODE
@@ -35,18 +42,15 @@
 
 <HR>
 
+<BR><BR>
+<IMG SRC="views_graph.png">
+<BR><BR>
+<IMG SRC="views_graph.png?monthly=1">
+<BR><BR>
+<IMG SRC="users_graph.png">
+<BR><BR>
+</DIV>
+
 <?php
-
-print '<BR><BR>' . "\n";
-print '<IMG SRC="' . 'views_graph.png">' . "\n";
-print '<BR><BR>' . "\n";
-print '<IMG SRC="u' . 'users_graph.png">' . "\n";
-print '<BR><BR>' . "\n";
-print '</DIV>' . "\n";
-
-//
-// END PAGE CONTENT CODE
-//
-
 $HTML->footer( array() );
 ?>

Deleted: trunk/gforge_base/evolvisforge/gforge/www/stats/oldindex.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/stats/oldindex.php	2010-02-25 13:22:22 UTC (rev 419)
+++ trunk/gforge_base/evolvisforge/gforge/www/stats/oldindex.php	2010-02-25 13:22:24 UTC (rev 420)
@@ -1,29 +0,0 @@
-<?php
-//
-// SourceForge: Breaking Down the Barriers to Open Source Development
-// Copyright 1999-2000 (c) The SourceForge Crew
-// http://sourceforge.net
-//
-// $Id: oldindex.php,v 1.4 2000/11/16 23:16:01 tperdue Exp $ 
-
-echo "<h1>this page -- if needed -- needs to be fixed to use the new cacher</H1>";
-
-/*
-require('pre.php');
-require('cache.php');
-
-   // require you to be a member of the sfstats group (group_id = 11084)
-session_require( array('group'=>$sys_stats_group) );
-
-$HTML->header(array('title'=>'Site Statistics'));
-
-echo '<P><B> <A HREF="/stats/project.php">Project Stats</A> | <A HREF="/stats/">SourceForge Stats</A> </B>';
-echo '<P>';
-
-echo cache_display("stats_sf_stats",'1',1800);
-
-$HTML->footer(array());
-
-*/
-
-?>

Modified: trunk/gforge_base/evolvisforge/gforge/www/stats/views_graph.png
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/stats/views_graph.png	2010-02-25 13:22:22 UTC (rev 419)
+++ trunk/gforge_base/evolvisforge/gforge/www/stats/views_graph.png	2010-02-25 13:22:24 UTC (rev 420)
@@ -1,13 +1,20 @@
 <?php
-//
-// SourceForge: Breaking Down the Barriers to Open Source Development
-// Copyright 1999-2000 (c) The SourceForge Crew
-// http://sourceforge.net
-//
-// $Id: views_graph.png,v 1.2 2000/08/31 23:15:04 msnelham Exp $
-require('pre.php');
-require("graph_lib.php");
+/**
+  *
+  * SourceForge Sitewide Statistics - stats common module
+  *
+  * SourceForge: Breaking Down the Barriers to Open Source Development
+  * Copyright 1999-2001 (c) VA Linux Systems
+  * http://sourceforge.net
+  *
+  * @version   $Id: change_email.php,v 1.12 2001/05/13 17:53:29 pfalcon Exp $
+  *
+  */
 
+
+require_once('pre.php');
+require_once('graph_lib.php');
+
    // require you to be a member of the sfstats group (group_id = 11084)
 session_require( array('group'=>$sys_stats_group) );
 
@@ -20,15 +27,29 @@
 	$year = gmstrftime("%Y", time() );
 }
 
-$sql = "SELECT month,day,site_views,subdomain_views FROM stats_site ORDER BY month ASC, day ASC";
-$res = db_query( $sql );
+if ($monthly) {
 
+	$sql = "SELECT month,site_page_views AS site_views,subdomain_views 
+		FROM stats_site_months ORDER BY month ASC";
+	$grouping='Months';
+
+} else {
+
+	$sql = "SELECT month,day,site_page_views AS site_views,subdomain_views 
+		FROM stats_site_last_30 ORDER BY month ASC, day ASC";
+	$grouping='Days';
+
+}
+
+$res = db_query($sql, -1, 0, SYS_DB_STATS);
+//echo db_error();
+
 $i = 0;
 $xdata = array();
 $ydata = array();
 while ( $row = db_fetch_array($res) ) {
         $xdata[$i]          = $i;
-	$xlabel[$i]         = (substr($row['month'],4) + 1 - 1) . "/" . $row['day'];
+	$xlabel[$i]         = $row['month'] . (($row['day']) ? "/" . $row['day'] : '');
         $ydata1[$i]         = $row["site_views"] + $row["subdomain_views"];
         ++$i;
 }
@@ -40,7 +61,7 @@
 $graph->DrawGrid('gray');
 $graph->LineGraph($data1,'red');
 $graph->SetTitle( "Sourceforge Page Views" );
-$graph->SetSubTitle("Page Views (RED) since beginning of time ( $i days )");
+$graph->SetSubTitle("Total Page Views (RED) ( $i $grouping )");
 $graph->SetxTitle('Date');
 $graph->SetyTitle('Views (RED)');
 $graph->DrawAxis();




More information about the evolvis-commits mailing list