<!-- deleted page location element type -->
<xs:complexType name="pagelocation_delete">
<xs:attribute name="name" type="woltlab_varchar" use="required" />
- </xs:complexType>
+ </xs:complexType>
<!-- imported/updated page location element type -->
<xs:complexType name="pagelocation_import">
<!-- deleted page menu item element -->
<xs:complexType name="pagemenuitem_delete">
<xs:attribute name="name" type="woltlab_varchar" use="required" />
- </xs:complexType>
+ </xs:complexType>
<!-- imported/updated page menu item element -->
<xs:complexType name="pagemenuitem_import">
<permissions>admin.system.package.canEditServer</permissions>
<showorder>2</showorder>
</acpmenuitem>
- <!-- /packages -->
+ <!-- /packages -->
<!-- application -->
<acpmenuitem name="wcf.acp.menu.link.application">
<parent>wcf.acp.menu.link.group.general</parent>
<permissions>admin.user.canEditGroup,admin.user.canDeleteGroup</permissions>
<showorder>1</showorder>
- </acpmenuitem>
+ </acpmenuitem>
<acpmenuitem name="wcf.acp.menu.link.group.add">
<link>index.php/UserGroupAdd/</link>
<optiontype>boolean</optiontype>
<!-- TODO: change to '0' (production mode) later -->
<defaultvalue>1</defaultvalue>
- </option>
+ </option>
<option name="module_api_access">
<categoryname>module.system</categoryname>
{/if}
{if $success|isset}
- <p class="success">{lang}wcf.global.form.edit.success{/lang}</p>
+ <p class="success">{lang}wcf.global.form.edit.success{/lang}</p>
{/if}
<div class="contentNavigation">
{/if}
{if $success|isset}
- <p class="success">{lang}wcf.global.form.{$action}.success{/lang}</p>
+ <p class="success">{lang}wcf.global.form.{$action}.success{/lang}</p>
{/if}
<div class="contentNavigation">
</header>
{if $cleared}
- <p class="success">{lang}wcf.acp.cache.clear.success{/lang}</p>
+ <p class="success">{lang}wcf.acp.cache.clear.success{/lang}</p>
{/if}
<div class="container containerPadding marginTop shadow">
<p class="info">{lang}wcf.acp.cronjob.intro{/lang}</p>
{if $success|isset}
- <p class="success">{lang}wcf.global.form.{$action}.success{/lang}</p>
+ <p class="success">{lang}wcf.global.form.{$action}.success{/lang}</p>
{/if}
<div class="contentNavigation">
{/if}
{if $success|isset}
- <p class="success">{lang}wcf.acp.option.import.success{/lang}</p>
+ <p class="success">{lang}wcf.acp.option.import.success{/lang}</p>
{/if}
<form method="post" action="{link controller='OptionImport'}{/link}" enctype="multipart/form-data">
{include file='header' templateName='success'}
-<p class="success">{lang}{@$message}{/lang}</p>
+<p class="success">{lang}{@$message}{/lang}</p>
{include file='footer'}
{/if}
{if $success|isset}
- <p class="success">{lang}wcf.global.form.{$action}.success{/lang}</p>
+ <p class="success">{lang}wcf.global.form.{$action}.success{/lang}</p>
{/if}
<div class="contentNavigation">
{/if}
{if $userID|isset && $__wcf->user->userID == $userID}
- <p class="warning">{lang}wcf.acp.user.edit.warning.selfEdit{/lang}</p>
+ <p class="warning">{lang}wcf.acp.user.edit.warning.selfEdit{/lang}</p>
{/if}
{if $success|isset}
- <p class="success">{lang}wcf.global.form.{@$action}.success{/lang}</p>
+ <p class="success">{lang}wcf.global.form.{@$action}.success{/lang}</p>
{/if}
<div class="contentNavigation">
<dl{if $errorType.email|isset} class="formError"{/if}>
<dt><label for="email">{lang}wcf.user.email{/lang}</label></dt>
- <dd>
+ <dd>
<input type="email" id="email" name="email" value="{$email}" required="required" class="medium" />
{if $errorType.email|isset}
<small class="innerError">
{/if}
{if $success|isset}
- <p class="success">{lang}wcf.global.form.{@$action}.success{/lang}</p>
+ <p class="success">{lang}wcf.global.form.{@$action}.success{/lang}</p>
{/if}
<div class="contentNavigation">
{/if}
</dd>
</dl>
- </fieldset>
+ </fieldset>
{/if}
<fieldset>
{/if}
{*if $deletedUsers}
- <p class="success">{lang}wcf.acp.user.delete.success{/lang}</p>
+ <p class="success">{lang}wcf.acp.user.delete.success{/lang}</p>
{elseif $deletedUsers === 0}
- <p class="error">{lang}wcf.acp.user.delete.error{/lang}</p>
+ <p class="error">{lang}wcf.acp.user.delete.error{/lang}</p>
{/if*}
<div class="contentNavigation">
<p class="warning">{lang}wcf.acp.user.massProcessing.warning{/lang}</p>
{if $affectedUsers|isset}
- <p class="success">{lang}wcf.acp.user.massProcessing.success{/lang}</p>
+ <p class="success">{lang}wcf.acp.user.massProcessing.success{/lang}</p>
{/if}
<form method="post" action="{link controller='UsersMassProcessing'}{/link}">
{if $__wcf->session->getPermission('admin.user.canEditMailAddress')}
<dl>
<dt><label for="email">{lang}wcf.user.email{/lang}</label></dt>
- <dd>
+ <dd>
<input type="email" id="email" name="email" value="{$email}" class="medium" />
</dd>
</dl>
<title>SVG Icons</title>
- <style type="text/css">
+ <style type="text/css">
* {
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
text-overflow: ellipsis;
*/
protected function validateEmail($email, $confirmEmail) {
if (StringUtil::toLowerCase($this->user->email) != StringUtil::toLowerCase($email)) {
- parent::validateEmail($email, $this->confirmEmail);
+ parent::validateEmail($email, $this->confirmEmail);
}
}
$statement = WCF::getDB()->prepareStatement($sql.$this->conditions, $this->maxResults);
$statement->execute($this->conditions->getParameters());
while ($row = $statement->fetchArray()) {
- $this->matches[] = $row['userID'];
+ $this->matches[] = $row['userID'];
}
}
WCF_DIR.'cache/cache.package.php',
'wcf\system\cache\builder\PackageCacheBuilder'
);
- $this->packages = CacheHandler::getInstance()->get('package');
+ $this->packages = CacheHandler::getInstance()->get('package');
}
/**
/**
* @see wcf\data\DatabaseObject::$databaseTableIndexName
*/
- protected static $databaseTableIndexName = 'searchID';
+ protected static $databaseTableIndexName = 'searchID';
}
}
// save style
- $style = parent::create($parameters);
+ $style = parent::create($parameters);
$styleEditor = new StyleEditor($style);
// save variables
}
else {
if (!isset($data['inheritedActions'][$row['environment']][$row['eventClassName']])) $data['inheritedActions'][$row['environment']][$row['eventClassName']] = array();
- $data['inheritedActions'][$row['environment']][$row['eventClassName']][$row['eventName']][] = $row;
+ $data['inheritedActions'][$row['environment']][$row['eventClassName']][$row['eventName']][] = $row;
}
}
unset($this->cache[$cacheResource['cache']]);
}
if (isset($this->loaded[$cacheResource['file']])) {
- unset($this->loaded[$cacheResource['file']]);
+ unset($this->loaded[$cacheResource['file']]);
}
}
}
$filepattern = str_replace('*', '.*', str_replace('.', '\.', $filepattern));
if (substr($directory, -1) != '/') {
- $directory .= '/';
+ $directory .= '/';
}
DirectoryUtil::getInstance($directory)->executeCallback(new Callback(function ($filename) {
protected function needRebuild(array $cacheResource) {
// cache does not exist
if (!file_exists($cacheResource['file'])) {
- return true;
+ return true;
}
// cache is empty
if (!@filesize($cacheResource['file'])) {
- return true;
+ return true;
}
// cache resource was marked as obsolete
if (($mtime = filemtime($cacheResource['file'])) <= 1) {
- return true;
+ return true;
}
// maxlifetime expired
if ($cacheResource['maxLifetime'] > 0 && (TIME_NOW - $mtime) > $cacheResource['maxLifetime']) {
- return true;
+ return true;
}
// do not rebuild cache
// read header
$header = $this->readHeader($binaryData);
if ($header === false) {
- continue;
+ continue;
}
// fixes a bug that files with long names aren't correctly
*/
protected function readHeader($binaryData) {
if (strlen($binaryData) != 512) {
- return false;
+ return false;
}
$header = array();
.'MIME-Version: 1.0'.self::$crlf
.'From: '.$this->getFrom().self::$crlf
.($this->getCCString() != '' ? 'CC:'.$this->getCCString().self::$crlf : '')
- .($this->getBCCString() != '' ? 'BCC:'.$this->getBCCString().self::$crlf : '');
+ .($this->getBCCString() != '' ? 'BCC:'.$this->getBCCString().self::$crlf : '');
if (count($this->getAttachments())) {
$this->header .= 'Content-Transfer-Encoding: 8bit'.self::$crlf;
if ($withTo && $this->getToString() != '') $recipients .= 'TO:'.$this->getToString().self::$crlf;
if ($this->getCCString() != '') $recipients .= 'CC:'.$this->getCCString().self::$crlf;
if ($this->getBCCString() != '') $recipients .= 'BCC:'.$this->getBCCString().self::$crlf;
- return $recipients;
+ return $recipients;
}
/**
// get file contents
$data = @file_get_contents($path);
- $data = chunk_split(base64_encode($data), 70, self::$crlf);
+ $data = chunk_split(base64_encode($data), 70, self::$crlf);
$this->body .= 'Content-Type: application/octetstream; name="'.$fileName.'"'.self::$crlf;
$this->body .= 'Content-Transfer-Encoding: base64'.self::$crlf;
foreach ($packageUpdateVersions as $packageUpdateVersion) {
try {
// get auth data
- $authData = $this->getAuthData($packageUpdateVersion);
+ $authData = $this->getAuthData($packageUpdateVersion);
// send request
// TODO: Use HTTPRequest
$className = $this->template->getPluginClassName('modifier', $modifierData['name']);
if (class_exists($className)) {
$modifierData['className'] = $className;
- $this->autoloadPlugins[$modifierData['className']] = $modifierData['className'];
+ $this->autoloadPlugins[$modifierData['className']] = $modifierData['className'];
}
else if ((!function_exists($modifierData['name']) && !in_array($modifierData['name'], $this->unknownPHPFunctions)) || in_array($modifierData['name'], $this->disabledPHPFunctions)) {
throw new SystemException($this->formatSyntaxError("unknown modifier '".$values[$i]."'", $this->currentIdentifier, $this->currentLineNo));
$result .= $arg;
}
- return $result;
+ return $result;
}
}
// get selected values
if (isset($tagArgs['selected'])) {
- if (!is_array($tagArgs['selected'])) $tagArgs['selected'] = array($tagArgs['selected']);
+ if (!is_array($tagArgs['selected'])) $tagArgs['selected'] = array($tagArgs['selected']);
}
else {
$tagArgs['selected'] = array();
$html = '';
foreach ($tagArgs['options'] as $key => $value) {
if (!empty($html)) $html .= $tagArgs['separator'];
- $html .= '<label><input type="checkbox" name="'.$this->encodeHTML($tagArgs['name']).'[]" value="'.$this->encodeHTML($key).'"'.(in_array($key, $tagArgs['selected']) ? ' checked="checked"' : '').' /> '.$this->encodeHTML($value).'</label>';
+ $html .= '<label><input type="checkbox" name="'.$this->encodeHTML($tagArgs['name']).'[]" value="'.$this->encodeHTML($key).'"'.(in_array($key, $tagArgs['selected']) ? ' checked="checked"' : '').' /> '.$this->encodeHTML($value).'</label>';
}
return $html;
$this->selected = array();
if (isset($tagArgs['selected'])) {
$this->selected = $tagArgs['selected'];
- if (!is_array($this->selected)) $this->selected = array($this->selected);
+ if (!is_array($this->selected)) $this->selected = array($this->selected);
}
// create option list
for ($j = 0; $j < $i; $j++) {
unset($target[$j]);
}
- $relPath .= str_repeat('../', count($current) - $i).implode('/', $target).'/';
+ $relPath .= str_repeat('../', count($current) - $i).implode('/', $target).'/';
for ($j = $i + 1; $j < count($current); $j++) {
unset($current[$j]);
}
<item name="wcf.global.configureDB.database"><![CDATA[Database name]]></item>
<item name="wcf.global.configureDB.database.description"><![CDATA[The database must already exist.]]></item>
<item name="wcf.global.configureDB.number"><![CDATA[Installation-number]]></item>
- <item name="wcf.global.configureDB.number.description"><![CDATA[The installation-number allows you to install multiple installations of this software into the same database. If this is your first installation in this database, you should enter <em>1</em>.]]></item>
+ <item name="wcf.global.configureDB.number.description"><![CDATA[The installation-number allows you to install multiple installations of this software into the same database. If this is your first installation in this database, you should enter <em>1</em>.]]></item>
<item name="wcf.global.configureDB.error"><![CDATA[An error has accured while trying to connect to your database:
<br /><strong>{$exception->getMessage()}{if $exception|get_class == 'DatabaseException'}<br />{$exception->getErrorDesc()}{/if}</strong>]]></item>
<item name="wcf.global.configureDB.conflictedTables"><![CDATA[The following table{if $conflictedTables|count > 1}s{/if} already exist{if $conflictedTables|count == 1}s{/if} within your "{$dbName}" Database:<br />{implode from=$conflictedTables item="table"}{$table}{/implode}.<br /><br />To solve this problem, please do one of the following:<br />1. Enable the "Overwrite" option below to overwrite {if $conflictedTables|count > 1}these tables{else}this table{/if} and continue the installation with the "Next" button or<br />2. You re-enter the database access information, but to a different database and continue the installation with the "Next" button or<br />3. Enter a new installation number, not forgetting to continue the installation with the "Next" Button.]]></item>
<dl>
<dt><label for="dbNumber">{lang}wcf.global.configureDB.number{/lang}</label></dt>
- <dd>
+ <dd>
<input type="text" id="dbNumber" name="dbNumber" value="{$dbNumber}" class="short" />
<small>{lang}wcf.global.configureDB.number.description{/lang}</small>
</dd>
</fieldset>
-<form method="post" action="install.php">
+<form method="post" action="install.php">
<div class="wcf-formSubmit">
<input type="submit" value="{lang}wcf.global.button.next{/lang}"{if !$system.phpVersion.result || !$system.sql.result || !$system.mbString.result} disabled="disabled"{/if} accesskey="s"/>
<input type="hidden" name="step" value="{@$nextStep}" />
projects / GitHub / WoltLab / WCF.git / commitdiff