Changeset 601 for trunk

Timestamp:

Nov 25, 2013, 10:19:37 PM (11 years ago)

Author:

chronos

Message:

• Fixed: Missing config item Advertisement.
• Fixed: User registration was not working after installation.

Location:

trunk

Files:

• Modules/User/Registration.php (modified) (2 diffs)
• admin/UpdateTrace.php (modified) (21 diffs)
• admin/install.php (modified) (1 diff)
• includes/Version.php (modified) (1 diff)

trunk/Modules/User/Registration.php

@@ -74 +74 @@
         function Show()
         {
-                global $User, $Config;
+                global $Config;
         
                 $Output = '';
@@ -105 +105 @@
                                                         {
                                                                 if($Team == 0) $Team = 'NULL';
-                                                                $User->Register($UserName, $Pass, $Email, $Language, $Team, $PreferredVersion);
+                                                                $this->System->User->Register($UserName, $Pass, $Email, $Language, $Team, $PreferredVersion);
                                                                 $Output .= ShowMessage('Registrace proběhla úspěšně.');
                                                                 $Output .= 'Přečtěte si pozorně <a href="'.$this->System->Link('/info.php').'">pokyny pro překladání</a> a můžete pak hned začít překládat.';
-                                                                $User->Login($UserName, $Pass);
+                                                                $this->System->User->Login($UserName, $Pass);
                                                                 $this->System->ModuleManager->Modules['Log']->WriteLog('Uživatel se zaregistroval: '.$UserName, LOG_TYPE_USER);
                                                                 $ShowForm = false;

trunk/admin/UpdateTrace.php

@@ -16 +16 @@
   KEY `ReleaseDate` (`ReleaseDate`),
   KEY `Imported` (`Imported`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=88 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
 -- --------------------------------------------------------
@@ -32 +32 @@
   PRIMARY KEY (`ID`),
   KEY `user` (`User`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=11 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;
 
 --
@@ -50 +50 @@
   `Revision` int(11) NOT NULL,
   PRIMARY KEY (`Id`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=2 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
 -- --------------------------------------------------------
@@ -69 +69 @@
   KEY `Entry` (`Entry`),
   KEY `User` (`User`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=552 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
 --
@@ -100 +100 @@
   KEY `ClientVersion` (`ClientVersion`),
   KEY `OutputType` (`OutputType`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=237 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
 --
@@ -125 +125 @@
   KEY `Export` (`Export`),
   KEY `Group` (`Group`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=4043 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
 --
@@ -150 +150 @@
   KEY `Export` (`Export`),
   KEY `Sequence` (`Sequence`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=213 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
 --
@@ -170 +170 @@
   `Name` varchar(255) NOT NULL,
   PRIMARY KEY (`Id`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=10 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
 -- --------------------------------------------------------
@@ -185 +185 @@
   PRIMARY KEY (`Id`),
   KEY `Export` (`Export`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=36 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
 --
@@ -208 +208 @@
   KEY `User` (`User`),
   KEY `Sequence` (`Sequence`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=36309 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
 --
@@ -231 +231 @@
   KEY `ExportType` (`ExportType`),
   KEY `ClientVersion` (`ClientVersion`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=82 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
 --
@@ -264 +264 @@
   `LastVersion` int(11) NOT NULL,
   PRIMARY KEY (`Id`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=37 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;
 
 -- --------------------------------------------------------
@@ -285 +285 @@
   KEY `Visible` (`Visible`),
   KEY `Sequence` (`Sequence`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=94 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;
 
 --
@@ -308 +308 @@
   KEY `ClientVersion` (`ClientVersion`),
   KEY `GroupItem` (`GroupItem`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=160 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
 --
@@ -330 +330 @@
   PRIMARY KEY (`Id`),
   KEY `Enabled` (`Enabled`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=3 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;
 
 -- --------------------------------------------------------
@@ -349 +349 @@
   KEY `type` (`Type`),
   KEY `date` (`Date`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=4151 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
 --
@@ -371 +371 @@
   `Description` varchar(255) NOT NULL,
   PRIMARY KEY (`Id`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=15 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
 -- --------------------------------------------------------
@@ -387 +387 @@
   KEY `Time` (`Time`),
   KEY `User` (`User`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=51 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
 --
@@ -418 +418 @@
   KEY `Hits` (`Hits`),
   KEY `DateFirst` (`DateFirst`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=768 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
 --
@@ -461 +461 @@
   KEY `date` (`Date`),
   KEY `User` (`User`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1659 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
 --
@@ -485 +485 @@
   KEY `Leader` (`Leader`),
   KEY `TimeCreate` (`TimeCreate`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=58 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
 --

trunk/admin/install.php

@@ -120 +120 @@
     'WebCounter' => '',
     'Timezone' => 'Europe/Prague',
+    'Advertisement' => '',
   ),
   'ForbiddedUserNames' => array('addon', 'admin', 'administrator'),

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update. 
 
-$Revision = 600; // Subversion revision
+$Revision = 601; // Subversion revision
 $DatabaseRevision = 600; // Database structure revision 
 $ReleaseTime = '2013-11-25';