iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Switch znc.in URLs to https

Browse Source
This commit is contained in:
Alexey Sokolov
2017-05-30 22:32:01 +01:00
parent ef5ace9b86
commit 10bfece38c
13 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CONTRIBUTING.md
View File

@@ -15,7 +15,7 @@ Reporting bugs
in debug mode and include the relevant part of the output. To enable in debug mode and include the relevant part of the output. To enable
debug mode, run ZNC with the `-D` flag. debug mode, run ZNC with the `-D` flag.
[The debugging page]:http://wiki.znc.in/Debugging [The debugging page]:https://wiki.znc.in/Debugging
Code changes Code changes
============ ============
@@ -24,4 +24,4 @@ Code changes
* For deciding which branch to pull request, please see [the branches page] * For deciding which branch to pull request, please see [the branches page]
on wiki.znc.in. on wiki.znc.in.
[The branches page]:http://wiki.znc.in/Branches [The branches page]:https://wiki.znc.in/Branches

2
Makefile.in
View File

@@ -231,7 +231,7 @@ install: znc znc.service $(LIBZNC)
@echo " to generate a config file." @echo " to generate a config file."
@echo "" @echo ""
@echo " If you need help with using ZNC, please visit our wiki at:" @echo " If you need help with using ZNC, please visit our wiki at:"
@echo " http://znc.in" @echo " https://znc.in"
uninstall: uninstall:
rm $(DESTDIR)$(bindir)/znc rm $(DESTDIR)$(bindir)/znc

16
README.md
View File

