diff options
author | nodiscc <nodiscc@gmail.com> | 2015-04-10 20:52:12 +0200 |
---|---|---|
committer | nodiscc <nodiscc@gmail.com> | 2015-04-10 20:52:12 +0200 |
commit | caee7ff9ccc302f85bd08714636e0be08fbd7cc4 (patch) | |
tree | 7ee76f719adaa5803c19f96124a3e015b90cfaeb /index.php | |
parent | 0c45b01cc2af1d0c8771f4c20de3e8f732c93080 (diff) | |
download | Shaarli-caee7ff9ccc302f85bd08714636e0be08fbd7cc4.tar.gz Shaarli-caee7ff9ccc302f85bd08714636e0be08fbd7cc4.tar.zst Shaarli-caee7ff9ccc302f85bd08714636e0be08fbd7cc4.zip |
change wording and variable names for "Hide public links" feature
Diffstat (limited to 'index.php')
-rw-r--r-- | index.php | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -34,7 +34,7 @@ $GLOBALS['config']['UPDATECHECK_INTERVAL'] = 86400 ; // Updates check frequency | |||
34 | // Note: You must have publisher.php in the same directory as Shaarli index.php | 34 | // Note: You must have publisher.php in the same directory as Shaarli index.php |
35 | $GLOBALS['config']['ARCHIVE_ORG'] = false; // For each link, add a link to an archived version on archive.org | 35 | $GLOBALS['config']['ARCHIVE_ORG'] = false; // For each link, add a link to an archived version on archive.org |
36 | $GLOBALS['config']['ENABLE_RSS_PERMALINKS'] = true; // Enable RSS permalinks by default. This corresponds to the default behavior of shaarli before this was added as an option. | 36 | $GLOBALS['config']['ENABLE_RSS_PERMALINKS'] = true; // Enable RSS permalinks by default. This corresponds to the default behavior of shaarli before this was added as an option. |
37 | $GLOBALS['config']['DISABLE_PUBLIC_LINKS'] = false; | 37 | $GLOBALS['config']['HIDE_PUBLIC_LINKS'] = false; |
38 | // ----------------------------------------------------------------------------------------------- | 38 | // ----------------------------------------------------------------------------------------------- |
39 | // You should not touch below (or at your own risks!) | 39 | // You should not touch below (or at your own risks!) |
40 | // Optional config file. | 40 | // Optional config file. |
@@ -1460,7 +1460,7 @@ function renderPage() | |||
1460 | $GLOBALS['privateLinkByDefault']=!empty($_POST['privateLinkByDefault']); | 1460 | $GLOBALS['privateLinkByDefault']=!empty($_POST['privateLinkByDefault']); |
1461 | $GLOBALS['config']['ENABLE_RSS_PERMALINKS']= !empty($_POST['enableRssPermalinks']); | 1461 | $GLOBALS['config']['ENABLE_RSS_PERMALINKS']= !empty($_POST['enableRssPermalinks']); |
1462 | $GLOBALS['config']['ENABLE_UPDATECHECK'] = !empty($_POST['updateCheck']); | 1462 | $GLOBALS['config']['ENABLE_UPDATECHECK'] = !empty($_POST['updateCheck']); |
1463 | $GLOBALS['config']['DISABLE_PUBLIC_LINKS'] = !empty($_POST['disablePublicLinks']); | 1463 | $GLOBALS['config']['HIDE_PUBLIC_LINKS'] = !empty($_POST['hidePublicLinks']); |
1464 | writeConfig(); | 1464 | writeConfig(); |
1465 | echo '<script>alert("Configuration was saved.");document.location=\'?do=tools\';</script>'; | 1465 | echo '<script>alert("Configuration was saved.");document.location=\'?do=tools\';</script>'; |
1466 | exit; | 1466 | exit; |
@@ -1902,7 +1902,7 @@ function buildLinkList($PAGE,$LINKSDB) | |||
1902 | $search_type='permalink'; | 1902 | $search_type='permalink'; |
1903 | } | 1903 | } |
1904 | // We chose to disable all private links and the user isn't logged in, do not return any link. | 1904 | // We chose to disable all private links and the user isn't logged in, do not return any link. |
1905 | else if ($GLOBALS['config']['DISABLE_PUBLIC_LINKS'] && !isLoggedIn()) | 1905 | else if ($GLOBALS['config']['HIDE_PUBLIC_LINKS'] && !isLoggedIn()) |
1906 | $linksToDisplay = array(); | 1906 | $linksToDisplay = array(); |
1907 | else | 1907 | else |
1908 | $linksToDisplay = $LINKSDB; // Otherwise, display without filtering. | 1908 | $linksToDisplay = $LINKSDB; // Otherwise, display without filtering. |
@@ -2334,7 +2334,7 @@ function writeConfig() | |||
2334 | $config .= '$GLOBALS[\'privateLinkByDefault\']='.var_export($GLOBALS['privateLinkByDefault'],true).'; '; | 2334 | $config .= '$GLOBALS[\'privateLinkByDefault\']='.var_export($GLOBALS['privateLinkByDefault'],true).'; '; |
2335 | $config .= '$GLOBALS[\'config\'][\'ENABLE_RSS_PERMALINKS\']='.var_export($GLOBALS['config']['ENABLE_RSS_PERMALINKS'], true).'; '; | 2335 | $config .= '$GLOBALS[\'config\'][\'ENABLE_RSS_PERMALINKS\']='.var_export($GLOBALS['config']['ENABLE_RSS_PERMALINKS'], true).'; '; |
2336 | $config .= '$GLOBALS[\'config\'][\'ENABLE_UPDATECHECK\']='.var_export($GLOBALS['config']['ENABLE_UPDATECHECK'], true).'; '; | 2336 | $config .= '$GLOBALS[\'config\'][\'ENABLE_UPDATECHECK\']='.var_export($GLOBALS['config']['ENABLE_UPDATECHECK'], true).'; '; |
2337 | $config .= '$GLOBALS[\'config\'][\'DISABLE_PUBLIC_LINKS\']='.var_export($GLOBALS['config']['DISABLE_PUBLIC_LINKS'], true).'; '; | 2337 | $config .= '$GLOBALS[\'config\'][\'HIDE_PUBLIC_LINKS\']='.var_export($GLOBALS['config']['HIDE_PUBLIC_LINKS'], true).'; '; |
2338 | $config .= ' ?>'; | 2338 | $config .= ' ?>'; |
2339 | if (!file_put_contents($GLOBALS['config']['CONFIG_FILE'],$config) || strcmp(file_get_contents($GLOBALS['config']['CONFIG_FILE']),$config)!=0) | 2339 | if (!file_put_contents($GLOBALS['config']['CONFIG_FILE'],$config) || strcmp(file_get_contents($GLOBALS['config']['CONFIG_FILE']),$config)!=0) |
2340 | { | 2340 | { |