From f25aed4e0896834d14ba15ce373bd2b34b9973f2 Mon Sep 17 00:00:00 2001 From: Anibal Copitan Date: Tue, 12 Aug 2014 15:25:30 -0500 Subject: [PATCH 1/2] Fix For delete links double \n in files.html --- main/admin/configure_homepage.php | 51 ++++++++++++++++--------------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/main/admin/configure_homepage.php b/main/admin/configure_homepage.php index dd9d32d9d2..cda48c6eb5 100755 --- a/main/admin/configure_homepage.php +++ b/main/admin/configure_homepage.php @@ -15,30 +15,33 @@ */ function home_tabs($file_logged_in) { - $file_logged_out = str_replace('_logged_in','', $file_logged_in); - - //variables initialization - $data_logged_out = array(); - $data_logged_in = array(); - - //we read the file with all links - $file = file($file_logged_in); - foreach ($file as $line) { - //not logged user only sees public links - if (!preg_match('/::private/',$line)) { - $data_logged_out[] = $line; - } - //logged user only sees all links - $data_logged_in[] = $line; - } - //tabs file for logged out users - $fp = fopen($file_logged_out, 'w'); - fputs($fp, implode("\n", $data_logged_out)); - fclose($fp); - //tabs file for logged in users - $fp = fopen($file_logged_in, 'w'); - fputs($fp, implode("\n", $data_logged_in)); - fclose($fp); + $post = strpos($file_logged_in, "_logged_in"); + if ($post !== false) { + $file_logged_out = str_replace('_logged_in','', $file_logged_in); + //variables initialization + $data_logged_out = array(); + $data_logged_in = array(); + + //we read the file with all links + $file = file($file_logged_in); + foreach ($file as $line) { + $line = str_replace("\n", '',$line); + //not logged user only sees public links + if (!preg_match('/::private/',$line)) { + $data_logged_out[] = $line; + } + //logged user only sees all links + $data_logged_in[] = $line; + } + //tabs file for logged out users + $fp = fopen($file_logged_out, 'w'); + fputs($fp, implode("\n", $data_logged_out)); + fclose($fp); + //tabs file for logged in users + $fp = fopen($file_logged_in, 'w'); + fputs($fp, implode("\n", $data_logged_in)); + fclose($fp); + } } /** * Code From 21b03cf78bb6c090705250d54b5c9086fe3b80c0 Mon Sep 17 00:00:00 2001 From: Anibal Copitan Date: Wed, 13 Aug 2014 14:47:28 -0500 Subject: [PATCH 2/2] Comment Optional only for insert_tabs NOT for insert_link --- main/admin/configure_homepage.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/main/admin/configure_homepage.php b/main/admin/configure_homepage.php index cda48c6eb5..eaec54eef9 100755 --- a/main/admin/configure_homepage.php +++ b/main/admin/configure_homepage.php @@ -831,8 +831,9 @@ switch ($action) { $default['link_name'] = $link_name; } $default['link_url'] = empty($link_url) ? 'http://' : api_htmlentities($link_url, ENT_QUOTES); - $form->addElement('text', 'link_url', array(get_lang('LinkURL'), get_lang('Optional').'
'.get_lang('GlobalLinkUseDoubleColumnPrivateToShowPrivately')), array('size' => '30', 'maxlength' => '100', 'style' => 'width: 350px;')); - + $linkUrlComment = ($action == 'insert_tabs') ? get_lang('Optional').'
'.get_lang('GlobalLinkUseDoubleColumnPrivateToShowPrivately') : ''; + $form->addElement('text', 'link_url', array(get_lang('LinkURL'), $linkUrlComment), array('size' => '30', 'maxlength' => '100', 'style' => 'width: 350px;')); + $options = array('-1' => get_lang('FirstPlace')); $selected = '';