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

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


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

Modified:
   trunk/gforge_base/evolvisforge/
   trunk/gforge_base/evolvisforge/gforge/etc/local.inc
   trunk/gforge_base/evolvisforge/gforge/www/forum/forum.php
   trunk/gforge_base/evolvisforge/gforge/www/index.php
   trunk/gforge_base/evolvisforge/gforge/www/mail/admin/index.php
   trunk/gforge_base/evolvisforge/gforge/www/mail/index.php
   trunk/gforge_base/evolvisforge/gforge/www/new/index.php
   trunk/gforge_base/evolvisforge/gforge/www/source.php
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:37:26.000000000 +0000
committer: lo-lan-do

   + timestamp: 2001-11-02 15:46:40.000000000 +0000
committer: lo-lan-do

Name: bzr:file-ids
   - 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

   + gforge/etc/local.inc	2 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fetc%2Flocal.inc
gforge/www/forum/forum.php	2 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fwww%2Fforum%2Fforum.php
gforge/www/index.php	2 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fwww%2Findex.php
gforge/www/mail/admin/index.php	2 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fwww%2Fmail%2Fadmin%2Findex.php
gforge/www/mail/index.php	2 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fwww%2Fmail%2Findex.php
gforge/www/new/index.php	2 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fwww%2Fnew%2Findex.php
gforge/www/source.php	2 at 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk%2Fgforge%2Fwww%2Fsource.php

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
186 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:199

   + 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
187 svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:200

Name: bzr:text-parents
   - 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

   + gforge/etc/local.inc	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:7
gforge/www/forum/forum.php	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:7
gforge/www/index.php	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:7
gforge/www/mail/admin/index.php	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:17
gforge/www/mail/index.php	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:86
gforge/www/new/index.php	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:7
gforge/www/source.php	svn-v4:9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:trunk:7


Modified: trunk/gforge_base/evolvisforge/gforge/etc/local.inc
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/etc/local.inc	2010-02-25 13:22:24 UTC (rev 420)
+++ trunk/gforge_base/evolvisforge/gforge/etc/local.inc	2010-02-25 13:22:27 UTC (rev 421)
@@ -65,10 +65,10 @@
 // Part II - Databases, html/php/other paths
 //server to use for updates and reads
 $sys_dbhost="localhost";
-//whether or not to use mysql replication
+//whether or not to use replication
 $sys_db_use_replication=true;
-//server to use for read-only stuff
 $sys_dbreadhost='localhost';
+$sys_dbreaddb='stats';
 $sys_dbname="alexandria";
 $sys_dbuser="www";
 $sys_dbpasswd="";
@@ -110,8 +110,27 @@
 $sf_cache_dir = "/var/cache/sourceforge";
 // Name of the system as a whole (needed by various utils and titles)
 $sys_name="prodigy";
+
+// session cookie settings
+//
+$sys_session_key        = "foobar";
+$sys_session_expire     = 60 * 60 * 24 * 7; 
+$sys_session_cypher     = MCRYPT_TWOFISH;
+$sys_session_cyphermode = MCRYPT_MODE_ECB;
+
+// username cookie settings
+//
+$sys_username_cookie_key        = "frobaz";
+$sys_username_cookie_urlspace   = ".company.com";
+$sys_username_cookie_expiration = 60 * 60 * 24 * 7;
+$sys_username_cookie_plaintext  = true;
+$sys_username_cookie_cypher     = MCRYPT_BLOWFISH;
+$sys_username_cookie_cyphermode = MCRYPT_MODE_ECB;
+
+// Require that user give unique (not yet existent in db) email upon
+// registration
+$sys_require_unique_email=0;
  
- 
 // Part III - GUI modifications (menu colors, etc.)
 //    See the top of the file include/html.php, this is where the menu colors
 //    and colors used throughout SourceForge are defined.
@@ -121,7 +140,7 @@
 $sys_themeroot=$sys_urlroot."themes/";
 
 // Akamization of images
-$sys_images_url = "//a248.e.akamai.net/7/248/1710/949111342/sourceforge.net/";
+$sys_images_url = "";
 
 // Part IV - Groups
 //  The SourceForge permission model is based on groups

