Changeset 884 for trunk/Application

Timestamp:

Apr 8, 2020, 7:27:09 PM (5 years ago)

Author:

chronos

Message:

• Fixed: Error during user registration.
• Fixed: Error on user enter to new team.

Location:

trunk/Application

Files:

• Core.php (modified) (1 diff)
• Version.php (modified) (1 diff)
• View.php (modified) (4 diffs)

trunk/Application/Core.php

@@ -150 +150 @@
   function Link($Target)
   {
-    $Remaining = substr($Target, strlen($this->BaseURL));
+    if (substr($Target, 0, strlen($this->BaseURL)) == $this->BaseURL)
+      $Remaining = substr($Target, strlen($this->BaseURL));
+      else $Remaining = $Target;
     $TargetParts = explode('/', $Remaining);
-    if ((count($TargetParts) > 0) and ($TargetParts[0] == '')) 
+    if ((count($TargetParts) > 0) and ($TargetParts[0] == ''))
       array_splice($TargetParts, 0, 1);
     if (count($TargetParts) > 0)

trunk/Application/Version.php

@@ -7 +7 @@
 
 $Version = '1.0';
-$Revision = 883; // Subversion revision
+$Revision = 884; // Subversion revision
 $DatabaseRevision = 873; // Database structure revision
 $ReleaseDate = strtotime('2020-04-08');

trunk/Application/View.php

@@ -40 +40 @@
     foreach ($this->System->Bars['Top'] as $BarItem)
       $Bar .= call_user_func($BarItem);
-      if (trim($Bar) != '') $Output .= $Bar;
+    if (trim($Bar) != '') $Output .= $Bar;
       else $Output .= ' ';
 
@@ -54 +54 @@
       '<div class="verticalmenu"><ul>';
     foreach ($this->System->Menu as $MenuItem)
+    {
       if (!isset($this->System->User) or $this->System->User->Licence($MenuItem['Permission']))
       {
@@ -63 +64 @@
           $MenuItem['Link'].'"'.$OnClick.'>'.$MenuItem['Title'].'</a></li>';
       }
-      $Output .= '</ul></div>';
-      return $Output;
+    }
+    $Output .= '</ul></div>';
+    return $Output;
   }
 
@@ -101 +103 @@
     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;';