Completed
Branch master (0b66f1)
by Michael
33:21
created
htdocs/install/locale/en_US/install.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -29,8 +29,8 @@  discard block
 block discarded – undo
29 29
 define("RECOMMENDED_EXTENSIONS", "Recommended extensions");
30 30
 define("RECOMMENDED", "Recommended");
31 31
 define("CURRENT", "Current");
32
-define("COMPOSER","Composer");
33
-define("COMPOSER_ENVIRONMENT",'Composer required. <a href="http://getcomposer.org/" target="_blank">http://getcomposer.org/</a>');
32
+define("COMPOSER", "Composer");
33
+define("COMPOSER_ENVIRONMENT", 'Composer required. <a href="http://getcomposer.org/" target="_blank">http://getcomposer.org/</a>');
34 34
 
35 35
 define("RECOMMENDED_EXTENSIONS_MSG", "These extensions are not required for normal use, but may be necessary to exploit
36 36
     some specific features (like the multi-language or RSS support). Thus, it is recommended to have them installed.");
@@ -73,9 +73,9 @@  discard block
 block discarded – undo
73 73
 define("XOOPS_ROOT_PATH_HELP", "Physical path to the XOOPS documents (served) directory WITHOUT trailing slash");
74 74
 
75 75
 define("XOOPS_LIB_PATH_LABEL", "XOOPS library directory");
76
-define("XOOPS_LIB_PATH_HELP", "Physical path to the XOOPS library directory WITHOUT trailing slash, for forward compatibility. Locate the folder out of " . XOOPS_ROOT_PATH_LABEL . " to make it secure.");
76
+define("XOOPS_LIB_PATH_HELP", "Physical path to the XOOPS library directory WITHOUT trailing slash, for forward compatibility. Locate the folder out of ".XOOPS_ROOT_PATH_LABEL." to make it secure.");
77 77
 define("XOOPS_DATA_PATH_LABEL", "XOOPS datafiles directory");
78
-define("XOOPS_DATA_PATH_HELP", "Physical path to the XOOPS datafiles (writable) directory WITHOUT trailing slash, for forward compatibility. Locate the folder out of " . XOOPS_ROOT_PATH_LABEL . " to make it secure.");
78
+define("XOOPS_DATA_PATH_HELP", "Physical path to the XOOPS datafiles (writable) directory WITHOUT trailing slash, for forward compatibility. Locate the folder out of ".XOOPS_ROOT_PATH_LABEL." to make it secure.");
79 79
 
80 80
 define("XOOPS_URL_LABEL", "Website location (URL)"); // L56
81 81
 define("XOOPS_URL_HELP", "Main URL that will be used to access your XOOPS installation"); // L58
@@ -159,8 +159,8 @@  discard block
 block discarded – undo
159 159
 define("ERR_READ_MAINFILE", "Could not open mainfile.php for reading");
160 160
 
161 161
 define("ERR_COPY_SECURE", "Could not copy into secure.php the distribution file: ");
162
-define("ERR_READ_SECURE","Could not open secure.php for reading");
163
-define("ERR_WRITE_SECURE","Could not write into secure.php. Please check the file permission and try again.");
162
+define("ERR_READ_SECURE", "Could not open secure.php for reading");
163
+define("ERR_WRITE_SECURE", "Could not write into secure.php. Please check the file permission and try again.");
164 164
 
165 165
 define("ERR_INVALID_DBCHARSET", "The charset '%s' is not supported.");
166 166
 define("ERR_INVALID_DBCOLLATION", "The collation '%s' is not supported.");
Please login to merge, or discard this patch.
htdocs/install/page_langselect.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
  * @version     $Id$
26 26
  */
27 27
 
28
-require_once __DIR__ . '/include/common.inc.php';
28
+require_once __DIR__.'/include/common.inc.php';
29 29
 
30 30
 /* @var $wizard XoopsInstallWizard */
31 31
 $wizard = $_SESSION['wizard'];
@@ -57,4 +57,4 @@  discard block
 block discarded – undo
57 57
 $_SESSION['pageHasHelp'] = false;
58 58
 $_SESSION['pageHasForm'] = true;
59 59
 $_SESSION['content'] = $content;
60
-include XOOPS_INSTALL_PATH . '/include/install_tpl.php';
60
+include XOOPS_INSTALL_PATH.'/include/install_tpl.php';
Please login to merge, or discard this patch.
htdocs/install/page_moduleinstaller.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 $xoopsOption['checkadmin'] = true;
26 26
 $xoopsOption['hascommon'] = true;
27 27
 
28
-require_once __DIR__ . '/include/common.inc.php';
28
+require_once __DIR__.'/include/common.inc.php';
29 29
 
30 30
 $xoops = Xoops::getInstance();
31 31
 
@@ -36,8 +36,8 @@  discard block
 block discarded – undo
36 36
 if ($_SERVER['REQUEST_METHOD'] === 'POST') {
37 37
     $xoops->events();
38 38
     $xoops->loadLocale('system');
39
-    include_once XOOPS_ROOT_PATH . "/modules/system/class/module.php";
40
-    include_once XOOPS_ROOT_PATH . "/modules/system/class/system.php";
39
+    include_once XOOPS_ROOT_PATH."/modules/system/class/module.php";
40
+    include_once XOOPS_ROOT_PATH."/modules/system/class/system.php";
41 41
 
42 42
     $system_module = new SystemModule();
43 43
     $system = System::getInstance();
@@ -52,14 +52,14 @@  discard block
 block discarded – undo
52 52
     $pageHasForm = false;
53 53
 
54 54
     if (count($msgs) > 0) {
55
-        $content = "<div class='x2-note successMsg'>" . INSTALLED_MODULES . "</div><ul class='log'>";
55
+        $content = "<div class='x2-note successMsg'>".INSTALLED_MODULES."</div><ul class='log'>";
56 56
         foreach ($msgs as $msg) {
57 57
             $tempvar = $msg->modinfo['name'];
58 58
             $content .= "<dt>{$tempvar}</dt>";
59 59
         }
60 60
         $content .= "</ul>";
61 61
     } else {
62
-        $content = "<div class='x2-note confirmMsg'>" . NO_INSTALLED_MODULES . "</div>";
62
+        $content = "<div class='x2-note confirmMsg'>".NO_INSTALLED_MODULES."</div>";
63 63
     }
64 64
 
65 65
     //Reset module lists in cache folder
@@ -89,8 +89,8 @@  discard block
 block discarded – undo
89 89
     }
90 90
     $xoops->loadLocale('system');
91 91
 
92
-    include_once XOOPS_ROOT_PATH . "/modules/system/class/module.php";
93
-    include_once XOOPS_ROOT_PATH . "/modules/system/class/system.php";
92
+    include_once XOOPS_ROOT_PATH."/modules/system/class/module.php";
93
+    include_once XOOPS_ROOT_PATH."/modules/system/class/system.php";
94 94
 
95 95
     $system = System::getInstance();
96 96
     // Get installed modules
@@ -112,15 +112,15 @@  discard block
 block discarded – undo
112 112
             $style = " style='background-color:#E6EFC2;'";
113 113
         }
