Changeset 861 for trunk/Application

Timestamp:

Jan 21, 2016, 3:20:48 PM (9 years ago)

Author:

chronos

Message:

• Removed: Execute flag from PHP files in repo.
• Modified: BaseView class separated to file View.php.
• Added: Left and Right bar items are now registered from their modules using callbacks.

Location:

trunk/Application

Files:

• Core.php (moved) (moved from trunk/includes/System.php ) (1 diff, 1 prop)
• DefaultConfig.php (modified) (1 prop)
• Version.php (modified) (1 diff)

trunk/Application/Core.php

@@ -320 +320 @@
   }
 }
-
-class BaseView extends View
-{
-  var $Title;
-
-  function ShowLocaleSelector()
-  {
-    //$Output .= ' <form action="?setlocale" method="get">';
-    $Output = ' <select onchange="window.location=this.value">';
-    foreach($this->System->LocaleManager->Available as $Locale)
-    {
-      $Remaining = substr($_SERVER["REQUEST_URI"], strlen($this->System->Config['Web']['BaseURL']));
-      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"';
-        else $Selected = '';
-      $Remaining = $this->System->TranslateReverseURL($Remaining, $this->System->LocaleManager->LangCode);
-
-      $URL = $this->System->LinkLocale($Remaining, $Locale['Code']);
-      $Output .= '<option title="" value="'.$URL.'"'.$Selected.' onchange="this.form.submit()">'.$Locale['Title'].'</option>';
-    }
-    $Output .= '</select><noscript><span><input type="submit" value="Submit"/></span></noscript>';
-
-    return($Output);
-  }
-
-  function ShowTopBar()
-  {
-    $Output = '<div class="Menu">';
-    if(isset($this->System->User))
-    {
-      if(!$this->System->User->Licence(LICENCE_USER))
-        $Output .= '<div class="advert">'.$this->System->Config['Web']['Advertisement'].'</div>';
-    }
-    $Output .= '<span class="MenuItem"></span><span class="MenuItem2">';
-
-    // Show bars items
-    $Bar = '';
-    foreach($this->System->Bars['Top'] as $BarItem)
-      $Bar .= call_user_func($BarItem);
-      if(trim($Bar) != '') $Output .= $Bar;
-      else $Output .= '&nbsp;';
-
-    $Output .= $this->ShowLocaleSelector();
-    //$Output .= '</form>';
-    $Output .= '</span></div>';
-    return($Output);
-  }
-
-  function ShowLoginBox()
-  {
-    $Output = '';
-    if($this->System->User->Licence(LICENCE_USER))
-    {
-      // $Output .= 'Jste přihlášen jako: <b>'.$tUser->Id.'</b> <a href="index.php?Logout">Odhlásit</a>';
-    } else
-    {
-      $Output .= '<strong>'.T('Login').':</strong>
-      <form action="" method="post">
-      <table>
-      <tr>
-      <td><input type="text" name="LoginUser" size="13" /></td>
-      </tr>
-      <tr>
-      <td><input type="password" name="LoginPass" size="13" /></td>
-      </tr>
-      <tr>
-      <th><input type="submit" value="'.T('Do login').'" /></th>
-      </tr>
-      </table>
-      </form>';
-    }
-    return($Output);
-  }
-
-  function ShowSearchBox()
-  {
-    $Output = '<strong>'.T('Search').':</strong>'.
-      '<form action="'.$this->System->Link('/search/').'" method="get"><div>'.
-      '<table>'.
-      '<tr>'.
-      '<td><input type="text" name="text" size="13" /></td>'.
-      '</tr>'.
-      '<tr>'.
-      '<th><input type="submit" value="'.T('Do search').'" /></th>'.
-      '</tr>'.
-      '</table></div>'.
-      '</form>';
-    return($Output);
-  }
-
-  function ShowMainMenu()
-  {
-    $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']))
-      {
-        if(isset($MenuItem['Click'])) $OnClick = ' onclick="'.$MenuItem['Click'].'"';
-        else $OnClick = '';
-        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="'.
-          $MenuItem['Link'].'"'.$OnClick.'>'.$MenuItem['Title'].'</a></li>';
-      }
-      $Output .= '</ul></div>';
-      return($Output);
-  }
-
-  function ShowTranslatedMenu()
-  {
-    $TranslationTree = $this->System->ModuleManager->Modules['Translation']->GetTranslationTree();
-
-    $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())
-    {
-      $Groups[T($Group['Name'])] = $Group;
-    }
-    ksort($Groups);
-    foreach($Groups as $Group)
-    {
-      $Output .= '<div id="menuitem-group'.$Group['Id'].'" onmouseover="show(\'group'.$Group['Id'].'\')" onmouseout="hide(\'group'.$Group['Id'].'\')">'.
-        '<a href="'.$this->System->Link('/TranslationList.php?group='.$Group['Id'].
-        '&amp;action=filter').'">'.str_replace(' ','&nbsp;', T($Group['Name'])).'</a></div>'.
-        '<div id="group'.$Group['Id'].'" class="hidden-menu-item" onmouseover="show(\'group'.$Group['Id'].'\')" onmouseout="hide(\'group'.$Group['Id'].'\')">';
-      $Output .= '&nbsp;<a title="Zde můžete začít překládat" href="'.
-        $this->System->Link('/TranslationList.php?group='.$Group['Id'].'&amp;state=1&amp;user=0&amp;entry=&amp;text=').'">'.T('Untranslated').'</a><br />'.
-        '&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))
-      {
-        $Output .= '&nbsp;<a title="'.T('Unfinished translations').'" href="'.$this->System->Link('/TranslationList.php?group='.$Group['Id'].'&amp;state=3').'">'.T('Unfinished').'</a><br />'.
-          '&nbsp;<a title="Všechny překlady, které jste přeložil" href="'.
-          $this->System->Link('/TranslationList.php?group='.$Group['Id'].'&amp;state=1&amp;user='.
-          $this->System->User->Id).'&amp;entry=&amp;text=">'.T('Own').'</a><br />';
-      }
-      $Output .= '&nbsp;<a title="'.T('Compose special filter').'" href="'.
-        $this->System->Link('/TranslationList.php?group='.$Group['Id'].'&amp;action=filter').
-        '">'.T('Filter').'</a><br />';
-      $Output .= '</div>';
-    }
-    $Output .= '</div>';
-    return($Output);
-  }
-
-  function ShowHeader()
-  {
-    $Output = ''.
-    '<!DOCTYPE html>'.
-    '<html>'.
-    '<head>'.
-    '<meta http-equiv="content-type" content="text/html; charset='.$this->System->Config['Web']['Charset'].'" />'.
-    '<meta name="keywords" content="'.$this->System->Config['Web']['Keywords'].'" />'.
-    '<meta name="description" content="'.$this->System->Config['Web']['Description'].'" />'.
-    '<meta name="robots" content="all" />'.
-    '<link rel="stylesheet" href="'.$this->System->Link('/style/style.css').'" type="text/css" media="all" />'.
-    '<script type="text/javascript" src="'.$this->System->Link('/style/global.js').'"></script>'.
-    '<link rel="shortcut icon" href="'.$this->System->Link('/images/favicon.ico').'" />';
-    $Output .= $this->System->ModuleManager->Modules['News']->ShowRSSHeader();
-    $Title = $this->System->Config['Web']['Title'];
-    if($this->Title != '') $Title = $this->Title.' - '.$Title;
-    $Output .= '<title>'.$Title.'</title>'.
-    '<script src="'.$this->System->Link('/style/respond.js').'"></script>'.
-    '</head><body>';
-
-    $Output .= $this->ShowTopBar();
-    $Output .= '<table class="page"><tr><td class="menu">';
-    $Output .= $this->ShowMainMenu();
-    $Output .= $this->System->ModuleManager->Modules['User']->ShowOnlineList();
-    $Output .= '<br />';
-    $Output .= $this->ShowSearchBox();
-
-    $Output .= '</td><td id="border-left"></td><td class="content">';
-    return($Output);
-  }
-
-  function ShowFooter()
-  {
-    global $ScriptStartTime, $Revision, $ReleaseTime, $Version;
-
-    $ScriptGenerateDuration = round(GetMicrotime() - $ScriptStartTime, 2);
-
-    $Output = '</td>';
-    if($this->System->ModuleManager->ModulePresent('Translation'))
-    {
-      $Output .= '<td class="menu2">';
-      $Output .= $this->ShowTranslatedMenu();
-      $Output .= '</td>';
-    }
-    $Output .= '</tr><tr>'.
-      '<td colspan="4" class="page-bottom">'.T('Version').': '.$Version.' '.T('Revision').': '.$Revision.' ('.HumanDate($ReleaseTime).')'.
-      ' &nbsp; <a href="http://svn.zdechov.net/trac/wowpreklad/browser/trunk">'.T('Source code').'</a> &nbsp; '.
-      '<a href="http://svn.zdechov.net/trac/wowpreklad/log/trunk?verbose=on">'.T('Changelog').'</a> &nbsp; '.
-      $this->System->Config['Web']['WebCounter'];
-
-    $Output .= '</td></tr>';
-    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').': '.
-    HumanSize(memory_get_peak_usage(FALSE)).' / '.ini_get('memory_limit').'B &nbsp;&nbsp; <a href="http://validator.w3.org/check?uri='.
-    htmlentities('http://'.$_SERVER['HTTP_HOST'].GetRequestURI().'?'.$_SERVER['QUERY_STRING']).'">HTML validator</a></td></tr>';
-    $Output .= '</table>'.
-      '</body>'.
-      '</html>';
-    return($Output);
-  }
-
-  function ShowPage($Content)
-  {
-    $Output = $this->ShowHeader().$Content.$this->ShowFooter();
-    if($this->System->Config['Web']['FormatOutput'])
-      $Output = $this->FormatOutput($Output);
-    return($Output);
-  }
-
-  function FormatOutput($s)
-  {
-    $out = '';
-    $nn = 0;
-    $n = 0;
-    while($s != '')
-    {
-      $start = strpos($s, '<');
-      $end = strpos($s, '>');
-      if($start != 0)
-      {
-        $end = $start - 1;
-        $start = 0;
-      }
-      $line = trim(substr($s, $start, $end + 1));
-      if(strlen($line) > 0)
-        if($line[0] == '<')
-        {
-          if($s[$start + 1] == '/')
-          {
-            $n = $n - 2;
-            $nn = $n;
-          } else
-          {
-            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;
-          }
-        }// 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");
-        $s = substr($s, $end + 1, strlen($s));
-        $nn = $n;
-    }
-    return($out);
-  }
-}

trunk/Application/Version.php

@@ -7 +7 @@
 
 $Version = '1.0-alfa';
-$Revision = 859; // Subversion revision
+$Revision = 861; // Subversion revision
 $DatabaseRevision = 857; // Database structure revision
 $ReleaseTime = '2016-01-21';