Changeset 880 for trunk

Timestamp:

Apr 7, 2020, 10:15:48 PM (5 years ago)

Author:

chronos

Message:

• Modified: Improved code formatting.

Location:

trunk

Files:

• Application/Core.php (modified) (19 diffs)
• Application/DefaultConfig.php (modified) (2 diffs)
• Application/UpdateTrace.php (modified) (6 diffs)
• Application/View.php (modified) (16 diffs)
• Modules/Admin/Admin.php (modified) (22 diffs)
• Modules/AoWoW/AoWoW.php (modified) (1 diff)
• Modules/ClientVersion/ClientVersion.php (modified) (4 diffs)
• Modules/Dictionary/Dictionary.php (modified) (20 diffs)
• Modules/Download/Download.php (modified) (3 diffs)
• Modules/Error/Error.php (modified) (2 diffs)
• Modules/Export/CreateAddon.php (modified) (18 diffs)
• Modules/Export/Export.php (modified) (44 diffs)
• Modules/Export/ExportOutput.php (modified) (23 diffs)
• Modules/Export/Page.php (modified) (48 diffs)
• Modules/Export/ProcessAoWoWExport.php (modified) (7 diffs)
• Modules/Export/ProcessTask.php (modified) (6 diffs)
• Modules/Export/cmdmpqexport.php (modified) (10 diffs)
• Modules/Forum/Forum.php (modified) (25 diffs)
• Modules/FrontPage/FrontPage.php (modified) (8 diffs)
• Modules/Import/Import.php (modified) (35 diffs)
• Modules/Import/Manage.php (modified) (7 diffs)
• Modules/Import/cmd.php (modified) (4 diffs)
• Modules/Import/generatecodeXML.php (modified) (1 diff)
• Modules/Info/Info.php (modified) (2 diffs)
• Modules/Log/Log.php (modified) (12 diffs)
• Modules/News/News.php (modified) (12 diffs)
• Modules/News/RSS.php (modified) (4 diffs)
• Modules/Redirection/Redirection.php (modified) (2 diffs)
• Modules/Referrer/Referrer.php (modified) (13 diffs)
• Modules/Search/Search.php (modified) (3 diffs)
• Modules/Server/Server.php (modified) (1 diff)
• Modules/ShoutBox/ShoutBox.php (modified) (12 diffs)
• Modules/Team/Team.php (modified) (22 diffs)
• Modules/Translation/Comparison.php (modified) (8 diffs)
• Modules/Translation/Form.php (modified) (20 diffs)
• Modules/Translation/LoadNames.php (modified) (7 diffs)
• Modules/Translation/Progress.php (modified) (9 diffs)
• Modules/Translation/Save.php (modified) (18 diffs)
• Modules/Translation/Translation.php (modified) (10 diffs)
• Modules/Translation/TranslationList.php (modified) (31 diffs)
• Modules/Translation/UserLevel.php (modified) (5 diffs)
• Modules/User/Options.php (modified) (8 diffs)
• Modules/User/Profile.php (modified) (14 diffs)
• Modules/User/Registration.php (modified) (7 diffs)
• Modules/User/User.php (modified) (17 diffs)
• Modules/User/UserList.php (modified) (4 diffs)
• Modules/Wiki/Wiki.php (modified) (9 diffs)
• Packages/Common/AppModule.php (modified) (18 diffs)
• Packages/Common/Common.php (modified) (6 diffs)
• Packages/Common/Config.php (modified) (3 diffs)
• Packages/Common/Database.php (modified) (10 diffs)
• Packages/Common/Error.php (modified) (4 diffs)
• Packages/Common/Image.php (modified) (4 diffs)
• Packages/Common/Locale.php (modified) (14 diffs)
• Packages/Common/Mail.php (modified) (9 diffs)
• Packages/Common/NetworkAddress.php (modified) (7 diffs)
• Packages/Common/Page.php (modified) (2 diffs)
• Packages/Common/PrefixMultiplier.php (modified) (4 diffs)
• Packages/Common/RSS.php (modified) (2 diffs)
• Packages/Common/Setup.php (modified) (30 diffs)
• Packages/Common/Table.php (modified) (14 diffs)
• Packages/Common/UTF8.php (modified) (3 diffs)
• Packages/Common/Update.php (modified) (5 diffs)
• Packages/Common/VarDumper.php (modified) (6 diffs)
• alert.php (modified) (1 diff)
• includes/FileStream.php (modified) (8 diffs)
• includes/Global.php (modified) (52 diffs)
• includes/MemoryStream.php (modified) (8 diffs)
• includes/PageEdit.php (modified) (12 diffs)
• includes/dbc.php (modified) (17 diffs)

trunk/Application/Core.php

@@ -34 +34 @@
 
     $this->Config = $Config;
-    if(isset($this->Config['Web']['Timezone']))
+    if (isset($this->Config['Web']['Timezone']))
       date_default_timezone_set($this->Config['Web']['Timezone']);
     mb_internal_encoding("UTF-8");
 
-    if(isset($this->Config['Database']))
-    {
-    $this->Database->Connect($this->Config['Database']['Host'],
-      $this->Config['Database']['User'], $this->Config['Database']['Password'],
-      $this->Config['Database']['Database']);
-    $this->Database->charset($this->Config['Database']['Charset']);
-    $this->Database->ShowSQLQuery = $this->Config['Web']['ShowSQLQuery'];
-    $this->Database->ShowSQLError = $this->Config['Web']['ShowSQLError'];
-    $this->Database->LogSQLQuery = $this->Config['Web']['LogSQLQuery'];
+    if (isset($this->Config['Database']))
+    {
+      $this->Database->Connect($this->Config['Database']['Host'],
+        $this->Config['Database']['User'], $this->Config['Database']['Password'],
+        $this->Config['Database']['Database']);
+      $this->Database->charset($this->Config['Database']['Charset']);
+      $this->Database->ShowSQLQuery = $this->Config['Web']['ShowSQLQuery'];
+      $this->Database->ShowSQLError = $this->Config['Web']['ShowSQLError'];
+      $this->Database->LogSQLQuery = $this->Config['Web']['LogSQLQuery'];
     }
 
@@ -60 +60 @@
     );
 
-    if(GetRemoteAddress() != '')
+    if (GetRemoteAddress() != '')
     {
       $this->BaseURL = $_SERVER["CONTEXT_PREFIX"];
@@ -68 +68 @@
 
     // Detect interface locale
-    if(isset($this->Config['Web']['Locale']))
+    if (isset($this->Config['Web']['Locale']))
       $this->LocaleManager->DefaultLangCode = $this->Config['Web']['Locale'];
     $this->LocaleManager->LangCode = $this->LocaleManager->DefaultLangCode;
-    if(count($this->PathItems) > 0)
+    if (count($this->PathItems) > 0)
     {
       $NewLangCode = $this->PathItems[0];
-      if(array_key_exists($NewLangCode, $this->LocaleManager->Available)) {
+      if (array_key_exists($NewLangCode, $this->LocaleManager->Available)) {
         array_shift($this->PathItems);
         $this->LocaleManager->LangCode = $NewLangCode;
       }
     }
-    if(array_key_exists($this->LocaleManager->LangCode, $this->LocaleManager->Available))
+    if (array_key_exists($this->LocaleManager->LangCode, $this->LocaleManager->Available))
       $this->LocaleManager->LoadLocale($this->LocaleManager->LangCode);
 
@@ -109 +109 @@
 
     $ScriptStartTime = GetMicrotime();
-    //if(GetRemoteAddress() != '')
+    //if (GetRemoteAddress() != '')
       session_start();
 
     // SQL injection hack protection
-    foreach($_POST as $Index => $Item)
-    {
-      if(is_array($_POST[$Index]))
-        foreach($_POST[$Index] as $Index2 => $Item2) $_POST[$Index][$Index2] = addslashes($Item2);
+    foreach ($_POST as $Index => $Item)
+    {
+      if (is_array($_POST[$Index]))
+        foreach ($_POST[$Index] as $Index2 => $Item2) $_POST[$Index][$Index2] = addslashes($Item2);
       else $_POST[$Index] = addslashes($_POST[$Index]);
     }
-    foreach($_GET as $Index => $Item) $_GET[$Index] = addslashes($_GET[$Index]);
+    foreach ($_GET as $Index => $Item) $_GET[$Index] = addslashes($_GET[$Index]);
 
     $this->RegisterPageBar('Top');
@@ -130 +130 @@
     $this->Setup->Start();
     $this->Setup->UpdateManager->VersionTable = 'DbVersion';
-    if($this->Setup->CheckState())
+    if ($this->Setup->CheckState())
     {
       $this->ModuleManager->Start();
@@ -136 +136 @@
 
     $this->BaseView = new BaseView($this);
-    if($this->DoNotShowPage == false)
+    if ($this->DoNotShowPage == false)
     {
       $this->ShowPage();
@@ -145 +145 @@
   {
     list($Usec, $Sec) = explode(' ', microtime());
-    return ((float)$Usec + (float)$Sec);
+    return (float)$Usec + (float)$Sec;
   }
 
@@ -152 +152 @@
     $Remaining = substr($Target, strlen($this->BaseURL));
     $TargetParts = explode('/', $Remaining);
-    if(count($TargetParts) > 0)
-    {
-      if(in_array($TargetParts[0], $this->LinkLocaleExceptions))
+    if (count($TargetParts) > 0)
+    {
+      if (in_array($TargetParts[0], $this->LinkLocaleExceptions))
       {
-        return($this->BaseURL.$Target);
-      }
-    }
-    return($this->LinkLocale($Target));
+        return $this->BaseURL.$Target;
+      }
+    }
+    return $this->LinkLocale($Target);
   }
 
@@ -168 +168 @@
     $RemainingParts = explode('?', $Remaining);
     $Directory = $RemainingParts[0];
-    if(count($RemainingParts) > 1)
+    if (count($RemainingParts) > 1)
     {
       $Params = $RemainingParts[1];
@@ -180 +180 @@
 
     $DirectoryParts = explode('/', $Directory);
-    foreach($DirectoryParts as $Index => $Item)
+    foreach ($DirectoryParts as $Index => $Item)
     {
       $NewText = $TargetLocaleManager->CurrentLocale->Texts->Translate($Item, 'URL');
@@ -187 +187 @@
     $Directory = implode('/', $DirectoryParts);
     $Remaining = $Directory;
-    if($Params != '') $Remaining .= '?'.$Params;
-
-    return($Remaining);
+    if ($Params != '') $Remaining .= '?'.$Params;
+
+    return $Remaining;
   }
 
@@ -198 +198 @@
     $RemainingParts = explode('?', $Remaining);
     $Directory = $RemainingParts[0];
-    if(count($RemainingParts) > 1)
+    if (count($RemainingParts) > 1)
     {
       $Params = $RemainingParts[1];
@@ -210 +210 @@
 
     $DirectoryParts = explode('/', $Directory);
-    foreach($DirectoryParts as $Index => $Item)
+    foreach ($DirectoryParts as $Index => $Item)
     {
       $NewText = $TargetLocaleManager->CurrentLocale->Texts->TranslateReverse($Item, 'URL');
@@ -217 +217 @@
     $Directory = implode('/', $DirectoryParts);
     $Remaining = $Directory;
-    if($Params != '') $Remaining .= '?'.$Params;
-
-    return($Remaining);
+    if ($Params != '') $Remaining .= '?'.$Params;
+
+    return $Remaining;
   }
 
   function LinkLocale($Target, $Locale = '')
   {
-    if($Locale == '') $Locale = $this->LocaleManager->LangCode;
+    if ($Locale == '') $Locale = $this->LocaleManager->LangCode;
 
     $Target = $this->TranslateURL($Target, $Locale);
 
-    if($Locale == $this->LocaleManager->DefaultLangCode)
-      return($this->BaseURL.$Target);
-    return($this->BaseURL.'/'.$Locale.$Target);
+    if ($Locale == $this->LocaleManager->DefaultLangCode)
+      return $this->BaseURL.$Target;
+    return $this->BaseURL.'/'.$Locale.$Target;
   }
 
   function RegisterPage($Path, $Handler)
   {
-    if(is_array($Path))
+    if (is_array($Path))
     {
       $Page = &$this->Pages;
       $LastKey = array_pop($Path);
-      foreach($Path as $PathItem)
+      foreach ($Path as $PathItem)
       {
         $Page = &$Page[$PathItem];
       }
-      if(!is_array($Page)) $Page = array('' => $Page);
+      if (!is_array($Page)) $Page = array('' => $Page);
       $Page[$LastKey] = $Handler;
     } else $this->Pages[$Path] = $Handler;
@@ -250 +250 @@
   function RegisterMenuItem($MenuItem, $Pos = NULL)
   {
-    if(is_null($Pos)) $this->Menu[] = $MenuItem;
+    if (is_null($Pos)) $this->Menu[] = $MenuItem;
       else {
         array_splice($this->Menu, $Pos, 0, array($MenuItem));
@@ -258 +258 @@
   function SearchPage($PathItems, $Pages)
   {
-    if(count($PathItems) == 0) $PathItems = array('');
+    if (count($PathItems) == 0) $PathItems = array('');
     $PathItem = $PathItems[0];
     $PathItem = $this->LocaleManager->CurrentLocale->Texts->TranslateReverse($PathItem, 'URL');
 
-    if(array_key_exists($PathItem, $Pages))
-    {
-      if(is_array($Pages[$PathItem]))
+    if (array_key_exists($PathItem, $Pages))
+    {
+      if (is_array($Pages[$PathItem]))
       {
         array_shift($PathItems);
-        return($this->SearchPage($PathItems, $Pages[$PathItem]));
+        return $this->SearchPage($PathItems, $Pages[$PathItem]);
       } else
       {
-        if(count($PathItems) == 1) return($Pages[$PathItem]);
-          else return(''); // Unexpected subpages
-      }
-    } else return('');
+        if (count($PathItems) == 1) return $Pages[$PathItem];
+          else return ''; // Unexpected subpages
+      }
+    } else return '';
   }
 
@@ -279 +279 @@
   {
     // Send correct HTTP status code to signal unknown page
-    if(array_key_exists('SERVER_PROTOCOL', $_SERVER))
+    if (array_key_exists('SERVER_PROTOCOL', $_SERVER))
       Header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found');
-    if(array_key_exists('HTTP_REFERER', $_SERVER)) $Referer = ' Referer: '.$_SERVER['HTTP_REFERER'];
+    if (array_key_exists('HTTP_REFERER', $_SERVER)) $Referer = ' Referer: '.$_SERVER['HTTP_REFERER'];
       else $Referer = '';
-    if(isset($this->ModuleManager->Modules['Log']))
+    if (isset($this->ModuleManager->Modules['Log']))
       $this->ModuleManager->Modules['Log']->WriteLog('Stránka "'.
         implode('/', $this->PathItems).'" nenalezena'.$Referer, LOG_TYPE_PAGE_NOT_FOUND);
-    return(ShowMessage(sprintf(T('Page "%s" not found'), implode('/', $this->PathItems)), MESSAGE_CRITICAL));
+    return ShowMessage(sprintf(T('Page "%s" not found'), implode('/', $this->PathItems)), MESSAGE_CRITICAL);
   }
 
@@ -295 +295 @@
     /* @var $Page Page */
     $ClassName = $this->SearchPage($this->PathItems, $this->Pages);
-    if(($ClassName != '') and (class_exists($ClassName)))
+    if (($ClassName != '') and (class_exists($ClassName)))
     {
       $Page = new $ClassName($this);
       $Output = $Page->GetOutput();
       $this->BaseView->Title = $Page->Title;
-      if($Page->RawPage == false) $Output = $this->BaseView->ShowPage($Output);
+      if ($Page->RawPage == false) $Output = $this->BaseView->ShowPage($Output);
     } else {
       $Output2 = '';
-      if((count($this->OnPageNotFound) == 2)
+      if ((count($this->OnPageNotFound) == 2)
         and method_exists($this->OnPageNotFound[0], $this->OnPageNotFound[1]))
         $Output2 = call_user_func_array($this->OnPageNotFound, array());
-     if($Output2 != '') $Output .= $this->BaseView->ShowPage($Output2);
+     if ($Output2 != '') $Output .= $this->BaseView->ShowPage($Output2);
       else {
         $Output = $this->PageNotFound();
@@ -338 +338 @@
   function HumanDate($Time)
   {
-    return(date('j.n.Y', $Time));
+    return date('j.n.Y', $Time);
   }
 }

trunk/Application/DefaultConfig.php

@@ -6 +6 @@
   {
     $IsDeveloper = in_array($_SERVER['REMOTE_ADDR'], array('127.0.0.1'));
-    return(array(
+    return array(
       array('Name' => 'SystemPassword', 'Type' => 'PasswordEncoded', 'Default' => '', 'Title' => 'System password'),
       array('Name' => 'Database/Host', 'Type' => 'String', 'Default' => 'localhost', 'Title' => 'Server'),
@@ -46 +46 @@
       array('Name' => 'OriginalLanguage', 'Type' => 'Integer', 'Default' => 1, 'Title' => 'Original language'),
       array('Name' => 'EnableGoogleTranslate', 'Type' => 'Boolean', 'Default' => false, 'Title' => 'Enable Google translate'),
-    ));
+    );
   }
 }

trunk/Application/UpdateTrace.php

@@ -2483 +2483 @@
 
   $DbResult = $System->Database->query('SELECT `TablePrefix` FROM `Group`');
-  while($Group = $DbResult->fetch_assoc())
+  while ($Group = $DbResult->fetch_assoc())
   {
     $Manager->Execute('ALTER TABLE `'.$Group['TablePrefix'].'` ADD FOREIGN KEY ( `Language` ) REFERENCES `Language` ('.
@@ -2532 +2532 @@
   // Set all string collation to utf8 general
   $DbResult = $Manager->Execute("SHOW TABLES");
-  while($DbRow = $DbResult->fetch_row())
+  while ($DbRow = $DbResult->fetch_row())
   {
     $Manager->Execute("ALTER TABLE `".$DbRow[0]."` CONVERT TO CHARACTER SET utf8");
@@ -2946 +2946 @@
 
 function UpdateTo872($Manager)
-{       
+{
   // Allow to store IPv6 addresses
   $Manager->Execute('ALTER TABLE `UserOnline` CHANGE `IpAddress` `IpAddress` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT "";');
@@ -2957 +2957 @@
 
 function UpdateTo873($Manager)
-{       
+{
   $Manager->Execute('ALTER TABLE `User` CHANGE `XP` `XP` INT(11) NOT NULL DEFAULT "0";');
   $Manager->Execute('ALTER TABLE `User` CHANGE `TranslatedCount` `TranslatedCount` INT(11) NOT NULL DEFAULT "0";');
@@ -2971 +2971 @@
   function Get()
   {
-    return(array(
+    return array(
       498 => array('Revision' => 506, 'Function' => 'UpdateTo506'),
       506 => array('Revision' => 510, 'Function' => 'UpdateTo510'),
@@ -3006 +3006 @@
       867 => array('Revision' => 872, 'Function' => 'UpdateTo872'),
       872 => array('Revision' => 873, 'Function' => 'UpdateTo873'),
-    ));
+    );
   }
 }

trunk/Application/View.php

@@ -9 +9 @@
     //$Output .= ' <form action="?setlocale" method="get">';
     $Output = ' <select onchange="window.location=this.value">';
-    foreach($this->System->LocaleManager->Available as $Locale)
+    foreach ($this->System->LocaleManager->Available as $Locale)
     {
       $Remaining = substr($_SERVER["REQUEST_URI"], strlen($this->System->BaseURL));
-      if(substr($Remaining, 1, strlen($Locale['Code'].'/')) == $this->System->LocaleManager->LangCode.'/')
+      if (substr($Remaining, 1, strlen($Locale['Code'].'/')) == $this->System->LocaleManager->LangCode.'/')
         $Remaining = substr($Remaining, strlen('/'.$Locale['Code']));
-      if($Locale['Code'] == $this->System->LocaleManager->CurrentLocale->Texts->Code) $Selected = ' selected="selected"';
+      if ($Locale['Code'] == $this->System->LocaleManager->CurrentLocale->Texts->Code) $Selected = ' selected="selected"';
         else $Selected = '';
       $Remaining = $this->System->TranslateReverseURL($Remaining, $this->System->LocaleManager->LangCode);
@@ -23 +23 @@
     $Output .= '</select><noscript><span><input type="submit" value="Submit"/></span></noscript>';
 
-    return($Output);
+    return $Output;
   }
 
@@ -29 +29 @@
   {
     $Output = '<div class="Menu">';
-    if(isset($this->System->User))
+    if (isset($this->System->User))
     {
-      if(!$this->System->User->Licence(LICENCE_USER))
+      if (!$this->System->User->Licence(LICENCE_USER))
         $Output .= '<div class="advert">'.$this->System->Config['Web']['Advertisement'].'</div>';
     }
@@ -38 +38 @@
     // Show bars items
     $Bar = '';
-    foreach($this->System->Bars['Top'] as $BarItem)
+    foreach ($this->System->Bars['Top'] as $BarItem)
       $Bar .= call_user_func($BarItem);
-      if(trim($Bar) != '') $Output .= $Bar;
+      if (trim($Bar) != '') $Output .= $Bar;
       else $Output .= '&nbsp;';
 
@@ -46 +46 @@
     //$Output .= '</form>';
     $Output .= '</span></div>';
-    return($Output);
+    return $Output;
   }
 
@@ -53 +53 @@
     $Output = '<strong>'.T('Menu').':</strong>'.
       '<div class="verticalmenu"><ul>';
-    foreach($this->System->Menu as $MenuItem)
-      if(!isset($this->System->User) or $this->System->User->Licence($MenuItem['Permission']))
+    foreach ($this->System->Menu as $MenuItem)
+      if (!isset($this->System->User) or $this->System->User->Licence($MenuItem['Permission']))
       {
-        if(isset($MenuItem['Click'])) $OnClick = ' onclick="'.$MenuItem['Click'].'"';
+        if (isset($MenuItem['Click'])) $OnClick = ' onclick="'.$MenuItem['Click'].'"';
         else $OnClick = '';
-        if($MenuItem['Icon'] != '') $Icon = '<img src="'.$this->System->Link('/images/menu/'.$MenuItem['Icon']).'"/>';
+        if ($MenuItem['Icon'] != '') $Icon = '<img src="'.$this->System->Link('/images/menu/'.$MenuItem['Icon']).'"/>';
         else $Icon = '';
         $Output .= '<li>'.$Icon.'<a class="verticalmenua" title="'.$MenuItem['Hint'].'" href="'.
@@ -64 +64 @@
       }
       $Output .= '</ul></div>';
-      return($Output);
+      return $Output;
   }
 
@@ -83 +83 @@
     // Show page headers
     $Bar = '';
-    foreach($this->System->PageHeaders as $Item)
+    foreach ($this->System->PageHeaders as $Item)
       $Output .= call_user_func($Item);
 
     $Title = $this->System->Config['Web']['Title'];
-    if($this->Title != '') $Title = $this->Title.' - '.$Title;
+    if ($this->Title != '') $Title = $this->Title.' - '.$Title;
     $Output .= '<title>'.$Title.'</title>'.
     '<script src="'.$this->System->Link('/style/respond.js').'"></script>'.
@@ -98 +98 @@
     // Show bars items
     $Bar = '';
-    foreach($this->System->Bars['Left'] as $BarItem)
+    foreach ($this->System->Bars['Left'] as $BarItem)
       $Bar .= call_user_func($BarItem);
-      if(trim($Bar) != '') $Output .= $Bar;
+      if (trim($Bar) != '') $Output .= $Bar;
       else $Output .= '&nbsp;';
 
     $Output .= '</td><td id="border-left"></td><td class="content">';
-    return($Output);
+    return $Output;
   }
 
@@ -117 +117 @@
     // Show bars items
     $Bar = '';
-    foreach($this->System->Bars['Right'] as $BarItem)
+    foreach ($this->System->Bars['Right'] as $BarItem)
       $Bar .= call_user_func($BarItem);
-      if(trim($Bar) != '') $Output .= $Bar;
+      if (trim($Bar) != '') $Output .= $Bar;
       else $Output .= '&nbsp;';
     $Output .= '</td>';
@@ -129 +129 @@
 
     $Output .= '</td></tr>';
-    if($this->System->Config['Web']['ShowRuntimeInfo'] == true)
+    if ($this->System->Config['Web']['ShowRuntimeInfo'] == true)
       $Output .= '<tr><td colspan="3" style="text-align: center;">'.T('Generating duration').': '.
     $ScriptGenerateDuration.' s / '.ini_get('max_execution_time').' s &nbsp;&nbsp; '.T('Used memory').': '.
@@ -137 +137 @@
       '</body>'.
       '</html>';
-    return($Output);
+    return $Output;
   }
 
@@ -143 +143 @@
   {
     $Output = $this->ShowHeader().$Content.$this->ShowFooter();
-    if($this->System->Config['Web']['FormatOutput'])
+    if ($this->System->Config['Web']['FormatOutput'])
       $Output = $this->FormatOutput($Output);
-    return($Output);
+    return $Output;
   }
 
@@ -153 +153 @@
     $nn = 0;
     $n = 0;
-    while($s != '')
+    while ($s != '')
     {
       $start = strpos($s, '<');
       $end = strpos($s, '>');
-      if($start != 0)
+      if ($start != 0)
       {
         $end = $start - 1;
@@ -163 +163 @@
       }
       $line = trim(substr($s, $start, $end + 1));
-      if(strlen($line) > 0)
-        if($line[0] == '<')
+      if (strlen($line) > 0)
+        if ($line[0] == '<')
         {
-          if($s[$start + 1] == '/')
+          if ($s[$start + 1] == '/')
           {
             $n = $n - 2;
@@ -172 +172 @@
           } else
           {
-            if(strpos($line, ' ')) $cmd = substr($line, 1, strpos($line, ' ') - 1);
+            if (strpos($line, ' ')) $cmd = substr($line, 1, strpos($line, ' ') - 1);
             else $cmd = substr($line, 1, strlen($line) - 2);
             //echo('['.$cmd.']');
-            if(strpos($s, '</'.$cmd.'>')) $n = $n + 2;
+            if (strpos($s, '</'.$cmd.'>')) $n = $n + 2;
           }
         }// else $line = '['.$line.']';
-        //if($line != '') echo(htmlspecialchars(str_repeat(' ',$nn).$line."\n"));
-        if($nn < 0) $nn = 0;
-        if($line != '') $out .= (str_repeat(' ', $nn).$line."\n");
+        //if ($line != '') echo(htmlspecialchars(str_repeat(' ',$nn).$line."\n"));
+        if ($nn < 0) $nn = 0;
+        if ($line != '') $out .= (str_repeat(' ', $nn).$line."\n");
         $s = substr($s, $end + 1, strlen($s));
         $nn = $n;
     }
-    return($out);
+    return $out;
   }
 }

trunk/Modules/Admin/Admin.php

@@ -52 +52 @@
       '<a href="'.$this->System->Link('/admin/?action=merge').'">Sjednocení textů</a><br/>'.
       '<small>Sjednotí stejné originální texty v databázi</small><br/><br/>';
-    return($Output);
+    return $Output;
   }
 
@@ -72 +72 @@
   function ShowPHPInfo()
   {
-    return(phpinfo());
+    return phpinfo();
   }
 
@@ -86 +86 @@
       '<a href="'.$this->System->Link('/admin/?action=sqlerror').'">Chybný SQL dotaz</a><br/>'.
       '<small>Vyvolá testovací chybu</small><br/><br/>';
-    return($Output);
+    return $Output;
   }
 
@@ -103 +103 @@
     );
     $Output = 'Questy: <br />';
-    while($quest = $DbResult->fetch_assoc())
+    while ($quest = $DbResult->fetch_assoc())
     {
       $Output .= $quest['ID'].', ';
@@ -109 +109 @@
     }
     $Output .= '<br / ><br / >Questy nastaveny jako nedokončené!';
-    return($Output);
+    return $Output;
   }
 
@@ -117 +117 @@
 
     $Output = '';
-    foreach($TranslationTree as $Group)
+    foreach ($TranslationTree as $Group)
     // $Group = $TranslationTree[1];
     {
@@ -130 +130 @@
       $DbResult = $this->System->Database->query($sql);
       echo ': <br />'.$Group['TablePrefix'].': <br />';
-      while($line = $DbResult->fetch_assoc())
+      while ($line = $DbResult->fetch_assoc())
       {
         echo ($line['ID'].', ');
@@ -138 +138 @@
       echo '<br / >Verze '.$Group['TablePrefix'].' opraveny!';
     }
-    return('Hotovo!');
+    return 'Hotovo!';
   }
 
@@ -145 +145 @@
     $Text = strtolower($Text);
     $Text = str_replace(' ', '', $Text);
-    return ($Text);
+    return $Text;
   }
 
@@ -153 +153 @@
 
     $Output = '';
-    foreach($TranslationTree as $Group)
+    foreach ($TranslationTree as $Group)
     //  $Group = $TranslationTree[1];
     {
@@ -164 +164 @@
       $DbResult = $this->System->Database->query($sql);
       echo ': <br />'.$Group['TablePrefix'].': ';
-      while($line = $DbResult->fetch_assoc())
+      while ($line = $DbResult->fetch_assoc())
       {
         $sql = 'SELECT * FROM `'.$Group['TablePrefix'] .'` as `T` '.
@@ -171 +171 @@
         //   echo $sql;
         $DbResult2 = $this->System->Database->query($sql);
-        if($DbResult2->num_rows > 0) {
+        if ($DbResult2->num_rows > 0) {
           $line2 = $DbResult2->fetch_assoc();
 
           $Same = true;
-          foreach($TranslationTree[$Group['Id']]['Items'] as $Column) {
+          foreach ($TranslationTree[$Group['Id']]['Items'] as $Column) {
             if ($this->StripText($line[$Column['Column']]) <> $this->StripText($line2[$Column['Column']]))
               $Same = false;
@@ -186 +186 @@
                 ' WHERE `T`.`Entry` = '.$line['Entry'].' AND (`T`.`Take` = '.$line['ID'].' OR `T`.`Take` = '.$line2['ID'].') ';
             $DbResult3 = $this->System->Database->query($sql);
-            while($line3 = $DbResult3->fetch_assoc()) {
+            while ($line3 = $DbResult3->fetch_assoc()) {
               echo $line3['ID'].' ';
               $this->System->Database->query('UPDATE `'.$Group['TablePrefix'].'` SET `VersionEnd` = '.$line2['VersionEnd'].', `VersionStart` = '.$line['VersionStart'].', `Take` = '.$line['ID'].' WHERE ID='.$line3['ID']);
@@ -199 +199 @@
       echo('Texty '.$Group['TablePrefix'].' sjednoceny!');
     }
-    return('Hotovo!');
+    return 'Hotovo!';
   }
 
@@ -224 +224 @@
         $Group = $TranslationTree[$_GET['id']];
         //  $Output .= '<form action="?action=dbcstructure&amp;id='.$Group['Id'].'">';
-        //  foreach($Group['Items'] as $GroupItem)
+        //  foreach ($Group['Items'] as $GroupItem)
         //   {
           //     $Output .= $GroupItem['Column'].': <input name="'.$GroupItem['Id'].'"><br />';
@@ -236 +236 @@
           $Group['DBCFileName'].'.dbc.csv');
 
-        //while(!$File->EOF())
+        //while (!$File->EOF())
 
         $Output .= '<table class="BaseTable">';
@@ -248 +248 @@
         $Output .= '</td></tr><tr><td>';
         for ($i = 0; $i < substr_count($Line, ','); $i++) {
-          foreach($Group['Items'] as $GroupItem)
+          foreach ($Group['Items'] as $GroupItem)
             $Output .=   ' <a href="'.$this->System->Link('/admin/?action=dbcstructure&amp;id='.
               $Group['Id'].'&amp;GroupItem='.$GroupItem['Id'].'&amp;ColumnIndex='.$i).'">'.
@@ -269 +269 @@
       } else {
         $DbResult = $this->System->Database->query('SELECT * FROM `ClientVersion`');
-        while($Version = $DbResult->fetch_assoc())
+        while ($Version = $DbResult->fetch_assoc())
         {
           $Output .= '<a href="'.$this->System->Link('/admin/?action=dbcstructure&amp;GameVersion='.
@@ -276 +276 @@
         $Output .= '<br /><br />';
 
-        foreach($TranslationTree as $Group)
+        foreach ($TranslationTree as $Group)
         {
           if ($Group['DBCFileName'] <> '')
@@ -283 +283 @@
         }
       }
-      return($Output);
+      return $Output;
   }
 
@@ -291 +291 @@
     $Output = 'Překlad rozhraní přegenerován';
     $Output .= '<table class="BaseTable"><tr><th>Originál</th><th>Překlad</th></tr>';
-    foreach($this->System->LocaleManager->CurrentLocale->Texts->Data as $Index => $Item)
+    foreach ($this->System->LocaleManager->CurrentLocale->Texts->Data as $Index => $Item)
       $Output .= '<tr><td>'.$Index.'</td><td>'.$Item.'</td></tr>';
     $Output .= '</table>';
     $Output .= 'Překladové soubory zaktualizovány';
-    return($Output);
+    return $Output;
   }
 
@@ -302 +302 @@
     $this->Title = T('Administration');
     $Output = '';
-    if($this->System->User->Licence(LICENCE_ADMIN))
+    if ($this->System->User->Licence(LICENCE_ADMIN))
     {
-      if(array_key_exists('action', $_GET))
+      if (array_key_exists('action', $_GET))
       {
-        if($_GET['action'] == 'error') $Output .= $this->TestError(12, 'test');
-        else if($_GET['action'] == 'exception') $Output .= $this->TestException(12, 'test');
-        else if($_GET['action'] == 'sqlerror') $Output .= $this->TestSQLError('SELECT dads FROM sdas');
-        else if($_GET['action'] == 'testing') $Output .= $this->Testing();
-        else if($_GET['action'] == 'phpinfo') $Output .= $this->ShowPHPInfo();
-        else if($_GET['action'] == 'locale') $Output .= $this->ShowLocale();
-        else if($_GET['action'] == 'uncomplete') $Output .= $this->Uncomplete();
-        else if($_GET['action'] == 'repairversion') $Output .= $this->RepairVersionEnd();
-        else if($_GET['action'] == 'dbcstructure') $Output .= $this->DbcStructure();
-        else if($_GET['action'] == 'merge') $Output .= $this->MergeSameText();
+        if ($_GET['action'] == 'error') $Output .= $this->TestError(12, 'test');
+        else if ($_GET['action'] == 'exception') $Output .= $this->TestException(12, 'test');
+        else if ($_GET['action'] == 'sqlerror') $Output .= $this->TestSQLError('SELECT dads FROM sdas');
+        else if ($_GET['action'] == 'testing') $Output .= $this->Testing();
+        else if ($_GET['action'] == 'phpinfo') $Output .= $this->ShowPHPInfo();
+        else if ($_GET['action'] == 'locale') $Output .= $this->ShowLocale();
+        else if ($_GET['action'] == 'uncomplete') $Output .= $this->Uncomplete();
+        else if ($_GET['action'] == 'repairversion') $Output .= $this->RepairVersionEnd();
+        else if ($_GET['action'] == 'dbcstructure') $Output .= $this->DbcStructure();
+        else if ($_GET['action'] == 'merge') $Output .= $this->MergeSameText();
         else $Output .= $this->ShowMenu();
       } else $Output .= $this->ShowMenu();
     } else $Output .= ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 }

trunk/Modules/AoWoW/AoWoW.php

@@ -23 +23 @@
       'Icon' => '',
     ));
-    if(array_key_exists('Search', $this->System->ModuleManager->Modules))
+    if (array_key_exists('Search', $this->System->ModuleManager->Modules))
       $this->System->ModuleManager->Modules['Search']->RegisterSearch('aowow',
       T('AoWoW'), array(), '', $this->System->Link('/aowow/?search='));

trunk/Modules/ClientVersion/ClientVersion.php

@@ -31 +31 @@
   function Show()
   {
-    if(array_key_exists('action', $_GET))
+    if (array_key_exists('action', $_GET))
     {
-      if($_GET['action'] == 'item') $Output = $this->ShowItem();
+      if ($_GET['action'] == 'item') $Output = $this->ShowItem();
       else $Output = $this->ShowList();
     } else $Output = $this->ShowList();
-    return($Output);
+    return $Output;
   }
 
   function ShowItem()
   {
-    if(array_key_exists('id', $_GET))
+    if (array_key_exists('id', $_GET))
     {
       $YesNo = array('Ne', 'Ano');
       $DbResult = $this->System->Database->query('SELECT * FROM `ClientVersion` WHERE `Id`='.($_GET['id']*1));
-      if($DbResult->num_rows > 0)
+      if ($DbResult->num_rows > 0)
       {
         $Version = $DbResult->fetch_assoc();
@@ -60 +60 @@
         '</table>';
         $Output .= '<div><a href="?">'.T('All versions list').'</a></div>';
-        if($Version['Imported'])
+        if ($Version['Imported'])
           $Output .= '<div><a href="'.$this->System->Link('/progress/?Version='.
             $Version['Version']).'">'.T('Progress').'</a></div>';
       } else $Output = ShowMessage(T('Item not found'), MESSAGE_CRITICAL);
     } else $Output = ShowMessage(T('Item not found'), MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
@@ -92 +92 @@
 
     $DbResult = $this->System->Database->query('SELECT * FROM ClientVersion '.$Order['SQL'].$PageList['SQLLimit']);
-    while($Version = $DbResult->fetch_assoc())
+    while ($Version = $DbResult->fetch_assoc())
     {
       $Output .= '<tr><td><a href="?action=item&amp;id='.$Version['Id'].'">'.
@@ -101 +101 @@
     $Output .= '</table>'.
       $PageList['Output'];
-    return($Output);
+    return $Output;
   }
 }

trunk/Modules/Dictionary/Dictionary.php

@@ -25 +25 @@
       'Icon' => '',
     ), 1);
-    if(array_key_exists('Search', $this->System->ModuleManager->Modules))
+    if (array_key_exists('Search', $this->System->ModuleManager->Modules))
       $this->System->ModuleManager->Modules['Search']->RegisterSearch('dictionary',
       T('Dictionary'), array('Text', 'Description'),
@@ -65 +65 @@
 
     // $buff[] = array($Line['ID'],GetIDbyName($Table),$Line[$Column],$Line['Tran']);
-    foreach($buff as $Line)
+    foreach ($buff as $Line)
     {
       if ($mode == 0)
@@ -83 +83 @@
     }
     $Output .= '</table>';
-    return($Output);
+    return $Output;
   }
 
@@ -89 +89 @@
   {
     $Output = '';
-    if($this->System->User->Licence(LICENCE_USER))
+    if ($this->System->User->Licence(LICENCE_USER))
     {
       $Output .= '<form action="?action=save" method="post">'.
@@ -103 +103 @@
         '</form>';
     } else $Output .= ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
   function DictionarySave()
   {
-    if($this->System->User->Licence(LICENCE_USER))
-    {
-      if(array_key_exists('Original', $_POST) and array_key_exists('Translated', $_POST) and array_key_exists('Description', $_POST))
+    if ($this->System->User->Licence(LICENCE_USER))
+    {
+      if (array_key_exists('Original', $_POST) and array_key_exists('Translated', $_POST) and array_key_exists('Description', $_POST))
       {
         // Check if original text exists and determine entry id
         $DbResult = $this->Database->query('SELECT * FROM `Dictionary` WHERE '.
           '`Text` = "'.$_POST['Original'].'" AND `Language`= '.$this->System->Config['OriginalLanguage']);
-        if($DbResult->num_rows > 0)
+        if ($DbResult->num_rows > 0)
         {
           $DbRow = $DbResult->fetch_assoc();
@@ -130 +130 @@
         $DbResult = $this->Database->query('SELECT `Id` FROM `Dictionary` WHERE '.
           '`Entry` = '.$Entry.' AND `Language`='.$_POST['Language'].' AND `User`='.$this->System->User->Id);
-        if($DbResult->num_rows > 0)
+        if ($DbResult->num_rows > 0)
         {
           $DbRow = $DbResult->fetch_assoc();
@@ -142 +142 @@
       } else $Output = ShowMessage(T('You have to fill all column of form.'), MESSAGE_CRITICAL);
     } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
   function DictionaryRemove()
   {
-    if($this->System->User->Licence(LICENCE_USER))
+    if ($this->System->User->Licence(LICENCE_USER))
     {
       $this->Database->query('DELETE FROM `Dictionary` WHERE (`User`='.$this->System->User->Id.') AND (`Id`='.($_GET['id'] * 1).')');
       $Output = ShowMessage(T('Record removed'));
     } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
   function DictionaryModify()
   {
-    if($this->System->User->Licence(LICENCE_USER))
+    if ($this->System->User->Licence(LICENCE_USER))
     {
       $DbResult = $this->Database->query('SELECT * FROM `Dictionary` WHERE `Id`='.($_GET['id'] * 1));
-      if($DbResult->num_rows > 0)
+      if ($DbResult->num_rows > 0)
       {
         $DbRow = $DbResult->fetch_assoc();
@@ -180 +180 @@
       } else $Output = ShowMessage(T('Item not found'), MESSAGE_CRITICAL);
     } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
@@ -189 +189 @@
     $Output = '';
     $GroupId = LoadGroupIdParameter();
-    if(array_key_exists('mode', $_GET)) $mode = $_GET['mode'];
+    if (array_key_exists('mode', $_GET)) $mode = $_GET['mode'];
     else $mode = 0; //0 = exact names, 1=all names, 2=nontranslated
     $Table = $TranslationTree[$GroupId]['TablePrefix'];
 
-    if(array_key_exists('ID', $_GET))
+    if (array_key_exists('ID', $_GET))
     {
       $TextID = $_GET['ID'];
@@ -202 +202 @@
       $DbResult = $this->Database->query('SELECT * FROM '.$Table.' WHERE ID = '.$TextID);
       $Line = $DbResult->fetch_assoc();
-      if(!$Line) $Output .= ShowMessage(T('Translation not found'), MESSAGE_CRITICAL);
+      if (!$Line) $Output .= ShowMessage(T('Translation not found'), MESSAGE_CRITICAL);
       else
       {
         $Text = '';
-        foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
+        foreach ($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
           $Text .= ' '.$Line[$TextItem['Column']];
         $Output .= $this->WriteTranslatNames($Text, $mode);
       }
     }
-    return($Output);
+    return $Output;
   }
 
@@ -221 +221 @@
       '<table style="width: 100%; height: 100%;">';
 
-    if(array_key_exists('search', $_GET)) $Search = $_GET['search'];
+    if (array_key_exists('search', $_GET)) $Search = $_GET['search'];
       else $Search = '';
 
@@ -227 +227 @@
       <input type="text" value="'.$Search.'" name="search" size="30" />
       <input type="submit" value="'.T('Search').'" />';
-    if($this->System->User->Licence(LICENCE_USER))
+    if ($this->System->User->Licence(LICENCE_USER))
       $Output .= ' <a href="?action=insert">'.T('Add word').'</a>';
 
@@ -233 +233 @@
       '<tr><td>'.T('Language').': ';
     $Lang = '<a href="?language=">'.T('All').'</a>';
-    if($_SESSION['language'] == '') $Output .= '<strong>'.$Lang.'</strong> ';
+    if ($_SESSION['language'] == '') $Output .= '<strong>'.$Lang.'</strong> ';
       else $Output .= $Lang;
-    foreach($LanguageList as $Language)
-      if($Language['Enabled'] == 1)
+    foreach ($LanguageList as $Language)
+      if ($Language['Enabled'] == 1)
       {
         $Lang = ' <a href="?language='.$Language['Id'].'">'.T($Language['Name']).'</a>';
-        if($Language['Id'] == $_SESSION['language']) $Output .= '<strong>'.$Lang.'</strong> ';
+        if ($Language['Id'] == $_SESSION['language']) $Output .= '<strong>'.$Lang.'</strong> ';
           else $Output .= $Lang;
       }
@@ -245 +245 @@
       '<tr><td>';
 
-    if(!is_numeric($_SESSION['language'])) $LanguageFilter = '';
+    if (!is_numeric($_SESSION['language'])) $LanguageFilter = '';
       else $LanguageFilter = ' AND (`T1`.`Language` = '.$_SESSION['language'].')';
 
-    if($Search <> '')
+    if ($Search <> '')
     {
       $Condition = ' AND (LOWER(`T1`.`Text`) LIKE LOWER("%'.$Search.'%")) OR '.
@@ -270 +270 @@
     $Output .= $PageList['Output'];
 
-    if(is_numeric($_SESSION['language'])) $LanguageName = $LanguageList[$_SESSION['language']]['Name'];
+    if (is_numeric($_SESSION['language'])) $LanguageName = $LanguageList[$_SESSION['language']]['Name'];
       else $LanguageName = T('Translation');
     $TableColumns = array(
@@ -276 +276 @@
       array('Name' => 'Translated', 'Title' => T($LanguageName)),
     );
-    if(!is_numeric($_SESSION['language'])) $TableColumns[] = array('Name' => 'LangName', 'Title' => T('Language'));
+    if (!is_numeric($_SESSION['language'])) $TableColumns[] = array('Name' => 'LangName', 'Title' => T('Language'));
     $TableColumns[] = array('Name' => 'Description', 'Title' => T('Description'));
     $TableColumns[] = array('Name' => 'UserName', 'Title' => T('Translator'));
-    if($this->System->User->Licence(LICENCE_USER)) $TableColumns[] = array('Name' => '', 'Title' => T('Action'));
+    if ($this->System->User->Licence(LICENCE_USER)) $TableColumns[] = array('Name' => '', 'Title' => T('Action'));
     $Order = GetOrderTableHeader($TableColumns, 'Original');
     $Output .= '<table class="BaseTable">'.$Order['Output'];
@@ -285 +285 @@
     $sql_page = $sql.$Order['SQL'].$PageList['SQLLimit'];
     $DbResult = $this->Database->query($sql_page);
-    while($Line = $DbResult->fetch_assoc())
+    while ($Line = $DbResult->fetch_assoc())
     {
       $Output .= '<tr>'.
         '<td>'.htmlspecialchars($Line['Original']).'</td>'.
         '<td><strong>'.htmlspecialchars($Line['Translated']).'</strong></td>';
-      if(!is_numeric($_SESSION['language'])) $Output .= '<td>'.T($Line['LangName']).'</td>';
+      if (!is_numeric($_SESSION['language'])) $Output .= '<td>'.T($Line['LangName']).'</td>';
       $Output .= '<td>'.htmlspecialchars($Line['Description']).'</td>'.
         '<td><a href="'.$this->System->Link('/user/?user='.$Line['UserId']).'">'.
         $Line['UserName'].'</a></td>';
-      if($this->System->User->Licence(LICENCE_USER))
-      {
-        if($Line['UserId'] == $this->System->User->Id)
+      if ($this->System->User->Licence(LICENCE_USER))
+      {
+        if ($Line['UserId'] == $this->System->User->Id)
           $Output .= '<td><a href="?action=remove&amp;id='.$Line['Id'].
             '" onclick="return confirmAction(\''.T('Do you really want to delete item?').'\');">'.T('Delete').'</a>'.
@@ -308 +308 @@
       '</td></tr>'.
       '</table></form>';
-    return($Output);
+    return $Output;
   }
 
@@ -319 +319 @@
     $LanguageList = GetLanguageList();
 
-    if(!isset($_SESSION['language']))
-    {
-      if($this->System->User->Licence(LICENCE_USER))
+    if (!isset($_SESSION['language']))
+    {
+      if ($this->System->User->Licence(LICENCE_USER))
       {
         $_SESSION['language'] = $this->System->User->Language;
       } else $_SESSION['language'] = '';
     }
-    if(array_key_exists('language', $_GET))
-    {
-      if($_GET['language'] == '') $_SESSION['language'] = '';
+    if (array_key_exists('language', $_GET))
+    {
+      if ($_GET['language'] == '') $_SESSION['language'] = '';
         else $_SESSION['language'] = $_GET['language'] * 1;
     }
@@ -335 +335 @@
 
     $ShowList = true;
-    if(array_key_exists('action', $_GET))
-    {
-      if($_GET['action'] == 'group')
+    if (array_key_exists('action', $_GET))
+    {
+      if ($_GET['action'] == 'group')
       {
         $Output .= $this->DictionaryGroup();
         $ShowList = false;
       }
-      else if($_GET['action'] == 'insert') $Output .= $this->DictionaryInsert();
-      else if($_GET['action'] == 'save') $Output .= $this->DictionarySave();
-      else if($_GET['action'] == 'remove') $Output .= $this->DictionaryRemove();
-      else if($_GET['action'] == 'modify') $Output .= $this->DictionaryModify();
+      else if ($_GET['action'] == 'insert') $Output .= $this->DictionaryInsert();
+      else if ($_GET['action'] == 'save') $Output .= $this->DictionarySave();
+      else if ($_GET['action'] == 'remove') $Output .= $this->DictionaryRemove();
+      else if ($_GET['action'] == 'modify') $Output .= $this->DictionaryModify();
       else $Output .= ShowMessage(T('Unknown action'), MESSAGE_CRITICAL);
     }
-    if($ShowList == true) $Output .= $this->DictionaryShow();
-    return($Output);
+    if ($ShowList == true) $Output .= $this->DictionaryShow();
+    return $Output;
   }
 }

trunk/Modules/Download/Download.php

@@ -74 +74 @@
   '<a href="'.$fileslink.'/DBCtoCSV.exe">DBCtoCSV</a> - '.T('tool for transform DBC files to CSV').'<br />'.
   '<a href="'.$fileslink.'/ClientDBExtractor.exe">ClientDBExtractor.exe</a> - '.T('tool for exporting dbc files from game client').'<br />';
-  return($Output);
+  return $Output;
   }
 
@@ -144 +144 @@
       $PageList['Output'];
 
-    return($Output);
+    return $Output;
   }
 
@@ -154 +154 @@
     else $Output .= $this->ShowDownload();
 
-    return($Output);
+    return $Output;
   }
 }

trunk/Modules/Error/Error.php

@@ -23 +23 @@
   function DoStart()
   {
-    if(isset($this->System->Config['Web']['ShowPHPError']))
+    if (isset($this->System->Config['Web']['ShowPHPError']))
       $this->ErrorHandler->ShowError = $this->System->Config['Web']['ShowPHPError'];
       else $this->ErrorHandler->ShowError = true;
@@ -36 +36 @@
   function DoError($Error)
   {
-    foreach($this->OnError as $OnError)
+    foreach ($this->OnError as $OnError)
       call_user_func($OnError, $Error);
   }

trunk/Modules/Export/CreateAddon.php

@@ -17 +17 @@
     $string = str_replace('$r', '"..'.$strlower.'(UnitRace("player")).."', $string);
     $Gender = '$G';
-    while(strpos($string, $Gender) !== false)
+    while (strpos($string, $Gender) !== false)
     {
       $Before = substr($string, 0, strpos($string, $Gender));
@@ -30 +30 @@
     }
     $Gender = '$g';
-    while(strpos($string, $Gender) !== false)
+    while (strpos($string, $Gender) !== false)
     {
       $Before = substr($string, 0, strpos($string, $Gender));
@@ -46 +46 @@
     $string = str_replace("\r", '', $string);
     $string = str_replace("\n", '\r\n', $string);
-    return($string);
+    return $string;
   }
 
@@ -64 +64 @@
     $string = str_replace('\\n', ' ', $string);
     $string = str_replace(' ', '', $string);
-//    while(strpos($string, '  '))
+//    while (strpos($string, '  '))
 //      $string = str_replace('  ', ' ', $string);
-    return($string);
+    return $string;
   }
 
@@ -75 +75 @@
     $string = str_replace('$b', '\r\n', $string);
     $string = $this->ReplaceVarInText($string,'');
-    return($string);
+    return $string;
   }
 
@@ -81 +81 @@
   {
     //echo (strpos($string,'<html>'));
-    if (strpos($string,'<html>') > -1) return(false);
-      else return(true);
+    if (strpos($string,'<html>') > -1) return false;
+      else return true;
   }
 
@@ -98 +98 @@
     $string = str_replace('\\\\124', '\\124',$string);
 
-    return ($string);
+    return $string;
   }
 
@@ -113 +113 @@
     $CreatedFileListCount = array();
 
-    if(!file_exists($this->TempDir.'CzWoW/')) mkdir($this->TempDir.'CzWoW/', 0777, true);
+    if (!file_exists($this->TempDir.'CzWoW/')) mkdir($this->TempDir.'CzWoW/', 0777, true);
 
     $DbResult = $this->Database->query('SELECT `Group`.* FROM `ExportGroup` JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id.' AND `Group`.`TablePrefix` != ""');
-    while($Group = $DbResult->fetch_assoc())
+    while ($Group = $DbResult->fetch_assoc())
     {
     //získání čísla verze pro export
@@ -126 +126 @@
       else $ExportVersion = '';
 
-      foreach($TranslationTree[$Group['Id']]['Items'] as $Column)
-      if($Column['AddonFileName'] != '')
+      foreach ($TranslationTree[$Group['Id']]['Items'] as $Column)
+      if ($Column['AddonFileName'] != '')
       {
         $this->AddProgress(1);
-        if(!isset($CreatedFileListCount[$Column['AddonFileName']]))
+        if (!isset($CreatedFileListCount[$Column['AddonFileName']]))
         $CreatedFileListCount[$Column['AddonFileName']] = 0;
         $CreatedFileListCount[$Column['AddonFileName']]++;
@@ -149 +149 @@
         $ID = $this->Database->query('SELECT `BuildNumber` FROM `ClientVersion` WHERE '.
         ' `Imported` = 1 AND `BuildNumber` < '.$BuildNumber.' ORDER BY  `BuildNumber` DESC LIMIT 1');
-        if($ID->num_rows > 0) {
+        if ($ID->num_rows > 0) {
           $ExportVersionOld = $ID->fetch_assoc();
           $ExportVersionOld = $ExportVersionOld['BuildNumber'];
 
           $DbResult2 = $this->Database->query($this->BuildQuery($Group,$ExportVersionOld));
-          while($Line = $DbResult2->fetch_assoc())
+          while ($Line = $DbResult2->fetch_assoc())
           {
             $en = trim($this->ReplaceEnText($Line['En'.$Column['Column']]));
             $cz = $this->ReplaceCzText($Line[$Column['Column']]);
-            if(($en <> '') and ($cz <> '') and ($this->NotCancel($en)))
+            if (($en <> '') and ($cz <> '') and ($this->NotCancel($en)))
             {
                $TableTexts[$en] = $cz;
@@ -167 +167 @@
 
         $DbResult2 = $this->Database->query($this->BuildQuery($Group,$ExportVersion));
-        while($Line = $DbResult2->fetch_assoc())
+        while ($Line = $DbResult2->fetch_assoc())
         {
           $en = trim($this->ReplaceEnText($Line['En'.$Column['Column']]));
           $cz = $this->ReplaceCzText($Line[$Column['Column']]);
-          if(($en <> '') and ($cz <> '') and ($this->NotCancel($en)))
+          if (($en <> '') and ($cz <> '') and ($this->NotCancel($en)))
           {
              $TableTexts[$en] = $cz;
@@ -177 +177 @@
         }
 
-        foreach($TableTexts as $key => $value) {
+        foreach ($TableTexts as $key => $value) {
             $Buffer .= "\n".'["'.$key.'"]="'.$value.'",';
             $i++;
@@ -194 +194 @@
     $CountFiles = 'CountFiles.lua';
     $Buffer = '';
-    foreach($CreatedFileList as $CreatedFile)
+    foreach ($CreatedFileList as $CreatedFile)
       $Buffer .= 'CZWOW_'.str_replace('_','_count=',$CreatedFile).';'."\n";
-    foreach($TranslationTree as $Group)
-      foreach($TranslationTree[$Group['Id']]['Items'] as $Column)
+    foreach ($TranslationTree as $Group)
+      foreach ($TranslationTree[$Group['Id']]['Items'] as $Column)
       if (($Column['AddonFileName'] != '') and (!in_array($Column['AddonFileName'].'_1', $CreatedFileList)))
       {
@@ -209 +209 @@
     $Buffer = '<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/.\FrameXML\UI.xsd">'."\n";
     $Buffer .= '<script file="'.$CountFiles.'"/>'."\n";
-    foreach($CreatedFileList as $CreatedFile)
+    foreach ($CreatedFileList as $CreatedFile)
       $Buffer .= '<script file="'.$CreatedFile.'.lua"/>'."\n";
     $Buffer .= '</Ui>';
     file_put_contents($this->TempDir.'CzWoW/Translates.xml', $Buffer);
-    return($Output);
+    return $Output;
   }
 
@@ -235 +235 @@
 
     $DbResult = $this->Database->query($this->BuildQuery($Group,$CanGenerated));
-    while($Line = $DbResult->fetch_array())
+    while ($Line = $DbResult->fetch_array())
     {
       $Original = $this->my_trim($Line['En'.$Column['Column']]);
       $Translated = $this->my_trim($Line[$Column['Column']]);
-      if($this->ClientVersion['Version'] == '2.4.3')
+      if ($this->ClientVersion['Version'] == '2.4.3')
       {
         $Original = str_replace("|Hchannel:%d|h[%s]|h", '[%s]', $Original);
@@ -247 +247 @@
     }
 
-    if(!file_exists($this->TempDir.'CzWoW/')) mkdir($this->TempDir.'CzWoW/',0777, true);
+    if (!file_exists($this->TempDir.'CzWoW/')) mkdir($this->TempDir.'CzWoW/',0777, true);
     file_put_contents($this->TempDir.'CzWoW/LocalizationStrings.lua', $Buffer);
   }
@@ -253 +253 @@
   function MakeAddon()
   {
-    if(!file_exists($this->TempDir)) mkdir($this->TempDir, 0777, true);
+    if (!file_exists($this->TempDir)) mkdir($this->TempDir, 0777, true);
     $Output = $this->MakeLanguageFiles();
     $Output .= $this->MakeClientStrings();
     // $Output .= MakeMainScript($Setting);
-    return($Output);
+    return $Output;
   }
 
@@ -283 +283 @@
     ';
     $DbResult = $System->Database->query('SELECT * FROM `CzWoWPackageVersion` ORDER BY `Date` DESC');
-    while($Line = $DbResult->fetch_assoc())
+    while ($Line = $DbResult->fetch_assoc())
     {
       $Buffer .='

trunk/Modules/Export/Export.php

@@ -17 +17 @@
   {
     $this->TempDir = dirname(__FILE__).'/../../'.$this->System->Config['Web']['TempFolder'].'Export/'.$this->Id.'/';
-    if(!file_exists($this->TempDir)) mkdir($this->TempDir, 0777, true);
+    if (!file_exists($this->TempDir)) mkdir($this->TempDir, 0777, true);
     $this->TempDirRelative = $this->System->Config['Web']['TempFolder'].'Export/'.$this->Id.'/';
     $this->SourceDir = dirname(__FILE__).'/../../'.$this->System->Config['Web']['SourceFolder'];
     $this->SourceDirRelative = $this->System->Config['Web']['SourceFolder'];
-    if(!file_exists($this->SourceDir)) mkdir($this->SourceDir, 0777, true);
+    if (!file_exists($this->SourceDir)) mkdir($this->SourceDir, 0777, true);
   }
 
@@ -29 +29 @@
     if ($Export['AllUsers']) {
       $DbResult2 = $this->System->Database->query('SELECT ID FROM `User` WHERE `ID` NOT IN(SELECT `User` FROM `ExportUser` WHERE `Export`='.$this->Id.')');
-      while($UserLine = $DbResult2->fetch_assoc())
+      while ($UserLine = $DbResult2->fetch_assoc())
       {
             $Condition = ' WHERE `Export`='.$this->Id.' AND `User`='.$UserLine['ID'];
             $DbResult = $this->System->Database->query('SELECT * FROM `ExportUser` '.$Condition); //,MAX(`Sequence`) as MaxSequence
-            if($DbResult->num_rows > 0)
+            if ($DbResult->num_rows > 0)
             {
             //  $this->System->Database->query('UPDATE `ExportUser` SET `Sequence`='.$Value.$Condition);
@@ -50 +50 @@
   {
     $DbResult = $this->Database->query('SELECT * FROM `Export` WHERE `Id`='.$this->Id);
-    if($DbResult->num_rows == 0) throw new Exception('Export '.$this->Id.' neexistuje');
+    if ($DbResult->num_rows == 0) throw new Exception('Export '.$this->Id.' neexistuje');
     $this->Export = $DbResult->fetch_assoc();
 
@@ -58 +58 @@
       'LEFT JOIN `User` ON `User`.`ID`=`ExportUser`.`User` '.
       'WHERE `ExportUser`.`Export`='.$this->Id.' ORDER BY `ExportUser`.`Sequence`');
-    while($UserLine = $DbResult->fetch_assoc())
+    while ($UserLine = $DbResult->fetch_assoc())
     {
       $this->UserNames .= ', '.$UserLine['Name'];
@@ -64 +64 @@
     $this->UserNames = substr($this->UserNames, 2);
 
-    if($this->Export['ClientVersion'] != '')
+    if ($this->Export['ClientVersion'] != '')
     {
       $DbResult = $this->Database->query('SELECT * FROM `ClientVersion` WHERE `Id`='.$this->Export['ClientVersion']);
@@ -82 +82 @@
 
     $DbResultItem = $this->System->Database->query('SELECT * FROM `ExportGroupItem` WHERE `Export`='.$this->Id);
-    while($GroupItem = $DbResultItem->fetch_assoc())
+    while ($GroupItem = $DbResultItem->fetch_assoc())
     {
       $GroupItems[$GroupItem['GroupItem']] = 1;
@@ -88 +88 @@
     // Build selected columns
     $Columns = '';
-    foreach($TranslationTree[$Group['Id']]['Items'] as $Column) {
+    foreach ($TranslationTree[$Group['Id']]['Items'] as $Column) {
       if (!isset($GroupItems[$Column['Id']])) $Columns .= ' `T`.`'.$Column['Column'].'` AS `'.$Column['Column'].'`, ';
     }
@@ -104 +104 @@
     // Build columns for english texts
     $OriginalColumns = '';
-    foreach($TranslationTree[$Group['Id']]['Items'] as $Column) {
+    foreach ($TranslationTree[$Group['Id']]['Items'] as $Column) {
       $OriginalColumns .= ' `T3`.`'.$Column['Column'].'` AS `En'.$Column['Column'].'`, ';
       if (isset($GroupItems[$Column['Id']]))
@@ -117 +117 @@
     '(`T3`.`VersionStart` = `T4`.`VersionStart`) AND (`T3`.`VersionEnd` = `T4`.`VersionEnd`)';
 
-    return($Query);
+    return $Query;
   }
 
@@ -129 +129 @@
     if (file_exists($file))
       $date = date('Y-m-d H:i',(filemtime($file)));
-    else return(true);
+    else return true;
   // echo $file;
 
@@ -135 +135 @@
       'JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id);
     $result = false;
-    while($Group = $DbResult->fetch_assoc())
+    while ($Group = $DbResult->fetch_assoc())
     {
       $Query = 'SELECT * FROM `'.$Group['TablePrefix'].'` AS `T`'.
@@ -149 +149 @@
         }
     }
-    return($result);
+    return $result;
   }
 
@@ -172 +172 @@
     $DbResult = $this->Database->query('SELECT `Group`.* FROM `ExportGroup` '.
       'JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id);
-    while($Group = $DbResult->fetch_assoc())
+    while ($Group = $DbResult->fetch_assoc())
     {
       $Buffer .= $Group['TablePrefix'].', ';
@@ -180 +180 @@
     $DbResult = $this->Database->query('SELECT `Group`.* FROM `ExportGroup` '.
       'JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id);
-    while($Group = $DbResult->fetch_assoc())
-    {
-      if($Group['MangosTable'] != '')
+    while ($Group = $DbResult->fetch_assoc())
+    {
+      if ($Group['MangosTable'] != '')
       {
         $Buffer .= "\n\n-- ".$Group['Name']."\n\n";
         $DbResult2 = $this->Database->query($this->BuildQuery($Group));
-        if($DbResult2->num_rows > 0)
-        while($Line = $DbResult2->fetch_array())
+        if ($DbResult2->num_rows > 0)
+        while ($Line = $DbResult2->fetch_array())
         {
           $Values = '';
-          foreach($TranslationTree[$Group['Id']]['Items'] as $GroupItem)
-          if($GroupItem['Column'] != $Group['PrimaryKeyItem']) // Do not update primary key
+          foreach ($TranslationTree[$Group['Id']]['Items'] as $GroupItem)
+          if ($GroupItem['Column'] != $Group['PrimaryKeyItem']) // Do not update primary key
           {
-            if($GroupItem['MangosColumn'] == '') $GroupItem['MangosColumn'] = $GroupItem['Column'];
+            if ($GroupItem['MangosColumn'] == '') $GroupItem['MangosColumn'] = $GroupItem['Column'];
             $Values .= ', `'.$GroupItem['MangosColumn'].'`="'.addslashes($Line[$GroupItem['Column']]).'"';
           }
@@ -200 +200 @@
           // Get multicolumn index
           $ColumnItems = explode(',', $Group['MangosTableIndex']);
-          if(count($ColumnItems) > 1)
+          if (count($ColumnItems) > 1)
           {
             $Where = 'CONCAT(';
-            foreach($ColumnItems as $ColumnItem)
+            foreach ($ColumnItems as $ColumnItem)
               $Where .= '`'.$ColumnItem.'`, "_", ';
             $Where = substr($Where, 0, -7).')';
@@ -216 +216 @@
       }
     }
-    if($this->Export['WithDiacritic'] != 1) $Buffer = utf2ascii($Buffer);
-    return($Buffer);
+    if ($this->Export['WithDiacritic'] != 1) $Buffer = utf2ascii($Buffer);
+    return $Buffer;
   }
 
@@ -243 +243 @@
       'aowow_skill' => 'skillID',
     );
-    foreach($AoWoWTables as $AoWoWTable => $IndexColum)
+    foreach ($AoWoWTables as $AoWoWTable => $IndexColum)
     {
       $Buffer .= '--'.$AoWoWTable.', ';
@@ -249 +249 @@
       $Query = 'SELECT `name`,`'.$IndexColum.'` FROM `'.$AoWoWTable.'`';
       $DbResult = $Database2->query($Query);
-      while($Line = $DbResult->fetch_assoc())
+      while ($Line = $DbResult->fetch_assoc())
       {
         $Ori_text = $Line['name'];
@@ -259 +259 @@
         $Tran = $DbResult2->fetch_assoc();
         //echo ($Line['name'].'='.$Tran['tran']);
-        if($Tran['Tran'] == '')
+        if ($Tran['Tran'] == '')
         {
           $DbResult2 = $Database2->query('SELECT `OptionText` AS `En`,
@@ -270 +270 @@
         }
 
-        if($Tran['Tran'] <> '')
+        if ($Tran['Tran'] <> '')
           $Buffer .= 'UPDATE `'.$AoWoWTable.'` SET `name` = "'.addslashes($Tran['Tran']).'" WHERE '.$IndexColum.' = '.$Line[$IndexColum].' ;'."\n";
       }
@@ -276 +276 @@
     }
     */
-    if($this->Export['WithDiacritic'] != 1) $Buffer = utf2ascii($Buffer);
-    return($Buffer);
+    if ($this->Export['WithDiacritic'] != 1) $Buffer = utf2ascii($Buffer);
+    return $Buffer;
   }
 
@@ -299 +299 @@
           if (false === strpos($String2,$varible)) {
               //  echo $varible;
-            return(false);
+            return false;
           }
       }
     }
-    return (true);
+    return true;
   }
 
@@ -324 +324 @@
       'WHERE `ExportGroup`.`Export`='.$this->Id.' AND `Group`.`DBCFileName` != ""');
     $Output = 'Počet generovaných skupin: '.$DbResult->num_rows."\n";
-    while($Group = $DbResult->fetch_assoc())
+    while ($Group = $DbResult->fetch_assoc())
     {
       $this->AddProgress(2);
       $Output .= $Group['Name'].', ';
-      if(file_exists($this->SourceDir.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc'))
+      if (file_exists($this->SourceDir.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc'))
       {
         // Load string column index list
@@ -335 +335 @@
         $ColumnIndexes = array();
         $ColumnFormat = array();
-        while($DbRow = $DbResult2->fetch_assoc())
+        while ($DbRow = $DbResult2->fetch_assoc())
         {
           $ColumnFormat[$DbRow['ColumnIndex']] = FORMAT_STRING;
@@ -344 +344 @@
         $LookupTable = array();
         $DbResult2 = $this->Database->query($this->BuildQuery($Group));
-        while($DbRow = $DbResult2->fetch_assoc()) {
+        while ($DbRow = $DbResult2->fetch_assoc()) {
           //Export only if translate have same varible %
           $CanExport = true;
-          foreach($TranslationTree[$Group['Id']]['Items'] as $Column)  {
+          foreach ($TranslationTree[$Group['Id']]['Items'] as $Column)  {
             $DbRow[$Column['Column']] = str_replace ( '$ ','$',$DbRow[$Column['Column']]);
             if (!$this->HaveVarible($DbRow['En'.$Column['Column']],$DbRow[$Column['Column']])) {
@@ -369 +369 @@
 
         // Create new DBC file
-        if(!file_exists($this->TempDir.'dbc/')) mkdir ($this->TempDir.'dbc/', 0777, true);
+        if (!file_exists($this->TempDir.'dbc/')) mkdir ($this->TempDir.'dbc/', 0777, true);
         $NewDBCFile = new DBCFile();
         $NewDBCFile->CreateFile($this->TempDir.'dbc/'.$Group['DBCFileName'].'.dbc', $ColumnFormat);
@@ -381 +381 @@
         $RowCount = $SourceDBCFile->GetRecordCount();
         $FieldCount = $SourceDBCFile->GetFieldCount();
-        for($Row = 0; $Row < $RowCount; $Row++)
+        for ($Row = 0; $Row < $RowCount; $Row++)
         {
           $Line = $SourceDBCFile->GetLine($Row);
@@ -388 +388 @@
           $PrimaryKeyItem = '';
           $ColumnItems = explode(',', $Group['DBCIndex']);
-          if(count($ColumnItems) > 1)
+          if (count($ColumnItems) > 1)
           {
-            foreach($ColumnItems as $ColumnItem)
+            foreach ($ColumnItems as $ColumnItem)
               $PrimaryKeyItem .= $Line[$ColumnItem].'_';
             $PrimaryKeyItem = substr($PrimaryKeyItem, 0, -1);
           } else $PrimaryKeyItem = $Line[$Group['DBCIndex']];
 
-          if(array_key_exists($PrimaryKeyItem, $LookupTable))
+          if (array_key_exists($PrimaryKeyItem, $LookupTable))
           {
             // Replace text columns
             $LookupTableItem = $LookupTable[$PrimaryKeyItem];
-            foreach($TranslationTree[$Group['Id']]['Items'] as $GroupItem)
+            foreach ($TranslationTree[$Group['Id']]['Items'] as $GroupItem)
             {
-              if(array_key_exists($GroupItem['Id'], $ColumnIndexes))
+              if (array_key_exists($GroupItem['Id'], $ColumnIndexes))
                 $Line[$ColumnIndexes[$GroupItem['Id']]] = $LookupTableItem[$GroupItem['Column']];
             }
@@ -409 +409 @@
           // Show completion progress
           $Progress = round($Row / $RowCount * 100);
-          if($Progress != $OldProgress)
+          if ($Progress != $OldProgress)
           {
             if (($Group['Id'] == 13) and ($Progress <> 100)) $this->AddProgress(0.01);
@@ -422 +422 @@
     }
     $Output .= 'Hotovo <br />';
-    return($Output);
+    return $Output;
   }
 
@@ -432 +432 @@
 
     $Output = '';
-    if(!file_exists($this->TempDir.'lua/')) mkdir($this->TempDir.'lua/', 0777, true);
+    if (!file_exists($this->TempDir.'lua/')) mkdir($this->TempDir.'lua/', 0777, true);
     $DbResult = $this->Database->query('SELECT `Group`.* FROM `ExportGroup` JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id.' AND `Group`.`LuaFileName` != ""');
-    while($Group = $DbResult->fetch_assoc())
+    while ($Group = $DbResult->fetch_assoc())
     {
       $this->AddProgress(1);
@@ -448 +448 @@
       $LookupTable = array();
       $DbResult2 = $this->Database->query($this->BuildQuery($Group));
-      while($DbRow = $DbResult2->fetch_assoc()) {
+      while ($DbRow = $DbResult2->fetch_assoc()) {
           $CanExport = true;
-          foreach($TranslationTree[$Group['Id']]['Items'] as $Column)  {
+          foreach ($TranslationTree[$Group['Id']]['Items'] as $Column)  {
           //  if (strpos($DbRow[$Column['Column']],'\\'))
            //   $CanExport = false;
@@ -502 +502 @@
       }
 
-      while(!$File->EOF())
+      while (!$File->EOF())
       {
         $Line = $File->ReadLine();
-        if(strpos($Line, '=') !== false)
+        if (strpos($Line, '=') !== false)
         {
           $LineParts = explode('=', $Line, 2);
@@ -511 +511 @@
           $Line = trim($LineParts[1]);
 
-          if($Line[0] == '"')
+          if ($Line[0] == '"')
           {
             // Quoted string value
@@ -532 +532 @@
           $Value['Comment'] = addslashes(stripslashes(substr($Line, 3))); // Skip " --"
 
-          if(array_key_exists($Value['ShortCut'], $LookupTable))
+          if (array_key_exists($Value['ShortCut'], $LookupTable))
           {
             $DbRow = $LookupTable[$Value['ShortCut']];
@@ -548 +548 @@
           }
           $NewLine = $Value['ShortCut'].' = "'.$Value['Text'].'";';
-          //if($Value['Comment'] != '') $NewLine .= ' -- '.$Value['Comment'];
+          //if ($Value['Comment'] != '') $NewLine .= ' -- '.$Value['Comment'];
           $NewLine .= "\r\n";
           $File2->WriteLine($NewLine);
@@ -555 +555 @@
       $Output .= 'Hotovo <br/>';
     }
-    return($Output);
+    return $Output;
   }
 
@@ -656 +656 @@
     "    <author>".$this->System->User->Name."</author>\n".
     "    <contributors>\n";
-    foreach(explode(',', $this->UserNames) as $UserName)
+    foreach (explode(',', $this->UserNames) as $UserName)
       $Buffer .= "      <user>".$UserName."</user>\n";
     $Buffer .=
@@ -665 +665 @@
     $DbResult = $this->Database->query('SELECT `Group`.* FROM `ExportGroup` '.
       'JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id);
-    while($Group = $DbResult->fetch_assoc())
-    {
-      if($Group['MangosTable'] == '')
+    while ($Group = $DbResult->fetch_assoc())
+    {
+      if ($Group['MangosTable'] == '')
       {
         $Group['MangosTable'] = $Group['TablePrefix'];
@@ -674 +674 @@
       $Buffer .= '    <group id="'.$Group['Id'].'" name="'.$Group['TablePrefix'].'">'."\n";
       $DbResult2 = $this->Database->query($this->BuildQuery($Group));
-      while($Line = $DbResult2->fetch_assoc())
+      while ($Line = $DbResult2->fetch_assoc())
       {
         $Buffer .= '      <item id="'.$Line['Entry'].'" user="'.$Line['UserName'].'">'."\n";
         $Values = '';
-        foreach($TranslationTree[$Group['Id']]['Items'] as $GroupItem)
+        foreach ($TranslationTree[$Group['Id']]['Items'] as $GroupItem)
         {
-          if($GroupItem['MangosColumn'] == '') $GroupItem['MangosColumn'] = $GroupItem['Column'];
-          if($Line[$GroupItem['Column']] != '')
+          if ($GroupItem['MangosColumn'] == '') $GroupItem['MangosColumn'] = $GroupItem['Column'];
+          if ($Line[$GroupItem['Column']] != '')
           $Buffer .= '        <text index="'.$GroupItem['Id'].'" name="'.
             $GroupItem['Column'].'">'.addslashes($Line[$GroupItem['Column']]).'</text>'."\n";
@@ -689 +689 @@
       $Buffer .= "    </group>\n";
     }
-    if($this->Export['WithDiacritic'] != 1) $Buffer = utf2ascii($Buffer);
+    if ($this->Export['WithDiacritic'] != 1) $Buffer = utf2ascii($Buffer);
     $Buffer .= "  </translation>\n".
   "</document>";
-    return($Buffer);
+    return $Buffer;
   }
 }
@@ -732 +732 @@
       '((`Export`.`OutputType` = 9) OR (`Export`.`OutputType` = 10)) AND '.
       '(`TimeFinish` IS NULL) OR (`Export` ='.$TaskId.') ORDER BY `TimeQueued`'); // `Export`='.$Export->Id
-    while($Task = $DbResult->fetch_assoc())
+    while ($Task = $DbResult->fetch_assoc())
     {
       $Export = '<a href="'.$this->System->Link('/export/?Action=View&amp;ExportId='.$Task['Export']).'">'.$Task['Export'].'</a>';
@@ -744 +744 @@
       // Show estimated time to complete
       $PrefixMultiplier = new PrefixMultiplier();
-      if($Task['Progress'] > 0) {
+      if ($Task['Progress'] > 0) {
         $ElapsedTime = time() - MysqlDateTimeToTime($Task['TimeStart']);
         $Output .= T('Elapsed time').': <strong>'.$PrefixMultiplier->Add($ElapsedTime, '', 4, 'Time').'</strong> / ';
@@ -752 +752 @@
       $Output .= '</div>';
 
-      if($Task['Progress'] > 99)
+      if ($Task['Progress'] > 99)
         $Output .= '<script type="text/javascript" language="JavaScript" charset="utf-8">'.
         'setTimeout("parent.location.href=\''.$this->System->Link('/export/?Action=View&Tab=7&ExportId='.$TaskId).'\'", 500)'.
         '</script>';
     }
-    return($Output);
+    return $Output;
   }
 }

trunk/Modules/Export/ExportOutput.php

@@ -10 +10 @@
 {
   $FileList = scandir($Path);
-  foreach($FileList as $FileName)
-  {
-    if(file_exists($Path.$FileName) and ($FileName != '.') and ($FileName != '..'))
+  foreach ($FileList as $FileName)
+  {
+    if (file_exists($Path.$FileName) and ($FileName != '.') and ($FileName != '..'))
     {
-      if(is_dir($Path.$FileName)) CreateZipFromDir($Zip, $Path.$FileName.'/', $ZipPath.$FileName.'/');
+      if (is_dir($Path.$FileName)) CreateZipFromDir($Zip, $Path.$FileName.'/', $ZipPath.$FileName.'/');
         else $Zip->addFile(file_get_contents($Path.$FileName), $ZipPath.$FileName);
     }
@@ -28 +28 @@
   $Export->Id = $ExportId;
   $Export->Init();
-  if(function_exists('gzcompress'))
+  if (function_exists('gzcompress'))
   {
     $SaveFilename = $Export->TempDir.'CzAoWoW_SQL.zip';
@@ -45 +45 @@
     '<a href="'.$System->Link('/'.$Export->TempDirRelative.'CzAoWoW_SQL.zip').'">'.$SQLFilename.'</a><br />'.
     'Pokud se vám zdá, že filtr na export nefunguje, vymažte si vyrovnávací paměť prohlížeče a zkuste stáhnout soubor znovu.';
-  return($Output);
+  return $Output;
 }
 
@@ -58 +58 @@
      htmlspecialchars($Export->ExportToAoWoWSQL()).
     '</pre>';
-  return($Output );
+  return $Output ;
 }
 
@@ -69 +69 @@
   $Export->Id = $ExportId;
   $Export->Init();
-  if(function_exists('gzcompress'))
+  if (function_exists('gzcompress'))
   {
     $SaveFilename = $Export->TempDir.'CzWoW_SQL.zip';
@@ -86 +86 @@
     '<a href="'.$System->Link('/'.$Export->TempDirRelative.'CzWoW_SQL.zip').'">'.$SQLFilename.'</a><br />'.
     'Pokud se vám zdá, že filtr na export nefunguje, vymažte si vyrovnávací paměť prohlížeče a zkuste stáhnout soubor znovu.';
-  return($Output);
+  return $Output;
 }
 
@@ -99 +99 @@
     htmlspecialchars($Export->ExportToMangosSQL()).
     '</pre>';
-  return($Output);
+  return $Output;
 }
 
@@ -106 +106 @@
   global $System;
 
-  if(function_exists('gzcompress'))
+  if (function_exists('gzcompress'))
   {
     $Addon = new ExportAddon($System);
@@ -135 +135 @@
     'Pokud se vám zdá, že filtr na export nefunguje, vymažte si vyrovnávací paměť prohlížeče a zkuste stáhnout soubor znovu.';
   $Output .= '<br /><strong>Použití ve hře</strong><br />Menu addonu ve hře vyvoláte povelem /czwow.';
-  return($Output);
+  return $Output;
 }
 
@@ -146 +146 @@
   $Export->Id = $ExportId;
   $Export->Init();
-  if(function_exists('gzcompress'))
+  if (function_exists('gzcompress'))
   {
     $SaveFilename = $Export->TempDir.'CzWoW_XML.zip';
@@ -163 +163 @@
     '<a href="'.$System->Link('/'.$Export->TempDirRelative.'CzWoW_XML.zip').'">CzWoW_SQL.zip</a><br />'.
     'Pokud se vám zdá, že filtr na export nefunguje, vymažte si vyrovnávací paměť prohlížeče a zkuste stáhnout soubor znovu.';
-  return($Output);
+  return $Output;
 }
 
@@ -176 +176 @@
     htmlspecialchars($Export->ExportToXML()).
     '</pre>';
-  return($Output);
+  return $Output;
 }
 
@@ -190 +190 @@
   $DbResult = $System->Database->query('SELECT `Id` FROM `ExportTask` WHERE (`Export` = '.$ExportId.
       ') AND ((`TimeFinish` < `TimeStart`) OR (`TimeFinish` IS NULL))');
-  if($DbResult->num_rows == 0)
-  {
-    if(array_key_exists('Regenerate', $_POST))
+  if ($DbResult->num_rows == 0)
+  {
+    if (array_key_exists('Regenerate', $_POST))
     {
       $System->Database->query('UPDATE `ExportTask` SET `TimeQueued` = NOW(), `Progress`=0 , `TimeStart` = NULL, `TimeFinish` = NULL WHERE `Export` = '.$ExportId);
@@ -211 +211 @@
 
   $DbResult = $System->Database->query('SELECT * FROM `ExportTask` WHERE `Export` = '.$ExportId);
-  if($DbResult->num_rows == 0)
+  if ($DbResult->num_rows == 0)
   {
     $System->Database->query('INSERT INTO `ExportTask` (`Export` ,`TimeQueued` ) VALUES ('.$ExportId.', NOW())');
@@ -220 +220 @@
   $DbResult = $System->Database->query('SELECT `TimeFinish` FROM `ExportTask` WHERE `Export` = '.$ExportId);
   $ExportTask = $DbResult->fetch_assoc();
-  if($ExportTask['TimeFinish'] <> '')
+  if ($ExportTask['TimeFinish'] <> '')
   {
     $Output .= '<strong>Souhrný balík: <a href="'.$System->Link('/'.$Export->TempDirRelative.'CzWoW_DBC.zip').'">CzWoW_DBC.zip</a></strong><br/>';
     $DbResult = $System->Database->query('SELECT `Group`.* FROM `ExportGroup` JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$Export->Id.' AND `Group`.`DBCFileName` != ""');
-    while($Group = $DbResult->fetch_assoc())
+    while ($Group = $DbResult->fetch_assoc())
     {
-      if(file_exists($Export->TempDir.'dbc/'.$Group['DBCFileName'].'.dbc'))
+      if (file_exists($Export->TempDir.'dbc/'.$Group['DBCFileName'].'.dbc'))
         $Output .= '<a href="'.$System->Link('/'.$Export->TempDirRelative.'dbc/'.$Group['DBCFileName'].'.dbc').'">'.$Group['DBCFileName'].'.dbc</a><br/>';
     }
@@ -233 +233 @@
 
   }
-  return($Output);
+  return $Output;
 }
 
@@ -261 +261 @@
     'WHERE ((`Export`.`OutputType` = 9) OR (`Export`.`OutputType` = 10)) AND '.
     '(`TimeFinish` IS NULL) AND (`TimeQueued` < (NOW() - '.$Timeout.'))');
-  if($DbResult->num_rows > 0)
+  if ($DbResult->num_rows > 0)
   {
     $System->ModuleManager->Modules['Log']->WriteLog('ProcesTask nepracuje přes 2 hodiny, pravděpodobně nepracuje!', LOG_TYPE_ERROR);
   }
-  return ($Output);
+  return $Output;
 }
 
@@ -281 +281 @@
   $DbResult = $System->Database->query('SELECT `Id` FROM `ExportTask` WHERE (`Export` = '.$ExportId.
     ') AND ((`TimeFinish` < `TimeStart`) OR (`TimeFinish` IS NULL))');
-  if($DbResult->num_rows == 0)
-  {
-    if(array_key_exists('Regenerate', $_POST))
+  if ($DbResult->num_rows == 0)
+  {
+    if (array_key_exists('Regenerate', $_POST))
     {
       $System->Database->query('UPDATE `ExportTask` SET `TimeQueued` = NOW(), `Progress`=0, `TimeStart` = NULL, `TimeFinish` = NULL WHERE `Export` = '.$ExportId);
@@ -298 +298 @@
   // Start task for the first time if export task was not yet started
   $DbResult = $System->Database->query('SELECT * FROM `ExportTask` WHERE `Export` = '.$ExportId);
-  if($DbResult->num_rows == 0)
+  if ($DbResult->num_rows == 0)
   {
     $System->Database->query('INSERT INTO ExportTask (`Export` ,`TimeStart` ) VALUES ('.$ExportId.', NOW())');
@@ -306 +306 @@
   $DbResult = $System->Database->query('SELECT `TimeFinish` FROM `ExportTask` WHERE `Export` = '.$ExportId);
   $ExportTask = $DbResult->fetch_assoc();
-  if($ExportTask['TimeFinish'] <> '')
+  if ($ExportTask['TimeFinish'] <> '')
   {
     $FileName = 'Instalace_CzechWoW_'.$Export->ClientVersion['Version'].'.exe';
@@ -313 +313 @@
     $Output .= ShowProgress($Export);
   }
-  return($Output);
+  return $Output;
 }
 
@@ -324 +324 @@
   $Export->Init();
 
-  if(function_exists('gzcompress'))
+  if (function_exists('gzcompress'))
   {
     $Output = 'Generování lua souborů...<br />';
@@ -342 +342 @@
     'Souhrný archív <a href="'.$System->Link('/'.$Export->TempDirRelative.'CzWoW_Lua.zip').'">CzWoW_Lua.zip</a><br />';
   $DbResult = $System->Database->query('SELECT `Group`.* FROM `ExportGroup` JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$Export->Id.' AND `Group`.`LuaFileName` != ""');
-  while($Group = $DbResult->fetch_assoc())
+  while ($Group = $DbResult->fetch_assoc())
   {
     $Output .= '<a href="'.$System->Link('/'.$Export->TempDirRelative.'lua/'.$Group['LuaFileName'].'.lua').'">'.$Group['LuaFileName'].'.lua</a><br/>';
   }
   $Output .= '<br /><br /><strong>Použití ve hře</strong><br />Ze souborů vytvořte MPQ archív a nahrajte ho do hry do podsložky jako Data/enUS/patch-enUS-5.MPQ nebo Data/enUS/patch-enGB-5.MPQ. Pro starší verze hry než 3.2.0 je nutné spouštět hru pomocí programu WoWMe.exe (WoW Model Editor Fix).';
-  return($Output);
+  return $Output;
 }
 
 function ExportOutput($ExportId, $Type)
 {
-  if($Type == 1) $Output = OutputMangosSQLToHTML($ExportId);
-  else if($Type == 2) $Output = OutputMangosSQLToFile($ExportId);
-  else if($Type == 3) $Output = OutputAoWoWToHTML($ExportId);
-  else if($Type == 4) $Output = OutputAoWoWToFile($ExportId);
-  else if($Type == 5) $Output = OutputXMLToHTML($ExportId);
-  else if($Type == 6) $Output = OutputXMLToFile($ExportId);
-  else if($Type == 7) $Output = OutputAddon($ExportId);
-  else if($Type == 8) $Output = OutputLua($ExportId);
-  else if($Type == 9) $Output = OutputDBCToFile($ExportId);
-  else if($Type == 10) $Output = OutputEXEToFile($ExportId);
+  if ($Type == 1) $Output = OutputMangosSQLToHTML($ExportId);
+  else if ($Type == 2) $Output = OutputMangosSQLToFile($ExportId);
+  else if ($Type == 3) $Output = OutputAoWoWToHTML($ExportId);
+  else if ($Type == 4) $Output = OutputAoWoWToFile($ExportId);
+  else if ($Type == 5) $Output = OutputXMLToHTML($ExportId);
+  else if ($Type == 6) $Output = OutputXMLToFile($ExportId);
+  else if ($Type == 7) $Output = OutputAddon($ExportId);
+  else if ($Type == 8) $Output = OutputLua($ExportId);
+  else if ($Type == 9) $Output = OutputDBCToFile($ExportId);
+  else if ($Type == 10) $Output = OutputEXEToFile($ExportId);
   else $Output = ShowMessage('Nebyl vybrán žádný formát výstupu.', MESSAGE_CRITICAL);
-  return($Output);
-}
+  return $Output;
+}

trunk/Modules/Export/Page.php

@@ -17 +17 @@
   {
     $Output = '<a href="?Action=ViewList">'.T('All').'</a>';
-    if($this->System->User->Licence(LICENCE_USER))
+    if ($this->System->User->Licence(LICENCE_USER))
     {
       $Output .= ' <a href="?Action=ViewList&amp;Filter=Others">'.T('Others').'</a>'.
@@ -23 +23 @@
     }
 
-    if($this->System->User->Licence(LICENCE_USER))
+    if ($this->System->User->Licence(LICENCE_USER))
       $Output .= '<br/><div style="text-align: center;"><a href="?Action=Create">'.T('Create new export').'</a></div><br/>';
 
     $Filter = '';
-    if(array_key_exists('Filter', $_GET))
-    {
-      if($_GET['Filter'] == 'My') $Filter = ' WHERE `Export`.`User` = '.$this->System->User->Id;
-      if($_GET['Filter'] == 'Others') $Filter = ' WHERE `Export`.`User` != '.$this->System->User->Id;
+    if (array_key_exists('Filter', $_GET))
+    {
+      if ($_GET['Filter'] == 'My') $Filter = ' WHERE `Export`.`User` = '.$this->System->User->Id;
+      if ($_GET['Filter'] == 'Others') $Filter = ' WHERE `Export`.`User` != '.$this->System->User->Id;
     }
 
@@ -62 +62 @@
       '(SELECT COUNT(*) FROM `ExportUser` WHERE `ExportUser`.`Export`=`Export`.`Id`) AS `UserCount` FROM `Export` '.
       'LEFT JOIN `User` ON `User`.`ID`=`Export`.`User` '.$Filter.$Order['SQL'].$PageList['SQLLimit']);
-    while($Export = $DbResult->fetch_assoc())
+    while ($Export = $DbResult->fetch_assoc())
     {
       $Action = '<a href="?Action=View&amp;ExportId='.$Export['Id'].'&amp;Tab=0">'.T('View').'</a> '.
         '<a href="?Action=View&amp;ExportId='.$Export['Id'].'&amp;Tab=7">'.T('Make export').'</a>';
-      if($Export['User'] == $this->System->User->Id) $Action .= ' <a href="?Action=Delete&amp;ExportId='.$Export['Id'].'" onclick="return confirmAction(\''.T('Realy delete item?').'\');">'.T('Delete').'</a>';
-      if($this->System->User->Id != null) $Action .= ' <a href="?Action=Clone&amp;ExportId='.$Export['Id'].'" onclick="return confirmAction(\''.T('Realy clone item?').'\');">'.T('Clone').'</a>';
+      if ($Export['User'] == $this->System->User->Id) $Action .= ' <a href="?Action=Delete&amp;ExportId='.$Export['Id'].'" onclick="return confirmAction(\''.T('Realy delete item?').'\');">'.T('Delete').'</a>';
+      if ($this->System->User->Id != null) $Action .= ' <a href="?Action=Clone&amp;ExportId='.$Export['Id'].'" onclick="return confirmAction(\''.T('Realy clone item?').'\');">'.T('Clone').'</a>';
       $Output .= '<tr><td>'.HumanDate($Export['TimeCreate']).'</td>'.
           '<td><a href="'.$this->System->Link('/user/?user='.$Export['User']).'">'.$Export['UserName'].'</a></td>'.
@@ -79 +79 @@
         $PageList['Output'];
 
-    return($Output);
+    return $Output;
   }
 
   function ExportCreate()
   {
-    if($this->System->User->Licence(LICENCE_USER))
+    if ($this->System->User->Licence(LICENCE_USER))
     {
       $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `Export` WHERE `User`='.$this->System->User->Id);
       $DbRow = $DbResult->fetch_row();
-      if($DbRow[0] < $this->System->Config['MaxExportPerUser'])
+      if ($DbRow[0] < $this->System->Config['MaxExportPerUser'])
       {
         $Output = '<form action="?Action=CreateFinish" method="post">'.
@@ -98 +98 @@
       } else $Output = ShowMessage(sprintf(T('You can\'t create another export. Max for one user is %d.'), $this->System->Config['MaxExportPerUser']), MESSAGE_CRITICAL);
     } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
   function ExportCreateFinish()
   {
-    if($this->System->User->Licence(LICENCE_USER))
-    {
-      if(array_key_exists('Title', $_POST) and array_key_exists('Description', $_POST))
+    if ($this->System->User->Licence(LICENCE_USER))
+    {
+      if (array_key_exists('Title', $_POST) and array_key_exists('Description', $_POST))
       {
         $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `Export` WHERE `User`='.$this->System->User->Id);
         $DbRow = $DbResult->fetch_row();
-        if($DbRow[0] < $this->System->Config['MaxExportPerUser'])
+        if ($DbRow[0] < $this->System->Config['MaxExportPerUser'])
         {
           $this->System->Database->query('INSERT INTO `Export` (`Title`, `User`, `TimeCreate`, `WithDiacritic`, `Description`) VALUES ("'.$_POST['Title'].'", '.$this->System->User->Id.', NOW(), 1, "'.$_POST['Description'].'")');
@@ -120 +120 @@
       } else $Output = ShowMessage(T('Missing data in form.'), MESSAGE_CRITICAL);
     } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
   function ExportDelete()
   {
-    if($this->System->User->Licence(LICENCE_USER))
+    if ($this->System->User->Licence(LICENCE_USER))
     {
       $DbResult = $this->System->Database->query('SELECT * FROM `Export` WHERE (`Id`='.($_GET['ExportId'] * 1).') AND (`User`='.$this->System->User->Id.')');
-      if($DbResult->num_rows > 0)
+      if ($DbResult->num_rows > 0)
       {
         $this->System->Database->query('DELETE FROM `ExportGroup` WHERE `Export`='.$_GET['ExportId']);
@@ -143 +143 @@
       } else $Output = ShowMessage(T('Export not found.'), MESSAGE_CRITICAL);
     } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
@@ -163 +163 @@
     $DbResult = $this->System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
     $Export = $DbResult->fetch_assoc();
-    if($this->System->User->Licence(LICENCE_USER) and ($this->System->User->Id == $Export['User'])) $Editable = true;
+    if ($this->System->User->Licence(LICENCE_USER) and ($this->System->User->Id == $Export['User'])) $Editable = true;
     else $Editable = false;
 
-    if(array_key_exists('Operation', $_POST))
-    {
-      if($_POST['Operation'] == 'Save')
+    if (array_key_exists('Operation', $_POST))
+    {
+      if ($_POST['Operation'] == 'Save')
       {
         //print_r($_POST);
         // Update user selection page
-        foreach($_POST as $Index => $Value)
+        foreach ($_POST as $Index => $Value)
         {
-          if(substr($Index, 0, 3) == 'seq')
+          if (substr($Index, 0, 3) == 'seq')
           {
             $UserId = substr($Index, 3) * 1;
-            if(array_key_exists('sel'.$UserId, $_POST)) $Selected = true;
+            if (array_key_exists('sel'.$UserId, $_POST)) $Selected = true;
             else $Selected = false;
             $Condition = ' WHERE `Export`='.$_GET['ExportId'].' AND `User`='.$UserId;
             $DbResult = $this->System->Database->query('SELECT * FROM `ExportUser` '.$Condition);
-            if($DbResult->num_rows > 0)
+            if ($DbResult->num_rows > 0)
             {
-              if(!$Selected) $this->System->Database->query('DELETE FROM `ExportUser` '.$Condition);
+              if (!$Selected) $this->System->Database->query('DELETE FROM `ExportUser` '.$Condition);
               else $this->System->Database->query('UPDATE `ExportUser` SET `Sequence`='.$Value.$Condition);
             } else
             {
-              if($Selected) $this->System->Database->query('INSERT INTO `ExportUser` (`Export`, `User`, `Sequence`) VALUES ('.$_GET['ExportId'].', '.$UserId.', '.$Value.')');
+              if ($Selected) $this->System->Database->query('INSERT INTO `ExportUser` (`Export`, `User`, `Sequence`) VALUES ('.$_GET['ExportId'].', '.$UserId.', '.$Value.')');
             }
           }
@@ -221 +221 @@
     );
     $Order = GetOrderTableHeader($TableColumns, 'TranslatedCount', 1);
-    if($Order['Column'] != 'Sequence2') $InitialOrder = ', '.substr($Order['SQL'], 10);
+    if ($Order['Column'] != 'Sequence2') $InitialOrder = ', '.substr($Order['SQL'], 10);
     else $InitialOrder = '';
 
@@ -234 +234 @@
     $Output .= '<form name="Translators" action="?Action=View&amp;ExportId='.$_GET['ExportId'].'" method="post">'.
         '<h3>'.T('Translators').'</h3>';
-    if($Editable)
+    if ($Editable)
     {
       $Output .= '<input type="submit" value="'.T('Save').'" '.$DisabledInput[$Editable].'/>'.
@@ -252 +252 @@
     $this->System->Database->query('SET @I = 0');
     $DbResult = $this->System->Database->query($Query);
-    while($UserLine = $DbResult->fetch_assoc())
+    while ($UserLine = $DbResult->fetch_assoc())
     {
       $XP = GetLevelMinMax($UserLine['XP']);
@@ -268 +268 @@
         '</form>'.
         $PageList['Output'];
-    return($Output);
+    return $Output;
   }
 
@@ -278 +278 @@
     $DbRows = $this->System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
     $Export = $DbRows->fetch_assoc();
-    if($this->System->User->Licence(LICENCE_USER) and ($this->System->User->Id == $Export['User'])) $Editable = true;
+    if ($this->System->User->Licence(LICENCE_USER) and ($this->System->User->Id == $Export['User'])) $Editable = true;
     else $Editable = false;
 
-    if(array_key_exists('Operation', $_POST))
-      if($_POST['Operation'] == 'Save')  if($Editable and array_key_exists('Title', $_POST) and array_key_exists('Description', $_POST))
-      {
-        if(array_key_exists('WithDiacritic', $_POST)) $WithDiacritic = 1;
+    if (array_key_exists('Operation', $_POST))
+      if ($_POST['Operation'] == 'Save')  if ($Editable and array_key_exists('Title', $_POST) and array_key_exists('Description', $_POST))
+      {
+        if (array_key_exists('WithDiacritic', $_POST)) $WithDiacritic = 1;
         else $WithDiacritic = 0;
         if (array_key_exists('Featured', $_POST)) $Export['Featured'] = 1;
@@ -296 +296 @@
       }
 
-      if($Export['WithDiacritic'] == 1) $WithDiacritic = ' checked="checked"';
+      if ($Export['WithDiacritic'] == 1) $WithDiacritic = ' checked="checked"';
       else $WithDiacritic = '';
       $Output .= '<form action="?Action=View&amp;Tab=0&amp;ExportId='.$Export['Id'].'" method="post">'.
           '<table>';
-      if($this->System->User->Id != null)
+      if ($this->System->User->Id != null)
       {
         $Output .= '<input type="hidden" name="Operation" value="Save"/>'.
             '<tr><td colspan="2">';
-        if($Editable) $Output .= ' <input type="submit" value="'.T('Save').'" '.$DisabledInput[$Editable].'/>';
+        if ($Editable) $Output .= ' <input type="submit" value="'.T('Save').'" '.$DisabledInput[$Editable].'/>';
         $Output .= ' <a href="?Action=Clone&amp;ExportId='.$Export['Id'].'" onclick="return confirmAction(\''.T('Realy clone item?').'\');">'.T('Clone').'</a> ';
-        if($this->System->User->Licence(LICENCE_ADMIN))
+        if ($this->System->User->Licence(LICENCE_ADMIN))
           $Output .= CheckBox('Featured', $Export['Featured'], '', 'CheckBox', !$Editable). ' '.T('Recommended').' ';
         $Output .= '</td></tr>';
@@ -314 +314 @@
           '<tr><td>'.T('With diacritics').'</td><td><input type="checkbox" name="WithDiacritic" '.$WithDiacritic.''.$DisabledInput[$Editable].'/></td></tr>'.
           '</table></form>';
-      return($Output);
+      return $Output;
   }
 
@@ -325 +325 @@
     $DbRows = $this->System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
     $Export = $DbRows->fetch_assoc();
-    if($this->System->User->Licence(LICENCE_USER) and ($this->System->User->Id == $Export['User'])) $Editable = true;
+    if ($this->System->User->Licence(LICENCE_USER) and ($this->System->User->Id == $Export['User'])) $Editable = true;
     else $Editable = false;
 
-    if(array_key_exists('Operation', $_POST))
-    {
-      if($_POST['Operation'] == 'Save')
+    if (array_key_exists('Operation', $_POST))
+    {
+      if ($_POST['Operation'] == 'Save')
       {
         //print_r($_POST);
         // Update user selection page
-        foreach($_POST as $Index => $Value)
+        foreach ($_POST as $Index => $Value)
         {
-          if(substr($Index, 0, 3) == 'seq')
+          if (substr($Index, 0, 3) == 'seq')
           {
             $LanguageId = substr($Index, 3) * 1;
-            if(array_key_exists('sel'.$LanguageId, $_POST)) $Selected = true;
+            if (array_key_exists('sel'.$LanguageId, $_POST)) $Selected = true;
             else $Selected = false;
             $Condition = ' WHERE Export='.$_GET['ExportId'].' AND `Language`='.$LanguageId;
             $DbResult = $this->System->Database->query('SELECT * FROM `ExportLanguage` '.$Condition);
-            if($DbResult->num_rows > 0)
+            if ($DbResult->num_rows > 0)
             {
-              if(!$Selected) $this->System->Database->query('DELETE FROM `ExportLanguage` '.$Condition);
+              if (!$Selected) $this->System->Database->query('DELETE FROM `ExportLanguage` '.$Condition);
               else $this->System->Database->query('UPDATE `ExportLanguage` SET `Sequence`='.$Value.$Condition);
             } else
             {
-              if($Selected) $this->System->Database->query('INSERT INTO `ExportLanguage` (`Export`, `Language`, `Sequence`) VALUES ('.$_GET['ExportId'].', '.$LanguageId.', '.$Value.')');
+              if ($Selected) $this->System->Database->query('INSERT INTO `ExportLanguage` (`Export`, `Language`, `Sequence`) VALUES ('.$_GET['ExportId'].', '.$LanguageId.', '.$Value.')');
             }
           }
@@ -377 +377 @@
     $Output .= '<form action="?Action=View&amp;ExportId='.$_GET['ExportId'].'" method="post">'.
         '<h3>'.T('Languages').'</h3>';
-    if($Editable)
+    if ($Editable)
     {
       $Output .= '<input type="submit" value="'.T('Save').'" '.$DisabledInput[$Editable].'/>'.
@@ -393 +393 @@
     $this->System->Database->query('SET @I = 0');
     $DbResult = $this->System->Database->query($Query);
-    while($Langugage = $DbResult->fetch_assoc())
+    while ($Langugage = $DbResult->fetch_assoc())
     {
       $Checked = $Langugage['Sequence'] != '';
@@ -405 +405 @@
         '</form>'.
         $PageList['Output'];
-    return($Output);
+    return $Output;
   }
 
@@ -416 +416 @@
     $DbRows = $this->System->Database->query('SELECT * FROM Export WHERE Id='.$_GET['ExportId']);
     $Export = $DbRows->fetch_assoc();
-    if($this->System->User->Licence(LICENCE_USER) and ($this->System->User->Id == $Export['User'])) $Editable = true;
+    if ($this->System->User->Licence(LICENCE_USER) and ($this->System->User->Id == $Export['User'])) $Editable = true;
     else $Editable = false;
 
-    if(array_key_exists('Operation', $_POST))
-    {
-      if($_POST['Operation'] == 'Save')
+    if (array_key_exists('Operation', $_POST))
+    {
+      if ($_POST['Operation'] == 'Save')
       {
         //print_r($_POST);
         // Update user selection page
-        foreach($_POST as $Index => $Value)
+        foreach ($_POST as $Index => $Value)
         {
-          if(substr($Index, 0, 3) == 'seq')
+          if (substr($Index, 0, 3) == 'seq')
           {
             $GroupId = substr($Index, 3) * 1;
-            if(array_key_exists('sel'.$GroupId, $_POST)) $Selected = true;
+            if (array_key_exists('sel'.$GroupId, $_POST)) $Selected = true;
             else $Selected = false;
             $Condition = ' WHERE `Export`='.$_GET['ExportId'].' AND `Group`='.$GroupId;
             $DbResult = $this->System->Database->query('SELECT * FROM `ExportGroup` '.$Condition);
-            if($DbResult->num_rows > 0)
+            if ($DbResult->num_rows > 0)
             {
-              if(!$Selected) $this->System->Database->query('DELETE FROM `ExportGroup` '.$Condition);
+              if (!$Selected) $this->System->Database->query('DELETE FROM `ExportGroup` '.$Condition);
             } else
             {
-              if($Selected) $this->System->Database->query('INSERT INTO `ExportGroup` (`Export`, `Group`) VALUES ('.$_GET['ExportId'].', '.$GroupId.')');
+              if ($Selected) $this->System->Database->query('INSERT INTO `ExportGroup` (`Export`, `Group`) VALUES ('.$_GET['ExportId'].', '.$GroupId.')');
             }
           }
@@ -446 +446 @@
       }
       //items
-      foreach($TranslationTree as $Group)
-      {
-        foreach($TranslationTree[$Group['Id']]['Items'] as $Column) {
-          if(array_key_exists('item'.$Column['Id'], $_POST)) $Selected = true;
+      foreach ($TranslationTree as $Group)
+      {
+        foreach ($TranslationTree[$Group['Id']]['Items'] as $Column) {
+          if (array_key_exists('item'.$Column['Id'], $_POST)) $Selected = true;
           else $Selected = false;
           //we will save only forbitten collums and need to be visible
@@ -457 +457 @@
             $Condition = ' WHERE `Export`='.$_GET['ExportId'].' AND `GroupItem`='.$Column['Id'];
             $DbResult = $this->System->Database->query('SELECT * FROM `ExportGroupItem` '.$Condition);
-            if($DbResult->num_rows > 0)
+            if ($DbResult->num_rows > 0)
             {
-              if(!$Selected) $this->System->Database->query('DELETE FROM `ExportGroupItem` '.$Condition);
+              if (!$Selected) $this->System->Database->query('DELETE FROM `ExportGroupItem` '.$Condition);
             } else
             {
-              if($Selected) $this->System->Database->query('INSERT INTO `ExportGroupItem` (`Export`, `GroupItem`) VALUES ('.$_GET['ExportId'].', '.$Column['Id'].')');
+              if ($Selected) $this->System->Database->query('INSERT INTO `ExportGroupItem` (`Export`, `GroupItem`) VALUES ('.$_GET['ExportId'].', '.$Column['Id'].')');
             }
 
@@ -486 +486 @@
     $Output .= '<form action="?Action=View&amp;ExportId='.$_GET['ExportId'].'" method="post">'.
         '<h3>'.T('Translation groups').'</h3>';
-    if($Editable)
+    if ($Editable)
     {
       $Output .= '<input type="submit" value="'.T('Save').'" '.$DisabledInput[$Editable].'/>'.
@@ -500 +500 @@
 
     $DbResultItem = $this->System->Database->query('SELECT * FROM `ExportGroupItem` WHERE `Export`='.$_GET['ExportId']);
-    while($GroupItem = $DbResultItem->fetch_assoc())
+    while ($GroupItem = $DbResultItem->fetch_assoc())
     {
       $GroupItems[$GroupItem['GroupItem']] = 1;
@@ -507 +507 @@
     $Query = 'SELECT * FROM ('.$Query.') AS TX '.$Order['SQL'].$PageList['SQLLimit'];
     $DbResult = $this->System->Database->query($Query);
-    while($Group = $DbResult->fetch_assoc())
+    while ($Group = $DbResult->fetch_assoc())
     {
       $Columns = '';
-      foreach($TranslationTree[$Group['Id']]['Items'] as $Column) {
+      foreach ($TranslationTree[$Group['Id']]['Items'] as $Column) {
         if ($Column['Visible']) $Columns .= CheckBox('item'.$Column['Id'],
           !isset($GroupItems[$Column['Id']]), '', 'CheckBox', !$Editable).' '.T($Column['Name']).' <br/>';
@@ -533 +533 @@
       '</form>'.
       $PageList['Output'];
-    return($Output);
+    return $Output;
   }
 
@@ -540 +540 @@
     $Output = '';
     $DisabledInput = array(false => ' disabled="disabled"', true => '');
-    if(array_key_exists('ExportId', $_GET))
+    if (array_key_exists('ExportId', $_GET))
     {
       $DbRows = $this->System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
-      if($DbRows->num_rows > 0)
+      if ($DbRows->num_rows > 0)
       {
         $Export = $DbRows->fetch_assoc();
-        if($this->System->User->Licence(LICENCE_USER) and ($this->System->User->Id == $Export['User'])) $Editable = true;
+        if ($this->System->User->Licence(LICENCE_USER) and ($this->System->User->Id == $Export['User'])) $Editable = true;
         else $Editable = false;
 
-        if(array_key_exists('Operation', $_POST))
-          if($_POST['Operation'] == 'Save')
+        if (array_key_exists('Operation', $_POST))
+          if ($_POST['Operation'] == 'Save')
           {
-            if(array_key_exists('OutputType', $_POST) and ($_POST['OutputType'] * 1 > 0))
+            if (array_key_exists('OutputType', $_POST) and ($_POST['OutputType'] * 1 > 0))
             {
               $this->System->Database->query('UPDATE Export SET OutputType='.$_POST['OutputType'].' WHERE Id='.$_GET['ExportId']);
@@ -564 +564 @@
           $Output .= '<h3>'.T('Format the generated output').'</h3>'.
               '<form action="?Action=View&amp;ExportId='.$_GET['ExportId'].'" method="post">';
-          if($Editable)
+          if ($Editable)
           {
             $Output .= '<input type="submit" value="'.T('Save').'" '.$DisabledInput[$Editable].'/>'.
@@ -571 +571 @@
           }
           $DbResult = $this->System->Database->query('SELECT * FROM `ExportOutputType` ORDER BY `Name`');
-          while($ExportFormat = $DbResult->fetch_assoc())
+          while ($ExportFormat = $DbResult->fetch_assoc())
           {
             $Output .= RadioButton('OutputType', $ExportFormat['Id'], $Export['OutputType'] == $ExportFormat['Id'], '', !$Editable).' '.$ExportFormat['Name'].'<br/>';
@@ -578 +578 @@
       } else $Output .= ShowMessage(T('Item not found'), MESSAGE_CRITICAL);
     } else $Output .= ShowMessage(T('Is isn\'t select'), MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
@@ -587 +587 @@
     $DbRows = $this->System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
     $Export = $DbRows->fetch_assoc();
-    if($this->System->User->Licence(LICENCE_USER) and ($this->System->User->Id == $Export['User'])) $Editable = true;
+    if ($this->System->User->Licence(LICENCE_USER) and ($this->System->User->Id == $Export['User'])) $Editable = true;
     else $Editable = false;
 
-    if(array_key_exists('Operation', $_POST))
-      if(($_POST['Operation'] == 'Save') and (array_key_exists('ClientVersion', $_POST)))
+    if (array_key_exists('Operation', $_POST))
+      if (($_POST['Operation'] == 'Save') and (array_key_exists('ClientVersion', $_POST)))
       {
         $this->System->Database->query('UPDATE `Export` SET `ClientVersion`='.$_POST['ClientVersion'].' WHERE `Id`='.$_GET['ExportId']);
@@ -600 +600 @@
       $Export = $DbResult->fetch_assoc();
 
-      if($Export['OutputType'] == '') $Output .= ShowMessage('Nevybrán typ exportu', MESSAGE_CRITICAL);
+      if ($Export['OutputType'] == '') $Output .= ShowMessage('Nevybrán typ exportu', MESSAGE_CRITICAL);
       else {
         $Query = 'SELECT `ClientVersion`.* FROM `ExportVersion` '.
@@ -620 +620 @@
             '<h3>'.T('Client version').'</h3>';
 
-        if($Editable)
+        if ($Editable)
         {
           $Output .= '<input type="submit" value="'.T('Save').'" '.$DisabledInput[$Editable].'/>'.
@@ -633 +633 @@
         $Query = 'SELECT * FROM ('.$Query.') AS `TX` '.$Order['SQL'].$PageList['SQLLimit'];
         $DbResult = $this->System->Database->query($Query);
-        while($Version = $DbResult->fetch_assoc())
+        while ($Version = $DbResult->fetch_assoc())
         {
           $Output .= '<tr><td><a href="'.$this->System->Link('/client-version/?action=item&amp;id='.$Version['Id']).'">'.
@@ -646 +646 @@
             $PageList['Output'];
       }
-      return($Output);
+      return $Output;
   }
 
@@ -654 +654 @@
     $DbResult = $this->System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
     $Export = $DbResult->fetch_assoc();
-    if($Export['OutputType'] == '') $Output .= ShowMessage('Nevybrán typ exportu', MESSAGE_CRITICAL);
-    else if($Export['ClientVersion'] == '') $Output .= ShowMessage(T('Export don\'t have selected version of client'), MESSAGE_CRITICAL);
+    if ($Export['OutputType'] == '') $Output .= ShowMessage('Nevybrán typ exportu', MESSAGE_CRITICAL);
+    else if ($Export['ClientVersion'] == '') $Output .= ShowMessage(T('Export don\'t have selected version of client'), MESSAGE_CRITICAL);
     else {
       $DbResult = $this->System->Database->query('SELECT * FROM `ExportOutputType` WHERE `Id`='.$Export['OutputType']);
-      if($DbResult->num_rows > 0)
+      if ($DbResult->num_rows > 0)
       {
         $DbResult = $this->System->Database->query('SELECT * FROM `ExportVersion` WHERE (`ExportType`='.$Export['OutputType'].') AND (`ClientVersion`='.$Export['ClientVersion'].')');
-        if($DbResult->num_rows > 0)
+        if ($DbResult->num_rows > 0)
         {
           if (array_key_exists('Auto', $_GET) == false)
@@ -669 +669 @@
       } else $Output = ShowMessage(T('Format output isn\'t select').'.', MESSAGE_CRITICAL);
     }
-    return($Output);
+    return $Output;
   }
 
@@ -679 +679 @@
     $Export->LoadFilters();
 
-    if(($Export->Export['ClientVersion'] == '') or ($Export->ClientVersion['BuildNumber'] == ''))
+    if (($Export->Export['ClientVersion'] == '') or ($Export->ClientVersion['BuildNumber'] == ''))
       $Output = ShowMessage(T('Export don\'t have selected version of client'), MESSAGE_CRITICAL);
     else {
@@ -687 +687 @@
       $UnionItems = array();
       $DbResult = $this->System->Database->query($GroupListQuery.$Where);
-      while($DbRow = $DbResult->fetch_assoc())
+      while ($DbRow = $DbResult->fetch_assoc())
       {
         $UnionItems[] = 'SELECT (SELECT COUNT(DISTINCT(`Entry`)) FROM ('.
@@ -721 +721 @@
       $Translated = 0;
       $Total = 0;
-      if(count($UnionItems) > 0)
+      if (count($UnionItems) > 0)
       {
         $ID = $this->System->Database->query('SELECT *, ROUND(`Translated` / `Total` * 100, 2) AS `Percent` FROM ('.implode(' UNION ALL ', $UnionItems).') AS `C3` '.$Order['SQL'].$PageList['SQLLimit']);
-        while($Group = $ID->fetch_assoc())
+        while ($Group = $ID->fetch_assoc())
         {
           $Output .= '<tr><td>'.T($Group['Name']).'</td><td>'.$Group['Translated'].'</td><td>'.$Group['Total'].'</td><td>'.ProgressBar(150, $Group['Percent']).'</td></tr>';
@@ -731 +731 @@
         }
       }
-      if($Total > 0) $Percent = $Translated / $Total * 100;
+      if ($Total > 0) $Percent = $Translated / $Total * 100;
       else $Percent = 100;
 
@@ -737 +737 @@
       $Output .= '</table>';
     }
-    return($Output);
+    return $Output;
   }
 
@@ -743 +743 @@
   {
     $Output = '';
-    if(array_key_exists('ExportId', $_GET) and is_numeric($_GET['ExportId']))
+    if (array_key_exists('ExportId', $_GET) and is_numeric($_GET['ExportId']))
     {
       $DbResult = $this->System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
-      if($DbResult->num_rows > 0)
+      if ($DbResult->num_rows > 0)
       {
         $Export = $DbResult->fetch_assoc();
@@ -759 +759 @@
           T('Statistic'), T('Output')));
         $Output .= '<div id="content">';
-        if($_SESSION['Tab'] == TAB_GENERAL) $Output .= $this->ExportViewGeneral();
-        else if($_SESSION['Tab'] == TAB_TRANSLATORS) $Output .= $this->ExportViewTranslators();
-        else if($_SESSION['Tab'] == TAB_GROUPS) $Output .= $this->ExportViewGroups();
-        else if($_SESSION['Tab'] == TAB_LANGUAGES) $Output .= $this->ExportViewLanguages();
-        else if($_SESSION['Tab'] == TAB_OUTPUT_FORMAT) $Output .= $this->ExportViewOutputFormat();
-        else if($_SESSION['Tab'] == TAB_VERSION) $Output .= $this->ExportViewVersion();
-        else if($_SESSION['Tab'] == TAB_STAT) $Output .= $this->ExportViewStat();
-        else if($_SESSION['Tab'] == TAB_OUTPUT) $Output .= $this->ExportViewOutput();
+        if ($_SESSION['Tab'] == TAB_GENERAL) $Output .= $this->ExportViewGeneral();
+        else if ($_SESSION['Tab'] == TAB_TRANSLATORS) $Output .= $this->ExportViewTranslators();
+        else if ($_SESSION['Tab'] == TAB_GROUPS) $Output .= $this->ExportViewGroups();
+        else if ($_SESSION['Tab'] == TAB_LANGUAGES) $Output .= $this->ExportViewLanguages();
+        else if ($_SESSION['Tab'] == TAB_OUTPUT_FORMAT) $Output .= $this->ExportViewOutputFormat();
+        else if ($_SESSION['Tab'] == TAB_VERSION) $Output .= $this->ExportViewVersion();
+        else if ($_SESSION['Tab'] == TAB_STAT) $Output .= $this->ExportViewStat();
+        else if ($_SESSION['Tab'] == TAB_OUTPUT) $Output .= $this->ExportViewOutput();
         else $Output .= $this->ExportViewGeneral();
 
@@ -772 +772 @@
       } else $Output .= ShowMessage(T('Export not found.'), MESSAGE_CRITICAL);
     } else $Output .= ShowMessage(T('Is isn\'t select'), MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
   function ExportClone()
   {
-    if($this->System->User->Licence(LICENCE_USER))
-    {
-      if(array_key_exists('ExportId', $_GET) and is_numeric($_GET['ExportId']))
+    if ($this->System->User->Licence(LICENCE_USER))
+    {
+      if (array_key_exists('ExportId', $_GET) and is_numeric($_GET['ExportId']))
       {
         $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `Export` WHERE `User`='.$this->System->User->Id);
         $DbRow = $DbResult->fetch_row();
-        if($DbRow[0] < $this->System->Config['MaxExportPerUser'])
+        if ($DbRow[0] < $this->System->Config['MaxExportPerUser'])
         {
           $DbResult = $this->System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
-          if($DbResult->num_rows > 0)
+          if ($DbResult->num_rows > 0)
           {
             $DbRow = $DbResult->fetch_assoc();
@@ -810 +810 @@
       } else $Output = ShowMessage(T('Export not found.'), MESSAGE_CRITICAL);
     } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
@@ -816 +816 @@
   {
     $this->Title = T('Export');
-    if(array_key_exists('Action', $_GET))
-    {
-      if($_GET['Action'] == 'Create') $Output = $this->ExportCreate();
-      else if($_GET['Action'] == 'CreateFinish') $Output = $this->ExportCreateFinish();
-      else if($_GET['Action'] == 'View') $Output = $this->ExportView();
-      else if($_GET['Action'] == 'Delete') $Output = $this->ExportDelete();
-      else if($_GET['Action'] == 'Clone') $Output = $this->ExportClone();
+    if (array_key_exists('Action', $_GET))
+    {
+      if ($_GET['Action'] == 'Create') $Output = $this->ExportCreate();
+      else if ($_GET['Action'] == 'CreateFinish') $Output = $this->ExportCreateFinish();
+      else if ($_GET['Action'] == 'View') $Output = $this->ExportView();
+      else if ($_GET['Action'] == 'Delete') $Output = $this->ExportDelete();
+      else if ($_GET['Action'] == 'Clone') $Output = $this->ExportClone();
       else $Output = $this->ExportList();
     } else $Output = $this->ExportList();
-    return($Output);
+    return $Output;
   }
 }
@@ -839 +839 @@
   function Show()
   {
-    if(array_key_exists('i', $_GET))
+    if (array_key_exists('i', $_GET))
       $Output = $this->System->ModuleManager->Modules['Export']->GetTaskProgress($_GET['i'] * 1);
       else $Output = 'Missing task id';
-    return($Output);
+    return $Output;
   }
 }

trunk/Modules/Export/ProcessAoWoWExport.php

@@ -14 +14 @@
 $Output = '';
 
-if(defined('STDIN') == false)
+if (defined('STDIN') == false)
 {
   $Output = T('Access denied');
@@ -20 +20 @@
 }
 
-foreach($_SERVER['argv'] as $parameter)
+foreach ($_SERVER['argv'] as $parameter)
 {
-  if(strpos($parameter, '=') !== false)
+  if (strpos($parameter, '=') !== false)
   {
     $index = substr($parameter, 0, strpos($parameter, '='));
@@ -33 +33 @@
 echo 'Generuji Export:';
   $Export = new Export($System);
-if(!array_key_exists('AoWoWExportId', $Config)) {
+if (!array_key_exists('AoWoWExportId', $Config)) {
   $Export->Id = $Config['AoWoWExportId'];
 } else $Export->Id = 37;
@@ -45 +45 @@
 $UserSelection = array();
 $DbResult = $System->Database->query('SELECT `ID`, `XP` FROM `User`');
-while($DbRow = $DbResult->fetch_assoc())
+while ($DbRow = $DbResult->fetch_assoc())
 {
   $UserSelection[$DbRow['ID']] = $DbRow['XP'];
@@ -53 +53 @@
 // Update export user selection sequence
 $Sequence = 1;
-foreach($UserSelection as $ID => $XP)
+foreach ($UserSelection as $ID => $XP)
 {
   $DbResult = $System->Database->query('SELECT `Id` FROM `ExportUser` WHERE `Export` = '.$Config['AoWoWExportId'].' AND `User` = '.$ID);
-  if($DbResult->num_rows > 0)
+  if ($DbResult->num_rows > 0)
     $Query = 'UPDATE `ExportUser` SET `Sequence` = '.$Sequence.' WHERE `Export` = '.$Config['AoWoWExportId'].' AND `User` = '.$ID;
     else $Query = 'INSERT INTO `ExportUser` (`Export`, `User`, `Sequence`) VALUES ('.$Config['AoWoWExportId'].', '.$ID.', '.$Sequence.')';
@@ -70 +70 @@
 $Database2->query('SET NAMES '.$Config['Database']['Charset']);
 $Database2->select_db($Config['Database']['DatabaseAoWoW']);
-foreach($SQL as $Line)
+foreach ($SQL as $Line)
 {
 //echo '.';
   //echo($Line."\n");
-  if(trim($Line) != '') $Database2->query($Line);
+  if (trim($Line) != '') $Database2->query($Line);
 }
 echo 'Hotovo
@@ -83 +83 @@
 // Delete temporary cache files
 $Files = scandir(dirname(__FILE__).'/../../aowow/cache/mangos');
-foreach($Files as $File)
+foreach ($Files as $File)
 {
   $End = substr($File, strlen($File) - 3);
-  if($End == 'aww') unlink(dirname(__FILE__).'/../../aowow/cache/mangos/'.$File);
+  if ($End == 'aww') unlink(dirname(__FILE__).'/../../aowow/cache/mangos/'.$File);
 }
 $Files = scandir(dirname(__FILE__).'/../../aowow/cache/templates/wowhead');
-foreach($Files as $File)
+foreach ($Files as $File)
 {
   $End = substr($File, strlen($File) - 3);
-  if($End == 'php') unlink(dirname(__FILE__).'/../../aowow/cache/templates/wowhead/'.$File);
+  if ($End == 'php') unlink(dirname(__FILE__).'/../../aowow/cache/templates/wowhead/'.$File);
 }
 echo 'Hotovo

trunk/Modules/Export/ProcessTask.php

@@ -23 +23 @@
   function DeleteOldFiles($deldir)
   {
-    if(file_exists($deldir.'/'))
+    if (file_exists($deldir.'/'))
     {
       $Dir = opendir($deldir.'/') ;
-      while(($File = readdir($Dir)) !== false)
+      while (($File = readdir($Dir)) !== false)
       {
-        if(($File != '..') and ($File != '.') and (!is_dir($File))) unlink($deldir.'/'.$File);
+        if (($File != '..') and ($File != '.') and (!is_dir($File))) unlink($deldir.'/'.$File);
       }
       closedir($Dir);
@@ -56 +56 @@
   function MPQPack($packdir)
   {
-    if(file_exists($packdir.DIRECTORY_SEPARATOR))
+    if (file_exists($packdir.DIRECTORY_SEPARATOR))
     {
       $Dir = opendir($packdir.DIRECTORY_SEPARATOR);
-      while(($File = readdir($Dir)) !== false)
+      while (($File = readdir($Dir)) !== false)
       {
-        if(($File != '..') and ($File != '.')) {
+        if (($File != '..') and ($File != '.')) {
           $File = str_replace('/', DIRECTORY_SEPARATOR, $File);
           $InDir = '';
@@ -109 +109 @@
     // Delete old files
     $this->DeleteOldFiles($Export->TempDir.'dbc');
-    if(file_exists($Export->TempDir.'CzWoW_DBC.zip')) unlink($Export->TempDir.'CzWoW_DBC.zip');
+    if (file_exists($Export->TempDir.'CzWoW_DBC.zip')) unlink($Export->TempDir.'CzWoW_DBC.zip');
 
     $this->SetProgress(20);
-    if(function_exists('gzcompress'))
+    if (function_exists('gzcompress'))
     {
       $Export->ExportToDBC();
@@ -185 +185 @@
     global $Config;
 
-    while(1)
+    while (1)
     {
       $DbResult = $this->Database->query('SELECT `ExportTask`.`Id`, `ExportTask`.`Export`, '.
@@ -191 +191 @@
         'LEFT JOIN `Export` ON `Export`.`Id` = `ExportTask`.`Export` WHERE '.
         '(`ExportTask`.`TimeFinish` IS NULL) ORDER BY `TimeQueued`');
-      while($Task = $DbResult->fetch_assoc())
+      while ($Task = $DbResult->fetch_assoc())
       {
         $this->Id = $Task['Id'];
-        if($Task['ExportId'] != '')
+        if ($Task['ExportId'] != '')
         {
           try
@@ -201 +201 @@
             $this->Database->update('ExportTask', '`Id`='.$this->Id, array('TimeStart' => 'NOW()'));
 
-            if($Task['ExportOutput'] == 9)
+            if ($Task['ExportOutput'] == 9)
             {
               $this->ExportDBC($Task);
             } else
-            if($Task['ExportOutput'] == 10)
+            if ($Task['ExportOutput'] == 10)
             {
               $this->ExportEXE($Task);

trunk/Modules/Export/cmdmpqexport.php

@@ -17 +17 @@
 $Output = '';
 
-if(defined('STDIN') == false)
+if (defined('STDIN') == false)
 {
   $Output = T('Access denied');
@@ -23 +23 @@
 }
 
-foreach($_SERVER['argv'] as $parameter)
+foreach ($_SERVER['argv'] as $parameter)
 {
-  if(strpos($parameter, '=') !== false)
+  if (strpos($parameter, '=') !== false)
   {
     $index = substr($parameter, 0, strpos($parameter, '='));
@@ -33 +33 @@
   } else $_GET[$parameter] = '';
 }
-if(!array_key_exists('ExportId', $_GET) and !array_key_exists('needgeneration', $_GET) and !array_key_exists('version', $_GET) and !array_key_exists('dbc', $_GET) and !array_key_exists('lua', $_GET) and !array_key_exists('addon', $_GET)) {
+if (!array_key_exists('ExportId', $_GET) and !array_key_exists('needgeneration', $_GET) and !array_key_exists('version', $_GET) and !array_key_exists('dbc', $_GET) and !array_key_exists('lua', $_GET) and !array_key_exists('addon', $_GET)) {
   $Output .= 'Usage type_export=id_export -for export<br />';
   $Output .= 'Usage ExportId=id_export - for write export info<br />';
@@ -43 +43 @@
 }
                      //37
-if(array_key_exists('lua', $_GET)) {
+if (array_key_exists('lua', $_GET)) {
   $Export = new Export($System);
   $Export->Id = $_GET['lua'];
@@ -53 +53 @@
 ',$Output);
 }
-if(array_key_exists('version', $_GET)) {
+if (array_key_exists('version', $_GET)) {
   $Export = new Export($System);
   $Export->Id = $_GET['version'];
@@ -63 +63 @@
 ',$Output);
 }
-if(array_key_exists('dbc', $_GET)) {
+if (array_key_exists('dbc', $_GET)) {
   $Export = new Export($System);
   $Export->Id = $_GET['dbc'];
@@ -73 +73 @@
 ',$Output);
 }
-if(array_key_exists('addon', $_GET)) {
+if (array_key_exists('addon', $_GET)) {
     $Addon = new ExportAddon($System);
     $Addon->Id = $_GET['addon'];
@@ -84 +84 @@
 }
 
-if(array_key_exists('needgeneration', $_GET)) {
+if (array_key_exists('needgeneration', $_GET)) {
   $DbRows = $System->Database->query('SELECT `ClientVersion`.`Version` AS `Version`, '.
     '`Export`.`Id`,`Export`.`ClientVersion`,`Export`.`OutputType`,`Export`.`Title`,'.
@@ -96 +96 @@
   if ($Export->NeedGeneration()) {
     $DbResult = $System->Database->query('SELECT * FROM `ExportTask` WHERE `Export` = '.$Export->Id);
-    if($DbResult->num_rows == 0)
+    if ($DbResult->num_rows == 0)
     {
       $System->Database->query('INSERT INTO `ExportTask` (`Export` ,`TimeStart` ) VALUES ('.$Export->Id.', NOW())');
@@ -114 +114 @@
 }
 
-if(array_key_exists('ExportId', $_GET)) {
+if (array_key_exists('ExportId', $_GET)) {
   $Export = new Export($System);
   $Export->Id = $_GET['ExportId'];

trunk/Modules/Forum/Forum.php

@@ -21 +21 @@
       'Permission' => LICENCE_ANONYMOUS));
 
-    if(array_key_exists('Search', $this->System->ModuleManager->Modules))
+    if (array_key_exists('Search', $this->System->ModuleManager->Modules))
       $this->System->ModuleManager->Modules['Search']->RegisterSearch('forum',
       T('Forum'), array('UserName', 'Text'), '`ForumText`', $this->System->Link('/forum/?search='));
-    if(array_key_exists('Search', $this->System->ModuleManager->Modules))
+    if (array_key_exists('Search', $this->System->ModuleManager->Modules))
       $this->System->ModuleManager->Modules['Search']->RegisterSearch('forumthread',
       T('Name of thread forum'), array('UserName', 'Text'), '`ForumThread`',
@@ -53 +53 @@
     $DbResult = $this->Database->query($Query);
     $Output .= '<table class="MiniTable"><tr><th>'.T('Date').'</th><th>'.T('User').'</th><th>'.T('Post').'</th></tr>';
-    while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
     {
       $Output .= '<tr>'.
@@ -62 +62 @@
     }
     $Output .= '</table></div>';
-    return($Output);
+    return $Output;
   }
 }
@@ -72 +72 @@
     $Output = '';
     $this->Title = T('Forum');
-    if(array_key_exists('a', $_POST)) $Action = $_POST['a'];
-      else if(array_key_exists('a', $_GET)) $Action = $_GET['a'];
+    if (array_key_exists('a', $_POST)) $Action = $_POST['a'];
+      else if (array_key_exists('a', $_GET)) $Action = $_GET['a'];
        else $Action = '';
     if (array_key_exists('Edit', $_GET)) {
@@ -86 +86 @@
     if (array_key_exists('Thread', $_GET)) {
       $Output .= '<h3>'.T('Forum - Thread').'</h3>';
-      if($Action == 'add2') $Output .= $this->AddFinish();
-      if($this->System->User->Licence(LICENCE_USER)) $Output .= $this->ShowAddForm();
+      if ($Action == 'add2') $Output .= $this->AddFinish();
+      if ($this->System->User->Licence(LICENCE_USER)) $Output .= $this->ShowAddForm();
       $Output .= $this->ShowList();
     } else {
       $Output .= '<h3>'.T('Forum - List of Thread').'</h3>';
-      if($Action == 'add2') $Output .= $this->AddFinish('ForumThread');
-      if($this->System->User->Licence(LICENCE_USER)) $Output .= $this->ShowAddFormThread();
+      if ($Action == 'add2') $Output .= $this->AddFinish('ForumThread');
+      if ($this->System->User->Licence(LICENCE_USER)) $Output .= $this->ShowAddFormThread();
       $Output .= $this->ShowListThread();
     }
-    return($Output);
+    return $Output;
   }
 
@@ -104 +104 @@
     $DbResult = $this->System->Database->query('UPDATE `ForumText` SET `Text`="'.$_POST['text'].'" WHERE `User` = '.$this->System->User->Id.' AND `ID` = '.$_GET['Edit']);
     $Output .= ShowMessage(T('Text edited.'));
-    return ($Output);
+    return $Output;
   }
 
@@ -110 +110 @@
   {
     $Output = '';
-    if($this->System->User->Licence(LICENCE_USER))
+    if ($this->System->User->Licence(LICENCE_USER))
     {
       $DbResult = $this->System->Database->query('SELECT * FROM `ForumText`  WHERE `User` = '.$this->System->User->Id.' AND `ID` = '.$_GET['Edit']);
@@ -118 +118 @@
             '<fieldset><legend>'.T('Edit message').'</legend>'.
             T('User').': ';
-        if($this->System->User->Licence(LICENCE_USER)) $Output .= '<b>'.$this->System->User->Name.'</b><br />';
+        if ($this->System->User->Licence(LICENCE_USER)) $Output .= '<b>'.$this->System->User->Name.'</b><br />';
           else $Output .= '<input type="text" name="user" /><br />';
         $Output .= T('Message text').': ('.T('You can use').' <a href="http://www.bbcode.org/reference.php">'.T('BB code').'</a>)<br/>'.
@@ -127 +127 @@
       } else $Output .= ShowMessage(T('You have to be registered for adding message.'), MESSAGE_CRITICAL);
     }   else $Output .= ShowMessage(T('You can edit only your own message.'), MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
@@ -150 +150 @@
     $DbResult = $this->System->Database->query('SELECT `ForumText`.`Text`, `ForumText`.`Date`, `ForumText`.`UserName`,'.
     '`ForumThread`.`Text` as `ThreadName`,`ForumText`.`Thread` FROM `ForumText` '.$join.' WHERE '.$where.' ORDER BY `ForumText`.`Date` DESC '.$PageList['SQLLimit']);
-    while($Line = $DbResult->fetch_assoc())
+    while ($Line = $DbResult->fetch_assoc())
       $Output .= '<div><a href="'.$this->System->Link('/forum/?Thread='.$Line['Thread']).'">'.
       htmlspecialchars($Line['ThreadName']).'</a><br /><strong>'.$Line['UserName'].
       '</strong> ('.HumanDate($Line['Date']).'): '.$parser->qparse(htmlspecialchars($Line['Text'])).'</div> ';
     $Output .= '</div>'.$PageList['Output'];
-    return($Output);
+    return $Output;
   }
 
@@ -169 +169 @@
     $Output .= '<div class="shoutbox">';
     $DbResult = $this->System->Database->query('SELECT * FROM `ForumThread` WHERE 1 ORDER BY `ID` DESC '.$PageList['SQLLimit']);
-    while($Line = $DbResult->fetch_assoc())
+    while ($Line = $DbResult->fetch_assoc())
       $Output .= '<div><span style="float:right;"><strong>'.$Line['UserName'].
     '</strong> - ('.HumanDate($Line['Date']).')</span> <a href="?Thread='.$Line['ID'].'">'.
     str_replace("\n", '', htmlspecialchars($Line['Text'])).'</a></div>';
     $Output .= '</div>'.$PageList['Output'];
-    return($Output);
+    return $Output;
   }
 
@@ -183 +183 @@
     $parser = new HTML_BBCodeParser2(array('filters' => array('Basic','Extended','Images','Links','Lists','Email')));
 
-    if(array_key_exists('search', $_GET)) $_SESSION['search'] = $_GET['search'];
-    else if(!array_key_exists('search', $_SESSION)) $_SESSION['search'] = '';
-    if(array_key_exists('search', $_GET) and ($_GET['search'] == '')) $_SESSION['search'] = '';
-    if($_SESSION['search'] != '')
+    if (array_key_exists('search', $_GET)) $_SESSION['search'] = $_GET['search'];
+    else if (!array_key_exists('search', $_SESSION)) $_SESSION['search'] = '';
+    if (array_key_exists('search', $_GET) and ($_GET['search'] == '')) $_SESSION['search'] = '';
+    if ($_SESSION['search'] != '')
     {
       $SearchQuery = ' AND (`Text` LIKE "%'.$_SESSION['search'].'%")';
@@ -193 +193 @@
 
     $DbResult = $this->System->Database->query('SELECT * FROM `ForumThread` WHERE ID='.($_GET['Thread']*1).' LIMIT 1');
-    if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
     {
     $Thread = $DbResult->fetch_assoc();
@@ -206 +206 @@
     $DbResult = $this->System->Database->query('SELECT * FROM `ForumText` WHERE `Thread` = '.
       ($_GET['Thread']*1).' '.$SearchQuery.' ORDER BY `ID` DESC '.$PageList['SQLLimit']);
-    while($Line = $DbResult->fetch_assoc()) {
+    while ($Line = $DbResult->fetch_assoc()) {
       if ($this->System->User->Id == $Line['User'])
         $edit = '<a href="?Edit='.$Line['ID'].'">'.T('edit').'</a>';
@@ -216 +216 @@
     $Output .= '</div>'.$PageList['Output'];
     } else $Output .= ShowMessage(T('Item not found'), MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
@@ -222 +222 @@
   {
     $Output = '';
-    if($this->System->User->Licence(LICENCE_USER))
+    if ($this->System->User->Licence(LICENCE_USER))
     {
       $Output .= '<form action="?Thread='.$_GET['Thread'].'" method="post">'.
         '<fieldset><legend>'.T('New Forum Message').'</legend>'.
         T('User').': ';
-      if($this->System->User->Licence(LICENCE_USER)) $Output .= '<b>'.$this->System->User->Name.'</b><br />';
+      if ($this->System->User->Licence(LICENCE_USER)) $Output .= '<b>'.$this->System->User->Name.'</b><br />';
         else $Output .= '<input type="text" name="user" /><br />';
       $Output .= T('Message text').': ('.T('You can use').' <a href="http://www.bbcode.org/reference.php">'.T('BB code').'</a>)<br/>'.
@@ -235 +235 @@
         '</form>';
     } else $Output .= ShowMessage(T('You have to be registered for adding message.'), MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
@@ -241 +241 @@
   {
     $Output = '';
-    if($this->System->User->Licence(LICENCE_USER))
+    if ($this->System->User->Licence(LICENCE_USER))
     {
         $Output .= '<form action="?" method="post">'.
             '<fieldset><legend>'.T('New thread').'</legend>'.
             T('User').': ';
-        if($this->System->User->Licence(LICENCE_USER)) $Output .= '<b>'.$this->System->User->Name.'</b><br />';
+        if ($this->System->User->Licence(LICENCE_USER)) $Output .= '<b>'.$this->System->User->Name.'</b><br />';
         else $Output .= '<input type="text" name="user" /><br />';
       $Output .= T('Name of thread').': <br />'.
@@ -254 +254 @@
       '</form>';
     } else $Output .= ShowMessage(T('You have to be registered for adding message.'), MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
@@ -260 +260 @@
   {
     $Output = '';
-    if($this->System->User->Licence(LICENCE_USER))
-    {
-      if(array_key_exists('text', $_POST))
+    if ($this->System->User->Licence(LICENCE_USER))
+    {
+      if (array_key_exists('text', $_POST))
       {
         $Text = $_POST['text'];
-        if(trim($Text) == '') $Output .= ShowMessage('Nelze vložit prázdnou zprávu.', MESSAGE_WARNING);
+        if (trim($Text) == '') $Output .= ShowMessage('Nelze vložit prázdnou zprávu.', MESSAGE_WARNING);
         else
         {
@@ -273 +273 @@
           $DbResult = $this->System->Database->query('SELECT `Text` FROM `'.$Table.'` WHERE 1 '.$Thread.' AND (`User` = "'.
               $this->System->User->Id.'") ORDER BY `Date` DESC LIMIT 1');
-          if($DbResult->num_rows > 0)
+          if ($DbResult->num_rows > 0)
           {
             $DbRow = $DbResult->fetch_assoc();
           } else $DbRow['Text'] = '';
 
-          if($DbRow['Text'] == $Text) $Output .= ShowMessage(T('You can\' add same message twice.'), MESSAGE_WARNING);
+          if ($DbRow['Text'] == $Text) $Output .= ShowMessage(T('You can\' add same message twice.'), MESSAGE_WARNING);
           else
           {
@@ -284 +284 @@
 
               $DbResult = $this->System->Database->query('SELECT * FROM `ForumThread` WHERE ID='.($_GET['Thread']*1).' LIMIT 1');
-              if($DbResult->num_rows > 0)
+              if ($DbResult->num_rows > 0)
               {
                 $this->System->Database->query('INSERT INTO `'.$Table.'` ( `User`, `UserName` , `Text` , `Date` , `IP` , `Thread` ) '.
@@ -300 +300 @@
       $Output .= '<br/>';
     } else $Output .= ShowMessage(T('You have to be registered for adding message.'), MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
@@ -313 +313 @@
       '`User`, `UserName`, `Text`, ( SELECT `Text` FROM `ForumThread` '.
       'WHERE `ID` = `ForumText`.`Thread`) AS `ThreadText` FROM `ForumText` ORDER BY `ID` DESC LIMIT 20');
-    while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
     {
       $Title = mb_substr($DbRow['Text'], 0, $TitleLength);
-      if(mb_strlen($Title) == $TitleLength) $Title .= '...';
+      if (mb_strlen($Title) == $TitleLength) $Title .= '...';
       $Items[] = array
       (
@@ -333 +333 @@
       'Items' => $Items,
     ));
-    return($Output);
+    return $Output;
   }
 }

trunk/Modules/FrontPage/FrontPage.php

@@ -31 +31 @@
     global $Message, $MessageType;
 
-    if(array_key_exists('action', $_GET))
+    if (array_key_exists('action', $_GET))
     {
-      if($_GET['action'] == 'login')
+      if ($_GET['action'] == 'login')
       {
-        if(array_key_exists('LoginUser', $_POST) and array_key_exists('LoginPass', $_POST))
+        if (array_key_exists('LoginUser', $_POST) and array_key_exists('LoginPass', $_POST))
         {
-          if(array_key_exists('StayLogged', $_POST)) $StayLogged = true;
+          if (array_key_exists('StayLogged', $_POST)) $StayLogged = true;
             else $StayLogged = false;
           $this->System->User->Login($_POST['LoginUser'], $_POST['LoginPass'], $StayLogged);
-          if($this->System->User->Role == LICENCE_ANONYMOUS)
+          if ($this->System->User->Role == LICENCE_ANONYMOUS)
           {
             $Message = T('Incorrect name or password');
@@ -55 +55 @@
         }
       } else
-        if($_GET['action'] == 'logout')
+        if ($_GET['action'] == 'logout')
         {
-          if($this->System->User->Role != LICENCE_ANONYMOUS)
+          if ($this->System->User->Role != LICENCE_ANONYMOUS)
           {
             $this->System->ModuleManager->Modules['Log']->WriteLog('Odhlášení', LOG_TYPE_USER);
@@ -78 +78 @@
     $this->System->ModuleManager->Modules['FrontPage']->HandleLoginForm();
     $Output = '';
-    if(isset($Message)) $Output .= ShowMessage($Message, $MessageType);
+    if (isset($Message)) $Output .= ShowMessage($Message, $MessageType);
 
     $Output .= ''.
@@ -90 +90 @@
       '<div class="box-left">'.$this->System->ModuleManager->Modules['Forum']->ShowBox().'</div>'.
       '<div class="box-right">'.$this->System->ModuleManager->Modules['Translation']->ShowBox().'</div>';
-     return($Output);
+     return $Output;
   }
 
@@ -96 +96 @@
   {
     // Cookies have to be used before any text is sent to output
-    if(!array_key_exists('HideWelcome', $_COOKIE)) $_COOKIE['HideWelcome'] = 0;
-    if(isset($_GET['Action']))
+    if (!array_key_exists('HideWelcome', $_COOKIE)) $_COOKIE['HideWelcome'] = 0;
+    if (isset($_GET['Action']))
     {
-      if($_GET['Action'] == 'HideWelcome')
+      if ($_GET['Action'] == 'HideWelcome')
       {
         $_COOKIE['HideWelcome'] = 1;
         setcookie('HideWelcome', $_COOKIE['HideWelcome'], time() + 3600 * 24 * 365);
       }
-      if($_GET['Action'] == 'UnHideWelcome')
+      if ($_GET['Action'] == 'UnHideWelcome')
       {
         $_COOKIE['HideWelcome'] = 0;
@@ -111 +111 @@
     }
 
-    if(isset($_COOKIE['HideWelcome']) and ($_COOKIE['HideWelcome'] == 1))
+    if (isset($_COOKIE['HideWelcome']) and ($_COOKIE['HideWelcome'] == 1))
     {
       $Action = '<a href="?Action=UnHideWelcome">'.T('Show welcome').'</a>';
@@ -122 +122 @@
 
     // Echo text even if it is hidden because of caching by external searching engines
-    return('<div style="'.$HideWelcome.'">'.
+    return '<div style="'.$HideWelcome.'">'.
       '<div id="bannertitle">'.$this->System->Config['Web']['Title'].'</div>'.
       T('Open web system for translation texts from game World of Warcraft (WoW).<br/>'.
@@ -133 +133 @@
       '<li>Thanks for sophisticated system of selectable exports you can download any part of translation, even just quests. And so exclude translation of items, creatures and others.</li>'.
       '<li>Texts can be translated to multiple languages, e.g. Czech and Slovak.</li>'.
-      '</ul>').'</div>'.$Action);
+      '</ul>').'</div>'.$Action;
   }
 }

trunk/Modules/Import/Import.php

@@ -49 +49 @@
     $Columns = '';
     //$Values = '';
-    foreach($this->Group['Items'] as $GroupItem)
+    foreach ($this->Group['Items'] as $GroupItem)
     {
       $Columns .= ', `'.$GroupItem['Column'].'` ';
@@ -61 +61 @@
     $DbResultAfter  = $this->System->Database->query('SELECT `VersionEnd`,`VersionStart`, `ID`, `Entry`, '.$Columns.' FROM `'.$this->Group['TablePrefix'].'` WHERE '.$Where.' AND `VersionStart` >= '.$this->Version['BuildNumber'].' ORDER BY `VersionStart` LIMIT 1');
 
-    if(($DbResultMiddle->num_rows > 0) or ($DbResultBefore->num_rows > 0) or ($DbResultAfter->num_rows > 0))
+    if (($DbResultMiddle->num_rows > 0) or ($DbResultBefore->num_rows > 0) or ($DbResultAfter->num_rows > 0))
     {
       // Update existed text
@@ -68 +68 @@
       $DbRowBefore = $DbResultBefore->fetch_assoc();
 
-      if($this->HaveSameText($this->Group, $DbRowBefore, $Value) and ($DbResultBefore->num_rows > 0) )
+      if ($this->HaveSameText($this->Group, $DbRowBefore, $Value) and ($DbResultBefore->num_rows > 0) )
       {
           $insert = false;
@@ -78 +78 @@
 
       } else
-      if($this->HaveSameText($this->Group, $DbRowAfter, $Value) and ($DbResultAfter->num_rows > 0))
+      if ($this->HaveSameText($this->Group, $DbRowAfter, $Value) and ($DbResultAfter->num_rows > 0))
       {
           $insert = false;
@@ -104 +104 @@
 
             //if [DEPRECATED] do not import
-        foreach($this->Group['Items'] as $GroupItem) {
+        foreach ($this->Group['Items'] as $GroupItem) {
           if (false !== strpos($Value[$GroupItem['Column']],'[DEPRECATED')) {
             echo('d '.$DbRowBefore['Entry'].' ');
@@ -113 +113 @@
         if ($insert) {
           $insert = false;
-          foreach($this->Group['Items'] as $GroupItem)
+          foreach ($this->Group['Items'] as $GroupItem)
           {
             if ($Value[$GroupItem['Column']] <> '') $insert = true;
@@ -128 +128 @@
           $Columns = '`Entry`, `Language`, `VersionStart`, `VersionEnd`';
           $Values = $Value['Entry'].', 0, '.$this->Version['BuildNumber'].', '.$this->Version['BuildNumber'];
-          foreach($this->Group['Items'] as $GroupItem)
+          foreach ($this->Group['Items'] as $GroupItem)
           {
             $Columns .= ', `'.$GroupItem['Column'].'`';
@@ -150 +150 @@
     {
       // Insert new text
-      if(is_numeric($Value[$this->Group['PrimaryKeyItem']])) $Value['Entry'] = $Value[$this->Group['PrimaryKeyItem']];
+      if (is_numeric($Value[$this->Group['PrimaryKeyItem']])) $Value['Entry'] = $Value[$this->Group['PrimaryKeyItem']];
       else
       {
@@ -156 +156 @@
         $Value['Entry'] = 1;
         $DbResult = $this->System->Database->query('SELECT MAX(`Entry`) FROM `'.$this->Group['TablePrefix'].'`');
-        if($DbResult->num_rows > 0)
+        if ($DbResult->num_rows > 0)
         {
           $DbRow = $DbResult->fetch_row();
@@ -165 +165 @@
       $Values = $Value['Entry'].', 0, '.$this->Version['BuildNumber'].', '.$this->Version['BuildNumber'];
       $insert = false;
-      foreach($this->Group['Items'] as $GroupItem)
+      foreach ($this->Group['Items'] as $GroupItem)
       {
         $Columns .= ', `'.$GroupItem['Column'].'`';
@@ -188 +188 @@
     $Output = 'Načítání textů z LUA souboru...';
 
-    if(($this->Group['LuaFileName'] != '') and ($this->Group['TablePrefix'] != ''))
+    if (($this->Group['LuaFileName'] != '') and ($this->Group['TablePrefix'] != ''))
     {
 
         $Output .= '<br />'.$this->Group['Name'].'<br />';
-      //  if($this->Group['LastVersion'] < $this->Version['BuildNumber'] + 1)
+      //  if ($this->Group['LastVersion'] < $this->Version['BuildNumber'] + 1)
         {
           $File = new FileStream();
@@ -199 +199 @@
           $this->NewItemCount = 0;
           $Count = 0;
-          while(!$File->EOF())
+          while (!$File->EOF())
           {
             $Line = $File->ReadLine();
-            if(strpos($Line, '=') !== false)
+            if (strpos($Line, '=') !== false)
             {
               $LineParts = explode('=', $Line, 2);
               $Value['ShortCut'] = trim($LineParts[0]);
               $Line = trim($LineParts[1]);
-              if($Line[0] == '"')
+              if ($Line[0] == '"')
               {
                 // Quoted string value
@@ -234 +234 @@
       } else $Output .= ShowMessage('Není definováno jméno zdrojového souboru', MESSAGE_CRITICAL);
     $Output .= ShowMessage('Dokončeno.');
-    return ($Output);
+    return $Output;
   }
 
@@ -243 +243 @@
     $TranslationTree = $this->System->ModuleManager->Modules['Translation']->GetTranslationTree();
     $Output = '<br /><br />Začínám se synchronizací VersionEnd u přeložených textů<br />';
-    foreach($TranslationTree as $Group)
+    foreach ($TranslationTree as $Group)
     {
       $Output .= '<br />'.$Group['Name'].' ';
       $do = true;
-      while($do)
+      while ($do)
       {
       $DbResult = $this->System->Database->query('SELECT `gs_tran`.`ID`, '.
@@ -258 +258 @@
         '`gs_tran`.`VersionEnd` <> `gs_orig`.`VersionEnd` OR `gs_tran`.`VersionStart` <> `gs_orig`.`VersionStart`');
         $do = ($DbResult->num_rows > 0);
-        while($DbRow = $DbResult->fetch_assoc())
+        while ($DbRow = $DbResult->fetch_assoc())
         {
           echo('`');
@@ -267 +267 @@
       $Output .= '<strong>Dokončeno.</strong>';
     }
-    return($Output);
+    return $Output;
   }
 
@@ -273 +273 @@
   {
     $result = true;
-    foreach($Group['Items'] as $GroupItem)
+    foreach ($Group['Items'] as $GroupItem)
     {
       $old = $DbRow2[$GroupItem['Column']];
@@ -324 +324 @@
         }
 
-      if(($old == 'null') or ($old == 'NULL')) $old = '';
-      if(($new == 'null') or ($new == 'NULL')) $new = '';
-
-      if(($new <> '') and ($old <> $new) and ($GroupItem['Column'] <> 'Comment'))
+      if (($old == 'null') or ($old == 'NULL')) $old = '';
+      if (($new == 'null') or ($new == 'NULL')) $new = '';
+
+      if (($new <> '') and ($old <> $new) and ($GroupItem['Column'] <> 'Comment'))
       {
         //  echo $old.'X'.$new;
@@ -339 +339 @@
     }
 
-    return($result);
+    return $result;
   }
 
@@ -348 +348 @@
     $TranslationTree = $this->System->ModuleManager->Modules['Translation']->GetTranslationTree();
     $Output = 'Načítání textů z DBC souboru...';
-    if(($this->Group['DBCFileName'] != '') and ($this->Group['TablePrefix'] != ''))
+    if (($this->Group['DBCFileName'] != '') and ($this->Group['TablePrefix'] != ''))
     {
       $Output .= '<br />'.$this->Group['Name'].'<br />';
@@ -357 +357 @@
       $ColumnIndexes = array();
       $ColumnFormat = array();
-      while($DbRow = $DbResult->fetch_assoc())
+      while ($DbRow = $DbResult->fetch_assoc())
       {
         $ColumnFormat[$DbRow['ColumnIndex']] = FORMAT_STRING;
@@ -369 +369 @@
       $Count = 0;
 
-      for($I = 0; $I < $ItemCount; $I++)
-      {
-        foreach($this->Group['Items'] as $GroupItem)
-        if(array_key_exists($GroupItem['Id'], $ColumnIndexes))
+      for ($I = 0; $I < $ItemCount; $I++)
+      {
+        foreach ($this->Group['Items'] as $GroupItem)
+        if (array_key_exists($GroupItem['Id'], $ColumnIndexes))
         {
           $Value[$GroupItem['Column']] = addslashes($DBCFile->GetString($I, $ColumnIndexes[$GroupItem['Id']]));
@@ -380 +380 @@
         $Columns = explode(',', $this->Group['DBCIndex']);
         $ColumnValue = '';
-        foreach($Columns as $Column)
+        foreach ($Columns as $Column)
           $ColumnValue .= '_'.$DBCFile->GetUint($I, $Column);
         $ColumnValue = substr($ColumnValue, 1);
@@ -391 +391 @@
     }
     $Output .= '<strong>Dokončeno.</strong>';
-    return($Output);
+    return $Output;
   }
 
@@ -400 +400 @@
     $this->Group = $TranslationTree[$GroupId];
 
-    if($this->Group['SourceType'] == 'dbc') $Output = $this->ImportDBC();
-    else if($this->Group['SourceType'] == 'sql') $Output = $this->ImportSQL();
-    else if($this->Group['SourceType'] == 'lua') $Output = $this->ImportLUA();
+    if ($this->Group['SourceType'] == 'dbc') $Output = $this->ImportDBC();
+    else if ($this->Group['SourceType'] == 'sql') $Output = $this->ImportSQL();
+    else if ($this->Group['SourceType'] == 'lua') $Output = $this->ImportLUA();
     else $Output = ShowMessage('Neznámý typ zdroje pro import', MESSAGE_CRITICAL);
     $Output .= $this->UpdateTranslated();
-    return($Output);
+    return $Output;
   }
 
@@ -420 +420 @@
     $folow_structure = false;
     $i = 0;
-    while((!$File->EOF()))
+    while ((!$File->EOF()))
     {
       $Line = $File->ReadLine();
       // Struktura
-      if(strpos($Line, 'CREATE TABLE `'.$this->Group['MangosTable'].'`') !== false)
+      if (strpos($Line, 'CREATE TABLE `'.$this->Group['MangosTable'].'`') !== false)
       {
         $Line = '';
@@ -430 +430 @@
         $i = 0;
       }
-      if((strpos($Line, ';') !== false) and ($folow_structure == true))
+      if ((strpos($Line, ';') !== false) and ($folow_structure == true))
       {
         $folow_structure = false;
@@ -437 +437 @@
         //  echo ('<br /><br />');
       }
-      if(($folow_structure == true) and ($Line != ''))
+      if (($folow_structure == true) and ($Line != ''))
       {
         $str = substr($Line, 0, strpos($Line, '`'));
         $Line = substr($Line, strpos($Line, '`') + 1);
         $Line = substr($Line, 0, strpos($Line, '`'));
-        if(strlen($str) < 3) $structure[$i] = $Line;
+        if (strlen($str) < 3) $structure[$i] = $Line;
         $i++;
       }
 
       //data
-      if((strpos($Line, 'INSERT INTO `'.$this->Group['MangosTable'].'`') !== false) and (isset($structure)))
+      if ((strpos($Line, 'INSERT INTO `'.$this->Group['MangosTable'].'`') !== false) and (isset($structure)))
       {
         while ((strpos($Line, ');') === false) or ($File->EOF()))
@@ -461 +461 @@
         $value_buff = '';
         $Value = '';
-        foreach($LineParts as $LinePart)
+        foreach ($LineParts as $LinePart)
         {
 
           unset($Value, $value_buff);
-          foreach($structure as $i => $column)
+          foreach ($structure as $i => $column)
           {
             if (substr($LinePart, 0, 1) != "'")
@@ -475 +475 @@
               $LinePart = substr($LinePart, 1);
               $value_buff = substr($LinePart, 0, strpos($LinePart, "'"));
-              while(substr($value_buff, strlen($value_buff) - 1, 1) == "\\")
+              while (substr($value_buff, strlen($value_buff) - 1, 1) == "\\")
               {
                 $str = substr($LinePart, strlen($value_buff));
@@ -484 +484 @@
               $LinePart = substr($LinePart, strlen($value_buff) + 2);
             }
-            if(($value_buff != 'null') and ($value_buff != 'NULL'))
+            if (($value_buff != 'null') and ($value_buff != 'NULL'))
             {
               $str = '';
-              while(substr($value_buff, strlen($value_buff) - 1,1) == " ")
+              while (substr($value_buff, strlen($value_buff) - 1,1) == " ")
               {
                 $value_buff = substr($value_buff, 0, strlen($value_buff) - 1);
@@ -493 +493 @@
               }
               $str2 = '';
-              while(substr($value_buff, 0, 1) == ' ')
+              while (substr($value_buff, 0, 1) == ' ')
               {
                 $value_buff = substr($value_buff, 1, strlen($value_buff) - 1);
@@ -505 +505 @@
             //  echo ($column.'-"'.$Value[$column].'"<br>');
           }
-          foreach($this->Group['Items'] as $GroupItem)
+          foreach ($this->Group['Items'] as $GroupItem)
           {
-            if($GroupItem['MangosColumn'] != '')
+            if ($GroupItem['MangosColumn'] != '')
               if (isset($Value[$GroupItem['MangosColumn']]))
                 $Value[$GroupItem['Column']] = $Value[$GroupItem['MangosColumn']];
@@ -519 +519 @@
           $Columns = explode(',', $this->Group['MangosTableIndex']);
           $ColumnValue = '';
-          foreach($Columns as $Column)
+          foreach ($Columns as $Column)
             $ColumnValue .= '_'.$Value[$Column];
           $ColumnValue = substr($ColumnValue, 1);
@@ -530 +530 @@
     $Output = '<br />Celkem: '.$Count.'  Nových: '.$this->NewItemCount.'<br />';
     $this->UpdateLastVersion();
-    return($Output);
+    return $Output;
   }
 

trunk/Modules/Import/Manage.php

@@ -19 +19 @@
     '<li>Po provedení importu je potřeba několikrát spustit skript na aktualizaci verze u překladu. Je potřeba ho provádět opakovaně dokud nezmizí tečky označující, že byly provedeny změny.</li>'.
     '</ol>';
-    return($Output);
+    return $Output;
   }
 
@@ -26 +26 @@
     global $System;
 
-    if(array_key_exists('id', $_GET))
+    if (array_key_exists('id', $_GET))
     {
       $Output = '<div style="font-size: xx-small;">';
@@ -38 +38 @@
       $Output .= '</div>';
     } else $Output = ShowMessage('Nebylo zadáno id skupiny.', MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
@@ -68 +68 @@
 
     $DbResult = $this->System->Database->query('SELECT * FROM `Group`'.$Order['SQL'].$PageList['SQLLimit']);
-    while($Group = $DbResult->fetch_assoc())
+    while ($Group = $DbResult->fetch_assoc())
     {
       $Output .= '<tr><td>'.T($Group['Name']).'</td>'.
         '<td>'.$Group['SourceType'].'</td><td>';
-      if($Group['MangosTable'] != '') $Output .= $Group['MangosTable'].'.sql ';
-      if($Group['DBCFileName'] != '') $Output .= $Group['DBCFileName'].'.dbc ';
-      if($Group['LuaFileName'] != '') $Output .= $Group['LuaFileName'].'.lua ';
+      if ($Group['MangosTable'] != '') $Output .= $Group['MangosTable'].'.sql ';
+      if ($Group['DBCFileName'] != '') $Output .= $Group['DBCFileName'].'.dbc ';
+      if ($Group['LuaFileName'] != '') $Output .= $Group['LuaFileName'].'.lua ';
       $Output .= '</td>'.
         '<td><a title="Změny po posledním importu u vybrané překladové skupiny" href="../log/?group='.$Group['Id'].'&amp;type=11">'.HumanDate($Group['LastImport']).'</a></td>'.
@@ -82 +82 @@
     }
     $Output .= '</table>';
-    return($Output);
+    return $Output;
   }
 
@@ -93 +93 @@
     $Output .= $Import->UpdateTranslated();
     $Output .= '</div>';
-    return($Output);
+    return $Output;
   }
 
@@ -100 +100 @@
     $this->Title = T('Import');
     $Output = '';
-    if($this->System->User->Licence(LICENCE_ADMIN))
+    if ($this->System->User->Licence(LICENCE_ADMIN))
     {
-    if(array_key_exists('action', $_GET))
+    if (array_key_exists('action', $_GET))
     {
-      if($_GET['action'] == 'instructions') $Output .= $this->ShowInstructions();
-      else if($_GET['action'] == 'importgroup') $Output .= $this->ShowImportGroup();
-      else if($_GET['action'] == 'update_translated') $Output .= $this->UpdateTranslated();
+      if ($_GET['action'] == 'instructions') $Output .= $this->ShowInstructions();
+      else if ($_GET['action'] == 'importgroup') $Output .= $this->ShowImportGroup();
+      else if ($_GET['action'] == 'update_translated') $Output .= $this->UpdateTranslated();
       else $Output .= $this->ShowMenu();
     } else $Output .= $this->ShowMenu();
     } else $Output .= ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 }

trunk/Modules/Import/cmd.php

@@ -13 +13 @@
 $Output = '';
 
-if(defined('STDIN') == false)
+if (defined('STDIN') == false)
 {
   $Output = T('Access denied');
@@ -19 +19 @@
 }
 
-foreach($_SERVER['argv'] as $parameter)
+foreach ($_SERVER['argv'] as $parameter)
 {
-  if(strpos($parameter, '=') !== false)
+  if (strpos($parameter, '=') !== false)
   {
     $index = substr($parameter, 0, strpos($parameter, '='));
@@ -30 +30 @@
 }
 
-if(!array_key_exists('id', $_GET))
+if (!array_key_exists('id', $_GET))
 {
   $Output .= '
@@ -49 +49 @@
   $Output .= '   version=<version> - nastaví verzi importu default: '.$System->Config['Web']['GameVersion'].'<br /><br />';
       $Output .= '    <id_import_group>:';
-    foreach($TranslationTree as $Group)
+    foreach ($TranslationTree as $Group)
     {
       $Output .= '<br />    '.$Group['Id'].' ';

trunk/Modules/Import/generatecodeXML.php

@@ -30 +30 @@
 
 $files = scandir($verze);
-foreach($files as $file)
+foreach ($files as $file)
 {
   $end = substr($file, strlen($file) - 3);
-  if($end == 'xml')
+  if ($end == 'xml')
   {
     echo('<br />--'.$file.'<br /><br />');

trunk/Modules/Info/Info.php

@@ -69 +69 @@
   '</ul><br />'.
   '<br />';
-  return($Output);
+  return $Output;
   }
 }
@@ -94 +94 @@
 '<iframe width="420" height="315" src="https://www.youtube.com/embed/6EhBFv59syk" frameborder="0" allowfullscreen></iframe><br/>'.
 '<img src="'.$this->System->Link('/images/promotion.bmp').'" width="800" alt="addon-obr">';
-    return($Output);
+    return $Output;
   }
 }

trunk/Modules/Log/Log.php

@@ -33 +33 @@
   function WriteLog($Text, $Type)
   {
-    if(isset($this->System->User) and !is_null($this->System->User->Id))
+    if (isset($this->System->User) and !is_null($this->System->User->Id))
       $UserId = $this->System->User->Id;
       else $UserId = 'NULL';
@@ -60 +60 @@
   global $System, $User;
 
-  if(isset($User) and !is_null($User->Id)) $UserId = $User->Id;
+  if (isset($User) and !is_null($User->Id)) $UserId = $User->Id;
     else $UserId = 'NULL';
   $Query = 'INSERT INTO `Log` ( `User` , `Type` , `Text` , `Date` , `IP`, `URL` ) '.
@@ -75 +75 @@
     $Output = '';
     $Items = array();
-    if(array_key_exists('type', $_GET)) $Where = ' WHERE `Type` = "'.($_GET['type'] * 1).'"';
+    if (array_key_exists('type', $_GET)) $Where = ' WHERE `Type` = "'.($_GET['type'] * 1).'"';
       else $Where = '';
     $sql = 'SELECT *, UNIX_TIMESTAMP(`Date`) AS `TimeCreate`, (SELECT `User`.`Name` FROM `User` WHERE `User`.`ID` = `Log`.`User`) AS `UserName`, `Date` FROM `Log`'.
       $Where.' ORDER BY `Date` DESC LIMIT 100';
     $DbResult = $this->System->Database->query($sql);
-    while($Line = $DbResult->fetch_assoc())
+    while ($Line = $DbResult->fetch_assoc())
     {
       $DbResult2 = $this->System->Database->query('SELECT * FROM `LogType` WHERE `Id`='.$Line['Type']);
       $LogType = $DbResult2->fetch_assoc();
 
-      if($Line['Type'] == LOG_TYPE_ERROR) $Line['Text'] = htmlspecialchars($Line['Text']);
+      if ($Line['Type'] == LOG_TYPE_ERROR) $Line['Text'] = htmlspecialchars($Line['Text']);
       $Line['Text'] = str_replace("\n", '<br>', $Line['Text']);
 
@@ -106 +106 @@
       'Items' => $Items,
     ));
-    return($Output);
+    return $Output;
   }
 
   function Show()
   {
-    if(array_key_exists('a', $_POST)) $Action = $_POST['a'];
-      else if(array_key_exists('a', $_GET)) $Action = $_GET['a'];
+    if (array_key_exists('a', $_POST)) $Action = $_POST['a'];
+      else if (array_key_exists('a', $_GET)) $Action = $_GET['a'];
       else $Action = '';
-    if($Action == 'delerrlog') $Output = $this->DeleteErrorLog();
+    if ($Action == 'delerrlog') $Output = $this->DeleteErrorLog();
     else $Output = $this->ShowList();
-    return($Output);
+    return $Output;
   }
 
@@ -125 +125 @@
     $this->Title = T('System log');
     $Output = '';
-    if(array_key_exists('type', $_GET)) $_SESSION['type'] = $_GET['type'] * 1;
-    else if(!array_key_exists('type', $_SESSION)) $_SESSION['type'] = '';
-
-    if(array_key_exists('group', $_GET)) $_SESSION['group'] = $_GET['group'];
-
-    if($_SESSION['type'] != '') $WhereType = ' (`Type`='.$_SESSION['type'].')';
+    if (array_key_exists('type', $_GET)) $_SESSION['type'] = $_GET['type'] * 1;
+    else if (!array_key_exists('type', $_SESSION)) $_SESSION['type'] = '';
+
+    if (array_key_exists('group', $_GET)) $_SESSION['group'] = $_GET['group'];
+
+    if ($_SESSION['type'] != '') $WhereType = ' (`Type`='.$_SESSION['type'].')';
       else $WhereType = '1=1';
 
@@ -138 +138 @@
 
     // Show category filter
-    if($this->System->User->Licence(LICENCE_MODERATOR))
+    if ($this->System->User->Licence(LICENCE_MODERATOR))
     {
       $Output = '<strong>'.T('Filter').':</strong>';
         $Item = '<a href="'.$this->System->Link('/log/?type=').'" title="Bez filtrování">'.T('All').'</a>';
-      if($_SESSION['type'] == '') $Item = '<strong>'.$Item.'</strong>';
+      if ($_SESSION['type'] == '') $Item = '<strong>'.$Item.'</strong>';
       $Output .= ' '.$Item;
       $DbResult = $this->System->Database->query('SELECT * FROM `LogType`');
-      while($LogType = $DbResult->fetch_assoc())
+      while ($LogType = $DbResult->fetch_assoc())
       {
         $Item = '<a href="'.$this->System->Link('/log/?type='.$LogType['Id']).'" style="color:'.
           $LogType['Color'].'" title="'.$LogType['Name'].'">'.T($LogType['Name']).'</a>';
-        if($_SESSION['type'] == $LogType['Id']) $Item = '<strong>'.$Item.'</strong>';
+        if ($_SESSION['type'] == $LogType['Id']) $Item = '<strong>'.$Item.'</strong>';
         $Output .= ' '.$Item;
       }
@@ -155 +155 @@
      $Output .= '<br /><br />';
 
-    if(array_key_exists('type', $_SESSION)) $Where = ' WHERE '.$WhereType;
+    if (array_key_exists('type', $_SESSION)) $Where = ' WHERE '.$WhereType;
     else
     {
-      if(array_key_exists('group', $_SESSION)) $Where = ' WHERE `Text` LIKE "%'.$TranslationTree[$_SESSION['group']]['Name'].'%"';
+      if (array_key_exists('group', $_SESSION)) $Where = ' WHERE `Text` LIKE "%'.$TranslationTree[$_SESSION['group']]['Name'].'%"';
         else $Where = '';
     }
-    //if(($Where != '') and (array_key_exists('group', $_SESSION))) $Where .= ' AND text LIKE "%'.$TranslationTree[$_SESSION['group']]['Name'].'%"';
+    //if (($Where != '') and (array_key_exists('group', $_SESSION))) $Where .= ' AND text LIKE "%'.$TranslationTree[$_SESSION['group']]['Name'].'%"';
 
     $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `Log` '.$Where);
@@ -172 +172 @@
       array('Name' => 'Date', 'Title' => T('Time')),
     );
-    if($_SESSION['type'] == '') $TableColumns[] =
+    if ($_SESSION['type'] == '') $TableColumns[] =
       array('Name' => 'LogName', 'Title' => T('Type'));
     $TableColumns = array_merge($TableColumns, array(
@@ -187 +187 @@
       '(SELECT `User`.`Name` FROM `User` WHERE `User`.`ID` = `Log`.`User`) AS `UserName` FROM `Log` LEFT JOIN `LogType` ON `LogType`.`Id`=`Log`.`Type` '.$Where.$Order['SQL'].$PageList['SQLLimit'];
     $DbResult = $this->System->Database->query($sql);
-    while($Line = $DbResult->fetch_assoc())
-    {
-      if($Line['Type'] == LOG_TYPE_ERROR) $Line['Text'] = htmlspecialchars($Line['Text']);
+    while ($Line = $DbResult->fetch_assoc())
+    {
+      if ($Line['Type'] == LOG_TYPE_ERROR) $Line['Text'] = htmlspecialchars($Line['Text']);
       $Line['Text'] = str_replace("\n", '<br/>', $Line['Text']);
       $Output .= '<tr><td>'.$Line['Date'].'</td>';
-      if($_SESSION['type'] == '') $Output .= '<td>'.T($Line['LogName']).'</td>';
+      if ($_SESSION['type'] == '') $Output .= '<td>'.T($Line['LogName']).'</td>';
       $Output .= '<td><span style="color: '.$Line['LogColor'].'">'.$Line['Text'].'</span></td>'.
       '<td><a href="'.$this->System->Link('/user/?user='.$Line['User']).'">'.$Line['UserName'].'</a></td>'.
@@ -200 +200 @@
     $Output .= '</table>'.
       $PageList['Output'];
-      if($this->System->User->Licence(LICENCE_ADMIN))
+      if ($this->System->User->Licence(LICENCE_ADMIN))
       {
         $Output .= '<div>'.T('Remove').': <a href="'.$this->System->Link('/log/?a=delerrlog&amp;type='.LOG_TYPE_ERROR).'">'.T('Error logs').'</a> '.
@@ -207 +207 @@
     } else $Output .= ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
 
-    return($Output);
+    return $Output;
   }
 
   function DeleteErrorLog()
   {
-    if($this->System->User->Licence(LICENCE_ADMIN) and
+    if ($this->System->User->Licence(LICENCE_ADMIN) and
     (($_GET['type'] == LOG_TYPE_ERROR) or ($_GET['type'] == LOG_TYPE_PAGE_NOT_FOUND)))
     {
@@ -223 +223 @@
       $Output = ShowMessage('Smazáno všech '.$DbRow[0].' záznamů z '.$LogType['Description'].'.');
       $Output .= $this->ShowList();
-      return($Output);
+      return $Output;
     } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
   }

trunk/Modules/News/News.php

@@ -35 +35 @@
     $DbResult = $this->Database->query('SELECT `News`.`Time`, `User`.`Name`, `News`.`Text`,`News`.`Title`, `News`.`Id` '.
       ' FROM `News` JOIN `User` ON `User`.`ID` = `News`.`User` ORDER BY `Time` DESC LIMIT '.$Count);
-    while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
     {
       $Output .= '<h4><a href="'.$this->System->Link('/news/?a=item&amp;i='.$DbRow['Id']).'">'.$DbRow['Title'].'</a> ('.HumanDate($DbRow['Time']).')</h4>'.
@@ -41 +41 @@
     }
     $Output .= '</div></div>';
-    return($Output);
+    return $Output;
   }
 
@@ -48 +48 @@
     $this->RSSChannels[$Channel['Channel']] = $Channel;
 
-    if(is_null($Pos)) $this->RSSChannelsPos[] = $Channel['Channel'];
+    if (is_null($Pos)) $this->RSSChannelsPos[] = $Channel['Channel'];
     else {
       array_splice($this->RSSChannelsPos, $Pos, 0, $Channel['Channel']);
@@ -57 +57 @@
   {
     $Output = '';
-    foreach($this->RSSChannels as $Channel)
+    foreach ($this->RSSChannels as $Channel)
     {
-      if($this->System->User->Licence($Channel['Permission']))
+      if ($this->System->User->Licence($Channel['Permission']))
         $Output .= ' <link rel="alternate" title="'.$Channel['Title'].'" href="'.
           $this->System->Link('/rss/?channel='.$Channel['Channel']).'" type="application/rss+xml" />';
     }
-    return($Output);
+    return $Output;
   }
 }
@@ -72 +72 @@
   {
     $this->Title = T('News');
-    if(array_key_exists('a', $_POST)) $Action = $_POST['a'];
-      else if(array_key_exists('a', $_GET)) $Action = $_GET['a'];
+    if (array_key_exists('a', $_POST)) $Action = $_POST['a'];
+      else if (array_key_exists('a', $_GET)) $Action = $_GET['a'];
       else $Action = '';
-    if($Action == 'add2') $Output = $this->SaveNew();
-    else if($Action == 'add') $Output = $this->ShowAddForm();
-    else if($Action == 'item') $Output = $this->ShowItem();
+    if ($Action == 'add2') $Output = $this->SaveNew();
+    else if ($Action == 'add') $Output = $this->ShowAddForm();
+    else if ($Action == 'item') $Output = $this->ShowItem();
     else $Output = $this->ShowList();
-    return($Output);
+    return $Output;
   }
 
@@ -89 +89 @@
 
     $Output = '<h3>'.T('News').'</h3>';
-    if($this->System->User->Licence(LICENCE_ADMIN))
+    if ($this->System->User->Licence(LICENCE_ADMIN))
       $Output .= ' <a href="?a=add">'.T('Add').'</a>';
     $Output .= $PageList['Output'];
@@ -95 +95 @@
     $DbResult = $this->System->Database->query('SELECT `News`.`Time`, `News`.`Text`, `News`.`Title`, `News`.`Id`, '.
         '`User`.`Name` AS `User` FROM `News` JOIN `User` ON `User`.`Id`=`News`.`User` ORDER BY `News`.`Time` DESC '.$PageList['SQLLimit']);
-    while($Line = $DbResult->fetch_assoc())
+    while ($Line = $DbResult->fetch_assoc())
     {
       $Output .= '<h4><a href="?a=item&amp;i='.$Line['Id'].'">'.$Line['Title'].'</a> ('.HumanDate($Line['Time']).')</h4><div>'.$Line['Text'].' ('.$Line['User'].')</div>';
     }
     $Output .= '</div>'.$PageList['Output'];
-    return($Output);
+    return $Output;
   }
 
   function ShowItem()
   {
-    if(array_key_exists('i', $_GET))
+    if (array_key_exists('i', $_GET))
     {
       $Output = '<h3>'.T('News').'</h3>';
       $DbResult = $this->System->Database->query('SELECT `News`.`Time`, `News`.`Text`, `News`.`Title`, `News`.`Id`, '.
         '`User`.`Name` AS `User` FROM `News` JOIN `User` ON `User`.`Id`=`News`.`User` WHERE `News`.`Id` = '.($_GET['i'] * 1));
-      if($DbResult->num_rows == 1)
+      if ($DbResult->num_rows == 1)
       {
         $Line = $DbResult->fetch_assoc();
@@ -117 +117 @@
     } else $Output = ShowMessage(T('Item not found'), MESSAGE_CRITICAL);
     $Output .= '<br/><a href="'.$this->System->Link('/news/').'">'.T('All news').'</a>';
-    return($Output);
+    return $Output;
   }
 
   function ShowAddForm()
   {
-    if($this->System->User->Licence(LICENCE_ADMIN))
+    if ($this->System->User->Licence(LICENCE_ADMIN))
     {
       $Output = '<form action="?" method="POST">'.
@@ -134 +134 @@
     } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
     $Output .= $this->ShowList();
-    return($Output);
+    return $Output;
   }
 
   function SaveNew()
   {
-    if($this->System->User->Licence(LICENCE_ADMIN))
+    if ($this->System->User->Licence(LICENCE_ADMIN))
     {
-      if(array_key_exists('text', $_POST) and array_key_exists('title', $_POST))
+      if (array_key_exists('text', $_POST) and array_key_exists('title', $_POST))
       {
         $querty = 'INSERT INTO `News` (`Title`, `Time` ,`User` ,`Text`) VALUES ( "'.$_POST['title'].'", NOW( ) , '.
@@ -151 +151 @@
       } else $Output = ShowMessage(T('Data not specified'), MESSAGE_CRITICAL);
     } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
@@ -160 +160 @@
       '`News`.`Title`, `News`.`Time`, `User`.`Name`, `News`.`Text`, `News`.`Id` '.
       'FROM `News` JOIN `User` ON `User`.`ID` = `News`.`User` ORDER BY `Time` DESC LIMIT 10');
-    while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
     {
      $Items[] = array
@@ -178 +178 @@
       'Items' => $Items,
     ));
-    return($Output);
+    return $Output;
   }
 }

trunk/Modules/News/RSS.php

@@ -15 +15 @@
       "    <pubDate>".date('r')."</pubDate>\n".
       "    <ttl>20</ttl>\n";
-  foreach($Data['Items'] as $Item)
+  foreach ($Data['Items'] as $Item)
   {
     $Result .= "    <item>\n".
@@ -26 +26 @@
   $Result .= "  </channel>\n".
       "</rss>";
-  return($Result);
+  return $Result;
 }
 
@@ -35 +35 @@
     $this->RawPage = true;
 
-    if(array_key_exists('channel', $_GET)) $ChannelName = $_GET['channel'];
+    if (array_key_exists('channel', $_GET)) $ChannelName = $_GET['channel'];
       else $ChannelName = '';
-    if(array_key_exists('token', $_GET)) $Token = $_GET['token'];
+    if (array_key_exists('token', $_GET)) $Token = $_GET['token'];
       else $Token = '';
-    if(array_key_exists($ChannelName, $this->System->ModuleManager->Modules['News']->RSSChannels))
+    if (array_key_exists($ChannelName, $this->System->ModuleManager->Modules['News']->RSSChannels))
     {
       $Channel = $this->System->ModuleManager->Modules['News']->RSSChannels[$ChannelName];
-      if($this->System->User->Licence($Channel['Permission']) or
+      if ($this->System->User->Licence($Channel['Permission']) or
       $this->System->User->CheckToken($Channel['Permission'], $Token))
       {
-        if(is_string($Channel['Callback'][0]))
+        if (is_string($Channel['Callback'][0]))
         {
           $Class = new $Channel['Callback'][0]($this->System);
@@ -53 +53 @@
       } else $Output = T('Access denied');
     } else $Output = 'Nezadán žádný kanál';
-    return($Output);
+    return $Output;
   }
 }

trunk/Modules/Redirection/Redirection.php

@@ -24 +24 @@
     Header($_SERVER['SERVER_PROTOCOL'].' 301 Moved Permanently');
     Header('Location: '.$Location);
-    return('<h3 align="center">'.T('').'</h3>');
+    return '<h3 align="center">'.T('').'</h3>';
   }
 
@@ -30 +30 @@
   {
     $Output = '';
-    if(count($this->System->PathItems) > 0)
+    if (count($this->System->PathItems) > 0)
     {
-      if($this->System->PathItems[0] == 'user.php') $Output = $this->Redirect($this->System->Link('/user/'));
-      if($this->System->PathItems[0] == 'team.php') $Output = $this->Redirect($this->System->Link('/team/'));
-      if($this->System->PathItems[0] == 'version.php') $Output = $this->Redirect($this->System->Link('/client-version/'));
-      if($this->System->PathItems[0] == 'phpBB3') $Output = $this->Redirect($this->System->Link('/forum/'));
-      if($this->System->PathItems[0] == 'phpbb3') $Output = $this->Redirect($this->System->Link('/forum/'));
-      if($this->System->PathItems[0] == 'statistic.php') $Output = $this->Redirect($this->System->Link('/progress/'));
-      if($this->System->PathItems[0] == 'register.php') $Output = $this->Redirect($this->System->Link('/registration/'));
-      if($this->System->PathItems[0] == 'registrace.php') $Output = $this->Redirect($this->System->Link('/registration/'));
-      if($this->System->PathItems[0] == 'dictionary.php') $Output = $this->Redirect($this->System->Link('/dictionary/'));
-      if($this->System->PathItems[0] == 'download-addon.php') $Output = $this->Redirect($this->System->Link('/download/'));
-      if($this->System->PathItems[0] == 'banners.php') $Output = $this->Redirect($this->System->Link('/referrer/'));
-      if($this->System->PathItems[0] == 'download.php') $Output = $this->Redirect($this->System->Link('/download/'));
-      if($this->System->PathItems[0] == 'serverlist.php') $Output = $this->Redirect($this->System->Link('/server/'));
-      if($this->System->PathItems[0] == 'info.php') $Output = $this->Redirect($this->System->Link('/info/'));
-      if($this->System->PathItems[0] == 'userlist.php') $Output = $this->Redirect($this->System->Link('/users/'));
-      if($this->System->PathItems[0] == 'promotion.php') $Output = $this->Redirect($this->System->Link('/promotion/'));
-      if($this->System->PathItems[0] == 'log.php') $Output = $this->Redirect($this->System->Link('/log/'));
-      if(count($this->System->PathItems) > 1)
+      if ($this->System->PathItems[0] == 'user.php') $Output = $this->Redirect($this->System->Link('/user/'));
+      if ($this->System->PathItems[0] == 'team.php') $Output = $this->Redirect($this->System->Link('/team/'));
+      if ($this->System->PathItems[0] == 'version.php') $Output = $this->Redirect($this->System->Link('/client-version/'));
+      if ($this->System->PathItems[0] == 'phpBB3') $Output = $this->Redirect($this->System->Link('/forum/'));
+      if ($this->System->PathItems[0] == 'phpbb3') $Output = $this->Redirect($this->System->Link('/forum/'));
+      if ($this->System->PathItems[0] == 'statistic.php') $Output = $this->Redirect($this->System->Link('/progress/'));
+      if ($this->System->PathItems[0] == 'register.php') $Output = $this->Redirect($this->System->Link('/registration/'));
+      if ($this->System->PathItems[0] == 'registrace.php') $Output = $this->Redirect($this->System->Link('/registration/'));
+      if ($this->System->PathItems[0] == 'dictionary.php') $Output = $this->Redirect($this->System->Link('/dictionary/'));
+      if ($this->System->PathItems[0] == 'download-addon.php') $Output = $this->Redirect($this->System->Link('/download/'));
+      if ($this->System->PathItems[0] == 'banners.php') $Output = $this->Redirect($this->System->Link('/referrer/'));
+      if ($this->System->PathItems[0] == 'download.php') $Output = $this->Redirect($this->System->Link('/download/'));
+      if ($this->System->PathItems[0] == 'serverlist.php') $Output = $this->Redirect($this->System->Link('/server/'));
+      if ($this->System->PathItems[0] == 'info.php') $Output = $this->Redirect($this->System->Link('/info/'));
+      if ($this->System->PathItems[0] == 'userlist.php') $Output = $this->Redirect($this->System->Link('/users/'));
+      if ($this->System->PathItems[0] == 'promotion.php') $Output = $this->Redirect($this->System->Link('/promotion/'));
+      if ($this->System->PathItems[0] == 'log.php') $Output = $this->Redirect($this->System->Link('/log/'));
+      if (count($this->System->PathItems) > 1)
       {
-        if(($this->System->PathItems[0] == 'team') and ($this->System->PathItems[1] == 'userlist.php'))
+        if (($this->System->PathItems[0] == 'team') and ($this->System->PathItems[1] == 'userlist.php'))
           $Output = $this->Redirect($this->System->Link('/userlist/'));
-        if(($this->System->PathItems[0] == 'dictionary') and ($this->System->PathItems[1] == 'user.php'))
+        if (($this->System->PathItems[0] == 'dictionary') and ($this->System->PathItems[1] == 'user.php'))
           $Output = $this->Redirect($this->System->Link('/user/'));
-        if(($this->System->PathItems[0] == 'forum') and ($this->System->PathItems[1] == 'index.php'))
+        if (($this->System->PathItems[0] == 'forum') and ($this->System->PathItems[1] == 'index.php'))
           $Output = $this->Redirect($this->System->Link('/forum/'));
-        if(($this->System->PathItems[0] == 'phpbb3') and ($this->System->PathItems[1] == 'index.php'))
+        if (($this->System->PathItems[0] == 'phpbb3') and ($this->System->PathItems[1] == 'index.php'))
           $Output = $this->Redirect($this->System->Link('/forum/'));
-        if(($this->System->PathItems[0] == 'phpBB3') and ($this->System->PathItems[1] == 'index.php'))
+        if (($this->System->PathItems[0] == 'phpBB3') and ($this->System->PathItems[1] == 'index.php'))
           $Output = $this->Redirect($this->System->Link('/forum/'));
-        if(($this->System->PathItems[0] == 'download') and ($this->System->PathItems[1] == 'ceske_fonty_do_wow.zip'))
+        if (($this->System->PathItems[0] == 'download') and ($this->System->PathItems[1] == 'ceske_fonty_do_wow.zip'))
           $Output = $this->Redirect($this->System->Link('/files/ceske_fonty_do_wow.zip'));
       }
     }
-    return($Output);
+    return $Output;
   }
 }

trunk/Modules/Referrer/Referrer.php

@@ -34 +34 @@
   function Log()
   {
-    if(array_key_exists('HTTP_REFERER', $_SERVER))
+    if (array_key_exists('HTTP_REFERER', $_SERVER))
     {
       $Referrer = addslashes($_SERVER['HTTP_REFERER']);
       $HostName = substr($Referrer, strpos($Referrer, '/') + 2);
       $HostName = substr($HostName, 0, strpos($HostName, '/'));
-      if(!in_array($HostName, $this->Excludes))
+      if (!in_array($HostName, $this->Excludes))
       {
         $IP = GetRemoteAddress();
@@ -46 +46 @@
         $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `BlackList` WHERE `IP` = "'.$IP.'"');
         $DbRow = $DbResult->fetch_row();
-        if($DbRow[0] == 0)
+        if ($DbRow[0] == 0)
         {
           $Visible = '1';
@@ -58 +58 @@
         // Check if host name is already stored and need just to update hit counter
         $DbResult = $this->System->Database->query('SELECT `Id` FROM `Referrer` WHERE `Web` = "'.$HostName.'"');
-        if($DbResult->num_rows > 0)
+        if ($DbResult->num_rows > 0)
         {
           $DbRow = $DbResult->fetch_assoc();
@@ -92 +92 @@
     $Output .= $BannerSmall.' &nbsp;&nbsp;<textarea rows="2" cols="30">'.htmlspecialchars($BannerSmall).'</textarea><br />';
 
-    if($this->System->User->Licence(LICENCE_ADMIN)) {
+    if ($this->System->User->Licence(LICENCE_ADMIN)) {
 
     $MonthAge = 3;
@@ -99 +99 @@
     <div style="font-size: 10px;">Seznam je automaticky aktualizován a zobrazeny jsou servery, ze kterých přišli uživatelé během posledních třech měsíců řazený sestupně dle nejnovějších.</div><br />';
 
-    if(!$this->System->User->Licence(LICENCE_ADMIN)) $Where = ' WHERE (`Visible`=1) AND (`Parent` IS NULL)';
+    if (!$this->System->User->Licence(LICENCE_ADMIN)) $Where = ' WHERE (`Visible`=1) AND (`Parent` IS NULL)';
     else $Where = '';
     $Query = 'SELECT *, (SELECT Web FROM `Referrer` AS T4 WHERE T4.Id = T3.Parent) AS ParentName '.
@@ -123 +123 @@
         array('Name' => 'TotalHits', 'Title' => T('Hits')),
     );
-    if($this->System->User->Licence(LICENCE_ADMIN))
+    if ($this->System->User->Licence(LICENCE_ADMIN))
     {
       $TableColumns[] = array('Name' => 'Visible', 'Title' => T('Visible'));
@@ -137 +137 @@
 
     $DbResult = $this->Database->query($Query);
-    while($Line = $DbResult->fetch_assoc())
+    while ($Line = $DbResult->fetch_assoc())
     {
       $Output .= '<tr><td><a href="'.$Line['LastURL'].'">'.$Line['Web'].'</a></td>'.
           '<td>'.HumanDate($Line['MaxDateLast']).'</td>'.
           '<td>'.$Line['TotalHits'].'</td>';
-      if($this->System->User->Licence(LICENCE_ADMIN))
+      if ($this->System->User->Licence(LICENCE_ADMIN))
       {
         $Output .=
@@ -158 +158 @@
 
     }
-    return($Output);
+    return $Output;
   }
 
@@ -165 +165 @@
     $Output = '<select name="Parent">';
     $Output .= '<option value=""';
-    if($Selected == '')
+    if ($Selected == '')
       $Output .= ' selected="selected"';
     $Output .= '></option>';
     $DbResult = $this->Database->select('Referrer', '`Id`, `Web`', '`Parent` IS NULL ORDER BY `Web`');
-    while($Language = $DbResult->fetch_assoc())
-    if($Language['Id'] != $Self)
+    while ($Language = $DbResult->fetch_assoc())
+    if ($Language['Id'] != $Self)
     {
       $Output .= '<option value="'.$Language['Id'].'"';
-      if($Selected == $Language['Id'])
+      if ($Selected == $Language['Id'])
         $Output .= ' selected="selected"';
       $Output .= '>'.$Language['Web'].'</option>';
     }
     $Output .= '</select>';
-    return($Output);
+    return $Output;
   }
 
   function Spam()
   {
-    if($this->System->User->Licence(LICENCE_ADMIN))
-    {
-      if(array_key_exists('id', $_GET))
+    if ($this->System->User->Licence(LICENCE_ADMIN))
+    {
+      if (array_key_exists('id', $_GET))
       {
         $DbResult = $this->Database->select('Referrer', '*', 'Id='.$_GET['id']);
-        if($DbResult->num_rows > 0)
+        if ($DbResult->num_rows > 0)
         {
           $Item = $DbResult->fetch_assoc();
           $this->Database->update('Referrer', 'Id='.$_GET['id'], array('Visible' => 0, 'Description' => 'Spam'));
           $DbResult2 = $this->Database->select('BlackList', '*', 'IP="'.$Item['LastIP'].'"');
-          if($DbResult2->num_rows == 0)
+          if ($DbResult2->num_rows == 0)
           {
             $this->Database->insert('BlackList', array('Time' => 'NOW()', 'IP' => $Item['LastIP']));
@@ -202 +202 @@
       } else $Output = ShowMessage(T('Item not specified'), MESSAGE_CRITICAL);
     } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
   function Edit()
   {
-    if($this->System->User->Licence(LICENCE_ADMIN))
-    {
-      if(array_key_exists('id', $_GET))
+    if ($this->System->User->Licence(LICENCE_ADMIN))
+    {
+      if (array_key_exists('id', $_GET))
       {
         $DbResult = $this->Database->select('Referrer', '*', 'Id='.$_GET['id']);
-        if($DbResult->num_rows > 0)
+        if ($DbResult->num_rows > 0)
         {
           $Item = $DbResult->fetch_assoc();
-          if($Item['Visible'] == 1) $Visible = ' checked ';
+          if ($Item['Visible'] == 1) $Visible = ' checked ';
             else $Visible = '';
           $Output = '<form action="?action=editsave&amp;id='.$_GET['id'].'" method="post"><table>'.
@@ -227 +227 @@
       } else $Output = ShowMessage(T('Item not specified'), MESSAGE_CRITICAL);
     } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
   function EditSave()
   {
-    if($this->System->User->Licence(LICENCE_ADMIN))
-    {
-      if($_POST['Parent'] == '') $_POST['Parent'] = null;
+    if ($this->System->User->Licence(LICENCE_ADMIN))
+    {
+      if ($_POST['Parent'] == '') $_POST['Parent'] = null;
       $_POST['Visible'] = array_key_exists('Visible', $_POST);
       $DbResult = $this->Database->update('Referrer', 'Id='.$_GET['id'], array(
@@ -243 +243 @@
       $Output .= $this->ShowList();
     } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
@@ -249 +249 @@
   {
     $this->Title = T('Promotion');
-    if(array_key_exists('action', $_GET))
-    {
-      if($_GET['action'] == 'edit') $Output = $this->Edit();
-      else if($_GET['action'] == 'spam') $Output = $this->Spam();
-      else if($_GET['action'] == 'editsave') $Output = $this->EditSave();
+    if (array_key_exists('action', $_GET))
+    {
+      if ($_GET['action'] == 'edit') $Output = $this->Edit();
+      else if ($_GET['action'] == 'spam') $Output = $this->Spam();
+      else if ($_GET['action'] == 'editsave') $Output = $this->EditSave();
       else $Output = $this->ShowList();
     } else $Output = $this->ShowList();
-    return($Output);
+    return $Output;
   }
 }

trunk/Modules/Search/Search.php

@@ -48 +48 @@
       '</table></div>'.
       '</form>';
-    return($Output);
+    return $Output;
   }
 }
@@ -57 +57 @@
   {
     $this->Title = T('Search');
-    if(array_key_exists('text', $_GET)) $Search = $_GET['text'];
-    else if(array_key_exists('text', $_POST)) $Search = $_POST['text'];
+    if (array_key_exists('text', $_GET)) $Search = $_GET['text'];
+    else if (array_key_exists('text', $_POST)) $Search = $_POST['text'];
     else $Search = '';
     $SearchHTML = urlencode($Search);
 
     $Output = '<table class="BaseTable"><tr><th>'.T('Section').'</th><th>'.T('Found count').'</th></tr>';
-    foreach($this->System->ModuleManager->Modules['Search']->SearchItems as $SearchItem)
+    foreach ($this->System->ModuleManager->Modules['Search']->SearchItems as $SearchItem)
     {
       $ColumnQuery = array();
-      foreach($SearchItem['Columns'] as $Column)
+      foreach ($SearchItem['Columns'] as $Column)
       {
         $ColumnQuery[] = '(`'.$Column.'` LIKE "%'.$Search.'%")';
       }
       $ColumnQuery = implode(' OR ', $ColumnQuery);
-      if($SearchItem['Query'] != '')
+      if ($SearchItem['Query'] != '')
       {
         $DbResult = $this->Database->query('SELECT COUNT(*) FROM '.$SearchItem['Query'].' WHERE '.$ColumnQuery);
@@ -82 +82 @@
 
     $Output .= '</table>';
-    return($Output);
+    return $Output;
   }
 }

trunk/Modules/Server/Server.php

@@ -57 +57 @@
     $Output .= '<h3>'.T('Translated server list').'</h3>';
     $Output .= parent::ViewList();
-    return($Output);
+    return $Output;
   }
 }

trunk/Modules/ShoutBox/ShoutBox.php

@@ -20 +20 @@
       'Title' => T('Shoutbox'), 'Channel' => 'shoutbox', 'Callback' => array('PageShoutBox', 'ShowRSS'),
       'Permission' => LICENCE_ANONYMOUS));
-    if(array_key_exists('Search', $this->System->ModuleManager->Modules))
+    if (array_key_exists('Search', $this->System->ModuleManager->Modules))
       $this->System->ModuleManager->Modules['Search']->RegisterSearch('shoutbox',
       T('Shoutbox'), array('UserName', 'Text'), '`ShoutBox`', $this->System->Link('/shoutbox/?search='));
@@ -29 +29 @@
     $Output = '<strong><a href="'.$this->System->Link('/shoutbox/').'">'.T('Shoutbox').':</a></strong>';
 
-    if($this->System->User->Licence(LICENCE_USER))
+    if ($this->System->User->Licence(LICENCE_USER))
       $Output .= ' <a href="'.$this->System->Link('/shoutbox/?a=add').'">'.T('Add').'</a>';
     $Output .= '<div class="box"><div class="shoutbox"><table>';
     $DbResult = $this->Database->query('SELECT * FROM `ShoutBox` ORDER BY `ID` DESC LIMIT 30');
-    while($Line = $DbResult->fetch_assoc())
+    while ($Line = $DbResult->fetch_assoc())
       $Output .= '<tr><td><strong>'.$Line['UserName'].'</strong>: '.MakeActiveLinks($Line['Text']).'</td></tr>';
     $Output .= '</table></div></div>';
-    return($Output);
+    return $Output;
   }
 }
@@ -45 +45 @@
   {
     $this->Title = T('Shoutbox');
-    if(array_key_exists('a', $_POST)) $Action = $_POST['a'];
-      else if(array_key_exists('a', $_GET)) $Action = $_GET['a'];
+    if (array_key_exists('a', $_POST)) $Action = $_POST['a'];
+      else if (array_key_exists('a', $_GET)) $Action = $_GET['a'];
       else $Action = '';
-    if($Action == 'add2') $Output = $this->AddFinish();
-    if($Action == 'add') $Output = $this->ShowAddForm();
+    if ($Action == 'add2') $Output = $this->AddFinish();
+    if ($Action == 'add') $Output = $this->ShowAddForm();
     else $Output = $this->ShowList();
-    return($Output);
+    return $Output;
   }
 
@@ -57 +57 @@
   {
     $Output = '';
-    if(array_key_exists('search', $_GET)) $_SESSION['search'] = $_GET['search'];
-    else if(!array_key_exists('search', $_SESSION)) $_SESSION['search'] = '';
-    if(array_key_exists('search', $_GET) and ($_GET['search'] == '')) $_SESSION['search'] = '';
-    if($_SESSION['search'] != '')
+    if (array_key_exists('search', $_GET)) $_SESSION['search'] = $_GET['search'];
+    else if (!array_key_exists('search', $_SESSION)) $_SESSION['search'] = '';
+    if (array_key_exists('search', $_GET) and ($_GET['search'] == '')) $_SESSION['search'] = '';
+    if ($_SESSION['search'] != '')
     {
       $SearchQuery = ' AND (`Text` LIKE "%'.$_SESSION['search'].'%")';
@@ -71 +71 @@
 
     $Output .= '<h3>'.T('Shoutbox').'</h3>';
-    if($this->System->User->Licence(LICENCE_USER))
+    if ($this->System->User->Licence(LICENCE_USER))
       $Output .= ' <a href="'.$this->System->Link('/shoutbox/?a=add').'">'.T('Add').'</a>';
     $Output .= $PageList['Output'];
     $Output .= '<div class="shoutbox">';
     $DbResult = $this->System->Database->query('SELECT * FROM `ShoutBox`  WHERE 1'.$SearchQuery.' ORDER BY `ID` DESC '.$PageList['SQLLimit']);
-    while($Line = $DbResult->fetch_assoc())
+    while ($Line = $DbResult->fetch_assoc())
       $Output .= '<div><strong>'.$Line['UserName'].'</strong>: '.MakeActiveLinks($Line['Text']).'</div>';
     $Output .= '</div>'.$PageList['Output'];
-    return($Output);
+    return $Output;
   }
 
@@ -85 +85 @@
   {
     $Output = '';
-    if($this->System->User->Licence(LICENCE_USER))
+    if ($this->System->User->Licence(LICENCE_USER))
     {
         $Output .= '<form action="?" method="post">'.
             '<fieldset><legend>'.T('New message').'</legend>'.
             'Uživatel: ';
-        if($this->System->User->Licence(LICENCE_USER)) $Output .= '<b>'.$this->System->User->Name.'</b><br />';
+        if ($this->System->User->Licence(LICENCE_USER)) $Output .= '<b>'.$this->System->User->Name.'</b><br />';
         else $Output .= '<input type="text" name="user" /><br />';
       $Output .= 'Text zprávy: <br/>'.
@@ -99 +99 @@
     } else $Output .= ShowMessage('Pro vkládaní zpráv musíte byt registrováni.', MESSAGE_CRITICAL);
     $Output .= $this->ShowList();
-    return($Output);
+    return $Output;
   }
 
@@ -105 +105 @@
   {
     $Output = '';
-    if($this->System->User->Licence(LICENCE_USER))
+    if ($this->System->User->Licence(LICENCE_USER))
     {
-      if(array_key_exists('text', $_POST))
+      if (array_key_exists('text', $_POST))
       {
         $Text = $_POST['text'];
-        if(trim($Text) == '') $Output .= ShowMessage('Nelze vložit prázdnou zprávu.', MESSAGE_WARNING);
+        if (trim($Text) == '') $Output .= ShowMessage('Nelze vložit prázdnou zprávu.', MESSAGE_WARNING);
         else
         {
@@ -116 +116 @@
           $DbResult = $this->System->Database->query('SELECT `Text` FROM `ShoutBox` WHERE (`User` = "'.
               $this->System->User->Id.'") ORDER BY `Date` DESC LIMIT 1');
-          if($DbResult->num_rows > 0)
+          if ($DbResult->num_rows > 0)
           {
             $DbRow = $DbResult->fetch_assoc();
           } else $DbRow['Text'] = '';
 
-          if($DbRow['Text'] == $Text) $Output .= ShowMessage('Nelze vložit stejnou zprávu vícekrát za sebou.', MESSAGE_WARNING);
+          if ($DbRow['Text'] == $Text) $Output .= ShowMessage('Nelze vložit stejnou zprávu vícekrát za sebou.', MESSAGE_WARNING);
           else
           {
@@ -134 +134 @@
     } else $Output .= ShowMessage('Pro vkládaní zpráv musíte byt registrováni.', MESSAGE_CRITICAL);
     $Output .= $this->ShowList();
-    return($Output);
+    return $Output;
   }
 
@@ -143 +143 @@
     mb_internal_encoding('utf-8');
     $DbResult = $this->Database->query('SELECT UNIX_TIMESTAMP(`Date`) AS `UnixDate`, `User`, `UserName`, `Text` FROM `ShoutBox` ORDER BY `ID` DESC LIMIT 20');
-    while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
     {
       $Title = mb_substr($DbRow['Text'], 0, $TitleLength);
-      if(mb_strlen($Title) == $TitleLength) $Title .= '...';
+      if (mb_strlen($Title) == $TitleLength) $Title .= '...';
       $Items[] = array
       (
@@ -163 +163 @@
       'Items' => $Items,
     ));
-    return($Output);
+    return $Output;
   }
 }

trunk/Modules/Team/Team.php

@@ -24 +24 @@
       'Icon' => '',
     ), 1);
-    if(array_key_exists('Search', $this->System->ModuleManager->Modules))
+    if (array_key_exists('Search', $this->System->ModuleManager->Modules))
       $this->System->ModuleManager->Modules['Search']->RegisterSearch('team',
       T('Teams'), array('Name'), '`Team`', $this->System->Link('/team/?search='));
@@ -38 +38 @@
     $Output .= 'Týmy jsou seskupení překladatelů, kteří se hlásí k něčemu společnému jako např. WoW serveru, způsobu překladu, ke stejnému hernímu spolku, aj. Být členem týmu samo o sobě nemá žádný zásadní důsledek a spíše to může pomoci se lépe orientovat mezi překladateli někomu, kdo sestavuje export.<br/>';
 
-    if(array_key_exists('search', $_GET)) $_SESSION['search'] = $_GET['search'];
-    else if(!array_key_exists('search', $_SESSION)) $_SESSION['search'] = '';
+    if (array_key_exists('search', $_GET)) $_SESSION['search'] = $_GET['search'];
+    else if (!array_key_exists('search', $_SESSION)) $_SESSION['search'] = '';
     if (array_key_exists('search', $_GET) and ($_GET['search'] == '')) $_SESSION['search'] = '';
 
-    if($this->System->User->Licence(LICENCE_USER))
+    if ($this->System->User->Licence(LICENCE_USER))
       $Output .= '<br /><div style="text-align: center;"><a href="?action=create">'.T('Create translating team').'</a></div><br/>';
-    if($_SESSION['search'] != '')
+    if ($_SESSION['search'] != '')
     {
       $SearchQuery = ' AND ((`Name` LIKE "%'.$_SESSION['search'].'%") OR (`Description` LIKE "%'.$_SESSION['search'].'%"))';
@@ -64 +64 @@
       array('Name' => 'TimeCreate', 'Title' => T('Founding date')),
     );
-    if($this->System->User->Licence(LICENCE_USER)) $TableColumns[] = array('Name' => '', 'Title' => T('User actions'));
+    if ($this->System->User->Licence(LICENCE_USER)) $TableColumns[] = array('Name' => '', 'Title' => T('User actions'));
 
     $Order = GetOrderTableHeader($TableColumns, 'NumberUser', 1);
@@ -72 +72 @@
       '(SELECT `Name` FROM `User` WHERE `User`.`ID`=`Team`.`Leader`) AS `LeaderName` '.
       'FROM `Team` WHERE 1'.$SearchQuery.$Order['SQL'].$PageList['SQLLimit']);
-    while($Team = $DbResult->fetch_assoc())
+    while ($Team = $DbResult->fetch_assoc())
     {
       $Output .= '<tr>'.
@@ -80 +80 @@
         '<td><a href="'.$this->System->Link('/users/?team='.$Team['Id']).'" title="Zobrazit členy týmu">'.$Team['NumberUser'].'</a></td>'.
         '<td>'.HumanDate($Team['TimeCreate']).'</td>';
-      if($this->System->User->Licence(LICENCE_USER))
-      {
-        if($Team['Leader'] == $this->System->User->Id) $Action = ' <a href="?action=modify&amp;id='.$Team['Id'].'">'.T('Edit').'</a>';
+      if ($this->System->User->Licence(LICENCE_USER))
+      {
+        if ($Team['Leader'] == $this->System->User->Id) $Action = ' <a href="?action=modify&amp;id='.$Team['Id'].'">'.T('Edit').'</a>';
         else $Action = '';
-        if($Team['Id'] == $this->System->User->Team) $Action = ' <a href="?action=leave">'.T('Leave').'</a>';
+        if ($Team['Id'] == $this->System->User->Team) $Action = ' <a href="?action=leave">'.T('Leave').'</a>';
         $Output .= '<td><a href="?action=gointeam&amp;id='.$Team['Id'].'">'.T('Enter').'</a>'.$Action.'</td>';
       }
@@ -92 +92 @@
       $PageList['Output'];
 
-    return($Output);
+    return $Output;
   }
 
   function TeamJoin()
   {
-    if($this->System->User->Licence(LICENCE_USER))
-    {
-      if(array_key_exists('id', $_GET))
+    if ($this->System->User->Licence(LICENCE_USER))
+    {
+      if (array_key_exists('id', $_GET))
       {
         $this->Database->query('UPDATE `User` SET `Team` = '.$_GET['id'].' WHERE `ID` = '.$this->System->User->Id);
@@ -114 +114 @@
       } else $Output = ShowMessage('Nutno zadat id týmu.', MESSAGE_CRITICAL);
     } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
@@ -120 +120 @@
   {
     $Output = '';
-    if($this->System->User->Licence(LICENCE_USER))
-    {
-      if(array_key_exists('Name', $_POST) and array_key_exists('Description', $_POST))
+    if ($this->System->User->Licence(LICENCE_USER))
+    {
+      if (array_key_exists('Name', $_POST) and array_key_exists('Description', $_POST))
       {
         $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Team` WHERE `Name` = "'.trim($_POST['Name']).'"');
         $DbRow = $DbResult->fetch_row();
         $Count = $DbRow[0];
-        if(($Count == 0) and ($_POST['Name'] != ''))
+        if (($Count == 0) and ($_POST['Name'] != ''))
         {
           $this->Database->query('INSERT INTO `Team` (`Name` ,`Description`, `URL`, `TimeCreate`, `Leader`)'.
@@ -142 +142 @@
     } else $Output .= ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
     $Output .= $this->ShowTeamList();
-    return($Output);
+    return $Output;
   }
 
   function TeamModify()
   {
-    if($this->System->User->Licence(LICENCE_USER))
-    {
-      if(array_key_exists('id', $_GET))
+    if ($this->System->User->Licence(LICENCE_USER))
+    {
+      if (array_key_exists('id', $_GET))
       {
         $DbResult = $this->Database->query('SELECT * FROM `Team` WHERE `Id`='.$_GET['id'].' AND `Leader`='.$this->System->User->Id);
-        if($DbResult->num_rows > 0)
+        if ($DbResult->num_rows > 0)
         {
           $Team = $DbResult->fetch_assoc();
@@ -165 +165 @@
       } else $Output = ShowMessage('Nezadáno id týmu', MESSAGE_CRITICAL);
     } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
@@ -171 +171 @@
   {
     $Output = '';
-    if($this->System->User->Licence(LICENCE_USER))
-    {
-      if(array_key_exists('id', $_GET) and array_key_exists('Name', $_POST) and array_key_exists('Description', $_POST) and array_key_exists('URL', $_POST))
+    if ($this->System->User->Licence(LICENCE_USER))
+    {
+      if (array_key_exists('id', $_GET) and array_key_exists('Name', $_POST) and array_key_exists('Description', $_POST) and array_key_exists('URL', $_POST))
       {
         $DbResult = $this->Database->query('SELECT * FROM `Team` WHERE `Id`='.$_GET['id'].' AND `Leader`='.$this->System->User->Id);
-        if($DbResult->num_rows > 0)
+        if ($DbResult->num_rows > 0)
         {
           $Team = $DbResult->fetch_assoc();
@@ -182 +182 @@
           $DbRow = $DbResult->fetch_row();
           $Count = $DbRow[0];
-          if(($Count == 0) and ($_POST['Name'] != ''))
+          if (($Count == 0) and ($_POST['Name'] != ''))
           {
             $this->Database->query('UPDATE `Team` SET `Name`="'.$_POST['Name'].'", `Description`="'.$_POST['Description'].'", `URL`="'.$_POST['URL'].'" WHERE Id='.$Team['Id']);
@@ -192 +192 @@
     } else $Output .= ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
     $Output .= $this->ShowTeamList();
-    return($Output);
+    return $Output;
   }
 
   function TeamCreate()
   {
-    if($this->System->User->Licence(LICENCE_USER))
+    if ($this->System->User->Licence(LICENCE_USER))
     {
       $Output ='<form action="?action=finish_create" method="post">'.
@@ -207 +207 @@
         '</table></fieldset></form>';
     } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
@@ -213 +213 @@
   {
     $Output = '';
-    if(array_key_exists('id', $_GET) and is_numeric($_GET['id']))
+    if (array_key_exists('id', $_GET) and is_numeric($_GET['id']))
     {
       $DbResult = $this->Database->query('SELECT `Id`, `Name`, `Description`, `URL`, `Leader`, '.
@@ -221 +221 @@
         '(SELECT ROUND(AVG(`XP`)) FROM `User` WHERE `Team` = `Team`.`Id`) AS `AverageXP` FROM '.
         '`Team` WHERE `Id`='.($_GET['id'] * 1));
-      if($DbResult->num_rows > 0)
+      if ($DbResult->num_rows > 0)
       {
         $Team = $DbResult->fetch_assoc();
         $DbResult2 = $this->Database->query('SELECT `Name`, `Id` FROM `User` WHERE `ID`='.$Team['Leader']);
-        if($DbResult2->num_rows > 0)
+        if ($DbResult2->num_rows > 0)
         {
           $Leader = $DbResult2->fetch_assoc();
@@ -233 +233 @@
           T('Web pages').': <a href="http://'.htmlspecialchars($Team['URL']).'">'.htmlspecialchars($Team['URL']).'</a><br/>'.
           T('Leader').': <a href="'.$this->System->Link('/user/?user='.$Leader['Id']).'">'.$Leader['Name'].'</a><br/>';
-        if($Team['Description'] != '')
+        if ($Team['Description'] != '')
           $Output .= T('Description').': '.htmlspecialchars($Team['Description']).'<br />';
         $Output .= '<br />';
         //$Output .= '<a href="export/?team='.$Team['Id'].'">Exportovat překlad týmu</a> ';
-        if($this->System->User->Licence(LICENCE_USER))
+        if ($this->System->User->Licence(LICENCE_USER))
           $Output .='<a href="?action=gointeam&amp;id='.$Team['Id'].'">'.T('Enter to team').'</a><br /><br />';
         $XP = GetLevelMinMax($Team['AverageXP']);
@@ -252 +252 @@
         $Query = '';
         $DbResult = $this->Database->query($GroupListQuery);
-        if($DbResult->num_rows > 0)
-        {
-          while($DbRow = $DbResult->fetch_assoc())
+        if ($DbResult->num_rows > 0)
+        {
+          while ($DbRow = $DbResult->fetch_assoc())
           {
             $Query .= 'SELECT (SELECT COUNT(DISTINCT(`Entry`)) FROM ('.
@@ -289 +289 @@
           $Total = 0;
           $DbResult = $this->Database->query('SELECT *, ROUND(`Translated` / `Total` * 100, 2) AS `Percent` FROM ('.$Query.') AS `C3` '.$Order['SQL'].$PageList['SQLLimit']);
-          while($Group = $DbResult->fetch_assoc())
+          while ($Group = $DbResult->fetch_assoc())
           {
             $Output .='<tr><td>'.T($Group['Name']).'</td><td>'.$Group['Translated'].
@@ -296 +296 @@
             $Total += $Group['Total'];
           }
-          if($Total > 0) $Progress = round($Translated / $Total * 100, 2);
+          if ($Total > 0) $Progress = round($Translated / $Total * 100, 2);
           else $Progress = 0;
           $Output .='<tr><td><strong>'.T('Total').'</strong></td><td><strong>'.
@@ -306 +306 @@
       } else $Output .= ShowMessage('Tým nenalezen', MESSAGE_CRITICAL);
     } else $Output .= ShowMessage('Musíte zadat id týmu', MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
   function TeamLeave()
   {
-    if($this->System->User->Licence(LICENCE_USER))
+    if ($this->System->User->Licence(LICENCE_USER))
     {
       $this->Database->query('UPDATE `User` SET `Team` = NULL WHERE `ID` = '.$this->System->User->Id);
@@ -325 +325 @@
       $Output .= $this->ShowTeamList();
     } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
   function Show()
   {
-    if(array_key_exists('action', $_GET))
-    {
-      if($_GET['action'] == 'gointeam') $Output = $this->TeamJoin();
-      else if($_GET['action'] == 'finish_create') $Output = $this->TeamCreateFinish();
-      else if($_GET['action'] == 'modify') $Output = $this->TeamModify();
-      else if($_GET['action'] == 'finish_modify') $Output = $this->TeamModifyFinish();
-      else if($_GET['action'] == 'create') $Output = $this->TeamCreate();
-      else if($_GET['action'] == 'team') $Output = $this->TeamShow();
-      else if($_GET['action'] == 'leave') $Output = $this->TeamLeave();
+    if (array_key_exists('action', $_GET))
+    {
+      if ($_GET['action'] == 'gointeam') $Output = $this->TeamJoin();
+      else if ($_GET['action'] == 'finish_create') $Output = $this->TeamCreateFinish();
+      else if ($_GET['action'] == 'modify') $Output = $this->TeamModify();
+      else if ($_GET['action'] == 'finish_modify') $Output = $this->TeamModifyFinish();
+      else if ($_GET['action'] == 'create') $Output = $this->TeamCreate();
+      else if ($_GET['action'] == 'team') $Output = $this->TeamShow();
+      else if ($_GET['action'] == 'leave') $Output = $this->TeamLeave();
       else $Output = $this->ShowTeamList();
     } else $Output = $this->ShowTeamList();
-    return($Output);
+    return $Output;
   }
 }

trunk/Modules/Translation/Comparison.php

@@ -12 +12 @@
     $ArrStr2 = explode(' ', $String2);
 
-    for($i = 0; $i < count($ArrStr1); $i++)
+    for ($i = 0; $i < count($ArrStr1); $i++)
     {
-      if(isset($ArrStr2[$i]))
+      if (isset($ArrStr2[$i]))
       {
-        if($ArrStr1[$i] == $ArrStr2[$i])
+        if ($ArrStr1[$i] == $ArrStr2[$i])
         {
           $Result .= $ArrStr1[$i].' ';
@@ -22 +22 @@
         {
           $find = false;
-          for($j = 0; $j < count($ArrStr2); $j++)
+          for ($j = 0; $j < count($ArrStr2); $j++)
           {
-            if(($ArrStr1[$i] == $ArrStr2[$j]) and ($find == false))
+            if (($ArrStr1[$i] == $ArrStr2[$j]) and ($find == false))
             {
               $Result .= $ArrStr1[$i].' ';
@@ -30 +30 @@
             }
           }
-          if($find == false)
+          if ($find == false)
           $Result .= '<span class="edit">'.$ArrStr1[$i].' </span>';
         }
       } else $Result .= '<span class="edit">'.$ArrStr1[$i].' </span>';
     }
-    return($Result);
+    return $Result;
   }
 
@@ -44 +44 @@
     $Output = '';
 
-    if($this->System->User->Licence(LICENCE_USER))
+    if ($this->System->User->Licence(LICENCE_USER))
     {
     $Output = 'Text je porovnáván vždy ku předešlému (vlevo). Změny jsou zvýrazněny <span class="edit">barvou.</span><br /><br />';
@@ -51 +51 @@
     $Table = $TranslationTree[$GroupId]['TablePrefix'];
 
-    if(array_key_exists('entry', $_GET))
+    if (array_key_exists('entry', $_GET))
     {
       $Textentry = $_GET['entry'];
-      if((array_key_exists('ID1', $_GET)) and ($_GET['ID1'] <> -1))  //porovnání pouze 2 textů
+      if ((array_key_exists('ID1', $_GET)) and ($_GET['ID1'] <> -1))  //porovnání pouze 2 textů
       {
         $TextID1 = $_GET['ID1'];
@@ -66 +66 @@
           ' LEFT JOIN `Language` ON `Language`.`Id` = `'.$Table.'`.`Language` '.
           'WHERE `Entry` = '.$Textentry.' '.$WhereID.' ORDER BY `Language`');
-      while($Line[] = $DataID->fetch_assoc());
+      while ($Line[] = $DataID->fetch_assoc());
       array_pop($Line);
 
@@ -74 +74 @@
           '<table class="BaseTable">'.
           '<tr><th>Přeložil</th>';
-      foreach($Line as $Index => $LineItem)
+      foreach ($Line as $Index => $LineItem)
         $Output .= '<th>'.$LineItem['UserName'].'</th>';
       $Output .= '</tr>'.
           '<tr>'.
           '<th>ID textu</th>';
-      foreach($Line as $Index => $LineItem)
+      foreach ($Line as $Index => $LineItem)
         $Output .= '<td><a href="form.php?group='.$GroupId.'&amp;ID='.$LineItem['ID'].'">'.$LineItem['ID'].'</a></td>';
       $Output .= '</tr>'.
           '<tr><th>Převzato</th>';
-      foreach($Line as $Index => $LineItem)
+      foreach ($Line as $Index => $LineItem)
         $Output .= '<td><a href="form.php?group='.$GroupId.'&amp;ID='.$LineItem['Take'].'">'.$LineItem['Take'].'</a></td>';
       $Output .= '</tr>'.
           '<tr><th>'.T('Language').'</th>';
-      foreach($Line as $Index => $LineItem)
+      foreach ($Line as $Index => $LineItem)
         $Output .= '<td>'.T($LineItem['LanguageName']).'</td>';
       $Output .= '</tr>'.
           '<tr><th>'.T('Version').'</th>';
-      foreach($Line as $Index => $LineItem)
+      foreach ($Line as $Index => $LineItem)
         $Output .= '<td>'.GetVersionWOW($LineItem['VersionStart']).' - '.GetVersionWOW($LineItem['VersionEnd']).'</td>';
       $Output .= '</tr>';
-      foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
+      foreach ($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
       {
         $writethis = false;
-        for($i = 0; $i < count($Line); $i++)
+        for ($i = 0; $i < count($Line); $i++)
         {
-          if($Line[$i][$TextItem['Column']] <> '') $writethis = true;
+          if ($Line[$i][$TextItem['Column']] <> '') $writethis = true;
         }
-        if($writethis)
+        if ($writethis)
         {
           $Output .= '<tr><th>'.$TextItem['Name'].'</th>';
-          for($i = 0; $i < count($Line); $i++)
+          for ($i = 0; $i < count($Line); $i++)
           {
-            if($i > 0)
+            if ($i > 0)
             {
               $Output .= '<td>';
@@ -120 +120 @@
   } else $Output .= ShowMessage('Porovnávat můžou pouze překladatelé!', MESSAGE_CRITICAL);
 
-    return($Output);
+    return $Output;
   }
 }

trunk/Modules/Translation/Form.php

@@ -10 +10 @@
     $this->Title = T('Translation');
     $Action = '';
-    if(array_key_exists('action', $_GET)) $Action = $_GET['action'];
-
-    if($Action == 'delete') $Output = $this->Delete();
+    if (array_key_exists('action', $_GET)) $Action = $_GET['action'];
+
+    if ($Action == 'delete') $Output = $this->Delete();
       else $Output = $this->ShowForm();
-    return($Output);
+    return $Output;
   }
 
@@ -26 +26 @@
     $this->GroupId = $GroupId;
     $Table = $TranslationTree[$GroupId]['TablePrefix'];
-    if(array_key_exists('action', $_GET)) $Action = $_GET['action'];
+    if (array_key_exists('action', $_GET)) $Action = $_GET['action'];
     else $Action = '';
 
-    if(array_key_exists('ID', $_GET))
+    if (array_key_exists('ID', $_GET))
     {
       $TextID = $_GET['ID'] * 1;
@@ -36 +36 @@
       $DbResult = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE `ID` = '.$TextID);
       $Line = $DbResult->fetch_assoc();
-      if(!$Line)
+      if (!$Line)
       {
         $Output .= ShowMessage('Překlad nenalezen.', MESSAGE_CRITICAL);
@@ -47 +47 @@
           else $Language = '`Language` != '.$this->System->Config['OriginalLanguage'];
           $Columns = '';
-          foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
+          foreach ($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
             $Columns .= ' `Orig`.`'.$TextItem['Column'].'` as `Orig_'.$TextItem['Column'].'`, `Tran`.`'.$TextItem['Column'].'` as `'.$TextItem['Column'].'`,';
 
@@ -56 +56 @@
           $DbResult = $this->Database->query($sql.$join.$where);
           while ($LineSearch = $DbResult->fetch_assoc()) {
-            foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
-              if($TextItem['Visible'] == 1)
+            foreach ($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
+              if ($TextItem['Visible'] == 1)
                 if (($LineAJ[$TextItem['Column']] <> '') and
                     ($LineSearch[$TextItem['Column']] <> '') and
@@ -74 +74 @@
           $LineAJ = $DbResult->fetch_assoc();
         }
-        if(!$LineAJ)
+        if (!$LineAJ)
         {
           $Output .= ShowMessage('Anglický originál k překladu nenalezen.', MESSAGE_CRITICAL);
@@ -80 +80 @@
         {
 
-          if($Line['User'] != '')
+          if ($Line['User'] != '')
           {
             $IDUser = $this->Database->query('SELECT * FROM `User` WHERE `ID` = '.$Line['User']);
@@ -89 +89 @@
           $Output .= T('Group').': <strong>'.$TranslationTree[$GroupId]['Name'].'</strong><br />';
 
-          if(($Line['Language'] <> 0) and ($LineUser['Name'] <> ''))
+          if (($Line['Language'] <> 0) and ($LineUser['Name'] <> ''))
             $Output .= T('Translated by').': <a href="'.$this->System->Link('/user/?user='.$Line['User']).'"><strong>'.$LineUser['Name'].'</strong></a> dne '.HumanDate($Line['ModifyTime']).'<br />';
-          if(($Line['Take'] <> 0) and ($Line['Take'] <> $Line['ID']))
+          if (($Line['Take'] <> 0) and ($Line['Take'] <> $Line['ID']))
           {
             $DbResult = $this->Database->query('SELECT `Language`,`VersionStart`,`VersionEnd` FROM `'.$Table.'` WHERE `ID` = '.$Line['Take']);
@@ -105 +105 @@
           }
           $Output .= 'Text: ';
-          if($Line['Language'] <> 0)
-          {
-            if($Line['Complete'] == 1) $Output .= ' <b>'.T('Completed').'</b>';
+          if ($Line['Language'] <> 0)
+          {
+            if ($Line['Complete'] == 1) $Output .= ' <b>'.T('Completed').'</b>';
             else $Output .= ' <b>'.T('Stored in unfinished').'</b> ';
           } else $Output .= ' <b>'.T('Original version').'</b> ';
@@ -120 +120 @@
           $Version = $DbResult->fetch_row();
           $Version = $Version[0];
-          if($Version > 0)
+          if ($Version > 0)
           {
             $Output .= '<form action="comparison.php" method="get"><a href="'.$this->System->Link('/TranslationList.php?group='.
@@ -128 +128 @@
             <input type="hidden" name="ID2" value="'.$TextID.'" />';
 
-            if($this->System->User->Licence(LICENCE_USER)) { // allow to compare only to user
+            if ($this->System->User->Licence(LICENCE_USER)) { // allow to compare only to user
               $Output .= '<select onchange="this.form.submit();" name="ID1">
               <option value="-1">'.T('Select text for comparison').'</option>
               <option value="-1">'.T('Show/compare all').'</option>';
               $DataID = $this->Database->query('SELECT *, (SELECT `User`.`Name` AS `UserName` FROM `User` WHERE `User`.`ID` = `'.$Table.'`.`User`) AS `UserName` FROM `'.$Table.'` WHERE (`Entry` = '.$Line['Entry'].') AND (`ID` <> '.$Line['ID'].')');
-              while($Version = $DataID->fetch_array())
+              while ($Version = $DataID->fetch_array())
               {
-                if($Version['ID'] == $Line['Take']) $Output .= '<option value="'.
+                if ($Version['ID'] == $Line['Take']) $Output .= '<option value="'.
                  $Version['ID'].'">'.$Version['ID'].' - '.$Version['User'].' ('.T('taken over').')</option>';
                 else
                 {
-                  if($Version['Language'] == 0) $Version['UserName'] = T('Original');
+                  if ($Version['Language'] == 0) $Version['UserName'] = T('Original');
                   $Output .= '<option value="'.$Version['ID'].'">'.$Version['ID'].' - '.
                       $Version['UserName'].' ('.GetVersionWOW($Version['VersionStart']).' - '.
@@ -155 +155 @@
 
           // Special characters: $B - New line, $N - Name, $C - profession
-          if($this->System->User->Licence(LICENCE_USER))
+          if ($this->System->User->Licence(LICENCE_USER))
           {
             $Output .= '<form action="'.$this->System->Link('/save.php?group='.$GroupId).'" method="post"><div>';
             // TODO: Remove fixed group id condition
-          //  if(($GroupId < 4) or ($GroupId == 10) or ($GroupId == 11))
+          //  if (($GroupId < 4) or ($GroupId == 10) or ($GroupId == 11))
             $Output .= '<a href="'.$this->System->Link('/dictionary/?action=group&amp;group='.
               $GroupId.'&amp;ID='.$LineAJ['ID']).'" target="_blank"  title="Zobrazit přeložené názvy věci, postav, a herních objektů k tomuto překladu">'.T('Search in names').'</a>';
@@ -169 +169 @@
           }
 
-          if($TranslationTree[$GroupId]['WowheadName'] != '')
+          if ($TranslationTree[$GroupId]['WowheadName'] != '')
             $WowheadLink = '<a href="http://www.wowhead.com/?'.$TranslationTree[$GroupId]['WowheadName'].
               '='.$LineAJ['Entry'].'">'.$LineAJ['Entry'].'</a>';
@@ -187 +187 @@
           <td>'.T('Original').'</td>
           <td>';
-          if($Line['Language'] <> 0) $Language = $Line['Language'];
-          else if($this->System->User->Id != 0)
+          if ($Line['Language'] <> 0) $Language = $Line['Language'];
+          else if ($this->System->User->Id != 0)
           {
             $Language = $this->System->User->Language;
           } else $Language = 0;
-          if($this->System->User->Licence(LICENCE_USER)) $Output .= WriteLanguages($Language);
+          if ($this->System->User->Licence(LICENCE_USER)) $Output .= WriteLanguages($Language);
             else {
             $DbResult3 = $this->Database->select('Language', '`Id`, `Name`', '(`Enabled` = 1) AND (`Id`='.$Language.')');
-            if($DbResult3->num_rows > 0)
+            if ($DbResult3->num_rows > 0)
             {
               $Language = $DbResult3->fetch_assoc();
@@ -209 +209 @@
              '<script>';
           $Output .=    '$(document).ready(function() {';
-          foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
+          foreach ($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
             $Output .=   '$("#'.$TextItem['Column'].'").load("'.$this->System->Link('/LoadNames.php?ID='.$LineAJ['ID'].'&Column='.$TextItem['Column'].'&GroupId='.$GroupId).'");';
 
@@ -215 +215 @@
             '</script>';
 
-          foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
-            if($TextItem['Visible'] == 1)
+          foreach ($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
+            if ($TextItem['Visible'] == 1)
             {
-              if(($LineAJ[$TextItem['Column']] <> '') or ($Line[$TextItem['Column']] <> ''))
+              if (($LineAJ[$TextItem['Column']] <> '') or ($Line[$TextItem['Column']] <> ''))
               {
-                if(($TextItem['Name'] == 'Text') and (($Table == 'global_strings') or ($Table == 'glue_strings')))
+                if (($TextItem['Name'] == 'Text') and (($Table == 'global_strings') or ($Table == 'glue_strings')))
                   $Output .= '<tr><th>'.$LineAJ['ShortCut'].'</th>';
                 else $Output .= '<tr><th>'.T($TextItem['Name']).'</th>';
                 $Output .= '<td id="'.$TextItem['Column'].'">'.str_replace("\n", '<br/>', htmlspecialchars($LineAJ[$TextItem['Column']])).'</td>
                 <td>';
-                if($this->System->User->Licence(LICENCE_USER))
+                if ($this->System->User->Licence(LICENCE_USER))
                   $Output .= '<textarea rows="8" cols="40" onkeydown="ResizeTextArea(this)" class="textedit" id="'.$TextItem['Column'].'" name="'.$TextItem['Column'].'">';
                 $Output .=  htmlspecialchars($Line[$TextItem['Column']]);
-                if($this->System->User->Licence(LICENCE_USER)) $Output .= '</textarea></td></tr>';
+                if ($this->System->User->Licence(LICENCE_USER)) $Output .= '</textarea></td></tr>';
               }
             } else
@@ -235 +235 @@
             }
             $Output .= '</table></div>';
-            if($this->System->User->Licence(LICENCE_USER)) {
+            if ($this->System->User->Licence(LICENCE_USER)) {
               $Output .= '</form>';
 
-              if(isset($this->System->Config['Web']['EnableGoogleTranslate']) and
+              if (isset($this->System->Config['Web']['EnableGoogleTranslate']) and
                 $this->System->Config['Web']['EnableGoogleTranslate'])
               {
               $Output .= '<br/><table class="BaseTable">'.
               '<tr><th>'.T('Google translator').':</th><th>'.T('Not translated').'</th><th>'.T('Translated').'</th>';
-              foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
-                if($TextItem['Visible'] == 1)
+              foreach ($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
+                if ($TextItem['Visible'] == 1)
                   if ($LineAJ[$TextItem['Column']] <> '')
                     $Output .= '<tr><td>'.$TextItem['Column'].'</td>'.
@@ -256 +256 @@
       }
     } else $Output = ShowMessage('Nebylo zadáno ID.', MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
@@ -263 +263 @@
     $TranslationTree = $this->System->ModuleManager->Modules['Translation']->GetTranslationTree();
 
-    if($this->System->User->Licence(LICENCE_MODERATOR))
+    if ($this->System->User->Licence(LICENCE_MODERATOR))
     {
       $GroupId = LoadGroupIdParameter();
@@ -273 +273 @@
       $this->System->ModuleManager->Modules['Log']->WriteLog('Překlad byl smazán! <a href="'.$this->System->Link('/form.php?group='.$this->GroupId.'&amp;ID='.$TextID).'">'.$TextID.'</a>', LOG_TYPE_MODERATOR);
     } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 }

trunk/Modules/Translation/LoadNames.php

@@ -18 +18 @@
     }
   //   }
-    return ($Text);
+    return $Text;
   }
   function ReplaceNotTranslated($orig,$tran,$Text,$ID,$Group)
@@ -26 +26 @@
     $Text = str_replace(' '.$orig,' <span title="Kliknutím přeložíš" class="needtran"><a class="needtran" target="_NEW2" href="'.
       $this->System->Link('/form.php?group='.$Group.'&amp;ID='.$ID).'">'.$orig_replace.'</a></span>',$Text);
-    return ($Text);
+    return $Text;
   }
 
@@ -44 +44 @@
     $Text = str_replace('$r','<span Title="Znamená rasu hráče, překladu zachovej na stejné pozici." class="edit">$R</span>',$Text);
     $Text = str_replace('$g','<span Title="Vybere oslovení podle pohlaví hráče, překladu zachovej na stejné pozici." class="edit">$G</span>',$Text);
-    foreach($names as $Line) {
+    foreach ($names as $Line) {
      if (($_GET['ID'] <> $Line[0]) or ($Line[1] <> $_GET['GroupId']))
       if ($Line[3] <> '')  {
@@ -61 +61 @@
 
     $Output = '';
-    if(array_key_exists('GroupId', $_GET)) $GroupId = $_GET['GroupId'];
-      else return(ShowMessage(T('GroupId not specified'), MESSAGE_CRITICAL));
-    if(!array_key_exists('ID', $_GET)) return(ShowMessage(T('ID not specified'), MESSAGE_CRITICAL));
-    if(!array_key_exists('Column', $_GET)) return(ShowMessage(T('Column not specified'), MESSAGE_CRITICAL));
+    if (array_key_exists('GroupId', $_GET)) $GroupId = $_GET['GroupId'];
+      else return ShowMessage(T('GroupId not specified'), MESSAGE_CRITICAL);
+    if (!array_key_exists('ID', $_GET)) return ShowMessage(T('ID not specified'), MESSAGE_CRITICAL);
+    if (!array_key_exists('Column', $_GET)) return ShowMessage(T('Column not specified'), MESSAGE_CRITICAL);
     $Table = $TranslationTree[$GroupId]['TablePrefix'];
     $DbResult = $this->System->Database->query('SELECT * FROM `'.$Table.'` WHERE `ID` = '.$_GET['ID'].' LIMIT 1');
@@ -73 +73 @@
           $names = array();
           if ($this->System->User->Licence(LICENCE_USER))
-          if(($GroupId < 4) or ($GroupId == 10) or ($GroupId == 11))
+          if (($GroupId < 4) or ($GroupId == 10) or ($GroupId == 11))
           {
             //<span class="edit">barvou.</span>
             $names = GetTranslatNames($Text, 0, GetTranslatNamesArray());
           } else {
-            if(($GroupId == 13)) {
+            if (($GroupId == 13)) {
               $names = GetTranslatNames($Text, 0, array('Dictionary' => 'Text',
                 'TextGlobalString' => 'Text', 'TextArea' => 'Name',
@@ -87 +87 @@
           }
                                    //$LineAJ[$Column]
-          return ($this->ColorNames(htmlspecialchars($Text),$names));
+          return $this->ColorNames(htmlspecialchars($Text),$names);
     }
 
@@ -93 +93 @@
   {
     $this->RawPage = true;
-    return(str_replace("\n", '<br/>', $this->LoadNames()));
+    return str_replace("\n", '<br/>', $this->LoadNames());
   }
 }

trunk/Modules/Translation/Progress.php

@@ -8 +8 @@
 
     $BuildNumber = GetBuildNumber($_SESSION['StatVersion']);
-    if(is_numeric($_SESSION['language'])) $LanguageFilter = 'AND (`Language`='.$_SESSION['language'].')';
+    if (is_numeric($_SESSION['language'])) $LanguageFilter = 'AND (`Language`='.$_SESSION['language'].')';
     else $LanguageFilter = ' AND (`Language`!='.$this->System->Config['OriginalLanguage'].')';
 
@@ -14 +14 @@
     $Query = '';
     $DbResult = $this->Database->query($GroupListQuery);
-    if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
     {
-      while($DbRow = $DbResult->fetch_assoc())
+      while ($DbRow = $DbResult->fetch_assoc())
       {
         $Query .= 'SELECT (SELECT COUNT(DISTINCT(`Entry`)) FROM ('.
@@ -50 +50 @@
       $Total = 0;
       $DbResult = $this->Database->query('SELECT *, ROUND(`Translated` / `Total` * 100, 2) AS `Percent` FROM ('.$Query.') AS `C3` '.$Order['SQL'].$PageList['SQLLimit']);
-      while($Group = $DbResult->fetch_assoc())
+      while ($Group = $DbResult->fetch_assoc())
       {
         $Output .= '<tr><td>'.T($Group['Name']).'</td><td>'.$Group['Translated'].'</td><td>'.$Group['Total'].'</td><td>'.ProgressBar(150, $Group['Percent']).'</td></tr>';
@@ -56 +56 @@
         $Total += $Group['Total'];
       }
-      if($Total <> 0) $TotalCount = round($Translated / $Total * 100, 2);
+      if ($Total <> 0) $TotalCount = round($Translated / $Total * 100, 2);
       else $TotalCount = 0;
       $Output .= '<tr><td><strong>'.T('Total').'</strong></td><td><strong>'.$Translated.'</strong></td><td><strong>'.$Total.'</strong></td><td><strong>'.ProgressBar(150, $TotalCount).'</strong></td></tr>'.
           '</table>';
     }
-    return($Output);
+    return $Output;
   }
 
@@ -69 +69 @@
     $LanguageList = GetLanguageList();
 
-    if(array_key_exists('Version', $_GET)) $_SESSION['StatVersion'] = $_GET['Version'];
-    if(!array_key_exists('StatVersion', $_SESSION))
+    if (array_key_exists('Version', $_GET)) $_SESSION['StatVersion'] = $_GET['Version'];
+    if (!array_key_exists('StatVersion', $_SESSION))
     {
-      if($this->System->User->Licence(LICENCE_USER) and ($this->System->User->PreferredVersionGame != ''))
+      if ($this->System->User->Licence(LICENCE_USER) and ($this->System->User->PreferredVersionGame != ''))
       {
         $_SESSION['StatVersion'] = $this->System->User->PreferredVersionGame;
@@ -80 +80 @@
     }
 
-    if(!isset($_SESSION['language']))
+    if (!isset($_SESSION['language']))
     {
-      if($this->System->User->Licence(LICENCE_USER))
+      if ($this->System->User->Licence(LICENCE_USER))
       {
         $_SESSION['language'] = $this->System->User->Language;
@@ -89 +89 @@
       }
     }
-    if(array_key_exists('language', $_GET))
+    if (array_key_exists('language', $_GET))
     {
-      if($_GET['language'] == '') {
+      if ($_GET['language'] == '') {
         $_SESSION['language'] = '';
       } else {
@@ -97 +97 @@
       }
     }
-    if(!array_key_exists($_SESSION['language'], $LanguageList)) $_SESSION['language'] = '';
+    if (!array_key_exists($_SESSION['language'], $LanguageList)) $_SESSION['language'] = '';
 
     // Show client version selection
     $Output = T('Client version:').' ';
     $DbResult = $this->Database->query('SELECT `Version`, `Title` FROM `ClientVersion` WHERE `Imported`=1 ORDER BY `Version`');
-    while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
       $Output .= '<a href="?Version='.$DbRow['Version'].'" title="'.$DbRow['Title'].'">'.$DbRow['Version'].'</a> ';
     $Output .= '<br/>';
@@ -109 +109 @@
     $Output .= T('Language:').' ';
     $Lang = '<a href="?language=">'.T('All').'</a>';
-    if($_SESSION['language'] == '') $Output .= '<strong>'.$Lang.'</strong> ';
+    if ($_SESSION['language'] == '') $Output .= '<strong>'.$Lang.'</strong> ';
       else $Output .= $Lang;
-    foreach($LanguageList as $Language)
-    if($Language['Enabled'] == 1)
+    foreach ($LanguageList as $Language)
+    if ($Language['Enabled'] == 1)
     {
       $Lang = ' <a href="?language='.$Language['Id'].'">'.T($Language['Name']).'</a>';
-      if($Language['Id'] == $_SESSION['language']) $Output .= '<strong>'.$Lang.'</strong> ';
+      if ($Language['Id'] == $_SESSION['language']) $Output .= '<strong>'.$Lang.'</strong> ';
         else $Output .= $Lang;
     }
 
-    if(is_numeric($_SESSION['language'])) $LanguageName = $LanguageList[$_SESSION['language']]['Name'];
+    if (is_numeric($_SESSION['language'])) $LanguageName = $LanguageList[$_SESSION['language']]['Name'];
       else $LanguageName = T('All');
     $Output .= '<br/><br/><h3>'.sprintf(T('Statistics of translation completion of language %s for version %s'), T($LanguageName), $_SESSION['StatVersion']).'</h3><br/>';
     $Output .= $this->ShowStatTable();
 
-    return($Output);
+    return $Output;
   }
 }

trunk/Modules/Translation/Save.php

@@ -11 +11 @@
     // Get source text record from database by ID
     $DbResult = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE `ID`='.$TextID);
-    if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
     {
       $SourceText = $DbResult->fetch_assoc();
@@ -19 +19 @@
           'AND (`Language` = '.$this->System->Config['OriginalLanguage'].') AND (`VersionStart` = '.$SourceText['VersionStart'].') '.
           'AND (`VersionEnd` = '.$SourceText['VersionEnd'].')');
-      if($DbResult->num_rows > 0)
+      if ($DbResult->num_rows > 0)
       {
         $EnglishText = $DbResult->fetch_assoc();
@@ -25 +25 @@
         // Get all similar english texts
         $Filter = array();
-        foreach($Group['Items'] as $GroupItem)
+        foreach ($Group['Items'] as $GroupItem)
         {
-          if(($GroupItem['Visible'] == 1) and ($EnglishText[$GroupItem['Column']] != ''))
+          if (($GroupItem['Visible'] == 1) and ($EnglishText[$GroupItem['Column']] != ''))
             $Filter[] = '(`'.$GroupItem['Column'].'` = "'.addslashes($EnglishText[$GroupItem['Column']]).'")';
         }
-        if(count($Filter) > 0) $Filter = ' AND ('.implode(' OR ', $Filter).')';
+        if (count($Filter) > 0) $Filter = ' AND ('.implode(' OR ', $Filter).')';
           else $Filter = ' AND 0';
 
           $Query = 'SELECT * FROM `'.$Table.'` WHERE (`Language` = '.$this->System->Config['OriginalLanguage'].')'.$Filter;
           $DbResult = $this->Database->query($Query);
-          while($EnglishFound = $DbResult->fetch_assoc())
+          while ($EnglishFound = $DbResult->fetch_assoc())
           {
             // Get user translation paired to found english item entry
@@ -41 +41 @@
               ') AND (`Entry` = '.$EnglishFound['Entry'].') AND (`VersionStart` = '.$EnglishFound['VersionStart'].
               ') AND (`VersionEnd` = '.$EnglishFound['VersionEnd'].')');
-            if($DbResult2->num_rows > 0)
+            if ($DbResult2->num_rows > 0)
             {
               // Update existed user translation
@@ -47 +47 @@
               $Modified = false;
               $Values = '`Language` = '.$Language;
-              if($Language != $ExistedText['Language']) $Modified = true;
+              if ($Language != $ExistedText['Language']) $Modified = true;
 
               $Completable = true;
               $CompleteParts = $ExistedText['CompleteParts'];
-              foreach($Group['Items'] as $GroupItem)
-              {
-                if($GroupItem['Visible'] == 1)
-                {
-                  if($EnglishFound[$GroupItem['Column']] == $EnglishText[$GroupItem['Column']])
+              foreach ($Group['Items'] as $GroupItem)
+              {
+                if ($GroupItem['Visible'] == 1)
+                {
+                  if ($EnglishFound[$GroupItem['Column']] == $EnglishText[$GroupItem['Column']])
                   {
-                    if(array_key_exists($GroupItem['Column'], $_POST))
+                    if (array_key_exists($GroupItem['Column'], $_POST))
                     {
-                      if($_POST[$GroupItem['Column']] != $ExistedText[$GroupItem['Column']])
+                      if ($_POST[$GroupItem['Column']] != $ExistedText[$GroupItem['Column']])
                         $Modified = true;
 
@@ -66 +66 @@
                     }
                   }
-                  if((($CompleteParts & (1 << ($GroupItem['Sequence'] - 1))) == 0) and
+                  if ((($CompleteParts & (1 << ($GroupItem['Sequence'] - 1))) == 0) and
                       ($EnglishFound[$GroupItem['Column']] != '')) $Completable = false;
                 }
               }
-              if($Completable) $NewComplete = 1; // All parts of text are completed. Make entire text as completed
+              if ($Completable) $NewComplete = 1; // All parts of text are completed. Make entire text as completed
                 else $NewComplete = 0;
 
               // Update completion status for edited translation item
-              if($SourceText['ID'] == $ExistedText['ID'])
+              if ($SourceText['ID'] == $ExistedText['ID'])
               {
                 $NewComplete = $Complete; // Our original user text, set complete according user choice
-                if($Complete == 1)
-                {
-                  foreach($Group['Items'] as $GroupItem)
-                    if($GroupItem['Visible'] == 1) $CompleteParts |= (1 << ($GroupItem['Sequence'] - 1));
+                if ($Complete == 1)
+                {
+                  foreach ($Group['Items'] as $GroupItem)
+                    if ($GroupItem['Visible'] == 1) $CompleteParts |= (1 << ($GroupItem['Sequence'] - 1));
                 }
               }
               $Values .= ', `Complete`='.$NewComplete.', `CompleteParts` = '.$CompleteParts;
-              if(($NewComplete != $ExistedText['Complete']) or ($CompleteParts != $ExistedText['CompleteParts']))
+              if (($NewComplete != $ExistedText['Complete']) or ($CompleteParts != $ExistedText['CompleteParts']))
                 $Modified = true;
 
               $Values .= ', `ModifyTime` = NOW()';
-              if($Modified)
+              if ($Modified)
               {
                 // Update user translation
@@ -114 +114 @@
               $CompleteParts = 0;
               $Completable = true;
-              foreach($Group['Items'] as $GroupItem)
+              foreach ($Group['Items'] as $GroupItem)
               {
                 $Columns .= ', `'.$GroupItem['Column'].'`';
-                if($GroupItem['Visible'] == 1)
-                {
-                  if($EnglishFound[$GroupItem['Column']] == $EnglishText[$GroupItem['Column']])
+                if ($GroupItem['Visible'] == 1)
+                {
+                  if ($EnglishFound[$GroupItem['Column']] == $EnglishText[$GroupItem['Column']])
                   {
                     // Read form user data
-                    if(array_key_exists($GroupItem['Column'], $_POST))
+                    if (array_key_exists($GroupItem['Column'], $_POST))
                     {
                       $Values .= ', "'.$_POST[$GroupItem['Column']].'"';
@@ -128 +128 @@
                     } else $Values .= ', "'.addslashes($EnglishFound[$GroupItem['Column']]).'"';
                   } else $Values .= ', "'.addslashes($EnglishFound[$GroupItem['Column']]).'"';
-                  if((($CompleteParts & (1 << ($GroupItem['Sequence'] - 1))) == 0) and ($EnglishFound[$GroupItem['Column']] != '')) $Completable = false;
+                  if ((($CompleteParts & (1 << ($GroupItem['Sequence'] - 1))) == 0) and ($EnglishFound[$GroupItem['Column']] != '')) $Completable = false;
                 } else
                 {
@@ -135 +135 @@
                 }
               }
-              if($Completable) $NewComplete = 1; // All parts of text are completed. Make entire text as completed
+              if ($Completable) $NewComplete = 1; // All parts of text are completed. Make entire text as completed
                 else $NewComplete = 0;
               // Update completion status for edited translation item
-              if($SourceText['ID'] == $EnglishFound['ID'])
+              if ($SourceText['ID'] == $EnglishFound['ID'])
               {
                 $TakeID = $TextID;
                 $NewComplete = $Complete; // Our original user text, set complete according user choice
-                if($Complete == 1)
-                {
-                  foreach($Group['Items'] as $GroupItem)
-                    if($GroupItem['Visible'] == 1) $CompleteParts |= (1 << ($GroupItem['Sequence'] - 1));
+                if ($Complete == 1)
+                {
+                  foreach ($Group['Items'] as $GroupItem)
+                    if ($GroupItem['Visible'] == 1) $CompleteParts |= (1 << ($GroupItem['Sequence'] - 1));
                 }
               }
@@ -171 +171 @@
       } else $Output .= ShowMessage('Anglický originál k překladu nenalezen.', MESSAGE_CRITICAL);
     } else $Output .= ShowMessage('Zadaná položka nenalezena.', MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
@@ -183 +183 @@
     unset($Message);
     $this->System->ModuleManager->Modules['FrontPage']->HandleLoginForm();
-    if(isset($Message)) $Output .= ShowMessage($Message, $MessageType);
+    if (isset($Message)) $Output .= ShowMessage($Message, $MessageType);
 
     $GroupId = LoadGroupIdParameter();
     $Group = $TranslationTree[$GroupId];
     $Table = $Group['TablePrefix'];
-    if($this->System->User->Licence(LICENCE_USER))
-    {
-      if(array_key_exists('ID', $_POST) and is_numeric($_POST['ID']))
+    if ($this->System->User->Licence(LICENCE_USER))
+    {
+      if (array_key_exists('ID', $_POST) and is_numeric($_POST['ID']))
       {
         $Entry = $_POST['entry'] * 1;
         $TextID = $_POST['ID'] * 1;
         $Language = $_POST['Language'] * 1;
-        if(array_key_exists('End', $_POST)) $Complete = 1;
+        if (array_key_exists('End', $_POST)) $Complete = 1;
           else $Complete = 0;
 
@@ -207 +207 @@
     {
       // User automatically logged out. Show login dialog and allow to save retry.
-      if(array_key_exists('ID', $_POST) and array_key_exists('entry', $_POST) and array_key_exists('Language', $_POST) and array_key_exists('user', $_POST))
+      if (array_key_exists('ID', $_POST) and array_key_exists('entry', $_POST) and array_key_exists('Language', $_POST) and array_key_exists('user', $_POST))
       {
         $Output .= 'Byli jste automaticky odhlášeni. Pro <strong>Uložení překladu</strong> se musíte přihlásit zde:<br /><br />'.
@@ -216 +216 @@
           '<input type="hidden" name="Language" value="'.$_POST['Language'].'" />';
 
-        foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
+        foreach ($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
         {
-          if(array_key_exists($TextItem['Column'], $_POST)) $Value = $_POST[$TextItem['Column']]; else $Value = '';
+          if (array_key_exists($TextItem['Column'], $_POST)) $Value = $_POST[$TextItem['Column']]; else $Value = '';
           $Output .= '<input id="'.$TextItem['Column'].'" name="'.$TextItem['Column'].'" type="hidden" value="'.htmlspecialchars($Value).'" />';
         }
@@ -232 +232 @@
       } else $Output = ShowMessage('Nezadány požadované údaje.', MESSAGE_CRITICAL);
     }
-    return($Output);
+    return $Output;
   }
 
@@ -246 +246 @@
     $redirecting = $DbResult->fetch_assoc();
 
-    switch($redirecting['Redirecting'])
+    switch ($redirecting['Redirecting'])
     {
       case 1:
@@ -254 +254 @@
         break;
       case 2:
-        if($next <> '')
+        if ($next <> '')
           $Output .= '<script type="text/javascript" language="JavaScript" charset="utf-8">'.
             'setTimeout("parent.location.href=\''.htmlspecialchars_decode($next).'\'", 1500)'.
@@ -260 +260 @@
           break;
       case 3:
-        if($prev <> '')
+        if ($prev <> '')
           $Output .= '<script type="text/javascript" language="JavaScript" charset="utf-8">'.
             'setTimeout("parent.location.href=\''.htmlspecialchars_decode($prev).'\'", 1500)'.
@@ -269 +269 @@
     $Output .= sprintf(T('You can be redirected automatically from this page. You can set where you want to be transfered here: %s'), '<a href="'.
       $this->System->Link('/options/').'" title="'.T('User settings').'">'.T('Options').'</a>');
-    return($Output);
+    return $Output;
   }
 }

trunk/Modules/Translation/Translation.php

@@ -47 +47 @@
       'Icon' => '',
     ));
-    if(array_key_exists('Search', $this->System->ModuleManager->Modules))
+    if (array_key_exists('Search', $this->System->ModuleManager->Modules))
     {
       $TranslationTree = $this->System->ModuleManager->Modules['Translation']->GetTranslationTree();
-      foreach($TranslationTree as $Group)
+      foreach ($TranslationTree as $Group)
       {
         $Table = $Group['TablePrefix'];
 
         $Columns = array('ID', 'Entry');
-        foreach($Group['Items'] as $Item)
+        foreach ($Group['Items'] as $Item)
         {
-          if($Item['Column'] != '') $Columns[] = $Item['Column'];
+          if ($Item['Column'] != '') $Columns[] = $Item['Column'];
         }
 
@@ -74 +74 @@
     $DbResult = $this->Database->query('SELECT UNIX_TIMESTAMP(`Date`) AS `Date`, `User`.`Name` AS `UserName`, `Text` FROM `Log` '.
     'JOIN `User` ON `User`.`ID` = `Log`.`User` WHERE `Type` = 1 ORDER BY `Date` DESC LIMIT 100');
-    while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
     {
       $Items[] = array
@@ -92 +92 @@
       'Items' => $Items,
     ));
-    return($Output);
+    return $Output;
   }
 
@@ -105 +105 @@
     $UnionItems = array();
     $DbResult = $this->Database->query($GroupListQuery);
-    if($DbResult->num_rows > 0)
-    {
-      while($DbRow = $DbResult->fetch_assoc())
+    if ($DbResult->num_rows > 0)
+    {
+      while ($DbRow = $DbResult->fetch_assoc())
       {
         $UnionItems[] = 'SELECT `T`.`ID`, `T`.`Take`, `T`.`User`, `T`.`ModifyTime`, `T`.`Group`, `T`.`GroupName` '.
@@ -122 +122 @@
       $DbResult = $this->Database->query($Query);
       $Output .= '<table class="MiniTable"><tr><th>'.T('Date').'</th><th>'.T('Who').'</th><th>'.T('New').'</th><th>'.T('Source').'</th><th>'.T('Group').'</th></tr>';
-      while($DbRow = $DbResult->fetch_assoc())
+      while ($DbRow = $DbResult->fetch_assoc())
       {
         $Output .= '<tr><td>'.HumanDate($DbRow['ModifyTime']).'</td>'.
@@ -133 +133 @@
     }
     $Output .= '</div>';
-    return($Output);
+    return $Output;
   }
 
   function GetTranslationTree()
   {
-    if(isset($this->TranslationTree)) return($this->TranslationTree);
+    if (isset($this->TranslationTree)) return $this->TranslationTree;
     else {
       $Result = array();
       $Groups = array();
       $DbResult = $this->System->Database->query('SELECT *, UNIX_TIMESTAMP(`LastImport`) AS `LastImportTime` FROM `Group`');
-      while($DbRow = $DbResult->fetch_assoc())
+      while ($DbRow = $DbResult->fetch_assoc())
         $Groups[T($DbRow['Name'])] = $DbRow;
       ksort($Groups);
-      foreach($Groups as $Group)
+      foreach ($Groups as $Group)
       {
         $Group['Items'] = array();
@@ -153 +153 @@
       }
       $DbResult = $this->System->Database->query('SELECT * FROM `GroupItem` ORDER BY `Group`, `Sequence`');
-      while($DbRow = $DbResult->fetch_assoc())
+      while ($DbRow = $DbResult->fetch_assoc())
       {
         $Result[$DbRow['Group']]['Items'][] = $DbRow;
       }
       $this->TranslationTree = $Result;
-      return($Result);
+      return $Result;
     }
   }
@@ -168 +168 @@
     $Output = '<strong>'.T('Translate groups').':</strong><br /><div id="TranslationMenu">';
     $DbResult = $this->System->Database->select('Group', '`Id`, `Name`', '1 ORDER BY `Name`');
-    while($Group = $DbResult->fetch_assoc())
+    while ($Group = $DbResult->fetch_assoc())
     {
       $Groups[T($Group['Name'])] = $Group;
     }
     ksort($Groups);
-    foreach($Groups as $Group)
+    foreach ($Groups as $Group)
     {
       $Output .= '<div id="menuitem-group'.$Group['Id'].'" onmouseover="show(\'group'.$Group['Id'].'\')" onmouseout="hide(\'group'.$Group['Id'].'\')">'.
@@ -183 +183 @@
         '&nbsp;<a title="Přeložené texty, můžete zde hlasovat, nebo opravovat překlady" href="'.
         $this->System->Link('/TranslationList.php?group='.$Group['Id'].'&amp;state=2&amp;user=0&amp;entry=&amp;text=').'">'.T('Translated').'</a><br />';
-      if(isset($this->System->User) and $this->System->User->Licence(LICENCE_USER))
+      if (isset($this->System->User) and $this->System->User->Licence(LICENCE_USER))
       {
         $Output .= '&nbsp;<a title="'.T('Unfinished translations').'" href="'.$this->System->Link('/TranslationList.php?group='.$Group['Id'].'&amp;state=3').'">'.T('Unfinished').'</a><br />'.
@@ -196 +196 @@
     }
     $Output .= '</div>';
-    return($Output);
+    return $Output;
   }
 }

trunk/Modules/Translation/TranslationList.php

@@ -47 +47 @@
     );
     foreach ($StateTypes as $index => $StateType) {
-      if($Filter['State'] == $index) $Selected = ' selected="selected"';
+      if ($Filter['State'] == $index) $Selected = ' selected="selected"';
       else $Selected = '';
       $Output .= '<option value="'.$index.'"'.$Selected.'>'.$StateType.'</option>';
@@ -54 +54 @@
 
     // Translation group
-    if($GroupId == 0)
+    if ($GroupId == 0)
     {
       $Filter['Group'] = GetParameter('group', 0, true, true);
-      if($Filter['Group'] != 0)
+      if ($Filter['Group'] != 0)
       {
-        if(isset($TranslationTree[$Filter['Group']]) == false)
+        if (isset($TranslationTree[$Filter['Group']]) == false)
           ErrorMessage('Překladová skupina dle zadaného Id neexistuje.');
         $Table = $TranslationTree[$Filter['Group']]['TablePrefix'];
@@ -70 +70 @@
 
     $Output .= '<td><select name="group" style="width: 80px">';
-    if($Filter['Group'] == 0) $Selected = ' selected="selected"';
+    if ($Filter['Group'] == 0) $Selected = ' selected="selected"';
     else $Selected = '';
     $Output .= '<option value="0"'.$Selected.'>'.T('All').'</option>';
     $DbResult = $this->Database->query('SELECT `Id`,`Name` FROM `Group`');
-    while($Group = $DbResult->fetch_assoc())
+    while ($Group = $DbResult->fetch_assoc())
       $Groups[T($Group['Name'])] = $Group;
     ksort($Groups);
-    foreach($Groups as $Group)
-    {
-      if($Group['Id'] == $Filter['Group']) $Selected = ' selected="selected"';
+    foreach ($Groups as $Group)
+    {
+      if ($Group['Id'] == $Filter['Group']) $Selected = ' selected="selected"';
       else $Selected = '';
       $Output .= '<option value="'.$Group['Id'].'"'.$Selected.'>'.T($Group['Name']).'</option>';
@@ -89 +89 @@
     else
       $Filter['Version'] = GetParameter('version', 0, true, true);
-    if($Filter['Version'] != 0)
+    if ($Filter['Version'] != 0)
     {
       $DbResult = $this->Database->query('SELECT `Id`, `BuildNumber`,`Version` FROM `ClientVersion` WHERE (`Imported` = 1) AND (`Id` ='.$Filter['Version'].')');
-      if($DbResult->num_rows > 0)
+      if ($DbResult->num_rows > 0)
       {
         $DbRow = $DbResult->fetch_assoc();
@@ -99 +99 @@
     }
     $Output .= '<td><select name="version">';
-    if($Filter['Version'] == 0) $Selected = ' selected="selected"';
+    if ($Filter['Version'] == 0) $Selected = ' selected="selected"';
     else $Selected = '';
     $Output .= '<option value="0"'.$Selected.'>'.T('All').'</option>';
     $DbResult = $this->Database->query('SELECT `Id`, `BuildNumber`,`Version` FROM `ClientVersion` WHERE `Imported` = 1 ORDER BY `BuildNumber` DESC');
-    while($Version = $DbResult->fetch_assoc())
-    {
-      if($Version['Id'] == $Filter['Version']) $Selected = ' selected="selected"';
+    while ($Version = $DbResult->fetch_assoc())
+    {
+      if ($Version['Id'] == $Filter['Version']) $Selected = ' selected="selected"';
       else $Selected = '';
       $Output .= '<option value="'.$Version['Id'].'"'.$Selected.'>'.$Version['Version'].'</option>';
     }
     $Output .= '</select></td>';
-    if($Filter['Version'] != 0) $VersionFilter = ' AND (`VersionStart` <= '.$Filter['BuildNumber'].') AND (`VersionEnd` >= '.$Filter['BuildNumber'].')';
+    if ($Filter['Version'] != 0) $VersionFilter = ' AND (`VersionStart` <= '.$Filter['BuildNumber'].') AND (`VersionEnd` >= '.$Filter['BuildNumber'].')';
     else $VersionFilter = '';
     //else $Filter['SQL'] .= ' AND '; DISTINCT(Entry)
@@ -117 +117 @@
     $Filter['Language'] = GetParameter('lang', 0, true, true);
     $Output .= '<td><select name="lang">';
-    if($Filter['Language'] == 0) $Selected = ' selected="selected"';
+    if ($Filter['Language'] == 0) $Selected = ' selected="selected"';
     else $Selected = '';
     $Output .= '<option value="0"'.$Selected.'>'.T('All').'</option>';
     $DbResult = $this->Database->query('SELECT `Id`, `Name` FROM `Language` WHERE `Enabled` = 1 ORDER BY `Name`');
-    while($Language = $DbResult->fetch_assoc())
-    {
-      if($Language['Id'] == $Filter['Language']) $Selected = ' selected="selected"';
+    while ($Language = $DbResult->fetch_assoc())
+    {
+      if ($Language['Id'] == $Filter['Language']) $Selected = ' selected="selected"';
       else $Selected = '';
       $Output .= '<option value="'.$Language['Id'].'"'.$Selected.'>'.T($Language['Name']).'</option>';
@@ -130 +130 @@
     $LanguageFilter = '';
     $LanguageFilterSub = '';
-    if($Filter['Language'] != 0) {
+    if ($Filter['Language'] != 0) {
       $LanguageFilter = ' AND (`T`.`Language` = '.$Filter['Language'].')';
       $LanguageFilterSub = ' AND (`Sub`.`Language` = '.$Filter['Language'].')';
@@ -138 +138 @@
     $Filter['User'] = GetParameter('user', 0, true, true);
     $Output .= '<td><select name="user" style="width: 80px">';
-    if($Filter['User'] == 0) $Selected = ' selected="selected"';
+    if ($Filter['User'] == 0) $Selected = ' selected="selected"';
     else $Selected = '';
     $Output .= '<option value="0"'.$Selected.'>'.T('All').'</option>';
     $DbResult = $this->Database->query('SELECT `Id`, `Name` FROM `User` ORDER BY `Name`');
-    while($User = $DbResult->fetch_assoc())
-    {
-      if($User['Id'] == $Filter['User']) $Selected = ' selected="selected"';
+    while ($User = $DbResult->fetch_assoc())
+    {
+      if ($User['Id'] == $Filter['User']) $Selected = ' selected="selected"';
       else $Selected = '';
       $Output .= '<option value="'.$User['Id'].'"'.$Selected.'>'.$User['Name'].'</option>';
     }
     $Output .= '</select></td>';
-    if($Filter['User'] != 0) $UserFilter = ' AND (`User` = '.$Filter['User'].')';
+    if ($Filter['User'] != 0) $UserFilter = ' AND (`User` = '.$Filter['User'].')';
     else $UserFilter = '';
 
@@ -155 +155 @@
     $Filter['Text'] = GetParameter('text', '', false, true);
     $Output .= '<td><input name="text" type="text" style="width: 60px;" value="'.htmlentities($Filter['Text']).'"></td>';
-    if($Filter['Text'] != '')
+    if ($Filter['Text'] != '')
     {
       $Items = array('(`T`.`ID` LIKE "%'.$Filter['Text'].'%")', '(`T`.`Entry` LIKE "%'.$Filter['Text'].'%")');
-      if($Filter['Group'] != 0)
-        foreach($TranslationTree[$Filter['Group']]['Items'] as $GroupItem)
-        if($GroupItem['Visible'] == 1)
+      if ($Filter['Group'] != 0)
+        foreach ($TranslationTree[$Filter['Group']]['Items'] as $GroupItem)
+        if ($GroupItem['Visible'] == 1)
         $Items[] = '(`T`.`'.$GroupItem['Column'].'` LIKE "%'.$Filter['Text'].'%")';
       $Filter['SQL'] .= ' AND ('.implode(' OR ', $Items).')';
@@ -168 +168 @@
     $Filter['Entry'] = GetParameter('entry', '', false, true);
     $Output .= '<td><input name="entry" type="text" style="width: 60px;" value="'.htmlentities($Filter['Entry']).'"></td>';
-    if($Filter['Entry'] != '')
+    if ($Filter['Entry'] != '')
     {
       $Filter['SQL'] .= ' AND (`Entry` = "'.$Filter['Entry'].'")';
     }
 
-    if($Filter['Group'] != 0)
+    if ($Filter['Group'] != 0)
     {
         $WithoutAlter =       ' AND NOT EXISTS(SELECT 1 FROM `'.$Table.'` AS `Sub` WHERE '.
@@ -179 +179 @@
           ' AND (`Sub`.`Entry` = `T`.`Entry`) AND (`Sub`.`ID` != `T`.`ID`) AND (`Sub`.`Complete` = 1) AND '.
           '(`Sub`.`VersionStart` = `T`.`VersionStart`) AND (`Sub`.`VersionEnd` = `T`.`VersionEnd`) LIMIT 1 ) ';
-        foreach($TranslationTree[$Filter['Group']]['Items'] as $GroupItem)
-          if($GroupItem['Visible'] == 1) {
+        foreach ($TranslationTree[$Filter['Group']]['Items'] as $GroupItem)
+          if ($GroupItem['Visible'] == 1) {
             $ItemsVar[] =    'LENGTH(`T`.`'.$GroupItem['Column'].'`) - LENGTH( REPLACE( `T`.`'.$GroupItem['Column'].'`,  \'$\',  \'\' ) ) '.
                            ' < ('.
@@ -188 +188 @@
                               ')';
           }
-      if($Filter['State'] == CompletionState::All) {
+      if ($Filter['State'] == CompletionState::All) {
         $Filter['SQL'] .= $UserFilter.$VersionFilter;
       } else
-      if($Filter['State'] == CompletionState::NotTranslated) {
+      if ($Filter['State'] == CompletionState::NotTranslated) {
         $Filter['SQL'] .= $VersionFilter.' AND (`T`.`Language` = '.$this->System->Config['OriginalLanguage'].') '.
           'AND NOT EXISTS(SELECT 1 FROM `'.$Table.'` AS `Sub` WHERE '.
@@ -198 +198 @@
           '(`Sub`.`VersionStart` = `T`.`VersionStart`) AND (`Sub`.`VersionEnd` = `T`.`VersionEnd`))';
       } else
-      if($Filter['State'] == CompletionState::Translated) {
+      if ($Filter['State'] == CompletionState::Translated) {
         $Filter['SQL'] .= $UserFilter.$LanguageFilter.$VersionFilter.' AND (`T`.`Complete` = 1)';
       } else
-      if($Filter['State'] == CompletionState::NotFinished) {
+      if ($Filter['State'] == CompletionState::NotFinished) {
         $Filter['SQL'] .= $UserFilter.$LanguageFilter.$VersionFilter.' AND (`T`.`Language` != '.$this->System->Config['OriginalLanguage'].
       ') AND (`T`.`Complete` = 0)';
       } else
-      if($Filter['State'] == CompletionState::Original) {
+      if ($Filter['State'] == CompletionState::Original) {
         $Filter['SQL'] .= $VersionFilter.' AND (`T`.`Language` = '.$this->System->Config['OriginalLanguage'].')';
       } else
-      if($Filter['State'] == CompletionState::NotFinishedNotTranslated) {
+      if ($Filter['State'] == CompletionState::NotFinishedNotTranslated) {
         $Filter['SQL'] .= $UserFilter.$VersionFilter.$WithoutAlter.
       ' AND (`T`.`Language` != '.$this->System->Config['OriginalLanguage'].
       ') AND (`T`.`Complete` = 0)';
       } else
-      if($Filter['State'] == CompletionState::Missing1) {
+      if ($Filter['State'] == CompletionState::Missing1) {
         $Filter['SQL'] .= $UserFilter.$VersionFilter.' AND (`T`.`Complete` = 1) AND `T`.`Language` != '.$this->System->Config['OriginalLanguage'];
         $Filter['SQL'] .= ' AND ('.implode(' OR ', $ItemsVar).') ';
       } else
-      if($Filter['State'] == CompletionState::Missing2) {
+      if ($Filter['State'] == CompletionState::Missing2) {
         $Filter['SQL'] .= $UserFilter.$VersionFilter.' AND (`T`.`Complete` = 1) AND `T`.`Language` != '.$this->System->Config['OriginalLanguage'];
         $Filter['SQL'] .= ' '. $WithoutAlter;
@@ -226 +226 @@
     /*
      // Ownership
-    if(array_key_exists('owner', $_GET) and is_numeric($_GET['owner'])) $Filter['Owner'] = $_GET['owner'];
+    if (array_key_exists('owner', $_GET) and is_numeric($_GET['owner'])) $Filter['Owner'] = $_GET['owner'];
     else $Filter['Owner'] = 0;
     $Output .= ' <td><select name="owner">';
-    if($Filter['Owner'] == 0) $Selected = ' selected="selected"';
+    if ($Filter['Owner'] == 0) $Selected = ' selected="selected"';
     else $Selected = '';
     $Output .= '<option value="0"'.$Selected.'>Všech</option>';
-    if($Filter['Owner'] == 1) $Selected = ' selected="selected"';
+    if ($Filter['Owner'] == 1) $Selected = ' selected="selected"';
     else $Selected = '';
     $Output .= '<option value="1"'.$Selected.'>Překladatelův tým</option>';
-    if($Filter['Owner'] == 2) $Selected = ' selected="selected"';
+    if ($Filter['Owner'] == 2) $Selected = ' selected="selected"';
     else $Selected = '';
     $Output .= '<option value="2"'.$Selected.'>Překladatele</option>';
     $Output .= '</select></td>';
-    if(($Filter['Owner'] == 2) AND ($Filter['User'] != 0)) $Filter['SQL'] .= ' AND (`User` = '.$Filter['User'].')';
+    if (($Filter['Owner'] == 2) AND ($Filter['User'] != 0)) $Filter['SQL'] .= ' AND (`User` = '.$Filter['User'].')';
     */
 
@@ -246 +246 @@
     $Output .= '</form><br/>';
     $Filter['Output'] = $Output;
-    return($Filter);
+    return $Filter;
   }
 
@@ -289 +289 @@
 
     $DbResult = $this->Database->query($Query.' '.$Order['SQL'].' '.$PageList['SQLLimit']);
-    while($Line = $DbResult->fetch_assoc())
+    while ($Line = $DbResult->fetch_assoc())
     {
       $Output .= '<tr><td><a href="'.$this->System->Link('/form.php?group='.$Filter['Group'].'&amp;ID='.$Line['ID']).'">'.$Line['ID'].'</a></td>'.
@@ -305 +305 @@
     $Output .= '</table>'.
         $PageList['Output'];
-    return($Output);
+    return $Output;
   }
 
@@ -316 +316 @@
     $Output .= '<table class="BaseTable"><tr><th>'.T('Group').'</th><th>'.T('Count').'</th></tr>';
     $Total = 0;
-    foreach($TranslationTree as $Group)
-      if($Group['TablePrefix'] != '')
+    foreach ($TranslationTree as $Group)
+      if ($Group['TablePrefix'] != '')
       {
         $Filter = $this->ShowFilter($Group['Id']);
@@ -328 +328 @@
       $Output .= '<tr><td><strong>'.T('Total').'</strong></td><td><strong>'.$Total.'</strong></td></tr>'.
           '</table>';
-      return($Output);
+      return $Output;
   }
 
@@ -336 +336 @@
 
     $GroupId = GetParameter('group', 0, true);
-    if($GroupId == 0) $Output = ShowMessage('Skupina nenalezena', MESSAGE_CRITICAL);
+    if ($GroupId == 0) $Output = ShowMessage('Skupina nenalezena', MESSAGE_CRITICAL);
     else {
       $Table = $TranslationTree[$GroupId]['TablePrefix'];
@@ -351 +351 @@
           '<td>'.T('Texts marked as unfinished').'</td></tr>';
 
-      if($this->System->User->Licence(LICENCE_USER))
+      if ($this->System->User->Licence(LICENCE_USER))
       {
         $Output .= '<tr><td><a title="'.T('Unfinished texts').'" href="?group='.$GroupId.'&amp;state=3&amp;user='.$this->System->User->Id.'">'.T('My unfinished').'</a></td>
@@ -373 +373 @@
       $Output .= '</table>';
     }
-    return($Output);
+    return $Output;
   }
 
@@ -380 +380 @@
     $this->Title = T('Translation groups');
     $Action = GetParameter('action', '');
-    if($Action == 'filter') $Output = $this->ShowMenu();
+    if ($Action == 'filter') $Output = $this->ShowMenu();
     else
     {
       $Filter = $this->ShowFilter();
-      if($Filter['Group'] > 0) $Output = $this->ShowTranslationList($Filter);
+      if ($Filter['Group'] > 0) $Output = $this->ShowTranslationList($Filter);
         else $Output = $this->ShowGroupList($Filter);
     }
-    return($Output);
+    return $Output;
   }
 }
@@ -409 +409 @@
       array('Name' => 'LastVersion', 'Title' => T('Version of last import')),
    );
-   if($this->System->User->Licence(LICENCE_ADMIN))
+   if ($this->System->User->Licence(LICENCE_ADMIN))
    $TableColumns[] = array('Name' => '', 'Title' => T('Actions'));
 
@@ -416 +416 @@
 
    $DbResult = $this->Database->query('SELECT * FROM `Group`'.$Order['SQL'].$PageList['SQLLimit']);
-   while($Group = $DbResult->fetch_assoc())
+   while ($Group = $DbResult->fetch_assoc())
    {
      $Output .= '<tr><td><a href="'.$this->System->Link('/TranslationList.php?group='.$Group['Id'].'&amp;action=filter').'">'.T($Group['Name']).'</a></td>'.
        '<td>'.$Group['SourceType'].'</td><td>';
-     if($Group['MangosTable'] != '') $Output .= $Group['MangosTable'].'.sql ';
-     if($Group['DBCFileName'] != '') $Output .= $Group['DBCFileName'].'.dbc ';
-     if($Group['LuaFileName'] != '') $Output .= $Group['LuaFileName'].'.lua ';
+     if ($Group['MangosTable'] != '') $Output .= $Group['MangosTable'].'.sql ';
+     if ($Group['DBCFileName'] != '') $Output .= $Group['DBCFileName'].'.dbc ';
+     if ($Group['LuaFileName'] != '') $Output .= $Group['LuaFileName'].'.lua ';
      $Output .= '</td>';
-     if($this->System->User->Licence(LICENCE_ADMIN))
+     if ($this->System->User->Licence(LICENCE_ADMIN))
        $Output .= '<td><a title="Změny po posledním importu u vybrané překladové skupiny" href="'.$this->System->Link('/log/?group='.
      $Group['Id'].'&amp;type=11').'">'.HumanDate($Group['LastImport']).'</a></td>';
@@ -430 +430 @@
      $Output .= '<td><a href="'.$this->System->Link('/client-version/?action=item&amp;id='.
        GetVersionWOWId($Group['LastVersion'])).'">'.GetVersionWOW($Group['LastVersion']).'</a></td>';
-     if($this->System->User->Licence(LICENCE_ADMIN))
+     if ($this->System->User->Licence(LICENCE_ADMIN))
        $Output .= '<td><a href="?action=groupdelete&amp;id='.$Group['Id'].'">'.T('Remove').'</a></td>';
      $Output .= '</tr>';
@@ -436 +436 @@
     $Output .= '</table>'.
       '<br /><a title="'.T('Changelog of changes after import').'" href="'.$this->System->Link('/log/?type=11').'">'.T('Changelog of text modification during import').'</a><br/>';
-    if($this->System->User->Licence(LICENCE_ADMIN)) $Output .= '<a href="?action=groupadd">'.T('Add translation group').'</a>';
-    return($Output);
+    if ($this->System->User->Licence(LICENCE_ADMIN)) $Output .= '<a href="?action=groupadd">'.T('Add translation group').'</a>';
+    return $Output;
   }
 
   function ShowGroupAdd()
   {
-    if($this->System->User->Licence(LICENCE_ADMIN))
+    if ($this->System->User->Licence(LICENCE_ADMIN))
     {
       $Output = '<h3>Vložení nové překladové skupiny</h3>'.
@@ -452 +452 @@
           '</table></form>';
     } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
   function ShowGroupAddFinish()
   {
-    if($this->System->User->Licence(LICENCE_ADMIN))
+    if ($this->System->User->Licence(LICENCE_ADMIN))
     {
       $TableName = 'Text'.$_POST['TablePrefix'];
       $DbResult = $this->System->Database->select('Group', 'Id', 'TablePrefix="'.$TableName.'"');
-      if($DbResult->num_rows == 0)
+      if ($DbResult->num_rows == 0)
       {
 
@@ -500 +500 @@
       $Output .= $this->ShowList();
     } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
   function ShowGroupDelete()
   {
-    if($this->System->User->Licence(LICENCE_ADMIN))
+    if ($this->System->User->Licence(LICENCE_ADMIN))
     {
       $DbResult = $this->System->Database->select('Group', '*', '`Id`='.$_GET['id']);
-      if($DbResult->num_rows == 1)
+      if ($DbResult->num_rows == 1)
       {
         $Group = $DbResult->fetch_assoc();
@@ -518 +518 @@
     } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
     $Output .= $this->ShowList();
-    return($Output);
+    return $Output;
   }
 
@@ -525 +525 @@
     $this->Title = T('Translation groups');
     $Action = GetParameter('action', '');
-    if($Action == 'groupadd') $Output = $this->ShowGroupAdd();
-    else if($Action == 'groupdelete') $Output = $this->ShowGroupDelete();
-    else if($Action == 'groupaddfinish') $Output = $this->ShowGroupAddFinish();
+    if ($Action == 'groupadd') $Output = $this->ShowGroupAdd();
+    else if ($Action == 'groupdelete') $Output = $this->ShowGroupDelete();
+    else if ($Action == 'groupaddfinish') $Output = $this->ShowGroupAddFinish();
     else $Output = $this->ShowList();
-    return($Output);
+    return $Output;
   }
 }

trunk/Modules/Translation/UserLevel.php

@@ -11 +11 @@
   $Diakrit = array("á","č","ď","é","ě","í","ľ","ň","ó","ř","š","ť","ú",
   "ů","ý","ž","Á","Č","Ď","É","Ě","Í","Ľ","Ň","Ó","Ř","Š","Ť","Ú","Ů","Ý","Ž");
-  for($i = 0; $i < count($Diakrit); $i = $i + 1)
+  for ($i = 0; $i < count($Diakrit); $i = $i + 1)
   {
-    if(strpos($Word, $Diakrit[$i]) <> false)
+    if (strpos($Word, $Diakrit[$i]) <> false)
       $Result = true;
   }
-  return($Result);
+  return $Result;
 }
 
@@ -26 +26 @@
 
   $xp = 0;
-  foreach($TranslationTree as $Group)
+  foreach ($TranslationTree as $Group)
   {
-    if($Group['TablePrefix'] != '')
+    if ($Group['TablePrefix'] != '')
     {
       $GroupBy = 'GROUP BY ';
       $TakeColumns = '';
-      foreach($TranslationTree[$Group['Id']]['Items'] as $Index => $TextItem)
+      foreach ($TranslationTree[$Group['Id']]['Items'] as $Index => $TextItem)
       {
         $GroupBy .= '`T`.`'.$TextItem['Column'].'`, ';
@@ -42 +42 @@
         'LEFT JOIN `'.$Group['TablePrefix'].'` AS `T2` ON `T2`.`ID` = `T`.`Take` '.
         'WHERE (`T`.`User` = '.$UserId.') AND (`T`.`Complete` = 1) AND (`T`.`Take` IS NOT NULL) '.$GroupBy);
-      while($Line = $IDtran->fetch_array())
+      while ($Line = $IDtran->fetch_array())
       {
         $xp_translation = 0;
         $translated = true;
-        foreach($TranslationTree[$Group['Id']]['Items'] as $Index => $TextItem)
+        foreach ($TranslationTree[$Group['Id']]['Items'] as $Index => $TextItem)
         {
-          if(($Line[$TextItem['Column']] <> $Line[$TextItem['Column'].'_Take']) and
+          if (($Line[$TextItem['Column']] <> $Line[$TextItem['Column'].'_Take']) and
             (strlen($Line[$TextItem['Column']]) > (strlen($Line[$TextItem['Column'].'_Take']) * 0.5)))
           {
             $TextArr = explode(' ', $Line[$TextItem['Column']]);
-            foreach($TextArr as $Word)
+            foreach ($TextArr as $Word)
             {
-              if(CheckDiakrit($Word)) $indikator = $from_diakrit;
+              if (CheckDiakrit($Word)) $indikator = $from_diakrit;
                 else $indikator = 1;
               $xp_translation = $xp_translation + ($indikator * $xp_from_word);
@@ -65 +65 @@
           }
         }
-        if($translated) $xp = $xp + $xp_translation;   // XP addition for entire translation if complete translated
+        if ($translated) $xp = $xp + $xp_translation;   // XP addition for entire translation if complete translated
       }
     }
   }
-  return($xp);
+  return $xp;
 }
 
@@ -79 +79 @@
   // Main code for users
   $DbResult = $System->Database->query('SELECT `ID`, `Name` FROM `User` WHERE `Id` = '.$UserId);
-  if($DbResult->num_rows > 0)
+  if ($DbResult->num_rows > 0)
   {
-    while($LineUser = $DbResult->fetch_array())
+    while ($LineUser = $DbResult->fetch_array())
     {
       // Build TranslatedCount query
       $TranslatedCount = '(';
-      if(count($TranslationTree) > 0)
+      if (count($TranslationTree) > 0)
       {
-      foreach($TranslationTree as $Group)
-        if($Group['TablePrefix'] != '')
+      foreach ($TranslationTree as $Group)
+        if ($Group['TablePrefix'] != '')
         {
           $Count = '(SELECT COUNT(*) FROM `'.$Group['TablePrefix'].'` WHERE (`Complete` = 1) AND (`Language` <> '.

trunk/Modules/User/Options.php

@@ -17 +17 @@
         '<option value="0">'.T('Nowhere').'</option>'.
         '<option value="1"';
-    if($this->System->User->Redirecting == '1') $Output .= ' selected="selected"';
+    if ($this->System->User->Redirecting == '1') $Output .= ' selected="selected"';
     $Output .= '>'.T('To untranslated').'</option>';
     $Output .= '<option value="2"';
-    if($this->System->User->Redirecting == '2') $Output .= ' selected="selected"';
+    if ($this->System->User->Redirecting == '2') $Output .= ' selected="selected"';
     $Output .= '>'.T('To next translation').'</option>';
     $Output .= '<option value="3"';
-    if($this->System->User->Redirecting == '3') $Output .= ' selected="selected"';
+    if ($this->System->User->Redirecting == '3') $Output .= ' selected="selected"';
     $Output .= '>'.T('To previous translation').'</option>';
     $Output .= '</select>';
@@ -60 +60 @@
         '<input type="hidden" name="action" value="gointeam"/>'.
         '<select name="id">';
-    while($LineTeam = $DbResult->fetch_assoc())
+    while ($LineTeam = $DbResult->fetch_assoc())
     {
       $Output .= '<option value="'.$LineTeam['Id'].'"';
@@ -69 +69 @@
     </form>';
     $Output .= '</fieldset>';
-    return($Output);
+    return $Output;
   }
 
@@ -75 +75 @@
   {
     $Output = '';
-    if(array_key_exists('Email', $_POST))
+    if (array_key_exists('Email', $_POST))
     {
       $Email = $_POST['Email'];
@@ -84 +84 @@
       $Redirecting = $_POST['redirecting'];
       $PreferredVersion = $_POST['ClientVersion'];
-      if($PreferredVersion == '') $PreferredVersion = null;
+      if ($PreferredVersion == '') $PreferredVersion = null;
       $Info = $_POST['info'];
 
       // Do user want to change password?
-      if(($OldPass != '') or ($NewPass != '') or ($NewPass2 != ''))
+      if (($OldPass != '') or ($NewPass != '') or ($NewPass2 != ''))
       {
-        if($NewPass == $NewPass2)
+        if ($NewPass == $NewPass2)
         {
           $DbResult = $this->System->Database->query('SELECT `Pass`, '.$this->System->User->CryptPasswordSQL('"'.$OldPass.'"', '`Salt`').' AS `Hash` FROM `User` WHERE `ID`= '.$this->System->User->Id);
           $DbRow = $DbResult->fetch_assoc();
-          if($DbRow['Hash'] == $DbRow['Pass'])
+          if ($DbRow['Hash'] == $DbRow['Pass'])
           {
             // Update password
@@ -130 +130 @@
       $this->System->User->Load();
     } else $Output .= ShowMessage('Nezadány údaje.', MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
@@ -137 +137 @@
     $this->Title = T('User settings');
     $Output = '';
-    if($this->System->User->Licence(LICENCE_USER))
+    if ($this->System->User->Licence(LICENCE_USER))
     {
-      if(array_key_exists('action', $_GET) and ($_GET['action'] == 'save'))
+      if (array_key_exists('action', $_GET) and ($_GET['action'] == 'save'))
       {
         $Output .= $this->UserOptionsSave();
@@ -145 +145 @@
       $Output .= $this->UserOptionsFrom();
     } else $Output .= ShowMessage('Nejste přihlášený.', MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 }

trunk/Modules/User/Profile.php

@@ -6 +6 @@
   {
     $Output = '';
-    if(array_key_exists('text', $_POST))
-    if($this->System->User->Licence(LICENCE_ADMIN))
+    if (array_key_exists('text', $_POST))
+    if ($this->System->User->Licence(LICENCE_ADMIN))
     {
       $Text = $_POST['text'];
@@ -16 +16 @@
         'Text: <strong>'.$Text.'</strong><br />';
 
-      if(@mail($Email, $Subject, $Text, 'From: '.$this->System->Config['Web']['AdminEmail'].
+      if (@mail($Email, $Subject, $Text, 'From: '.$this->System->Config['Web']['AdminEmail'].
         '\nReply-To: '.$this->System->Config['Web']['AdminEmail'].'\nX-Mailer: PHP/'))
       {
@@ -23 +23 @@
       else $Output .= ShowMessage('Nepodařilo se odesat E-mail.', MESSAGE_CRITICAL);
     } else $Output .= ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
@@ -57 +57 @@
       '(SELECT COUNT(*) FROM `ExportUser` WHERE `ExportUser`.`Export`=`Export`.`Id`) AS `UserCount` FROM `Export` '.
       'LEFT JOIN `User` ON `User`.`ID`=`Export`.`User` '.$Filter.$Order['SQL'].$PageList['SQLLimit']);
-    while($Export = $DbResult->fetch_assoc())
+    while ($Export = $DbResult->fetch_assoc())
     {
       $Action = '<a href="'.$this->System->Link('/export/?Action=View&amp;ExportId='.$Export['Id'].'&amp;Tab=0').'">'.T('Show').'</a> '.
         '<a href="'.$this->System->Link('/export/?Action=View&amp;ExportId='.$Export['Id'].'&amp;Tab=7').'">'.T('Export').'</a>';
-      if($Export['User'] == $this->System->User->Id) $Action .= ' <a href="?Action=Delete&amp;ExportId='.$Export['Id'].'" onclick="return confirmAction(\''.T('Really remove item?').'\');">'.T('Remove').'</a>';
-      if($this->System->User->Id != null) $Action .= ' <a href="'.$this->System->Link('/export/?Action=Clone&amp;ExportId='.$Export['Id']).'" onclick="return confirmAction(\''.T('Really clone item?').'\');">'.T('Clone').'</a>';
+      if ($Export['User'] == $this->System->User->Id) $Action .= ' <a href="?Action=Delete&amp;ExportId='.$Export['Id'].'" onclick="return confirmAction(\''.T('Really remove item?').'\');">'.T('Remove').'</a>';
+      if ($this->System->User->Id != null) $Action .= ' <a href="'.$this->System->Link('/export/?Action=Clone&amp;ExportId='.$Export['Id']).'" onclick="return confirmAction(\''.T('Really clone item?').'\');">'.T('Clone').'</a>';
       $Output .= '<tr><td>'.HumanDate($Export['TimeCreate']).'</td>'.
         '<td>'.htmlspecialchars($Export['Title']).'</td>'.
@@ -74 +74 @@
 
     $Output .= '<div style="text-align: center;"><a href="'.$this->System->Link('/export/').'">'.T('Export page').'</a></div>';
-    return($Output);
+    return $Output;
   }
 
@@ -86 +86 @@
     $UnionItems = array();
     $DbResult = $this->Database->query($GroupListQuery);
-    if($DbResult->num_rows > 0)
-    {
-      while($DbRow = $DbResult->fetch_assoc())
+    if ($DbResult->num_rows > 0)
+    {
+      while ($DbRow = $DbResult->fetch_assoc())
       {
         $UnionItems[] = 'SELECT `T`.`ID`, `T`.`Take`, `T`.`User`, `T`.`ModifyTime`, `T`.`Group`, `T`.`GroupName` '.
@@ -106 +106 @@
       $Output .= '<table class="BaseTable"><tr>'.
         '<th>'.T('Date').'</th><th>'.T('New').'</th><th>'.T('Source').'</th><th>'.T('Group').'</th></tr>';
-      while($DbRow = $DbResult->fetch_assoc())
+      while ($DbRow = $DbResult->fetch_assoc())
       {
         $Output .= '<tr><td>'.HumanDate($DbRow['ModifyTime']).'</td>'.
@@ -115 +115 @@
       $Output .= '</table>';
     }
-    return($Output);
+    return $Output;
   }
 
@@ -130 +130 @@
       'JOIN `ForumThread` ON `ForumThread`.`ID` = `ForumText`.`Thread` '.
       'WHERE `ForumText`.`User` = '.($_GET['user'] * 1).' ORDER BY `ForumText`.`Date` DESC LIMIT '.$Count);
-    while($Line = $DbResult->fetch_assoc())
+    while ($Line = $DbResult->fetch_assoc())
       $Output .= '<div><a href="'.$this->System->Link('/forum/?Thread='.$Line['Thread']).'">'.htmlspecialchars($Line['ThreadName']).'</a><br />'.
         '<strong>'.$Line['UserName'].'</strong> ('.HumanDate($Line['Date']).'): '.$parser->qparse(htmlspecialchars($Line['Text'])).'</div> ';
     $Output .= '</div>';
-    return($Output);
+    return $Output;
   }
 
@@ -151 +151 @@
       'WHERE `User`.`Id` = '.($_GET['user'] * 1);
     $DbResult = $this->Database->query($Query);
-    if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
     {
       $UserLine = $DbResult->fetch_array();
@@ -163 +163 @@
         T('Number of translated:').' <a href="'.$this->System->Link('/TranslationList.php?user='.$UserLine['ID'].'&amp;state=2&amp;group=0').'" title="Zobrazit Všechny jeho přeložené texty"><strong>'.$UserLine['TranslatedCount'].'</strong></a><br />'.
         T('Level:').' <strong>'.$XP['Level'].'</strong> '.T('experience:').' '.ProgressBar(150, round($XP['XP'] / $XP['MaxXP'] * 100, 2), $XP['XP'].' / '.$XP['MaxXP']).'<br/>';
-      if($this->System->ModuleManager->ModuleRunning('Team') and ($UserLine['TeamName'] != ''))
+      if ($this->System->ModuleManager->ModuleRunning('Team') and ($UserLine['TeamName'] != ''))
         $Output .= T('Member of team:').' <a href="'.$this->System->Link('/team/?action=team&amp;id='.$UserLine['Team']).'"><strong>'.htmlspecialchars($UserLine['TeamName']).'</strong></a><br />';
 
@@ -187 +187 @@
       '</tr></table>';
     $Output .= '<br />'.$this->ShowLastForum().'<br />';
-    if($this->System->User->Licence(LICENCE_MODERATOR))
+    if ($this->System->User->Licence(LICENCE_MODERATOR))
     {
       $Output .= '<fieldset><legend>Moderování</legend>';
@@ -243 +243 @@
       }
     } else $Output .= ShowMessage('Uživatel nenalezen', MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
@@ -250 +250 @@
     $this->Title = T('User profile');
     $Output = $this->SendMail();
-    if(array_key_exists('user', $_GET))
+    if (array_key_exists('user', $_GET))
     {
       $Output .= $this->ShowProfile();
     } else $Output .= ShowMessage('Nevybrán uživatel', MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 }

trunk/Modules/User/Registration.php

@@ -5 +5 @@
   function ShowForm()
   {
-    if(array_key_exists('sc', $_POST)) $Human = true;
+    if (array_key_exists('sc', $_POST)) $Human = true;
       else $Human = false;
-    if(array_key_exists('user', $_POST)) $UserName = $_POST['user'];
+    if (array_key_exists('user', $_POST)) $UserName = $_POST['user'];
       else $UserName = '';
-    if(array_key_exists('Email', $_POST)) $Email = $_POST['Email'];
+    if (array_key_exists('Email', $_POST)) $Email = $_POST['Email'];
       else $Email = '';
-    if(array_key_exists('Team', $_POST)) $Team = $_POST['Team'];
+    if (array_key_exists('Team', $_POST)) $Team = $_POST['Team'];
       else $Team = '';
-    if(array_key_exists('Language', $_POST)) $Language = $_POST['Language'];
+    if (array_key_exists('Language', $_POST)) $Language = $_POST['Language'];
       else $Language = 1;
 
@@ -24 +24 @@
     <tr>
     <th class="Left">'.T('Are you human?').'</th>';
-    if($Human) $Checked = ' checked="checked"';
+    if ($Human) $Checked = ' checked="checked"';
       else $Checked = '';
     $Output .= '<td><input type="checkbox" name="sc" '.$Checked.'/></td>
@@ -50 +50 @@
     <tr>
     <th class="Left">'.T('I belong to team').':</th>';
-    if($Team == '') $Selected = ' selected="selected"';
+    if ($Team == '') $Selected = ' selected="selected"';
       else $Selected = '';
     $Output .= '<td><select name="Team"><option value="0"'.$Selected.'>'.T('none').'</option>';
     $DbResult = $this->Database->query('SELECT `Name`, `Id` FROM `Team`');
-    while($Line = $DbResult->fetch_assoc())
+    while ($Line = $DbResult->fetch_assoc())
     {
-      if($Team == $Line['Id']) $Selected = ' selected="selected"';
+      if ($Team == $Line['Id']) $Selected = ' selected="selected"';
       else $Selected = '';
       $Output .= '<option value="0'.$Line['Id'].'"'.$Selected.'>'.htmlspecialchars($Line['Name']).'</option>';
@@ -81 +81 @@
     </tr>
     </table></fieldset></form>';
-    return($Output);
+    return $Output;
   }
 
@@ -91 +91 @@
     $ShowForm = true;
 
-      if(array_key_exists('user', $_POST)) $UserName = $_POST['user'];
+      if (array_key_exists('user', $_POST)) $UserName = $_POST['user'];
         else $UserName = '';
-      if(array_key_exists('pass', $_POST)) $Pass = $_POST['pass'];
+      if (array_key_exists('pass', $_POST)) $Pass = $_POST['pass'];
         else $Pass = '';
-      if(array_key_exists('pass2', $_POST)) $Pass2 = $_POST['pass2'];
+      if (array_key_exists('pass2', $_POST)) $Pass2 = $_POST['pass2'];
         else $Pass2 = '';
-      if(array_key_exists('Email', $_POST)) $Email = $_POST['Email'];
+      if (array_key_exists('Email', $_POST)) $Email = $_POST['Email'];
         else $Email = '';
-      if(array_key_exists('Team', $_POST)) $Team = $_POST['Team'] * 1;
+      if (array_key_exists('Team', $_POST)) $Team = $_POST['Team'] * 1;
         else $Team = '';
-      if(array_key_exists('Language', $_POST)) $Language = $_POST['Language'] * 1;
+      if (array_key_exists('Language', $_POST)) $Language = $_POST['Language'] * 1;
         else $Language = '';
-      if(array_key_exists('ClientVersion', $_POST)) $PreferredVersion = $_POST['ClientVersion'] * 1;
+      if (array_key_exists('ClientVersion', $_POST)) $PreferredVersion = $_POST['ClientVersion'] * 1;
         else $PreferredVersion = '';
-      if($PreferredVersion == '') $PreferredVersion = 'NULL';
-      if(array_key_exists('sc', $_POST)) $SpamCheck = $_POST['sc'];
+      if ($PreferredVersion == '') $PreferredVersion = 'NULL';
+      if (array_key_exists('sc', $_POST)) $SpamCheck = $_POST['sc'];
         else $SpamCheck = '';
 
-      if($SpamCheck != '')
+      if ($SpamCheck != '')
       {
-        if(($UserName != '') and ($Pass != '') and ($Pass2 != ''))
+        if (($UserName != '') and ($Pass != '') and ($Pass2 != ''))
         {
-          if(!in_array(strtolower($UserName), $Config['ForbiddedUserNames']))
+          if (!in_array(strtolower($UserName), $Config['ForbiddedUserNames']))
           {
-            if($Pass == $Pass2)
+            if ($Pass == $Pass2)
             {
               $DbResult = $this->Database->query('SELECT * FROM `User` WHERE LOWER(`Name`) = LOWER("'.$UserName.'")');
               $Line = $DbResult->fetch_row();
-              if(!$Line)
+              if (!$Line)
               {
-                if($Team == 0) $Team = 'NULL';
+                if ($Team == 0) $Team = 'NULL';
                 $this->System->User->Register($UserName, $Pass, $Email, $Language, $Team, $PreferredVersion);
                 $Output .= ShowMessage(T('Registration was successful'));
@@ -154 +154 @@
       } else $Output = ShowMessage('Nejsi člověk. Strojům není dovoleno se registrovat.', MESSAGE_CRITICAL);
 
-      if($ShowForm) $Output .= $this->ShowForm();
-      return($Output);
+      if ($ShowForm) $Output .= $this->ShowForm();
+      return $Output;
   }
 
@@ -162 +162 @@
     $this->Title = T('User registration');
     $Output = '';
-    if(array_key_exists('user', $_POST))
+    if (array_key_exists('user', $_POST))
     {
       $Output .= $this->CheckRegistration();
     } else $Output .= $this->ShowForm();
-    return($Output);
+    return $Output;
   }
 }

trunk/Modules/User/User.php

@@ -34 +34 @@
       'Icon' => '',
     ), 0);
-    if(array_key_exists('Search', $this->System->ModuleManager->Modules))
+    if (array_key_exists('Search', $this->System->ModuleManager->Modules))
       $this->System->ModuleManager->Modules['Search']->RegisterSearch('user',
       T('Translators'), array('Name'), '`User`', $this->System->Link('/users/?search='));
@@ -49 +49 @@
       'WHERE (`ActivityTime` >= NOW() - 300) '.
       'ORDER BY `ActivityTime` DESC ) AS `T` GROUP BY `Name`');
-    while($DbUser = $DbResult->fetch_assoc())
+    while ($DbUser = $DbResult->fetch_assoc())
     {
       $Name = '<a href="'.$this->System->Link('/user/?user='.$DbUser['ID']).'">'.$DbUser['Name'].'</a>';
       $Output .= $Name.'<br />';
     }
-    return($Output);
+    return $Output;
   }
 
@@ -60 +60 @@
   {
     $Output = '';
-    if($this->System->User->Licence(LICENCE_USER))
+    if ($this->System->User->Licence(LICENCE_USER))
     {
       //$DbResult =$this->Database->query('SELECT `Id`, `Name` FROM `Team` WHERE `Id`='.$this->System->User->Team);
@@ -79 +79 @@
         '<a href="'.$this->System->Link('/registration/').'">'.T('Registration').'</a>';
     }
-    return($Output);
+    return $Output;
   }
 }
@@ -104 +104 @@
       </table>
       </fieldset></form>';
-      return($Output);
+      return $Output;
   }
 }
@@ -132 +132 @@
     $this->Database = &$System->Database;
     $this->OnlineStateTimeout = 600; // in seconds
-    if(isset($_SESSION)) $this->Check();
+    if (isset($_SESSION)) $this->Check();
   }
 
@@ -144 +144 @@
     $DbResult = $this->Database->query('SELECT `ID` FROM `User` WHERE '.
       'LOWER(`Name`) = LOWER("'.$Name.'") AND `Pass` = '.$this->CryptPasswordSQL('"'.$Password.'"', '`Salt`'));
-    if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
     {
       $User = $DbResult->fetch_assoc();
@@ -151 +151 @@
       // Prepare cookies for permanent login
       $StayLoggedSalt = $this->GetPasswordSalt();
-      if($StayLogged == true) $StayLoggedValue = 1; else $StayLoggedValue = 0;
+      if ($StayLogged == true) $StayLoggedValue = 1; else $StayLoggedValue = 0;
       $this->Database->update('UserOnline', '`SessionId`="'.$SID.'"', array(
         'User' => $User['ID'], 'StayLogged' => $StayLoggedValue, 'StayLoggedHash' => $StayLoggedSalt));
-      if($StayLogged)
+      if ($StayLogged)
       {
         setcookie('LoginUserId', $User['ID'], time() + 365 * 24 * 60 * 60);
@@ -176 +176 @@
   {
     $SID = session_id();
-    if($this->Role != LICENCE_ANONYMOUS)
+    if ($this->Role != LICENCE_ANONYMOUS)
     {
       $this->Database->update('UserOnline', '`SessionId`="'.$SID.'"', array('User' => null));
@@ -192 +192 @@
     'LEFT JOIN `ClientVersion` ON `ClientVersion`.`Id` = `User`.`PreferredVersion` '.
     'WHERE `User`.`ID` = '.$this->Id);
-    if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
     {
       $User = $DbResult->fetch_assoc();
@@ -222 +222 @@
   function Licence($Licence)
   {
-    if(GetRemoteAddress() == '') return(true); // Execution from command line
-      else return($this->Role >= $Licence);
+    if (GetRemoteAddress() == '') return true; // Execution from command line
+      else return $this->Role >= $Licence;
   }
 
@@ -229 +229 @@
   {
     $DbResult = $this->Database->select('APIToken', 'User', '`Token`="'.$Token.'"');
-    if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
     {
       $DbRow = $DbResult->fetch_assoc();
       $DbResult2 = $this->Database->select('User', 'GM', '`ID`="'.$DbRow['User'].'"');
       $DbRow2 = $DbResult2->fetch_assoc();
-      return($DbRow2['GM'] >= $Licence);
-    } else return(false);
+      return $DbRow2['GM'] >= $Licence;
+    } else return false;
   }
 
   function GetPasswordSalt()
   {
-    return(substr(sha1(mt_rand()), 0, 8));
+    return substr(sha1(mt_rand()), 0, 8);
   }
 
   function CryptPasswordSQL($Password, $Salt)
   {
-    return('SHA1(CONCAT(SHA1('.$Password.'), '.$Salt.'))');
+    return 'SHA1(CONCAT(SHA1('.$Password.'), '.$Salt.'))';
   }
 
@@ -253 +253 @@
     // Lookup user record
     $Query = $this->Database->select('UserOnline', '*', 'SessionId="'.$SID.'"');
-    if($Query->num_rows > 0)
+    if ($Query->num_rows > 0)
     {
       // Refresh time of last access
       $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array('ActivityTime' => 'NOW()'));
     } else {
-      if(GetRemoteAddress() != '') $HostName = gethostbyaddr(GetRemoteAddress());
+      if (GetRemoteAddress() != '') $HostName = gethostbyaddr(GetRemoteAddress());
         else $HostName = '';
       $this->Database->insert('UserOnline', array('SessionId' => $SID,
@@ -267 +267 @@
 
     // Logged permanently?
-    if(array_key_exists('LoginHash', $_COOKIE))
+    if (array_key_exists('LoginHash', $_COOKIE))
     {
       $DbResult = $this->Database->query('SELECT * FROM `UserOnline` WHERE `User`='.$_COOKIE['LoginUserId'].
         ' AND `StayLogged`=1 AND SessionId!="'.$SID.'"');
-      if($DbResult->num_rows > 0)
+      if ($DbResult->num_rows > 0)
       {
         $DbRow = $DbResult->fetch_assoc();
-        if(sha1($_COOKIE['LoginUserId'].$DbRow['StayLoggedHash']) == $_COOKIE['LoginHash'])
+        if (sha1($_COOKIE['LoginUserId'].$DbRow['StayLoggedHash']) == $_COOKIE['LoginHash'])
         {
           $this->Database->query('DELETE FROM `UserOnline` WHERE `SessionId`="'.$SID.'"');
@@ -285 +285 @@
     $Query = $this->Database->select('UserOnline', '*', '`SessionId`="'.$SID.'"');
     $Row = $Query->fetch_assoc();
-    if($Row['User'] != '')
+    if ($Row['User'] != '')
     {
       $this->Id = $Row['User'];
@@ -296 +296 @@
     // Remove nonactive users
     $DbResult = $this->Database->select('UserOnline', '`Id`, `User`', '(`ActivityTime` < DATE_SUB(NOW(), INTERVAL '.$this->OnlineStateTimeout.' SECOND)) AND (`StayLogged` = 0)');
-    while($DbRow = $DbResult->fetch_array())
+    while ($DbRow = $DbResult->fetch_array())
     {
       $this->Database->delete('UserOnline', 'Id='.$DbRow['Id']);
@@ -305 +305 @@
   {
     $Salt = $this->GetPasswordSalt();
-    if($Team == null) $Team = 'NULL';
-    if($PreferredVersion == null) $PreferredVersion = 'NULL';
+    if ($Team == null) $Team = 'NULL';
+    if ($PreferredVersion == null) $PreferredVersion = 'NULL';
     $this->Database->query('INSERT INTO `User` '.
       '(`Name` , `Pass` , `Salt`, `Email` , `Language` , `Team` , `NeedUpdate`, `RegistrationTime`, `PreferredVersion` ) '.

trunk/Modules/User/UserList.php

@@ -7 +7 @@
     $this->Title = T('Translators');
     $Output = '';
-    if(array_key_exists('search', $_GET)) $_SESSION['search'] = $_GET['search'];
-    else if(!array_key_exists('search', $_SESSION)) $_SESSION['search'] = '';
-    if(array_key_exists('search', $_GET) and ($_GET['search'] == '')) $_SESSION['search'] = '';
-    if($_SESSION['search'] != '')
+    if (array_key_exists('search', $_GET)) $_SESSION['search'] = $_GET['search'];
+    else if (!array_key_exists('search', $_SESSION)) $_SESSION['search'] = '';
+    if (array_key_exists('search', $_GET) and ($_GET['search'] == '')) $_SESSION['search'] = '';
+    if ($_SESSION['search'] != '')
     {
       $SearchQuery = ' AND (`User`.`Name` LIKE "%'.$_SESSION['search'].'%")';
@@ -17 +17 @@
 
     $TeamFilter = '';
-    if(array_key_exists('team', $_GET))
+    if (array_key_exists('team', $_GET))
     {
       $TeamId = $_GET['team'] * 1;
       $DbResult = $this->Database->select('Team', 'Name', '`Id`='.$TeamId);
-      if($DbResult->num_rows > 0)
+      if ($DbResult->num_rows > 0)
       {
         $Team = $DbResult->fetch_assoc();
@@ -58 +58 @@
 
     $DbResult = $this->Database->query($Query);
-    while($Line = $DbResult->fetch_assoc())
+    while ($Line = $DbResult->fetch_assoc())
     {
       $XP = GetLevelMinMax($Line['XP']);
@@ -71 +71 @@
         $PageList['Output'];
 
-    return($Output);
+    return $Output;
   }
 }

trunk/Modules/Wiki/Wiki.php

@@ -22 +22 @@
   {
     $DbResult = $this->Database->select('WikiPage', '*', '`VisibleInMenu`=1');
-    while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
     {
       $this->System->RegisterPage($DbRow['NormalizedName'], 'PageWiki');
@@ -40 +40 @@
   function Show()
   {
-    if(array_key_exists('Action', $_GET))
-    {
-      if($_GET['Action'] == 'Edit') $Output = $this->EditContent();
-      else if($_GET['Action'] == 'EditSave') $Output = $this->SaveContent();
-      else if($_GET['Action'] == 'History') $Output = $this->ShowHistory();
+    if (array_key_exists('Action', $_GET))
+    {
+      if ($_GET['Action'] == 'Edit') $Output = $this->EditContent();
+      else if ($_GET['Action'] == 'EditSave') $Output = $this->SaveContent();
+      else if ($_GET['Action'] == 'History') $Output = $this->ShowHistory();
       else $Output = $this->ShowContent();
     } else $Output = $this->ShowContent();
-    return($Output);
+    return $Output;
   }
 
@@ -54 +54 @@
     $PageName = $this->System->PathItems[count($this->System->PathItems) - 1];
     $DbResult = $this->Database->select('WikiPage', 'Name, Id', 'NormalizedName="'.$PageName.'"');
-    if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
     {
       $DbRow = $DbResult->fetch_assoc();
-      if(array_key_exists('ver', $_GET))
+      if (array_key_exists('ver', $_GET))
       {
         $DbResult2 = $this->Database->select('WikiPageContent', '*', 'Page='.$DbRow['Id'].' AND Id='.$_GET['ver']*1);
-        if($DbResult2->num_rows > 0)
+        if ($DbResult2->num_rows > 0)
         {
           $DbRow2 = $DbResult2->fetch_assoc();
           $Output = '<h3>Archív stránky '.$DbRow['Name'].' ('.HumanDateTime($DbRow2['Time']).')</h3>';
           $Output .= $DbRow2['Content'];
-          if($this->System->User->Licence(LICENCE_MODERATOR))
+          if ($this->System->User->Licence(LICENCE_MODERATOR))
             $Output .= '<div><a href="?Action=Edit">Upravit nejnovější</a> <a href="?Action=History">Historie</a></div>';
         } else $Output = ShowMessage('Wiki stránka nenalezena', MESSAGE_CRITICAL);
@@ -71 +71 @@
       {
         $DbResult2 = $this->Database->select('WikiPageContent', '*', 'Page='.$DbRow['Id'].' ORDER BY Time DESC LIMIT 1');
-        if($DbResult2->num_rows > 0)
+        if ($DbResult2->num_rows > 0)
         {
           $DbRow2 = $DbResult2->fetch_assoc();
           $Output = '<h3>'.$DbRow['Name'].'</h3>';
           $Output .= $DbRow2['Content'];
-          if($this->System->User->Licence(LICENCE_MODERATOR))
+          if ($this->System->User->Licence(LICENCE_MODERATOR))
             $Output .= '<hr><div><a href="?Action=Edit">Upravit</a> <a href="?Action=History">Historie</a></div>';
         } else $Output = ShowMessage('Wiki stránka nenalezena', MESSAGE_CRITICAL);
       }
     } else $Output = ShowMessage('Wiki stránka nenalezena', MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
   function EditContent()
   {
-    if($this->System->User->Licence(LICENCE_MODERATOR))
+    if ($this->System->User->Licence(LICENCE_MODERATOR))
     {
     $PageName = $this->System->PathItems[count($this->System->PathItems) - 1];
     $DbResult = $this->Database->select('WikiPage', 'Name, Id', 'NormalizedName="'.$PageName.'"');
-    if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
     {
       $DbRow = $DbResult->fetch_assoc();
       $Output = '<h3>Úprava '.$DbRow['Name'].'</h3>';
       $DbResult2 = $this->Database->select('WikiPageContent', '*', 'Page='.$DbRow['Id'].' ORDER BY Time DESC LIMIT 1');
-      if($DbResult2->num_rows > 0)
+      if ($DbResult2->num_rows > 0)
       {
         $DbRow2 = $DbResult2->fetch_assoc();
@@ -106 +106 @@
     } else $Output = ShowMessage('Wiki stránka nenalezena', MESSAGE_CRITICAL);
     } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
   function SaveContent()
   {
-    if($this->System->User->Licence(LICENCE_MODERATOR))
+    if ($this->System->User->Licence(LICENCE_MODERATOR))
     {
     $PageName = $this->System->PathItems[count($this->System->PathItems) - 1];
     $DbResult = $this->Database->select('WikiPage', 'Name, Id', 'NormalizedName="'.$PageName.'"');
-    if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
     {
       $DbRow = $DbResult->fetch_assoc();
-      if(array_key_exists('content', $_POST) and array_key_exists('save', $_POST))
+      if (array_key_exists('content', $_POST) and array_key_exists('save', $_POST))
       {
         $DbResult2 = $this->Database->insert('WikiPageContent', array('Content' => stripslashes($_POST['content']),
@@ -127 +127 @@
     } else $Output = ShowMessage('Wiki stránka nenalezena', MESSAGE_CRITICAL);
     } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
   function ShowHistory()
   {
-    if($this->System->User->Licence(LICENCE_MODERATOR))
+    if ($this->System->User->Licence(LICENCE_MODERATOR))
     {
       $PageName = $this->System->PathItems[count($this->System->PathItems) - 1];
       $DbResult = $this->Database->select('WikiPage', 'Name, Id', 'NormalizedName="'.$PageName.'"');
-      if($DbResult->num_rows > 0)
+      if ($DbResult->num_rows > 0)
       {
         $DbRow = $DbResult->fetch_assoc();
@@ -160 +160 @@
           ' FROM `WikiPageContent` WHERE Page='.
           $DbRow['Id'].' '.$Order['SQL'].$PageList['SQLLimit']);
-        while($PageContent = $DbResult2->fetch_assoc())
+        while ($PageContent = $DbResult2->fetch_assoc())
         {
           $Output .= '<tr>'.
@@ -173 +173 @@
       } else $Output = ShowMessage('Wiki stránka nenalezena', MESSAGE_CRITICAL);
     } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
@@ -200 +200 @@
     $text = str_replace("\r\n", '<br/>', $text);
     $text = '<p>'.$text.'</p>';
-    return($text);
+    return $text;
   }
 }

trunk/Packages/Common/AppModule.php

@@ -77 +77 @@
   function Install()
   {
-    if($this->Installed) return;
+    if ($this->Installed) return;
     $List = array();
     $this->Manager->EnumDependenciesCascade($this, $List, array(ModuleCondition::NotInstalled));
@@ -89 +89 @@
   function Uninstall()
   {
-    if(!$this->Installed) return;
+    if (!$this->Installed) return;
     $this->Stop();
     $this->Installed = false;
@@ -100 +100 @@
   function Upgrade()
   {
-    if(!$this->Installed) return;
-    if($this->InstalledVersion == $this->Version) return;
+    if (!$this->Installed) return;
+    if ($this->InstalledVersion == $this->Version) return;
     $List = array();
     $this->Manager->EnumSuperiorDependenciesCascade($this, $List, array(ModuleCondition::Installed));
@@ -117 +117 @@
   function Start()
   {
-    if($this->Running) return;
-    if(!$this->Installed) return;
+    if ($this->Running) return;
+    if (!$this->Installed) return;
     $List = array();
     $this->Manager->EnumDependenciesCascade($this, $List, array(ModuleCondition::NotRunning));
@@ -128 +128 @@
   function Stop()
   {
-    if(!$this->Running) return;
+    if (!$this->Running) return;
     $this->Running = false;
     $List = array();
@@ -144 +144 @@
   function Enable()
   {
-    if($this->Enabled) return;
-    if(!$this->Installed) return;
+    if ($this->Enabled) return;
+    if (!$this->Installed) return;
     $List = array();
     $this->Manager->EnumDependenciesCascade($this, $List, array(ModuleCondition::NotEnabled));
@@ -154 +154 @@
   function Disable()
   {
-    if(!$this->Enabled) return;
+    if (!$this->Enabled) return;
     $this->Stop();
     $this->Enabled = false;
@@ -203 +203 @@
   function Perform($List, $Actions, $Conditions = array(ModuleCondition::All))
   {
-    foreach($List as $Index => $Module)
-    {
-      if(in_array(ModuleCondition::All, $Conditions) or
+    foreach ($List as $Index => $Module)
+    {
+      if (in_array(ModuleCondition::All, $Conditions) or
         ($Module->Running and in_array(ModuleCondition::Running, $Conditions)) or
         (!$Module->Running and in_array(ModuleCondition::NotRunning, $Conditions)) or
@@ -213 +213 @@
         (!$Module->Enabled and in_array(ModuleCondition::NotEnabled, $Conditions)))
       {
-        foreach($Actions as $Action)
+        foreach ($Actions as $Action)
         {
-          if($Action == ModuleAction::Start) $Module->Start();
-          if($Action == ModuleAction::Stop) $Module->Stop();
-          if($Action == ModuleAction::Install) $Module->Install();
-          if($Action == ModuleAction::Uninstall) $Module->Uninstall();
-          if($Action == ModuleAction::Enable) $Module->Enable();
-          if($Action == ModuleAction::Disable) $Module->Disable();
-          if($Action == ModuleAction::Upgrade) $Module->Upgrade();
+          if ($Action == ModuleAction::Start) $Module->Start();
+          if ($Action == ModuleAction::Stop) $Module->Stop();
+          if ($Action == ModuleAction::Install) $Module->Install();
+          if ($Action == ModuleAction::Uninstall) $Module->Uninstall();
+          if ($Action == ModuleAction::Enable) $Module->Enable();
+          if ($Action == ModuleAction::Disable) $Module->Disable();
+          if ($Action == ModuleAction::Upgrade) $Module->Upgrade();
         }
       }
@@ -229 +229 @@
   function EnumDependenciesCascade($Module, &$List, $Conditions = array(ModuleCondition::All))
   {
-    foreach($Module->Dependencies as $Dependency)
-    {
-      if(!array_key_exists($Dependency, $this->Modules))
+    foreach ($Module->Dependencies as $Dependency)
+    {
+      if (!array_key_exists($Dependency, $this->Modules))
         throw new Exception(sprintf(T('Module "%s" dependency "%s" not found'), $Module->Name, $Dependency));
       $DepModule = $this->Modules[$Dependency];
-      if(in_array(ModuleCondition::All, $Conditions) or
+      if (in_array(ModuleCondition::All, $Conditions) or
         ($Module->Running and in_array(ModuleCondition::Running, $Conditions)) or
         (!$Module->Running and in_array(ModuleCondition::NotRunning, $Conditions)) or
@@ -250 +250 @@
   function EnumSuperiorDependenciesCascade($Module, &$List, $Conditions = array(ModuleCondition::All))
   {
-    foreach($this->Modules as $RefModule)
-    {
-      if(in_array($Module->Name, $RefModule->Dependencies) and
+    foreach ($this->Modules as $RefModule)
+    {
+      if (in_array($Module->Name, $RefModule->Dependencies) and
           (in_array(ModuleCondition::All, $Conditions) or
           ($Module->Running and in_array(ModuleCondition::Running, $Conditions)) or
@@ -270 +270 @@
   {
     $this->LoadModules();
-    if(file_exists($this->FileName)) $this->LoadState();
+    if (file_exists($this->FileName)) $this->LoadState();
     $this->StartEnabled();
   }
@@ -315 +315 @@
   function ModulePresent($Name)
   {
-    return(array_key_exists($Name, $this->Modules));
+    return array_key_exists($Name, $this->Modules);
   }
 
   function ModuleEnabled($Name)
   {
-    return(array_key_exists($Name, $this->Modules) and $this->Modules[$Name]->Enabled);
+    return array_key_exists($Name, $this->Modules) and $this->Modules[$Name]->Enabled;
   }
 
   function ModuleRunning($Name)
   {
-    return(array_key_exists($Name, $this->Modules) and $this->Modules[$Name]->Running);
+    return array_key_exists($Name, $this->Modules) and $this->Modules[$Name]->Running;
   }
 
@@ -331 +331 @@
   function SearchModuleById($Id)
   {
-    foreach($this->Modules as $Module)
+    foreach ($this->Modules as $Module)
     {
       //DebugLog($Module->Name.' '.$Module->Id);
-      if($Module->Id == $Id) return($Module->Name);
-    }
-    return('');
+      if ($Module->Id == $Id) return $Module->Name;
+    }
+    return '';
   }
 
@@ -343 +343 @@
     $ConfigModules = array();
     include($this->FileName);
-    foreach($ConfigModules as $Mod)
-    {
-      if(array_key_exists($Mod['Name'], $this->Modules))
+    foreach ($ConfigModules as $Mod)
+    {
+      if (array_key_exists($Mod['Name'], $this->Modules))
       {
         $this->Modules[$Mod['Name']] = $this->Modules[$Mod['Name']];
@@ -358 +358 @@
   {
     $Data = array();
-    foreach($this->Modules as $Module)
+    foreach ($this->Modules as $Module)
     {
       $Data[] = array('Name' => $Module->Name, 'Enabled' => $Module->Enabled,
@@ -381 +381 @@
   {
     $List = scandir($Directory);
-    foreach($List as $Item)
-    {
-      if(is_dir($Directory.'/'.$Item) and ($Item != '.') and ($Item != '..') and ($Item != '.svn'))
+    foreach ($List as $Item)
+    {
+      if (is_dir($Directory.'/'.$Item) and ($Item != '.') and ($Item != '..') and ($Item != '.svn'))
       {
         include_once($Directory.'/'.$Item.'/'.$Item.'.php');
@@ -394 +394 @@
   function LoadModules()
   {
-    if(method_exists($this->OnLoadModules[0], $this->OnLoadModules[1]))
+    if (method_exists($this->OnLoadModules[0], $this->OnLoadModules[1]))
       $this->OnLoadModules();
     else $this->LoadModulesFromDir($this->ModulesDir);

trunk/Packages/Common/Common.php

@@ -59 +59 @@
 
     $Result = '';
-    if(array_key_exists('all', $QueryItems))
+    if (array_key_exists('all', $QueryItems))
     {
       $PageCount = 1;
@@ -70 +70 @@
     }
 
-    if(!array_key_exists('Page', $_SESSION)) $_SESSION['Page'] = 0;
-    if(array_key_exists('page', $_GET)) $_SESSION['Page'] = $_GET['page'] * 1;
-    if($_SESSION['Page'] < 0) $_SESSION['Page'] = 0;
-    if($_SESSION['Page'] >= $PageCount) $_SESSION['Page'] = $PageCount - 1;
+    if (!array_key_exists('Page', $_SESSION)) $_SESSION['Page'] = 0;
+    if (array_key_exists('page', $_GET)) $_SESSION['Page'] = $_GET['page'] * 1;
+    if ($_SESSION['Page'] < 0) $_SESSION['Page'] = 0;
+    if ($_SESSION['Page'] >= $PageCount) $_SESSION['Page'] = $PageCount - 1;
     $CurrentPage = $_SESSION['Page'];
 
@@ -79 +79 @@
 
     $Result = '';
-    if($PageCount > 1)
+    if ($PageCount > 1)
     {
-      if($CurrentPage > 0)
+      if ($CurrentPage > 0)
       {
         $QueryItems['page'] = 0;
@@ -90 +90 @@
       $PagesMax = $PageCount - 1;
       $PagesMin = 0;
-      if($PagesMax > ($CurrentPage + $Around)) $PagesMax = $CurrentPage + $Around;
-      if($PagesMin < ($CurrentPage - $Around))
+      if ($PagesMax > ($CurrentPage + $Around)) $PagesMax = $CurrentPage + $Around;
+      if ($PagesMin < ($CurrentPage - $Around))
       {
         $Result.= ' ... ';
         $PagesMin = $CurrentPage - $Around;
       }
-      for($i = $PagesMin; $i <= $PagesMax; $i++)
+      for ($i = $PagesMin; $i <= $PagesMax; $i++)
       {
-        if($i == $CurrentPage) $Result.= '<strong>'.($i + 1).'</strong> ';
+        if ($i == $CurrentPage) $Result.= '<strong>'.($i + 1).'</strong> ';
         else {
          $QueryItems['page'] = $i;
@@ -104 +104 @@
         }
       }
-      if($PagesMax < ($PageCount - 1)) $Result .= ' ... ';
-      if($CurrentPage < ($PageCount - 1))
+      if ($PagesMax < ($PageCount - 1)) $Result .= ' ... ';
+      if ($CurrentPage < ($PageCount - 1))
       {
         $QueryItems['page'] = ($CurrentPage + 1);
@@ -114 +114 @@
     }
     $QueryItems['all'] = '1';
-    if($PageCount > 1) $Result.= ' <a href="?'.SetQueryStringArray($QueryItems).'">Vše</a>';
+    if ($PageCount > 1) $Result.= ' <a href="?'.SetQueryStringArray($QueryItems).'">Vše</a>';
 
     $Result = '<div style="text-align: center">'.$Result.'</div>';
     $this->SQLLimit = ' LIMIT '.$CurrentPage * $ItemPerPage.', '.$ItemPerPage;
     $this->Page = $CurrentPage;
-    return($Result);
+    return $Result;
   }
 }

trunk/Packages/Common/Config.php

@@ -12 +12 @@
   function ReadValue($Name)
   {
-    if(!is_array($Name)) $Name = explode('/', $Name);
+    if (!is_array($Name)) $Name = explode('/', $Name);
     $Last = array_pop($Name);
     $Data = &$this->Data;
-    foreach($Name as $Item)
+    foreach ($Name as $Item)
     {
       $Data = &$Data[$Item];
     }
-    return($Data[$Last]);
+    return $Data[$Last];
   }
 
   function WriteValue($Name, $Value)
   {
-    if(!is_array($Name)) $Name = explode('/', $Name);
+    if (!is_array($Name)) $Name = explode('/', $Name);
     $Last = array_pop($Name);
     $Data = &$this->Data;
-    foreach($Name as $Item)
+    foreach ($Name as $Item)
     {
       $Data = &$Data[$Item];
@@ -38 +38 @@
     $ConfigData = array();
     include $FileName;
-    foreach($this->Data as $Index => $Item)
+    foreach ($this->Data as $Index => $Item)
     {
-      if(array_key_exits($Index, $ConfigData))
+      if (array_key_exits($Index, $ConfigData))
         $this->Data[$Index] = $ConfigData[$Index];
     }
@@ -52 +52 @@
   function GetAsArray()
   {
-    return($this->Data);
+    return $this->Data;
   }
 }

trunk/Packages/Common/Database.php

@@ -11 +11 @@
   function fetch_assoc()
   {
-    return($this->PDOStatement->fetch(PDO::FETCH_ASSOC));
+    return $this->PDOStatement->fetch(PDO::FETCH_ASSOC);
   }
 
   function fetch_array()
   {
-    return($this->PDOStatement->fetch(PDO::FETCH_BOTH));
+    return $this->PDOStatement->fetch(PDO::FETCH_BOTH);
   }
 
   function fetch_row()
   {
-    return($this->PDOStatement->fetch(PDO::FETCH_NUM));
+    return $this->PDOStatement->fetch(PDO::FETCH_NUM);
   }
 }
@@ -54 +54 @@
   function Connect($Host, $User, $Password, $Database)
   {
-    if($this->Type == 'mysql') $ConnectionString = 'mysql:host='.$Host.';dbname='.$Database;
-      else if($this->Type == 'pgsql') $ConnectionString = 'pgsql:dbname='.$Database.';host='.$Host;
+    if ($this->Type == 'mysql') $ConnectionString = 'mysql:host='.$Host.';dbname='.$Database;
+      else if ($this->Type == 'pgsql') $ConnectionString = 'pgsql:dbname='.$Database.';host='.$Host;
       else $ConnectionString = '';
     try {
@@ -74 +74 @@
   function Connected()
   {
-    return(isset($this->PDO));
+    return isset($this->PDO);
   }
 
@@ -84 +84 @@
   function query($Query)
   {
-    if(!$this->Connected()) throw new Exception(T('Not connected to database'));
-    if(($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true)) $QueryStartTime = microtime();
+    if (!$this->Connected()) throw new Exception(T('Not connected to database'));
+    if (($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true)) $QueryStartTime = microtime();
     $this->LastQuery = $Query;
-    if(($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true))
+    if (($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true))
       $Duration = ' ; '.round(microtime() - $QueryStartTime, 4). ' s';
-    if($this->LogSQLQuery == true)
+    if ($this->LogSQLQuery == true)
       file_put_contents($this->LogFile, $Query.$Duration."\n", FILE_APPEND);
-    if($this->ShowSQLQuery == true)
+    if ($this->ShowSQLQuery == true)
       echo('<div style="border-bottom-width: 1px; border-bottom-style: solid; '.
       'padding-bottom: 3px; padding-top: 3px; font-size: 12px; font-family: Arial;">'.$Query.$Duration.'</div>'."\n");
     $Result = new DatabaseResult();
     $Result->PDOStatement = $this->PDO->query($Query);
-    if($Result->PDOStatement)
+    if ($Result->PDOStatement)
     {
       $Result->num_rows = $Result->PDOStatement->rowCount();
@@ -104 +104 @@
       $this->Error = $this->PDO->errorInfo();
       $this->Error = $this->Error[2];
-      if(($this->Error != '') and ($this->ShowSQLError == true))
+      if (($this->Error != '') and ($this->ShowSQLError == true))
         echo('<div><strong>SQL Error: </strong>'.$this->Error.'<br />'.$Query.'</div>');
         throw new Exception('SQL Error: '.$this->Error.', Query: '.$Query);
     }
-    return($Result);
+    return $Result;
   }
 
   function select($Table, $What = '*', $Condition = 1)
   {
-    return($this->query('SELECT '.$What.' FROM `'.$this->Prefix.$Table.'` WHERE '.$Condition));
+    return $this->query('SELECT '.$What.' FROM `'.$this->Prefix.$Table.'` WHERE '.$Condition);
   }
 
@@ -125 +125 @@
     $Name = '';
     $Values = '';
-    foreach($Data as $Key => $Value)
+    foreach ($Data as $Key => $Value)
     {
       $Name .= ',`'.$Key.'`';
-      if(!in_array($Value, $this->Functions))
+      if (!in_array($Value, $this->Functions))
       {
-        if(is_null($Value)) $Value = 'NULL';
+        if (is_null($Value)) $Value = 'NULL';
         else $Value = $this->PDO->quote($Value);
       }
@@ -144 +144 @@
   {
     $Values = '';
-    foreach($Data as $Key => $Value)
-    {
-      if(!in_array($Value, $this->Functions))
+    foreach ($Data as $Key => $Value)
+    {
+      if (!in_array($Value, $this->Functions))
       {
-        if(is_null($Value)) $Value = 'NULL';
+        if (is_null($Value)) $Value = 'NULL';
         else $Value = $this->PDO->quote($Value);
       }
@@ -161 +161 @@
     $Name = '';
     $Values = '';
-    foreach($Data as $Key => $Value)
-    {
-      if(!in_array($Value, $this->Functions))
+    foreach ($Data as $Key => $Value)
+    {
+      if (!in_array($Value, $this->Functions))
       {
-        if(is_null($Value)) $Value = 'NULL';
+        if (is_null($Value)) $Value = 'NULL';
         else $Value = $this->PDO->quote($Value);
       }
@@ -185 +185 @@
   function real_escape_string($Text)
   {
-    return(addslashes($Text));
+    return addslashes($Text);
   }
 
   function quote($Text)
   {
-    return($this->PDO->quote($Text));
+    return $this->PDO->quote($Text);
   }
 
@@ -205 +205 @@
 function TimeToMysqlDateTime($Time)
 {
-  if($Time == NULL) return(NULL);
-    else return(date('Y-m-d H:i:s', $Time));
+  if ($Time == NULL) return NULL;
+    else return date('Y-m-d H:i:s', $Time);
 }
 
 function TimeToMysqlDate($Time)
 {
-  if($Time == NULL) return(NULL);
-    else return(date('Y-m-d', $Time));
+  if ($Time == NULL) return NULL;
+    else return date('Y-m-d', $Time);
 }
 
 function TimeToMysqlTime($Time)
 {
-  if($Time == NULL) return(NULL);
-    else return(date('H:i:s', $Time));
+  if ($Time == NULL) return NULL;
+    else return date('H:i:s', $Time);
 }
 
 function MysqlDateTimeToTime($DateTime)
 {
-  if($DateTime == '') return(NULL);
+  if ($DateTime == '') return NULL;
   $Parts = explode(' ', $DateTime);
   $DateParts = explode('-', $Parts[0]);
   $TimeParts = explode(':', $Parts[1]);
   $Result = mktime($TimeParts[0], $TimeParts[1], $TimeParts[2], $DateParts[1], $DateParts[2], $DateParts[0]);
-  return($Result);
+  return $Result;
 }
 
 function MysqlDateToTime($Date)
 {
-  if($Date == '') return(NULL);
-  return(MysqlDateTimeToTime($Date.' 0:0:0'));
+  if ($Date == '') return NULL;
+  return MysqlDateTimeToTime($Date.' 0:0:0');
 }
 
 function MysqlTimeToTime($Time)
 {
-  if($Time == '') return(NULL);
-  return(MysqlDateTimeToTime('0000-00-00 '.$Time));
-}
+  if ($Time == '') return NULL;
+  return MysqlDateTimeToTime('0000-00-00 '.$Time);
+}

trunk/Packages/Common/Error.php

@@ -45 +45 @@
     );
 
-    if(($this->UserErrors & $Number))
+    if (($this->UserErrors & $Number))
     {
       // Error was suppressed with the @-operator
-      if(0 === error_reporting())
+      if (0 === error_reporting())
       {
         return false;
@@ -58 +58 @@
       $Backtrace[0]['line'] = $LineNumber;
       $this->Report($Backtrace);
-      //if((E_ERROR | E_PARSE) & $Number)
+      //if ((E_ERROR | E_PARSE) & $Number)
       die();
     }
@@ -82 +82 @@
       'An internal error occurred!<br/>'.
       'Administrator will be notified and the problem will be investigated and fixed soon.'.'<br/><br/>';
-    if($this->ShowError == true)
+    if ($this->ShowError == true)
       $Output .= '<pre>'.$Message.'</pre><br/>';
     $Output .= '</body></html>';
@@ -92 +92 @@
     $Date = date('Y-m-d H:i:s');
     $Error = '# '.$Date."\n";
-    foreach($Backtrace as $Item)
+    foreach ($Backtrace as $Item)
     {
-      if(!array_key_exists('line', $Item)) $Item['line'] = '';
-      if(!array_key_exists('file', $Item)) $Item['file'] = '';
+      if (!array_key_exists('line', $Item)) $Item['line'] = '';
+      if (!array_key_exists('file', $Item)) $Item['file'] = '';
 
       $Error .= ' '.$Item['file'].'('.$Item['line'].")\t".$Item['function'];
       $Arguments = '';
-      if(array_key_exists('args', $Item) and is_array($Item['args']))
-        foreach($Item['args'] as $Item)
+      if (array_key_exists('args', $Item) and is_array($Item['args']))
+        foreach ($Item['args'] as $Item)
         {
-          if(is_object($Item)) ;
-          else if(is_array($Item)) $Arguments .= "'".serialize($Item)."',";
+          if (is_object($Item)) ;
+          else if (is_array($Item)) $Arguments .= "'".serialize($Item)."',";
           else $Arguments .= "'".$Item."',";
         }
-        if(strlen($Arguments) > 0) $Error .= '('.substr($Arguments, 0, -1).')';
+        if (strlen($Arguments) > 0) $Error .= '('.substr($Arguments, 0, -1).')';
         $Error .= "\n";
     }
     $Error .= "\n";
 
-    foreach($this->OnError as $OnError)
+    foreach ($this->OnError as $OnError)
       call_user_func($OnError, $Error);
   }

trunk/Packages/Common/Image.php

@@ -65 +65 @@
   function SaveToFile($FileName)
   {
-    if($this->Type == IMAGETYPE_JPEG)
+    if ($this->Type == IMAGETYPE_JPEG)
     {
       imagejpeg($this->Image, $FileName);
     } else
-    if($this->Type == IMAGETYPE_GIF)
+    if ($this->Type == IMAGETYPE_GIF)
     {
-      imagegif($this->Image, $FileName);
+      imagegif ($this->Image, $FileName);
     } else
-    if($this->Type == IMAGETYPE_PNG)
+    if ($this->Type == IMAGETYPE_PNG)
     {
       imagepng($this->Image, $FileName);
@@ -83 +83 @@
     $ImageInfo = getimagesize($FileName);
     $this->Type = $ImageInfo[2];
-    if($this->Type == IMAGETYPE_JPEG)
+    if ($this->Type == IMAGETYPE_JPEG)
     {
       $this->Image = imagecreatefromjpeg($FileName);
     } else
-    if($this->Type == IMAGETYPE_GIF)
+    if ($this->Type == IMAGETYPE_GIF)
     {
       $this->Image = imagecreatefromgif($FileName);
     } else
-    if( $this->Type == IMAGETYPE_PNG)
+    if ( $this->Type == IMAGETYPE_PNG)
     {
       $this->Image = imagecreatefrompng($FileName);
@@ -112 +112 @@
   function GetWidth()
   {
-    return(imagesx($this->Image));
+    return imagesx($this->Image);
   }
 
   function GetHeight()
   {
-    return(imagesy($this->Image));
+    return imagesy($this->Image);
   }
 
@@ -127 +127 @@
   function ConvertColor($Color)
   {
-    return(imagecolorallocate($this->Image, ($Color >> 16) & 0xff, ($Color >> 8) & 0xff, $Color & 0xff));
+    return imagecolorallocate($this->Image, ($Color >> 16) & 0xff, ($Color >> 8) & 0xff, $Color & 0xff);
   }
 

trunk/Packages/Common/Locale.php

@@ -20 +20 @@
   function Translate($Text, $Group = '')
   {
-    if(array_key_exists($Text, $this->Data[$Group]) and ($this->Data[$Group][$Text] != ''))
-      return($this->Data[$Group][$Text]);
-      else return($Text);
+    if (array_key_exists($Text, $this->Data[$Group]) and ($this->Data[$Group][$Text] != ''))
+      return $this->Data[$Group][$Text];
+      else return $Text;
   }
 
@@ -28 +28 @@
   {
     $Key = array_search($Text, $this->Data[$Group]);
-    if(($Key === FALSE) or ($this->Data[$Group][$Key] == '')) return($Text);
-      else return($Key);
+    if (($Key === FALSE) or ($this->Data[$Group][$Key] == '')) return $Text;
+      else return $Key;
   }
 }
@@ -47 +47 @@
   {
     $FileName = $this->Dir.'/'.$Language.'.php';
-    if(file_exists($FileName)) {
+    if (file_exists($FileName)) {
       include_once($FileName);
       $ClassName = 'LocaleText'.$Language;
@@ -59 +59 @@
     // Search for php files
     $FileList = scandir($Path);
-    foreach($FileList as $FileName)
+    foreach ($FileList as $FileName)
     {
       $FullName = $Path.'/'.$FileName;
-      if(($FileName == '.') or ($FileName == '..')) ; // Skip virtual items
-      else if(substr($FileName, 0, 1) == '.') ; // Skip Linux hidden files
-      else if(is_dir($FullName)) $this->AnalyzeCode($FullName);
-      else if(file_exists($FullName))
-      {
-        if(substr($FullName, -4) == '.php')
+      if (($FileName == '.') or ($FileName == '..')) ; // Skip virtual items
+      else if (substr($FileName, 0, 1) == '.') ; // Skip Linux hidden files
+      else if (is_dir($FullName)) $this->AnalyzeCode($FullName);
+      else if (file_exists($FullName))
+      {
+        if (substr($FullName, -4) == '.php')
         {
           $Content = file_get_contents($FullName);
           // Search occurence of T() function
-          while(strpos($Content, 'T(') !== false)
+          while (strpos($Content, 'T(') !== false)
           {
             $Previous = strtolower(substr($Content, strpos($Content, 'T(') - 1, 1));
@@ -77 +77 @@
             $Ord = ord($Previous);
             //echo($Ord.',');
-            if(!(($Ord >= ord('a')) and ($Ord <= ord('z'))))
+            if (!(($Ord >= ord('a')) and ($Ord <= ord('z'))))
             {
               // Do for non-alpha previous character
               $Original = substr($Content, 0, strpos($Content, ')'));
               $Original2 = '';
-              if((substr($Original, 0, 1) == "'") and (substr($Original, -1, 1) == "'"))
+              if ((substr($Original, 0, 1) == "'") and (substr($Original, -1, 1) == "'"))
                 $Original2 = substr($Original, 1, -1);
-              if((substr($Original, 0, 1) == '"') and (substr($Original, -1, 1) == '"'))
+              if ((substr($Original, 0, 1) == '"') and (substr($Original, -1, 1) == '"'))
                 $Original2 = substr($Original, 1, -1);
-              if($Original2 != '')
+              if ($Original2 != '')
               {
-                if(!array_key_exists($Original2, $this->Texts->Data))
+                if (!array_key_exists($Original2, $this->Texts->Data))
                   $this->Texts->Data[$Original2] = '';
               }
@@ -109 +109 @@
     '    $this->Title = \''.$this->Texts->Title.'\';'."\n".
     '    $this->Data = array('."\n";
-    foreach($this->Texts->Data as $Index => $Item)
+    foreach ($this->Texts->Data as $Index => $Item)
     {
       $Content .= "      '".$Index."' => '".$Item."',\n";
@@ -122 +122 @@
   {
     $DbResult = $Database->select('Language', '*', 'Code='.$Database->quote($LangCode));
-    if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
     {
       $Language = $DbResult->fetch_assoc();
       $this->Texts->Data = array();
       $DbResult = $Database->select('Locale', '`Original`, `Translated`', '`Language`='.$Language['Id']);
-      while($DbRow = $DbResult->fetch_assoc())
+      while ($DbRow = $DbResult->fetch_assoc())
         $this->Texts->Data[$DbRow['Original']] = $DbRow['Translated'];
     }
@@ -135 +135 @@
   {
     $DbResult = $Database->select('Language', '*', 'Code='.$Database->quote($LangCode));
-    if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
     {
       $Language = $DbResult->fetch_assoc();
       $Database->delete('Locale', '`Language`='.$Language['Id']);
-      foreach($this->Texts->Data as $Index => $Item)
+      foreach ($this->Texts->Data as $Index => $Item)
         $Database->query('INSERT INTO `Locale` (`Language`,`Original`,`Translated`) '.
         'VALUES('.$Language['Id'].','.$Database->quote($Index).','.$Database->quote($Item).')');
@@ -148 +148 @@
   {
     $DbResult = $Database->select('Language', '*', '`Code`='.$Database->quote($LangCode));
-    if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
     {
       $Language = $DbResult->fetch_assoc();
-      foreach($this->Texts->Data as $Index => $Item)
+      foreach ($this->Texts->Data as $Index => $Item)
       {
         $DbResult = $Database->select('Locale', '*', '(`Original` ='.$Database->quote($Index).
           ') AND (`Language`='.($Language['Id']).')');
-        if($DbResult->num_rows > 0)
+        if ($DbResult->num_rows > 0)
         $Database->update('Locale', '(`Language`='.($Language['Id']).') AND '.
           '(`Original` ='.$Database->quote($Index).')', array('Translated' => $Item));
@@ -188 +188 @@
     $this->Available = array();
     $FileList = scandir($this->Dir);
-    foreach($FileList as $FileName)
-    {
-      if(substr($FileName, -4) == '.php')
+    foreach ($FileList as $FileName)
+    {
+      if (substr($FileName, -4) == '.php')
       {
         $Code = substr($FileName, 0, -4);
@@ -206 +206 @@
     $Locale->AnalyzeCode($Directory);
     $FileList = scandir($this->Dir);
-    foreach($FileList as $FileName)
-    {
-      if(substr($FileName, -4) == '.php')
+    foreach ($FileList as $FileName)
+    {
+      if (substr($FileName, -4) == '.php')
       {
         $FileLocale = new LocaleFile($this->System);
@@ -215 +215 @@
 
         // Add new
-        foreach($Locale->Texts->Data as $Index => $Item)
-          if(!array_key_exists($Index, $FileLocale->Texts->Data))
+        foreach ($Locale->Texts->Data as $Index => $Item)
+          if (!array_key_exists($Index, $FileLocale->Texts->Data))
             $FileLocale->Texts->Data[$Index] = $Item;
         // Remove old
-        foreach($FileLocale->Texts->Data as $Index => $Item)
-          if(!array_key_exists($Index, $Locale->Texts->Data))
+        foreach ($FileLocale->Texts->Data as $Index => $Item)
+          if (!array_key_exists($Index, $Locale->Texts->Data))
             unset($FileLocale->Texts->Data[$Index]);
         $FileLocale->UpdateToDatabase($this->System->Database, $FileLocale->Texts->Code);
@@ -232 +232 @@
   function LoadLocale($Code)
   {
-    if(array_key_exists($Code, $this->Available))
+    if (array_key_exists($Code, $this->Available))
     {
       $this->CurrentLocale->Dir = $this->Dir;
@@ -245 +245 @@
   global $GlobalLocaleManager;
 
-  if(isset($GlobalLocaleManager)) return($GlobalLocaleManager->CurrentLocale->Texts->Translate($Text, $Group));
-    else return($Text);
-}
+  if (isset($GlobalLocaleManager)) return $GlobalLocaleManager->CurrentLocale->Texts->Translate($Text, $Group);
+    else return $Text;
+}

trunk/Packages/Common/Mail.php

@@ -69 +69 @@
   function Organization($org)
   {
-    if(trim($org != '')) $this->xheaders['Organization'] = $org;
+    if (trim($org != '')) $this->xheaders['Organization'] = $org;
   }
 
   function Priority($Priority)
   {
-    if(!intval($Priority)) return(false);
-
-    if(!isset($this->priorities[$Priority - 1])) return(false);
+    if (!intval($Priority)) return false;
+
+    if (!isset($this->priorities[$Priority - 1])) return false;
 
     $this->xheaders['X-Priority'] = $this->priorities[$Priority - 1];
-    return(true);
+    return true;
   }
 
@@ -96 +96 @@
   function Send()
   {
-    if(count($this->Bodies) == 0) throw new Exception(T('Mail message need at least one text body'));
+    if (count($this->Bodies) == 0) throw new Exception(T('Mail message need at least one text body'));
 
     $Body = $this->BuildAttachment($this->BuildBody());
@@ -103 +103 @@
     $this->Headers['CC'] = '';
     $this->Headers['BCC'] = '';
-    foreach($this->Recipients as $Index => $Recipient)
-    {
-      if($Recipient['Type'] == 'SendCombined')
-      {
-        if($Index > 0) $To .= ', ';
+    foreach ($this->Recipients as $Index => $Recipient)
+    {
+      if ($Recipient['Type'] == 'SendCombined')
+      {
+        if ($Index > 0) $To .= ', ';
         $To .= $Recipient['Address'];
       } else
-      if($Recipient['Type'] == 'Send')
-      {
-        if($Index > 0) $To .= ', ';
+      if ($Recipient['Type'] == 'Send')
+      {
+        if ($Index > 0) $To .= ', ';
         $To .= $Recipient['Name'].' <'.$Recipient['Address'].'>';
       } else
-      if($Recipient['Type'] == 'Copy')
-      {
-        if($Index > 0) $this->Headers['CC'] .= ', ';
+      if ($Recipient['Type'] == 'Copy')
+      {
+        if ($Index > 0) $this->Headers['CC'] .= ', ';
         $this->Headers['CC'] .= $Recipient['Name'].' <'.$To['Address'].'>';
       } else
-      if($Recipient['Type'] == 'HiddenCopy')
-      {
-        if($Index > 0) $this->Headers['BCC'] .= ', ';
+      if ($Recipient['Type'] == 'HiddenCopy')
+      {
+        if ($Index > 0) $this->Headers['BCC'] .= ', ';
         $this->Headers['BCC'] .= $Recipient['Name'].' <'.$To['Address'].'>';
       }
     }
-    if($To == '') throw new Exception(T('Mail message need at least one recipient address'));
+    if ($To == '') throw new Exception(T('Mail message need at least one recipient address'));
 
     $this->Headers['Mime-Version'] = '1.0';
 
-    if($this->AgentIdent != '') $this->Headers['X-Mailer'] = $this->AgentIdent;
-    if($this->ReplyTo != '') $this->Headers['Reply-To'] = $this->ReplyTo;
-    if($this->From != '') $this->Headers['From'] = $this->From;
+    if ($this->AgentIdent != '') $this->Headers['X-Mailer'] = $this->AgentIdent;
+    if ($this->ReplyTo != '') $this->Headers['Reply-To'] = $this->ReplyTo;
+    if ($this->From != '') $this->Headers['From'] = $this->From;
 
     $Headers = '';
-    foreach($this->Headers as $Header => $Value)
-    {
-      if(($Header != 'Subject') and ($Value != '')) $Headers .= $Header.': '.$Value."\n";
+    foreach ($this->Headers as $Header => $Value)
+    {
+      if (($Header != 'Subject') and ($Value != '')) $Headers .= $Header.': '.$Value."\n";
     }
 
     $this->Subject = strtr($this->Subject, "\r\n", '  ');
 
-    if($this->Subject == '') throw new Exception(T('Mail message missing Subject'));
+    if ($this->Subject == '') throw new Exception(T('Mail message missing Subject'));
 
 
     $res = mail($To, $this->Subject, $Body, $Headers);
-    return($res);
+    return $res;
   }
 
   function ValidEmail($Address)
   {
-    if(ereg(".*<(.+)>", $Address, $regs)) $Address = $regs[1];
-    if(ereg("^[^@  ]+@([a-zA-Z0-9\-]+\.)+([a-zA-Z0-9\-]{2}|net|com|gov|mil|org|edu|int)\$", $Address))
-      return(true);
-      else return(false);
+    if (ereg(".*<(.+)>", $Address, $regs)) $Address = $regs[1];
+    if (ereg("^[^@  ]+@([a-zA-Z0-9\-]+\.)+([a-zA-Z0-9\-]{2}|net|com|gov|mil|org|edu|int)\$", $Address))
+      return true;
+      else return false;
   }
 
   function CheckAdresses($Addresses)
   {
-    foreach($Addresses as $Address)
-    {
-      if(!$this->ValidEmail($Address))
+    foreach ($Addresses as $Address)
+    {
+      if (!$this->ValidEmail($Address))
   throw new Exception(sprintf(T('Mail message invalid address %s'), $Address));
     }
@@ -168 +168 @@
   private function ContentEncoding($Charset)
   {
-    if($Charset != CHARSET_ASCII) return('8bit');
-      else return('7bit');
+    if ($Charset != CHARSET_ASCII) return '8bit';
+      else return '7bit';
   }
 
   private function BuildAttachment($Body)
   {
-    if(count($this->Attachments) > 0)
+    if (count($this->Attachments) > 0)
     {
       $this->Headers['Content-Type'] = "multipart/mixed;\n boundary=\"PHP-mixed-".$this->Boundary."\"";
@@ -181 +181 @@
       $Result .= $Body;
 
-      foreach($this->Attachments as $Attachment)
+      foreach ($this->Attachments as $Attachment)
       {
         $FileName = $Attachment['FileName'];
@@ -187 +187 @@
         $ContentType = $Attachment['FileType'];
         $Disposition = $Attachment['Disposition'];
-        if($Attachment['Type'] == 'File')
+        if ($Attachment['Type'] == 'File')
         {
-          if(!file_exists($FileName))
+          if (!file_exists($FileName))
             throw new Exception(sprintf(T('Mail message attached file %s can\'t be found'), $FileName));
           $Data = file_get_contents($FileName);
         } else
-        if($Attachment['Type'] == 'Data') $Data = $Attachment['Data'];
+        if ($Attachment['Type'] == 'Data') $Data = $Attachment['Data'];
           else $Data = '';
 
@@ -203 +203 @@
       }
     } else $Result = $Body;
-    return($Result);
+    return $Result;
   }
 
@@ -209 +209 @@
   {
     $Result = '';
-    if(count($this->Bodies) > 1)
+    if (count($this->Bodies) > 1)
     {
       $this->Headers['Content-Type'] = 'multipart/alternative; boundary="PHP-alt-'.$this->Boundary.'"';
@@ -221 +221 @@
 
 
-    foreach($this->Bodies as $Body)
-    {
-      if(count($this->Bodies) > 1) $Result .= "\n\n".'--PHP-alt-'.$this->Boundary."\n";
+    foreach ($this->Bodies as $Body)
+    {
+      if (count($this->Bodies) > 1) $Result .= "\n\n".'--PHP-alt-'.$this->Boundary."\n";
       $Result .= 'Content-Type: '.$Body['Type'].'; charset='.$Body['Charset'].
         "\nContent-Transfer-Encoding: ".$this->ContentEncoding($Body['Charset'])."\n\n".$Body['Content']."\n";
     }
-    return($Result);
+    return $Result;
   }
 }

trunk/Packages/Common/NetworkAddress.php

@@ -14 +14 @@
   function GetNetMask()
   {
-    return(0xffffffff ^ ((1 << (32 - $this->Prefix)) - 1));
+    return 0xffffffff ^ ((1 << (32 - $this->Prefix)) - 1);
   }
 
   function AddressToString()
   {
-    return(implode('.', array(($this->Address >> 24) & 255, ($this->Address >> 16) & 255, ($this->Address >> 8) & 255, ($this->Address & 255))));
+    return implode('.', array(($this->Address >> 24) & 255, ($this->Address >> 16) & 255, ($this->Address >> 8) & 255, ($this->Address & 255)));
   }
 
@@ -37 +37 @@
     $To->Address = $From->Address + $HostMask;
     $To->Prefix = 32;
-    return(array('From' => $From, 'To' => $To));
+    return array('From' => $From, 'To' => $To);
   }
 
@@ -43 +43 @@
   {
     $this->Prefix = $NewPrefix;
-    if($this->Prefix > 32) $this->Prefix = 32;
-    if($this->Prefix < 0) $this->Prefix = 0;
+    if ($this->Prefix > 32) $this->Prefix = 32;
+    if ($this->Prefix < 0) $this->Prefix = 0;
     $this->Address = $this->Address & $this->GetNetMask();
   }
@@ -51 +51 @@
   {
     $UpperNetmask = $this->GetNetMask();
-    if(($this->Prefix < $Address->Prefix) and (($Address->Address & $UpperNetmask) == ($this->Address & $UpperNetmask))) $Result = true;
+    if (($this->Prefix < $Address->Prefix) and (($Address->Address & $UpperNetmask) == ($this->Address & $UpperNetmask))) $Result = true;
       else $Result = false;
     //echo($Address->AddressToString().'/'.$Address->Prefix.' in '.$this->AddressToString().'/'.$this->Prefix.' '.$Result."\n");
-    return($Result);
+    return $Result;
   }
 }
@@ -71 +71 @@
   function AddressToString()
   {
-    return(inet_ntop($this->Address));
+    return inet_ntop($this->Address);
   }
 
@@ -83 +83 @@
     $Result = array();
     $Data = array_reverse(unpack('C*', $this->Address));
-    foreach($Data as $Item)
+    foreach ($Data as $Item)
     {
 
@@ -89 +89 @@
       $Result[] = dechex(($Item >> 4) & 15);
     }
-    return($Result);
+    return $Result;
   }
 

trunk/Packages/Common/Page.php

@@ -17 +17 @@
   function Show()
   {
-    return('');
+    return '';
   }
 
@@ -23 +23 @@
   {
     $Output = $this->Show();
-    return($Output);
+    return $Output;
   }
 
   function SystemMessage($Title, $Text)
   {
-    return(call_user_func_array($this->OnSystemMessage, array($Title, $Text)));
+    return call_user_func_array($this->OnSystemMessage, array($Title, $Text));
   }
 }

trunk/Packages/Common/PrefixMultiplier.php

@@ -74 +74 @@
   function TruncateDigits($Value, $Digits = 4)
   {
-    for($II = 2; $II > -6; $II--)
+    for ($II = 2; $II > -6; $II--)
     {
-      if($Value >= pow(10, $II))
+      if ($Value >= pow(10, $II))
       {
-        if($Digits < ($II + 1)) $RealDigits = $II + 1;
+        if ($Digits < ($II + 1)) $RealDigits = $II + 1;
           else $RealDigits = $Digits;
         $Value = round($Value / pow(10, $II - $RealDigits + 1)) * pow(10, $II - $RealDigits + 1);
@@ -84 +84 @@
       }
     }
-    return($Value);
+    return $Value;
   }
 
@@ -93 +93 @@
     $Negative = ($Value < 0);
     $Value = abs($Value);
-    if(($Unit == '') and ($PrefixType != 'Time'))
-      return($this->TruncateDigits($Value, $Digits));
+    if (($Unit == '') and ($PrefixType != 'Time'))
+      return $this->TruncateDigits($Value, $Digits);
 
     $I = $PrefixMultipliers[$PrefixType]['BaseIndex'];
-    if($Value == 0) return($Value.' '.$PrefixMultipliers[$PrefixType]['Definition'][$I][0].$Unit);
+    if ($Value == 0) return $Value.' '.$PrefixMultipliers[$PrefixType]['Definition'][$I][0].$Unit;
 
-    if($Value > 1)
+    if ($Value > 1)
     {
-      while((($I + 1) <= count($PrefixMultipliers[$PrefixType]['Definition'])) and (($Value / $PrefixMultipliers[$PrefixType]['Definition'][$I + 1][2]) > 1))
+      while ((($I + 1) <= count($PrefixMultipliers[$PrefixType]['Definition'])) and (($Value / $PrefixMultipliers[$PrefixType]['Definition'][$I + 1][2]) > 1))
         $I = $I + 1;
     } else
-    if($Value < 1)
+    if ($Value < 1)
     {
-      while((($I - 1) >= 0) and (($Value / $PrefixMultipliers[$PrefixType]['Definition'][$I][2]) < 1))
+      while ((($I - 1) >= 0) and (($Value / $PrefixMultipliers[$PrefixType]['Definition'][$I][2]) < 1))
         $I = $I - 1;
     }
@@ -113 +113 @@
     // Truncate digits count
     $Value = $this->TruncateDigits($Value, $Digits);
-    if($Negative) $Value = -$Value;
-    return($Value.' '.$PrefixMultipliers[$PrefixType]['Definition'][$I][0].$Unit);
+    if ($Negative) $Value = -$Value;
+    return $Value.' '.$PrefixMultipliers[$PrefixType]['Definition'][$I][0].$Unit;
   }
 }

trunk/Packages/Common/RSS.php

@@ -28 +28 @@
   "    <pubDate>".date('r')."</pubDate>\n".
   "    <ttl>20</ttl>\n";
-    foreach($this->Items as $Item)
+    foreach ($this->Items as $Item)
     {
       $Result .= "    <item>\n".
@@ -39 +39 @@
     $Result .= "  </channel>\n".
     "</rss>";
-    return($Result);
+    return $Result;
   }
 }

trunk/Packages/Common/Setup.php

@@ -29 +29 @@
       '<input type="submit" name="login" value="'.T('Login').'"/>'.
       '</form>';
-    return($Output);
+    return $Output;
   }
 
@@ -37 +37 @@
 
     $Output .= 'Je připojení k databázi: '.$this->YesNo[$this->UpdateManager->Database->Connected()].'<br/>';
-    if($this->UpdateManager->Database->Connected())
+    if ($this->UpdateManager->Database->Connected())
     {
       $Output .= 'Je instalováno: '.$this->YesNo[$this->UpdateManager->IsInstalled()].'<br/>';
-      if($this->UpdateManager->IsInstalled())
+      if ($this->UpdateManager->IsInstalled())
         $Output .= 'Je aktuální: '.$this->YesNo[$this->UpdateManager->IsUpToDate()].'<br/>'.
         'Verze databáze: '.$this->UpdateManager->GetDbVersion().'<br/>';
       $Output .= 'Verze databáze kódu: '.$this->UpdateManager->Revision.'<br/>';
-      if($this->UpdateManager->IsInstalled())
-      {
-        if(!$this->UpdateManager->IsUpToDate())
+      if ($this->UpdateManager->IsInstalled())
+      {
+        if (!$this->UpdateManager->IsUpToDate())
           $Output .= '<a href="?action=upgrade">'.T('Upgrade').'</a> ';
         $Output .= '<a href="?action=insert_sample_data">Vložit vzorová data</a> ';
@@ -59 +59 @@
     $Output .= '<a href="'.$this->System->Link('/').'">'.T('Go to main page').'</a> ';
     $Output .= '';
-    return($Output);
+    return $Output;
   }
 
@@ -73 +73 @@
 
     $Output = '';
-    if(isset($this->Config))
-    {
-      if(!array_key_exists('SystemPassword', $_SESSION)) $_SESSION['SystemPassword'] = '';
-      if(array_key_exists('login', $_POST)) $_SESSION['SystemPassword'] = $_POST['SystemPassword'];
-      if(sha1($_SESSION['SystemPassword']) != $this->Config['SystemPassword'])
+    if (isset($this->Config))
+    {
+      if (!array_key_exists('SystemPassword', $_SESSION)) $_SESSION['SystemPassword'] = '';
+      if (array_key_exists('login', $_POST)) $_SESSION['SystemPassword'] = $_POST['SystemPassword'];
+      if (sha1($_SESSION['SystemPassword']) != $this->Config['SystemPassword'])
       {
         $Output .= $this->LoginPanel();
       } else
       {
-        if(array_key_exists('action', $_GET)) $Action = $_GET['action'];
+        if (array_key_exists('action', $_GET)) $Action = $_GET['action'];
           else $Action = '';
-        if($Action == 'logout')
+        if ($Action == 'logout')
         {
           $_SESSION['SystemPassword'] = '';
@@ -90 +90 @@
           $Output .= $this->LoginPanel();
         } else
-        if($Action == 'models')
+        if ($Action == 'models')
         {
           $this->System->FormManager->UpdateSQLMeta();
         } else
-        if($Action == 'upgrade')
+        if ($Action == 'upgrade')
         {
           $Output .= '<h3>Povýšení</h3>';
@@ -105 +105 @@
           $Output .= $this->ControlPanel();
         } else
-        if($Action == 'install')
+        if ($Action == 'install')
         {
           $Output .= '<h3>Instalace</h3>';
@@ -114 +114 @@
           $Output .= $this->ControlPanel();
         } else
-        if($Action == 'uninstall')
+        if ($Action == 'uninstall')
         {
           $Output .= '<h3>Odinstalace</h3>';
@@ -120 +120 @@
           $Output .= $this->ControlPanel();
         } else
-        if($Action == 'reload_modules')
+        if ($Action == 'reload_modules')
         {
           $Output .= '<h3>Znovunačtení seznamu modulů</h3>';
@@ -127 +127 @@
           $Output .= $this->ControlPanel();
         } else
-        if($Action == 'insert_sample_data')
+        if ($Action == 'insert_sample_data')
         {
           $Output .= '<h3>Vložení vzorových dat</h3>';
@@ -133 +133 @@
           $Output .= $this->ControlPanel();
         } else
-        if($Action == 'modules')
+        if ($Action == 'modules')
         {
           $Output .= $this->ShowModules();
         } else
-        if($Action == 'configure_save')
+        if ($Action == 'configure_save')
         {
            $Output .= $this->ConfigSave($this->Config);
            $Output .= $this->ControlPanel();
         } else
-        if($Action == 'configure')
+        if ($Action == 'configure')
         {
           $Output .= $this->PrepareConfig($this->Config);
@@ -152 +152 @@
     } else
     {
-      if(array_key_exists('configure_save', $_POST))
+      if (array_key_exists('configure_save', $_POST))
       {
         $Output .= $this->ConfigSave(array());
@@ -160 +160 @@
       }
     }
-    return($Output);
+    return $Output;
   }
 
@@ -166 +166 @@
   {
     $Output = '';
-    if(array_key_exists('op', $_GET)) $Operation = $_GET['op'];
+    if (array_key_exists('op', $_GET)) $Operation = $_GET['op'];
       else $Operation = '';
-    if($Operation == 'install')
+    if ($Operation == 'install')
     {
       $this->System->ModuleManager->Modules[$_GET['name']]->Install();
@@ -174 +174 @@
       $Output .= 'Modul '.$_GET['name'].' instalován<br/>';
     } else
-    if($Operation == 'uninstall')
+    if ($Operation == 'uninstall')
     {
       $this->System->ModuleManager->Modules[$_GET['name']]->Uninstall();
@@ -180 +180 @@
       $Output .= 'Modul '.$_GET['name'].' odinstalován<br/>';
     } else
-    if($Operation == 'enable')
+    if ($Operation == 'enable')
     {
       $this->System->ModuleManager->Modules[$_GET['name']]->Enable();
@@ -186 +186 @@
       $Output .= 'Modul '.$_GET['name'].' povolen<br/>';
     } else
-    if($Operation == 'disable')
+    if ($Operation == 'disable')
     {
       $this->System->ModuleManager->Modules[$_GET['name']]->Disable();
@@ -192 +192 @@
       $Output .= 'Modul '.$_GET['name'].' zakázán<br/>';
     } else
-    if($Operation == 'upgrade')
+    if ($Operation == 'upgrade')
     {
       $this->System->ModuleManager->Modules[$_GET['name']]->Upgrade();
@@ -200 +200 @@
     $Output .= '<h3>Správa modulů</h3>';
     $Output .= $this->ShowList();
-    return($Output);
+    return $Output;
   }
 
@@ -221 +221 @@
       array('Name' => '', 'Title' => 'Akce'),
     ));
-    foreach($this->System->ModuleManager->Modules as $Module)
-    {
-      if(($Module->Dependencies) > 0) $Dependencies = implode(',', $Module->Dependencies);
+    foreach ($this->System->ModuleManager->Modules as $Module)
+    {
+      if (($Module->Dependencies) > 0) $Dependencies = implode(',', $Module->Dependencies);
        else $Dependencies = '&nbsp;';
       $Actions = '';
-      if($Module->Installed == true)
+      if ($Module->Installed == true)
       {
         $Actions .= ' <a href="?action=modules&amp;op=uninstall&amp;name='.$Module->Name.'">Odinstalovat</a>';
-        if($Module->Enabled == true) $Actions .= ' <a href="?action=modules&amp;op=disable&amp;name='.$Module->Name.'">Zakázat</a>';
+        if ($Module->Enabled == true) $Actions .= ' <a href="?action=modules&amp;op=disable&amp;name='.$Module->Name.'">Zakázat</a>';
         else $Actions .= ' <a href="?action=modules&amp;op=enable&amp;name='.$Module->Name.'">Povolit</a>';
-        if($Module->InstalledVersion != $Module->Version) $Actions .= ' <a href="?action=modules&amp;op=upgrade&amp;name='.$Module->Name.'">Povýšit</a>';
+        if ($Module->InstalledVersion != $Module->Version) $Actions .= ' <a href="?action=modules&amp;op=upgrade&amp;name='.$Module->Name.'">Povýšit</a>';
       } else $Actions .= ' <a href="?action=modules&amp;op=install&amp;name='.$Module->Name.'">Instalovat</a>';
 
@@ -244 +244 @@
     $Output .= $Pageing->Show();
     //$Output .= '<p><a href="?A=SaveToDb">Uložit do databáze</a></p>';
-    return($Output);
+    return $Output;
   }
 
@@ -250 +250 @@
   {
     $Output = '';
-    if(!file_exists($this->ConfigDir.'/Config.php') and !is_writable($this->ConfigDir))
+    if (!file_exists($this->ConfigDir.'/Config.php') and !is_writable($this->ConfigDir))
       $Output .= 'Varování: Konfigurační soubor nebude možné zapsat, protože složka "'.$this->ConfigDir.'" není povolená pro zápis!';
-    if(file_exists($this->ConfigDir.'/Config.php') and !is_writable($this->ConfigDir.'/Config.php'))
+    if (file_exists($this->ConfigDir.'/Config.php') and !is_writable($this->ConfigDir.'/Config.php'))
       $Output .= 'Varování: Konfigurační soubor nebude možné zapsat, protože soubor "'.$this->ConfigDir.'/Config.php" není povolen pro zápis!';
     $Output .= '<h3>Nastavení systému</h3>'.
         '<form action="?action=configure_save" method="post">'.
         '<table>';
-    foreach($this->ConfigDefinition as $Def)
+    foreach ($this->ConfigDefinition as $Def)
     {
       $PathParts = explode('/', $Def['Name']);
       $TempConfig = &$Config;
-      foreach($PathParts as $Part)
-        if(array_key_exists($Part, $TempConfig))
+      foreach ($PathParts as $Part)
+        if (array_key_exists($Part, $TempConfig))
         {
           $TempConfig = &$TempConfig[$Part];
         }
-      if(!is_array($TempConfig)) $Value = $TempConfig;
+      if (!is_array($TempConfig)) $Value = $TempConfig;
         else $Value = $Def['Default'];
       $Output .= '<tr><td>'.$Def['Title'].'</td><td>';
-      if($Def['Type'] == 'String') $Output .= '<input type="text" name="'.$Def['Name'].'" value="'.$Value.'"/>';
-      if($Def['Type'] == 'Password') $Output .= '<input type="password" name="'.$Def['Name'].'"/>';
-      if($Def['Type'] == 'PasswordEncoded') $Output .= '<input type="password" name="'.$Def['Name'].'"/>';
-      if($Def['Type'] == 'Integer') $Output .= '<input type="text" name="'.$Def['Name'].'" value="'.$Value.'"/>';
-      if($Def['Type'] == 'Float') $Output .= '<input type="text" name="'.$Def['Name'].'" value="'.$Value.'"/>';
-      if($Def['Type'] == 'Boolean') $Output .= '<input type="text" name="'.$Def['Name'].'" value="'.$Value.'"/>';
-      if($Def['Type'] == 'Array') $Output .= '<input type="text" name="'.$Def['Name'].'" value="'.implode(',', $Value).'"/>';
+      if ($Def['Type'] == 'String') $Output .= '<input type="text" name="'.$Def['Name'].'" value="'.$Value.'"/>';
+      if ($Def['Type'] == 'Password') $Output .= '<input type="password" name="'.$Def['Name'].'"/>';
+      if ($Def['Type'] == 'PasswordEncoded') $Output .= '<input type="password" name="'.$Def['Name'].'"/>';
+      if ($Def['Type'] == 'Integer') $Output .= '<input type="text" name="'.$Def['Name'].'" value="'.$Value.'"/>';
+      if ($Def['Type'] == 'Float') $Output .= '<input type="text" name="'.$Def['Name'].'" value="'.$Value.'"/>';
+      if ($Def['Type'] == 'Boolean') $Output .= '<input type="text" name="'.$Def['Name'].'" value="'.$Value.'"/>';
+      if ($Def['Type'] == 'Array') $Output .= '<input type="text" name="'.$Def['Name'].'" value="'.implode(',', $Value).'"/>';
     }
     $Output .= '</td></tr>'.
@@ -281 +281 @@
         '</table>'.
         '</form>';
-    return($Output);
+    return $Output;
   }
 
@@ -287 +287 @@
   {
     $Config = $DefaultConfig;
-    foreach($this->ConfigDefinition as $Def)
+    foreach ($this->ConfigDefinition as $Def)
     {
       $Value = null;
-      if($Def['Type'] == 'String') if(array_key_exists($Def['Name'], $_POST))
+      if ($Def['Type'] == 'String') if (array_key_exists($Def['Name'], $_POST))
         $Value = $_POST[$Def['Name']];
-      if($Def['Type'] == 'Password') if(array_key_exists($Def['Name'], $_POST) and ($_POST[$Def['Name']] != ''))
+      if ($Def['Type'] == 'Password') if (array_key_exists($Def['Name'], $_POST) and ($_POST[$Def['Name']] != ''))
         $Value = $_POST[$Def['Name']];
-      if($Def['Type'] == 'PasswordEncoded') if(array_key_exists($Def['Name'], $_POST) and ($_POST[$Def['Name']] != ''))
+      if ($Def['Type'] == 'PasswordEncoded') if (array_key_exists($Def['Name'], $_POST) and ($_POST[$Def['Name']] != ''))
         $Value = sha1($_POST[$Def['Name']]);
-      if($Def['Type'] == 'Integer') if(array_key_exists($Def['Name'], $_POST))
+      if ($Def['Type'] == 'Integer') if (array_key_exists($Def['Name'], $_POST))
         $Value = $_POST[$Def['Name']];
-      if($Def['Type'] == 'Float') if(array_key_exists($Def['Name'], $_POST))
+      if ($Def['Type'] == 'Float') if (array_key_exists($Def['Name'], $_POST))
         $Value = $_POST[$Def['Name']];
-      if($Def['Type'] == 'Boolean') if(array_key_exists($Def['Name'], $_POST))
+      if ($Def['Type'] == 'Boolean') if (array_key_exists($Def['Name'], $_POST))
         $Value = $_POST[$Def['Name']];
-      if($Def['Type'] == 'Array') if(array_key_exists($Def['Name'], $_POST))
+      if ($Def['Type'] == 'Array') if (array_key_exists($Def['Name'], $_POST))
         $Value = explode(',', $_POST[$Def['Name']]);
-      if(!is_null($Value))
+      if (!is_null($Value))
       {
         $PathParts = explode('/', $Def['Name']);
         $TempConfig = &$Config;
-        foreach($PathParts as $Part)
+        foreach ($PathParts as $Part)
         {
           $TempConfig = &$TempConfig[$Part];
         }
-        if(!is_array($TempConfig)) $TempConfig = $Value;
+        if (!is_array($TempConfig)) $TempConfig = $Value;
         else $Value = $Def['Default'];
       }
@@ -319 +319 @@
     file_put_contents($this->ConfigDir.'/Config.php', $ConfigText);
     $Output = 'Konfigurace nastavena<br/>';
-    return($Output);
+    return $Output;
   }
 
@@ -327 +327 @@
       "\$IsDeveloper = array_key_exists('REMOTE_ADDR', \$_SERVER) and  in_array(\$_SERVER['REMOTE_ADDR'], array('127.0.0.1'));\n\n";
 
-    foreach($this->ConfigDefinition as $Def)
+    foreach ($this->ConfigDefinition as $Def)
     {
       $PathParts = explode('/', $Def['Name']);
       $Output .= "\$Config";
-      foreach($PathParts as $Part)
+      foreach ($PathParts as $Part)
         $Output .= "['".$Part."']";
       $TempConfig = &$Config;
       $Output .= ' = ';
-      foreach($PathParts as $Part)
-        if(array_key_exists($Part, $TempConfig))
+      foreach ($PathParts as $Part)
+        if (array_key_exists($Part, $TempConfig))
         {
           $TempConfig = &$TempConfig[$Part];
         }
-      if(!is_array($TempConfig)) $Value = $TempConfig;
+      if (!is_array($TempConfig)) $Value = $TempConfig;
         else $Value = $Def['Default'];
-      if($Def['Type'] == 'Array')
+      if ($Def['Type'] == 'Array')
       {
         $Output .= ' array(';
-        foreach($Value as $Index => $Item)
+        foreach ($Value as $Index => $Item)
           $Output .= '\''.$Item.'\', ';
         $Output .= ')';
@@ -353 +353 @@
     }
     $Output .= "\n\n";
-    return($Output);
+    return $Output;
   }
 }
@@ -362 +362 @@
   {
     $Output = '';
-    if(!$this->Database->Connected()) $Output .= T('Can\'t connect to database').'<br>';
+    if (!$this->Database->Connected()) $Output .= T('Can\'t connect to database').'<br>';
     else {
-      if(!$this->System->Setup->UpdateManager->IsInstalled())
+      if (!$this->System->Setup->UpdateManager->IsInstalled())
         $Output .= T('System requires database initialization').'<br>';
       else
-      if(!$this->System->Setup->UpdateManager->IsUpToDate())
+      if (!$this->System->Setup->UpdateManager->IsUpToDate())
         $Output .= T('System requires database upgrade').'<br>';
     }
     $Output .= sprintf(T('Front page was not configured. Continue to %s'), '<a href="'.$this->System->Link('/setup/').'">'.T('setup').'</a>');
-    return($Output);
+    return $Output;
   }
 }
@@ -402 +402 @@
   function CheckState()
   {
-    return($this->Database->Connected() and $this->UpdateManager->IsInstalled() and
-      $this->UpdateManager->IsUpToDate());
+    return $this->Database->Connected() and $this->UpdateManager->IsInstalled() and
+      $this->UpdateManager->IsUpToDate();
   }
 
@@ -435 +435 @@
   {
     $DbResult = $this->Database->query('SHOW TABLES LIKE "'.$this->UpdateManager->VersionTable.'"');
-    return($DbResult->num_rows > 0);
+    return $DbResult->num_rows > 0;
   }
 
@@ -443 +443 @@
     $this->UpdateManager->Trace = $Updates->Get();
     $Output = $this->UpdateManager->Upgrade();
-    return($Output);
+    return $Output;
   }
 }

trunk/Packages/Common/Table.php

@@ -7 +7 @@
   function Show()
   {
-    return('');
+    return '';
   }
 }
@@ -15 +15 @@
   function GetCell($Y, $X)
   {
-    return('');
+    return '';
   }
 
@@ -28 +28 @@
   function RowsCount()
   {
-    return(0);
+    return 0;
   }
 }
@@ -38 +38 @@
   function GetCell($Y, $X)
   {
-    return($this->Cells[$Y][$X]);
+    return $this->Cells[$Y][$X];
   }
 
   function RowsCount()
   {
-    return(count($this->Cells));
+    return count($this->Cells);
   }
 }
@@ -55 +55 @@
   function GetCell($Y, $X)
   {
-    return($this->Cells[$Y][$X]);
+    return $this->Cells[$Y][$X];
   }
 
@@ -62 +62 @@
     $this->Cells = array();
     $DbResult = $this->Database->query($this->Query);
-    while($DbRow = $DbResult->fetch_row())
+    while ($DbRow = $DbResult->fetch_row())
     {
       $this->Cells[] = $DbRow;
@@ -75 +75 @@
   function RowsCount()
   {
-    return(count($this->Cells));
+    return count($this->Cells);
   }
 }
@@ -114 +114 @@
   {
     $this->Columns = array();
-    foreach($Columns as $Column)
+    foreach ($Columns as $Column)
     {
       $NewCol = new TableColumn();
@@ -121 +121 @@
       $this->Columns[] = $NewCol;
     }
-    if(count($this->Columns) > 0)
+    if (count($this->Columns) > 0)
       $this->DefaultColumn = $this->Columns[0]->Name;
       else $this->DefaultColumn = '';
@@ -131 +131 @@
     $Output .= $this->GetOrderHeader();
     $this->Table->BeginRead();
-    for($Y = 0; $Y < $this->Table->RowsCount(); $Y++)
+    for ($Y = 0; $Y < $this->Table->RowsCount(); $Y++)
     {
       $Output .= '<tr>';
 
-      for($X = 0; $X < count($this->Columns); $X++)
+      for ($X = 0; $X < count($this->Columns); $X++)
       {
         $Cell = $this->Table->GetCell($Y, $X);
-        if($Cell == '') $Output .= '<td>&nbsp;</td>';
+        if ($Cell == '') $Output .= '<td>&nbsp;</td>';
           else $Output .= '<td>'.$Cell.'</td>';
       }
@@ -145 +145 @@
     $this->Table->EndRead();
     $Output .= '</table>';
-    return($Output);
+    return $Output;
   }
 
   function GetOrderHeader()
   {
-    if(array_key_exists('OrderCol', $_GET)) $_SESSION['OrderCol'] = $_GET['OrderCol'];
-    if(array_key_exists('OrderDir', $_GET)) $_SESSION['OrderDir'] = $_GET['OrderDir'];
-    if(!array_key_exists('OrderCol', $_SESSION)) $_SESSION['OrderCol'] = $this->DefaultColumn;
-    if(!array_key_exists('OrderDir', $_SESSION)) $_SESSION['OrderDir'] = $this->DefaultOrder;
+    if (array_key_exists('OrderCol', $_GET)) $_SESSION['OrderCol'] = $_GET['OrderCol'];
+    if (array_key_exists('OrderDir', $_GET)) $_SESSION['OrderDir'] = $_GET['OrderDir'];
+    if (!array_key_exists('OrderCol', $_SESSION)) $_SESSION['OrderCol'] = $this->DefaultColumn;
+    if (!array_key_exists('OrderDir', $_SESSION)) $_SESSION['OrderDir'] = $this->DefaultOrder;
 
     // Check OrderCol
     $Found = false;
-    foreach($this->Columns as $Column)
+    foreach ($this->Columns as $Column)
     {
-      if($Column->Name == $_SESSION['OrderCol'])
+      if ($Column->Name == $_SESSION['OrderCol'])
       {
         $Found = true;
@@ -165 +165 @@
       }
     }
-    if($Found == false)
+    if ($Found == false)
     {
       $_SESSION['OrderCol'] = $this->DefaultColumn;
@@ -171 +171 @@
     }
     // Check OrderDir
-    if(($_SESSION['OrderDir'] != 0) and ($_SESSION['OrderDir'] != 1))
+    if (($_SESSION['OrderDir'] != 0) and ($_SESSION['OrderDir'] != 1))
       $_SESSION['OrderDir'] = 0;
 
     $Result = '';
     $QueryItems = GetQueryStringArray($_SERVER['QUERY_STRING']);
-    foreach($this->Columns as $Index => $Column)
+    foreach ($this->Columns as $Index => $Column)
     {
       $QueryItems['OrderCol'] = $Column->Name;
       $QueryItems['OrderDir'] = 1 - $_SESSION['OrderDir'];
-      if($Column->Name == $_SESSION['OrderCol'])
+      if ($Column->Name == $_SESSION['OrderCol'])
         $ArrowImage = '<img style="vertical-align: middle; border: 0px;" src="'.$this->OrderArrowImage[$_SESSION['OrderDir']].'" alt="order arrow">';
         else $ArrowImage = '';
-      if($Column->Name == '') $Result .= '<th>'.$Column->Title.'</th>';
+      if ($Column->Name == '') $Result .= '<th>'.$Column->Title.'</th>';
         else $Result .= '<th><a href="?'.SetQueryStringArray($QueryItems).'">'.$Column->Title.$ArrowImage.'</a></th>';
     }
@@ -190 +190 @@
     $this->OrderDirection = $_SESSION['OrderDir'];
 
-    return('<tr>'.$Result.'</tr>');
+    return '<tr>'.$Result.'</tr>';
   }
 }

trunk/Packages/Common/UTF8.php

@@ -529 +529 @@
   {
     $Result = '';
-    for($I = 0; $I < strlen($String); $I++)
+    for ($I = 0; $I < strlen($String); $I++)
     {
-       if(ord($String[$I]) < 128) $Result .= $String[$I];
-       else if(ord($String[$I]) > 127)
+       if (ord($String[$I]) < 128) $Result .= $String[$I];
+       else if (ord($String[$I]) > 127)
        {
          $Result .= $this->CharTable[$Charset][ord($String[$I])];
        }
     }
-    return($Result);
+    return $Result;
   }
 
@@ -544 +544 @@
     $Result = '';
     $UTFPrefix = '';
-    for($I = 0; $I < strlen($String); $I++)
+    for ($I = 0; $I < strlen($String); $I++)
     {
-      if(ord($String{$I}) & 0x80) // UTF control character
+      if (ord($String{$I}) & 0x80) // UTF control character
       {
-        if(ord($String{$I}) & 0x40) // First
+        if (ord($String{$I}) & 0x40) // First
         {
-          if($UTFPrefix != '') $Result .= chr(array_search($UTFPrefix, $this->CharTable[$Charset]));
+          if ($UTFPrefix != '') $Result .= chr(array_search($UTFPrefix, $this->CharTable[$Charset]));
           $UTFPrefix = $String{$I};
         }
@@ -556 +556 @@
       } else
       {
-        if($UTFPrefix != '') $Result .= chr(array_search($UTFPrefix, $this->CharTable[$Charset]));
+        if ($UTFPrefix != '') $Result .= chr(array_search($UTFPrefix, $this->CharTable[$Charset]));
         $UTFPrefix = '';
         $Result .= $String{$I};
       }
     }
-    return($Result);
+    return $Result;
   }
 }

trunk/Packages/Common/Update.php

@@ -23 +23 @@
     $DbResult = $this->Database->select($this->VersionTable, '*', 'Id=1');
     $Version = $DbResult->fetch_assoc();
-    return($Version['Revision']);
+    return $Version['Revision'];
   }
 
@@ -29 +29 @@
   {
     $DbResult = $this->Database->query('SHOW TABLES LIKE "'.$this->VersionTable.'"');
-    return($DbResult->num_rows > 0);
+    return $DbResult->num_rows > 0;
   }
 
   function IsUpToDate()
   {
-    return($this->Revision <= $this->GetDbVersion());
+    return $this->Revision <= $this->GetDbVersion();
   }
 
@@ -41 +41 @@
     $DbRevision = $this->GetDbVersion();
     $Output = 'Počáteční revize databáze: '.$DbRevision.'<br/>';
-    while($this->Revision > $DbRevision)
+    while ($this->Revision > $DbRevision)
     {
       $TraceItem = $this->Trace[$DbRevision];
@@ -54 +54 @@
         $TraceItem['Revision'].' WHERE `Id`=1');
     }
-    return($Output);
+    return $Output;
   }
 
@@ -79 +79 @@
     echo($Query.';<br/>');
     flush();
-    return($this->Database->query($Query));
+    return $this->Database->query($Query);
   }
 }

trunk/Packages/Common/VarDumper.php

@@ -49 +49 @@
                 self::$_depth=$depth;
                 self::dumpInternal($var,0);
-                if($highlight)
+                if ($highlight)
                 {
                         $result=highlight_string("<?php\n".self::$_output,true);
@@ -60 +60 @@
         private static function dumpInternal($var,$level)
         {
-                switch(gettype($var))
+                switch (gettype($var))
                 {
                         case 'boolean':
@@ -84 +84 @@
                                 break;
                         case 'array':
-                                if(self::$_depth<=$level)
+                                if (self::$_depth<=$level)
                                         self::$_output.='array(...)';
-                                else if(empty($var))
+                                else if (empty($var))
                                         self::$_output.='array()';
                                 else
@@ -93 +93 @@
                                         $spaces=str_repeat(' ',$level*4);
                                         self::$_output.="array\n".$spaces.'(';
-                                        foreach($keys as $key)
+                                        foreach ($keys as $key)
                                         {
                                                 self::$_output.="\n".$spaces."    [$key] => ";
@@ -102 +102 @@
                                 break;
                         case 'object':
-                                if(($id=array_search($var,self::$_objects,true))!==false)
+                                if (($id=array_search($var,self::$_objects,true))!==false)
                                         self::$_output.=get_class($var).'#'.($id+1).'(...)';
-                                else if(self::$_depth<=$level)
+                                else if (self::$_depth<=$level)
                                         self::$_output.=get_class($var).'(...)';
                                 else
@@ -114 +114 @@
                                         $spaces=str_repeat(' ',$level*4);
                                         self::$_output.="$className#$id\n".$spaces.'(';
-                                        foreach($keys as $key)
+                                        foreach ($keys as $key)
                                         {
                                                 $keyDisplay=strtr(trim($key),array("\0"=>':'));

trunk/alert.php

@@ -15 +15 @@
     $DbResult = $this->Database->query('SELECT `News`.`Time`, `News`.`Text`, `News`.`Title`, '.
         '`User`.`Name` AS `User` FROM `News` JOIN `User` ON `User`.`Id`=`News`.`User` ORDER BY `News`.`Time` DESC ');
-    while($Article = $DbResult->fetch_assoc())
+    while ($Article = $DbResult->fetch_assoc())
     {
       $Output .= ('> '.HumanDate($Article['Time']).' '.$Article['Title']."\n".strip_tags($Article['Text'])."\n\n");
     }
-    return($Output);
+    return $Output;
   }
 }

trunk/includes/FileStream.php

@@ -15 +15 @@
   function __destruct()
   {
-    if($this->Handle)
+    if ($this->Handle)
       fclose($this->Handle);
   }
@@ -24 +24 @@
     $this->CloseFile();
     $this->Handle = fopen($FileName, 'rb');
-    if(!$this->Handle) die(str_replace('%s', $FileName, FILE_NOT_FOUND));
+    if (!$this->Handle) die(str_replace('%s', $FileName, FILE_NOT_FOUND));
   }
 
@@ -32 +32 @@
     $this->CloseFile();
     $this->Handle = fopen($FileName, 'wb+');
-    if(!$this->Handle) die(str_replace('%s', $FileName, FILE_NOT_FOUND));
+    if (!$this->Handle) die(str_replace('%s', $FileName, FILE_NOT_FOUND));
   }
 
   public function CloseFile()
   {
-    if($this->Handle)
+    if ($this->Handle)
       fclose($this->Handle);
   }
@@ -43 +43 @@
   public function ReadBlock($Count)
   {
-    return(fread($this->Handle, $Count));
+    return fread($this->Handle, $Count);
   }
 
   public function ReadByte()
   {
-    return(fread($this->Handle, 1));
+    return fread($this->Handle, 1);
   }
 
@@ -54 +54 @@
   {
     $val = unpack('V*', fread($this->Handle, 4));
-    return($val[1]);
+    return $val[1];
   }
 
@@ -60 +60 @@
   {
     $val = unpack('I*', fread($this->Handle, 4));
-    return($val[1]);
+    return $val[1];
   }
 
@@ -66 +66 @@
   {
     $val = unpack('f*', fread($this->Handle, 4));
-    return($val[1]);
+    return $val[1];
   }
 
   public function ReadChar()
   {
-    return(fread($this->Handle, 1));
+    return fread($this->Handle, 1);
   }
 
   public function ReadLine()
   {
-    return(fgets($this->Handle));
+    return fgets($this->Handle);
   }
 
   public function ReadTextLine()
   {
-    return(fgets($this->Handle));
+    return fgets($this->Handle);
   }
 
@@ -131 +131 @@
   public function GetPosition()
   {
-    return(ftell($this->Handle));
+    return ftell($this->Handle);
   }
 
   public function GetSize()
   {
-    return(filesize($this->FileName));
+    return filesize($this->FileName);
   }
 
   public function SetSize($Size)
   {
-    return(ftruncate($this->Handle, $Size));
+    return ftruncate($this->Handle, $Size);
   }
 
   public function EOF()
   {
-    return(feof($this->Handle));
+    return feof($this->Handle);
   }
 }

trunk/includes/Global.php

@@ -2 +2 @@
 
 include_once(dirname(__FILE__).'/../Packages/Common/Common.php');
-if(file_exists(dirname(__FILE__).'/../Config/Config.php'))
+if (file_exists(dirname(__FILE__).'/../Config/Config.php'))
   include_once(dirname(__FILE__).'/../Config/Config.php');
 include_once(dirname(__FILE__).'/../Application/Core.php');
@@ -13 +13 @@
 
 // Back compatibility, will be removed
-if(isset($InitSystem) and $InitSystem)
+if (isset($InitSystem) and $InitSystem)
 {
   $System = new Core();
@@ -25 +25 @@
   {
     global $TempPageContent;
-    return($TempPageContent);
+    return $TempPageContent;
   }
 }
@@ -54 +54 @@
 {
   list($Usec, $Sec) = explode(' ', microtime());
-  return ((float)$Usec + (float)$Sec);
+  return (float)$Usec + (float)$Sec;
 }
 
@@ -64 +64 @@
 
   $UnitIndex = 0;
-  while($Value > 1024)
+  while ($Value > 1024)
   {
     $Value = round($Value / 1024, 3);
     $UnitIndex++;
   }
-  return($Value.' '.$UnitNames[$UnitIndex]);
+  return $Value.' '.$UnitNames[$UnitIndex];
 }
 
@@ -76 +76 @@
   $Result = array();
   $Parts = explode('&', $QueryString);
-  foreach($Parts as $Part)
-  {
-    if($Part != '')
-    {
-      if(!strpos($Part, '=')) $Part .= '=';
+  foreach ($Parts as $Part)
+  {
+    if ($Part != '')
+    {
+      if (!strpos($Part, '=')) $Part .= '=';
       $Item = explode('=', $Part);
       $Result[$Item[0]] = $Item[1];
     }
   }
-  return($Result);
+  return $Result;
 }
 
@@ -91 +91 @@
 {
   $Parts = array();
-  foreach($QueryStringArray as $Index => $Item)
+  foreach ($QueryStringArray as $Index => $Item)
   {
     $Parts[] = $Index.'='.$Item;
   }
-  return(implode('&', $Parts));
+  return implode('&', $Parts);
 }
 
@@ -107 +107 @@
   //$return = Str_Replace(Array("(",")",".","!",",","\"","'"), "", $return); //odstraní ().!,"'
   //$return = StrToLower($return); // velká písmena nahradí malými.
-  return($return);
+  return $return;
 }
 
@@ -116 +116 @@
   $Days = floor($Days - $month * 30);
   $month = $month - $year * 12;
-  return($year.'r '.$month.'m '.$Days.'d');
+  return $year.'r '.$month.'m '.$Days.'d';
 }
 
@@ -137 +137 @@
 
   error_reporting(E_ALL ^ E_WARNING);
-  if (($handle = @fopen($url, "r")) === FALSE) return(false);
+  if (($handle = @fopen($url, "r")) === FALSE) return false;
 
   $data = stream_get_contents($handle);
@@ -164 +164 @@
   $data = strip_tags($data);
 
-  return($data);
+  return $data;
 }
 
@@ -178 +178 @@
   $PageCount = floor($TotalCount / $ItemPerPage) + 1;
 
-  if(!array_key_exists('Page', $_SESSION)) $_SESSION['Page'] = 0;
-  if(array_key_exists('page', $_GET)) $_SESSION['Page'] = $_GET['page'] * 1;
-  if($_SESSION['Page'] < 0) $_SESSION['Page'] = 0;
-  if($_SESSION['Page'] >= $PageCount) $_SESSION['Page'] = $PageCount - 1;
+  if (!array_key_exists('Page', $_SESSION)) $_SESSION['Page'] = 0;
+  if (array_key_exists('page', $_GET)) $_SESSION['Page'] = $_GET['page'] * 1;
+  if ($_SESSION['Page'] < 0) $_SESSION['Page'] = 0;
+  if ($_SESSION['Page'] >= $PageCount) $_SESSION['Page'] = $PageCount - 1;
   $CurrentPage = $_SESSION['Page'];
 
@@ -188 +188 @@
 
   $Result = '';
-  if($PageCount > 1)
-  {
-    if($CurrentPage > 0)
+  if ($PageCount > 1)
+  {
+    if ($CurrentPage > 0)
     {
       $QueryItems['page'] = 0;
@@ -199 +199 @@
     $PagesMax = $PageCount - 1;
     $PagesMin = 0;
-    if($PagesMax > ($CurrentPage + $Around)) $PagesMax = $CurrentPage + $Around;
-    if($PagesMin < ($CurrentPage - $Around))
+    if ($PagesMax > ($CurrentPage + $Around)) $PagesMax = $CurrentPage + $Around;
+    if ($PagesMin < ($CurrentPage - $Around))
     {
       $Result.= ' ... ';
       $PagesMin = $CurrentPage - $Around;
     }
-    for($i = $PagesMin; $i <= $PagesMax; $i++)
-    {
-      if($i == $CurrentPage) $Result.= '<strong>'.($i + 1).'</strong> ';
+    for ($i = $PagesMin; $i <= $PagesMax; $i++)
+    {
+      if ($i == $CurrentPage) $Result.= '<strong>'.($i + 1).'</strong> ';
       else {
        $QueryItems['page'] = $i;
@@ -213 +213 @@
       }
     }
-    if($PagesMax < ($PageCount - 1)) $Result .= ' ... ';
-    if($CurrentPage < ($PageCount - 1))
+    if ($PagesMax < ($PageCount - 1)) $Result .= ' ... ';
+    if ($CurrentPage < ($PageCount - 1))
     {
       $QueryItems['page'] = ($CurrentPage + 1);
@@ -223 +223 @@
   }
   $Result = '<div style="text-align: center">'.$Result.'</div>';
-  return(array('SQLLimit' => ' LIMIT '.$CurrentPage * $ItemPerPage.', '.$ItemPerPage,
+  return array('SQLLimit' => ' LIMIT '.$CurrentPage * $ItemPerPage.', '.$ItemPerPage,
     'Page' => $CurrentPage,
     'Output' => $Result,
-  ));
+  );
 }
 
@@ -236 +236 @@
   global $OrderDirSQL, $OrderArrowImage, $Config, $System;
 
-  if(array_key_exists('OrderCol', $_GET)) $_SESSION['OrderCol'] = $_GET['OrderCol'];
-  if(array_key_exists('OrderDir', $_GET) and (array_key_exists($_GET['OrderDir'], $OrderArrowImage)))
+  if (array_key_exists('OrderCol', $_GET)) $_SESSION['OrderCol'] = $_GET['OrderCol'];
+  if (array_key_exists('OrderDir', $_GET) and (array_key_exists($_GET['OrderDir'], $OrderArrowImage)))
     $_SESSION['OrderDir'] = $_GET['OrderDir'];
-  if(!array_key_exists('OrderCol', $_SESSION)) $_SESSION['OrderCol'] = $DefaultColumn;
-  if(!array_key_exists('OrderDir', $_SESSION)) $_SESSION['OrderDir'] = $DefaultOrder;
+  if (!array_key_exists('OrderCol', $_SESSION)) $_SESSION['OrderCol'] = $DefaultColumn;
+  if (!array_key_exists('OrderDir', $_SESSION)) $_SESSION['OrderDir'] = $DefaultOrder;
 
   // Check OrderCol
   $Found = false;
-  foreach($Columns as $Column)
-  {
-    if($Column['Name'] == $_SESSION['OrderCol'])
+  foreach ($Columns as $Column)
+  {
+    if ($Column['Name'] == $_SESSION['OrderCol'])
     {
       $Found = true;
@@ -252 +252 @@
     }
   }
-  if($Found == false)
+  if ($Found == false)
   {
     $_SESSION['OrderCol'] = $DefaultColumn;
@@ -258 +258 @@
   }
   // Check OrderDir
-  if(($_SESSION['OrderDir'] != 0) and ($_SESSION['OrderDir'] != 1)) $_SESSION['OrderDir'] = 0;
+  if (($_SESSION['OrderDir'] != 0) and ($_SESSION['OrderDir'] != 1)) $_SESSION['OrderDir'] = 0;
 
   $Result = '';
   $QueryItems = GetQueryStringArray($_SERVER['QUERY_STRING']);
-  foreach($Columns as $Index => $Column)
+  foreach ($Columns as $Index => $Column)
   {
     $QueryItems['OrderCol'] = $Column['Name'];
     $QueryItems['OrderDir'] = 1 - $_SESSION['OrderDir'];
-    if($Column['Name'] == $_SESSION['OrderCol']) $ArrowImage = '<img style="vertical-align: middle; border: 0px;" src="'.
+    if ($Column['Name'] == $_SESSION['OrderCol']) $ArrowImage = '<img style="vertical-align: middle; border: 0px;" src="'.
       $System->Link('/images/'.$OrderArrowImage[$_SESSION['OrderDir']]).'" alt="order arrow"/>';
       else $ArrowImage = '';
-    if($Column['Name'] == '') $Result .= '<th>'.$Column['Title'].'</th>';
+    if ($Column['Name'] == '') $Result .= '<th>'.$Column['Title'].'</th>';
       else $Result .= '<th><a href="?'.SetQueryStringArray($QueryItems).'">'.$Column['Title'].$ArrowImage.'</a></th>';
   }
-  return(array(
+  return array(
     'SQL' => ' ORDER BY `'.$_SESSION['OrderCol'].'` '.$OrderDirSQL[$_SESSION['OrderDir']],
     'Output' => '<tr>'.$Result.'</tr>',
     'Column' => $_SESSION['OrderCol'],
     'Direction' => $_SESSION['OrderDir'],
-  ));
+  );
 }
 
@@ -287 +287 @@
   $DbResult = $System->Database->select('ClientVersion', '`Id`, `Version`', '`Imported` = 1');
   $Output .= '<option value=""';
-  if($Selected == '')
+  if ($Selected == '')
     $Output .= ' selected="selected"';
   $Output .= '>'.T('None').'</option>';
-  while($ClientVersion = $DbResult->fetch_assoc())
+  while ($ClientVersion = $DbResult->fetch_assoc())
   {
     $Output .= '<option value="'.$ClientVersion['Id'].'"';
-    if($Selected == $ClientVersion['Id'])
+    if ($Selected == $ClientVersion['Id'])
       $Output .= ' selected="selected"';
     $Output .= '>'.$ClientVersion['Version'].'</option>';
   }
   $Output .= '</select>';
-  return($Output);
+  return $Output;
 }
 
@@ -307 +307 @@
   $Result = array();
   $DbResult = $System->Database->query('SELECT * FROM `Language` WHERE `Enabled` = 1');
-  while($DbRow = $DbResult->fetch_assoc())
+  while ($DbRow = $DbResult->fetch_assoc())
     $Result[$DbRow['Id']] = $DbRow;
-  return($Result);
+  return $Result;
 }
 
@@ -316 +316 @@
 function HumanDate($SQLDateTime)
 {
-  if($SQLDateTime == '') return('&nbsp;');
+  if ($SQLDateTime == '') return '&nbsp;';
   $DateTimeParts = explode(' ', $SQLDateTime);
-  if($DateTimeParts[0] != '0000-00-00')
+  if ($DateTimeParts[0] != '0000-00-00')
   {
     $DateParts = explode('-', $DateTimeParts[0]);
-    return(($DateParts[2] * 1).'.'.($DateParts[1] * 1).'.'.($DateParts[0] * 1));
-  } else return('&nbsp;');
+    return ($DateParts[2] * 1).'.'.($DateParts[1] * 1).'.'.($DateParts[0] * 1);
+  } else return '&nbsp;';
 }
 
 function HumanDateTime($SQLDateTime)
 {
-  if($SQLDateTime == '') return('&nbsp;');
+  if ($SQLDateTime == '') return '&nbsp;';
   $DateTimeParts = explode(' ', $SQLDateTime);
-  if($DateTimeParts[0] != '0000-00-00' and $SQLDateTime <> '')
+  if ($DateTimeParts[0] != '0000-00-00' and $SQLDateTime <> '')
   {
     $DateParts = explode('-', $DateTimeParts[0]);
     $Output = ($DateParts[2] * 1).'.'.($DateParts[1] * 1).'.'.($DateParts[0] * 1);
   } else $Output = '&nbsp;';
-  if(count($DateTimeParts) > 1)
-  if($DateTimeParts[1] != '00:00:00')
+  if (count($DateTimeParts) > 1)
+  if ($DateTimeParts[1] != '00:00:00')
   {
     $TimeParts = explode(':', $DateTimeParts[1]);
     $Output .= ' '.($TimeParts[0] * 1).':'.($TimeParts[1] * 1).':'.($TimeParts[2] * 1);
   };
-  return($Output);
+  return $Output;
 }
 
@@ -347 +347 @@
   global $System, $Config;
 
-  if($Prev)
+  if ($Prev)
     $sql = 'SELECT `ID` FROM `'.$Table.'` AS `item` WHERE '.
       '(`Language` = '.$Config['OriginalLanguage'].') AND NOT EXISTS(SELECT `entry` '.
@@ -359 +359 @@
   $DbResult = $System->Database->query($sql);
   $Next = $DbResult->fetch_assoc();
-  if($Next)
-  {
-    if($Prev) $Output = '<a href="form.php?group='.$GroupId.'&amp;ID='.$Next['ID'].'">Předcházející '.$Next['ID'].'</a> ';
+  if ($Next)
+  {
+    if ($Prev) $Output = '<a href="form.php?group='.$GroupId.'&amp;ID='.$Next['ID'].'">Předcházející '.$Next['ID'].'</a> ';
     else $Output = '<a href="form.php?group='.$GroupId.'&amp;ID='.$Next['ID'].'">Následující '.$Next['ID'].'</a> ';
-      return('form.php?group='.$GroupId.'&amp;ID='.$Next['ID']);
+      return 'form.php?group='.$GroupId.'&amp;ID='.$Next['ID'];
   }
 }
@@ -371 +371 @@
   global $System, $BuildNumbers;
 
-  if(isset($BuildNumbers[$Version]) == false)
+  if (isset($BuildNumbers[$Version]) == false)
   {
     $sql = 'SELECT `BuildNumber` FROM `ClientVersion` WHERE `Version` = "'.$Version.'"';
@@ -378 +378 @@
     $BuildNumbers[$Version] = $DbRow['BuildNumber'];
   }
-  return($BuildNumbers[$Version]);
+  return $BuildNumbers[$Version];
 }
 
@@ -386 +386 @@
   global $System, $VersionsWOW;
 
-  if(isset($VersionsWOW[$BuildNumber]) == false)
+  if (isset($VersionsWOW[$BuildNumber]) == false)
   {
     $sql = 'SELECT `Version` FROM `ClientVersion` WHERE `BuildNumber` = "'.$BuildNumber.'"';
@@ -393 +393 @@
     $VersionsWOW[$BuildNumber] = $Version['Version'];
   }
-  return($VersionsWOW[$BuildNumber]);
+  return $VersionsWOW[$BuildNumber];
 }
 
@@ -401 +401 @@
   global $System, $VersionsWOWId;
 
-  if(isset($VersionsWOWId[$BuildNumber]) == false)
+  if (isset($VersionsWOWId[$BuildNumber]) == false)
   {
     $sql = 'SELECT `Id` FROM `ClientVersion` WHERE `BuildNumber` = "'.$BuildNumber.'"';
@@ -408 +408 @@
     $VersionsWOWId[$BuildNumber] = $Version['Id'];
   }
-  return($VersionsWOWId[$BuildNumber]);
+  return $VersionsWOWId[$BuildNumber];
 }
 
@@ -416 +416 @@
   $TranslationTree = $System->ModuleManager->Modules['Translation']->GetTranslationTree();
 
-  if(array_key_exists('group', $_GET)) $GroupId = $_GET['group'] * 1;
+  if (array_key_exists('group', $_GET)) $GroupId = $_GET['group'] * 1;
     else $GroupId = 1;
 
-  if(isset($TranslationTree[$GroupId]) == false) ErrorMessage('Překladová skupina dle zadaného Id neexistuje.');
-  return($GroupId);
+  if (isset($TranslationTree[$GroupId]) == false) ErrorMessage('Překladová skupina dle zadaného Id neexistuje.');
+  return $GroupId;
 }
 
 function LoadCommandLineParameters()
 {
-  if(!array_key_exists('REMOTE_ADDR', $_SERVER))
-  {
-    foreach($_SERVER['argv'] as $Parameter)
-    {
-      if(strpos($Parameter, '=') !== false)
+  if (!array_key_exists('REMOTE_ADDR', $_SERVER))
+  {
+    foreach ($_SERVER['argv'] as $Parameter)
+    {
+      if (strpos($Parameter, '=') !== false)
       {
         $Index = substr($Parameter, 0, strpos($Parameter, '='));
@@ -444 +444 @@
   $QueryItems = GetQueryStringArray($_SERVER['QUERY_STRING']);
 
-  if(array_key_exists('Tab', $_GET)) $_SESSION['Tab'] = $_GET['Tab'];
-  if(!array_key_exists('Tab', $_SESSION)) $_SESSION['Tab'] = 0;
-  if(($_SESSION['Tab'] < 0) or ($_SESSION['Tab'] > (count($Tabs) - 1))) $_SESSION['Tab'] = 0;
+  if (array_key_exists('Tab', $_GET)) $_SESSION['Tab'] = $_GET['Tab'];
+  if (!array_key_exists('Tab', $_SESSION)) $_SESSION['Tab'] = 0;
+  if (($_SESSION['Tab'] < 0) or ($_SESSION['Tab'] > (count($Tabs) - 1))) $_SESSION['Tab'] = 0;
   $Output = '<div id="header">'.
     '<ul>';
-  foreach($Tabs as $Index => $Tab)
+  foreach ($Tabs as $Index => $Tab)
   {
     $QueryItems['Tab'] = $Index;
-    if($Index == $_SESSION['Tab']) $Selected = ' id="selected"';
+    if ($Index == $_SESSION['Tab']) $Selected = ' id="selected"';
       else $Selected = '';
     $Output .= '<li'.$Selected.'><a href="?'.SetQueryStringArray($QueryItems).'">'.$Tab.'</a></li>';
   }
   $Output .= '</ul></div>';
-  return($Output);
+  return $Output;
 }
 
 function CheckBox($Name, $Checked = false, $Id = '', $Class = '', $Disabled = false)
 {
-  if($Id) $Id = ' id="'.$Id.'"'; else $Id = '';
-  if($Class) $Class = ' class="'.$Class.'"'; else $Class = '';
-  if($Checked) $Checked = ' checked="checked"'; else $Checked = '';
-  if($Disabled) $Disabled = ' disabled="disabled"'; else $Disabled = '';
-  return('<input type="checkbox" value="checked" name="'.$Name.'"'.$Checked.$Disabled.$Id.$Class.' />');
+  if ($Id) $Id = ' id="'.$Id.'"'; else $Id = '';
+  if ($Class) $Class = ' class="'.$Class.'"'; else $Class = '';
+  if ($Checked) $Checked = ' checked="checked"'; else $Checked = '';
+  if ($Disabled) $Disabled = ' disabled="disabled"'; else $Disabled = '';
+  return '<input type="checkbox" value="checked" name="'.$Name.'"'.$Checked.$Disabled.$Id.$Class.' />';
 }
 
 function RadioButton($Name, $Value, $Checked = false, $OnClick = '', $Disabled = false)
 {
-  if($Checked) $Checked = ' checked="checked"'; else $Checked = '';
-  if($OnClick != '') $OnClick = ' onclick="'.$OnClick.'"'; else $OnClick = '';
-  if($Disabled) $Disabled = ' disabled="disabled"'; else $Disabled = '';
-  return('<input type="radio" name="'.$Name.'" value="'.$Value.'"'.$Checked.$Disabled.$OnClick.'/>');
+  if ($Checked) $Checked = ' checked="checked"'; else $Checked = '';
+  if ($OnClick != '') $OnClick = ' onclick="'.$OnClick.'"'; else $OnClick = '';
+  if ($Disabled) $Disabled = ' disabled="disabled"'; else $Disabled = '';
+  return '<input type="radio" name="'.$Name.'" value="'.$Value.'"'.$Checked.$Disabled.$OnClick.'/>';
 }
 
 function SelectOption($Name, $Text, $Selected = false)
 {
-  if($Selected) $Selected = ' selected="selected"'; else $Selected = '';
-  return('<option value="'.$Name.'"'.$Selected.'>'.$Text.'</option>');
+  if ($Selected) $Selected = ' selected="selected"'; else $Selected = '';
+  return '<option value="'.$Name.'"'.$Selected.'>'.$Text.'</option>';
 }
 
 function DeleteDirectory($dirname)
 {
-  if(is_dir($dirname))
+  if (is_dir($dirname))
   {
     $dir_handle = opendir($dirname);
-    if(!$dir_handle) return(false);
-    while($file = readdir($dir_handle))
-    {
-      if(($file != '.') and ($file != '..'))
+    if (!$dir_handle) return false;
+    while ($file = readdir($dir_handle))
+    {
+      if (($file != '.') and ($file != '..'))
       {
-        if(!is_dir($dirname.'/'.$file)) unlink($dirname.'/'.$file);
+        if (!is_dir($dirname.'/'.$file)) unlink($dirname.'/'.$file);
           else DeleteDirectory($dirname.'/'.$file);
       }
@@ -500 +500 @@
     rmdir($dirname);
   }
-  return(true);
+  return true;
 }
 
@@ -515 +515 @@
   $TranslationTree = $System->ModuleManager->Modules['Translation']->GetTranslationTree();
 
-  foreach($TranslationTree as $TableID => $Value)
-  {
-    if($Value['TablePrefix'] == $Table) return $TableID;
+  foreach ($TranslationTree as $TableID => $Value)
+  {
+    if ($Value['TablePrefix'] == $Table) return $TableID;
   }
 }
@@ -540 +540 @@
     'Dictionary' => 'Text',
   );
-  return($TablesColumn);
+  return $TablesColumn;
 }
 
@@ -578 +578 @@
   $sqlall = '';
 
-  foreach($TablesColumn as $Table => $Column)
+  foreach ($TablesColumn as $Table => $Column)
   {
     $orderinby = ' ORDER BY ID DESC ';
@@ -588 +588 @@
 
     $where = '(`Language` = '.$Config['OriginalLanguage'].') ';
-    if ($mode == 1) 
+    if ($mode == 1)
     {
       $where .= ' AND EXISTS(SELECT 1 FROM `'.$Table.
@@ -594 +594 @@
       ') AND (`Sub`.`Entry` = `O`.`Entry`))';
     }
-    if ($mode == 2) 
+    if ($mode == 2)
     {
       $where .= ' AND NOT EXISTS(SELECT 1 FROM `'.$Table.
@@ -601 +601 @@
     }
     $where .= ' AND (';
-    if (array_search('the', $ArrStr)) 
+    if (array_search('the', $ArrStr))
     {
       $where .= '(`O`.`'.$Column.'` LIKE "The %") OR ';
@@ -607 +607 @@
 
     $SqlOK = false;
-    if (count($ArrStr) > 0) 
+    if (count($ArrStr) > 0)
     {
       for ($i = 0; $i < count($ArrStr); $i++)
@@ -614 +614 @@
         if ((strlen($ArrStr[$i]) > 3) or ( ((count($ArrStr) < 6) or ($i == 0)) and (strlen($ArrStr[$i]) > 0) ) )  //length
           if ((!$FirstBig) or (ctype_upper(substr($ArrStr[$i], 0, 1))) or (count($ArrStr) < 6) )  //first big
-            if (array_search($ArrStr[$i], $ArrStr) == $i) 
+            if (array_search($ArrStr[$i], $ArrStr) == $i)
             {  // first in array
               $where .= '(`O`.`'.$Column.'` LIKE "'.addslashes($ArrStr[$i]).'%") OR ';
@@ -623 +623 @@
       $where .= ')';
     }
-    if ($SqlOK) 
+    if ($SqlOK)
     {
         //$sql.$where.$groupby.$orderby
 //          $buff[] = array($Line['ID'], GetIDbyName($Table), $Line['Orig'], $Line['Tran']);
-      if ($sqlall <> '') 
-      { 
-        $sqlall .= ' UNION ALL ( '.$sql.$where.$groupby.' )';      
+      if ($sqlall <> '')
+      {
+        $sqlall .= ' UNION ALL ( '.$sql.$where.$groupby.' )';
       } else {
-        $sqlall .= ' ( '.$sql.$where.$groupby.' )';             
+        $sqlall .= ' ( '.$sql.$where.$groupby.' )';
       }
     }
   }
-  if ($SqlOK) 
+  if ($SqlOK)
   {
     $orderby = ' ORDER BY LENGTH(Orig) DESC ';
@@ -641 +641 @@
     $DbResult = $System->Database->query($sqlall.$orderby);
     //  echo ($sql.'|'.$where.'|'.$groupby);
-    while($Line = $DbResult->fetch_assoc())
+    while ($Line = $DbResult->fetch_assoc())
     {
       $buff[] = array($Line['ID'], $Line['GroupId'], $Line['Orig'], $Line['Tran']);
@@ -652 +652 @@
 {
   $Pixels = $Width * ($Percent / 100);
-  if($Pixels > $Width) $Pixels = $Width;
-  if($Text == '') $Text = $Percent;
-
-  return('<div class="progressbar" style="width: '.$Width.'px">'.
+  if ($Pixels > $Width) $Pixels = $Width;
+  if ($Text == '') $Text = $Percent;
+
+  return '<div class="progressbar" style="width: '.$Width.'px">'.
     '<div class="bar" style="width: '.$Pixels.'px;"></div>'.
     '<div class="text" style="width: '.$Width.'px">'.$Text.'</div>'.
-    '</div>');
+    '</div>';
 }
 
@@ -665 +665 @@
   $IndexLevel = 100;
 
-  if($XP > 0) $Level = floor(sqrt($XP / $IndexLevel));
+  if ($XP > 0) $Level = floor(sqrt($XP / $IndexLevel));
     else $Level = 0;
   $MinXP = $Level * $Level * $IndexLevel;
@@ -671 +671 @@
   $MaxXP = $MaxXP - $MinXP;
   $XP = $XP - $MinXP;
-  return(array('Level' => $Level, 'XP' => $XP, 'MaxXP' => $MaxXP));
+  return array('Level' => $Level, 'XP' => $XP, 'MaxXP' => $MaxXP);
 }
 
@@ -677 +677 @@
 {
   $Result = $Default;
-  if(array_key_exists($Name, $_GET)) $Result = $_GET[$Name];
-  else if(array_key_exists($Name, $_POST)) $Result = $_POST[$Name];
-  else if($Session and array_key_exists($Name, $_SESSION)) $Result = $_SESSION[$Name];
-  if($Numeric and !is_numeric($Result)) $Result = $Default;
-  if($Session) $_SESSION[$Name] = $Result;
-  return($Result);
+  if (array_key_exists($Name, $_GET)) $Result = $_GET[$Name];
+  else if (array_key_exists($Name, $_POST)) $Result = $_POST[$Name];
+  else if ($Session and array_key_exists($Name, $_SESSION)) $Result = $_SESSION[$Name];
+  if ($Numeric and !is_numeric($Result)) $Result = $Default;
+  if ($Session) $_SESSION[$Name] = $Result;
+  return $Result;
 }
 
@@ -693 +693 @@
   $Result = '';
   $I = 0;
-  while((strpos($Content, 'http://') !== false) or (strpos($Content, 'https://') !== false))
-  {
-    if(strpos($Content, 'http://') !== false) $I = strpos($Content, 'http://');
-    if(strpos($Content, 'https://') !== false) $I = strpos($Content, 'https://');
+  while ((strpos($Content, 'http://') !== false) or (strpos($Content, 'https://') !== false))
+  {
+    if (strpos($Content, 'http://') !== false) $I = strpos($Content, 'http://');
+    if (strpos($Content, 'https://') !== false) $I = strpos($Content, 'https://');
     $Result .= substr($Content, 0, $I);
     $Content = substr($Content, $I);
     $SpacePos = strpos($Content, ' ');
-    if($SpacePos !== false) $URL = substr($Content, 0, strpos($Content, ' '));
+    if ($SpacePos !== false) $URL = substr($Content, 0, strpos($Content, ' '));
       else $URL = substr($Content, 0);
 
@@ -707 +707 @@
   }
   $Result .= $Content;
-  return($Result);
+  return $Result;
 }
 
@@ -729 +729 @@
   );
 
-  return('<div class="message" style="background-color: '.$BackgroundColor[$Type].
+  return '<div class="message" style="background-color: '.$BackgroundColor[$Type].
     ';"><table><tr><td class="icon"><img src="'.
     $System->Link('/images/message/'.$IconName[$Type].'.png').'" alt="'.
-    $IconName[$Type].'"><td>'.$Text.'</td></tr></table></div>');
+    $IconName[$Type].'"><td>'.$Text.'</td></tr></table></div>';
 }
 
 function ProcessURL()
 {
-  if(array_key_exists('REDIRECT_QUERY_STRING', $_SERVER))
+  if (array_key_exists('REDIRECT_QUERY_STRING', $_SERVER))
     $PathString = $_SERVER['REDIRECT_QUERY_STRING'];
   else $PathString = '';
-  if(substr($PathString, -1, 1) == '/') $PathString = substr($PathString, 0, -1);
+  if (substr($PathString, -1, 1) == '/') $PathString = substr($PathString, 0, -1);
   $PathItems = explode('/', $PathString);
-  if(strpos(GetRequestURI(), '?') !== false)
+  if (strpos(GetRequestURI(), '?') !== false)
     $_SERVER['QUERY_STRING'] = substr(GetRequestURI(), strpos(GetRequestURI(), '?') + 1);
   else $_SERVER['QUERY_STRING'] = '';
   parse_str($_SERVER['QUERY_STRING'], $_GET);
   // SQL injection hack protection
-  foreach($_GET as $Index => $Item) $_GET[$Index] = addslashes($_GET[$Index]);
-  return($PathItems);
+  foreach ($_GET as $Index => $Item) $_GET[$Index] = addslashes($_GET[$Index]);
+  return $PathItems;
 }
 
@@ -757 +757 @@
   $Output = '<select name="Language">';
   $DbResult = $System->Database->select('Language', '`Id`, `Name`', '`Enabled` = 1');
-  while($Language = $DbResult->fetch_assoc())
+  while ($Language = $DbResult->fetch_assoc())
   {
     $Output .= '<option value="'.$Language['Id'].'"';
-    if($Selected == $Language['Id'])
+    if ($Selected == $Language['Id'])
       $Output .= ' selected="selected"';
     $Output .= '>'.T($Language['Name']).'</option>';
   }
   $Output .= '</select>';
-  return($Output);
+  return $Output;
 }
 
 function GetClientProxyAddresses()
 {
-  if(array_key_exists('HTTP_X_FORWARDED_FOR',$_SERVER)) $IP = $_SERVER['HTTP_X_FORWARDED_FOR'];
+  if (array_key_exists('HTTP_X_FORWARDED_FOR',$_SERVER)) $IP = $_SERVER['HTTP_X_FORWARDED_FOR'];
     else $IP = array();
 }
@@ -776 +776 @@
 function GetRemoteAddress()
 {
-  if(array_key_exists('REMOTE_ADDR', $_SERVER)) $IP = $_SERVER['REMOTE_ADDR'];
+  if (array_key_exists('REMOTE_ADDR', $_SERVER)) $IP = $_SERVER['REMOTE_ADDR'];
     else $IP = '';
-  return($IP);
+  return $IP;
 }
 
 function GetRequestURI()
 {
-  if(array_key_exists('REQUEST_URI', $_SERVER)) return($_SERVER['REQUEST_URI']);
-    else return($_SERVER['PHP_SELF']);
-}
+  if (array_key_exists('REQUEST_URI', $_SERVER)) return $_SERVER['REQUEST_URI'];
+    else return $_SERVER['PHP_SELF'];
+}

trunk/includes/MemoryStream.php

@@ -20 +20 @@
     $Result = substr($this->Data, $this->Position, $Count);
     $this->Position = $this->Position + $Count;
-    return($Result);
+    return $Result;
   }
 
@@ -27 +27 @@
     $Result = $this->Data[$this->Position];
     $this->Position = $this->Position + 1;
-    return($Result);
+    return $Result;
   }
 
@@ -34 +34 @@
     $val = unpack('V*', substr($this->Data, $this->Position, 4));
     $this->Position = $this->Position + 4;
-    return($val[1]);
+    return $val[1];
   }
 
@@ -41 +41 @@
     $val = unpack('I*', substr($this->Data, $this->Position, 4));
     $this->Position = $this->Position + 4;
-    return($val[1]);
+    return $val[1];
   }
 
@@ -48 +48 @@
     $val = unpack('f*', substr($this->Data, $this->Position, 4));
     $this->Position = $this->Position + 4;
-    return($val[1]);
+    return $val[1];
   }
 
@@ -55 +55 @@
     $Result = $this->Data[$this->Position];
     $this->Position = $this->Position + 1;
-    return($Result);
+    return $Result;
   }
 
@@ -62 +62 @@
     $Length = 0;
     $StartPosition = $this->Position;
-    while(!$this->EOF())
+    while (!$this->EOF())
     {
       $Char = $this->ReadChar();
-      if($Char == $EndSymbol) break;
+      if ($Char == $EndSymbol) break;
     }
     $Result = substr($this->Data, $StartPosition, $this->Position - $StartPosition);
-    return($Result);
+    return $Result;
   }
 
@@ -116 +116 @@
   public function GetPosition()
   {
-    return($this->Position);
+    return $this->Position;
   }
 
   public function GetSize()
   {
-    return(strlen($this->Data));
+    return strlen($this->Data);
   }
 
   public function SetSize($Size)
   {
-    return($this->Data = substr($this->Data, 0, $Size));
+    return $this->Data = substr($this->Data, 0, $Size);
   }
 
   public function EOF()
   {
-    return($this->Position >= strlen($this->Data));
+    return $this->Position >= strlen($this->Data);
   }
 }

trunk/includes/PageEdit.php

@@ -16 +16 @@
     );
     $this->AllowEdit = false;
-    if($this->AllowEdit) $this->ItemActions[] = array('Name' => T('Delete'), 'URL' => '?action=remove&id=#Id');
+    if ($this->AllowEdit) $this->ItemActions[] = array('Name' => T('Delete'), 'URL' => '?action=remove&id=#Id');
   }
 
@@ -22 +22 @@
   {
     $Output = '';
-    if(array_key_exists('action', $_GET))
+    if (array_key_exists('action', $_GET))
     {
-      if($_GET['action'] == 'add') $Output .= $this->AddItem();
-      else if($_GET['action'] == 'view') $Output .= $this->ViewItem();
-      else if($_GET['action'] == 'edit') $Output .= $this->ModifyItem();
-      else if($_GET['action'] == 'remove') $Output .= $this->RemoveItem();
-      else if($_GET['action'] == 'delete') $Output .= $this->DeleteItem();
+      if ($_GET['action'] == 'add') $Output .= $this->AddItem();
+      else if ($_GET['action'] == 'view') $Output .= $this->ViewItem();
+      else if ($_GET['action'] == 'edit') $Output .= $this->ModifyItem();
+      else if ($_GET['action'] == 'remove') $Output .= $this->RemoveItem();
+      else if ($_GET['action'] == 'delete') $Output .= $this->DeleteItem();
       else $Output .= ShowMessage(T('Unknown action'), MESSAGE_CRITICAL);
     } else $Output .= $this->ViewList();
-    return($Output);
+    return $Output;
   }
 
@@ -37 +37 @@
   {
     $DbResult = $this->Database->query('SELECT * FROM ('.$this->TableSQL.') AS `T` WHERE `Id`='.$_GET['id']);
-    if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
     {
       $DbRow = $DbResult->fetch_assoc();
@@ -43 +43 @@
       $Output = T('Item').
         '<table>';
-      foreach($this->Definition as $DefIndex => $Def)
+      foreach ($this->Definition as $DefIndex => $Def)
       {
         $Output .= '<tr><td>'.$Def['Title'].':</td><td>'.$this->ViewControl($Def['Type'], $DefIndex, $DbRow[$DefIndex]).'</tr>';
@@ -50 +50 @@
         '</table>';
     } else $Output = ShowMessage(T('Item not found'), MESSAGE_CRITICAL);
-    if($this->AllowEdit)
+    if ($this->AllowEdit)
     {
       $Output .= '<a href="?action=add">'.T('Add').'</a> ';
@@ -57 +57 @@
     }
     $Output .= '<a href="?">'.T('List').'</a><br/>';
-    return($Output);
+    return $Output;
   }
 
@@ -69 +69 @@
     $Output .= '<table class="BaseTable">';
     $TableColumns = array();
-    foreach($this->Definition as $Index => $Def)
-      if($Def['InList'])
+    foreach ($this->Definition as $Index => $Def)
+      if ($Def['InList'])
         $TableColumns[] = array('Name' => $Index, 'Title' => $Def['Title']);
-    if(count($this->ItemActions) > 0)
+    if (count($this->ItemActions) > 0)
       $TableColumns[] = array('Name' => '', 'Title' => 'Akce');
 
@@ -79 +79 @@
 
     $DbResult = $this->Database->query('SELECT * FROM ('.$this->Table.') '.$Order['SQL'].$PageList['SQLLimit']);
-    while($Item = $DbResult->fetch_assoc())
+    while ($Item = $DbResult->fetch_assoc())
     {
       $Output .= '<tr>';
-      foreach($this->Definition as $Index => $Def)
-      if($Def['InList'])
+      foreach ($this->Definition as $Index => $Def)
+      if ($Def['InList'])
       {
-        if($Def['Type'] == 'URL') $Output .= '<td><a href="'.$Item[$Index].'">'.$Item[$Index].'</a></td>';
+        if ($Def['Type'] == 'URL') $Output .= '<td><a href="'.$Item[$Index].'">'.$Item[$Index].'</a></td>';
           else $Output .= '<td>'.$Item[$Index].'</td>';
       }
-      if(count($this->ItemActions) > 0)
+      if (count($this->ItemActions) > 0)
       {
         $Output .= '<td>';
-        foreach($this->ItemActions as $Index => $Action)
+        foreach ($this->ItemActions as $Index => $Action)
         {
           $URL = $Action['URL'];
-          if(strpos($URL, '#Id')) $URL = str_replace('#Id', $Item['Id'], $URL);
+          if (strpos($URL, '#Id')) $URL = str_replace('#Id', $Item['Id'], $URL);
           $Output .= '<a href="'.$URL.'">'.$Action['Name'].'</a> ';
         }
@@ -102 +102 @@
     }
     $Output .= '</table>';
-    if($this->AllowEdit) $Output .= '<a href="?action=add">'.T('Add').'</a><br/>';
-    return($Output);
+    if ($this->AllowEdit) $Output .= '<a href="?action=add">'.T('Add').'</a><br/>';
+    return $Output;
   }
 
@@ -109 +109 @@
   {
     $Output = '';
-    if($this->System->User->Licence(LICENCE_USER))
+    if ($this->System->User->Licence(LICENCE_USER))
     {
-      if(array_key_exists('finish', $_GET))
+      if (array_key_exists('finish', $_GET))
       {
         $Items = array();
-        foreach($this->Definition as $Index => $Def)
+        foreach ($this->Definition as $Index => $Def)
         {
           $Items[$Index] = $_POST[$Index];
@@ -125 +125 @@
           '<fieldset><legend>'.T('New item').'</legend>'.
           '<table>';
-        foreach($this->Definition as $DefIndex => $Def)
+        foreach ($this->Definition as $DefIndex => $Def)
         {
           $Output .= '<tr><td>'.$Def['Title'].':</td><td>'.$this->GetControl($Def['Type'], $DefIndex, '').'</tr>';
@@ -135 +135 @@
       }
     } else $Output .= ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
   function DeleteItem()
   {
-    if($this->System->User->Licence(LICENCE_USER))
+    if ($this->System->User->Licence(LICENCE_USER))
     {
       $this->Database->query('DELETE FROM `'.$this->Table.'` WHERE (`User`='.$this->System->User->Id.') AND (`Id`='.($_GET['id'] * 1).')');
       $Output = ShowMessage(T('Record removed'));
     } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
   function GetControl($Type, $Name, $Value)
   {
-    if($Type == 'Text') $Output = '<input type="text" name="'.$Name.'" value="'.$Value.'"/>';
-    else if($Type == 'Boolean') $Output = '<input type="checkbox" name="'.$Name.'"/>';
+    if ($Type == 'Text') $Output = '<input type="text" name="'.$Name.'" value="'.$Value.'"/>';
+    else if ($Type == 'Boolean') $Output = '<input type="checkbox" name="'.$Name.'"/>';
     else $Output = '<input type="text" name="'.$Name.'" value="'.$Value.'"/>';
-    return($Output);
+    return $Output;
   }
 
   function ViewControl($Type, $Name, $Value)
   {
-    if($Type == 'Text') $Output = $Value;
-    else if($Type == 'URL') $Output = '<a href="'.$Value.'">'.$Value.'</a>';
-    else if($Type == 'Boolean') $Output = $Value;
+    if ($Type == 'Text') $Output = $Value;
+    else if ($Type == 'URL') $Output = '<a href="'.$Value.'">'.$Value.'</a>';
+    else if ($Type == 'Boolean') $Output = $Value;
     else $Output = $Value;
-    return($Output);
+    return $Output;
   }
 }

trunk/includes/dbc.php

@@ -35 +35 @@
 
     $this->ColumnFormat = $ColumnFormat;
-    if($this->ReadUint() != DBC_SIGNATURE) die(NOT_DBC_FILE);
+    if ($this->ReadUint() != DBC_SIGNATURE) die(NOT_DBC_FILE);
 
     $this->RecordCount = $this->ReadUint();
@@ -43 +43 @@
 
     $this->GenerateOffsetTable();
-    if($this->EndOffset != $this->RecordSize)
+    if ($this->EndOffset != $this->RecordSize)
     die(RECORD_SIZE_NOT_MATCH.$this->EndOffset.' <> '.$this->RecordSize);
   }
@@ -71 +71 @@
   {
     // Preallocate array
-    if($this->FieldCount > 0) $this->Offsets = array_fill(0, $this->FieldCount, 0);
+    if ($this->FieldCount > 0) $this->Offsets = array_fill(0, $this->FieldCount, 0);
       else $this->Offsets = array();
 
     $Offset = 0;
     $I = 0;
-    while($I < $this->FieldCount)
+    while ($I < $this->FieldCount)
     {
       $this->Offsets[$I] = $Offset;
-      if(array_key_exists($I, $this->ColumnFormat)) $Format = $this->ColumnFormat[$I];
+      if (array_key_exists($I, $this->ColumnFormat)) $Format = $this->ColumnFormat[$I];
         else $Format = FORMAT_UINT32;
-      switch($Format)
+      switch ($Format)
       {
         case FORMAT_BYTE:
@@ -100 +100 @@
   private function CellPos($Row, $Column)
   {
-    return($this->HeaderSize + $Row * $this->RecordSize + $this->Offsets[$Column]);
+    return $this->HeaderSize + $Row * $this->RecordSize + $this->Offsets[$Column];
   }
 
@@ -106 +106 @@
   {
     $this->SetPosition($this->CellPos($Row, $Column));
-    return($this->ReadByte());
+    return $this->ReadByte();
   }
 
@@ -112 +112 @@
   {
     $this->SetPosition($this->CellPos($Row, $Column));
-    return($this->ReadUint());
+    return $this->ReadUint();
   }
 
@@ -118 +118 @@
   {
     $this->SetPosition($this->CellPos($Row, $Column));
-    return($this->ReadInt());
+    return $this->ReadInt();
   }
 
@@ -124 +124 @@
   {
     $this->SetPosition($this->CellPos($Row, $Column));
-    return($this->ReadFloat());
+    return $this->ReadFloat();
   }
 
@@ -156 +156 @@
 
     $Position = $this->HeaderSize + $this->RecordCount * $this->RecordSize + $Offset;
-    if($Position >= $this->GetSize()) return('');
+    if ($Position >= $this->GetSize()) return '';
     $this->SetPosition($Position);
 
     $String = '';
-    while(($Char = $this->ReadChar()) != "\0")
+    while (($Char = $this->ReadChar()) != "\0")
     {
       $String .= $Char;
     }
-    return($String);
+    return $String;
   }
 
   public function SetString($Row, $Column, $Value)
   {
-    if(in_array($Value, $this->StringList))
+    if (in_array($Value, $this->StringList))
     {
       $this->SetUint($Row, $Column, $this->StringListOffset[array_search($Value, $this->StringList)]);
@@ -192 +192 @@
     $this->SetPosition($this->HeaderSize + $this->RecordCount * $this->RecordSize);
     $this->WriteByte(0);
-    foreach($this->StringList as $Index => $Item)
+    foreach ($this->StringList as $Index => $Item)
     {
       $this->WriteString($Item."\0");
@@ -206 +206 @@
 
     // Preallocate array
-    if($this->FieldCount > 0) $Line = array_fill(0, $this->FieldCount, 0);
+    if ($this->FieldCount > 0) $Line = array_fill(0, $this->FieldCount, 0);
       else $Line = array();
-    for($I = 0; $I < $this->FieldCount; $I++)
-    {
-      if(array_key_exists($I, $this->ColumnFormat)) $Format = $this->ColumnFormat[$I];
+    for ($I = 0; $I < $this->FieldCount; $I++)
+    {
+      if (array_key_exists($I, $this->ColumnFormat)) $Format = $this->ColumnFormat[$I];
         else $Format = FORMAT_UINT32;
       $Record->SetPosition($this->Offsets[$I]);
-      switch($Format)
+      switch ($Format)
       {
         case FORMAT_BYTE:
@@ -231 +231 @@
 
           $Position = $this->HeaderSize + $this->RecordCount * $this->RecordSize + $Offset;
-          if($Position >= $this->GetSize()) $String = '';
+          if ($Position >= $this->GetSize()) $String = '';
           else
           {
             $this->SetPosition($Position);
             $String = '';
-            while(($Char = $this->ReadChar()) != "\0")
+            while (($Char = $this->ReadChar()) != "\0")
               $String .= $Char;
           }
@@ -245 +245 @@
       }
     }
-    return($Line);
+    return $Line;
   }
 
@@ -253 +253 @@
     $Record = new MemoryStream();
 
-    for($I = 0; $I < $this->FieldCount; $I++)
-    {
-      if(array_key_exists($I, $this->ColumnFormat)) $Format = $this->ColumnFormat[$I];
+    for ($I = 0; $I < $this->FieldCount; $I++)
+    {
+      if (array_key_exists($I, $this->ColumnFormat)) $Format = $this->ColumnFormat[$I];
         else $Format = FORMAT_UINT32;
       $Record->SetPosition($this->Offsets[$I]);
-      switch($Format)
+      switch ($Format)
       {
         case FORMAT_BYTE:
@@ -273 +273 @@
           break;
         case FORMAT_STRING:
-          if(in_array($Line[$I], $this->StringList))
+          if (in_array($Line[$I], $this->StringList))
           {
             $Record->WriteUint($this->StringListOffset[array_search($Line[$I], $this->StringList)]);
@@ -291 +291 @@
     $this->SetPosition($this->CellPos($Row, 0));
     $this->WriteBlock($Record->Data, $this->RecordSize);
-    return($Line);
+    return $Line;
   }
 
   public function GetRecordCount()
   {
-    return($this->RecordCount);
+    return $this->RecordCount;
   }
 
@@ -306 +306 @@
   public function GetFieldCount()
   {
-    return($this->FieldCount);
+    return $this->FieldCount;
   }