114 114
         $form = new Xoops\Form\ThemeForm('', 'modules', 'index.php', 'post');
115
-        $moduleYN = new Xoops\Form\RadioYesNo('', 'modules[' . $module->getInfo('dirname') . ']', $value, XoopsLocale::YES, XoopsLocale::NO);
116
-        $moduleYN->set('onclick', 'selectModule("' . $module->getInfo('dirname') . '", this);');
115
+        $moduleYN = new Xoops\Form\RadioYesNo('', 'modules['.$module->getInfo('dirname').']', $value, XoopsLocale::YES, XoopsLocale::NO);
116
+        $moduleYN->set('onclick', 'selectModule("'.$module->getInfo('dirname').'", this);');
117 117
         $form->addElement($moduleYN);
118 118
 
119
-        $content .= "<tr id='" . $module->getInfo('dirname') . "'" . $style . ">\n";
120
-        $content .= "    <td class='img' ><img src='" . XOOPS_URL . "/modules/" . $module->getInfo('dirname') . "/" . $module->getInfo('image') . "' alt='" . $module->getInfo('name') . "'/></td>\n";
119
+        $content .= "<tr id='".$module->getInfo('dirname')."'".$style.">\n";
120
+        $content .= "    <td class='img' ><img src='".XOOPS_URL."/modules/".$module->getInfo('dirname')."/".$module->getInfo('image')."' alt='".$module->getInfo('name')."'/></td>\n";
121 121
         $content .= "    <td>";
