@@ 156-176 (lines=21) @@ | ||
153 | foreach ($mount_parm as $mount_param) { //name and mountpoint find |
|
154 | if (($mount_param['name']===trim($df_buf[0])) && ($mount_param['mountpoint']===$df_buf[5])) { |
|
155 | $dev->setFsType($mount_param['fstype']); |
|
156 | if (PSI_SHOW_MOUNT_OPTION) { |
|
157 | if (PSI_SHOW_MOUNT_CREDENTIALS) { |
|
158 | $dev->setOptions($mount_param['options']); |
|
159 | } else { |
|
160 | $mpo=$mount_param['options']; |
|
161 | ||
162 | $mpo=preg_replace('/(^guest,)|(^guest$)|(,guest$)/i', '', $mpo); |
|
163 | $mpo=preg_replace('/,guest,/i', ',', $mpo); |
|
164 | ||
165 | $mpo=preg_replace('/(^user=[^,]*,)|(^user=[^,]*$)|(,user=[^,]*$)/i', '', $mpo); |
|
166 | $mpo=preg_replace('/,user=[^,]*,/i', ',', $mpo); |
|
167 | ||
168 | $mpo=preg_replace('/(^username=[^,]*,)|(^username=[^,]*$)|(,username=[^,]*$)/i', '', $mpo); |
|
169 | $mpo=preg_replace('/,username=[^,]*,/i', ',', $mpo); |
|
170 | ||
171 | $mpo=preg_replace('/(^password=[^,]*,)|(^password=[^,]*$)|(,password=[^,]*$)/i', '', $mpo); |
|
172 | $mpo=preg_replace('/,password=[^,]*,/i', ',', $mpo); |
|
173 | ||
174 | $dev->setOptions($mpo); |
|
175 | } |
|
176 | } |
|
177 | $notwas = false; |
|
178 | break; |
|
179 | } |
|
@@ 184-204 (lines=21) @@ | ||
181 | if ($notwas) foreach ($mount_parm as $mount_param) { //mountpoint find |
|
182 | if ($mount_param['mountpoint']===$df_buf[5]) { |
|
183 | $dev->setFsType($mount_param['fstype']); |
|
184 | if (PSI_SHOW_MOUNT_OPTION) { |
|
185 | if (PSI_SHOW_MOUNT_CREDENTIALS) { |
|
186 | $dev->setOptions($mount_param['options']); |
|
187 | } else { |
|
188 | $mpo=$mount_param['options']; |
|
189 | ||
190 | $mpo=preg_replace('/(^guest,)|(^guest$)|(,guest$)/i', '', $mpo); |
|
191 | $mpo=preg_replace('/,guest,/i', ',', $mpo); |
|
192 | ||
193 | $mpo=preg_replace('/(^user=[^,]*,)|(^user=[^,]*$)|(,user=[^,]*$)/i', '', $mpo); |
|
194 | $mpo=preg_replace('/,user=[^,]*,/i', ',', $mpo); |
|
195 | ||
196 | $mpo=preg_replace('/(^username=[^,]*,)|(^username=[^,]*$)|(,username=[^,]*$)/i', '', $mpo); |
|
197 | $mpo=preg_replace('/,username=[^,]*,/i', ',', $mpo); |
|
198 | ||
199 | $mpo=preg_replace('/(^password=[^,]*,)|(^password=[^,]*$)|(,password=[^,]*$)/i', '', $mpo); |
|
200 | $mpo=preg_replace('/,password=[^,]*,/i', ',', $mpo); |
|
201 | ||
202 | $dev->setOptions($mpo); |
|
203 | } |
|
204 | } |
|
205 | $notwas = false; |
|
206 | break; |
|
207 | } |
|
@@ 242-262 (lines=21) @@ | ||
239 | } |
|
240 | if ($total > $free) $dev->setUsed($total - $free); |
|
241 | ||
242 | if (PSI_SHOW_MOUNT_OPTION) { |
|
243 | if (PSI_SHOW_MOUNT_CREDENTIALS) { |
|
244 | $dev->setOptions($mount_param['options']); |
|
245 | } else { |
|
246 | $mpo=$mount_param['options']; |
|
247 | ||
248 | $mpo=preg_replace('/(^guest,)|(^guest$)|(,guest$)/i', '', $mpo); |
|
249 | $mpo=preg_replace('/,guest,/i', ',', $mpo); |
|
250 | ||
251 | $mpo=preg_replace('/(^user=[^,]*,)|(^user=[^,]*$)|(,user=[^,]*$)/i', '', $mpo); |
|
252 | $mpo=preg_replace('/,user=[^,]*,/i', ',', $mpo); |
|
253 | ||
254 | $mpo=preg_replace('/(^username=[^,]*,)|(^username=[^,]*$)|(,username=[^,]*$)/i', '', $mpo); |
|
255 | $mpo=preg_replace('/,username=[^,]*,/i', ',', $mpo); |
|
256 | ||
257 | $mpo=preg_replace('/(^password=[^,]*,)|(^password=[^,]*$)|(,password=[^,]*$)/i', '', $mpo); |
|
258 | $mpo=preg_replace('/,password=[^,]*,/i', ',', $mpo); |
|
259 | ||
260 | $dev->setOptions($mpo); |
|
261 | } |
|
262 | } |
|
263 | $arrResult[] = $dev; |
|
264 | } |
|
265 | } |
@@ 113-129 (lines=17) @@ | ||
110 | if (PSI_SHOW_MOUNT_OPTION) { |
|
111 | if (PSI_SHOW_MOUNT_CREDENTIALS) { |
|
112 | $dev->setOptions($mount_parm[$df_buf[1]]['options']); |
|
113 | } else { |
|
114 | $mpo=$mount_parm[$df_buf[1]]['options']; |
|
115 | ||
116 | $mpo=preg_replace('/(^guest,)|(^guest$)|(,guest$)/i', '', $mpo); |
|
117 | $mpo=preg_replace('/,guest,/i', ',', $mpo); |
|
118 | ||
119 | $mpo=preg_replace('/(^user=[^,]*,)|(^user=[^,]*$)|(,user=[^,]*$)/i', '', $mpo); |
|
120 | $mpo=preg_replace('/,user=[^,]*,/i', ',', $mpo); |
|
121 | ||
122 | $mpo=preg_replace('/(^username=[^,]*,)|(^username=[^,]*$)|(,username=[^,]*$)/i', '', $mpo); |
|
123 | $mpo=preg_replace('/,username=[^,]*,/i', ',', $mpo); |
|
124 | ||
125 | $mpo=preg_replace('/(^password=[^,]*,)|(^password=[^,]*$)|(,password=[^,]*$)/i', '', $mpo); |
|
126 | $mpo=preg_replace('/,password=[^,]*,/i', ',', $mpo); |
|
127 | ||
128 | $dev->setOptions($mpo); |
|
129 | } |
|
130 | } |
|
131 | } |
|
132 | $this->sys->setDiskDevices($dev); |