Changeset 498
- Timestamp:
- Jan 30, 2013, 10:33:07 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/TranslationList.php
r466 r498 191 191 $Table = $TranslationTree[$Filter['Group']]['TablePrefix']; 192 192 193 $Query = 'SELECT `T`.*, (SELECT `User`.`Name` FROM `User` WHERE `User`.`ID` = `T`.`User`) AS `UserName` FROM `'.$Table.'` AS `T` WHERE 1 '.$Filter['SQL']; 193 $Query = 'SELECT `T`.`ID`, `T`.`Entry`, `T`.`VersionStart`, `T`.`VersionEnd`, '. 194 '`T`.`Name`, (SELECT `User`.`Name` FROM `User` WHERE `User`.`ID` = `T`.`User`)'. 195 'AS `UserName` FROM `'.$Table.'` AS `T` WHERE 1 '.$Filter['SQL']; 194 196 //echo($Query); 195 197 -
trunk/export/create_addon.php
r455 r498 65 65 function ReplaceCzText($string) 66 66 { 67 $string = mysql_escape_string($string);67 $string = $this->Database->real_escape_string($string); 68 68 $string = str_replace('$B', '\r\n', $string); 69 69 $string = str_replace('$b', '\r\n', $string); -
trunk/includes/config.sample.php
r497 r498 31 31 'VisiblePagingItems' => 20, 32 32 'WebCounter' => '', 33 'Timezone' => 'Europe/Prague', 33 34 ), 34 35 'ExportTaskProcessPeriod' => 10, -
trunk/includes/global.php
r497 r498 17 17 if(file_exists(dirname(__FILE__).'/config.php')) include_once(dirname(__FILE__).'/config.php'); 18 18 else die('Nenalezen konfigurační soubor config.php ve složce includes. Vytvořte jej zkopírováním vzoru config.sample.php.'); 19 date_default_timezone_set($Config['Web']['Timezone']); 19 20 include_once(dirname(__FILE__).'/Database.php'); 20 21 include_once(dirname(__FILE__).'/rss.php'); … … 62 63 if($User->Licence(LICENCE_USER)) 63 64 { 64 $DbResult = $System->Database->query('SELECT `Id`, `Name` FROM `Team` WHERE `Id`='.$User->Team); 65 $Team = $DbResult->fetch_assoc(); 66 65 //$DbResult = $System->Database->query('SELECT `Id`, `Name` FROM `Team` WHERE `Id`='.$User->Team); 66 //$Team = $DbResult->fetch_assoc(); 67 67 //echo('<span class="MenuItem">Moje překlady: <a href="">Dokončené</a> <a href="">Rozpracované</a> <a href="">Exporty</a> Tým: <a href="">'.$Team['name'].'</a></span>'); 68 68 echo('<span class="MenuItem2">'.$User->Name.' <a href="'.$System->Link('/?action=logout').'">Odhlášení</a> <a href="'.$System->Link('/Options.php').'">Nastavení</a>'); … … 250 250 if($User->Role != LICENCE_ANONYMOUS) 251 251 { 252 WriteLog('Odhlášení', LOG_TYPE_USER); 252 253 $User->Logout(); 253 254 $Message = 'Byl jsi odhlášen.'; 254 255 $MessageType = MESSAGE_INFORMATION; 255 WriteLog('Odhlášení', LOG_TYPE_USER);256 256 } 257 257 } -
trunk/registrace.php
r495 r498 14 14 else $Email = ''; 15 15 if(array_key_exists('Team', $_POST)) $Team = $_POST['Team']; 16 else $Team = 0;16 else $Team = ''; 17 17 if(array_key_exists('Language', $_POST)) $Language = $_POST['Language']; 18 18 else $Language = 1; … … 50 50 <tr> 51 51 <td>Patřím do týmu: </td>'); 52 if($Team == 0) $Selected = ' selected="selected"';52 if($Team == '') $Selected = ' selected="selected"'; 53 53 else $Selected = ''; 54 54 echo('<td><select name="Team"><option value="0"'.$Selected.'>Žádného</option> -
trunk/statistic.php
r463 r498 19 19 { 20 20 $Query .= 'SELECT (SELECT COUNT(DISTINCT(`Entry`)) FROM ('. 21 ' SELECT `T`. *FROM `'.$DbRow['TablePrefix'].'` AS `T`'.21 ' SELECT `T`.`Id`, `T`.`Entry` FROM `'.$DbRow['TablePrefix'].'` AS `T`'. 22 22 ' WHERE (`Complete` = 1) AND (`Language`='.$LanguageId.') AND (`VersionStart` <= '.$BuildNumber.') AND (`VersionEnd` >= '.$BuildNumber.')'. 23 23 ') AS `C1`) AS `Translated`, '. 24 24 '(SELECT COUNT(DISTINCT(`Entry`)) FROM ('. 25 ' SELECT `T`. *FROM `'.$DbRow['TablePrefix'].'` AS `T`'.25 ' SELECT `T`.`Id`, `T`.`Entry` FROM `'.$DbRow['TablePrefix'].'` AS `T`'. 26 26 ' WHERE (`Language` = 0) AND (`VersionStart` <= '.$BuildNumber.') AND (`VersionEnd` >= '.$BuildNumber.')'. 27 27 ') AS `C2`) AS `Total`, "'.$DbRow['Name'].'" AS `Name` UNION '; -
trunk/team.php
r466 r498 263 263 if($User->Licence(LICENCE_USER)) 264 264 { 265 $System->Database->query('UPDATE `User` SET `Team` = 0WHERE `ID` = '.$User->Id);265 $System->Database->query('UPDATE `User` SET `Team` = NULL WHERE `ID` = '.$User->Id); 266 266 ShowMessage('Nyní nejste členem žádného týmu.'); 267 267 WriteLog('Uživatel vystoupil z týmu', LOG_TYPE_USER);
Note:
See TracChangeset
for help on using the changeset viewer.