adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-06-28 05:51:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.6.x'

Browse Source
This commit is contained in:
J-P Nurmi
2015-02-23 09:39:12 +01:00
parent 962cb945eb 696b07947a
commit be5f26ba18
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/znc/ZNCString.h
+4 -4
View File
@@ -159,7 +159,7 @@ public:
/**
* Check if this string is equal to some other string.
* @param s The string to compare to.
* @param cs CaseSensitive if you want the comparision to be case
* @param cs CaseSensitive if you want the comparison to be case
* sensitive, CaseInsensitive (default) otherwise.
* @return True if the strings are equal.
*/
@@ -499,21 +499,21 @@ public:
/** Find the position of the given substring.
* @param s The substring to search for.
* @param cs CaseSensitive if you want the comparision to be case
* @param cs CaseSensitive if you want the comparison to be case
* sensitive, CaseInsensitive (default) otherwise.
* @return The position of the substring if found, CString::npos otherwise.
*/
size_t Find(const CString& s, CaseSensitivity cs = CaseInsensitive) const;
/** Check whether the string starts with a given prefix.
* @param sPrefix The prefix.
* @param cs CaseSensitive if you want the comparision to be case
* @param cs CaseSensitive if you want the comparison to be case
* sensitive, CaseInsensitive (default) otherwise.
* @return True if the string starts with prefix, false otherwise.
*/
bool StartsWith(const CString& sPrefix, CaseSensitivity cs = CaseInsensitive) const;
/** Check whether the string ends with a given suffix.
* @param sSuffix The suffix.
* @param cs CaseSensitive if you want the comparision to be case
* @param cs CaseSensitive if you want the comparison to be case
* sensitive, CaseInsensitive (default) otherwise.
* @return True if the string ends with suffix, false otherwise.
*/
modules/data/webadmin/tmpl/add_edit_user.tmpl
+1 -1
View File
@@ -206,7 +206,7 @@
<td align="center">
<? IF CanBeLoadedByNetwork ?>
<input type="checkbox" name="loaded_by_network" id="loaded_by_net_<? VAR Name ?>"
<? IF LoadedByAllNetworks ?>
<? IF LoadedBySomeNetworks && LoadedByAllNetworks ?>
checked="checked"
<? ENDIF ?>
disabled="disabled"/>
modules/data/webadmin/tmpl/settings.tmpl
+2 -2
View File
@@ -198,7 +198,7 @@
<td align="center">
<? IF CanBeLoadedByNetwork ?>
<input type="checkbox" name="loaded_by_network" id="loaded_by_net_<? VAR Name ?>"
<? IF LoadedByAllNetworks ?>
<? IF LoadedBySomeNetworks && LoadedByAllNetworks ?>
checked="checked"
<? ENDIF ?>
disabled="disabled"/>
@@ -212,7 +212,7 @@
<td align="center">
<? IF CanBeLoadedByUser ?>
<input type="checkbox" name="loaded_by_user" id="loaded_by_user_<? VAR Name ?>"
<? IF LoadedByAllUsers ?>
<? IF LoadedBySomeUsers && LoadedByAllUsers ?>
checked="checked"
<? ENDIF ?>
disabled="disabled"/>