@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | // Include the definition of zen_theme_get_default_settings(). |
3 | -include_once './' . drupal_get_path('theme', 'zen') . '/zen-internals/template.theme-registry.inc'; |
|
3 | +include_once './'.drupal_get_path('theme', 'zen').'/zen-internals/template.theme-registry.inc'; |
|
4 | 4 | |
5 | 5 | |
6 | 6 | /** |
@@ -16,10 +16,10 @@ discard block |
||
16 | 16 | function zen_settings($saved_settings, $subtheme_defaults = array()) { |
17 | 17 | |
18 | 18 | // Add the form's CSS |
19 | - drupal_add_css(drupal_get_path('theme', 'zen') . '/zen-internals/css/theme-settings.css', 'theme'); |
|
19 | + drupal_add_css(drupal_get_path('theme', 'zen').'/zen-internals/css/theme-settings.css', 'theme'); |
|
20 | 20 | |
21 | 21 | // Add javascript to show/hide optional settings |
22 | - drupal_add_js(drupal_get_path('theme', 'zen') . '/zen-internals/js/theme-settings.js', 'theme'); |
|
22 | + drupal_add_js(drupal_get_path('theme', 'zen').'/zen-internals/js/theme-settings.js', 'theme'); |
|
23 | 23 | |
24 | 24 | // Get the default values from the .info file. |
25 | 25 | $defaults = zen_theme_get_default_settings('zen'); |
@@ -97,15 +97,15 @@ discard block |
||
97 | 97 | '#title' => t('Rebuild theme registry on every page.'), |
98 | 98 | '#default_value' => $settings['zen_rebuild_registry'], |
99 | 99 | '#description' => t('During theme development, it can be very useful to continuously <a href="!link">rebuild the theme registry</a>. WARNING: this is a huge performance penalty and must be turned off on production websites.', array('!link' => 'http://drupal.org/node/173880#theme-registry')), |
100 | - '#prefix' => '<div id="div-zen-registry"><strong>' . t('Theme registry:') . '</strong>', |
|
100 | + '#prefix' => '<div id="div-zen-registry"><strong>'.t('Theme registry:').'</strong>', |
|
101 | 101 | '#suffix' => '</div>', |
102 | 102 | ); |
103 | 103 | $form['themedev']['zen_layout'] = array( |
104 | 104 | '#type' => 'radios', |
105 | 105 | '#title' => t('Layout method'), |
106 | 106 | '#options' => array( |
107 | - 'zen-columns-liquid' => t('Liquid layout') . ' <small>(layout-liquid.css)</small>', |
|
108 | - 'zen-columns-fixed' => t('Fixed layout') . ' <small>(layout-fixed.css)</small>', |
|
107 | + 'zen-columns-liquid' => t('Liquid layout').' <small>(layout-liquid.css)</small>', |
|
108 | + 'zen-columns-fixed' => t('Fixed layout').' <small>(layout-fixed.css)</small>', |
|
109 | 109 | ), |
110 | 110 | '#default_value' => $settings['zen_layout'], |
111 | 111 | ); |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | '#title' => t('Display borders around main layout elements'), |
115 | 115 | '#default_value' => $settings['zen_wireframes'], |
116 | 116 | '#description' => t('<a href="!link">Wireframes</a> are useful when prototyping a website.', array('!link' => 'http://www.boxesandarrows.com/view/html_wireframes_and_prototypes_all_gain_and_no_pain')), |
117 | - '#prefix' => '<div id="div-zen-wireframes"><strong>' . t('Wireframes:') . '</strong>', |
|
117 | + '#prefix' => '<div id="div-zen-wireframes"><strong>'.t('Wireframes:').'</strong>', |
|
118 | 118 | '#suffix' => '</div>', |
119 | 119 | ); |
120 | 120 |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | // Include the definition of zen_settings() and zen_theme_get_default_settings(). |
3 | -include_once './' . drupal_get_path('theme', 'zen') . '/theme-settings.php'; |
|
3 | +include_once './'.drupal_get_path('theme', 'zen').'/theme-settings.php'; |
|
4 | 4 | |
5 | 5 | |
6 | 6 | /** |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | } |
41 | 41 | $error = merge_hosts($host, $newest_host); |
42 | 42 | if (!$error) { |
43 | - echo "<br>".tra("Merged %1 into %2",$host->id,$newest_host->id)."\n"; |
|
43 | + echo "<br>".tra("Merged %1 into %2", $host->id, $newest_host->id)."\n"; |
|
44 | 44 | } else { |
45 | 45 | echo "<br>$error\n"; |
46 | 46 | } |
@@ -52,10 +52,10 @@ discard block |
||
52 | 52 | function merge_by_name($userid) { |
53 | 53 | $hosts = array(); |
54 | 54 | $host_list = BoincHost::enum("userid=$userid"); |
55 | - foreach($host_list as $host) { |
|
55 | + foreach ($host_list as $host) { |
|
56 | 56 | $hosts[$host->domain_name][] = $host; |
57 | 57 | } |
58 | - foreach($hosts as $hlist) { |
|
58 | + foreach ($hosts as $hlist) { |
|
59 | 59 | merge_name($hlist); |
60 | 60 | } |
61 | 61 | } |
@@ -38,7 +38,7 @@ |
||
38 | 38 | xml_error(ERR_ACCT_CREATION_DISABLED); |
39 | 39 | } |
40 | 40 | |
41 | -if(defined('INVITE_CODES')) { |
|
41 | +if (defined('INVITE_CODES')) { |
|
42 | 42 | $invite_code = get_str("invite_code"); |
43 | 43 | if (!preg_match(INVITE_CODES, $invite_code)) { |
44 | 44 | xml_error(ERR_ATTACH_FAIL_INIT); |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | start_table(); |
50 | 50 | |
51 | 51 | $get_reason = true; |
52 | -if (get_str('action')=="hide") { |
|
52 | +if (get_str('action') == "hide") { |
|
53 | 53 | //display input that selects reason |
54 | 54 | echo "<input type=hidden name=action value=hide>"; |
55 | 55 | row1(tra("Hide post")); |
@@ -66,12 +66,12 @@ discard block |
||
66 | 66 | ) |
67 | 67 | ) |
68 | 68 | ); |
69 | -} elseif (get_str('action')=="move") { |
|
69 | +} elseif (get_str('action') == "move") { |
|
70 | 70 | row1(tra("Move post")); |
71 | 71 | echo "<input type=hidden name=action value=move>"; |
72 | 72 | row2(tra("Destination thread ID:"), "<input name=\"threadid\">"); |
73 | 73 | // TODO: display where to move the post as a dropdown instead of having to get ID |
74 | -} elseif (get_str('action')=="banish_user") { |
|
74 | +} elseif (get_str('action') == "banish_user") { |
|
75 | 75 | $userid = get_int('userid'); |
76 | 76 | $user = BoincUser::lookup_id($userid); |
77 | 77 | BoincForumPrefs::lookup($user); |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | error_page("no user found"); |
80 | 80 | } |
81 | 81 | $x = $user->prefs->banished_until; |
82 | - if ($x>time()) { |
|
82 | + if ($x > time()) { |
|
83 | 83 | error_page(tra("User is already banished")); |
84 | 84 | } |
85 | 85 | row1(tra("Banish user")); |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | echo "<input type=\"hidden\" name=\"id\" value=\"".$postid."\">\n"; |
98 | 98 | echo "<input type=\"hidden\" name=\"userid\" value=\"".$userid."\">\n"; |
99 | 99 | echo "<input type=\"hidden\" name=\"confirmed\" value=\"yes\">\n"; |
100 | -} elseif (get_str('action')=="delete") { |
|
100 | +} elseif (get_str('action') == "delete") { |
|
101 | 101 | echo "<input type=hidden name=action value=delete>"; |
102 | 102 | row2( |
103 | 103 | "Are you sure want to delete this post? This cannot be undone.", |
@@ -41,7 +41,7 @@ |
||
41 | 41 | $nhosts = get_int("nhosts"); |
42 | 42 | $hostid = get_int("id_0"); |
43 | 43 | $latest_host = get_host($hostid, $user); |
44 | -for ($i=1; $i<$nhosts; $i++) { |
|
44 | +for ($i = 1; $i < $nhosts; $i++) { |
|
45 | 45 | $var = "id_$i"; |
46 | 46 | $hostid = get_int($var, true); |
47 | 47 | if (!$hostid) continue; |
@@ -54,7 +54,7 @@ |
||
54 | 54 | if (!is_valid_country($country)) { |
55 | 55 | error_page(tra("bad country")); |
56 | 56 | } |
57 | -$joinable = post_str('joinable', true)?1:0; |
|
57 | +$joinable = post_str('joinable', true) ? 1 : 0; |
|
58 | 58 | |
59 | 59 | $t = BoincTeam::lookup("name='$team_name'"); |
60 | 60 | if ($t && $t->id != $teamid) { |
@@ -148,6 +148,6 @@ |
||
148 | 148 | |
149 | 149 | page_tail(); |
150 | 150 | |
151 | -$cvs_version_tracker[]="\$Id$"; //Generated automatically - do not edit |
|
151 | +$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit |
|
152 | 152 | |
153 | 153 | ?> |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | page_tail(); |
45 | 45 | exit; |
46 | 46 | } |
47 | - if (substr($user->authenticator, 0, 1) == 'x'){ |
|
47 | + if (substr($user->authenticator, 0, 1) == 'x') { |
|
48 | 48 | sleep(LOGIN_FAIL_SLEEP_SEC); |
49 | 49 | error_page("This account has been administratively disabled."); |
50 | 50 | } |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | Please <a href=get_passwd.php>try again</a>. |
106 | 106 | "; |
107 | 107 | page_tail(); |
108 | - } else if (substr($user->authenticator, 0, 1) == 'x'){ |
|
108 | + } else if (substr($user->authenticator, 0, 1) == 'x') { |
|
109 | 109 | sleep(LOGIN_FAIL_SLEEP_SEC); |
110 | 110 | error_page("This account has been administratively disabled."); |
111 | 111 | } else { |