Modified: trunk/gforge_base/evolvisforge/gforge/www/forum/forum.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/forum/forum.php	2010-02-25 13:22:24 UTC (rev 420)
+++ trunk/gforge_base/evolvisforge/gforge/www/forum/forum.php	2010-02-25 13:22:27 UTC (rev 421)
@@ -1,10 +1,15 @@
 <?php
-//
-// SourceForge: Breaking Down the Barriers to Open Source Development
-// Copyright 1999-2000 (c) The SourceForge Crew
-// http://sourceforge.net
-//
-// $Id$
+/**
+  *
+  * SourceForge Forums Facility
+  *
+  * SourceForge: Breaking Down the Barriers to Open Source Development
+  * Copyright 1999-2001 (c) VA Linux Systems
+  * http://sourceforge.net
+  *
+  * @version   $Id$
+  *
+  */
 
 /*
 
@@ -15,10 +20,11 @@
 
 */
 
-require('pre.php');
-require('../forum/forum_utils.php');
+require_once('pre.php');
+require_once('www/forum/forum_utils.php');
 
 if ($forum_id) {
+
 	/*
 		Set up global vars that are expected by some forum functions
 	*/
@@ -33,15 +39,25 @@
 	$allow_anonymous=db_result($result,0,'allow_anonymous');
 	$send_all_posts_to=db_result($result,0,'send_all_posts_to');
 
+	//
+	//	Set up local objects
+	//
+	$g =& group_get_object($group_id);
+
+	if (user_isloggedin()) {
+		$u =& session_get_user();
+		$perm =& $g->getPermission($u);
+	}
+
 	//private forum check
-	if (!db_result($result,0,'is_public')) {
-		if (!user_isloggedin() || !user_ismember($group_id)) {
+	if (db_result($result,0,'is_public') != 1) {
+		if (!user_isloggedin() || (user_isloggedin() && !$perm->isMember())) {
 			/*
 				If this is a private forum, kick 'em out
 			*/
 			exit_error('ERROR','Forum is restricted to members of this group');
 		}	 
-	}	 
+	}
 
 
 	/*
@@ -67,7 +83,7 @@
 		$style='nested';
 	}
 	if (!$style || ($style != 'ultimate' && $style != 'flat' && $style != 'nested' && $style != 'threaded')) {
-		$style='nested';
+		$style='ultimate';
 	}
 
 	if (!$max_rows || $max_rows < 5) {
@@ -85,25 +101,20 @@
 	if (!$thread_id && user_isloggedin()) {
 		$_pref=$style.'|'.$max_rows;
 		if ($set=='custom') {
-//echo "<P>checking pref";
-			if (user_get_preference('forum_style')) {
-//echo "<P>pref exists";
-				if ($_pref == user_get_preference('forum_style')) {
-//echo "<P>pref same: $_pref";
+			if ($u->getPreference('forum_style')) {
+				if ($_pref == $u->getPreference('forum_style')) {
 					//do nothing - pref already stored
 				} else {
-//echo "<P>setting pref: $_pref";
 					//set the pref
-					user_set_preference ('forum_style',$_pref);
+					$u->setPreference ('forum_style',$_pref);
 				}
 			} else {
-//echo "<P>setting pref";
 					//set the pref
-					user_set_preference ('forum_style',$_pref);
+					$u->setPreference ('forum_style',$_pref);
 			}
 		} else {
-			if (user_get_preference('forum_style')) {
-				$_pref_arr=explode ('|',user_get_preference('forum_style'));
+			if ($u->getPreference('forum_style')) {
+				$_pref_arr=explode ('|',$u->getPreference('forum_style'));
 				$style=$_pref_arr[0];
 				$max_rows=$_pref_arr[1];
 			} else {
@@ -113,12 +124,15 @@
 		}
 	}
 	if (!$style || ($style != 'ultimate' && $style != 'flat' && $style != 'nested' && $style != 'threaded')) {
-		$style='nested';
+		$style='ultimate';
 	}
 
+	if (!$max_rows || $max_rows < 5) {
+		$max_rows=25; 
+	}
 
 //echo "<P>style: $style";
-	forum_header(array('title'=>$forum_name));
+	forum_header(array('title'=>$forum_name,'pagename'=>'forum_forum','sectionvals'=>group_getname($group_id),'forum_id'=>$forum_id));
 
 /**
  *
@@ -197,6 +211,9 @@
 		"ORDER BY forum.most_recent_date DESC";
 
 		$result=db_query($sql,($max_rows+25),$offset);
+
+		echo db_error();
+
 		while ($row=db_fetch_array($result)) {
 			$msg_arr["$row[is_followup_to]"][]=$row;
 		}
@@ -233,6 +250,9 @@
 		"ORDER BY forum.most_recent_date DESC";
 		
 		$result=db_query($sql,($max_rows+25),$offset);
+
+		echo db_error();
+
 		while ($row=db_fetch_array($result)) {
 			$msg_arr["$row[is_followup_to]"][]=$row;
 		}
@@ -248,7 +268,7 @@
 			 
 		if ($rows > $max_rows) {
 			$rows=$max_rows;
-		}       
+		}	   
 		$i=0;	 
 		while (($i < $rows) && ($total_rows < $max_rows)) {
 			$thread=$msg_arr["0"][$i];
@@ -257,14 +277,14 @@
 			$ret_val .= '<TR BGCOLOR="'. html_get_alt_row_color($total_rows) .'"><TD><A HREF="/forum/message.php?msg_id='.
 				$thread['msg_id'].'">'.
 				html_image("images/msg.gif","12","10",array("BORDER"=>"0"));
-			/*      
+			/*	  
 				See if this message is new or not
 				If so, highlite it in bold
 			*/
 			if (get_forum_saved_date($forum_id) < $thread['date']) {
 				$ret_val .= '<B>';
 			}
-			/*      
+			/*	  
 				show the subject and poster
 			*/
 			$ret_val .= $thread['subject'] .'</A></TD>'.
@@ -296,6 +316,9 @@
 		"ORDER BY forum.msg_id DESC";
 
 		$result=db_query($sql,($max_rows+1),$offset);
+
+		echo db_error();
+
 		$i=0;	 
 		while (($row=db_fetch_array($result)) && ($i < $max_rows)) {
 			$ret_val .= forum_show_a_nested_message ( $row ).'<BR>';
@@ -319,8 +342,9 @@
 			"ORDER BY f.most_recent_date DESC";
 
 		$result=db_query($sql,($max_rows+1),$offset);
-//echo db_error();
-//echo "In Ultimate View";
+
+		echo db_error();
+
 		$title_arr=array();
 		$title_arr[]='Topic';
 		$title_arr[]='Topic Starter';
@@ -331,23 +355,23 @@
 		$i=0;
 		while (($row=db_fetch_array($result)) && ($i < $max_rows)) {
 			$ret_val .= '
-			        <TR BGCOLOR="'. html_get_alt_row_color($i) .'"><TD><A HREF="/forum/forum.php?thread_id='.
-			        $row['thread_id'].'&forum_id='.$forum_id.'">'.
-			        html_image("images/ic/cfolder15.png","15","13",array("border"=>"0")) . '  &nbsp; ';
-			/*      
-			        See if this message is new or not
-			        If so, highlite it in bold
+				<TR BGCOLOR="'. html_get_alt_row_color($i) .'"><TD><A HREF="/forum/forum.php?thread_id='.
+				$row['thread_id'].'&forum_id='.$forum_id.'">'.
+				html_image("images/ic/cfolder15.png","15","13",array("border"=>"0")) . '  &nbsp; ';
+			/*	  
+					See if this message is new or not
+					If so, highlite it in bold
 			*/
 			if (get_forum_saved_date($forum_id) < $row['recent']) {
-			        $ret_val .= '<B>';
+					$ret_val .= '<B>';
 			}
 			/* 
-			        show the subject and poster
+					show the subject and poster
 			*/
 			$ret_val .= $row['subject'] .'</A></TD>'.
-			        '<TD>'. $row['user_name'] .'</TD>'.
+				'<TD>'. $row['user_name'] .'</TD>'.
 				'<TD>'. $row['followups'] .'</TD>'.
-			        '<TD>'.date($sys_datefmt,$row['recent']).'</TD></TR>';
+				'<TD>'.date($sys_datefmt,$row['recent']).'</TD></TR>';
 			$i++;
 		}
 
@@ -362,8 +386,8 @@
 		<TR BGCOLOR="#EEEEEE"><TD WIDTH="50%">';
 	if ($offset != 0) {
 		$ret_val .= '<FONT face="Arial, Helvetica" SIZE="3" STYLE="text-decoration: none"><B>
-			<A HREF="javascript:history.back()"><B>' .
-			html_image("images/t2.gif","15","15",array("BORDER"=>"0","ALIGN"=>"MIDDLE")) . ' Previous Messages</A></B></FONT>';
+		<A HREF="javascript:history.back()"><B>' .
+		html_image("images/t2.gif","15","15",array("BORDER"=>"0","ALIGN"=>"MIDDLE")) . ' Previous Messages</A></B></FONT>';
 	} else {
 		$ret_val .= '&nbsp;';
 	}
@@ -372,9 +396,9 @@
 
 	if (db_numrows($result) > $max_rows) {
 		$ret_val .= '<FONT face="Arial, Helvetica" SIZE=3 STYLE="text-decoration: none"><B>
-			<A HREF="/forum/forum.php?max_rows='.$max_rows.'&style='.$style.'&offset='.($offset+$i).'&forum_id='.$forum_id.'">
-			<B>Next Messages ' .
-			html_image("images/t.gif","15","15",array("BORDER"=>"0","ALIGN"=>"MIDDLE")) . '</A>';
+		<A HREF="/forum/forum.php?max_rows='.$max_rows.'&style='.$style.'&offset='.($offset+$i).'&forum_id='.$forum_id.'">
+		<B>Next Messages ' .
+		html_image("images/t.gif","15","15",array("BORDER"=>"0","ALIGN"=>"MIDDLE")) . '</A>';
 	} else {
 		$ret_val .= '&nbsp;';
 	}
@@ -390,7 +414,7 @@
 		//	Viewing a particular thread in nested view
 		//
 		echo '<CENTER><h3>Post A Message To This Thread:</H3></CENTER>';
-                show_post_form($forum_id,$thread_id,$msg_arr["0"][0]['msg_id'],$msg_arr["0"][0]['subject']);
+				show_post_form($forum_id,$thread_id,$msg_arr["0"][0]['msg_id'],$msg_arr["0"][0]['subject']);
 	} else {
 		//
 		//	Viewing an entire message forum in a given format

Modified: trunk/gforge_base/evolvisforge/gforge/www/index.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/index.php	2010-02-25 13:22:24 UTC (rev 420)
+++ trunk/gforge_base/evolvisforge/gforge/www/index.php	2010-02-25 13:22:27 UTC (rev 421)
@@ -1,17 +1,22 @@
 <?php
-//
-// SourceForge: Breaking Down the Barriers to Open Source Development
-// Copyright 1999-2000 (c) The SourceForge Crew
-// http://sourceforge.net
-//
-// $Id$
+/**
+  *
+  * SourceForge Front 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');    // Initial db and session library, opens session
-require ('cache.php');
-require($DOCUMENT_ROOT.'/forum/forum_utils.php');
-require ('features_boxes.php');
+require_once('pre.php');    // Initial db and session library, opens session
+require_once('www/include/cache.php');
+require_once('www/forum/forum_utils.php');
+require_once('www/include/features_boxes.php');
 
-$HTML->header(array('title'=>'Welcome'));
+$HTML->header(array('title'=>'Welcome','pagename'=>'home'));
 
 ?>
 <!-- whole page table -->
@@ -21,25 +26,25 @@
 	<hr width="100%" size="1" noshade>
 	<span class="slogan">
 	<div align="center">
-	<?php echo $Language->BREAKING_DOWN_BARRIERS; ?>
+	<?php echo $Language->getText('home','breaking_down_barriers'); ?>
 	</div>
 	</span>
         <hr width="100%" size="1" noshade>
 	&nbsp;<br>
 <P>
 <?php
-
+ 
 /*
 
-	Temp way of getting
+       Temp way of getting
 
-	blurb before the content mgr is ready
+       blurb before the content mgr is ready
 
 */
 
-echo $Language->HOME_PAGE_ABOUT_BLURB;
+echo $Language->getText('home','about_blurb');
 echo '<P>';
-// echo $HTML->box1_top($Language->GROUP_LONG_FOUNDRIES);
+// echo $HTML->box1_top($Language->getText('menu','long_foundries'));
 ?>
 
 <!--
@@ -47,6 +52,12 @@
 <br><b>SourceForge Development Foundries</b><br><br>
 <table bgcolor="White" border="0" cellpadding="0" cellspacing="0" valign="top" width="100%">
 <tr>
+	<td>Essentials:</td>
+</tr>
+<tr>
+	<td><font size="-1"><a href="/foundry/linuxkernel/">Linux Kernel</a>, <a href="/foundry/linuxdrivers/"><b>Linux Drivers</b></a></font></td>
+</tr>
+<tr>
 	<td>Hardware:</td>
 	<td>Programming:</td>
 </tr>
@@ -79,7 +90,7 @@
 -->
 
 <?php
-echo $HTML->box1_top($Language->GROUP_LONG_NEWS);
+echo $HTML->box1_top($Language->getText('group','long_news'));
 echo news_show_latest($sys_news_group,5,true,false,false,5);
 echo $HTML->box1_bottom();
 ?>
@@ -90,7 +101,7 @@
 
 echo '<TD width="35%" VALIGN="TOP">';
 
-echo cache_display('show_features_boxes','show_features_boxes()',3600);
+echo cache_display('show_features_boxes','show_features_boxes()',(24*3600));
 
 ?>
 

Modified: trunk/gforge_base/evolvisforge/gforge/www/mail/admin/index.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/mail/admin/index.php	2010-02-25 13:22:24 UTC (rev 420)
+++ trunk/gforge_base/evolvisforge/gforge/www/mail/admin/index.php	2010-02-25 13:22:27 UTC (rev 421)
@@ -1,14 +1,20 @@
 <?php
-//
-// SourceForge: Breaking Down the Barriers to Open Source Development
-// Copyright 1999-2000 (c) The SourceForge Crew
-// http://sourceforge.net
-//
-// $Id$
+/**
+  *
+  * SourceForge Mailing Lists Facility
+  *
+  * 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('../mail_utils.php');
 
+require_once('pre.php');
+require_once('../mail_utils.php');
+
 if ($group_id && user_ismember($group_id,'A')) {
 
 	if ($post_changes) {
@@ -18,8 +24,11 @@
 
 		if ($add_list) {
 			$list_password = substr(md5($GLOBALS['session_hash'] . time() . rand(0,40000)),0,16);
-			if (!$list_name || strlen($list_name) < 3) {
-				exit_error('Error','Must Provide List Name That Is 3 or More Characters Long');
+
+			$list_name=stripslashes($list_name);
+
+			if (!$list_name || strlen($list_name) < 4) {
+				exit_error('Error','Must Provide List Name That Is 4 or More Characters Long');
 			}
 			$new_list_name=strtolower(group_getunixname($group_id).'-'.$list_name);
 
@@ -66,7 +75,7 @@
 					. "Your mailing list info is at:\n"
 					. "http://".$GLOBALS['sys_lists_host']."/mailman/listinfo/$new_list_name\n\n"
 					. "List administration can be found at:\n"
-					. "http://".$GLOBALS['sys_lists_host']."/mailman/admin/$new_list_name\n\n"
+					. "https://".$GLOBALS['sys_lists_host']."/mailman/admin/$new_list_name\n\n"
 					. "Your list password is: $list_password\n"
 					. "You are encouraged to change this password as soon as possible.\n\n"
 					. "Thank you for registering your project with SourceForge.\n\n"
@@ -104,10 +113,9 @@
 		/*
 			Show the form for adding forums
 		*/
-		mail_header(array('title'=>'Add a Mailing List'));
+		mail_header(array('title'=>'Add a Mailing List','pagename'=>'mail_admin_add_list'));
 
 		echo '
-			<H2>Add a Mailing List</H2>
 			<P>Lists are named in this manner: 
 			<BR><B>projectname-listname@'. $GLOBALS['sys_lists_host'] .'</B>
 			<P>It will take <B><FONT COLOR="RED">6-24 Hours</FONT></B> for your list 
@@ -142,7 +150,7 @@
 		/*
 			Change a forum to public/private
 		*/
-		mail_header(array('title'=>'Update Mailing Lists'));
+		mail_header(array('title'=>'Update Mailing Lists','pagename'=>'mail_admin_change_status'));
 
 		$sql="SELECT list_name,group_list_id,is_public,description ".
 			"FROM mail_group_list ".
@@ -152,13 +160,10 @@
 
 		if (!$result || $rows < 1) {
 			echo '
-				<H2>No Lists Found</H2>
-				<P>
-				None found for this project';
+				<P>No lists found for this project';
 			echo db_error();
 		} else {
 			echo '
-			<H2>Update Mailing Lists</H2>
 			<P>
 			You can administrate lists from here. Please note that private lists
 			can still be viewed by members of your project, but are not listed on SourceForge.<P>';
@@ -190,7 +195,7 @@
 						<FONT SIZE="-1">
 						<INPUT TYPE="SUBMIT" NAME="SUBMIT" VALUE="Update">
 					</TD>
-					<TD><A href="http://'. $GLOBALS['sys_lists_host'] .'/mailman/admin/'
+					<TD><A href="https://'. $GLOBALS['sys_lists_host'] .'/mailman/admin/'
 					.db_result($result,$i,'list_name').'">[Administrate this list in GNU Mailman]</A>
 				       </TD></TR>
 				       <TR BGCOLOR="'. html_get_alt_row_color($i) .'"><TD COLSPAN="3">
@@ -210,10 +215,9 @@
 			Show main page for choosing 
 			either moderotor or delete
 		*/
-		mail_header(array('title'=>'Mailing List Administration'));
+		mail_header(array('title'=>'Mailing List Administration','pagename'=>'mail_admin'));
 
 		echo '
-			<H2>Mailing List Administration</H2>
 			<P>
 			<A HREF="'.$PHP_SELF.'?group_id='.$group_id.'&add_list=1">Add Mailing List</A><BR>
 			<A HREF="'.$PHP_SELF.'?group_id='.$group_id.'&change_status=1">Administrate/Update Lists</A>';

Modified: trunk/gforge_base/evolvisforge/gforge/www/mail/index.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/mail/index.php	2010-02-25 13:22:24 UTC (rev 420)
+++ trunk/gforge_base/evolvisforge/gforge/www/mail/index.php	2010-02-25 13:22:27 UTC (rev 421)
@@ -1,17 +1,22 @@
 <?php
-//
-// SourceForge: Breaking Down the Barriers to Open Source Development
-// Copyright 1999-2000 (c) The SourceForge Crew
-// http://sourceforge.net
-//
-// $Id$
+/**
+  *
+  * SourceForge Mailing Lists Facility
+  *
+  * 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('../mail/mail_utils.php');
+require_once('pre.php');
+require_once('../mail/mail_utils.php');
 
 if ($group_id) {
 
-	mail_header(array('title'=>'Mailing Lists for '.group_getname($group_id)));
+	mail_header(array('title'=>'Mailing Lists for '.group_getname($group_id),'pagename'=>'mail','sectionvals'=>array(group_getname($group_id))));
 	
 	if (user_isloggedin() && user_ismember($group_id)) {
 		$public_flag='0,1';
@@ -34,10 +39,7 @@
 		exit;
 	}
 
-	echo "<P>Mailing lists provided via a SourceForge version of "
-		. "<A href=\"http://www.list.org\">GNU Mailman</A>. "
-		. "Thanks to the Mailman and <A href=\"http://www.python.org\">Python</A> "
-		. "crews for excellent software.";
+	echo $Language->getText('mail', 'provided_by');
 	echo "<P>Choose a list to browse, search, and post messages.<P>\n";
 
 	/*
@@ -59,8 +61,8 @@
 	echo '</TD></TR></TABLE>';
 
 } else {
-	mail_header(array('title'=>'Choose a Group First'));
-	require('../mail/mail_nav.php');
+	mail_header(array('title'=>'Choose a Group First','pagename'=>'mail'));
+	require_once('../mail/mail_nav.php');
 	echo '
 		<H1>Error - choose a group first</H1>';
 }

Modified: trunk/gforge_base/evolvisforge/gforge/www/new/index.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/new/index.php	2010-02-25 13:22:24 UTC (rev 420)
+++ trunk/gforge_base/evolvisforge/gforge/www/new/index.php	2010-02-25 13:22:27 UTC (rev 421)
@@ -1,15 +1,21 @@
 <?php
-//
-// SourceForge: Breaking Down the Barriers to Open Source Development
-// Copyright 1999-2000 (c) The SourceForge Crew
-// http://sourceforge.net
-//
-// $Id$
+/**
+  *
+  * SourceForge New Releases 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 "vote_function.php";
-$HTML->header(array("title"=>"New File Releases"));
+require_once('pre.php');
+require_once('vote_function.php');
 
+$HTML->header(array("title"=>"New File Releases",'pagename'=>'new'));
+
 if ( !$offset || $offset < 0 ) {
 	$offset = 0;
 }
@@ -30,7 +36,7 @@
 	. "frs_package.name AS module_name, "
 	. "frs_dlstats_grouptotal_agg.downloads "
 	. "FROM groups,users,frs_package,frs_release,frs_dlstats_grouptotal_agg "
-	. "WHERE ( frs_release.release_date > $start_time "
+	. "WHERE ( frs_release.release_date > '$start_time' "
 	. "AND frs_release.package_id = frs_package.package_id "
 	. "AND frs_package.group_id = groups.group_id "
 	. "AND frs_release.released_by = users.user_id "
@@ -41,7 +47,7 @@
 //	. "GROUP BY groups.group_name,groups.group_id,groups.unix_group_name,"
 //	."groups.short_description,users.user_name,users.user_id,frs_release.release_id "
 	. "ORDER BY frs_release.release_date DESC";
-$res_new = db_query($query,21,$offset);
+$res_new = db_query($query, 21, $offset, SYS_DB_STATS);
 
 if (!$res_new || db_numrows($res_new) < 1) {
 	// echo $query . "<BR><BR>";

Modified: trunk/gforge_base/evolvisforge/gforge/www/source.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/source.php	2010-02-25 13:22:24 UTC (rev 420)
+++ trunk/gforge_base/evolvisforge/gforge/www/source.php	2010-02-25 13:22:27 UTC (rev 421)
@@ -1,21 +1,40 @@
 <?php
+/**
+  *
+  * Show Source Code of a 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');
+
+// Check for valid page
 if (!isset($page_url)) {
 	exit_error('ERROR','No page specified');
 }
 
+// Check for invalid characters
 if (strstr($page_url,'..')) {
 	exit_error('ERROR','You cannot have .. in your page_name url');
 }
 
+// Truncate project names
+if (strstr($page_url,'projects')) {
+	$page_url = '/projects';
+}
+
 $page_name = $DOCUMENT_ROOT . $page_url;
 
 //echo("<!-- $page_name -->\n\n\n");
 
 if (file_exists($page_name) && !is_dir($page_name)) {
-	echo $HTML->header(array('title'=>'View Source'));
+	$HTML->header(array('title'=>'View Source','pagename'=>'viewsource'));
 	show_source($page_name);
 } else if (is_dir($page_name)) {
 	exit_error('ERROR','Trying to show source for a directory');
@@ -23,6 +42,6 @@
         exit_error('ERROR','Trying to show source for inadequate URL');
 }
 
-echo $HTML->footer(array());
+$HTML->footer(array());
 
 ?>




More information about the evolvis-commits mailing list