@@ -1,4 +1,4 @@
# [![ZNC](http://wiki.znc.in/resources/assets/wiki.png)](http://znc.in) - An advanced IRC bouncer # [![ZNC](https://wiki.znc.in/resources/assets/wiki.png)](https://znc.in) - An advanced IRC bouncer
[![Travis Build Status](https://img.shields.io/travis/znc/znc/master.svg?label=linux%2Fmacos)](https://travis-ci.org/znc/znc) [![Travis Build Status](https://img.shields.io/travis/znc/znc/master.svg?label=linux%2Fmacos)](https://travis-ci.org/znc/znc)
[![Jenkins Build Status](https://img.shields.io/jenkins/s/https/jenkins.znc.in/job/znc/job/znc/job/master.svg?label=freebsd)](https://jenkins.znc.in/job/znc/job/znc/job/master/) [![Jenkins Build Status](https://img.shields.io/jenkins/s/https/jenkins.znc.in/job/znc/job/znc/job/master.svg?label=freebsd)](https://jenkins.znc.in/job/znc/job/znc/job/master/)
@@ -158,12 +158,12 @@ These directories are also in there:
This file shouldn't be too hard too understand. An explanation of all the This file shouldn't be too hard too understand. An explanation of all the
items can be found on the items can be found on the
[Configuration](http://wiki.znc.in/Configuration)-Page. [Configuration](https://wiki.znc.in/Configuration)-Page.
**Warning: better not to edit config, while ZNC is running.** Use the **Warning: better not to edit config, while ZNC is running.** Use the
[webadmin] and [controlpanel] modules instead. [webadmin] and [controlpanel] modules instead.
[webadmin]:http://wiki.znc.in/Webadmin [webadmin]:https://wiki.znc.in/Webadmin
[controlpanel]:http://wiki.znc.in/Controlpanel [controlpanel]:https://wiki.znc.in/Controlpanel
If you changed some settings while ZNC is running, a simple If you changed some settings while ZNC is running, a simple
`pkill -SIGUSR1 znc` will make ZNC rewrite its config file. Alternatively `pkill -SIGUSR1 znc` will make ZNC rewrite its config file. Alternatively
@@ -178,17 +178,17 @@ and running make or with the `znc-buildmod` shell script.
For additional info look in the wiki: For additional info look in the wiki:
- [Writing modules](http://wiki.znc.in/Writing_modules) - [Writing modules](https://wiki.znc.in/Writing_modules)
Perl modules are loaded through the global module Perl modules are loaded through the global module
[ModPerl](http://wiki.znc.in/Modperl). [ModPerl](https://wiki.znc.in/Modperl).
Python modules are loaded through the global module Python modules are loaded through the global module
[ModPython](http://wiki.znc.in/Modpython). [ModPython](https://wiki.znc.in/Modpython).
## Further infos ## Further infos
Please visit http://znc.in/ or Please visit https://znc.in/ or
[#znc on freenode](ircs://irc.freenode.net:6697/#znc) if you still have [#znc on freenode](ircs://irc.freenode.net:6697/#znc) if you still have
questions. questions.

4
modules/awaynick.cpp
View File

@@ -21,7 +21,7 @@ class CAwayNickMod : public CModule {
MODCONSTRUCTOR(CAwayNickMod) {} MODCONSTRUCTOR(CAwayNickMod) {}
bool OnLoad(const CString&, CString& sMessage) override { bool OnLoad(const CString&, CString& sMessage) override {
sMessage = "retired module - see http://wiki.znc.in/awaynick"; sMessage = "retired module - see https://wiki.znc.in/awaynick";
return false; return false;
} }
}; };
@@ -32,4 +32,4 @@ void TModInfo<CAwayNickMod>(CModInfo& Info) {
} }
NETWORKMODULEDEFS(CAwayNickMod, NETWORKMODULEDEFS(CAwayNickMod,
"retired module - see http://wiki.znc.in/awaynick") "retired module - see https://wiki.znc.in/awaynick")

2
modules/data/webadmin/tmpl/add_edit_network.tmpl
View File

@@ -237,7 +237,7 @@
<? LOOP ModuleLoop ?> <? LOOP ModuleLoop ?>
<tr class="<? IF __EVEN__ ?>evenrow<? ELSE ?>oddrow<? ENDIF ?>"> <tr class="<? IF __EVEN__ ?>evenrow<? ELSE ?>oddrow<? ENDIF ?>">
<td class="mod_name"> <td class="mod_name">
<input type="checkbox" name="loadmod" id="lm_<? VAR Name ?>" value="<? VAR Name ?>"<? IF Checked ?> checked="checked"<? ENDIF ?><? IF Disabled ?> disabled="disabled"<? ENDIF ?> /><label for="lm_<? VAR Name ?>"> <? IF Wiki ?><a href="http://wiki.znc.in/<? VAR Wiki ?>" target="_blank" class="external"><? VAR Name ?></a> <? ELSE ?> <? VAR Name ?> <? ENDIF ?></label> <input type="checkbox" name="loadmod" id="lm_<? VAR Name ?>" value="<? VAR Name ?>"<? IF Checked ?> checked="checked"<? ENDIF ?><? IF Disabled ?> disabled="disabled"<? ENDIF ?> /><label for="lm_<? VAR Name ?>"> <? IF Wiki ?><a href="https://wiki.znc.in/<? VAR Wiki ?>" target="_blank" class="external"><? VAR Name ?></a> <? ELSE ?> <? VAR Name ?> <? ENDIF ?></label>
</td> </td>
<td class="mod_args"> <td class="mod_args">
<? IF Disabled ?> <? IF Disabled ?>

4
modules/data/webadmin/tmpl/add_edit_user.tmpl
View File

@@ -177,7 +177,7 @@
<? LOOP ModuleLoop ?> <? LOOP ModuleLoop ?>
<tr class="<? IF __EVEN__ ?>evenrow<? ELSE ?>oddrow<? ENDIF ?>"> <tr class="<? IF __EVEN__ ?>evenrow<? ELSE ?>oddrow<? ENDIF ?>">
<td class="mod_name"> <td class="mod_name">
<input type="checkbox" name="loadmod" id="lm_<? VAR Name ?>" value="<? VAR Name ?>"<? IF Checked ?> checked="checked"<? ENDIF ?><? IF Disabled ?> disabled="disabled"<? ENDIF ?> /><label for="lm_<? VAR Name ?>"> <? IF Wiki ?><a href="http://wiki.znc.in/<? VAR Wiki ?>" target="_blank" class="external"><? VAR Name ?></a> <? ELSE ?> <? VAR Name ?> <? ENDIF ?></label> <input type="checkbox" name="loadmod" id="lm_<? VAR Name ?>" value="<? VAR Name ?>"<? IF Checked ?> checked="checked"<? ENDIF ?><? IF Disabled ?> disabled="disabled"<? ENDIF ?> /><label for="lm_<? VAR Name ?>"> <? IF Wiki ?><a href="https://wiki.znc.in/<? VAR Wiki ?>" target="_blank" class="external"><? VAR Name ?></a> <? ELSE ?> <? VAR Name ?> <? ENDIF ?></label>
</td> </td>
<td class="mod_args"> <td class="mod_args">
<? IF Disabled ?> <? IF Disabled ?>
@@ -323,7 +323,7 @@
title="<? FORMAT "Maximum number of IRC networks allowed for this user." ?>" <? IF !ImAdmin ?>disabled="disabled"<? ENDIF ?> /> title="<? FORMAT "Maximum number of IRC networks allowed for this user." ?>" <? IF !ImAdmin ?>disabled="disabled"<? ENDIF ?> />
</div> </div>
<? SETBLOCK Substitutions_Link ?><a href="http://wiki.znc.in/ExpandString" target="_blank" class="external"><? FORMAT "Substitutions" ?></a><? ENDSETBLOCK ?> <? SETBLOCK Substitutions_Link ?><a href="https://wiki.znc.in/ExpandString" target="_blank" class="external"><? FORMAT "Substitutions" ?></a><? ENDSETBLOCK ?>
<div class="subsection half" id="ctcpreplies_plain"> <div class="subsection half" id="ctcpreplies_plain">
<div class="inputlabel"><label for="ctcpreplies"><? FORMAT "CTCP Replies:" ?></label></div> <div class="inputlabel"><label for="ctcpreplies"><? FORMAT "CTCP Replies:" ?></label></div>
<div><textarea id="ctcpreplies" name="ctcpreplies" cols="70" rows="3" id="ctcpreplies_text"><? LOOP CTCPLoop ?><? VAR CTCP ?> <div><textarea id="ctcpreplies" name="ctcpreplies" cols="70" rows="3" id="ctcpreplies_text"><? LOOP CTCPLoop ?><? VAR CTCP ?>

2
modules/data/webadmin/tmpl/settings.tmpl
View File

@@ -182,7 +182,7 @@
<? IF Checked ?> checked="checked"<? ENDIF ?> <? IF Checked ?> checked="checked"<? ENDIF ?>
<? IF Disabled ?> disabled="disabled"<? ENDIF ?> /> <? IF Disabled ?> disabled="disabled"<? ENDIF ?> />
<label for="lm_<? VAR Name ?>"> <label for="lm_<? VAR Name ?>">
<? IF Wiki ?><a href="http://wiki.znc.in/<? VAR Wiki ?>" target="_blank" class="external"><? VAR Name ?></a> <? IF Wiki ?><a href="https://wiki.znc.in/<? VAR Wiki ?>" target="_blank" class="external"><? VAR Name ?></a>
<? ELSE ?> <? VAR Name ?> <? ENDIF ?></label> <? ELSE ?> <? VAR Name ?> <? ENDIF ?></label>
</td> </td>
<td class="mod_args"> <td class="mod_args">

2
src/User.cpp
View File

@@ -1359,7 +1359,7 @@ CString CUser::GetRealName() const {
// Not include version number via GetTag() because of // Not include version number via GetTag() because of
// https://github.com/znc/znc/issues/818#issuecomment-70402820 // https://github.com/znc/znc/issues/818#issuecomment-70402820
return (!m_sRealName.Trim_n().empty()) ? m_sRealName return (!m_sRealName.Trim_n().empty()) ? m_sRealName
: "ZNC - http://znc.in"; : "ZNC - https://znc.in";
} }
const CString& CUser::GetBindHost() const { return m_sBindHost; } const CString& CUser::GetBindHost() const { return m_sBindHost; }
const CString& CUser::GetDCCBindHost() const { return m_sDCCBindHost; } const CString& CUser::GetDCCBindHost() const { return m_sDCCBindHost; }

2
src/main.cpp
View File

@@ -411,7 +411,7 @@ int main(int argc, char** argv) {
CUtils::PrintError( CUtils::PrintError(
"No modules found. Perhaps you didn't install ZNC properly?"); "No modules found. Perhaps you didn't install ZNC properly?");
CUtils::PrintError( CUtils::PrintError(
"Read http://wiki.znc.in/Installation for instructions."); "Read https://wiki.znc.in/Installation for instructions.");
if (!CUtils::GetBoolInput( if (!CUtils::GetBoolInput(
"Do you really want to run ZNC without any modules?", "Do you really want to run ZNC without any modules?",
false)) { false)) {

6
src/znc.cpp
View File

@@ -126,8 +126,8 @@ CString CZNC::GetTag(bool bIncludeVersion, bool bHTML) {
if (!Get().m_bHideVersion) { if (!Get().m_bHideVersion) {
bIncludeVersion = true; bIncludeVersion = true;
} }
CString sAddress = CString sAddress = bHTML ? "<a href=\"https://znc.in\">https://znc.in</a>"
bHTML ? "<a href=\"http://znc.in\">http://znc.in</a>" : "http://znc.in"; : "https://znc.in";
if (!bIncludeVersion) { if (!bIncludeVersion) {
return "ZNC - " + sAddress; return "ZNC - " + sAddress;
@@ -624,7 +624,7 @@ CString CZNC::MakeConfigHeader() {
"//\n" "//\n"
"// But if you feel risky, you might want to read help on /znc " "// But if you feel risky, you might want to read help on /znc "
"saveconfig and /znc rehash.\n" "saveconfig and /znc rehash.\n"
"// Also check http://wiki.znc.in/Configuration\n"; "// Also check https://wiki.znc.in/Configuration\n";
} }
bool CZNC::WriteNewConfig(const CString& sConfigFile) { bool CZNC::WriteNewConfig(const CString& sConfigFile) {

2
znc-uninstalled.pc.in
View File

@@ -22,5 +22,5 @@ INC_PATH=-I${srcdir}/
Name: ZNC Name: ZNC
Description: An advanced IRC proxy Description: An advanced IRC proxy
Version: ${version} Version: ${version}
URL: http://znc.in URL: https://znc.in
Cflags: ${CPPFLAGS} ${MODFLAGS} ${INC_PATH} Cflags: ${CPPFLAGS} ${MODFLAGS} ${INC_PATH}

2
znc.pc.cmake.in
View File

@@ -15,6 +15,6 @@ moddatadir=${datadir}/znc
Name: ZNC Name: ZNC
Description: An advanced IRC proxy Description: An advanced IRC proxy
Version: ${version} Version: ${version}
URL: http://znc.in URL: https://znc.in
Cflags: @CMAKE_CXX_FLAGS@ -I@CMAKE_INSTALL_FULL_INCLUDEDIR@ -include znc/zncconfig.h -Dznc_export_lib_EXPORTS Cflags: @CMAKE_CXX_FLAGS@ -I@CMAKE_INSTALL_FULL_INCLUDEDIR@ -include znc/zncconfig.h -Dznc_export_lib_EXPORTS
Libs: @znclib_pc@ Libs: @znclib_pc@

2
znc.pc.in
View File

@@ -20,5 +20,5 @@ INC_PATH=-I${includedir}/znc
Name: ZNC Name: ZNC
Description: An advanced IRC proxy Description: An advanced IRC proxy
Version: ${version} Version: ${version}
URL: http://znc.in URL: https://znc.in
Cflags: ${CPPFLAGS} ${MODFLAGS} ${INC_PATH} Cflags: ${CPPFLAGS} ${MODFLAGS} ${INC_PATH}