OpencachingDeutschland/oc-server3
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
following
2013-03-21 23:39:14 +01:00
parent 54b8f3315e 9661614ea0
commit c1bce2a7be
5 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
doc/license.txt
View File

@@ -170,3 +170,9 @@ List of third party components:
URI : http://www.softicons.com/free-icons/toolbar-icons/fugue-16px-additional-icons-2-by-yusuke-kamiyamane URI : http://www.softicons.com/free-icons/toolbar-icons/fugue-16px-additional-icons-2-by-yusuke-kamiyamane
License : Creative Commons BY 3.0 License : Creative Commons BY 3.0
Author : Yusuke Kamiyamane Author : Yusuke Kamiyamane
27. gears icon
Path : htdocs/resource2/ocstyle/images/misc/
URI : http://www.softicons.com/free-icons/toolbar-icons/fatcow-hosting-icons-by-fatcow/gear-in-icon
License : Creative Commons BY 3.0
Author : FatCow

2
htdocs/lang/de/ocstyle/error.tpl.php
View File

@@ -20,7 +20,7 @@
****************************************************************************/ ****************************************************************************/
?> ?>
<div class="content2-pagetitle"><img src="resource2/{$opt.template.style}/images/profile/32x32-profile.png" style="align: left; margin-right: 10px;" width="32" height="32" alt="{t}Register{/t}" />{t}error while loading the page{/t}</div> <div class="content2-pagetitle"><img src="resource2/ocstyle/images/misc/32x32-gears.png" style="align: left; margin-right: 10px;" width="32" height="32" />{t}error while loading the page{/t}</div>
<p>{t}In an attempt to create the page, an error has occurred. If you pass through a hyperlink on our side and the problem persists do not hesitate to contact us by email.{/t}</p> <p>{t}In an attempt to create the page, an error has occurred. If you pass through a hyperlink on our side and the problem persists do not hesitate to contact us by email.{/t}</p>
<p style="font-size:x-small;margin-bottom:0px;margin-left:15px;">{t}The following error occurred:{/t}</p> <p style="font-size:x-small;margin-bottom:0px;margin-left:15px;">{t}The following error occurred:{/t}</p>
<p style="margin-top:0px;margin-left:15px;margin-right:20px;background-color:#e5e5e5;border:1px solid black;text-align:left;padding:3px 8px 3px 8px;"> <p style="margin-top:0px;margin-left:15px;margin-right:20px;background-color:#e5e5e5;border:1px solid black;text-align:left;padding:3px 8px 3px 8px;">

3
htdocs/lib2/mail.class.php
View File

@@ -100,6 +100,9 @@ class mail extends Smarty
static function is_existent_maildomain($domain) static function is_existent_maildomain($domain)
{ {
if ($domain == "localhost")
return true; // allow maintenance mails e.g. to root
$smtp_serverlist = array(); $smtp_serverlist = array();
$smtp_serverweight = array(); $smtp_serverweight = array();

BIN
htdocs/resource2/ocstyle/images/misc/32x32-gears.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

2
htdocs/templates2/ocstyle/error.tpl
View File

@@ -5,7 +5,7 @@
***************************************************************************} ***************************************************************************}
{* OCSTYLE *} {* OCSTYLE *}
<div class="content2-pagetitle"> <div class="content2-pagetitle">
<img src="resource2/{$opt.template.style}/images/misc/32x32-world.png" style="align: left; margin-right: 10px;" width="32" height="32" alt="World" /> <img src="resource2/{$opt.template.style}/images/misc/32x32-gears.png" style="align: left; margin-right: 10px;" width="32" height="32" alt="World" />
{t}An error occured while processing the page{/t} {t}An error occured while processing the page{/t}
</div> </div>