@@ -330,6 +330,10 @@ function addon_url($url, $vars = [], $suffix = true, $domain = false)
330330 $ val = str_replace ("[ {$ key }] " , $ value , $ val );
331331 });
332332 $ val = str_replace (['^ ' , '$ ' ], '' , $ val );
333+ if (substr ($ val , -1 ) === '/ ' )
334+ {
335+ $ suffix = false ;
336+ }
333337 }
334338 }
335339 return url ($ val , [], $ suffix , $ domain ) . ($ vars ? '? ' . http_build_query ($ vars ) : '' );
@@ -345,7 +349,7 @@ function addon_url($url, $vars = [], $suffix = true, $domain = false)
345349function set_addon_info ($ name , $ array )
346350{
347351
348- $ file = ADDON_PATH . $ name . ' / info.ini ' ;
352+ $ file = ADDON_PATH . $ name . DIRECTORY_SEPARATOR . ' info.ini ' ;
349353 $ obj = get_addon_class ($ name );
350354 $ res = array ();
351355 foreach ($ array as $ key => $ val )
@@ -361,7 +365,7 @@ function set_addon_info($name, $array)
361365 }
362366 if ($ handle = fopen ($ file , 'w ' ))
363367 {
364- fwrite ($ handle , implode ("\r\ n" , $ res ));
368+ fwrite ($ handle , implode ("\n" , $ res ) . "\n" );
365369 fclose ($ handle );
366370 //清空当前配置缓存
367371 Config::set ("addon-info- {$ name }" , NULL );
@@ -383,14 +387,14 @@ function set_addon_info($name, $array)
383387 */
384388function set_addon_fullconfig ($ name , $ array )
385389{
386- $ file = ADDON_PATH . $ name . ' / config.php ' ;
390+ $ file = ADDON_PATH . $ name . DIRECTORY_SEPARATOR . ' config.php ' ;
387391 if (!is_really_writable ($ file ))
388392 {
389393 throw new Exception ("文件没有写入权限 " );
390394 }
391395 if ($ handle = fopen ($ file , 'w ' ))
392396 {
393- fwrite ($ handle , "<?php \r\n\r\ n" . "return " . var_export ($ array , TRUE ) . "; " );
397+ fwrite ($ handle , "<?php \n\ n" . "return " . var_export ($ array , TRUE ) . "; \n " );
394398 fclose ($ handle );
395399 }
396400 else
0 commit comments