122
-        $content .= "        " . $module->getInfo('name') . "&nbsp;" . number_format(round($module->getInfo('version'), 2), 2) . "&nbsp;(" . $module->getInfo('dirname') . ")";
123
-        $content .= "        <br />" . $module->getInfo('description');
122
+        $content .= "        ".$module->getInfo('name')."&nbsp;".number_format(round($module->getInfo('version'), 2), 2)."&nbsp;(".$module->getInfo('dirname').")";
123
+        $content .= "        <br />".$module->getInfo('description');
124 124
         $content .= "    </td>\n";
125 125
         $content .= "    <td class='yesno'>";
126 126
         $content .= $moduleYN->render();
@@ -128,14 +128,14 @@  discard block
 block discarded – undo
128 128
         ++$toinstal;
129 129
     }
130 130
     $content .= "</table>";
131
-    $content .= "</li></ul><script type='text/javascript'>" . $javascript . "</script>";
131
+    $content .= "</li></ul><script type='text/javascript'>".$javascript."</script>";
132 132
     if ($toinstal == 0) {
133 133
         $pageHasForm = false;
134
-        $content = "<div class='x2-note confirmMsg'>" . NO_MODULES_FOUND . "</div>";
134
+        $content = "<div class='x2-note confirmMsg'>".NO_MODULES_FOUND."</div>";
135 135
     }
136 136
 }
137 137
 
138 138
 $_SESSION['pageHasHelp'] = false;
139 139
 $_SESSION['pageHasForm'] = $pageHasForm;
140 140
 $_SESSION['content'] = $content;
141
-include XOOPS_INSTALL_PATH . '/include/install_tpl.php';
141
+include XOOPS_INSTALL_PATH.'/include/install_tpl.php';
Please login to merge, or discard this patch.
htdocs/install/page_extensioninstaller.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
 $xoopsOption['checkadmin'] = true;
23 23
 $xoopsOption['hascommon'] = true;
24 24
 
25
-require_once __DIR__ . '/include/common.inc.php';
25
+require_once __DIR__.'/include/common.inc.php';
26 26
 
27 27
 $xoops = Xoops::getInstance();
28 28
 
@@ -32,8 +32,8 @@  discard block
 block discarded – undo
32 32
 
