Changeset 381 for trunk


Ignore:
Timestamp:
Mar 13, 2010, 9:42:12 PM (15 years ago)
Author:
george
Message:
  • Opraveno: Řádky z Lua souborů se chybně načítaly, pokud obsahovaly \" nebo ; uvnitř textu.
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/import/import_lua.php

    r366 r381  
    1313    {
    1414      echo('<br />'.$Group['Name'].'<br />');
     15      if($Group['LastVersion'] < $BuildNumber)
     16      {
    1517      $File = new FileStream();
    1618      $File->OpenFile('../source/'.$import_version.'/lua/'.$Group['LuaFileName'].'.lua');
    … …  
    2224        if(strpos($Line, '=') !== false)
    2325        {
    24           $LineParts = explode(';', $Line);
    25           $LineParts2 = explode('=', $LineParts[0]);
    26           $Value['ShortCut'] = trim($LineParts2[0]);
    27           $Value['Text'] = addslashes(stripslashes(substr(trim($LineParts2[1]), 1, -1)));
    28           $Value['Comment'] = addslashes(stripslashes(substr(trim($LineParts[1]), 3)));
     26          $LineParts = explode('=', $Line, 2);
     27          $Value['ShortCut'] = trim($LineParts[0]);
     28          $Line = substr(trim($LineParts[1]), 1);
     29          $TempLine = str_replace('\"', '  ', $Line); // Temporary remove slashed quotes
     30          $Value['Text'] = addslashes(stripslashes(substr($Line, 0, strpos($TempLine, '"'))));
     31          $Line = trim(substr($Line, strpos($TempLine, '"') + 2)); // Skip closing quote and semicolon         
     32          $Value['Comment'] = addslashes(stripslashes(substr($Line, 3))); // Skip " --"
     33          print_r($Value);
    2934
    3035          $Columns = '';
    … …  
    8893      echo('<br />Celkem: '.$Count.'  Nových: '.$NewCount.'<br />');
    8994      $Database->SQLCommand('UPDATE `Group` SET `LastVersion` = "'.$BuildNumber.'", `LastImport` = NOW() WHERE `Id`='.$Group['Id']);
     95      } else echo('Již importován pro verzi '.$import_version);
    9096    }   
    9197  }

  • trunk/import/index.php

    r367 r381  
    1010ShowPage();
    1111
    12 if(!Licence(LICENCE_ADMIN))
     12if(!$User->Licence(LICENCE_ADMIN))
    1313{
    1414  echo('Nemáte oprávnění');
    … …  
    5757        foreach($tables as $table)
    5858        {
    59       echo('<a href="?source=sql_mangos&amp;group='.$table.'">'.$TranslationTree[$table]['Name'].'</a>');
    60       if ($table == $tables[0]) echo(' <strong>Pracuje</strong>');
    61       echo ('<br />');
    62     }
    63     echo ('<br />'); echo ('<br />');
     59          echo('<a href="?source=sql_mangos&amp;group='.$table.'">'.$TranslationTree[$table]['Name']. '</a>');
     60          if($table == $tables[0]) echo(' <strong>Pracuje</strong>');
     61          echo('<br />');
     62        }
     63        echo('<br />');
     64        echo('<br />');
    6465        ImportSQLMangos($Config['Web']['GameVersion'], $tables[0]);
    65     if (isset($tables[1]))
    66     {
     66        if(isset($tables[1]))
     67        {
    6768          echo('<script type="text/javascript" language="JavaScript" charset="utf-8">'.
    68           'setTimeout("parent.location.href=\''.htmlspecialchars_decode('?source=sql_mangos&amp;group='.$tables[1]).'\'", 3000)</script>');
    69     } else {
     69            'setTimeout("parent.location.href=\''.htmlspecialchars_decode('?source=sql_mangos&amp;group='.$tables[1]).'\'", 3000)</script>');
     70        } else
     71        {
     72          echo('<script type="text/javascript" language="JavaScript" charset="utf-8">'.
     73           'setTimeout("parent.location.href=\''.htmlspecialchars_decode('?source=update_version').'\'", 3000)</script>');
     74        }
     75      } else
     76      {
     77        foreach($tables as $table)
     78        {
     79          echo('<a href="?source=sql_mangos&amp;group='.$table.'">'.$TranslationTree[$table]['Name'].'</a>');
     80          if($table < $_GET['group']) echo(' <strong>Hotovo</strong>');
     81          if($table == $_GET['group']) echo(' <strong>Pracuje</strong>');
     82          echo('<br />');
     83        }
     84        echo('<br />');
     85        echo('<br />');
     86        ImportSQLMangos($Config['Web']['GameVersion'], $_GET['group']);
     87        if(isset($tables[array_search($_GET['group'],$tables) + 1]))
     88        {
     89          echo('<script type="text/javascript" language="JavaScript" charset="utf-8">'.
     90          'setTimeout("parent.location.href=\''.htmlspecialchars_decode('?source=sql_mangos&amp;group='.$tables[array_search($_GET['group'],$tables)+1]).'\'", 3000)</script>');
     91        } else
     92        {
    7093          echo('<script type="text/javascript" language="JavaScript" charset="utf-8">'.
    7194          'setTimeout("parent.location.href=\''.htmlspecialchars_decode('?source=update_version').'\'", 3000)</script>');
     95        }
    7296      }
    73     } else {
    74         foreach($tables as $table)
    75         {
    76       echo('<a href="?source=sql_mangos&amp;group='.$table.'">'.$TranslationTree[$table]['Name'].'</a>');
    77       if ($table < $_GET['group']) echo (' <strong>Hotovo</strong>');
    78       if ($table == $_GET['group']) echo (' <strong>Pracuje</strong>');
    79       echo ('<br />');
    80     }
    81     echo ('<br />'); echo ('<br />');
    82         ImportSQLMangos($Config['Web']['GameVersion'], $_GET['group']);
    83     if (isset($tables[array_search($_GET['group'],$tables)+1]))
    84     {
    85           echo('<script type="text/javascript" language="JavaScript" charset="utf-8">'.
    86           'setTimeout("parent.location.href=\''.htmlspecialchars_decode('?source=sql_mangos&amp;group='.$tables[array_search($_GET['group'],$tables)+1]).'\'", 3000)</script>');
    87     } else {
    88           echo('<script type="text/javascript" language="JavaScript" charset="utf-8">'.
    89           'setTimeout("parent.location.href=\''.htmlspecialchars_decode('?source=update_version').'\'", 3000)</script>');
    90       }
    91     }
    9297      break;
    9398    case 'dbc':
    … …  
    103108        foreach($tables as $table)
    104109        {
    105       echo('<a href="?source=dbc&amp;group='.$table.'">'.$TranslationTree[$table]['Name'].'</a>'); 
    106       if ($table == $tables[0]) echo(' <strong>Pracuje</strong>');
    107       echo ('<br />');
    108     }
    109     echo ('<br />'); echo ('<br />');
     110          echo('<a href="?source=dbc&amp;group='.$table.'">'.$TranslationTree[$table]['Name'].'</a>'); 
     111          if($table == $tables[0]) echo(' <strong>Pracuje</strong>');
     112          echo('<br />');
     113        }
     114        echo('<br />'); echo ('<br />');
    110115        ImportDBC($Config['Web']['GameVersion'], $tables[0]);
    111     if (isset($tables[1]))
    112     {
     116        if(isset($tables[1]))
     117        {
    113118          echo('<script type="text/javascript" language="JavaScript" charset="utf-8">'.
    114119          'setTimeout("parent.location.href=\''.htmlspecialchars_decode('?source=dbc&amp;group='.$tables[1]).'\'", 3000)</script>');
    115     } else {
     120        } else
     121        {
     122          echo('<script type="text/javascript" language="JavaScript" charset="utf-8">'.
     123            'setTimeout("parent.location.href=\''.htmlspecialchars_decode('?source=update_version').'\'", 3000)</script>');
     124        }
     125      } else
     126      {
     127        foreach($tables as $table)
     128        {
     129          echo('<a href="?source=dbc&amp;group='.$table.'">'.$TranslationTree[$table]['Name'].'</a>'); 
     130          if($table < $_GET['group']) echo (' <strong>Hotovo</strong>');
     131          if($table == $_GET['group']) echo (' <strong>Pracuje</strong>');
     132          echo('<br />');
     133        }
     134        echo('<br />');
     135        echo('<br />');
     136        ImportDBC($Config['Web']['GameVersion'], $_GET['group']);
     137        if(isset($tables[array_search($_GET['group'], $tables) + 1]))
     138        {
     139          echo('<script type="text/javascript" language="JavaScript" charset="utf-8">'.
     140          'setTimeout("parent.location.href=\''.htmlspecialchars_decode('?source=dbc&amp;group='.$tables[array_search($_GET['group'],$tables)+1]).'\'", 3000)</script>');
     141        } else
     142        {
    116143          echo('<script type="text/javascript" language="JavaScript" charset="utf-8">'.
    117144          'setTimeout("parent.location.href=\''.htmlspecialchars_decode('?source=update_version').'\'", 3000)</script>');
     145        }
    118146      }
    119     } else {
    120         foreach($tables as $table)
    121         {
    122       echo('<a href="?source=dbc&amp;group='.$table.'">'.$TranslationTree[$table]['Name'].'</a>'); 
    123       if ($table < $_GET['group']) echo (' <strong>Hotovo</strong>');
    124       if ($table == $_GET['group']) echo (' <strong>Pracuje</strong>');
    125       echo ('<br />');
    126     }
    127     echo ('<br />'); echo ('<br />');
    128         ImportDBC($Config['Web']['GameVersion'], $_GET['group']);
    129     if (isset($tables[array_search($_GET['group'],$tables)+1]))
    130     {
    131           echo('<script type="text/javascript" language="JavaScript" charset="utf-8">'.
    132           'setTimeout("parent.location.href=\''.htmlspecialchars_decode('?source=dbc&amp;group='.$tables[array_search($_GET['group'],$tables)+1]).'\'", 3000)</script>');
    133     } else {
    134           echo('<script type="text/javascript" language="JavaScript" charset="utf-8">'.
    135           'setTimeout("parent.location.href=\''.htmlspecialchars_decode('?source=update_version').'\'", 3000)</script>');
    136       }
    137     }
    138147      break;
    139148    case 'update_version':

  • trunk/includes/global_function.php

    r380 r381  
    232232 
    233233  $Result = array();
    234   $DbResult = $Database->SQLCommand('SELECT * FROM `Group` ORDER BY `Name`');
     234  $DbResult = $Database->SQLCommand('SELECT *, UNIX_TIMESTAMP(`LastImport`) AS `LastImportTime` FROM `Group` ORDER BY `Name`');
    235235  while($DbRow = mysql_fetch_assoc($DbResult))
    236236  {
    … …  
    238238    $Result[$DbRow['Id']] = $DbRow;
    239239  }
    240   $DbResult = $Database->SQLCommand('SELECT * FROM `GroupItem` ORDER BY DBCColumnIndex');
     240  $DbResult = $Database->SQLCommand('SELECT * FROM `GroupItem` ORDER BY `DBCColumnIndex`');
    241241  while($DbRow = mysql_fetch_assoc($DbResult))
    242242  {

  • trunk/server.php

    r362 r381  
    1010'Adresa serveru (realmlist): <strong>heroesoffantasy.cz</strong><br />'.
    1111'Registrace účtu: <a href="http://www.heroesoffantasy.cz/?page=register">zde</a><br />'.
    12 'Název realmu: <a href="http://www.heroesoffantasy.cz/?page=online&amp;RealmIndex=7">Titans</a><br />'.
     12'Název světa: <a href="http://www.heroesoffantasy.cz/?page=online&amp;RealmIndex=7">Titans</a><br />'.
    1313'Seznam povolených GM příkazů: <a href="http://www.heroesoffantasy.cz/?page=commands&amp;RealmIndex=7">zde</a>');
    1414         
Note: See TracChangeset for help on using the changeset viewer.