@@ -56,18 +56,18 @@ discard block |
||
56 | 56 | </select>"); |
57 | 57 | |
58 | 58 | $forumid = null; |
59 | -if (get_str("forumid",true)){ |
|
59 | +if (get_str("forumid", true)) { |
|
60 | 60 | $forumid = get_str("forumid"); |
61 | 61 | } |
62 | -$forumlist="<option value=\"-1\">".tra("All")."</option>"; |
|
62 | +$forumlist = "<option value=\"-1\">".tra("All")."</option>"; |
|
63 | 63 | $categories = BoincCategory::enum(); |
64 | 64 | foreach ($categories as $category) { |
65 | 65 | $forums = BoincForum::enum("parent_type=0 and category=$category->id"); |
66 | 66 | foreach ($forums as $forum) { |
67 | - if ($forum->id==$forumid){ |
|
68 | - $forumlist.="<option selected value=\"".$forum->id."\">".$forum->title."</option>"; |
|
67 | + if ($forum->id == $forumid) { |
|
68 | + $forumlist .= "<option selected value=\"".$forum->id."\">".$forum->title."</option>"; |
|
69 | 69 | } else { |
70 | - $forumlist.="<option value=\"".$forum->id."\">".$forum->title."</option>"; |
|
70 | + $forumlist .= "<option value=\"".$forum->id."\">".$forum->title."</option>"; |
|
71 | 71 | } |
72 | 72 | } |
73 | 73 | } |
@@ -76,22 +76,22 @@ discard block |
||
76 | 76 | '<select class="form-control" name="search_forum">'.$forumlist.'</select'); |
77 | 77 | |
78 | 78 | $sortlist = null; |
79 | -foreach ($thread_sort_styles as $id => $style){ |
|
80 | - if ($id == CREATE_TIME_NEW){ |
|
81 | - $sortlist.="<option selected value=\"".$id."\">".$style."</option>"; |
|
79 | +foreach ($thread_sort_styles as $id => $style) { |
|
80 | + if ($id == CREATE_TIME_NEW) { |
|
81 | + $sortlist .= "<option selected value=\"".$id."\">".$style."</option>"; |
|
82 | 82 | } else { |
83 | - $sortlist.="<option value=\"".$id."\">".$style."</option>"; |
|
83 | + $sortlist .= "<option value=\"".$id."\">".$style."</option>"; |
|
84 | 84 | } |
85 | 85 | } |
86 | 86 | row2(tra("Sort by"), |
87 | 87 | '<select class="form-control" name="search_sort">'.$sortlist.'</select'); |
88 | 88 | |
89 | 89 | row1(" "); |
90 | -row2("","<input class=\"btn btn-success\" type=\"submit\" value=\"".tra("Start the search")."\">"); |
|
90 | +row2("", "<input class=\"btn btn-success\" type=\"submit\" value=\"".tra("Start the search")."\">"); |
|
91 | 91 | echo "</form>"; |
92 | 92 | end_table(); |
93 | 93 | |
94 | 94 | page_tail(); |
95 | 95 | |
96 | -$cvs_version_tracker[]="\$Id$"; //Generated automatically - do not edit |
|
96 | +$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit |
|
97 | 97 | ?> |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | } |
69 | 69 | |
70 | 70 | if ($app_types->cpu) { |
71 | - $project_pref_descs[] = new PREF_BOOL ( |
|
71 | + $project_pref_descs[] = new PREF_BOOL( |
|
72 | 72 | tra("Use CPU"), |
73 | 73 | "Request CPU-only tasks from this project.", |
74 | 74 | "no_cpu", |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | ); |
78 | 78 | } |
79 | 79 | if ($app_types->ati) { |
80 | - $project_pref_descs[] = new PREF_BOOL ( |
|
80 | + $project_pref_descs[] = new PREF_BOOL( |
|
81 | 81 | tra("Use AMD GPU"), |
82 | 82 | "Request AMD GPU tasks from this project.", |
83 | 83 | "no_ati", |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | ); |
87 | 87 | } |
88 | 88 | if ($app_types->cuda) { |
89 | - $project_pref_descs[] = new PREF_BOOL ( |
|
89 | + $project_pref_descs[] = new PREF_BOOL( |
|
90 | 90 | tra("Use NVIDIA GPU"), |
91 | 91 | "Request NVIDIA GPU tasks from this project.", |
92 | 92 | "no_cuda", |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | ); |
96 | 96 | } |
97 | 97 | if ($app_types->intel_gpu) { |
98 | - $project_pref_descs[] = new PREF_BOOL ( |
|
98 | + $project_pref_descs[] = new PREF_BOOL( |
|
99 | 99 | tra("Use Intel GPU"), |
100 | 100 | "Request Intel GPU tasks from this project.", |
101 | 101 | "no_intel_gpu", |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | $x = ""; |
121 | 121 | } |
122 | 122 | |
123 | -$privacy_pref_descs = array ( |
|
123 | +$privacy_pref_descs = array( |
|
124 | 124 | new PREF_BOOL( |
125 | 125 | tra("Is it OK for %1 and your team (if any) to email you?", PROJECT).$x, |
126 | 126 | "", |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | global $in_project_specific; |
153 | 153 | global $venue_name; |
154 | 154 | |
155 | - switch($name) { |
|
155 | + switch ($name) { |
|
156 | 156 | case "venue": |
157 | 157 | $venue_name = $attrs["name"]; |
158 | 158 | $top_parse_result = $parse_result; |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | break; |
165 | 165 | default: |
166 | 166 | if ($in_project_specific) { |
167 | - $text= $text."<$name>"; |
|
167 | + $text = $text."<$name>"; |
|
168 | 168 | } else { |
169 | 169 | $text = ""; |
170 | 170 | } |
@@ -179,12 +179,12 @@ discard block |
||
179 | 179 | global $venue_name; |
180 | 180 | global $project_pref_descs; |
181 | 181 | |
182 | - foreach($project_pref_descs as $p) { |
|
182 | + foreach ($project_pref_descs as $p) { |
|
183 | 183 | if ($p->xml_parse($parse_result, $name, $text)) { |
184 | 184 | return; |
185 | 185 | } |
186 | 186 | } |
187 | - switch($name) { |
|
187 | + switch ($name) { |
|
188 | 188 | case "venue": |
189 | 189 | $top_parse_result->$venue_name = $parse_result; |
190 | 190 | $parse_result = $top_parse_result; |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | return $parse_result; |
229 | 229 | } |
230 | 230 | |
231 | -function prefs_show_project($prefs, $columns=false) { |
|
231 | +function prefs_show_project($prefs, $columns = false) { |
|
232 | 232 | global $project_pref_descs; |
233 | 233 | if ($columns) { |
234 | 234 | foreach ($project_pref_descs as $p) { |
@@ -254,7 +254,7 @@ discard block |
||
254 | 254 | } |
255 | 255 | } |
256 | 256 | |
257 | -function prefs_show_project_specific($prefs, $columns=false) { |
|
257 | +function prefs_show_project_specific($prefs, $columns = false) { |
|
258 | 258 | if ($columns) { |
259 | 259 | $project_specific_prefs = project_specific_prefs_parse($prefs->project_specific); |
260 | 260 | $project_specific_prefs->home = isset($prefs->home) ? project_specific_prefs_parse($prefs->home->project_specific) : ""; |
@@ -266,10 +266,10 @@ discard block |
||
266 | 266 | project_specific_prefs_show($project_specific_prefs, $columns); |
267 | 267 | } |
268 | 268 | |
269 | -function print_prefs_display_project($user, $columns=false) { |
|
269 | +function print_prefs_display_project($user, $columns = false) { |
|
270 | 270 | $project_prefs = prefs_parse_project($user->project_prefs); |
271 | 271 | |
272 | - $switch_link = " <font size=\"-1\"><a href=prefs.php?subset=project&cols=". (int)!$columns .">".tra("(Switch View)")."</a></font>"; |
|
272 | + $switch_link = " <font size=\"-1\"><a href=prefs.php?subset=project&cols=".(int)!$columns.">".tra("(Switch View)")."</a></font>"; |
|
273 | 273 | if ($columns) { |
274 | 274 | start_table(); |
275 | 275 | row_heading(tra("Combined preferences").$switch_link); |
@@ -311,14 +311,14 @@ discard block |
||
311 | 311 | } |
312 | 312 | } |
313 | 313 | |
314 | -function prefs_form_project($prefs, $error=false) { |
|
314 | +function prefs_form_project($prefs, $error = false) { |
|
315 | 315 | global $project_pref_descs; |
316 | 316 | foreach ($project_pref_descs as $p) { |
317 | 317 | $p->show_form_row($prefs, $error); |
318 | 318 | } |
319 | 319 | } |
320 | 320 | |
321 | -function prefs_form_project_specific($prefs_xml, $error=false) { |
|
321 | +function prefs_form_project_specific($prefs_xml, $error = false) { |
|
322 | 322 | $prefs = project_specific_prefs_parse($prefs_xml); |
323 | 323 | project_specific_prefs_edit($prefs, $error); |
324 | 324 | } |
@@ -357,7 +357,7 @@ discard block |
||
357 | 357 | |
358 | 358 | // given a prefs structure, return the corresponding XML string |
359 | 359 | // |
360 | -function project_prefs_make_xml($prefs, $primary=true) { |
|
360 | +function project_prefs_make_xml($prefs, $primary = true) { |
|
361 | 361 | global $project_pref_descs; |
362 | 362 | $xml = ""; |
363 | 363 | if ($primary) { |
@@ -392,8 +392,8 @@ discard block |
||
392 | 392 | // |
393 | 393 | function project_prefs_update(&$user, $prefs) { |
394 | 394 | $prefs_xml = BoincDb::escape_string(project_prefs_make_xml($prefs)); |
395 | - $send_email = $user->send_email?1:0; |
|
396 | - $show_hosts = $user->show_hosts?1:0; |
|
395 | + $send_email = $user->send_email ? 1 : 0; |
|
396 | + $show_hosts = $user->show_hosts ? 1 : 0; |
|
397 | 397 | $retval = $user->update("project_prefs='$prefs_xml', send_email=$send_email, show_hosts=$show_hosts"); |
398 | 398 | if (!$retval) { |
399 | 399 | return 1; |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | $b->create_time = (double)($batch->create_time); |
171 | 171 | $b->est_completion_time = (double)($batch->est_completion_time); |
172 | 172 | $b->njobs = (int)($batch->njobs); |
173 | - $b->fraction_done = (double) $batch->fraction_done; |
|
173 | + $b->fraction_done = (double)$batch->fraction_done; |
|
174 | 174 | $b->nerror_jobs = (int)($batch->nerror_jobs); |
175 | 175 | $b->state = (int)($batch->state); |
176 | 176 | $b->completion_time = (double)($batch->completion_time); |
@@ -398,7 +398,7 @@ discard block |
||
398 | 398 | </result> |
399 | 399 | </output_template> |
400 | 400 | "; |
401 | - for ($i=0; $i<2; $i++) { |
|
401 | + for ($i = 0; $i < 2; $i++) { |
|
402 | 402 | $job = new StdClass; |
403 | 403 | $job->input_files = array(); |
404 | 404 | $job->input_files[] = $f; |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | // For display, convert query string characters < and > into 'html form' so |
65 | 65 | // that they will be displayed. |
66 | 66 | // |
67 | -$html_text=str_replace('<', '<', str_replace('>', '>', $main_query)); |
|
67 | +$html_text = str_replace('<', '<', str_replace('>', '>', $main_query)); |
|
68 | 68 | |
69 | 69 | echo "<p>Query: <b>$html_text</b><p>\n"; |
70 | 70 | |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | if ($result) { |
160 | 160 | if ($detail == "low") { |
161 | 161 | start_table('table-striped'); |
162 | - switch($table) { |
|
162 | + switch ($table) { |
|
163 | 163 | case "result": |
164 | 164 | result_short_header(); |
165 | 165 | break; |
@@ -228,5 +228,5 @@ discard block |
||
228 | 228 | } |
229 | 229 | |
230 | 230 | admin_page_tail(); |
231 | -$cvs_version_tracker[]="\$Id$"; //Generated automatically - do not edit |
|
231 | +$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit |
|
232 | 232 | ?> |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | $app = BoincApp::lookup_id($id); |
26 | 26 | if (!$app) admin_error_page("no such app"); |
27 | 27 | |
28 | - $n = post_str("deprecated", true)?1:0; |
|
28 | + $n = post_str("deprecated", true) ? 1 : 0; |
|
29 | 29 | $app->update("deprecated=$n"); |
30 | 30 | |
31 | 31 | $n = post_num("weight"); |
@@ -37,16 +37,16 @@ discard block |
||
37 | 37 | $n = post_int("target_nresults"); |
38 | 38 | $app->update("target_nresults=$n"); |
39 | 39 | |
40 | - $n = post_str("homogeneous_app_version", true)?1:0; |
|
40 | + $n = post_str("homogeneous_app_version", true) ? 1 : 0; |
|
41 | 41 | $app->update("homogeneous_app_version=$n"); |
42 | 42 | |
43 | - $n = post_str("non_cpu_intensive", true)?1:0; |
|
43 | + $n = post_str("non_cpu_intensive", true) ? 1 : 0; |
|
44 | 44 | $app->update("non_cpu_intensive=$n"); |
45 | 45 | |
46 | - $n = post_str("beta", true)?1:0; |
|
46 | + $n = post_str("beta", true) ? 1 : 0; |
|
47 | 47 | $app->update("beta=$n"); |
48 | 48 | |
49 | - $n = post_str("fraction_done_exact", true)?1:0; |
|
49 | + $n = post_str("fraction_done_exact", true) ? 1 : 0; |
|
50 | 50 | $app->update("fraction_done_exact=$n"); |
51 | 51 | |
52 | 52 | echo "Application $id updated. |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | function add_app() { |
59 | 59 | $name = BoincDb::escape_string(post_str('add_name')); |
60 | 60 | $user_friendly_name = BoincDb::escape_string(post_str('add_user_friendly_name')); |
61 | - if (empty($name) || empty($user_friendly_name) ) { |
|
61 | + if (empty($name) || empty($user_friendly_name)) { |
|
62 | 62 | admin_error_page( |
63 | 63 | "To add a new application please supply both a brief name and a longer 'user-friendly' name.</font></p>" |
64 | 64 | ); |
@@ -81,11 +81,11 @@ discard block |
||
81 | 81 | <h2>Edit applications</h2> |
82 | 82 | "; |
83 | 83 | |
84 | - $app_clause="deprecated=0"; |
|
85 | - $action_url="manage_apps.php"; |
|
86 | - if($all) { |
|
84 | + $app_clause = "deprecated=0"; |
|
85 | + $action_url = "manage_apps.php"; |
|
86 | + if ($all) { |
|
87 | 87 | $app_clause = ""; |
88 | - $action_url="manage_apps.php?all=1"; |
|
88 | + $action_url = "manage_apps.php?all=1"; |
|
89 | 89 | echo "<a href=\"manage_apps.php\">Don't show deprecated applications</a>"; |
90 | 90 | } else { |
91 | 91 | echo "<a href=\"manage_apps.php?all=1\">Show deprecated applications</a>"; |
@@ -117,8 +117,8 @@ discard block |
||
117 | 117 | $apps = BoincApp::enum($app_clause); |
118 | 118 | foreach ($apps as $app) { |
119 | 119 | // grey-out deprecated versions |
120 | - $f1=$f2=''; |
|
121 | - if ($app->deprecated==1) { |
|
120 | + $f1 = $f2 = ''; |
|
121 | + if ($app->deprecated == 1) { |
|
122 | 122 | $f1 = "<font color='GREY'>"; |
123 | 123 | $f2 = "</font>"; |
124 | 124 | } |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | |
129 | 129 | echo " <TD align='left'>$f1<a href=app_details.php?appid=$app->id>$app->name</a><br> $app->user_friendly_name $f2</TD>\n"; |
130 | 130 | |
131 | - echo " <TD align='center'>$f1 " .date_str($app->create_time)."$f2</TD>\n"; |
|
131 | + echo " <TD align='center'>$f1 ".date_str($app->create_time)."$f2</TD>\n"; |
|
132 | 132 | |
133 | 133 | $v = $app->weight; |
134 | 134 | echo " <TD align='center'> |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | "; |
152 | 152 | |
153 | 153 | $v = ''; |
154 | - if ($app->homogeneous_app_version) $v=' CHECKED '; |
|
154 | + if ($app->homogeneous_app_version) $v = ' CHECKED '; |
|
155 | 155 | echo " <TD align='center'> |
156 | 156 | <input name='homogeneous_app_version' type='checkbox' $v></TD> |
157 | 157 | "; |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | break; |
139 | 139 | default: |
140 | 140 | end($page_list); |
141 | - $page_list[key($page_list)] = 'and ' . $page_list[key($page_list)]; |
|
141 | + $page_list[key($page_list)] = 'and '.$page_list[key($page_list)]; |
|
142 | 142 | $page_list = implode(', ', $page_list); |
143 | 143 | } |
144 | 144 | drupal_set_message(t('Default content has been generated for the @listed |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | 'type' => 'page', |
196 | 196 | 'title' => t('Help'), |
197 | 197 | 'uid' => 1, |
198 | - 'status' => 1, // published |
|
198 | + 'status' => 1, // published |
|
199 | 199 | 'promote' => 0, // not promoted to front page |
200 | 200 | 'path' => 'help', |
201 | 201 | 'pathauto_perform_alias' => FALSE, |
@@ -216,7 +216,7 @@ discard block |
||
216 | 216 | 'format' => 4, |
217 | 217 | //'teaser' => $teaser, |
218 | 218 | ); |
219 | - $node = (object) $node; // node_save requires an object |
|
219 | + $node = (object)$node; // node_save requires an object |
|
220 | 220 | node_save($node); |
221 | 221 | |
222 | 222 | $item = array( |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | 'type' => 'page', |
238 | 238 | 'title' => t('Rules and Policies'), |
239 | 239 | 'uid' => 1, |
240 | - 'status' => 1, // published |
|
240 | + 'status' => 1, // published |
|
241 | 241 | 'promote' => 0, // not promoted to front page |
242 | 242 | 'path' => 'rules-and-policies', |
243 | 243 | 'pathauto_perform_alias' => FALSE, |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | 'format' => 4, |
252 | 252 | //'teaser' => $teaser, |
253 | 253 | ); |
254 | - $node = (object) $node; // node_save requires an object |
|
254 | + $node = (object)$node; // node_save requires an object |
|
255 | 255 | node_save($node); |
256 | 256 | |
257 | 257 | // Create menu item to node |
@@ -273,7 +273,7 @@ discard block |
||
273 | 273 | 'type' => 'page', |
274 | 274 | 'title' => t('Moderation'), |
275 | 275 | 'uid' => 1, |
276 | - 'status' => 1, // published |
|
276 | + 'status' => 1, // published |
|
277 | 277 | 'promote' => 0, // not promoted to front page |
278 | 278 | 'path' => 'moderation', |
279 | 279 | 'pathauto_perform_alias' => FALSE, |
@@ -287,7 +287,7 @@ discard block |
||
287 | 287 | 'format' => 4, |
288 | 288 | //'teaser' => $teaser, |
289 | 289 | ); |
290 | - $node = (object) $node; // node_save requires an object |
|
290 | + $node = (object)$node; // node_save requires an object |
|
291 | 291 | node_save($node); |
292 | 292 | |
293 | 293 | // Create menu item to node |
@@ -52,7 +52,7 @@ |
||
52 | 52 | */ |
53 | 53 | function boinc_solr_search_block_view($delta = 0) { |
54 | 54 | $block = array(); |
55 | - switch($delta) { |
|
55 | + switch ($delta) { |
|
56 | 56 | case 'boinc_solr_search_0': |
57 | 57 | $items = array( |
58 | 58 | bts('By default a search matches ANY search term. Results with more than one term will be presented higher in the search results.', array(), NULL, 'boinc:search-help-sidebar-block'), |
@@ -16,10 +16,10 @@ discard block |
||
16 | 16 | ); |
17 | 17 | |
18 | 18 | // Build confirm form from elements, depending on node type. |
19 | - $description = bts('This action cannot be undone.', array(), NULL, 'boinc:delete-node'); |
|
19 | + $description = bts('This action cannot be undone.', array(), NULL, 'boinc:delete-node'); |
|
20 | 20 | $no = bts('Cancel', array(), NULL, 'boinc:form-cancel'); |
21 | 21 | |
22 | - switch($node->type) { |
|
22 | + switch ($node->type) { |
|
23 | 23 | case 'profile': |
24 | 24 | $question = bts('Are you sure you want to clear your profile?', array(), NULL, 'boinc:delete-node'); |
25 | 25 | $path = isset($_GET['destination']) ? $_GET['destination'] : 'account'; |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | |
29 | 29 | default: |
30 | 30 | $question = bts('Are you sure you want to Delete %title?', array('%title' => $node->title), NULL, 'boinc:delete-node'); |
31 | - $path = isset($_GET['destination']) ? $_GET['destination'] : 'node/'. $node->nid; |
|
31 | + $path = isset($_GET['destination']) ? $_GET['destination'] : 'node/'.$node->nid; |
|
32 | 32 | $yes = bts('Delete', array(), NULL, 'boinc:form-delete'); |
33 | 33 | } |
34 | 34 | return confirm_form($form, $question, $path, $description, $yes, $no); |
@@ -5,7 +5,7 @@ discard block |
||
5 | 5 | * Callback admin/boinc/import/settings |
6 | 6 | */ |
7 | 7 | function boincimport_admin_settings() { |
8 | - global $conf ; |
|
8 | + global $conf; |
|
9 | 9 | global $db_url; |
10 | 10 | global $base_url; |
11 | 11 | $stage = variable_get('boincimport_config_stage', 0); |
@@ -27,17 +27,17 @@ discard block |
||
27 | 27 | |
28 | 28 | $output = ''; |
29 | 29 | if (!variable_get('boincimport_tested', 0)) { |
30 | - $form['test']['#collapsed']= FALSE; |
|
30 | + $form['test']['#collapsed'] = FALSE; |
|
31 | 31 | $output = '<span class="marker">'; |
32 | 32 | $ready_for_migration = 0; |
33 | 33 | } |
34 | - $output .= '<p>' . t('The migration will modify and even destroy some data. You |
|
34 | + $output .= '<p>'.t('The migration will modify and even destroy some data. You |
|
35 | 35 | must test this module on a copy of your data first, several times if necessary. |
36 | 36 | Only use this module on your live data when you are familiar with the procedure |
37 | - and you\'re confident everything will run smoothly.') . '</p><p>' . t('Also, you |
|
37 | + and you\'re confident everything will run smoothly.').'</p><p>'.t('Also, you |
|
38 | 38 | should make a full backup of your database just prior to performing the |
39 | 39 | migration on the live data. It is better to turn off both the BOINC site and the |
40 | - Drupal site during the migration.') . '</p>'; |
|
40 | + Drupal site during the migration.').'</p>'; |
|
41 | 41 | if (!variable_get('boincimport_tested', 0)) { |
42 | 42 | $output .= '</span>'; |
43 | 43 | } |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | |
56 | 56 | // Where is BOINC data? |
57 | 57 | $pre = variable_get('boincimport_table_prefix', ''); |
58 | - $tables = array($pre .'forum', $pre .'post', $pre .'thread', $pre .'user'); |
|
58 | + $tables = array($pre.'forum', $pre.'post', $pre.'thread', $pre.'user'); |
|
59 | 59 | $db = (is_array($db_url) AND isset($db_url['boinc_rw'])) ? 'boinc_rw' : 'default'; |
60 | 60 | $result = _boincimport_check_tables($tables, $db, 0); |
61 | 61 | |
@@ -79,8 +79,8 @@ discard block |
||
79 | 79 | $default_db_url = is_array($db_url) ? end($db_url) : $db_url; |
80 | 80 | $url = variable_get('boincimport_db_url', $default_db_url); |
81 | 81 | if (!preg_match('{(mysql|pgsql):\/\/(.+):(.*?)@(.+)/(\w+)}i', $url)) { |
82 | - $output = '<p class="marker">'. t('Set the address of the BOINC database |
|
83 | - according to the following format:') . '<br /><pre> |
|
82 | + $output = '<p class="marker">'.t('Set the address of the BOINC database |
|
83 | + according to the following format:').'<br /><pre> |
|
84 | 84 | mysql://boinc_username:boinc_password@localhost/boinc_database |
85 | 85 | </pre></p>'; |
86 | 86 | $ready_for_migration = 0; |
@@ -98,13 +98,13 @@ discard block |
||
98 | 98 | ); |
99 | 99 | } |
100 | 100 | |
101 | - $output = '<p>' . t('Note that due to a limitation within Drupal core, we cannot |
|
101 | + $output = '<p>'.t('Note that due to a limitation within Drupal core, we cannot |
|
102 | 102 | import messages from one database type to another database type. E.g, we |
103 | 103 | cannot import BOINC from a myqsl DB, to a postgresql DB. You need to import |
104 | 104 | the data into the same type of database first (import all the BOINC data, as is, |
105 | - from mysql to postgresql).') . '</p><p>' . t('If both BOINC and Drupal are on |
|
105 | + from mysql to postgresql).').'</p><p>'.t('If both BOINC and Drupal are on |
|
106 | 106 | postgresql, see !this_issue.', array('!this_issue' => l(t('this issue'), |
107 | - 'http://drupal.org/node/64877', array('attributes' => array('target' => '_blank'))))) . '</p>'; |
|
107 | + 'http://drupal.org/node/64877', array('attributes' => array('target' => '_blank'))))).'</p>'; |
|
108 | 108 | $form['boinc_data']['note'] = array('#value' => $output); |
109 | 109 | |
110 | 110 | // BOINC table prefix |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | $output = $result['html']; |
122 | 122 | if ($result['result'] != 1) { |
123 | 123 | $ready_for_migration = 0; |
124 | - $form['boinc_data']['#collapsed']= FALSE; |
|
124 | + $form['boinc_data']['#collapsed'] = FALSE; |
|
125 | 125 | $output .= '<span class="marker">'; |
126 | 126 | $output .= t('Some tables couldn\'t be found. Are the database settings correct? |
127 | 127 | Please correct the errors so that the BOINC tables can be accessed.'); |
@@ -169,15 +169,15 @@ discard block |
||
169 | 169 | '#collapsible' => TRUE, |
170 | 170 | '#collapsed' => TRUE |
171 | 171 | ); |
172 | - $output = '<p>'. t('Select which !input_format should be used for the imported |
|
172 | + $output = '<p>'.t('Select which !input_format should be used for the imported |
|
173 | 173 | messages. It is highly-recommended that this value be left as it is, as the |
174 | 174 | Full HTML and PHP code formats can be very dangerous!', |
175 | - array('!input_format' => l(t('input format'), 'admin/settings/filters'))) .'</p>'; |
|
175 | + array('!input_format' => l(t('input format'), 'admin/settings/filters'))).'</p>'; |
|
176 | 176 | $form['input']['intro'] = array('#value' => $output); |
177 | 177 | |
178 | 178 | $formats = db_query('SELECT format, name FROM {filter_formats}'); |
179 | 179 | while ($format = db_fetch_array($formats)) { |
180 | - $input_formats[$format['format']]= $format['name']; |
|
180 | + $input_formats[$format['format']] = $format['name']; |
|
181 | 181 | } |
182 | 182 | |
183 | 183 | // By default, use the format named "Rich text"; fall back to Filtered HTML |
@@ -194,10 +194,10 @@ discard block |
||
194 | 194 | ); |
195 | 195 | if (!$input_format) { |
196 | 196 | $ready_for_migration = 0; |
197 | - $form['input']['#collapsed']= FALSE; |
|
197 | + $form['input']['#collapsed'] = FALSE; |
|
198 | 198 | } |
199 | - $output = '<p><em>'. t('This setting will be applied to all posts and private |
|
200 | - messages.') .'</em></p>'; |
|
199 | + $output = '<p><em>'.t('This setting will be applied to all posts and private |
|
200 | + messages.').'</em></p>'; |
|
201 | 201 | $form['input']['result'] = array('#value' => $output); |
202 | 202 | |
203 | 203 | // BBcode settings |
@@ -208,23 +208,23 @@ discard block |
||
208 | 208 | '#collapsed' => TRUE, |
209 | 209 | ); |
210 | 210 | |
211 | - $output = '<p>' . t('BOINC posts are often formatted in BBcode. During the |
|
212 | - import process, BBcode can be handled in two diffent ways') . ':</p>'; |
|
213 | - $output .= '<ul><li>' . t('Leave the BBcode as is and use the !bbcode_module |
|
211 | + $output = '<p>'.t('BOINC posts are often formatted in BBcode. During the |
|
212 | + import process, BBcode can be handled in two diffent ways').':</p>'; |
|
213 | + $output .= '<ul><li>'.t('Leave the BBcode as is and use the !bbcode_module |
|
214 | 214 | after the migration to filter the imported posts. In this case, the module |
215 | 215 | is not required during the migration, but will need to be installed and |
216 | 216 | configured later.', |
217 | 217 | array('!bbcode_module' => l(t('bbcode module'), 'http://drupal.org/project/bbcode', |
218 | - array('attributes' => array('target' => '_blank'))))) . '</li>'; |
|
219 | - $output .= '<li>' . t('Filter the BBcode now and replace it with plain HTML. |
|
218 | + array('attributes' => array('target' => '_blank'))))).'</li>'; |
|
219 | + $output .= '<li>'.t('Filter the BBcode now and replace it with plain HTML. |
|
220 | 220 | The BBcode module will be required during the migration process, but can |
221 | - be disabled afterwards.') . '</li></ul>'; |
|
222 | - $output .= '<p>' . t('An appropriate input filter should be chosen, as well, |
|
221 | + be disabled afterwards.').'</li></ul>'; |
|
222 | + $output .= '<p>'.t('An appropriate input filter should be chosen, as well, |
|
223 | 223 | as it will affect how the post is displayed. For example, if BBcode is |
224 | 224 | removed and replaced by HTML, some HTML tags will be stripped by the |
225 | 225 | "Filtered HTML" input format unless they are first added to the list of |
226 | 226 | allowed tags in that format. See the !input_formats page.', |
227 | - array('!input_formats' => l(t('input formats'), 'admin/settings/filters'))) . '</p>'; |
|
227 | + array('!input_formats' => l(t('input formats'), 'admin/settings/filters'))).'</p>'; |
|
228 | 228 | |
229 | 229 | $form['bbcode']['intro'] = array('#value' => $output); |
230 | 230 | $form['bbcode']['boincimport_bbcode'] = array( |
@@ -254,28 +254,28 @@ discard block |
||
254 | 254 | $result = db_query($sql, $input_format); |
255 | 255 | if (!db_result($result)) { |
256 | 256 | $form['bbcode']['#collapsed'] = FALSE; |
257 | - $output .= '<p class="marker">'. t('You need to !enable_bbcode_input and |
|
257 | + $output .= '<p class="marker">'.t('You need to !enable_bbcode_input and |
|
258 | 258 | then !configure_bbcode_options', array( |
259 | 259 | '!enable_bbcode_input' => l(t('enable BBcode in the selected input format'), "admin/settings/filters/{$input_format}"), |
260 | - '!configure_bbcode_options' => l(t('configure BBcode options'), "admin/settings/filters/{$input_format}/configure"))) .'</p>'; |
|
260 | + '!configure_bbcode_options' => l(t('configure BBcode options'), "admin/settings/filters/{$input_format}/configure"))).'</p>'; |
|
261 | 261 | } |
262 | - $output .= '<p>'. t('For best results, !disable_all_options', |
|
263 | - array('!disable_all_options' => l(t('all four BBcode configure options should be disabled'), "admin/settings/filters/{$input_format}/configure"))) . '.</p>'; |
|
262 | + $output .= '<p>'.t('For best results, !disable_all_options', |
|
263 | + array('!disable_all_options' => l(t('all four BBcode configure options should be disabled'), "admin/settings/filters/{$input_format}/configure"))).'.</p>'; |
|
264 | 264 | } else { |
265 | 265 | if ($bbcode_disabled) { |
266 | 266 | $form['bbcode']['#collapsed'] = FALSE; |
267 | - $output .= '<p>'. t('The !bbcode_module is recommended, but not required. |
|
267 | + $output .= '<p>'.t('The !bbcode_module is recommended, but not required. |
|
268 | 268 | You may !enable_bbcode after having installed it.', array( |
269 | 269 | '!bbcode_module' => l(t('bbcode module'), 'http://drupal.org/project/bbcode', array('attributes' => array('target' => '_blank'))), |
270 | - '!enable_bbcode' => l(t('enable the bbcode module'), 'admin/build/modules'))) .'</p>'; |
|
270 | + '!enable_bbcode' => l(t('enable the bbcode module'), 'admin/build/modules'))).'</p>'; |
|
271 | 271 | } |
272 | - $output .= '<p>' . t('Don\'t forget to !enable_bbcode_input and then !configure_bbcode_options.', array( |
|
272 | + $output .= '<p>'.t('Don\'t forget to !enable_bbcode_input and then !configure_bbcode_options.', array( |
|
273 | 273 | '!enable_bbcode_input' => l(t('enable BBcode in the selected input format'), "admin/settings/filters/{$input_format}"), |
274 | - '!configure_bbcode_options' => l(t('configure BBcode options'), "admin/settings/filters/{$input_format}/configure"))) . '</p>'; |
|
275 | - $output .= '<p>' . t('You may want to enable it for other input formats, too.') . '</p>'; |
|
274 | + '!configure_bbcode_options' => l(t('configure BBcode options'), "admin/settings/filters/{$input_format}/configure"))).'</p>'; |
|
275 | + $output .= '<p>'.t('You may want to enable it for other input formats, too.').'</p>'; |
|
276 | 276 | } |
277 | - $output .= '<p><em>'. t('This setting will be applied to all posts, private |
|
278 | - messages and the users\' signature.') .'</em></p>'; |
|
277 | + $output .= '<p><em>'.t('This setting will be applied to all posts, private |
|
278 | + messages and the users\' signature.').'</em></p>'; |
|
279 | 279 | |
280 | 280 | $form['bbcode']['result'] = array('#value' => $output); |
281 | 281 | |
@@ -287,7 +287,7 @@ discard block |
||
287 | 287 | '#collapsed' => TRUE, |
288 | 288 | ); |
289 | 289 | if (!variable_get('boincimport_base_url_boinc', 0)) { |
290 | - $form['url_transforms']['#collapsed']= FALSE; |
|
290 | + $form['url_transforms']['#collapsed'] = FALSE; |
|
291 | 291 | $output = '<span class="marker">'; |
292 | 292 | $ready_for_migration = 0; |
293 | 293 | } |
@@ -320,11 +320,11 @@ discard block |
||
320 | 320 | ); |
321 | 321 | variable_set('boincimport_ready', $ready_for_migration); |
322 | 322 | if ($ready_for_migration) { |
323 | - $output = '<p>'. t('Check the settings above one more time. If everything |
|
324 | - is ok, !proceed.', array('!proceed' => l(t('you can now proceed with the migration'), 'admin/boinc/import/process'))) .'</p>'; |
|
323 | + $output = '<p>'.t('Check the settings above one more time. If everything |
|
324 | + is ok, !proceed.', array('!proceed' => l(t('you can now proceed with the migration'), 'admin/boinc/import/process'))).'</p>'; |
|
325 | 325 | } else { |
326 | - $output = '<p class="marker">'. t('You are not ready for the migration yet. |
|
327 | - Please check the settings above.') .'</p>'; |
|
326 | + $output = '<p class="marker">'.t('You are not ready for the migration yet. |
|
327 | + Please check the settings above.').'</p>'; |
|
328 | 328 | } |
329 | 329 | |
330 | 330 | $form['migration']['info'] = array('#value' => $output); |
@@ -335,23 +335,23 @@ discard block |
||
335 | 335 | * Callback admin/boinc/import/post_configuration |
336 | 336 | */ |
337 | 337 | function boincimport_post_configuration() { |
338 | - $output = '<p>'. t('This page will help to tie up any loose ends following |
|
338 | + $output = '<p>'.t('This page will help to tie up any loose ends following |
|
339 | 339 | the BOINC data import process. Before continuing, it may be best to have |
340 | - already:') .'</p>'; |
|
340 | + already:').'</p>'; |
|
341 | 341 | $output .= '<ul>'; |
342 | - $output .= '<li>'. t('Imported users, teams, and forums using the BOINC |
|
343 | - import module') .'</li>'; |
|
344 | - $output .= '<li>'. t('Imported any additional data using add on modules if |
|
345 | - available.') .'</li>'; |
|
342 | + $output .= '<li>'.t('Imported users, teams, and forums using the BOINC |
|
343 | + import module').'</li>'; |
|
344 | + $output .= '<li>'.t('Imported any additional data using add on modules if |
|
345 | + available.').'</li>'; |
|
346 | 346 | $output .= '</ul>'; |
347 | 347 | //User Set up |
348 | - $output .= '<h2>'. t('User settings') .'</h2>'; |
|
349 | - $output .= '<p>'. t('Make sure your !user_settings are correct. Specifically, |
|
348 | + $output .= '<h2>'.t('User settings').'</h2>'; |
|
349 | + $output .= '<p>'.t('Make sure your !user_settings are correct. Specifically, |
|
350 | 350 | you can enable or disable signatures there. ', array( |
351 | 351 | '!user_settings' => l(t('user settings'), 'admin/user/settings') |
352 | - )) .'</p>'; |
|
353 | - $output .= '<p>' . t('Note that avatar/picture support is not tied to user |
|
354 | - settings Picture support at this time.') . '</p>'; |
|
352 | + )).'</p>'; |
|
353 | + $output .= '<p>'.t('Note that avatar/picture support is not tied to user |
|
354 | + settings Picture support at this time.').'</p>'; |
|
355 | 355 | /*$output .= '<p>' . t('In order to activate avatar/picture support, you need to |
356 | 356 | enable pictures on this page and also:') . '</p>'; |
357 | 357 | $output .= '<ul>'; |
@@ -366,15 +366,15 @@ discard block |
||
366 | 366 | $output .= '</ul>'; */ |
367 | 367 | |
368 | 368 | // Forum Set up |
369 | - $output .= '<h2>'. t('Forum settings') .'</h2>'; |
|
370 | - $output .= '<p>'. t('Check any additional changes to make on the |
|
369 | + $output .= '<h2>'.t('Forum settings').'</h2>'; |
|
370 | + $output .= '<p>'.t('Check any additional changes to make on the |
|
371 | 371 | !forum_settings page.', array( |
372 | 372 | '!forum_settings' => l(t('forum settings'), 'admin/content/forum/settings') |
373 | - )) .'</p>'; |
|
374 | - $output .= '<p>'. t('It also may be a good idea to look at the !forum_list to |
|
373 | + )).'</p>'; |
|
374 | + $output .= '<p>'.t('It also may be a good idea to look at the !forum_list to |
|
375 | 375 | verify that all necessary containers and forums are in place.', array( |
376 | 376 | '!forum_list' => l(t('forum list'), 'admin/content/forum') |
377 | - )) .'</p>'; |
|
377 | + )).'</p>'; |
|
378 | 378 | /*$output .= '<p>'. t('If need be, set up the private forums as explained in the |
379 | 379 | !documentation.', array( |
380 | 380 | '!documentation' => l(t('documentation'), 'http://drupal.org/node/58969', array('attributes' => array('target' => '_blank'))) |
@@ -390,17 +390,17 @@ discard block |
||
390 | 390 | // BBcode |
391 | 391 | $bbcode = variable_get('boincimport_bbcode', 0); |
392 | 392 | if ($bbcode) { |
393 | - $output .= '<h2>'. t('Remove BBcode module') .'</h2>'; |
|
394 | - $output .= '<p>'. t('The BBcode has been cleaned from the posts. You shouldn\'t |
|
395 | - need the bbcode module anymore. You can disable it.') .'</p>'; |
|
393 | + $output .= '<h2>'.t('Remove BBcode module').'</h2>'; |
|
394 | + $output .= '<p>'.t('The BBcode has been cleaned from the posts. You shouldn\'t |
|
395 | + need the bbcode module anymore. You can disable it.').'</p>'; |
|
396 | 396 | } else { |
397 | - $output .= '<h2>'. t('Configure BBcode module') .'</h2>'; |
|
398 | - $output .= '<p>'. t('Most likely, there are many BOINC forum postings |
|
397 | + $output .= '<h2>'.t('Configure BBcode module').'</h2>'; |
|
398 | + $output .= '<p>'.t('Most likely, there are many BOINC forum postings |
|
399 | 399 | formatted in BBcode. It would be a good idea to verify that BBcode is |
400 | 400 | being formatted correctly in the imported posts. Have a look around |
401 | 401 | !the_forum.', array( |
402 | 402 | '!the_forum' => l(t('the forum'), 'community') |
403 | - )) . '</p>'; |
|
403 | + )).'</p>'; |
|
404 | 404 | } |
405 | 405 | |
406 | 406 | return $output; |
@@ -445,11 +445,11 @@ discard block |
||
445 | 445 | $output .= '</ol>'; |
446 | 446 | |
447 | 447 | // process will die() if the link to the BOINC database is wrong: |
448 | - $output .= '<p>'. t('If the BOINC data is in another database, but you made a |
|
448 | + $output .= '<p>'.t('If the BOINC data is in another database, but you made a |
|
449 | 449 | mistake while setting up the data base url, you may be unable to access the |
450 | 450 | setting page due to some limitations of the core of Drupal. !reset_db_url.', array( |
451 | 451 | '!reset_db_url' => l(t('Click here to reset the database url'), 'admin/boinc/import/reset') |
452 | - )) .'</p>'; |
|
452 | + )).'</p>'; |
|
453 | 453 | |
454 | 454 | return $output; |
455 | 455 | } |