33 33
 if ($_SERVER['REQUEST_METHOD'] === 'POST') {
34 34
     $xoops->loadLocale('system');
35
-    include_once XOOPS_ROOT_PATH . "/modules/system/class/module.php";
36
-    include_once XOOPS_ROOT_PATH . "/modules/system/class/system.php";
35
+    include_once XOOPS_ROOT_PATH."/modules/system/class/module.php";
36
+    include_once XOOPS_ROOT_PATH."/modules/system/class/system.php";
37 37
 
38 38
     $system = System::getInstance();
39 39
 
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
     $pageHasForm = false;
50 50
 
51 51
     if (count($msgs) > 0) {
52
-        $content = "<div class='x2-note successMsg'>" . INSTALLED_EXTENSION . "</div><ul class='log'>";
52
+        $content = "<div class='x2-note successMsg'>".INSTALLED_EXTENSION."</div><ul class='log'>";
53 53
         foreach ($msgs as $msg) {
54 54
             if ($msg instanceof XoopsModule) {
55 55
                 $tempvar = $msg->modinfo['name'];
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
         }
59 59
         $content .= "</ul>";
60 60
     } else {
61
-        $content = "<div class='x2-note confirmMsg'>" . NO_INSTALLED_EXTENSION . "</div>";
61
+        $content = "<div class='x2-note confirmMsg'>".NO_INSTALLED_EXTENSION."</div>";
62 62
     }
63 63
 
64 64
     //Reset module lists in cache folder
@@ -69,9 +69,9 @@  discard block
 block discarded – undo
69 69
         $xoops->setConfig('locale', $_COOKIE['xo_install_lang']);
70 70
     }
71 71
     $xoops->loadLocale('system');
72
-    include_once XOOPS_ROOT_PATH . "/modules/system/class/module.php";
73
-    include_once XOOPS_ROOT_PATH . "/modules/system/class/extension.php";
74
-    include_once XOOPS_ROOT_PATH . "/modules/system/class/system.php";
72
+    include_once XOOPS_ROOT_PATH."/modules/system/class/module.php";
73
+    include_once XOOPS_ROOT_PATH."/modules/system/class/extension.php";
74
+    include_once XOOPS_ROOT_PATH."/modules/system/class/system.php";
75 75
 
76 76
     $system = System::getInstance();
77 77
 
@@ -96,15 +96,15 @@  discard block
 block discarded – undo
96 96
         }
97 97
 
98 98
         $form = new Xoops\Form\ThemeForm('', 'modules', 'index.php', 'post');
99
-        $moduleYN = new Xoops\Form\RadioYesNo('', 'modules[' . $ext->getInfo('dirname') . ']', $value, XoopsLocale::YES, XoopsLocale::NO);
100
-        $moduleYN->setExtra("onclick='selectModule(\"" . $ext->getInfo('dirname') . "\", this)'");
99
+        $moduleYN = new Xoops\Form\RadioYesNo('', 'modules['.$ext->getInfo('dirname').']', $value, XoopsLocale::YES, XoopsLocale::NO);
100
+        $moduleYN->setExtra("onclick='selectModule(\"".$ext->getInfo('dirname')."\", this)'");
101 101
         $form->addElement($moduleYN);
102 102
 
103
-        $content .= "<tr id='" . $ext->getInfo('dirname') . "'" . $style . ">\n";
104
-        $content .= "    <td class='img' ><img src='" . XOOPS_URL . "/modules/" . $ext->getInfo('dirname') . "/" . $ext->getInfo('image') . "' alt='" . $ext->getInfo('name') . "'/></td>\n";
103
+        $content .= "<tr id='".$ext->getInfo('dirname')."'".$style.">\n";
104
+        $content .= "    <td class='img' ><img src='".XOOPS_URL."/modules/".$ext->getInfo('dirname')."/".$ext->getInfo('image')."' alt='".$ext->getInfo('name')."'/></td>\n";
105 105
         $content .= "    <td>";
106
-        $content .= "        " . $ext->getInfo('name') . "&nbsp;" . number_format(round($ext->getInfo('version'), 2), 2) . "&nbsp;(" . $ext->getInfo('dirname') . ")";
107
-        $content .= "        <br />" . $ext->getInfo('description');
106
+        $content .= "        ".$ext->getInfo('name')."&nbsp;".number_format(round($ext->getInfo('version'), 2), 2)."&nbsp;(".$ext->getInfo('dirname').")";
107
+        $content .= "        <br />".$ext->getInfo('description');
108 108
         $content .= "    </td>\n";
109 109
         $content .= "    <td class='yesno'>";
110 110
         $content .= $moduleYN->render();
@@ -112,13 +112,13 @@  discard block
 block discarded – undo
112 112
         ++$toinstal;
113 113
     }
114 114
     $content .= "</table>";
115
-    $content .= "</li></ul><script type='text/javascript'>" . $javascript . "</script>";
115
+    $content .= "</li></ul><script type='text/javascript'>".$javascript."</script>";
116 116
     if ($toinstal == 0) {
117 117
         $pageHasForm = false;
118
-        $content = "<div class='x2-note confirmMsg'>" . NO_EXTENSION_FOUND . "</div>";
118
+        $content = "<div class='x2-note confirmMsg'>".NO_EXTENSION_FOUND."</div>";
119 119
     }
