@@ -26,13 +26,13 @@ discard block |
||
26 | 26 | |
27 | 27 | |
28 | 28 | // Create the graph. These two calls are always required |
29 | - $graph = new Graph(350,250,"auto"); |
|
29 | + $graph = new Graph(350, 250, "auto"); |
|
30 | 30 | //$graph->SetScale("lin"); |
31 | 31 | //$graph->SetScale("textlin"); |
32 | 32 | $graph->SetScale("loglin"); |
33 | 33 | |
34 | 34 | // Create the linear plot |
35 | - $lineplot=new BarPlot($arr, $xarr); |
|
35 | + $lineplot = new BarPlot($arr, $xarr); |
|
36 | 36 | $lineplot->SetColor("blue"); |
37 | 37 | |
38 | 38 | // Add the plot to the graph |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | |
45 | 45 | function show_text($xarr, $yarr) { |
46 | 46 | $n = sizeof($xarr); |
47 | - for ($i=0; $i<$n; $i++) { |
|
47 | + for ($i = 0; $i < $n; $i++) { |
|
48 | 48 | echo "<br>$xarr[$i] $yarr[$i]\n"; |
49 | 49 | } |
50 | 50 | } |
@@ -90,9 +90,9 @@ discard block |
||
90 | 90 | if ($ind > $maxind) $maxind = $ind; |
91 | 91 | } |
92 | 92 | $xarr = array(); |
93 | - for ($i=0; $i<=$maxind; $i++) { |
|
93 | + for ($i = 0; $i <= $maxind; $i++) { |
|
94 | 94 | $xarr[$i] = $i; |
95 | - if (is_null($yarr[$i])) $yarr[$i]=0; |
|
95 | + if (is_null($yarr[$i])) $yarr[$i] = 0; |
|
96 | 96 | } |
97 | 97 | if ($show_text) { |
98 | 98 | show_text($xarr, $yarr); |
@@ -44,15 +44,15 @@ |
||
44 | 44 | $start_id = 0; //Set this to something else if you like |
45 | 45 | $posts = _mysql_query("select * from post where id>$start_id order by id"); |
46 | 46 | echo _mysql_error(); |
47 | - $i=0; |
|
48 | - while ($post = _mysql_fetch_object($posts)){ |
|
47 | + $i = 0; |
|
48 | + while ($post = _mysql_fetch_object($posts)) { |
|
49 | 49 | $i++; |
50 | 50 | if ($i%100 == 0) { //For every 100 posts |
51 | - echo $post->id.". "; flush(); // print out where we are |
|
51 | + echo $post->id.". "; flush(); // print out where we are |
|
52 | 52 | //usleep(200000); |
53 | 53 | } |
54 | 54 | |
55 | - if ($post->id > $start_id){ |
|
55 | + if ($post->id > $start_id) { |
|
56 | 56 | fix_post($post); |
57 | 57 | } |
58 | 58 | } |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | "deprecated?", |
73 | 73 | "" |
74 | 74 | ); |
75 | - $clause = $all?"true":"deprecated = 0"; |
|
75 | + $clause = $all ? "true" : "deprecated = 0"; |
|
76 | 76 | $avs = BoincAppVersion::enum( |
77 | 77 | "$clause order by appid, platformid, plan_class, version_num" |
78 | 78 | ); |
@@ -80,20 +80,20 @@ discard block |
||
80 | 80 | foreach ($avs as $av) { |
81 | 81 | // grey out deprecated versions |
82 | 82 | // |
83 | - $f1=$f2=''; |
|
83 | + $f1 = $f2 = ''; |
|
84 | 84 | if ($av->deprecated == 1) { |
85 | - $f1="<font color='GREY'>"; |
|
86 | - $f2="</font>"; |
|
85 | + $f1 = "<font color='GREY'>"; |
|
86 | + $f2 = "</font>"; |
|
87 | 87 | } |
88 | 88 | |
89 | - $all_value = $all?1:0; |
|
89 | + $all_value = $all ? 1 : 0; |
|
90 | 90 | $app = $apps[$av->appid]; |
91 | 91 | // ignore app versions of deprecated apps by default |
92 | 92 | if ($all_value == 0 && $app->deprecated == 1) { |
93 | 93 | continue; |
94 | 94 | } |
95 | 95 | echo "<tr class=row$i><form action=manage_app_versions.php?all=$all_value#av_$av->id method=POST>\n"; |
96 | - $i = 1-$i; |
|
96 | + $i = 1 - $i; |
|
97 | 97 | echo "<input type=hidden name=id value=$av->id>"; |
98 | 98 | echo " <TD>$f1 <a id='av_$av->id' href=db_action.php?table=app_version&id=$av->id>$av->id</a> $f2</TD>\n"; |
99 | 99 | |
@@ -110,15 +110,15 @@ discard block |
||
110 | 110 | $v = $av->min_core_version; |
111 | 111 | echo " <TD><input type='text' size='4' name=min_core_version value='$v'></TD>\n"; |
112 | 112 | |
113 | - $v=$av->max_core_version; |
|
113 | + $v = $av->max_core_version; |
|
114 | 114 | echo " <TD><input type='text' size='4' name=max_core_version value='$v'></TD>\n"; |
115 | 115 | |
116 | - $v=''; |
|
117 | - if ($av->beta) $v=' CHECKED '; |
|
116 | + $v = ''; |
|
117 | + if ($av->beta) $v = ' CHECKED '; |
|
118 | 118 | echo " <TD> <input name=beta type='checkbox' $v></TD>\n"; |
119 | 119 | |
120 | - $v=''; |
|
121 | - if ($av->deprecated) $v=' CHECKED '; |
|
120 | + $v = ''; |
|
121 | + if ($av->deprecated) $v = ' CHECKED '; |
|
122 | 122 | echo " <TD> <input name=deprecated type='checkbox' $v></TD>\n"; |
123 | 123 | |
124 | 124 | if (!in_rops()) { |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | } |
42 | 42 | |
43 | 43 | function find_oldest() { |
44 | - $result=_mysql_query("select name,create_time from result where server_state=2 order by create_time limit 1"); |
|
44 | + $result = _mysql_query("select name,create_time from result where server_state=2 order by create_time limit 1"); |
|
45 | 45 | $x = _mysql_fetch_object($result); |
46 | 46 | return $x->create_time; |
47 | 47 | } |
@@ -88,25 +88,25 @@ discard block |
||
88 | 88 | |
89 | 89 | |
90 | 90 | |
91 | -$dbrc = db_init(1); // 1=soft, remember that DB might be down |
|
91 | +$dbrc = db_init(1); // 1=soft, remember that DB might be down |
|
92 | 92 | |
93 | -page_head(PROJECT . " - Server Status"); |
|
93 | +page_head(PROJECT." - Server Status"); |
|
94 | 94 | |
95 | 95 | |
96 | 96 | // Date stamp |
97 | 97 | |
98 | 98 | |
99 | -echo "<br ALIGN=RIGHT> ".PROJECT. " server status as of ". |
|
100 | - date("g:i A T"). " on ". date("l, j F Y ") . |
|
99 | +echo "<br ALIGN=RIGHT> ".PROJECT." server status as of ". |
|
100 | + date("g:i A T")." on ".date("l, j F Y "). |
|
101 | 101 | " (updated every $Nmin minutes).\n"; |
102 | 102 | |
103 | -$proc_uptime=exec("cat /proc/uptime | cut -d\" \" -f-1"); |
|
103 | +$proc_uptime = exec("cat /proc/uptime | cut -d\" \" -f-1"); |
|
104 | 104 | $days = (int)($proc_uptime/86400); |
105 | -$hours=(int)($proc_uptime/3600); |
|
106 | -$hours=$hours % 24; |
|
107 | -$minutes=(int)($proc_uptime/60); |
|
108 | -$minutes=$minutes % 60; |
|
109 | -echo "<br ALIGN=RIGHT>The ".PROJECT. " main server has been continuously up for ". "$days"." days "."$hours"." hours "."$minutes"." minutes.\n<P>"; |
|
105 | +$hours = (int)($proc_uptime/3600); |
|
106 | +$hours = $hours%24; |
|
107 | +$minutes = (int)($proc_uptime/60); |
|
108 | +$minutes = $minutes%60; |
|
109 | +echo "<br ALIGN=RIGHT>The ".PROJECT." main server has been continuously up for "."$days"." days "."$hours"." hours "."$minutes"." minutes.\n<P>"; |
|
110 | 110 | |
111 | 111 | // tables side by side |
112 | 112 | echo "<TABLE><TR><TD align=center> \n"; |
@@ -152,11 +152,11 @@ discard block |
||
152 | 152 | if ($dbrc) { |
153 | 153 | echo "The database server is not accessable"; |
154 | 154 | } else { |
155 | - $now=time(0); |
|
156 | - $s_day=24*3600; |
|
157 | - $d_ago=$now-$s_day; |
|
158 | - $s_week=7*$s_day; |
|
159 | - $w_ago=$now-$s_week; |
|
155 | + $now = time(0); |
|
156 | + $s_day = 24*3600; |
|
157 | + $d_ago = $now - $s_day; |
|
158 | + $s_week = 7*$s_day; |
|
159 | + $w_ago = $now - $s_week; |
|
160 | 160 | |
161 | 161 | echo " |
162 | 162 | <table border=2 cellpadding=6> |
@@ -276,12 +276,12 @@ discard block |
||
276 | 276 | <tr><td>invalid</td><td>".number_format($n)."</td></tr> |
277 | 277 | "; |
278 | 278 | |
279 | - $n = time(0)-find_oldest(); |
|
279 | + $n = time(0) - find_oldest(); |
|
280 | 280 | $days = (int)($n/86400); |
281 | - $hours=(int)($n/3600); |
|
282 | - $hours=$hours % 24; |
|
283 | - $minutes=(int)($n/60); |
|
284 | - $minutes=$minutes % 60; |
|
281 | + $hours = (int)($n/3600); |
|
282 | + $hours = $hours%24; |
|
283 | + $minutes = (int)($n/60); |
|
284 | + $minutes = $minutes%60; |
|
285 | 285 | echo " |
286 | 286 | <tr><td>Oldest Unsent Result</td><td>".$days." d ".$hours." h ".$minutes." m</td></tr> |
287 | 287 | "; |
@@ -297,7 +297,7 @@ discard block |
||
297 | 297 | |
298 | 298 | // Display cgi-bin restriction status |
299 | 299 | |
300 | -if ( file_exists("../../cgi-bin/.htaccess") ) { |
|
300 | +if (file_exists("../../cgi-bin/.htaccess")) { |
|
301 | 301 | echo "<P><font color=RED> |
302 | 302 | <b>The ".PROJECT." scheduler is currently restricted |
303 | 303 | to uwm.edu and a few other domains. |
@@ -276,7 +276,7 @@ discard block |
||
276 | 276 | do_query("alter table host add max_results_day integer not null"); |
277 | 277 | } |
278 | 278 | |
279 | -function update_4_20_2005(){ |
|
279 | +function update_4_20_2005() { |
|
280 | 280 | do_query("ALTER TABLE `thread` ADD `sticky` TINYINT UNSIGNED DEFAULT '0' NOT NULL"); |
281 | 281 | do_query("ALTER TABLE `forum` ADD `post_min_total_credit` INT NOT NULL AFTER `posts`"); |
282 | 282 | do_query("ALTER TABLE `forum` ADD `post_min_expavg_credit` INT NOT NULL AFTER `posts`"); |
@@ -286,7 +286,7 @@ discard block |
||
286 | 286 | do_query("ALTER TABLE `forum_preferences` ADD `last_post` INT( 14 ) UNSIGNED NOT NULL AFTER `posts`"); |
287 | 287 | } |
288 | 288 | |
289 | -function update_4_30_2005(){ |
|
289 | +function update_4_30_2005() { |
|
290 | 290 | do_query("ALTER TABLE `forum_preferences` ADD `ignore_sticky_posts` TINYINT( 1 ) UNSIGNED NOT NULL"); |
291 | 291 | } |
292 | 292 | |
@@ -313,7 +313,7 @@ discard block |
||
313 | 313 | do_query("update user set country='Macedonia' where country='Macedonia, The Former Yugoslav Republic of'"); |
314 | 314 | } |
315 | 315 | |
316 | -function update_11_24_2005(){ |
|
316 | +function update_11_24_2005() { |
|
317 | 317 | do_query("ALTER TABLE `forum_preferences` ADD `minimum_wrap_postcount` INT DEFAULT '100' NOT NULL AFTER `high_rating_threshold` , |
318 | 318 | ADD `display_wrap_postcount` INT DEFAULT '75' NOT NULL AFTER `minimum_wrap_postcount`"); |
319 | 319 | } |
@@ -618,7 +618,7 @@ discard block |
||
618 | 618 | "); |
619 | 619 | } |
620 | 620 | |
621 | -function update_10_05_2008(){ |
|
621 | +function update_10_05_2008() { |
|
622 | 622 | do_query("alter table forum_preferences add highlight_special tinyint default '1' not null"); |
623 | 623 | } |
624 | 624 | |
@@ -1244,7 +1244,7 @@ discard block |
||
1244 | 1244 | // This used to be the Subversion version#, |
1245 | 1245 | // but with Git we just use sequential integers |
1246 | 1246 | // |
1247 | -$db_updates = array ( |
|
1247 | +$db_updates = array( |
|
1248 | 1248 | array(18490, "update_6_16_2009"), |
1249 | 1249 | array(19001, "update_9_3_2009"), |
1250 | 1250 | array(20807, "update_3_5_2010"), |
@@ -42,15 +42,15 @@ |
||
42 | 42 | $start_id = 0; //Set this to something else if you like |
43 | 43 | $profiles = _mysql_query("select * from profile where userid>$start_id order by userid"); |
44 | 44 | echo _mysql_error(); |
45 | - $i=0; |
|
46 | - while ($profile = _mysql_fetch_object($profiles)){ |
|
45 | + $i = 0; |
|
46 | + while ($profile = _mysql_fetch_object($profiles)) { |
|
47 | 47 | $i++; |
48 | 48 | if ($i%100 == 0) { //For every 100 profiles |
49 | - echo $profile->userid.". "; flush(); // print out where we are |
|
49 | + echo $profile->userid.". "; flush(); // print out where we are |
|
50 | 50 | //usleep(200000); |
51 | 51 | } |
52 | 52 | |
53 | - if ($profile->userid > $start_id){ |
|
53 | + if ($profile->userid > $start_id) { |
|
54 | 54 | fix_profile($profile); |
55 | 55 | } |
56 | 56 | } |
@@ -78,8 +78,8 @@ discard block |
||
78 | 78 | foreach ($documents as $document) { |
79 | 79 | //dd($document, "index documents alter - document"); |
80 | 80 | |
81 | - $to_process = ( array_key_exists($document->bundle, $node_types) AND $node_types[$document->bundle] ); |
|
82 | - if ( $document->entity_type=='node' AND $to_process) { |
|
81 | + $to_process = (array_key_exists($document->bundle, $node_types) AND $node_types[$document->bundle]); |
|
82 | + if ($document->entity_type == 'node' AND $to_process) { |
|
83 | 83 | |
84 | 84 | // Remove ts_comments if present. |
85 | 85 | if (isset($document->ts_comments)) { |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | $comment_document->bundle = 'Comment'; |
111 | 111 | $comment_document->bundle_name = 'Comment'; |
112 | 112 | |
113 | - $comment_document->path = 'goto/comment/' . $comment->cid; |
|
113 | + $comment_document->path = 'goto/comment/'.$comment->cid; |
|
114 | 114 | $comment_document->url = url($comment_document->path, $url_options); |
115 | 115 | |
116 | 116 | // Comment object has no language |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | |
141 | 141 | // Index formatted username so it can be searched and sorted |
142 | 142 | // on. |
143 | - $account = (object) array('uid' => $comment->uid, 'name' => $comment->name); |
|
143 | + $account = (object)array('uid' => $comment->uid, 'name' => $comment->name); |
|
144 | 144 | $username = check_plain($account->name); |
145 | 145 | $comment_document->ss_name_formatted = $username; |
146 | 146 | $comment_document->tos_name_formatted = $username; |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | |
185 | 185 | // Copy over fields [im_taxonomy_vid_1], [tid], [im_vid_1], |
186 | 186 | // [im_vid_Forums], [tm_vid_1_names] |
187 | - if ( ( preg_match('/tid/', $fieldName) OR preg_match('/vid/', $fieldName) ) AND is_array($fieldValue) ) { |
|
187 | + if ((preg_match('/tid/', $fieldName) OR preg_match('/vid/', $fieldName)) AND is_array($fieldValue)) { |
|
188 | 188 | foreach ($fieldValue as $subkey => $subvalue) { |
189 | 189 | $comment_document->addField($fieldName, $subvalue); |
190 | 190 | } |
@@ -226,8 +226,8 @@ discard block |
||
226 | 226 | */ |
227 | 227 | function boinc_solr_comments_apachesolr_process_results(&$results, DrupalSolrQueryInterface $query) { |
228 | 228 | //dpm($query->getSolrParams(), "process_results query getSolrParams"); |
229 | - foreach($results as $id => $result) { |
|
230 | - if ($result['entity_type']=='comment') { |
|
229 | + foreach ($results as $id => $result) { |
|
230 | + if ($result['entity_type'] == 'comment') { |
|
231 | 231 | $results[$id]['type'] = 'Comment'; |
232 | 232 | $results[$id]['date'] = $result['fields']['changed']; |
233 | 233 | if (isset($result['fields']['is_uid'])) { |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | */ |
253 | 253 | function boinc_solr_comments_apachesolr_query_alter($query) { |
254 | 254 | // Add custom field to query results |
255 | - $query->addParam('fl','tos_content_extra'); |
|
255 | + $query->addParam('fl', 'tos_content_extra'); |
|
256 | 256 | } |
257 | 257 | |
258 | 258 | /* * * * * * * * * * * * * * * * * * * * * * * * * * * * |
@@ -282,7 +282,7 @@ discard block |
||
282 | 282 | switch ($op) { |
283 | 283 | case 'delete': |
284 | 284 | // Only call delete function on certain node types |
285 | - if (in_array( $node->type, $node_types)) { |
|
285 | + if (in_array($node->type, $node_types)) { |
|
286 | 286 | boinc_solr_comments_delete($node); |
287 | 287 | } |
288 | 288 | break; |
@@ -314,7 +314,7 @@ discard block |
||
314 | 314 | try { |
315 | 315 | $solr = apachesolr_get_solr($env_id); |
316 | 316 | // Custom query to find all comments with parent nid of the node bing deleted. |
317 | - $query = "entity_type:comment AND tos_content_extra:" . $node->nid; |
|
317 | + $query = "entity_type:comment AND tos_content_extra:".$node->nid; |
|
318 | 318 | $solr->deleteByQuery($query); |
319 | 319 | // Log the query used for deletion. |
320 | 320 | watchdog('Apache Solr', 'Deleted documents from index with query @query', array('@query' => $query), WATCHDOG_INFO); |
@@ -399,7 +399,7 @@ discard block |
||
399 | 399 | */ |
400 | 400 | |
401 | 401 | function boinc_solr_comments_enable() { |
402 | - drupal_set_message( bts('Warning: Your content <a href="@url">must be re-indexed</a> before Apache Solr will search comments.', array('@url' => url('admin/settings/apachesolr/index')), NULL, 'boinc:admin-solr-index-comments-message'), 'warning'); |
|
402 | + drupal_set_message(bts('Warning: Your content <a href="@url">must be re-indexed</a> before Apache Solr will search comments.', array('@url' => url('admin/settings/apachesolr/index')), NULL, 'boinc:admin-solr-index-comments-message'), 'warning'); |
|
403 | 403 | } |
404 | 404 | |
405 | 405 | /** |
@@ -410,7 +410,7 @@ discard block |
||
410 | 410 | * The comment to be published (unhidden). |
411 | 411 | */ |
412 | 412 | function boinc_solr_comments_publish($comment) { |
413 | - if ( ($comment->cid) AND ($comment->nid) ) { |
|
413 | + if (($comment->cid) AND ($comment->nid)) { |
|
414 | 414 | $node = node_load($comment->nid); |
415 | 415 | // Tell Solr that the node has been updated, so the comment can be |
416 | 416 | // indexed. |
@@ -426,7 +426,7 @@ discard block |
||
426 | 426 | * The comment to be unpublished (hidden). |
427 | 427 | */ |
428 | 428 | function boinc_solr_comments_unpublish($comment) { |
429 | - if ( ($comment->cid) ) { |
|
429 | + if (($comment->cid)) { |
|
430 | 430 | // Call the deletecomment function for hook comment. |
431 | 431 | boinc_solr_comments_deletecomment($comment); |
432 | 432 | } |
@@ -165,8 +165,8 @@ discard block |
||
165 | 165 | WHERE n.type = 'profile' |
166 | 166 | AND n.status = 1 |
167 | 167 | AND n.moderate = 0 |
168 | - " . ($never_been_picked ? " AND bu.uotd_time = 0 " : '') . " |
|
169 | - " . ($active_users ? " AND bu.boinc_id IN ({$active_users}) " : '') . " |
|
168 | + " . ($never_been_picked ? " AND bu.uotd_time = 0 " : '')." |
|
169 | + " . ($active_users ? " AND bu.boinc_id IN ({$active_users}) " : '')." |
|
170 | 170 | ORDER BY RAND() |
171 | 171 | LIMIT 1" |
172 | 172 | )); |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | * this function is called, it may be called with optional parameters |
213 | 213 | * new and prev email. |
214 | 214 | */ |
215 | -function _boincuser_send_emailchange($account, $new_email=NULL, $prev_email=NULL, $adminuser=FALSE) { |
|
215 | +function _boincuser_send_emailchange($account, $new_email = NULL, $prev_email = NULL, $adminuser = FALSE) { |
|
216 | 216 | require_boinc('token'); |
217 | 217 | module_load_include('inc', 'rules', 'modules/system.rules'); |
218 | 218 | |
@@ -303,7 +303,7 @@ discard block |
||
303 | 303 | // Name is limited to 60 characters, but we want to leave space to add a |
304 | 304 | // tally if needed (for users with duplicate names); Limit to 56 chars and |
305 | 305 | // replace the middle of the string with "..." if too long |
306 | - $cleaned_name = substr_replace($cleaned_name, '...', 28, ($name_length-56)+3); |
|
306 | + $cleaned_name = substr_replace($cleaned_name, '...', 28, ($name_length - 56) + 3); |
|
307 | 307 | } |
308 | 308 | |
309 | 309 | // Determine if there are duplicate names, if so append a number to end. |
@@ -379,7 +379,7 @@ discard block |
||
379 | 379 | // delimiters. Curly brace is not really allowed un URLs, but a |
380 | 380 | // more robust function would first check for these curly braces |
381 | 381 | // in the path_to_ignore patterms, just in case. |
382 | - if (preg_match('{' . $pi . '}', $path)) { |
|
382 | + if (preg_match('{'.$pi.'}', $path)) { |
|
383 | 383 | return TRUE; |
384 | 384 | } |
385 | 385 | } |
@@ -505,15 +505,15 @@ discard block |
||
505 | 505 | elseif (!in_array($_GET['q'], $page_blacklist)) { |
506 | 506 | watchdog('boincuser', 'The BOINC scheduling server settings are not yet |
507 | 507 | configured. Please !verify for the settings to become effective.', |
508 | - array('!verify' => l(t('verify the default values') . ' <strong>' . |
|
509 | - t('and') . '</strong> ' . t('save the configuration'), |
|
508 | + array('!verify' => l(t('verify the default values').' <strong>'. |
|
509 | + t('and').'</strong> '.t('save the configuration'), |
|
510 | 510 | 'admin/boinc/scheduler', array('html' => TRUE)) |
511 | 511 | ), WATCHDOG_WARNING); |
512 | 512 | if (user_access('administer site configuration')) { |
513 | 513 | drupal_set_message(t('The BOINC scheduling server settings are not yet |
514 | 514 | configured. Please !verify for the settings to become effective', |
515 | - array('!verify' => l(t('verify the default values') . ' <strong>' . |
|
516 | - t('and') . '</strong> ' . t('save the configuration'), |
|
515 | + array('!verify' => l(t('verify the default values').' <strong>'. |
|
516 | + t('and').'</strong> '.t('save the configuration'), |
|
517 | 517 | 'admin/boinc/scheduler', array('html' => TRUE)) |
518 | 518 | )), 'warning', FALSE); |
519 | 519 | } |
@@ -575,7 +575,7 @@ discard block |
||
575 | 575 | */ |
576 | 576 | function _boincuser_node_profile_delete_submit($form, &$form_state) { |
577 | 577 | $node = $form['#node']; |
578 | - $deleteurl = 'node/'. $node->nid .'/delete'; |
|
578 | + $deleteurl = 'node/'.$node->nid.'/delete'; |
|
579 | 579 | $afterq = 'destination=account'; |
580 | 580 | drupal_goto($deleteurl, $afterq); |
581 | 581 | } |
@@ -605,8 +605,8 @@ discard block |
||
605 | 605 | $view = views_get_current_view(); |
606 | 606 | $account_id = $view->args[0]; |
607 | 607 | $friend_count = flag_friend_get_friend_count($account_id); |
608 | - return '<h2 class="pane-title">' . bts('Friends (@count)', |
|
609 | - array('@count' => $friend_count)) . '</h2>'; |
|
608 | + return '<h2 class="pane-title">'.bts('Friends (@count)', |
|
609 | + array('@count' => $friend_count)).'</h2>'; |
|
610 | 610 | } |
611 | 611 | |
612 | 612 | /** |
@@ -619,7 +619,7 @@ discard block |
||
619 | 619 | $result = db_query_range("SELECT id,name FROM {user} WHERE name LIKE '%s%'", $string, 0, 10); |
620 | 620 | db_set_active('default'); |
621 | 621 | while ($user = db_fetch_object($result)) { |
622 | - $matches[$user->name . '_' . $user->id] = htmlentities($user->name) . " (" . $user->id . ')'; |
|
622 | + $matches[$user->name.'_'.$user->id] = htmlentities($user->name)." (".$user->id.')'; |
|
623 | 623 | } |
624 | 624 | |
625 | 625 | drupal_json((object)$matches); |
@@ -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 | } |