120 120
 }
121 121
 $_SESSION['pageHasHelp'] = false;
122 122
 $_SESSION['pageHasForm'] = $pageHasForm;
123 123
 $_SESSION['content'] = $content;
124
-include XOOPS_INSTALL_PATH . '/include/install_tpl.php';
124
+include XOOPS_INSTALL_PATH.'/include/install_tpl.php';
Please login to merge, or discard this patch.
htdocs/install/page_configsave.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
  * @version     $Id$
25 25
  */
26 26
 
27
-require_once __DIR__ . '/include/common.inc.php';
27
+require_once __DIR__.'/include/common.inc.php';
28 28
 
29 29
 /* @var $wizard XoopsInstallWizard */
30 30
 $wizard = $_SESSION['wizard'];
@@ -45,15 +45,15 @@  discard block
 block discarded – undo
45 45
 );
46 46
 $rewrite = array_merge($rewrite, $settings);
47 47
 
48
-if (!@copy($settings['ROOT_PATH'] . '/mainfile.dist.php', $settings['ROOT_PATH'] . '/mainfile.php')) {
48
+if (!@copy($settings['ROOT_PATH'].'/mainfile.dist.php', $settings['ROOT_PATH'].'/mainfile.php')) {
49 49
     $error = ERR_COPY_MAINFILE;
50 50
 } else {
51 51
     clearstatcache();
52 52
 
53
-    if (!$file = fopen($settings['ROOT_PATH'] . '/mainfile.php', "r")) {
53
+    if (!$file = fopen($settings['ROOT_PATH'].'/mainfile.php', "r")) {
54 54
         $error = ERR_READ_MAINFILE;
55 55
     } else {
56
-        $content = fread($file, filesize($settings['ROOT_PATH'] . '/mainfile.php'));
56
+        $content = fread($file, filesize($settings['ROOT_PATH'].'/mainfile.php'));
57 57
         fclose($file);
58 58
 
59 59
         foreach ($rewrite as $key => $val) {
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
                 }
73 73
             }
74 74
         }
75
-        if (!$file = fopen($settings['ROOT_PATH'] . '/mainfile.php', "w")) {
75
+        if (!$file = fopen($settings['ROOT_PATH'].'/mainfile.php', "w")) {
76 76
             $error = ERR_WRITE_MAINFILE;
77 77
         } else {
78 78
             if (fwrite($file, $content) == -1) {
@@ -83,15 +83,15 @@  discard block
 block discarded – undo
83 83
     }
84 84
 }
85 85
 
86
-if (!@copy($rewrite['VAR_PATH'] . '/data/secure.dist.php', $rewrite['VAR_PATH'] . '/data/secure.php')) {
87
-    $error = ERR_COPY_SECURE . $rewrite['VAR_PATH'] . '/data/secure.dist.php';
86
+if (!@copy($rewrite['VAR_PATH'].'/data/secure.dist.php', $rewrite['VAR_PATH'].'/data/secure.php')) {
87
+    $error = ERR_COPY_SECURE.$rewrite['VAR_PATH'].'/data/secure.dist.php';
88 88
 } else {
89 89
     clearstatcache();
90 90
 
91
-    if (!$file = fopen($rewrite['VAR_PATH'] . '/data/secure.php', "r")) {
91
+    if (!$file = fopen($rewrite['VAR_PATH'].'/data/secure.php', "r")) {
92 92
         $error = ERR_READ_SECURE;
93 93
     } else {
94
-        $content = fread($file, filesize($rewrite['VAR_PATH'] . '/data/secure.php'));
94
+        $content = fread($file, filesize($rewrite['VAR_PATH'].'/data/secure.php'));
95 95
         fclose($file);
96 96
 
97 97
         foreach ($rewrite as $key => $val) {
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
                 }
108 108
             }
109 109
         }
110
-        if (!$file = fopen($rewrite['VAR_PATH'] . '/data/secure.php', "w")) {
110
+        if (!$file = fopen($rewrite['VAR_PATH'].'/data/secure.php', "w")) {
111 111
             $error = ERR_WRITE_SECURE;
112 112
         } else {
113 113
             if (fwrite($file, $content) == -1) {
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
     if ($k === 'authorized') {
150 150
         continue;
151 151
     }
152
-    echo "<li><strong>XOOPS_{$k}</strong> " . IS_VALOR . " {$v}</li>";
152
+    echo "<li><strong>XOOPS_{$k}</strong> ".IS_VALOR." {$v}</li>";
153 153
 }
154 154
     ?>
155 155
 </ul>
@@ -157,11 +157,11 @@  discard block
 block discarded – undo
157 157
         $content = ob_get_contents();
158 158
     ob_end_clean();
159 159
 } else {
160
-    $content = '<div class="errorMsg">' . $error . '</div>';
160
+    $content = '<div class="errorMsg">'.$error.'</div>';
161 161
 }
162 162
 
163 163
 $_SESSION['pageHasHelp'] = false;
164 164
 $_SESSION['pageHasForm'] = false;
165 165
 $_SESSION['content'] = $content;
166 166
 $_SESSION['settings'] = $settings;
167
-include XOOPS_INSTALL_PATH . '/include/install_tpl.php';
167
+include XOOPS_INSTALL_PATH.'/include/install_tpl.php';
Please login to merge, or discard this patch.
htdocs/install/page_pathsettings.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -24,20 +24,20 @@  discard block
 block discarded – undo
24 24
  * @version     $Id$
25 25
  */
26 26
 
27
-require_once __DIR__ . '/include/common.inc.php';
27
+require_once __DIR__.'/include/common.inc.php';
28 28
 
29
-include_once XOOPS_INSTALL_PATH . '/class/pathcontroller.php';
29
+include_once XOOPS_INSTALL_PATH.'/class/pathcontroller.php';
30 30
 
31 31
 $ctrl = new XoopsPathController($wizard->configs['xoopsPathDefault'], $wizard->configs['dataPath']);
32 32
 
33 33
 if ($_SERVER['REQUEST_METHOD'] === 'GET' && @$_GET['var'] && @$_GET['action'] === 'checkpath') {
34 34
     $path = $_GET['var'];
35
-    $ctrl->xoopsPath[$path] = htmlspecialchars( trim($_GET['path']) );
36
-    echo genPathCheckHtml( $path, $ctrl->checkPath($path) );
35
+    $ctrl->xoopsPath[$path] = htmlspecialchars(trim($_GET['path']));
36
+    echo genPathCheckHtml($path, $ctrl->checkPath($path));
37 37
     exit();
38 38
 }
39 39
 $ctrl->execute();
40
-if ( $_SERVER['REQUEST_METHOD'] === 'POST' ) {
40
+if ($_SERVER['REQUEST_METHOD'] === 'POST') {
41 41
     return;
42 42
 }
43 43
 ob_start();
@@ -64,17 +64,17 @@  discard block
 block discarded – undo
64 64
     <label class="xolabel" for="root"><?php echo XOOPS_ROOT_PATH_LABEL; ?></label>
65 65
     <div class="xoform-help"><?php echo XOOPS_ROOT_PATH_HELP; ?></div>
66 66
         <input type="text" name="root" id="root" value="<?php echo $ctrl->xoopsPath['root']; ?>" onchange="updPath('root', this.value)" />
67
-        <span id="rootpathimg"><?php echo genPathCheckHtml( 'root', $ctrl->validPath['root'] ); ?></span>
67
+        <span id="rootpathimg"><?php echo genPathCheckHtml('root', $ctrl->validPath['root']); ?></span>
68 68
         <?php
69
-        if ($ctrl->validPath['root'] && !empty( $ctrl->permErrors['root'])) {
69
+        if ($ctrl->validPath['root'] && !empty($ctrl->permErrors['root'])) {
70 70
             echo '<div id="rootperms" class="x2-note">';
71
-            echo CHECKING_PERMISSIONS . '<br /><p>' . ERR_NEED_WRITE_ACCESS . '</p>';
71
+            echo CHECKING_PERMISSIONS.'<br /><p>'.ERR_NEED_WRITE_ACCESS.'</p>';
72 72
             echo '<ul class="diags">';
73 73
             foreach ($ctrl->permErrors['root'] as $path => $result) {
74 74
                 if ($result) {
75
-                    echo '<li class="success">' . sprintf(IS_WRITABLE, $path) . '</li>';
75
+                    echo '<li class="success">'.sprintf(IS_WRITABLE, $path).'</li>';
76 76
                 } else {
77
-                    echo '<li class="failure">' . sprintf(IS_NOT_WRITABLE, $path) . '</li>';
77
+                    echo '<li class="failure">'.sprintf(IS_NOT_WRITABLE, $path).'</li>';
78 78
                 }
79 79
             }
80 80
             echo '</ul>';
@@ -87,17 +87,17 @@  discard block
 block discarded – undo
87 87
     <label class="xolabel" for="data"><?php echo XOOPS_DATA_PATH_LABEL; ?></label>
88 88
     <div class="xoform-help"><?php echo XOOPS_DATA_PATH_HELP; ?></div>
89 89
         <input type="text" name="data" id="data" value="<?php echo $ctrl->xoopsPath['data']; ?>" onchange="updPath('data', this.value)" />
90
-        <span id="datapathimg"><?php echo genPathCheckHtml('data', $ctrl->validPath['data'] ); ?></span>
90
+        <span id="datapathimg"><?php echo genPathCheckHtml('data', $ctrl->validPath['data']); ?></span>
91 91
         <?php
92
-        if ($ctrl->validPath['data'] && !empty( $ctrl->permErrors['data'])) {
92
+        if ($ctrl->validPath['data'] && !empty($ctrl->permErrors['data'])) {
93 93
             echo '<div id="dataperms" class="x2-note">';
94
-            echo CHECKING_PERMISSIONS . '<br /><p>' . ERR_NEED_WRITE_ACCESS . '</p>';
94
+            echo CHECKING_PERMISSIONS.'<br /><p>'.ERR_NEED_WRITE_ACCESS.'</p>';
95 95
             echo '<ul class="diags">';
96 96
             foreach ($ctrl->permErrors['data'] as $path => $result) {
97 97
                 if ($result) {
98
-                    echo '<li class="success">' . sprintf(IS_WRITABLE, $path) . '</li>';
98
+                    echo '<li class="success">'.sprintf(IS_WRITABLE, $path).'</li>';
99 99
                 } else {
100
-                    echo '<li class="failure">' . sprintf(IS_NOT_WRITABLE, $path) . '</li>';
100
+                    echo '<li class="failure">'.sprintf(IS_NOT_WRITABLE, $path).'</li>';
101 101
                 }
102 102
             }
103 103
             echo '</ul>';
@@ -127,4 +127,4 @@  discard block
 block discarded – undo
127 127
 $_SESSION['pageHasHelp'] = true;
128 128
 $_SESSION['pageHasForm'] = true;
129 129
 $_SESSION['content'] = $content;
130
-include XOOPS_INSTALL_PATH . '/include/install_tpl.php';
130
+include XOOPS_INSTALL_PATH.'/include/install_tpl.php';
Please login to merge, or discard this patch.
htdocs/install/page_configsite.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 $xoopsOption['checkadmin'] = true;
29 29
 $xoopsOption['hascommon'] = true;
30 30
 
31
-require_once __DIR__ . '/include/common.inc.php';
31
+require_once __DIR__.'/include/common.inc.php';
32 32
 
33 33
 $xoops = Xoops::getInstance();
34 34
 
@@ -63,10 +63,10 @@  discard block
 block discarded – undo
63 63
 $criteria->setSort('conf_catid ASC, conf_order');
64 64
 $configs = $config_handler->getConfigs($criteria);
65 65
 
66
-include XOOPS_INSTALL_PATH . '/include/createconfigform.php';
66
+include XOOPS_INSTALL_PATH.'/include/createconfigform.php';
67 67
 $wizard->form = createConfigform($configs);
68 68
 
69 69
 $_SESSION['pageHasHelp'] = true;
70 70
 $_SESSION['pageHasForm'] = true;
71 71
 $_SESSION['content'] = $wizard->CreateForm();
72
-include XOOPS_INSTALL_PATH . '/include/install_tpl.php';
72
+include XOOPS_INSTALL_PATH.'/include/install_tpl.php';
Please login to merge, or discard this patch.
htdocs/install/page_modcheck.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
  * @version     $Id$
25 25
 **/
26 26
 
27
-require_once __DIR__ . '/include/common.inc.php';
27
+require_once __DIR__.'/include/common.inc.php';
28 28
 
29 29
 /* @var $wizard XoopsInstallWizard */
30 30
 $wizard = $_SESSION['wizard'];
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 
64 64
 <tr>
65 65
     <th><?php printf(PHP_EXTENSION, 'PDO'); ?></th>
66
-    <td><?php echo xoDiag(extension_loaded('PDO') ? 1 : -1, 'PDO::getAvailableDrivers() = ' . @implode(', ', PDO::getAvailableDrivers())); ?></td>
66
+    <td><?php echo xoDiag(extension_loaded('PDO') ? 1 : -1, 'PDO::getAvailableDrivers() = '.@implode(', ', PDO::getAvailableDrivers())); ?></td>
67 67
 </tr>
68 68
 
69 69
 <tr>
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 <tbody>
100 100
 <?php
101 101
 foreach ($wizard->configs['extensions'] as $key => $value) {
102
-    echo "<tr><th>" . $value[1] . "</th><td>" . $value[2] . "</td></tr>";
102
+    echo "<tr><th>".$value[1]."</th><td>".$value[2]."</td></tr>";
103 103
 }
104 104
 ?>
105 105
 
@@ -112,4 +112,4 @@  discard block
 block discarded – undo
112 112
 $_SESSION['pageHasHelp'] = false;
113 113
 $_SESSION['pageHasForm'] = false;
114 114
 $_SESSION['content'] = $content;
115
-include XOOPS_INSTALL_PATH . '/include/install_tpl.php';
115
+include XOOPS_INSTALL_PATH.'/include/install_tpl.php';
Please login to merge, or discard this patch.
htdocs/install/page_dbdriver.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
  * @version     $Id$
25 25
  */
26 26
 
27
-require_once __DIR__ . '/include/common.inc.php';
27
+require_once __DIR__.'/include/common.inc.php';
28 28
 
29 29
 /* @var $wizard XoopsInstallWizard */
30 30
 $wizard = $_SESSION['wizard'];
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
         $settings,
58 58
         array(
59 59
             'DB_DRIVER' => 'pdo_mysql',
60
-            'DB_PREFIX' => 'x' . substr(md5(time()), 0, 3),
60
+            'DB_PREFIX' => 'x'.substr(md5(time()), 0, 3),
61 61
         )
62 62
     );
63 63
 }
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 ?>
66 66
 <?php
67 67
 if (!empty($error)) {
68
-    echo '<div class="x2-note errorMsg">' . $error . "</div>\n";
68
+    echo '<div class="x2-note errorMsg">'.$error."</div>\n";
69 69
 }
70 70
 ?>
71 71
 <fieldset>
@@ -93,4 +93,4 @@  discard block
 block discarded – undo
93 93
 $_SESSION['pageHasForm'] = true;
94 94
 $_SESSION['content'] = $content;
95 95
 $_SESSION['settings'] = $settings;
96
-include XOOPS_INSTALL_PATH . '/include/install_tpl.php';
96
+include XOOPS_INSTALL_PATH.'/include/install_tpl.php';
Please login to merge, or discard this patch.