alxarafe /
alixar
@@ -69,23 +69,23 @@ |
||
| 69 | 69 | $file=''; |
| 70 | 70 | if (isset($argv[4])) |
| 71 | 71 | { |
| 72 | - $file=$argv[4]; |
|
| 73 | - print 'Argument 4='.$argv[4]."\n"; |
|
| 72 | + $file=$argv[4]; |
|
| 73 | + print 'Argument 4='.$argv[4]."\n"; |
|
| 74 | 74 | } |
| 75 | 75 | print 'Files will be generated/updated in directory '.$dir."\n"; |
| 76 | 76 | |
| 77 | 77 | if ($argv[2] != 'all') |
| 78 | 78 | { |
| 79 | - if (! is_dir($dir.'/'.$argv[2])) |
|
| 80 | - { |
|
| 81 | - print 'Create directory '.$dir.'/'.$argv[2]."\n"; |
|
| 82 | - $result=mkdir($dir.'/'.$argv[2]); |
|
| 83 | - if (! $result) |
|
| 84 | - { |
|
| 85 | - $db->close(); |
|
| 86 | - return -1; |
|
| 87 | - } |
|
| 88 | - } |
|
| 79 | + if (! is_dir($dir.'/'.$argv[2])) |
|
| 80 | + { |
|
| 81 | + print 'Create directory '.$dir.'/'.$argv[2]."\n"; |
|
| 82 | + $result=mkdir($dir.'/'.$argv[2]); |
|
| 83 | + if (! $result) |
|
| 84 | + { |
|
| 85 | + $db->close(); |
|
| 86 | + return -1; |
|
| 87 | + } |
|
| 88 | + } |
|
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | require_once DOL_DOCUMENT_ROOT."/../dev/translation/autotranslator.class.php"; |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | |
| 29 | 29 | $sapi_type = php_sapi_name(); |
| 30 | 30 | $script_file = basename(__FILE__); |
| 31 | -$path=dirname(__FILE__).'/'; |
|
| 31 | +$path = dirname(__FILE__).'/'; |
|
| 32 | 32 | |
| 33 | 33 | // Test if batch mode |
| 34 | 34 | if (substr($sapi_type, 0, 3) == 'cgi') { |
@@ -45,17 +45,17 @@ discard block |
||
| 45 | 45 | $langs->load("main"); |
| 46 | 46 | |
| 47 | 47 | // Global variables |
| 48 | -$version='1.14'; |
|
| 49 | -$error=0; |
|
| 48 | +$version = '1.14'; |
|
| 49 | +$error = 0; |
|
| 50 | 50 | |
| 51 | 51 | |
| 52 | 52 | // -------------------- START OF YOUR CODE HERE -------------------- |
| 53 | 53 | @set_time_limit(0); |
| 54 | 54 | print "***** ".$script_file." (".$version.") *****\n"; |
| 55 | -$dir=DOL_DOCUMENT_ROOT."/langs"; |
|
| 55 | +$dir = DOL_DOCUMENT_ROOT."/langs"; |
|
| 56 | 56 | |
| 57 | 57 | // Check parameters |
| 58 | -if (! isset($argv[3])) { |
|
| 58 | +if (!isset($argv[3])) { |
|
| 59 | 59 | print "Usage: ".$script_file." lang_code_src lang_code_dest|all APIKEY [langfile.lang]\n"; |
| 60 | 60 | print "Example: ".$script_file." en_US pt_PT 123456\n"; |
| 61 | 61 | print "Rem: lang_code to use can be found on http://www.google.com/language_tools\n"; |
@@ -66,21 +66,21 @@ discard block |
||
| 66 | 66 | print 'Argument 1='.$argv[1]."\n"; |
| 67 | 67 | print 'Argument 2='.$argv[2]."\n"; |
| 68 | 68 | print 'Argument 3='.$argv[3]."\n"; |
| 69 | -$file=''; |
|
| 69 | +$file = ''; |
|
| 70 | 70 | if (isset($argv[4])) |
| 71 | 71 | { |
| 72 | - $file=$argv[4]; |
|
| 72 | + $file = $argv[4]; |
|
| 73 | 73 | print 'Argument 4='.$argv[4]."\n"; |
| 74 | 74 | } |
| 75 | 75 | print 'Files will be generated/updated in directory '.$dir."\n"; |
| 76 | 76 | |
| 77 | 77 | if ($argv[2] != 'all') |
| 78 | 78 | { |
| 79 | - if (! is_dir($dir.'/'.$argv[2])) |
|
| 79 | + if (!is_dir($dir.'/'.$argv[2])) |
|
| 80 | 80 | { |
| 81 | 81 | print 'Create directory '.$dir.'/'.$argv[2]."\n"; |
| 82 | - $result=mkdir($dir.'/'.$argv[2]); |
|
| 83 | - if (! $result) |
|
| 82 | + $result = mkdir($dir.'/'.$argv[2]); |
|
| 83 | + if (!$result) |
|
| 84 | 84 | { |
| 85 | 85 | $db->close(); |
| 86 | 86 | return -1; |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | |
| 91 | 91 | require_once DOL_DOCUMENT_ROOT."/../dev/translation/autotranslator.class.php"; |
| 92 | 92 | |
| 93 | -$langParser = new autoTranslator($argv[2],$argv[1],$dir,$file,$argv[3]); |
|
| 93 | +$langParser = new autoTranslator($argv[2], $argv[1], $dir, $file, $argv[3]); |
|
| 94 | 94 | |
| 95 | 95 | print "***** Finished *****\n"; |
| 96 | 96 | |
@@ -50,8 +50,8 @@ discard block |
||
| 50 | 50 | |
| 51 | 51 | // Test if batch mode |
| 52 | 52 | if (substr($sapi_type, 0, 3) == 'cgi') { |
| 53 | - echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n"; |
|
| 54 | - exit; |
|
| 53 | + echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n"; |
|
| 54 | + exit; |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | $rc = 0; |
@@ -65,11 +65,11 @@ discard block |
||
| 65 | 65 | |
| 66 | 66 | if (empty($lPrimary) || empty($lSecondary) || empty($filesToProcess)) |
| 67 | 67 | { |
| 68 | - $rc = 1; |
|
| 69 | - $msg = '***** Script to clean language files *****'."\n"; |
|
| 70 | - $msg.= 'Usage: ./dev/translation/strip_language_file.php xx_XX xx_YY [file.lang|all]'."\n"; |
|
| 71 | - print $msg . "(rc=$rc).\n"; |
|
| 72 | - exit($rc); |
|
| 68 | + $rc = 1; |
|
| 69 | + $msg = '***** Script to clean language files *****'."\n"; |
|
| 70 | + $msg.= 'Usage: ./dev/translation/strip_language_file.php xx_XX xx_YY [file.lang|all]'."\n"; |
|
| 71 | + print $msg . "(rc=$rc).\n"; |
|
| 72 | + exit($rc); |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | $aPrimary = array(); |
@@ -79,14 +79,14 @@ discard block |
||
| 79 | 79 | // Define array $filesToProcess |
| 80 | 80 | if ($filesToProcess == 'all') |
| 81 | 81 | { |
| 82 | - $dir = new DirectoryIterator('htdocs/langs/'.$lPrimary); |
|
| 83 | - while($dir->valid()) { |
|
| 84 | - if(!$dir->isDot() && $dir->isFile() && ! preg_match('/^\./',$dir->getFilename())) { |
|
| 85 | - $files[] = $dir->getFilename(); |
|
| 86 | - } |
|
| 87 | - $dir->next(); |
|
| 88 | - } |
|
| 89 | - $filesToProcess=$files; |
|
| 82 | + $dir = new DirectoryIterator('htdocs/langs/'.$lPrimary); |
|
| 83 | + while($dir->valid()) { |
|
| 84 | + if(!$dir->isDot() && $dir->isFile() && ! preg_match('/^\./',$dir->getFilename())) { |
|
| 85 | + $files[] = $dir->getFilename(); |
|
| 86 | + } |
|
| 87 | + $dir->next(); |
|
| 88 | + } |
|
| 89 | + $filesToProcess=$files; |
|
| 90 | 90 | } |
| 91 | 91 | else $filesToProcess=explode(',',$filesToProcess); |
| 92 | 92 | |
@@ -96,257 +96,257 @@ discard block |
||
| 96 | 96 | // Loop on each file |
| 97 | 97 | foreach($filesToProcess as $fileToProcess) |
| 98 | 98 | { |
| 99 | - $lPrimaryFile = 'htdocs/langs/'.$lPrimary.'/'.$fileToProcess; |
|
| 100 | - $lSecondaryFile = 'htdocs/langs/'.$lSecondary.'/'.$fileToProcess; |
|
| 101 | - $lEnglishFile = 'htdocs/langs/'.$lEnglish.'/'.$fileToProcess; |
|
| 102 | - $output = $lSecondaryFile . '.delta'; |
|
| 103 | - |
|
| 104 | - print "---- Process language file ".$lSecondaryFile."\n"; |
|
| 105 | - |
|
| 106 | - if ( ! is_readable($lPrimaryFile) ) { |
|
| 107 | - $rc = 2; |
|
| 108 | - $msg = "Cannot read primary language file $lPrimaryFile."; |
|
| 109 | - print $msg . " (rc=$rc).\n"; |
|
| 110 | - exit($rc); |
|
| 111 | - } |
|
| 112 | - |
|
| 113 | - if ( ! is_readable($lSecondaryFile) ) { |
|
| 114 | - $rc = 3; |
|
| 115 | - $msg = "Cannot read secondary language file $lSecondaryFile. We discard this file."; |
|
| 116 | - print $msg . "\n"; |
|
| 117 | - continue; |
|
| 118 | - } |
|
| 119 | - |
|
| 120 | - if ( ! is_readable($lEnglishFile) ) { |
|
| 121 | - $rc = 3; |
|
| 122 | - $msg = "Cannot read english language file $lEnglishFile. We discard this file."; |
|
| 123 | - print $msg . "\n"; |
|
| 124 | - continue; |
|
| 125 | - } |
|
| 126 | - |
|
| 127 | - // Start reading and parsing Secondary |
|
| 128 | - |
|
| 129 | - if ( $handle = fopen($lSecondaryFile, 'r') ) |
|
| 130 | - { |
|
| 131 | - print "Read Secondary File $lSecondaryFile:\n"; |
|
| 132 | - $cnt = 0; |
|
| 133 | - while (($line = fgets($handle)) !== false) |
|
| 134 | - { |
|
| 135 | - $cnt++; |
|
| 136 | - |
|
| 137 | - // strip comments |
|
| 138 | - if ( preg_match("/^\w*#/", $line) ) { |
|
| 139 | - continue; |
|
| 140 | - } |
|
| 141 | - // strip empty lines |
|
| 142 | - if ( preg_match("/^\w*$/", $line) ) { |
|
| 143 | - continue; |
|
| 144 | - } |
|
| 145 | - |
|
| 146 | - $a = mb_split('=', trim($line), 2); |
|
| 147 | - if ( count($a) != 2 ) { |
|
| 148 | - print "ERROR in file $lSecondaryFile, line $cnt: " . trim($line) . "\n"; |
|
| 149 | - continue; |
|
| 150 | - } |
|
| 151 | - |
|
| 152 | - list($key, $value) = $a; |
|
| 153 | - |
|
| 154 | - // key is redundant |
|
| 155 | - if ( array_key_exists($key, $aSecondary) ) { |
|
| 156 | - print "Key $key is redundant in file $lSecondaryFile (line: $cnt).\n"; |
|
| 157 | - continue; |
|
| 158 | - } |
|
| 159 | - |
|
| 160 | - // String has no value |
|
| 161 | - if ( $value == '' ) { |
|
| 162 | - print "Key $key has no value in file $lSecondaryFile (line: $cnt).\n"; |
|
| 163 | - continue; |
|
| 164 | - } |
|
| 165 | - |
|
| 166 | - $aSecondary[$key] = trim($value); |
|
| 167 | - } |
|
| 168 | - if ( ! feof($handle) ) |
|
| 169 | - { |
|
| 170 | - $rc = 5; |
|
| 171 | - $msg = "Unexpected fgets() fail"; |
|
| 172 | - print $msg . " (rc=$rc).\n"; |
|
| 173 | - exit($rc); |
|
| 174 | - } |
|
| 175 | - fclose($handle); |
|
| 176 | - } |
|
| 177 | - else { |
|
| 178 | - $rc = 6; |
|
| 179 | - $msg = "Cannot open file $lSecondaryFile"; |
|
| 180 | - print $msg . " (rc=$rc).\n"; |
|
| 181 | - exit($rc); |
|
| 182 | - } |
|
| 183 | - |
|
| 184 | - |
|
| 185 | - // Start reading and parsing English |
|
| 186 | - |
|
| 187 | - if ( $handle = fopen($lEnglishFile, 'r') ) |
|
| 188 | - { |
|
| 189 | - print "Read English File $lEnglishFile:\n"; |
|
| 190 | - $cnt = 0; |
|
| 191 | - while (($line = fgets($handle)) !== false) |
|
| 192 | - { |
|
| 193 | - $cnt++; |
|
| 194 | - |
|
| 195 | - // strip comments |
|
| 196 | - if ( preg_match("/^\w*#/", $line) ) { |
|
| 197 | - continue; |
|
| 198 | - } |
|
| 199 | - // strip empty lines |
|
| 200 | - if ( preg_match("/^\w*$/", $line) ) { |
|
| 201 | - continue; |
|
| 202 | - } |
|
| 203 | - |
|
| 204 | - $a = mb_split('=', trim($line), 2); |
|
| 205 | - if ( count($a) != 2 ) { |
|
| 206 | - print "ERROR in file $lEnglishFile, line $cnt: " . trim($line) . "\n"; |
|
| 207 | - continue; |
|
| 208 | - } |
|
| 209 | - |
|
| 210 | - list($key, $value) = $a; |
|
| 211 | - |
|
| 212 | - // key is redundant |
|
| 213 | - if ( array_key_exists($key, $aEnglish) ) { |
|
| 214 | - print "Key $key is redundant in file $lEnglishFile (line: $cnt).\n"; |
|
| 215 | - continue; |
|
| 216 | - } |
|
| 217 | - |
|
| 218 | - // String has no value |
|
| 219 | - if ( $value == '' ) { |
|
| 220 | - print "Key $key has no value in file $lEnglishFile (line: $cnt).\n"; |
|
| 221 | - continue; |
|
| 222 | - } |
|
| 223 | - |
|
| 224 | - $aEnglish[$key] = trim($value); |
|
| 225 | - } |
|
| 226 | - if ( ! feof($handle) ) |
|
| 227 | - { |
|
| 228 | - $rc = 5; |
|
| 229 | - $msg = "Unexpected fgets() fail"; |
|
| 230 | - print $msg . " (rc=$rc).\n"; |
|
| 231 | - exit($rc); |
|
| 232 | - } |
|
| 233 | - fclose($handle); |
|
| 234 | - } |
|
| 235 | - else { |
|
| 236 | - $rc = 6; |
|
| 237 | - $msg = "Cannot open file $lEnglishFile"; |
|
| 238 | - print $msg . " (rc=$rc).\n"; |
|
| 239 | - exit($rc); |
|
| 240 | - } |
|
| 241 | - |
|
| 242 | - |
|
| 243 | - |
|
| 244 | - // Start reading and parsing Primary. See rules in header! |
|
| 245 | - |
|
| 246 | - $arrayofkeytoalwayskeep=array('DIRECTION','FONTFORPDF','FONTSIZEFORPDF','SeparatorDecimal','SeparatorThousand'); |
|
| 247 | - |
|
| 248 | - |
|
| 249 | - if ( $handle = fopen($lPrimaryFile, 'r') ) |
|
| 250 | - { |
|
| 251 | - if ( ! $oh = fopen($output, 'w') ) |
|
| 252 | - { |
|
| 253 | - print "ERROR in writing to file $output\n"; |
|
| 254 | - exit; |
|
| 255 | - } |
|
| 256 | - |
|
| 257 | - print "Read Primary File $lPrimaryFile and write ".$output.":\n"; |
|
| 258 | - |
|
| 259 | - fwrite($oh, "# Dolibarr language file - Source file is en_US - ".(preg_replace('/\.lang$/','',$fileToProcess))."\n"); |
|
| 260 | - |
|
| 261 | - $cnt = 0; |
|
| 262 | - while (($line = fgets($handle)) !== false) |
|
| 263 | - { |
|
| 264 | - $cnt++; |
|
| 265 | - |
|
| 266 | - // strip comments |
|
| 267 | - if ( preg_match("/^\w*#/", $line) ) { |
|
| 268 | - continue; |
|
| 269 | - } |
|
| 270 | - // strip empty lines |
|
| 271 | - if ( preg_match("/^\w*$/", $line) ) { |
|
| 272 | - continue; |
|
| 273 | - } |
|
| 274 | - |
|
| 275 | - $a = mb_split('=', trim($line), 2); |
|
| 276 | - if ( count($a) != 2 ) { |
|
| 277 | - print "ERROR in file $lPrimaryFile, line $cnt: " . trim($line) . "\n"; |
|
| 278 | - continue; |
|
| 279 | - } |
|
| 280 | - |
|
| 281 | - list($key, $value) = $a; |
|
| 282 | - |
|
| 283 | - // key is redundant |
|
| 284 | - if ( array_key_exists($key, $aPrimary) ) { |
|
| 285 | - print "Key $key is redundant in file $lPrimaryFile (line: $cnt) - Already found into ".$fileFirstFound[$key]." (line: ".$lineFirstFound[$key].").\n"; |
|
| 286 | - continue; |
|
| 287 | - } |
|
| 288 | - else |
|
| 289 | - { |
|
| 290 | - $fileFirstFound[$key] = $fileToProcess; |
|
| 291 | - $lineFirstFound[$key] = $cnt; |
|
| 292 | - } |
|
| 293 | - |
|
| 294 | - // String has no value |
|
| 295 | - if ( $value == '' ) { |
|
| 296 | - print "Key $key has no value in file $lPrimaryFile (line: $cnt).\n"; |
|
| 297 | - continue; |
|
| 298 | - } |
|
| 299 | - |
|
| 300 | - $aPrimary[$key] = trim($value); |
|
| 301 | - $fileFirstFound[$key] = $fileToProcess; |
|
| 302 | - $lineFirstFound[$key] = $cnt; |
|
| 303 | - |
|
| 304 | - // ----- Process output now ----- |
|
| 305 | - |
|
| 306 | - //print "Found primary key = ".$key."\n"; |
|
| 307 | - |
|
| 308 | - // Key not in other file |
|
| 309 | - if (in_array($key, $arrayofkeytoalwayskeep) || preg_match('/^FormatDate/',$key) || preg_match('/^FormatHour/',$key)) |
|
| 310 | - { |
|
| 311 | - //print "Key $key is a key we always want to see into secondary file (line: $cnt).\n"; |
|
| 312 | - } |
|
| 313 | - else if ( ! array_key_exists($key, $aSecondary)) |
|
| 314 | - { |
|
| 315 | - //print "Key $key does NOT exist in secondary language (line: $cnt).\n"; |
|
| 316 | - continue; |
|
| 317 | - } |
|
| 318 | - |
|
| 319 | - // String exists in both files and value into alternative language differs from main language but also from english files |
|
| 320 | - if ( |
|
| 321 | - (! empty($aSecondary[$key]) && $aSecondary[$key] != $aPrimary[$key] |
|
| 322 | - && ! empty($aEnglish[$key]) && $aSecondary[$key] != $aEnglish[$key]) |
|
| 323 | - || in_array($key, $arrayofkeytoalwayskeep) || preg_match('/^FormatDate/',$key) || preg_match('/^FormatHour/',$key) |
|
| 324 | - ) |
|
| 325 | - { |
|
| 326 | - //print "Key $key differs (aSecondary=".$aSecondary[$key].", aPrimary=".$aPrimary[$key].", aEnglish=".$aEnglish[$key].") so we add it into new secondary language (line: $cnt).\n"; |
|
| 327 | - fwrite($oh, $key."=".(empty($aSecondary[$key])?$aPrimary[$key]:$aSecondary[$key])."\n"); |
|
| 328 | - } |
|
| 329 | - } |
|
| 330 | - if ( ! feof($handle) ) { |
|
| 331 | - $rc = 7; |
|
| 332 | - $msg = "Unexpected fgets() fail"; |
|
| 333 | - print $msg . " (rc=$rc).\n"; |
|
| 334 | - exit($rc); |
|
| 335 | - } |
|
| 336 | - fclose($oh); |
|
| 337 | - fclose($handle); |
|
| 338 | - } |
|
| 339 | - else { |
|
| 340 | - $rc = 8; |
|
| 341 | - $msg = "Cannot open file $lPrimaryFile"; |
|
| 342 | - print $msg . " (rc=$rc).\n"; |
|
| 343 | - exit($rc); |
|
| 344 | - } |
|
| 345 | - |
|
| 346 | - print "Output can be found at $output.\n"; |
|
| 347 | - |
|
| 348 | - print "To rename all .delta files, you can do:\n"; |
|
| 349 | - print '> for fic in `ls htdocs/langs/'.$lSecondary.'/*.delta`; do f=`echo $fic | sed -e \'s/\.delta//\'`; echo $f; mv $f.delta $f; done'."\n"; |
|
| 99 | + $lPrimaryFile = 'htdocs/langs/'.$lPrimary.'/'.$fileToProcess; |
|
| 100 | + $lSecondaryFile = 'htdocs/langs/'.$lSecondary.'/'.$fileToProcess; |
|
| 101 | + $lEnglishFile = 'htdocs/langs/'.$lEnglish.'/'.$fileToProcess; |
|
| 102 | + $output = $lSecondaryFile . '.delta'; |
|
| 103 | + |
|
| 104 | + print "---- Process language file ".$lSecondaryFile."\n"; |
|
| 105 | + |
|
| 106 | + if ( ! is_readable($lPrimaryFile) ) { |
|
| 107 | + $rc = 2; |
|
| 108 | + $msg = "Cannot read primary language file $lPrimaryFile."; |
|
| 109 | + print $msg . " (rc=$rc).\n"; |
|
| 110 | + exit($rc); |
|
| 111 | + } |
|
| 112 | + |
|
| 113 | + if ( ! is_readable($lSecondaryFile) ) { |
|
| 114 | + $rc = 3; |
|
| 115 | + $msg = "Cannot read secondary language file $lSecondaryFile. We discard this file."; |
|
| 116 | + print $msg . "\n"; |
|
| 117 | + continue; |
|
| 118 | + } |
|
| 119 | + |
|
| 120 | + if ( ! is_readable($lEnglishFile) ) { |
|
| 121 | + $rc = 3; |
|
| 122 | + $msg = "Cannot read english language file $lEnglishFile. We discard this file."; |
|
| 123 | + print $msg . "\n"; |
|
| 124 | + continue; |
|
| 125 | + } |
|
| 126 | + |
|
| 127 | + // Start reading and parsing Secondary |
|
| 128 | + |
|
| 129 | + if ( $handle = fopen($lSecondaryFile, 'r') ) |
|
| 130 | + { |
|
| 131 | + print "Read Secondary File $lSecondaryFile:\n"; |
|
| 132 | + $cnt = 0; |
|
| 133 | + while (($line = fgets($handle)) !== false) |
|
| 134 | + { |
|
| 135 | + $cnt++; |
|
| 136 | + |
|
| 137 | + // strip comments |
|
| 138 | + if ( preg_match("/^\w*#/", $line) ) { |
|
| 139 | + continue; |
|
| 140 | + } |
|
| 141 | + // strip empty lines |
|
| 142 | + if ( preg_match("/^\w*$/", $line) ) { |
|
| 143 | + continue; |
|
| 144 | + } |
|
| 145 | + |
|
| 146 | + $a = mb_split('=', trim($line), 2); |
|
| 147 | + if ( count($a) != 2 ) { |
|
| 148 | + print "ERROR in file $lSecondaryFile, line $cnt: " . trim($line) . "\n"; |
|
| 149 | + continue; |
|
| 150 | + } |
|
| 151 | + |
|
| 152 | + list($key, $value) = $a; |
|
| 153 | + |
|
| 154 | + // key is redundant |
|
| 155 | + if ( array_key_exists($key, $aSecondary) ) { |
|
| 156 | + print "Key $key is redundant in file $lSecondaryFile (line: $cnt).\n"; |
|
| 157 | + continue; |
|
| 158 | + } |
|
| 159 | + |
|
| 160 | + // String has no value |
|
| 161 | + if ( $value == '' ) { |
|
| 162 | + print "Key $key has no value in file $lSecondaryFile (line: $cnt).\n"; |
|
| 163 | + continue; |
|
| 164 | + } |
|
| 165 | + |
|
| 166 | + $aSecondary[$key] = trim($value); |
|
| 167 | + } |
|
| 168 | + if ( ! feof($handle) ) |
|
| 169 | + { |
|
| 170 | + $rc = 5; |
|
| 171 | + $msg = "Unexpected fgets() fail"; |
|
| 172 | + print $msg . " (rc=$rc).\n"; |
|
| 173 | + exit($rc); |
|
| 174 | + } |
|
| 175 | + fclose($handle); |
|
| 176 | + } |
|
| 177 | + else { |
|
| 178 | + $rc = 6; |
|
| 179 | + $msg = "Cannot open file $lSecondaryFile"; |
|
| 180 | + print $msg . " (rc=$rc).\n"; |
|
| 181 | + exit($rc); |
|
| 182 | + } |
|
| 183 | + |
|
| 184 | + |
|
| 185 | + // Start reading and parsing English |
|
| 186 | + |
|
| 187 | + if ( $handle = fopen($lEnglishFile, 'r') ) |
|
| 188 | + { |
|
| 189 | + print "Read English File $lEnglishFile:\n"; |
|
| 190 | + $cnt = 0; |
|
| 191 | + while (($line = fgets($handle)) !== false) |
|
| 192 | + { |
|
| 193 | + $cnt++; |
|
| 194 | + |
|
| 195 | + // strip comments |
|
| 196 | + if ( preg_match("/^\w*#/", $line) ) { |
|
| 197 | + continue; |
|
| 198 | + } |
|
| 199 | + // strip empty lines |
|
| 200 | + if ( preg_match("/^\w*$/", $line) ) { |
|
| 201 | + continue; |
|
| 202 | + } |
|
| 203 | + |
|
| 204 | + $a = mb_split('=', trim($line), 2); |
|
| 205 | + if ( count($a) != 2 ) { |
|
| 206 | + print "ERROR in file $lEnglishFile, line $cnt: " . trim($line) . "\n"; |
|
| 207 | + continue; |
|
| 208 | + } |
|
| 209 | + |
|
| 210 | + list($key, $value) = $a; |
|
| 211 | + |
|
| 212 | + // key is redundant |
|
| 213 | + if ( array_key_exists($key, $aEnglish) ) { |
|
| 214 | + print "Key $key is redundant in file $lEnglishFile (line: $cnt).\n"; |
|
| 215 | + continue; |
|
| 216 | + } |
|
| 217 | + |
|
| 218 | + // String has no value |
|
| 219 | + if ( $value == '' ) { |
|
| 220 | + print "Key $key has no value in file $lEnglishFile (line: $cnt).\n"; |
|
| 221 | + continue; |
|
| 222 | + } |
|
| 223 | + |
|
| 224 | + $aEnglish[$key] = trim($value); |
|
| 225 | + } |
|
| 226 | + if ( ! feof($handle) ) |
|
| 227 | + { |
|
| 228 | + $rc = 5; |
|
| 229 | + $msg = "Unexpected fgets() fail"; |
|
| 230 | + print $msg . " (rc=$rc).\n"; |
|
| 231 | + exit($rc); |
|
| 232 | + } |
|
| 233 | + fclose($handle); |
|
| 234 | + } |
|
| 235 | + else { |
|
| 236 | + $rc = 6; |
|
| 237 | + $msg = "Cannot open file $lEnglishFile"; |
|
| 238 | + print $msg . " (rc=$rc).\n"; |
|
| 239 | + exit($rc); |
|
| 240 | + } |
|
| 241 | + |
|
| 242 | + |
|
| 243 | + |
|
| 244 | + // Start reading and parsing Primary. See rules in header! |
|
| 245 | + |
|
| 246 | + $arrayofkeytoalwayskeep=array('DIRECTION','FONTFORPDF','FONTSIZEFORPDF','SeparatorDecimal','SeparatorThousand'); |
|
| 247 | + |
|
| 248 | + |
|
| 249 | + if ( $handle = fopen($lPrimaryFile, 'r') ) |
|
| 250 | + { |
|
| 251 | + if ( ! $oh = fopen($output, 'w') ) |
|
| 252 | + { |
|
| 253 | + print "ERROR in writing to file $output\n"; |
|
| 254 | + exit; |
|
| 255 | + } |
|
| 256 | + |
|
| 257 | + print "Read Primary File $lPrimaryFile and write ".$output.":\n"; |
|
| 258 | + |
|
| 259 | + fwrite($oh, "# Dolibarr language file - Source file is en_US - ".(preg_replace('/\.lang$/','',$fileToProcess))."\n"); |
|
| 260 | + |
|
| 261 | + $cnt = 0; |
|
| 262 | + while (($line = fgets($handle)) !== false) |
|
| 263 | + { |
|
| 264 | + $cnt++; |
|
| 265 | + |
|
| 266 | + // strip comments |
|
| 267 | + if ( preg_match("/^\w*#/", $line) ) { |
|
| 268 | + continue; |
|
| 269 | + } |
|
| 270 | + // strip empty lines |
|
| 271 | + if ( preg_match("/^\w*$/", $line) ) { |
|
| 272 | + continue; |
|
| 273 | + } |
|
| 274 | + |
|
| 275 | + $a = mb_split('=', trim($line), 2); |
|
| 276 | + if ( count($a) != 2 ) { |
|
| 277 | + print "ERROR in file $lPrimaryFile, line $cnt: " . trim($line) . "\n"; |
|
| 278 | + continue; |
|
| 279 | + } |
|
| 280 | + |
|
| 281 | + list($key, $value) = $a; |
|
| 282 | + |
|
| 283 | + // key is redundant |
|
| 284 | + if ( array_key_exists($key, $aPrimary) ) { |
|
| 285 | + print "Key $key is redundant in file $lPrimaryFile (line: $cnt) - Already found into ".$fileFirstFound[$key]." (line: ".$lineFirstFound[$key].").\n"; |
|
| 286 | + continue; |
|
| 287 | + } |
|
| 288 | + else |
|
| 289 | + { |
|
| 290 | + $fileFirstFound[$key] = $fileToProcess; |
|
| 291 | + $lineFirstFound[$key] = $cnt; |
|
| 292 | + } |
|
| 293 | + |
|
| 294 | + // String has no value |
|
| 295 | + if ( $value == '' ) { |
|
| 296 | + print "Key $key has no value in file $lPrimaryFile (line: $cnt).\n"; |
|
| 297 | + continue; |
|
| 298 | + } |
|
| 299 | + |
|
| 300 | + $aPrimary[$key] = trim($value); |
|
| 301 | + $fileFirstFound[$key] = $fileToProcess; |
|
| 302 | + $lineFirstFound[$key] = $cnt; |
|
| 303 | + |
|
| 304 | + // ----- Process output now ----- |
|
| 305 | + |
|
| 306 | + //print "Found primary key = ".$key."\n"; |
|
| 307 | + |
|
| 308 | + // Key not in other file |
|
| 309 | + if (in_array($key, $arrayofkeytoalwayskeep) || preg_match('/^FormatDate/',$key) || preg_match('/^FormatHour/',$key)) |
|
| 310 | + { |
|
| 311 | + //print "Key $key is a key we always want to see into secondary file (line: $cnt).\n"; |
|
| 312 | + } |
|
| 313 | + else if ( ! array_key_exists($key, $aSecondary)) |
|
| 314 | + { |
|
| 315 | + //print "Key $key does NOT exist in secondary language (line: $cnt).\n"; |
|
| 316 | + continue; |
|
| 317 | + } |
|
| 318 | + |
|
| 319 | + // String exists in both files and value into alternative language differs from main language but also from english files |
|
| 320 | + if ( |
|
| 321 | + (! empty($aSecondary[$key]) && $aSecondary[$key] != $aPrimary[$key] |
|
| 322 | + && ! empty($aEnglish[$key]) && $aSecondary[$key] != $aEnglish[$key]) |
|
| 323 | + || in_array($key, $arrayofkeytoalwayskeep) || preg_match('/^FormatDate/',$key) || preg_match('/^FormatHour/',$key) |
|
| 324 | + ) |
|
| 325 | + { |
|
| 326 | + //print "Key $key differs (aSecondary=".$aSecondary[$key].", aPrimary=".$aPrimary[$key].", aEnglish=".$aEnglish[$key].") so we add it into new secondary language (line: $cnt).\n"; |
|
| 327 | + fwrite($oh, $key."=".(empty($aSecondary[$key])?$aPrimary[$key]:$aSecondary[$key])."\n"); |
|
| 328 | + } |
|
| 329 | + } |
|
| 330 | + if ( ! feof($handle) ) { |
|
| 331 | + $rc = 7; |
|
| 332 | + $msg = "Unexpected fgets() fail"; |
|
| 333 | + print $msg . " (rc=$rc).\n"; |
|
| 334 | + exit($rc); |
|
| 335 | + } |
|
| 336 | + fclose($oh); |
|
| 337 | + fclose($handle); |
|
| 338 | + } |
|
| 339 | + else { |
|
| 340 | + $rc = 8; |
|
| 341 | + $msg = "Cannot open file $lPrimaryFile"; |
|
| 342 | + print $msg . " (rc=$rc).\n"; |
|
| 343 | + exit($rc); |
|
| 344 | + } |
|
| 345 | + |
|
| 346 | + print "Output can be found at $output.\n"; |
|
| 347 | + |
|
| 348 | + print "To rename all .delta files, you can do:\n"; |
|
| 349 | + print '> for fic in `ls htdocs/langs/'.$lSecondary.'/*.delta`; do f=`echo $fic | sed -e \'s/\.delta//\'`; echo $f; mv $f.delta $f; done'."\n"; |
|
| 350 | 350 | } |
| 351 | 351 | |
| 352 | 352 | |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | |
| 47 | 47 | $sapi_type = php_sapi_name(); |
| 48 | 48 | $script_file = basename(__FILE__); |
| 49 | -$path=dirname(__FILE__).'/'; |
|
| 49 | +$path = dirname(__FILE__).'/'; |
|
| 50 | 50 | |
| 51 | 51 | // Test if batch mode |
| 52 | 52 | if (substr($sapi_type, 0, 3) == 'cgi') { |
@@ -58,17 +58,17 @@ discard block |
||
| 58 | 58 | |
| 59 | 59 | // Get and check arguments |
| 60 | 60 | |
| 61 | -$lPrimary = isset($argv[1])?$argv[1]:''; |
|
| 62 | -$lSecondary = isset($argv[2])?$argv[2]:''; |
|
| 61 | +$lPrimary = isset($argv[1]) ? $argv[1] : ''; |
|
| 62 | +$lSecondary = isset($argv[2]) ? $argv[2] : ''; |
|
| 63 | 63 | $lEnglish = 'en_US'; |
| 64 | -$filesToProcess = isset($argv[3])?$argv[3]:''; |
|
| 64 | +$filesToProcess = isset($argv[3]) ? $argv[3] : ''; |
|
| 65 | 65 | |
| 66 | 66 | if (empty($lPrimary) || empty($lSecondary) || empty($filesToProcess)) |
| 67 | 67 | { |
| 68 | 68 | $rc = 1; |
| 69 | 69 | $msg = '***** Script to clean language files *****'."\n"; |
| 70 | - $msg.= 'Usage: ./dev/translation/strip_language_file.php xx_XX xx_YY [file.lang|all]'."\n"; |
|
| 71 | - print $msg . "(rc=$rc).\n"; |
|
| 70 | + $msg .= 'Usage: ./dev/translation/strip_language_file.php xx_XX xx_YY [file.lang|all]'."\n"; |
|
| 71 | + print $msg."(rc=$rc).\n"; |
|
| 72 | 72 | exit($rc); |
| 73 | 73 | } |
| 74 | 74 | |
@@ -80,53 +80,53 @@ discard block |
||
| 80 | 80 | if ($filesToProcess == 'all') |
| 81 | 81 | { |
| 82 | 82 | $dir = new DirectoryIterator('htdocs/langs/'.$lPrimary); |
| 83 | - while($dir->valid()) { |
|
| 84 | - if(!$dir->isDot() && $dir->isFile() && ! preg_match('/^\./',$dir->getFilename())) { |
|
| 85 | - $files[] = $dir->getFilename(); |
|
| 83 | + while ($dir->valid()) { |
|
| 84 | + if (!$dir->isDot() && $dir->isFile() && !preg_match('/^\./', $dir->getFilename())) { |
|
| 85 | + $files[] = $dir->getFilename(); |
|
| 86 | 86 | } |
| 87 | 87 | $dir->next(); |
| 88 | 88 | } |
| 89 | - $filesToProcess=$files; |
|
| 89 | + $filesToProcess = $files; |
|
| 90 | 90 | } |
| 91 | -else $filesToProcess=explode(',',$filesToProcess); |
|
| 91 | +else $filesToProcess = explode(',', $filesToProcess); |
|
| 92 | 92 | |
| 93 | 93 | // Arguments should be OK here. |
| 94 | 94 | |
| 95 | 95 | |
| 96 | 96 | // Loop on each file |
| 97 | -foreach($filesToProcess as $fileToProcess) |
|
| 97 | +foreach ($filesToProcess as $fileToProcess) |
|
| 98 | 98 | { |
| 99 | 99 | $lPrimaryFile = 'htdocs/langs/'.$lPrimary.'/'.$fileToProcess; |
| 100 | 100 | $lSecondaryFile = 'htdocs/langs/'.$lSecondary.'/'.$fileToProcess; |
| 101 | 101 | $lEnglishFile = 'htdocs/langs/'.$lEnglish.'/'.$fileToProcess; |
| 102 | - $output = $lSecondaryFile . '.delta'; |
|
| 102 | + $output = $lSecondaryFile.'.delta'; |
|
| 103 | 103 | |
| 104 | 104 | print "---- Process language file ".$lSecondaryFile."\n"; |
| 105 | 105 | |
| 106 | - if ( ! is_readable($lPrimaryFile) ) { |
|
| 106 | + if (!is_readable($lPrimaryFile)) { |
|
| 107 | 107 | $rc = 2; |
| 108 | 108 | $msg = "Cannot read primary language file $lPrimaryFile."; |
| 109 | - print $msg . " (rc=$rc).\n"; |
|
| 109 | + print $msg." (rc=$rc).\n"; |
|
| 110 | 110 | exit($rc); |
| 111 | 111 | } |
| 112 | 112 | |
| 113 | - if ( ! is_readable($lSecondaryFile) ) { |
|
| 113 | + if (!is_readable($lSecondaryFile)) { |
|
| 114 | 114 | $rc = 3; |
| 115 | 115 | $msg = "Cannot read secondary language file $lSecondaryFile. We discard this file."; |
| 116 | - print $msg . "\n"; |
|
| 116 | + print $msg."\n"; |
|
| 117 | 117 | continue; |
| 118 | 118 | } |
| 119 | 119 | |
| 120 | - if ( ! is_readable($lEnglishFile) ) { |
|
| 120 | + if (!is_readable($lEnglishFile)) { |
|
| 121 | 121 | $rc = 3; |
| 122 | 122 | $msg = "Cannot read english language file $lEnglishFile. We discard this file."; |
| 123 | - print $msg . "\n"; |
|
| 123 | + print $msg."\n"; |
|
| 124 | 124 | continue; |
| 125 | 125 | } |
| 126 | 126 | |
| 127 | 127 | // Start reading and parsing Secondary |
| 128 | 128 | |
| 129 | - if ( $handle = fopen($lSecondaryFile, 'r') ) |
|
| 129 | + if ($handle = fopen($lSecondaryFile, 'r')) |
|
| 130 | 130 | { |
| 131 | 131 | print "Read Secondary File $lSecondaryFile:\n"; |
| 132 | 132 | $cnt = 0; |
@@ -135,41 +135,41 @@ discard block |
||
| 135 | 135 | $cnt++; |
| 136 | 136 | |
| 137 | 137 | // strip comments |
| 138 | - if ( preg_match("/^\w*#/", $line) ) { |
|
| 138 | + if (preg_match("/^\w*#/", $line)) { |
|
| 139 | 139 | continue; |
| 140 | 140 | } |
| 141 | 141 | // strip empty lines |
| 142 | - if ( preg_match("/^\w*$/", $line) ) { |
|
| 142 | + if (preg_match("/^\w*$/", $line)) { |
|
| 143 | 143 | continue; |
| 144 | 144 | } |
| 145 | 145 | |
| 146 | 146 | $a = mb_split('=', trim($line), 2); |
| 147 | - if ( count($a) != 2 ) { |
|
| 148 | - print "ERROR in file $lSecondaryFile, line $cnt: " . trim($line) . "\n"; |
|
| 147 | + if (count($a) != 2) { |
|
| 148 | + print "ERROR in file $lSecondaryFile, line $cnt: ".trim($line)."\n"; |
|
| 149 | 149 | continue; |
| 150 | 150 | } |
| 151 | 151 | |
| 152 | 152 | list($key, $value) = $a; |
| 153 | 153 | |
| 154 | 154 | // key is redundant |
| 155 | - if ( array_key_exists($key, $aSecondary) ) { |
|
| 155 | + if (array_key_exists($key, $aSecondary)) { |
|
| 156 | 156 | print "Key $key is redundant in file $lSecondaryFile (line: $cnt).\n"; |
| 157 | 157 | continue; |
| 158 | 158 | } |
| 159 | 159 | |
| 160 | 160 | // String has no value |
| 161 | - if ( $value == '' ) { |
|
| 161 | + if ($value == '') { |
|
| 162 | 162 | print "Key $key has no value in file $lSecondaryFile (line: $cnt).\n"; |
| 163 | 163 | continue; |
| 164 | 164 | } |
| 165 | 165 | |
| 166 | 166 | $aSecondary[$key] = trim($value); |
| 167 | 167 | } |
| 168 | - if ( ! feof($handle) ) |
|
| 168 | + if (!feof($handle)) |
|
| 169 | 169 | { |
| 170 | 170 | $rc = 5; |
| 171 | 171 | $msg = "Unexpected fgets() fail"; |
| 172 | - print $msg . " (rc=$rc).\n"; |
|
| 172 | + print $msg." (rc=$rc).\n"; |
|
| 173 | 173 | exit($rc); |
| 174 | 174 | } |
| 175 | 175 | fclose($handle); |
@@ -177,14 +177,14 @@ discard block |
||
| 177 | 177 | else { |
| 178 | 178 | $rc = 6; |
| 179 | 179 | $msg = "Cannot open file $lSecondaryFile"; |
| 180 | - print $msg . " (rc=$rc).\n"; |
|
| 180 | + print $msg." (rc=$rc).\n"; |
|
| 181 | 181 | exit($rc); |
| 182 | 182 | } |
| 183 | 183 | |
| 184 | 184 | |
| 185 | 185 | // Start reading and parsing English |
| 186 | 186 | |
| 187 | - if ( $handle = fopen($lEnglishFile, 'r') ) |
|
| 187 | + if ($handle = fopen($lEnglishFile, 'r')) |
|
| 188 | 188 | { |
| 189 | 189 | print "Read English File $lEnglishFile:\n"; |
| 190 | 190 | $cnt = 0; |
@@ -193,41 +193,41 @@ discard block |
||
| 193 | 193 | $cnt++; |
| 194 | 194 | |
| 195 | 195 | // strip comments |
| 196 | - if ( preg_match("/^\w*#/", $line) ) { |
|
| 196 | + if (preg_match("/^\w*#/", $line)) { |
|
| 197 | 197 | continue; |
| 198 | 198 | } |
| 199 | 199 | // strip empty lines |
| 200 | - if ( preg_match("/^\w*$/", $line) ) { |
|
| 200 | + if (preg_match("/^\w*$/", $line)) { |
|
| 201 | 201 | continue; |
| 202 | 202 | } |
| 203 | 203 | |
| 204 | 204 | $a = mb_split('=', trim($line), 2); |
| 205 | - if ( count($a) != 2 ) { |
|
| 206 | - print "ERROR in file $lEnglishFile, line $cnt: " . trim($line) . "\n"; |
|
| 205 | + if (count($a) != 2) { |
|
| 206 | + print "ERROR in file $lEnglishFile, line $cnt: ".trim($line)."\n"; |
|
| 207 | 207 | continue; |
| 208 | 208 | } |
| 209 | 209 | |
| 210 | 210 | list($key, $value) = $a; |
| 211 | 211 | |
| 212 | 212 | // key is redundant |
| 213 | - if ( array_key_exists($key, $aEnglish) ) { |
|
| 213 | + if (array_key_exists($key, $aEnglish)) { |
|
| 214 | 214 | print "Key $key is redundant in file $lEnglishFile (line: $cnt).\n"; |
| 215 | 215 | continue; |
| 216 | 216 | } |
| 217 | 217 | |
| 218 | 218 | // String has no value |
| 219 | - if ( $value == '' ) { |
|
| 219 | + if ($value == '') { |
|
| 220 | 220 | print "Key $key has no value in file $lEnglishFile (line: $cnt).\n"; |
| 221 | 221 | continue; |
| 222 | 222 | } |
| 223 | 223 | |
| 224 | 224 | $aEnglish[$key] = trim($value); |
| 225 | 225 | } |
| 226 | - if ( ! feof($handle) ) |
|
| 226 | + if (!feof($handle)) |
|
| 227 | 227 | { |
| 228 | 228 | $rc = 5; |
| 229 | 229 | $msg = "Unexpected fgets() fail"; |
| 230 | - print $msg . " (rc=$rc).\n"; |
|
| 230 | + print $msg." (rc=$rc).\n"; |
|
| 231 | 231 | exit($rc); |
| 232 | 232 | } |
| 233 | 233 | fclose($handle); |
@@ -235,7 +235,7 @@ discard block |
||
| 235 | 235 | else { |
| 236 | 236 | $rc = 6; |
| 237 | 237 | $msg = "Cannot open file $lEnglishFile"; |
| 238 | - print $msg . " (rc=$rc).\n"; |
|
| 238 | + print $msg." (rc=$rc).\n"; |
|
| 239 | 239 | exit($rc); |
| 240 | 240 | } |
| 241 | 241 | |
@@ -243,12 +243,12 @@ discard block |
||
| 243 | 243 | |
| 244 | 244 | // Start reading and parsing Primary. See rules in header! |
| 245 | 245 | |
| 246 | - $arrayofkeytoalwayskeep=array('DIRECTION','FONTFORPDF','FONTSIZEFORPDF','SeparatorDecimal','SeparatorThousand'); |
|
| 246 | + $arrayofkeytoalwayskeep = array('DIRECTION', 'FONTFORPDF', 'FONTSIZEFORPDF', 'SeparatorDecimal', 'SeparatorThousand'); |
|
| 247 | 247 | |
| 248 | 248 | |
| 249 | - if ( $handle = fopen($lPrimaryFile, 'r') ) |
|
| 249 | + if ($handle = fopen($lPrimaryFile, 'r')) |
|
| 250 | 250 | { |
| 251 | - if ( ! $oh = fopen($output, 'w') ) |
|
| 251 | + if (!$oh = fopen($output, 'w')) |
|
| 252 | 252 | { |
| 253 | 253 | print "ERROR in writing to file $output\n"; |
| 254 | 254 | exit; |
@@ -256,7 +256,7 @@ discard block |
||
| 256 | 256 | |
| 257 | 257 | print "Read Primary File $lPrimaryFile and write ".$output.":\n"; |
| 258 | 258 | |
| 259 | - fwrite($oh, "# Dolibarr language file - Source file is en_US - ".(preg_replace('/\.lang$/','',$fileToProcess))."\n"); |
|
| 259 | + fwrite($oh, "# Dolibarr language file - Source file is en_US - ".(preg_replace('/\.lang$/', '', $fileToProcess))."\n"); |
|
| 260 | 260 | |
| 261 | 261 | $cnt = 0; |
| 262 | 262 | while (($line = fgets($handle)) !== false) |
@@ -264,24 +264,24 @@ discard block |
||
| 264 | 264 | $cnt++; |
| 265 | 265 | |
| 266 | 266 | // strip comments |
| 267 | - if ( preg_match("/^\w*#/", $line) ) { |
|
| 267 | + if (preg_match("/^\w*#/", $line)) { |
|
| 268 | 268 | continue; |
| 269 | 269 | } |
| 270 | 270 | // strip empty lines |
| 271 | - if ( preg_match("/^\w*$/", $line) ) { |
|
| 271 | + if (preg_match("/^\w*$/", $line)) { |
|
| 272 | 272 | continue; |
| 273 | 273 | } |
| 274 | 274 | |
| 275 | 275 | $a = mb_split('=', trim($line), 2); |
| 276 | - if ( count($a) != 2 ) { |
|
| 277 | - print "ERROR in file $lPrimaryFile, line $cnt: " . trim($line) . "\n"; |
|
| 276 | + if (count($a) != 2) { |
|
| 277 | + print "ERROR in file $lPrimaryFile, line $cnt: ".trim($line)."\n"; |
|
| 278 | 278 | continue; |
| 279 | 279 | } |
| 280 | 280 | |
| 281 | 281 | list($key, $value) = $a; |
| 282 | 282 | |
| 283 | 283 | // key is redundant |
| 284 | - if ( array_key_exists($key, $aPrimary) ) { |
|
| 284 | + if (array_key_exists($key, $aPrimary)) { |
|
| 285 | 285 | print "Key $key is redundant in file $lPrimaryFile (line: $cnt) - Already found into ".$fileFirstFound[$key]." (line: ".$lineFirstFound[$key].").\n"; |
| 286 | 286 | continue; |
| 287 | 287 | } |
@@ -292,7 +292,7 @@ discard block |
||
| 292 | 292 | } |
| 293 | 293 | |
| 294 | 294 | // String has no value |
| 295 | - if ( $value == '' ) { |
|
| 295 | + if ($value == '') { |
|
| 296 | 296 | print "Key $key has no value in file $lPrimaryFile (line: $cnt).\n"; |
| 297 | 297 | continue; |
| 298 | 298 | } |
@@ -306,11 +306,11 @@ discard block |
||
| 306 | 306 | //print "Found primary key = ".$key."\n"; |
| 307 | 307 | |
| 308 | 308 | // Key not in other file |
| 309 | - if (in_array($key, $arrayofkeytoalwayskeep) || preg_match('/^FormatDate/',$key) || preg_match('/^FormatHour/',$key)) |
|
| 309 | + if (in_array($key, $arrayofkeytoalwayskeep) || preg_match('/^FormatDate/', $key) || preg_match('/^FormatHour/', $key)) |
|
| 310 | 310 | { |
| 311 | 311 | //print "Key $key is a key we always want to see into secondary file (line: $cnt).\n"; |
| 312 | 312 | } |
| 313 | - else if ( ! array_key_exists($key, $aSecondary)) |
|
| 313 | + else if (!array_key_exists($key, $aSecondary)) |
|
| 314 | 314 | { |
| 315 | 315 | //print "Key $key does NOT exist in secondary language (line: $cnt).\n"; |
| 316 | 316 | continue; |
@@ -318,19 +318,19 @@ discard block |
||
| 318 | 318 | |
| 319 | 319 | // String exists in both files and value into alternative language differs from main language but also from english files |
| 320 | 320 | if ( |
| 321 | - (! empty($aSecondary[$key]) && $aSecondary[$key] != $aPrimary[$key] |
|
| 322 | - && ! empty($aEnglish[$key]) && $aSecondary[$key] != $aEnglish[$key]) |
|
| 323 | - || in_array($key, $arrayofkeytoalwayskeep) || preg_match('/^FormatDate/',$key) || preg_match('/^FormatHour/',$key) |
|
| 321 | + (!empty($aSecondary[$key]) && $aSecondary[$key] != $aPrimary[$key] |
|
| 322 | + && !empty($aEnglish[$key]) && $aSecondary[$key] != $aEnglish[$key]) |
|
| 323 | + || in_array($key, $arrayofkeytoalwayskeep) || preg_match('/^FormatDate/', $key) || preg_match('/^FormatHour/', $key) |
|
| 324 | 324 | ) |
| 325 | 325 | { |
| 326 | 326 | //print "Key $key differs (aSecondary=".$aSecondary[$key].", aPrimary=".$aPrimary[$key].", aEnglish=".$aEnglish[$key].") so we add it into new secondary language (line: $cnt).\n"; |
| 327 | - fwrite($oh, $key."=".(empty($aSecondary[$key])?$aPrimary[$key]:$aSecondary[$key])."\n"); |
|
| 327 | + fwrite($oh, $key."=".(empty($aSecondary[$key]) ? $aPrimary[$key] : $aSecondary[$key])."\n"); |
|
| 328 | 328 | } |
| 329 | 329 | } |
| 330 | - if ( ! feof($handle) ) { |
|
| 330 | + if (!feof($handle)) { |
|
| 331 | 331 | $rc = 7; |
| 332 | 332 | $msg = "Unexpected fgets() fail"; |
| 333 | - print $msg . " (rc=$rc).\n"; |
|
| 333 | + print $msg." (rc=$rc).\n"; |
|
| 334 | 334 | exit($rc); |
| 335 | 335 | } |
| 336 | 336 | fclose($oh); |
@@ -339,7 +339,7 @@ discard block |
||
| 339 | 339 | else { |
| 340 | 340 | $rc = 8; |
| 341 | 341 | $msg = "Cannot open file $lPrimaryFile"; |
| 342 | - print $msg . " (rc=$rc).\n"; |
|
| 342 | + print $msg." (rc=$rc).\n"; |
|
| 343 | 343 | exit($rc); |
| 344 | 344 | } |
| 345 | 345 | |
@@ -87,8 +87,9 @@ discard block |
||
| 87 | 87 | $dir->next(); |
| 88 | 88 | } |
| 89 | 89 | $filesToProcess=$files; |
| 90 | +} else { |
|
| 91 | + $filesToProcess=explode(',',$filesToProcess); |
|
| 90 | 92 | } |
| 91 | -else $filesToProcess=explode(',',$filesToProcess); |
|
| 92 | 93 | |
| 93 | 94 | // Arguments should be OK here. |
| 94 | 95 | |
@@ -173,8 +174,7 @@ discard block |
||
| 173 | 174 | exit($rc); |
| 174 | 175 | } |
| 175 | 176 | fclose($handle); |
| 176 | - } |
|
| 177 | - else { |
|
| 177 | + } else { |
|
| 178 | 178 | $rc = 6; |
| 179 | 179 | $msg = "Cannot open file $lSecondaryFile"; |
| 180 | 180 | print $msg . " (rc=$rc).\n"; |
@@ -231,8 +231,7 @@ discard block |
||
| 231 | 231 | exit($rc); |
| 232 | 232 | } |
| 233 | 233 | fclose($handle); |
| 234 | - } |
|
| 235 | - else { |
|
| 234 | + } else { |
|
| 236 | 235 | $rc = 6; |
| 237 | 236 | $msg = "Cannot open file $lEnglishFile"; |
| 238 | 237 | print $msg . " (rc=$rc).\n"; |
@@ -284,8 +283,7 @@ discard block |
||
| 284 | 283 | if ( array_key_exists($key, $aPrimary) ) { |
| 285 | 284 | print "Key $key is redundant in file $lPrimaryFile (line: $cnt) - Already found into ".$fileFirstFound[$key]." (line: ".$lineFirstFound[$key].").\n"; |
| 286 | 285 | continue; |
| 287 | - } |
|
| 288 | - else |
|
| 286 | + } else |
|
| 289 | 287 | { |
| 290 | 288 | $fileFirstFound[$key] = $fileToProcess; |
| 291 | 289 | $lineFirstFound[$key] = $cnt; |
@@ -309,8 +307,7 @@ discard block |
||
| 309 | 307 | if (in_array($key, $arrayofkeytoalwayskeep) || preg_match('/^FormatDate/',$key) || preg_match('/^FormatHour/',$key)) |
| 310 | 308 | { |
| 311 | 309 | //print "Key $key is a key we always want to see into secondary file (line: $cnt).\n"; |
| 312 | - } |
|
| 313 | - else if ( ! array_key_exists($key, $aSecondary)) |
|
| 310 | + } else if ( ! array_key_exists($key, $aSecondary)) |
|
| 314 | 311 | { |
| 315 | 312 | //print "Key $key does NOT exist in secondary language (line: $cnt).\n"; |
| 316 | 313 | continue; |
@@ -335,8 +332,7 @@ discard block |
||
| 335 | 332 | } |
| 336 | 333 | fclose($oh); |
| 337 | 334 | fclose($handle); |
| 338 | - } |
|
| 339 | - else { |
|
| 335 | + } else { |
|
| 340 | 336 | $rc = 8; |
| 341 | 337 | $msg = "Cannot open file $lPrimaryFile"; |
| 342 | 338 | print $msg . " (rc=$rc).\n"; |
@@ -107,8 +107,8 @@ discard block |
||
| 107 | 107 | $files = scandir($workdir); |
| 108 | 108 | if (empty($files)) |
| 109 | 109 | { |
| 110 | - echo "Can't scan workdir = ".$workdir; |
|
| 111 | - exit; |
|
| 110 | + echo "Can't scan workdir = ".$workdir; |
|
| 111 | + exit; |
|
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | $dups=array(); |
@@ -122,38 +122,38 @@ discard block |
||
| 122 | 122 | $langstrings_3d = array(); |
| 123 | 123 | $langstrings_full = array(); |
| 124 | 124 | foreach ($files AS $file) { |
| 125 | - $path_file = pathinfo($file); |
|
| 126 | - // we're only interested in .lang files |
|
| 127 | - if ($path_file['extension']=='lang') { |
|
| 128 | - $content = file($workdir.$file); |
|
| 129 | - foreach ($content AS $line => $row) { |
|
| 130 | - // don't want comment lines |
|
| 131 | - if (substr($row,0,1) !== '#') { |
|
| 132 | - // don't want lines without the separator (why should those even be here, anyway...) |
|
| 133 | - if (strpos($row,'=')!==false) { |
|
| 134 | - $row_array = explode('=',$row); // $row_array[0] = key |
|
| 135 | - $langstrings_3d[$path_file['basename']][$line+1]=$row_array[0]; |
|
| 136 | - $langstrings_3dtrans[$path_file['basename']][$line+1]=$row_array[1]; |
|
| 137 | - $langstrings_full[]=$row_array[0]; |
|
| 138 | - $langstrings_dist[$row_array[0]]=$row; |
|
| 139 | - } |
|
| 140 | - } |
|
| 141 | - } |
|
| 142 | - } |
|
| 125 | + $path_file = pathinfo($file); |
|
| 126 | + // we're only interested in .lang files |
|
| 127 | + if ($path_file['extension']=='lang') { |
|
| 128 | + $content = file($workdir.$file); |
|
| 129 | + foreach ($content AS $line => $row) { |
|
| 130 | + // don't want comment lines |
|
| 131 | + if (substr($row,0,1) !== '#') { |
|
| 132 | + // don't want lines without the separator (why should those even be here, anyway...) |
|
| 133 | + if (strpos($row,'=')!==false) { |
|
| 134 | + $row_array = explode('=',$row); // $row_array[0] = key |
|
| 135 | + $langstrings_3d[$path_file['basename']][$line+1]=$row_array[0]; |
|
| 136 | + $langstrings_3dtrans[$path_file['basename']][$line+1]=$row_array[1]; |
|
| 137 | + $langstrings_full[]=$row_array[0]; |
|
| 138 | + $langstrings_dist[$row_array[0]]=$row; |
|
| 139 | + } |
|
| 140 | + } |
|
| 141 | + } |
|
| 142 | + } |
|
| 143 | 143 | } |
| 144 | 144 | |
| 145 | 145 | foreach ($langstrings_3d AS $filename => $file) |
| 146 | 146 | { |
| 147 | - foreach ($file AS $linenum => $value) |
|
| 148 | - { |
|
| 149 | - $keys = array_keys($langstrings_full, $value); |
|
| 150 | - if (count($keys)>1) |
|
| 151 | - { |
|
| 152 | - foreach ($keys AS $key) { |
|
| 153 | - $dups[$value][$filename][$linenum] = trim($langstrings_3dtrans[$filename][$linenum]); |
|
| 154 | - } |
|
| 155 | - } |
|
| 156 | - } |
|
| 147 | + foreach ($file AS $linenum => $value) |
|
| 148 | + { |
|
| 149 | + $keys = array_keys($langstrings_full, $value); |
|
| 150 | + if (count($keys)>1) |
|
| 151 | + { |
|
| 152 | + foreach ($keys AS $key) { |
|
| 153 | + $dups[$value][$filename][$linenum] = trim($langstrings_3dtrans[$filename][$linenum]); |
|
| 154 | + } |
|
| 155 | + } |
|
| 156 | + } |
|
| 157 | 157 | } |
| 158 | 158 | |
| 159 | 159 | if ($web) print "<h2>"; |
@@ -175,49 +175,49 @@ discard block |
||
| 175 | 175 | $count = 0; |
| 176 | 176 | foreach ($dups as $string => $pages) |
| 177 | 177 | { |
| 178 | - $count++; |
|
| 179 | - $s=''; |
|
| 180 | - |
|
| 181 | - // Keyword $string |
|
| 182 | - if ($web) $s.="<tr>"; |
|
| 183 | - if ($web) $s.="<td align=\"center\">"; |
|
| 184 | - if ($web) $s.=$count; |
|
| 185 | - if ($web) $s.="</td>"; |
|
| 186 | - if ($web) $s.="<td>"; |
|
| 187 | - $s.=$string; |
|
| 188 | - if ($web) $s.="</td>"; |
|
| 189 | - if ($web) $s.="<td>"; |
|
| 190 | - if (! $web) $s.= ' : '; |
|
| 191 | - |
|
| 192 | - // Loop on each files keyword was found |
|
| 178 | + $count++; |
|
| 179 | + $s=''; |
|
| 180 | + |
|
| 181 | + // Keyword $string |
|
| 182 | + if ($web) $s.="<tr>"; |
|
| 183 | + if ($web) $s.="<td align=\"center\">"; |
|
| 184 | + if ($web) $s.=$count; |
|
| 185 | + if ($web) $s.="</td>"; |
|
| 186 | + if ($web) $s.="<td>"; |
|
| 187 | + $s.=$string; |
|
| 188 | + if ($web) $s.="</td>"; |
|
| 189 | + if ($web) $s.="<td>"; |
|
| 190 | + if (! $web) $s.= ' : '; |
|
| 191 | + |
|
| 192 | + // Loop on each files keyword was found |
|
| 193 | 193 | $duplicateinsamefile=0; |
| 194 | - $inmain=0; |
|
| 194 | + $inmain=0; |
|
| 195 | 195 | $inadmin=0; |
| 196 | - foreach ($pages AS $file => $lines) |
|
| 197 | - { |
|
| 196 | + foreach ($pages AS $file => $lines) |
|
| 197 | + { |
|
| 198 | 198 | if ($file == 'main.lang') { $inmain=1; $inadmin=0; } |
| 199 | 199 | if ($file == 'admin.lang' && ! $inmain) { $inadmin=1; } |
| 200 | 200 | |
| 201 | - $s.=$file." "; |
|
| 201 | + $s.=$file." "; |
|
| 202 | 202 | |
| 203 | - // Loop on each line keword was found into file. |
|
| 204 | - $listoffilesforthisentry=array(); |
|
| 205 | - foreach ($lines as $line => $translatedvalue) |
|
| 206 | - { |
|
| 203 | + // Loop on each line keword was found into file. |
|
| 204 | + $listoffilesforthisentry=array(); |
|
| 205 | + foreach ($lines as $line => $translatedvalue) |
|
| 206 | + { |
|
| 207 | 207 | if (! empty($listoffilesforthisentry[$file])) $duplicateinsamefile=1; |
| 208 | 208 | $listoffilesforthisentry[$file]=1; |
| 209 | 209 | |
| 210 | - $s.= "(".$line." - ".htmlentities($translatedvalue).") "; |
|
| 211 | - } |
|
| 212 | - if ($web) $s.="<br>"; |
|
| 213 | - } |
|
| 214 | - if ($web) $s.="</td></tr>"; |
|
| 215 | - $s.="\n"; |
|
| 216 | - |
|
| 217 | - if ($duplicateinsamefile) $sduplicateinsamefile .= $s; |
|
| 218 | - else if ($inmain) $sinmainandother .= $s; |
|
| 219 | - else if ($inadmin) $sininstallandadmin .= $s; |
|
| 220 | - else $sother .= $s; |
|
| 210 | + $s.= "(".$line." - ".htmlentities($translatedvalue).") "; |
|
| 211 | + } |
|
| 212 | + if ($web) $s.="<br>"; |
|
| 213 | + } |
|
| 214 | + if ($web) $s.="</td></tr>"; |
|
| 215 | + $s.="\n"; |
|
| 216 | + |
|
| 217 | + if ($duplicateinsamefile) $sduplicateinsamefile .= $s; |
|
| 218 | + else if ($inmain) $sinmainandother .= $s; |
|
| 219 | + else if ($inadmin) $sininstallandadmin .= $s; |
|
| 220 | + else $sother .= $s; |
|
| 221 | 221 | } |
| 222 | 222 | |
| 223 | 223 | if (! $web) print "\n***** Entries duplicated in same file\n"; |
@@ -254,122 +254,122 @@ discard block |
||
| 254 | 254 | print "***** Strings in en_US that are never used:\n"; |
| 255 | 255 | |
| 256 | 256 | $unused=array(); |
| 257 | - foreach ($langstrings_dist AS $value => $line) |
|
| 258 | - { |
|
| 259 | - $qualifiedforclean=1; |
|
| 260 | - // Check if we must keep this key to be into file for removal |
|
| 261 | - if (preg_match('/^Module\d+/', $value)) $qualifiedforclean=0; |
|
| 262 | - if (preg_match('/^Permission\d+/', $value)) $qualifiedforclean=0; |
|
| 263 | - if (preg_match('/^PermissionAdvanced\d+/', $value)) $qualifiedforclean=0; |
|
| 264 | - if (preg_match('/^ProfId\d+/', $value)) $qualifiedforclean=0; |
|
| 265 | - if (preg_match('/^Delays_/', $value)) $qualifiedforclean=0; |
|
| 266 | - if (preg_match('/^BarcodeDesc/', $value)) $qualifiedforclean=0; |
|
| 267 | - if (preg_match('/^Extrafield/', $value)) $qualifiedforclean=0; |
|
| 268 | - if (preg_match('/^LocalTax/', $value)) $qualifiedforclean=0; |
|
| 269 | - if (preg_match('/^Country/', $value)) $qualifiedforclean=0; |
|
| 270 | - if (preg_match('/^Civility/', $value)) $qualifiedforclean=0; |
|
| 271 | - if (preg_match('/^Currency/', $value)) $qualifiedforclean=0; |
|
| 272 | - if (preg_match('/^DemandReasonTypeSRC/', $value)) $qualifiedforclean=0; |
|
| 273 | - if (preg_match('/^PaperFormat/', $value)) $qualifiedforclean=0; |
|
| 274 | - if (preg_match('/^Duration/', $value)) $qualifiedforclean=0; |
|
| 275 | - if (preg_match('/^AmountLT/', $value)) $qualifiedforclean=0; |
|
| 276 | - if (preg_match('/^TotalLT/', $value)) $qualifiedforclean=0; |
|
| 277 | - if (preg_match('/^Month/', $value)) $qualifiedforclean=0; |
|
| 278 | - if (preg_match('/^MonthShort/', $value)) $qualifiedforclean=0; |
|
| 279 | - if (preg_match('/^Day\d/', $value)) $qualifiedforclean=0; |
|
| 280 | - if (preg_match('/^Short/', $value)) $qualifiedforclean=0; |
|
| 281 | - if (preg_match('/^ExportDataset_/', $value)) $qualifiedforclean=0; |
|
| 282 | - if (preg_match('/^ImportDataset_/', $value)) $qualifiedforclean=0; |
|
| 283 | - if (preg_match('/^ActionAC_/', $value)) $qualifiedforclean=0; |
|
| 284 | - if (preg_match('/^TypeLocaltax/', $value)) $qualifiedforclean=0; |
|
| 285 | - if (preg_match('/^StatusProspect/', $value)) $qualifiedforclean=0; |
|
| 286 | - if (preg_match('/^PL_/', $value)) $qualifiedforclean=0; |
|
| 287 | - if (preg_match('/^TE_/', $value)) $qualifiedforclean=0; |
|
| 288 | - if (preg_match('/^JuridicalStatus/', $value)) $qualifiedforclean=0; |
|
| 289 | - if (preg_match('/^CalcMode/', $value)) $qualifiedforclean=0; |
|
| 290 | - if (preg_match('/^newLT/', $value)) $qualifiedforclean=0; |
|
| 291 | - if (preg_match('/^LT[0-9]/', $value)) $qualifiedforclean=0; |
|
| 292 | - if (preg_match('/^TypeContact_contrat_/', $value)) $qualifiedforclean=0; |
|
| 293 | - if (preg_match('/^ErrorPriceExpression/', $value)) $qualifiedforclean=0; |
|
| 294 | - if (preg_match('/^Language_/', $value)) $qualifiedforclean=0; |
|
| 295 | - if (preg_match('/^DescADHERENT_/', $value)) $qualifiedforclean=0; |
|
| 296 | - if (preg_match('/^SubmitTranslation/', $value)) $qualifiedforclean=0; |
|
| 297 | - if (preg_match('/^ModuleCompanyCode/', $value)) $qualifiedforclean=0; |
|
| 298 | - if (preg_match('/InDolibarr$/', $value)) $qualifiedforclean=0; |
|
| 299 | - // admin.lang |
|
| 300 | - if (preg_match('/^DAV_ALLOW_PUBLIC_DIR/i', $value)) $qualifiedforclean=0; |
|
| 301 | - if (preg_match('/^DAV_ALLOW_ECM_DIR/i', $value)) $qualifiedforclean=0; |
|
| 302 | - // boxes.lang |
|
| 303 | - if (preg_match('/^BoxTitleLast/', $value)) $qualifiedforclean=0; |
|
| 304 | - if (preg_match('/^BoxTitleLatest/', $value)) $qualifiedforclean=0; |
|
| 305 | - // install.lang |
|
| 306 | - if (preg_match('/^KeepDefaultValues/', $value)) $qualifiedforclean=0; |
|
| 307 | - // mail.lang |
|
| 308 | - if (preg_match('/MailingModuleDesc/i', $value)) $qualifiedforclean=0; |
|
| 309 | - // main.lang |
|
| 310 | - if (preg_match('/^Duration/', $value)) $qualifiedforclean=0; |
|
| 311 | - if (preg_match('/^FormatDate/', $value)) $qualifiedforclean=0; |
|
| 312 | - if (preg_match('/^DateFormat/', $value)) $qualifiedforclean=0; |
|
| 313 | - if (preg_match('/^.b$/', $value)) $qualifiedforclean=0; |
|
| 314 | - if (preg_match('/^.*Bytes$/', $value)) $qualifiedforclean=0; |
|
| 315 | - if (preg_match('/^NoteSomeFeaturesAreDisabled/', $value)) $qualifiedforclean=0; |
|
| 316 | - if (preg_match('/^(DoTest|Under|Limits|Cards|CurrentValue|DateLimit|DateAndHour|NbOfLines|NbOfObjects|NbOfReferes|TotalTTCShort|VATs)/', $value)) $qualifiedforclean=0; |
|
| 317 | - // modulebuilder |
|
| 318 | - if (preg_match('/^ModuleBuilderDesc/', $value)) $qualifiedforclean=0; |
|
| 319 | - // orders |
|
| 320 | - if (preg_match('/^OrderSource/', $value)) $qualifiedforclean=0; |
|
| 321 | - if (preg_match('/^TypeContact_/', $value)) $qualifiedforclean=0; |
|
| 257 | + foreach ($langstrings_dist AS $value => $line) |
|
| 258 | + { |
|
| 259 | + $qualifiedforclean=1; |
|
| 260 | + // Check if we must keep this key to be into file for removal |
|
| 261 | + if (preg_match('/^Module\d+/', $value)) $qualifiedforclean=0; |
|
| 262 | + if (preg_match('/^Permission\d+/', $value)) $qualifiedforclean=0; |
|
| 263 | + if (preg_match('/^PermissionAdvanced\d+/', $value)) $qualifiedforclean=0; |
|
| 264 | + if (preg_match('/^ProfId\d+/', $value)) $qualifiedforclean=0; |
|
| 265 | + if (preg_match('/^Delays_/', $value)) $qualifiedforclean=0; |
|
| 266 | + if (preg_match('/^BarcodeDesc/', $value)) $qualifiedforclean=0; |
|
| 267 | + if (preg_match('/^Extrafield/', $value)) $qualifiedforclean=0; |
|
| 268 | + if (preg_match('/^LocalTax/', $value)) $qualifiedforclean=0; |
|
| 269 | + if (preg_match('/^Country/', $value)) $qualifiedforclean=0; |
|
| 270 | + if (preg_match('/^Civility/', $value)) $qualifiedforclean=0; |
|
| 271 | + if (preg_match('/^Currency/', $value)) $qualifiedforclean=0; |
|
| 272 | + if (preg_match('/^DemandReasonTypeSRC/', $value)) $qualifiedforclean=0; |
|
| 273 | + if (preg_match('/^PaperFormat/', $value)) $qualifiedforclean=0; |
|
| 274 | + if (preg_match('/^Duration/', $value)) $qualifiedforclean=0; |
|
| 275 | + if (preg_match('/^AmountLT/', $value)) $qualifiedforclean=0; |
|
| 276 | + if (preg_match('/^TotalLT/', $value)) $qualifiedforclean=0; |
|
| 277 | + if (preg_match('/^Month/', $value)) $qualifiedforclean=0; |
|
| 278 | + if (preg_match('/^MonthShort/', $value)) $qualifiedforclean=0; |
|
| 279 | + if (preg_match('/^Day\d/', $value)) $qualifiedforclean=0; |
|
| 280 | + if (preg_match('/^Short/', $value)) $qualifiedforclean=0; |
|
| 281 | + if (preg_match('/^ExportDataset_/', $value)) $qualifiedforclean=0; |
|
| 282 | + if (preg_match('/^ImportDataset_/', $value)) $qualifiedforclean=0; |
|
| 283 | + if (preg_match('/^ActionAC_/', $value)) $qualifiedforclean=0; |
|
| 284 | + if (preg_match('/^TypeLocaltax/', $value)) $qualifiedforclean=0; |
|
| 285 | + if (preg_match('/^StatusProspect/', $value)) $qualifiedforclean=0; |
|
| 286 | + if (preg_match('/^PL_/', $value)) $qualifiedforclean=0; |
|
| 287 | + if (preg_match('/^TE_/', $value)) $qualifiedforclean=0; |
|
| 288 | + if (preg_match('/^JuridicalStatus/', $value)) $qualifiedforclean=0; |
|
| 289 | + if (preg_match('/^CalcMode/', $value)) $qualifiedforclean=0; |
|
| 290 | + if (preg_match('/^newLT/', $value)) $qualifiedforclean=0; |
|
| 291 | + if (preg_match('/^LT[0-9]/', $value)) $qualifiedforclean=0; |
|
| 292 | + if (preg_match('/^TypeContact_contrat_/', $value)) $qualifiedforclean=0; |
|
| 293 | + if (preg_match('/^ErrorPriceExpression/', $value)) $qualifiedforclean=0; |
|
| 294 | + if (preg_match('/^Language_/', $value)) $qualifiedforclean=0; |
|
| 295 | + if (preg_match('/^DescADHERENT_/', $value)) $qualifiedforclean=0; |
|
| 296 | + if (preg_match('/^SubmitTranslation/', $value)) $qualifiedforclean=0; |
|
| 297 | + if (preg_match('/^ModuleCompanyCode/', $value)) $qualifiedforclean=0; |
|
| 298 | + if (preg_match('/InDolibarr$/', $value)) $qualifiedforclean=0; |
|
| 299 | + // admin.lang |
|
| 300 | + if (preg_match('/^DAV_ALLOW_PUBLIC_DIR/i', $value)) $qualifiedforclean=0; |
|
| 301 | + if (preg_match('/^DAV_ALLOW_ECM_DIR/i', $value)) $qualifiedforclean=0; |
|
| 302 | + // boxes.lang |
|
| 303 | + if (preg_match('/^BoxTitleLast/', $value)) $qualifiedforclean=0; |
|
| 304 | + if (preg_match('/^BoxTitleLatest/', $value)) $qualifiedforclean=0; |
|
| 305 | + // install.lang |
|
| 306 | + if (preg_match('/^KeepDefaultValues/', $value)) $qualifiedforclean=0; |
|
| 307 | + // mail.lang |
|
| 308 | + if (preg_match('/MailingModuleDesc/i', $value)) $qualifiedforclean=0; |
|
| 309 | + // main.lang |
|
| 310 | + if (preg_match('/^Duration/', $value)) $qualifiedforclean=0; |
|
| 311 | + if (preg_match('/^FormatDate/', $value)) $qualifiedforclean=0; |
|
| 312 | + if (preg_match('/^DateFormat/', $value)) $qualifiedforclean=0; |
|
| 313 | + if (preg_match('/^.b$/', $value)) $qualifiedforclean=0; |
|
| 314 | + if (preg_match('/^.*Bytes$/', $value)) $qualifiedforclean=0; |
|
| 315 | + if (preg_match('/^NoteSomeFeaturesAreDisabled/', $value)) $qualifiedforclean=0; |
|
| 316 | + if (preg_match('/^(DoTest|Under|Limits|Cards|CurrentValue|DateLimit|DateAndHour|NbOfLines|NbOfObjects|NbOfReferes|TotalTTCShort|VATs)/', $value)) $qualifiedforclean=0; |
|
| 317 | + // modulebuilder |
|
| 318 | + if (preg_match('/^ModuleBuilderDesc/', $value)) $qualifiedforclean=0; |
|
| 319 | + // orders |
|
| 320 | + if (preg_match('/^OrderSource/', $value)) $qualifiedforclean=0; |
|
| 321 | + if (preg_match('/^TypeContact_/', $value)) $qualifiedforclean=0; |
|
| 322 | 322 | // other.lang |
| 323 | - if (preg_match('/^Notify_/', $value)) $qualifiedforclean=0; |
|
| 324 | - if (preg_match('/^PredefinedMail/', $value)) $qualifiedforclean=0; |
|
| 325 | - if (preg_match('/^DemoCompany/', $value)) $qualifiedforclean=0; |
|
| 326 | - if (preg_match('/^WeightUnit/', $value)) $qualifiedforclean=0; |
|
| 327 | - if (preg_match('/^LengthUnit/', $value)) $qualifiedforclean=0; |
|
| 328 | - if (preg_match('/^SurfaceUnit/', $value)) $qualifiedforclean=0; |
|
| 329 | - if (preg_match('/^VolumeUnit/', $value)) $qualifiedforclean=0; |
|
| 330 | - if (preg_match('/^SizeUnit/', $value)) $qualifiedforclean=0; |
|
| 331 | - if (preg_match('/^EMailText/', $value)) $qualifiedforclean=0; |
|
| 332 | - if (preg_match('/ById$/', $value)) $qualifiedforclean=0; |
|
| 333 | - if (preg_match('/ByLogin$/', $value)) $qualifiedforclean=0; |
|
| 334 | - // printing |
|
| 335 | - if (preg_match('/PrintingDriverDesc$/', $value)) $qualifiedforclean=0; |
|
| 336 | - if (preg_match('/PrintTestDesc$/', $value)) $qualifiedforclean=0; |
|
| 337 | - // products |
|
| 338 | - if (preg_match('/GlobalVariableUpdaterType$/', $value)) $qualifiedforclean=0; |
|
| 339 | - if (preg_match('/GlobalVariableUpdaterHelp$/', $value)) $qualifiedforclean=0; |
|
| 340 | - if (preg_match('/OppStatus/', $value)) $qualifiedforclean=0; |
|
| 341 | - if (preg_match('/AvailabilityType/', $value)) $qualifiedforclean=0; |
|
| 342 | - if (preg_match('/CardProduct/', $value)) $qualifiedforclean=0; |
|
| 343 | - |
|
| 344 | - if (preg_match('/sms/i', $value)) $qualifiedforclean=0; |
|
| 345 | - if (preg_match('/TF_/i', $value)) $qualifiedforclean=0; |
|
| 346 | - if (preg_match('/WithBankUsing/i', $value)) $qualifiedforclean=0; |
|
| 347 | - if (preg_match('/descWORKFLOW_/i', $value)) $qualifiedforclean=0; |
|
| 348 | - |
|
| 349 | - if (! $qualifiedforclean) |
|
| 350 | - { |
|
| 323 | + if (preg_match('/^Notify_/', $value)) $qualifiedforclean=0; |
|
| 324 | + if (preg_match('/^PredefinedMail/', $value)) $qualifiedforclean=0; |
|
| 325 | + if (preg_match('/^DemoCompany/', $value)) $qualifiedforclean=0; |
|
| 326 | + if (preg_match('/^WeightUnit/', $value)) $qualifiedforclean=0; |
|
| 327 | + if (preg_match('/^LengthUnit/', $value)) $qualifiedforclean=0; |
|
| 328 | + if (preg_match('/^SurfaceUnit/', $value)) $qualifiedforclean=0; |
|
| 329 | + if (preg_match('/^VolumeUnit/', $value)) $qualifiedforclean=0; |
|
| 330 | + if (preg_match('/^SizeUnit/', $value)) $qualifiedforclean=0; |
|
| 331 | + if (preg_match('/^EMailText/', $value)) $qualifiedforclean=0; |
|
| 332 | + if (preg_match('/ById$/', $value)) $qualifiedforclean=0; |
|
| 333 | + if (preg_match('/ByLogin$/', $value)) $qualifiedforclean=0; |
|
| 334 | + // printing |
|
| 335 | + if (preg_match('/PrintingDriverDesc$/', $value)) $qualifiedforclean=0; |
|
| 336 | + if (preg_match('/PrintTestDesc$/', $value)) $qualifiedforclean=0; |
|
| 337 | + // products |
|
| 338 | + if (preg_match('/GlobalVariableUpdaterType$/', $value)) $qualifiedforclean=0; |
|
| 339 | + if (preg_match('/GlobalVariableUpdaterHelp$/', $value)) $qualifiedforclean=0; |
|
| 340 | + if (preg_match('/OppStatus/', $value)) $qualifiedforclean=0; |
|
| 341 | + if (preg_match('/AvailabilityType/', $value)) $qualifiedforclean=0; |
|
| 342 | + if (preg_match('/CardProduct/', $value)) $qualifiedforclean=0; |
|
| 343 | + |
|
| 344 | + if (preg_match('/sms/i', $value)) $qualifiedforclean=0; |
|
| 345 | + if (preg_match('/TF_/i', $value)) $qualifiedforclean=0; |
|
| 346 | + if (preg_match('/WithBankUsing/i', $value)) $qualifiedforclean=0; |
|
| 347 | + if (preg_match('/descWORKFLOW_/i', $value)) $qualifiedforclean=0; |
|
| 348 | + |
|
| 349 | + if (! $qualifiedforclean) |
|
| 350 | + { |
|
| 351 | 351 | continue; |
| 352 | - } |
|
| 353 | - |
|
| 354 | - //$search = '\'trans("'.$value.'")\''; |
|
| 355 | - $search = '-e "\''.$value.'\'" -e \'"'.$value.'"\' -e "('.$value.')" -e "('.$value.',"'; |
|
| 356 | - $string = 'grep -R -m 1 -F --exclude=includes/* --include=*.php '.$search.' '.$htdocs.'* '.$scripts.'*'; |
|
| 357 | - //print $string."<br>\n"; |
|
| 358 | - exec($string,$output); |
|
| 359 | - if (empty($output)) { |
|
| 360 | - $unused[$value] = $line; |
|
| 361 | - echo $line; // $trad contains the \n |
|
| 362 | - } |
|
| 363 | - else |
|
| 364 | - { |
|
| 365 | - unset($output); |
|
| 366 | - //print 'X'.$output.'Y'; |
|
| 367 | - } |
|
| 368 | - } |
|
| 369 | - |
|
| 370 | - if (empty($unused)) print "No string not used found.\n"; |
|
| 371 | - else |
|
| 372 | - { |
|
| 352 | + } |
|
| 353 | + |
|
| 354 | + //$search = '\'trans("'.$value.'")\''; |
|
| 355 | + $search = '-e "\''.$value.'\'" -e \'"'.$value.'"\' -e "('.$value.')" -e "('.$value.',"'; |
|
| 356 | + $string = 'grep -R -m 1 -F --exclude=includes/* --include=*.php '.$search.' '.$htdocs.'* '.$scripts.'*'; |
|
| 357 | + //print $string."<br>\n"; |
|
| 358 | + exec($string,$output); |
|
| 359 | + if (empty($output)) { |
|
| 360 | + $unused[$value] = $line; |
|
| 361 | + echo $line; // $trad contains the \n |
|
| 362 | + } |
|
| 363 | + else |
|
| 364 | + { |
|
| 365 | + unset($output); |
|
| 366 | + //print 'X'.$output.'Y'; |
|
| 367 | + } |
|
| 368 | + } |
|
| 369 | + |
|
| 370 | + if (empty($unused)) print "No string not used found.\n"; |
|
| 371 | + else |
|
| 372 | + { |
|
| 373 | 373 | $filetosave='/tmp/'.($argv[2]?$argv[2]:"").'notused.lang'; |
| 374 | 374 | print "Strings in en_US that are never used are saved into file ".$filetosave.":\n"; |
| 375 | 375 | file_put_contents($filetosave, implode("",$unused)); |
@@ -377,7 +377,7 @@ discard block |
||
| 377 | 377 | if (($argv[2]?$argv[2]:"")) print 'cd htdocs/langs/en_US; mv '.($argv[2]?$argv[2]:"")." ".($argv[2]?$argv[2]:"").".tmp; "; |
| 378 | 378 | print "diff ".($argv[2]?$argv[2]:"").".tmp ".$filetosave." | grep \< | cut -b 3- > ".($argv[2]?$argv[2]:""); |
| 379 | 379 | if (($argv[2]?$argv[2]:"")) print "; rm ".($argv[2]?$argv[2]:"").".tmp;\n"; |
| 380 | - } |
|
| 380 | + } |
|
| 381 | 381 | } |
| 382 | 382 | |
| 383 | 383 | echo "\n"; |
@@ -20,14 +20,14 @@ discard block |
||
| 20 | 20 | |
| 21 | 21 | $sapi_type = php_sapi_name(); |
| 22 | 22 | $script_file = basename(__FILE__); |
| 23 | -$path=dirname(__FILE__).'/'; |
|
| 23 | +$path = dirname(__FILE__).'/'; |
|
| 24 | 24 | |
| 25 | -$web=0; |
|
| 25 | +$web = 0; |
|
| 26 | 26 | |
| 27 | 27 | // Test if batch mode |
| 28 | 28 | if (substr($sapi_type, 0, 3) == 'cgi') |
| 29 | 29 | { |
| 30 | - $web=1; |
|
| 30 | + $web = 1; |
|
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | |
@@ -111,9 +111,9 @@ discard block |
||
| 111 | 111 | exit; |
| 112 | 112 | } |
| 113 | 113 | |
| 114 | -$dups=array(); |
|
| 115 | -$exludefiles = array('.','..','README'); |
|
| 116 | -$files = array_diff($files,$exludefiles); |
|
| 114 | +$dups = array(); |
|
| 115 | +$exludefiles = array('.', '..', 'README'); |
|
| 116 | +$files = array_diff($files, $exludefiles); |
|
| 117 | 117 | // To force a file: $files=array('myfile.lang'); |
| 118 | 118 | if (isset($argv[2])) |
| 119 | 119 | { |
@@ -124,18 +124,18 @@ discard block |
||
| 124 | 124 | foreach ($files AS $file) { |
| 125 | 125 | $path_file = pathinfo($file); |
| 126 | 126 | // we're only interested in .lang files |
| 127 | - if ($path_file['extension']=='lang') { |
|
| 127 | + if ($path_file['extension'] == 'lang') { |
|
| 128 | 128 | $content = file($workdir.$file); |
| 129 | 129 | foreach ($content AS $line => $row) { |
| 130 | 130 | // don't want comment lines |
| 131 | - if (substr($row,0,1) !== '#') { |
|
| 131 | + if (substr($row, 0, 1) !== '#') { |
|
| 132 | 132 | // don't want lines without the separator (why should those even be here, anyway...) |
| 133 | - if (strpos($row,'=')!==false) { |
|
| 134 | - $row_array = explode('=',$row); // $row_array[0] = key |
|
| 135 | - $langstrings_3d[$path_file['basename']][$line+1]=$row_array[0]; |
|
| 136 | - $langstrings_3dtrans[$path_file['basename']][$line+1]=$row_array[1]; |
|
| 137 | - $langstrings_full[]=$row_array[0]; |
|
| 138 | - $langstrings_dist[$row_array[0]]=$row; |
|
| 133 | + if (strpos($row, '=') !== false) { |
|
| 134 | + $row_array = explode('=', $row); // $row_array[0] = key |
|
| 135 | + $langstrings_3d[$path_file['basename']][$line + 1] = $row_array[0]; |
|
| 136 | + $langstrings_3dtrans[$path_file['basename']][$line + 1] = $row_array[1]; |
|
| 137 | + $langstrings_full[] = $row_array[0]; |
|
| 138 | + $langstrings_dist[$row_array[0]] = $row; |
|
| 139 | 139 | } |
| 140 | 140 | } |
| 141 | 141 | } |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | foreach ($file AS $linenum => $value) |
| 148 | 148 | { |
| 149 | 149 | $keys = array_keys($langstrings_full, $value); |
| 150 | - if (count($keys)>1) |
|
| 150 | + if (count($keys) > 1) |
|
| 151 | 151 | { |
| 152 | 152 | foreach ($keys AS $key) { |
| 153 | 153 | $dups[$value][$filename][$linenum] = trim($langstrings_3dtrans[$filename][$linenum]); |
@@ -167,52 +167,52 @@ discard block |
||
| 167 | 167 | echo "<tbody>\n"; |
| 168 | 168 | } |
| 169 | 169 | |
| 170 | -$sduplicateinsamefile=''; |
|
| 171 | -$sinmainandother=''; |
|
| 172 | -$sininstallandadmin=''; |
|
| 173 | -$sother=''; |
|
| 170 | +$sduplicateinsamefile = ''; |
|
| 171 | +$sinmainandother = ''; |
|
| 172 | +$sininstallandadmin = ''; |
|
| 173 | +$sother = ''; |
|
| 174 | 174 | |
| 175 | 175 | $count = 0; |
| 176 | 176 | foreach ($dups as $string => $pages) |
| 177 | 177 | { |
| 178 | 178 | $count++; |
| 179 | - $s=''; |
|
| 179 | + $s = ''; |
|
| 180 | 180 | |
| 181 | 181 | // Keyword $string |
| 182 | - if ($web) $s.="<tr>"; |
|
| 183 | - if ($web) $s.="<td align=\"center\">"; |
|
| 184 | - if ($web) $s.=$count; |
|
| 185 | - if ($web) $s.="</td>"; |
|
| 186 | - if ($web) $s.="<td>"; |
|
| 187 | - $s.=$string; |
|
| 188 | - if ($web) $s.="</td>"; |
|
| 189 | - if ($web) $s.="<td>"; |
|
| 190 | - if (! $web) $s.= ' : '; |
|
| 182 | + if ($web) $s .= "<tr>"; |
|
| 183 | + if ($web) $s .= "<td align=\"center\">"; |
|
| 184 | + if ($web) $s .= $count; |
|
| 185 | + if ($web) $s .= "</td>"; |
|
| 186 | + if ($web) $s .= "<td>"; |
|
| 187 | + $s .= $string; |
|
| 188 | + if ($web) $s .= "</td>"; |
|
| 189 | + if ($web) $s .= "<td>"; |
|
| 190 | + if (!$web) $s .= ' : '; |
|
| 191 | 191 | |
| 192 | 192 | // Loop on each files keyword was found |
| 193 | - $duplicateinsamefile=0; |
|
| 194 | - $inmain=0; |
|
| 195 | - $inadmin=0; |
|
| 193 | + $duplicateinsamefile = 0; |
|
| 194 | + $inmain = 0; |
|
| 195 | + $inadmin = 0; |
|
| 196 | 196 | foreach ($pages AS $file => $lines) |
| 197 | 197 | { |
| 198 | - if ($file == 'main.lang') { $inmain=1; $inadmin=0; } |
|
| 199 | - if ($file == 'admin.lang' && ! $inmain) { $inadmin=1; } |
|
| 198 | + if ($file == 'main.lang') { $inmain = 1; $inadmin = 0; } |
|
| 199 | + if ($file == 'admin.lang' && !$inmain) { $inadmin = 1; } |
|
| 200 | 200 | |
| 201 | - $s.=$file." "; |
|
| 201 | + $s .= $file." "; |
|
| 202 | 202 | |
| 203 | 203 | // Loop on each line keword was found into file. |
| 204 | - $listoffilesforthisentry=array(); |
|
| 204 | + $listoffilesforthisentry = array(); |
|
| 205 | 205 | foreach ($lines as $line => $translatedvalue) |
| 206 | 206 | { |
| 207 | - if (! empty($listoffilesforthisentry[$file])) $duplicateinsamefile=1; |
|
| 208 | - $listoffilesforthisentry[$file]=1; |
|
| 207 | + if (!empty($listoffilesforthisentry[$file])) $duplicateinsamefile = 1; |
|
| 208 | + $listoffilesforthisentry[$file] = 1; |
|
| 209 | 209 | |
| 210 | - $s.= "(".$line." - ".htmlentities($translatedvalue).") "; |
|
| 210 | + $s .= "(".$line." - ".htmlentities($translatedvalue).") "; |
|
| 211 | 211 | } |
| 212 | - if ($web) $s.="<br>"; |
|
| 212 | + if ($web) $s .= "<br>"; |
|
| 213 | 213 | } |
| 214 | - if ($web) $s.="</td></tr>"; |
|
| 215 | - $s.="\n"; |
|
| 214 | + if ($web) $s .= "</td></tr>"; |
|
| 215 | + $s .= "\n"; |
|
| 216 | 216 | |
| 217 | 217 | if ($duplicateinsamefile) $sduplicateinsamefile .= $s; |
| 218 | 218 | else if ($inmain) $sinmainandother .= $s; |
@@ -220,25 +220,25 @@ discard block |
||
| 220 | 220 | else $sother .= $s; |
| 221 | 221 | } |
| 222 | 222 | |
| 223 | -if (! $web) print "\n***** Entries duplicated in same file\n"; |
|
| 223 | +if (!$web) print "\n***** Entries duplicated in same file\n"; |
|
| 224 | 224 | print $sduplicateinsamefile; |
| 225 | -if (! $web && empty($sduplicateinsamefile)) print "None\n"; |
|
| 226 | -if (! $web) print "\n"; |
|
| 225 | +if (!$web && empty($sduplicateinsamefile)) print "None\n"; |
|
| 226 | +if (!$web) print "\n"; |
|
| 227 | 227 | |
| 228 | -if (! $web) print "***** Entries in main and another (keep only entry in main)\n"; |
|
| 228 | +if (!$web) print "***** Entries in main and another (keep only entry in main)\n"; |
|
| 229 | 229 | print $sinmainandother; |
| 230 | -if (! $web && empty($sinmainandother)) print "None\n"; |
|
| 231 | -if (! $web) print "\n"; |
|
| 230 | +if (!$web && empty($sinmainandother)) print "None\n"; |
|
| 231 | +if (!$web) print "\n"; |
|
| 232 | 232 | |
| 233 | -if (! $web) print "***** Entries in admin and another\n"; |
|
| 233 | +if (!$web) print "***** Entries in admin and another\n"; |
|
| 234 | 234 | print $sininstallandadmin; |
| 235 | -if (! $web && empty($sininstallandadmin)) print "None\n"; |
|
| 236 | -if (! $web) print "\n"; |
|
| 235 | +if (!$web && empty($sininstallandadmin)) print "None\n"; |
|
| 236 | +if (!$web) print "\n"; |
|
| 237 | 237 | |
| 238 | -if (! $web) print "***** Other\n"; |
|
| 238 | +if (!$web) print "***** Other\n"; |
|
| 239 | 239 | print $sother; |
| 240 | -if (! $web && empty($sother)) print "None\n"; |
|
| 241 | -if (! $web) print "\n"; |
|
| 240 | +if (!$web && empty($sother)) print "None\n"; |
|
| 241 | +if (!$web) print "\n"; |
|
| 242 | 242 | |
| 243 | 243 | if ($web) |
| 244 | 244 | { |
@@ -249,116 +249,116 @@ discard block |
||
| 249 | 249 | |
| 250 | 250 | // STEP 2 - Search key not used |
| 251 | 251 | |
| 252 | -if ((! empty($_REQUEST['unused']) && $_REQUEST['unused'] == 'true') || (isset($argv[1]) && $argv[1]=='unused=true')) |
|
| 252 | +if ((!empty($_REQUEST['unused']) && $_REQUEST['unused'] == 'true') || (isset($argv[1]) && $argv[1] == 'unused=true')) |
|
| 253 | 253 | { |
| 254 | 254 | print "***** Strings in en_US that are never used:\n"; |
| 255 | 255 | |
| 256 | - $unused=array(); |
|
| 256 | + $unused = array(); |
|
| 257 | 257 | foreach ($langstrings_dist AS $value => $line) |
| 258 | 258 | { |
| 259 | - $qualifiedforclean=1; |
|
| 259 | + $qualifiedforclean = 1; |
|
| 260 | 260 | // Check if we must keep this key to be into file for removal |
| 261 | - if (preg_match('/^Module\d+/', $value)) $qualifiedforclean=0; |
|
| 262 | - if (preg_match('/^Permission\d+/', $value)) $qualifiedforclean=0; |
|
| 263 | - if (preg_match('/^PermissionAdvanced\d+/', $value)) $qualifiedforclean=0; |
|
| 264 | - if (preg_match('/^ProfId\d+/', $value)) $qualifiedforclean=0; |
|
| 265 | - if (preg_match('/^Delays_/', $value)) $qualifiedforclean=0; |
|
| 266 | - if (preg_match('/^BarcodeDesc/', $value)) $qualifiedforclean=0; |
|
| 267 | - if (preg_match('/^Extrafield/', $value)) $qualifiedforclean=0; |
|
| 268 | - if (preg_match('/^LocalTax/', $value)) $qualifiedforclean=0; |
|
| 269 | - if (preg_match('/^Country/', $value)) $qualifiedforclean=0; |
|
| 270 | - if (preg_match('/^Civility/', $value)) $qualifiedforclean=0; |
|
| 271 | - if (preg_match('/^Currency/', $value)) $qualifiedforclean=0; |
|
| 272 | - if (preg_match('/^DemandReasonTypeSRC/', $value)) $qualifiedforclean=0; |
|
| 273 | - if (preg_match('/^PaperFormat/', $value)) $qualifiedforclean=0; |
|
| 274 | - if (preg_match('/^Duration/', $value)) $qualifiedforclean=0; |
|
| 275 | - if (preg_match('/^AmountLT/', $value)) $qualifiedforclean=0; |
|
| 276 | - if (preg_match('/^TotalLT/', $value)) $qualifiedforclean=0; |
|
| 277 | - if (preg_match('/^Month/', $value)) $qualifiedforclean=0; |
|
| 278 | - if (preg_match('/^MonthShort/', $value)) $qualifiedforclean=0; |
|
| 279 | - if (preg_match('/^Day\d/', $value)) $qualifiedforclean=0; |
|
| 280 | - if (preg_match('/^Short/', $value)) $qualifiedforclean=0; |
|
| 281 | - if (preg_match('/^ExportDataset_/', $value)) $qualifiedforclean=0; |
|
| 282 | - if (preg_match('/^ImportDataset_/', $value)) $qualifiedforclean=0; |
|
| 283 | - if (preg_match('/^ActionAC_/', $value)) $qualifiedforclean=0; |
|
| 284 | - if (preg_match('/^TypeLocaltax/', $value)) $qualifiedforclean=0; |
|
| 285 | - if (preg_match('/^StatusProspect/', $value)) $qualifiedforclean=0; |
|
| 286 | - if (preg_match('/^PL_/', $value)) $qualifiedforclean=0; |
|
| 287 | - if (preg_match('/^TE_/', $value)) $qualifiedforclean=0; |
|
| 288 | - if (preg_match('/^JuridicalStatus/', $value)) $qualifiedforclean=0; |
|
| 289 | - if (preg_match('/^CalcMode/', $value)) $qualifiedforclean=0; |
|
| 290 | - if (preg_match('/^newLT/', $value)) $qualifiedforclean=0; |
|
| 291 | - if (preg_match('/^LT[0-9]/', $value)) $qualifiedforclean=0; |
|
| 292 | - if (preg_match('/^TypeContact_contrat_/', $value)) $qualifiedforclean=0; |
|
| 293 | - if (preg_match('/^ErrorPriceExpression/', $value)) $qualifiedforclean=0; |
|
| 294 | - if (preg_match('/^Language_/', $value)) $qualifiedforclean=0; |
|
| 295 | - if (preg_match('/^DescADHERENT_/', $value)) $qualifiedforclean=0; |
|
| 296 | - if (preg_match('/^SubmitTranslation/', $value)) $qualifiedforclean=0; |
|
| 297 | - if (preg_match('/^ModuleCompanyCode/', $value)) $qualifiedforclean=0; |
|
| 298 | - if (preg_match('/InDolibarr$/', $value)) $qualifiedforclean=0; |
|
| 261 | + if (preg_match('/^Module\d+/', $value)) $qualifiedforclean = 0; |
|
| 262 | + if (preg_match('/^Permission\d+/', $value)) $qualifiedforclean = 0; |
|
| 263 | + if (preg_match('/^PermissionAdvanced\d+/', $value)) $qualifiedforclean = 0; |
|
| 264 | + if (preg_match('/^ProfId\d+/', $value)) $qualifiedforclean = 0; |
|
| 265 | + if (preg_match('/^Delays_/', $value)) $qualifiedforclean = 0; |
|
| 266 | + if (preg_match('/^BarcodeDesc/', $value)) $qualifiedforclean = 0; |
|
| 267 | + if (preg_match('/^Extrafield/', $value)) $qualifiedforclean = 0; |
|
| 268 | + if (preg_match('/^LocalTax/', $value)) $qualifiedforclean = 0; |
|
| 269 | + if (preg_match('/^Country/', $value)) $qualifiedforclean = 0; |
|
| 270 | + if (preg_match('/^Civility/', $value)) $qualifiedforclean = 0; |
|
| 271 | + if (preg_match('/^Currency/', $value)) $qualifiedforclean = 0; |
|
| 272 | + if (preg_match('/^DemandReasonTypeSRC/', $value)) $qualifiedforclean = 0; |
|
| 273 | + if (preg_match('/^PaperFormat/', $value)) $qualifiedforclean = 0; |
|
| 274 | + if (preg_match('/^Duration/', $value)) $qualifiedforclean = 0; |
|
| 275 | + if (preg_match('/^AmountLT/', $value)) $qualifiedforclean = 0; |
|
| 276 | + if (preg_match('/^TotalLT/', $value)) $qualifiedforclean = 0; |
|
| 277 | + if (preg_match('/^Month/', $value)) $qualifiedforclean = 0; |
|
| 278 | + if (preg_match('/^MonthShort/', $value)) $qualifiedforclean = 0; |
|
| 279 | + if (preg_match('/^Day\d/', $value)) $qualifiedforclean = 0; |
|
| 280 | + if (preg_match('/^Short/', $value)) $qualifiedforclean = 0; |
|
| 281 | + if (preg_match('/^ExportDataset_/', $value)) $qualifiedforclean = 0; |
|
| 282 | + if (preg_match('/^ImportDataset_/', $value)) $qualifiedforclean = 0; |
|
| 283 | + if (preg_match('/^ActionAC_/', $value)) $qualifiedforclean = 0; |
|
| 284 | + if (preg_match('/^TypeLocaltax/', $value)) $qualifiedforclean = 0; |
|
| 285 | + if (preg_match('/^StatusProspect/', $value)) $qualifiedforclean = 0; |
|
| 286 | + if (preg_match('/^PL_/', $value)) $qualifiedforclean = 0; |
|
| 287 | + if (preg_match('/^TE_/', $value)) $qualifiedforclean = 0; |
|
| 288 | + if (preg_match('/^JuridicalStatus/', $value)) $qualifiedforclean = 0; |
|
| 289 | + if (preg_match('/^CalcMode/', $value)) $qualifiedforclean = 0; |
|
| 290 | + if (preg_match('/^newLT/', $value)) $qualifiedforclean = 0; |
|
| 291 | + if (preg_match('/^LT[0-9]/', $value)) $qualifiedforclean = 0; |
|
| 292 | + if (preg_match('/^TypeContact_contrat_/', $value)) $qualifiedforclean = 0; |
|
| 293 | + if (preg_match('/^ErrorPriceExpression/', $value)) $qualifiedforclean = 0; |
|
| 294 | + if (preg_match('/^Language_/', $value)) $qualifiedforclean = 0; |
|
| 295 | + if (preg_match('/^DescADHERENT_/', $value)) $qualifiedforclean = 0; |
|
| 296 | + if (preg_match('/^SubmitTranslation/', $value)) $qualifiedforclean = 0; |
|
| 297 | + if (preg_match('/^ModuleCompanyCode/', $value)) $qualifiedforclean = 0; |
|
| 298 | + if (preg_match('/InDolibarr$/', $value)) $qualifiedforclean = 0; |
|
| 299 | 299 | // admin.lang |
| 300 | - if (preg_match('/^DAV_ALLOW_PUBLIC_DIR/i', $value)) $qualifiedforclean=0; |
|
| 301 | - if (preg_match('/^DAV_ALLOW_ECM_DIR/i', $value)) $qualifiedforclean=0; |
|
| 300 | + if (preg_match('/^DAV_ALLOW_PUBLIC_DIR/i', $value)) $qualifiedforclean = 0; |
|
| 301 | + if (preg_match('/^DAV_ALLOW_ECM_DIR/i', $value)) $qualifiedforclean = 0; |
|
| 302 | 302 | // boxes.lang |
| 303 | - if (preg_match('/^BoxTitleLast/', $value)) $qualifiedforclean=0; |
|
| 304 | - if (preg_match('/^BoxTitleLatest/', $value)) $qualifiedforclean=0; |
|
| 303 | + if (preg_match('/^BoxTitleLast/', $value)) $qualifiedforclean = 0; |
|
| 304 | + if (preg_match('/^BoxTitleLatest/', $value)) $qualifiedforclean = 0; |
|
| 305 | 305 | // install.lang |
| 306 | - if (preg_match('/^KeepDefaultValues/', $value)) $qualifiedforclean=0; |
|
| 306 | + if (preg_match('/^KeepDefaultValues/', $value)) $qualifiedforclean = 0; |
|
| 307 | 307 | // mail.lang |
| 308 | - if (preg_match('/MailingModuleDesc/i', $value)) $qualifiedforclean=0; |
|
| 308 | + if (preg_match('/MailingModuleDesc/i', $value)) $qualifiedforclean = 0; |
|
| 309 | 309 | // main.lang |
| 310 | - if (preg_match('/^Duration/', $value)) $qualifiedforclean=0; |
|
| 311 | - if (preg_match('/^FormatDate/', $value)) $qualifiedforclean=0; |
|
| 312 | - if (preg_match('/^DateFormat/', $value)) $qualifiedforclean=0; |
|
| 313 | - if (preg_match('/^.b$/', $value)) $qualifiedforclean=0; |
|
| 314 | - if (preg_match('/^.*Bytes$/', $value)) $qualifiedforclean=0; |
|
| 315 | - if (preg_match('/^NoteSomeFeaturesAreDisabled/', $value)) $qualifiedforclean=0; |
|
| 316 | - if (preg_match('/^(DoTest|Under|Limits|Cards|CurrentValue|DateLimit|DateAndHour|NbOfLines|NbOfObjects|NbOfReferes|TotalTTCShort|VATs)/', $value)) $qualifiedforclean=0; |
|
| 310 | + if (preg_match('/^Duration/', $value)) $qualifiedforclean = 0; |
|
| 311 | + if (preg_match('/^FormatDate/', $value)) $qualifiedforclean = 0; |
|
| 312 | + if (preg_match('/^DateFormat/', $value)) $qualifiedforclean = 0; |
|
| 313 | + if (preg_match('/^.b$/', $value)) $qualifiedforclean = 0; |
|
| 314 | + if (preg_match('/^.*Bytes$/', $value)) $qualifiedforclean = 0; |
|
| 315 | + if (preg_match('/^NoteSomeFeaturesAreDisabled/', $value)) $qualifiedforclean = 0; |
|
| 316 | + if (preg_match('/^(DoTest|Under|Limits|Cards|CurrentValue|DateLimit|DateAndHour|NbOfLines|NbOfObjects|NbOfReferes|TotalTTCShort|VATs)/', $value)) $qualifiedforclean = 0; |
|
| 317 | 317 | // modulebuilder |
| 318 | - if (preg_match('/^ModuleBuilderDesc/', $value)) $qualifiedforclean=0; |
|
| 318 | + if (preg_match('/^ModuleBuilderDesc/', $value)) $qualifiedforclean = 0; |
|
| 319 | 319 | // orders |
| 320 | - if (preg_match('/^OrderSource/', $value)) $qualifiedforclean=0; |
|
| 321 | - if (preg_match('/^TypeContact_/', $value)) $qualifiedforclean=0; |
|
| 320 | + if (preg_match('/^OrderSource/', $value)) $qualifiedforclean = 0; |
|
| 321 | + if (preg_match('/^TypeContact_/', $value)) $qualifiedforclean = 0; |
|
| 322 | 322 | // other.lang |
| 323 | - if (preg_match('/^Notify_/', $value)) $qualifiedforclean=0; |
|
| 324 | - if (preg_match('/^PredefinedMail/', $value)) $qualifiedforclean=0; |
|
| 325 | - if (preg_match('/^DemoCompany/', $value)) $qualifiedforclean=0; |
|
| 326 | - if (preg_match('/^WeightUnit/', $value)) $qualifiedforclean=0; |
|
| 327 | - if (preg_match('/^LengthUnit/', $value)) $qualifiedforclean=0; |
|
| 328 | - if (preg_match('/^SurfaceUnit/', $value)) $qualifiedforclean=0; |
|
| 329 | - if (preg_match('/^VolumeUnit/', $value)) $qualifiedforclean=0; |
|
| 330 | - if (preg_match('/^SizeUnit/', $value)) $qualifiedforclean=0; |
|
| 331 | - if (preg_match('/^EMailText/', $value)) $qualifiedforclean=0; |
|
| 332 | - if (preg_match('/ById$/', $value)) $qualifiedforclean=0; |
|
| 333 | - if (preg_match('/ByLogin$/', $value)) $qualifiedforclean=0; |
|
| 323 | + if (preg_match('/^Notify_/', $value)) $qualifiedforclean = 0; |
|
| 324 | + if (preg_match('/^PredefinedMail/', $value)) $qualifiedforclean = 0; |
|
| 325 | + if (preg_match('/^DemoCompany/', $value)) $qualifiedforclean = 0; |
|
| 326 | + if (preg_match('/^WeightUnit/', $value)) $qualifiedforclean = 0; |
|
| 327 | + if (preg_match('/^LengthUnit/', $value)) $qualifiedforclean = 0; |
|
| 328 | + if (preg_match('/^SurfaceUnit/', $value)) $qualifiedforclean = 0; |
|
| 329 | + if (preg_match('/^VolumeUnit/', $value)) $qualifiedforclean = 0; |
|
| 330 | + if (preg_match('/^SizeUnit/', $value)) $qualifiedforclean = 0; |
|
| 331 | + if (preg_match('/^EMailText/', $value)) $qualifiedforclean = 0; |
|
| 332 | + if (preg_match('/ById$/', $value)) $qualifiedforclean = 0; |
|
| 333 | + if (preg_match('/ByLogin$/', $value)) $qualifiedforclean = 0; |
|
| 334 | 334 | // printing |
| 335 | - if (preg_match('/PrintingDriverDesc$/', $value)) $qualifiedforclean=0; |
|
| 336 | - if (preg_match('/PrintTestDesc$/', $value)) $qualifiedforclean=0; |
|
| 335 | + if (preg_match('/PrintingDriverDesc$/', $value)) $qualifiedforclean = 0; |
|
| 336 | + if (preg_match('/PrintTestDesc$/', $value)) $qualifiedforclean = 0; |
|
| 337 | 337 | // products |
| 338 | - if (preg_match('/GlobalVariableUpdaterType$/', $value)) $qualifiedforclean=0; |
|
| 339 | - if (preg_match('/GlobalVariableUpdaterHelp$/', $value)) $qualifiedforclean=0; |
|
| 340 | - if (preg_match('/OppStatus/', $value)) $qualifiedforclean=0; |
|
| 341 | - if (preg_match('/AvailabilityType/', $value)) $qualifiedforclean=0; |
|
| 342 | - if (preg_match('/CardProduct/', $value)) $qualifiedforclean=0; |
|
| 343 | - |
|
| 344 | - if (preg_match('/sms/i', $value)) $qualifiedforclean=0; |
|
| 345 | - if (preg_match('/TF_/i', $value)) $qualifiedforclean=0; |
|
| 346 | - if (preg_match('/WithBankUsing/i', $value)) $qualifiedforclean=0; |
|
| 347 | - if (preg_match('/descWORKFLOW_/i', $value)) $qualifiedforclean=0; |
|
| 348 | - |
|
| 349 | - if (! $qualifiedforclean) |
|
| 338 | + if (preg_match('/GlobalVariableUpdaterType$/', $value)) $qualifiedforclean = 0; |
|
| 339 | + if (preg_match('/GlobalVariableUpdaterHelp$/', $value)) $qualifiedforclean = 0; |
|
| 340 | + if (preg_match('/OppStatus/', $value)) $qualifiedforclean = 0; |
|
| 341 | + if (preg_match('/AvailabilityType/', $value)) $qualifiedforclean = 0; |
|
| 342 | + if (preg_match('/CardProduct/', $value)) $qualifiedforclean = 0; |
|
| 343 | + |
|
| 344 | + if (preg_match('/sms/i', $value)) $qualifiedforclean = 0; |
|
| 345 | + if (preg_match('/TF_/i', $value)) $qualifiedforclean = 0; |
|
| 346 | + if (preg_match('/WithBankUsing/i', $value)) $qualifiedforclean = 0; |
|
| 347 | + if (preg_match('/descWORKFLOW_/i', $value)) $qualifiedforclean = 0; |
|
| 348 | + |
|
| 349 | + if (!$qualifiedforclean) |
|
| 350 | 350 | { |
| 351 | 351 | continue; |
| 352 | 352 | } |
| 353 | 353 | |
| 354 | 354 | //$search = '\'trans("'.$value.'")\''; |
| 355 | 355 | $search = '-e "\''.$value.'\'" -e \'"'.$value.'"\' -e "('.$value.')" -e "('.$value.',"'; |
| 356 | - $string = 'grep -R -m 1 -F --exclude=includes/* --include=*.php '.$search.' '.$htdocs.'* '.$scripts.'*'; |
|
| 356 | + $string = 'grep -R -m 1 -F --exclude=includes/* --include=*.php '.$search.' '.$htdocs.'* '.$scripts.'*'; |
|
| 357 | 357 | //print $string."<br>\n"; |
| 358 | - exec($string,$output); |
|
| 358 | + exec($string, $output); |
|
| 359 | 359 | if (empty($output)) { |
| 360 | 360 | $unused[$value] = $line; |
| 361 | - echo $line; // $trad contains the \n |
|
| 361 | + echo $line; // $trad contains the \n |
|
| 362 | 362 | } |
| 363 | 363 | else |
| 364 | 364 | { |
@@ -370,13 +370,13 @@ discard block |
||
| 370 | 370 | if (empty($unused)) print "No string not used found.\n"; |
| 371 | 371 | else |
| 372 | 372 | { |
| 373 | - $filetosave='/tmp/'.($argv[2]?$argv[2]:"").'notused.lang'; |
|
| 373 | + $filetosave = '/tmp/'.($argv[2] ? $argv[2] : "").'notused.lang'; |
|
| 374 | 374 | print "Strings in en_US that are never used are saved into file ".$filetosave.":\n"; |
| 375 | - file_put_contents($filetosave, implode("",$unused)); |
|
| 375 | + file_put_contents($filetosave, implode("", $unused)); |
|
| 376 | 376 | print "To remove from original file, run command :\n"; |
| 377 | - if (($argv[2]?$argv[2]:"")) print 'cd htdocs/langs/en_US; mv '.($argv[2]?$argv[2]:"")." ".($argv[2]?$argv[2]:"").".tmp; "; |
|
| 378 | - print "diff ".($argv[2]?$argv[2]:"").".tmp ".$filetosave." | grep \< | cut -b 3- > ".($argv[2]?$argv[2]:""); |
|
| 379 | - if (($argv[2]?$argv[2]:"")) print "; rm ".($argv[2]?$argv[2]:"").".tmp;\n"; |
|
| 377 | + if (($argv[2] ? $argv[2] : "")) print 'cd htdocs/langs/en_US; mv '.($argv[2] ? $argv[2] : "")." ".($argv[2] ? $argv[2] : "").".tmp; "; |
|
| 378 | + print "diff ".($argv[2] ? $argv[2] : "").".tmp ".$filetosave." | grep \< | cut -b 3- > ".($argv[2] ? $argv[2] : ""); |
|
| 379 | + if (($argv[2] ? $argv[2] : "")) print "; rm ".($argv[2] ? $argv[2] : "").".tmp;\n"; |
|
| 380 | 380 | } |
| 381 | 381 | } |
| 382 | 382 | |
@@ -87,9 +87,13 @@ discard block |
||
| 87 | 87 | } |
| 88 | 88 | |
| 89 | 89 | echo "If you call this with argument \"unused=true\" it searches for the translation strings that exist in en_US but are never used.\n"; |
| 90 | -if ($web) print "<br>"; |
|
| 90 | +if ($web) { |
|
| 91 | + print "<br>"; |
|
| 92 | +} |
|
| 91 | 93 | echo "IMPORTANT: that can take quite a lot of time (up to 10 minutes), you need to tune the max_execution_time on your php.ini accordingly.\n"; |
| 92 | -if ($web) print "<br>"; |
|
| 94 | +if ($web) { |
|
| 95 | + print "<br>"; |
|
| 96 | +} |
|
| 93 | 97 | |
| 94 | 98 | |
| 95 | 99 | |
@@ -156,9 +160,13 @@ discard block |
||
| 156 | 160 | } |
| 157 | 161 | } |
| 158 | 162 | |
| 159 | -if ($web) print "<h2>"; |
|
| 163 | +if ($web) { |
|
| 164 | + print "<h2>"; |
|
| 165 | +} |
|
| 160 | 166 | print "Duplicate strings in lang files in $workdir - ".count($dups)." found\n"; |
| 161 | -if ($web) print "</h2>"; |
|
| 167 | +if ($web) { |
|
| 168 | + print "</h2>"; |
|
| 169 | +} |
|
| 162 | 170 | |
| 163 | 171 | if ($web) |
| 164 | 172 | { |
@@ -179,15 +187,31 @@ discard block |
||
| 179 | 187 | $s=''; |
| 180 | 188 | |
| 181 | 189 | // Keyword $string |
| 182 | - if ($web) $s.="<tr>"; |
|
| 183 | - if ($web) $s.="<td align=\"center\">"; |
|
| 184 | - if ($web) $s.=$count; |
|
| 185 | - if ($web) $s.="</td>"; |
|
| 186 | - if ($web) $s.="<td>"; |
|
| 190 | + if ($web) { |
|
| 191 | + $s.="<tr>"; |
|
| 192 | + } |
|
| 193 | + if ($web) { |
|
| 194 | + $s.="<td align=\"center\">"; |
|
| 195 | + } |
|
| 196 | + if ($web) { |
|
| 197 | + $s.=$count; |
|
| 198 | + } |
|
| 199 | + if ($web) { |
|
| 200 | + $s.="</td>"; |
|
| 201 | + } |
|
| 202 | + if ($web) { |
|
| 203 | + $s.="<td>"; |
|
| 204 | + } |
|
| 187 | 205 | $s.=$string; |
| 188 | - if ($web) $s.="</td>"; |
|
| 189 | - if ($web) $s.="<td>"; |
|
| 190 | - if (! $web) $s.= ' : '; |
|
| 206 | + if ($web) { |
|
| 207 | + $s.="</td>"; |
|
| 208 | + } |
|
| 209 | + if ($web) { |
|
| 210 | + $s.="<td>"; |
|
| 211 | + } |
|
| 212 | + if (! $web) { |
|
| 213 | + $s.= ' : '; |
|
| 214 | + } |
|
| 191 | 215 | |
| 192 | 216 | // Loop on each files keyword was found |
| 193 | 217 | $duplicateinsamefile=0; |
@@ -204,41 +228,76 @@ discard block |
||
| 204 | 228 | $listoffilesforthisentry=array(); |
| 205 | 229 | foreach ($lines as $line => $translatedvalue) |
| 206 | 230 | { |
| 207 | - if (! empty($listoffilesforthisentry[$file])) $duplicateinsamefile=1; |
|
| 231 | + if (! empty($listoffilesforthisentry[$file])) { |
|
| 232 | + $duplicateinsamefile=1; |
|
| 233 | + } |
|
| 208 | 234 | $listoffilesforthisentry[$file]=1; |
| 209 | 235 | |
| 210 | 236 | $s.= "(".$line." - ".htmlentities($translatedvalue).") "; |
| 211 | 237 | } |
| 212 | - if ($web) $s.="<br>"; |
|
| 238 | + if ($web) { |
|
| 239 | + $s.="<br>"; |
|
| 240 | + } |
|
| 241 | + } |
|
| 242 | + if ($web) { |
|
| 243 | + $s.="</td></tr>"; |
|
| 213 | 244 | } |
| 214 | - if ($web) $s.="</td></tr>"; |
|
| 215 | 245 | $s.="\n"; |
| 216 | 246 | |
| 217 | - if ($duplicateinsamefile) $sduplicateinsamefile .= $s; |
|
| 218 | - else if ($inmain) $sinmainandother .= $s; |
|
| 219 | - else if ($inadmin) $sininstallandadmin .= $s; |
|
| 220 | - else $sother .= $s; |
|
| 221 | -} |
|
| 247 | + if ($duplicateinsamefile) { |
|
| 248 | + $sduplicateinsamefile .= $s; |
|
| 249 | + } else if ($inmain) { |
|
| 250 | + $sinmainandother .= $s; |
|
| 251 | + } else if ($inadmin) { |
|
| 252 | + $sininstallandadmin .= $s; |
|
| 253 | + } else { |
|
| 254 | + $sother .= $s; |
|
| 255 | + } |
|
| 256 | + } |
|
| 222 | 257 | |
| 223 | -if (! $web) print "\n***** Entries duplicated in same file\n"; |
|
| 258 | +if (! $web) { |
|
| 259 | + print "\n***** Entries duplicated in same file\n"; |
|
| 260 | +} |
|
| 224 | 261 | print $sduplicateinsamefile; |
| 225 | -if (! $web && empty($sduplicateinsamefile)) print "None\n"; |
|
| 226 | -if (! $web) print "\n"; |
|
| 262 | +if (! $web && empty($sduplicateinsamefile)) { |
|
| 263 | + print "None\n"; |
|
| 264 | +} |
|
| 265 | +if (! $web) { |
|
| 266 | + print "\n"; |
|
| 267 | +} |
|
| 227 | 268 | |
| 228 | -if (! $web) print "***** Entries in main and another (keep only entry in main)\n"; |
|
| 269 | +if (! $web) { |
|
| 270 | + print "***** Entries in main and another (keep only entry in main)\n"; |
|
| 271 | +} |
|
| 229 | 272 | print $sinmainandother; |
| 230 | -if (! $web && empty($sinmainandother)) print "None\n"; |
|
| 231 | -if (! $web) print "\n"; |
|
| 273 | +if (! $web && empty($sinmainandother)) { |
|
| 274 | + print "None\n"; |
|
| 275 | +} |
|
| 276 | +if (! $web) { |
|
| 277 | + print "\n"; |
|
| 278 | +} |
|
| 232 | 279 | |
| 233 | -if (! $web) print "***** Entries in admin and another\n"; |
|
| 280 | +if (! $web) { |
|
| 281 | + print "***** Entries in admin and another\n"; |
|
| 282 | +} |
|
| 234 | 283 | print $sininstallandadmin; |
| 235 | -if (! $web && empty($sininstallandadmin)) print "None\n"; |
|
| 236 | -if (! $web) print "\n"; |
|
| 284 | +if (! $web && empty($sininstallandadmin)) { |
|
| 285 | + print "None\n"; |
|
| 286 | +} |
|
| 287 | +if (! $web) { |
|
| 288 | + print "\n"; |
|
| 289 | +} |
|
| 237 | 290 | |
| 238 | -if (! $web) print "***** Other\n"; |
|
| 291 | +if (! $web) { |
|
| 292 | + print "***** Other\n"; |
|
| 293 | +} |
|
| 239 | 294 | print $sother; |
| 240 | -if (! $web && empty($sother)) print "None\n"; |
|
| 241 | -if (! $web) print "\n"; |
|
| 295 | +if (! $web && empty($sother)) { |
|
| 296 | + print "None\n"; |
|
| 297 | +} |
|
| 298 | +if (! $web) { |
|
| 299 | + print "\n"; |
|
| 300 | +} |
|
| 242 | 301 | |
| 243 | 302 | if ($web) |
| 244 | 303 | { |
@@ -258,93 +317,245 @@ discard block |
||
| 258 | 317 | { |
| 259 | 318 | $qualifiedforclean=1; |
| 260 | 319 | // Check if we must keep this key to be into file for removal |
| 261 | - if (preg_match('/^Module\d+/', $value)) $qualifiedforclean=0; |
|
| 262 | - if (preg_match('/^Permission\d+/', $value)) $qualifiedforclean=0; |
|
| 263 | - if (preg_match('/^PermissionAdvanced\d+/', $value)) $qualifiedforclean=0; |
|
| 264 | - if (preg_match('/^ProfId\d+/', $value)) $qualifiedforclean=0; |
|
| 265 | - if (preg_match('/^Delays_/', $value)) $qualifiedforclean=0; |
|
| 266 | - if (preg_match('/^BarcodeDesc/', $value)) $qualifiedforclean=0; |
|
| 267 | - if (preg_match('/^Extrafield/', $value)) $qualifiedforclean=0; |
|
| 268 | - if (preg_match('/^LocalTax/', $value)) $qualifiedforclean=0; |
|
| 269 | - if (preg_match('/^Country/', $value)) $qualifiedforclean=0; |
|
| 270 | - if (preg_match('/^Civility/', $value)) $qualifiedforclean=0; |
|
| 271 | - if (preg_match('/^Currency/', $value)) $qualifiedforclean=0; |
|
| 272 | - if (preg_match('/^DemandReasonTypeSRC/', $value)) $qualifiedforclean=0; |
|
| 273 | - if (preg_match('/^PaperFormat/', $value)) $qualifiedforclean=0; |
|
| 274 | - if (preg_match('/^Duration/', $value)) $qualifiedforclean=0; |
|
| 275 | - if (preg_match('/^AmountLT/', $value)) $qualifiedforclean=0; |
|
| 276 | - if (preg_match('/^TotalLT/', $value)) $qualifiedforclean=0; |
|
| 277 | - if (preg_match('/^Month/', $value)) $qualifiedforclean=0; |
|
| 278 | - if (preg_match('/^MonthShort/', $value)) $qualifiedforclean=0; |
|
| 279 | - if (preg_match('/^Day\d/', $value)) $qualifiedforclean=0; |
|
| 280 | - if (preg_match('/^Short/', $value)) $qualifiedforclean=0; |
|
| 281 | - if (preg_match('/^ExportDataset_/', $value)) $qualifiedforclean=0; |
|
| 282 | - if (preg_match('/^ImportDataset_/', $value)) $qualifiedforclean=0; |
|
| 283 | - if (preg_match('/^ActionAC_/', $value)) $qualifiedforclean=0; |
|
| 284 | - if (preg_match('/^TypeLocaltax/', $value)) $qualifiedforclean=0; |
|
| 285 | - if (preg_match('/^StatusProspect/', $value)) $qualifiedforclean=0; |
|
| 286 | - if (preg_match('/^PL_/', $value)) $qualifiedforclean=0; |
|
| 287 | - if (preg_match('/^TE_/', $value)) $qualifiedforclean=0; |
|
| 288 | - if (preg_match('/^JuridicalStatus/', $value)) $qualifiedforclean=0; |
|
| 289 | - if (preg_match('/^CalcMode/', $value)) $qualifiedforclean=0; |
|
| 290 | - if (preg_match('/^newLT/', $value)) $qualifiedforclean=0; |
|
| 291 | - if (preg_match('/^LT[0-9]/', $value)) $qualifiedforclean=0; |
|
| 292 | - if (preg_match('/^TypeContact_contrat_/', $value)) $qualifiedforclean=0; |
|
| 293 | - if (preg_match('/^ErrorPriceExpression/', $value)) $qualifiedforclean=0; |
|
| 294 | - if (preg_match('/^Language_/', $value)) $qualifiedforclean=0; |
|
| 295 | - if (preg_match('/^DescADHERENT_/', $value)) $qualifiedforclean=0; |
|
| 296 | - if (preg_match('/^SubmitTranslation/', $value)) $qualifiedforclean=0; |
|
| 297 | - if (preg_match('/^ModuleCompanyCode/', $value)) $qualifiedforclean=0; |
|
| 298 | - if (preg_match('/InDolibarr$/', $value)) $qualifiedforclean=0; |
|
| 320 | + if (preg_match('/^Module\d+/', $value)) { |
|
| 321 | + $qualifiedforclean=0; |
|
| 322 | + } |
|
| 323 | + if (preg_match('/^Permission\d+/', $value)) { |
|
| 324 | + $qualifiedforclean=0; |
|
| 325 | + } |
|
| 326 | + if (preg_match('/^PermissionAdvanced\d+/', $value)) { |
|
| 327 | + $qualifiedforclean=0; |
|
| 328 | + } |
|
| 329 | + if (preg_match('/^ProfId\d+/', $value)) { |
|
| 330 | + $qualifiedforclean=0; |
|
| 331 | + } |
|
| 332 | + if (preg_match('/^Delays_/', $value)) { |
|
| 333 | + $qualifiedforclean=0; |
|
| 334 | + } |
|
| 335 | + if (preg_match('/^BarcodeDesc/', $value)) { |
|
| 336 | + $qualifiedforclean=0; |
|
| 337 | + } |
|
| 338 | + if (preg_match('/^Extrafield/', $value)) { |
|
| 339 | + $qualifiedforclean=0; |
|
| 340 | + } |
|
| 341 | + if (preg_match('/^LocalTax/', $value)) { |
|
| 342 | + $qualifiedforclean=0; |
|
| 343 | + } |
|
| 344 | + if (preg_match('/^Country/', $value)) { |
|
| 345 | + $qualifiedforclean=0; |
|
| 346 | + } |
|
| 347 | + if (preg_match('/^Civility/', $value)) { |
|
| 348 | + $qualifiedforclean=0; |
|
| 349 | + } |
|
| 350 | + if (preg_match('/^Currency/', $value)) { |
|
| 351 | + $qualifiedforclean=0; |
|
| 352 | + } |
|
| 353 | + if (preg_match('/^DemandReasonTypeSRC/', $value)) { |
|
| 354 | + $qualifiedforclean=0; |
|
| 355 | + } |
|
| 356 | + if (preg_match('/^PaperFormat/', $value)) { |
|
| 357 | + $qualifiedforclean=0; |
|
| 358 | + } |
|
| 359 | + if (preg_match('/^Duration/', $value)) { |
|
| 360 | + $qualifiedforclean=0; |
|
| 361 | + } |
|
| 362 | + if (preg_match('/^AmountLT/', $value)) { |
|
| 363 | + $qualifiedforclean=0; |
|
| 364 | + } |
|
| 365 | + if (preg_match('/^TotalLT/', $value)) { |
|
| 366 | + $qualifiedforclean=0; |
|
| 367 | + } |
|
| 368 | + if (preg_match('/^Month/', $value)) { |
|
| 369 | + $qualifiedforclean=0; |
|
| 370 | + } |
|
| 371 | + if (preg_match('/^MonthShort/', $value)) { |
|
| 372 | + $qualifiedforclean=0; |
|
| 373 | + } |
|
| 374 | + if (preg_match('/^Day\d/', $value)) { |
|
| 375 | + $qualifiedforclean=0; |
|
| 376 | + } |
|
| 377 | + if (preg_match('/^Short/', $value)) { |
|
| 378 | + $qualifiedforclean=0; |
|
| 379 | + } |
|
| 380 | + if (preg_match('/^ExportDataset_/', $value)) { |
|
| 381 | + $qualifiedforclean=0; |
|
| 382 | + } |
|
| 383 | + if (preg_match('/^ImportDataset_/', $value)) { |
|
| 384 | + $qualifiedforclean=0; |
|
| 385 | + } |
|
| 386 | + if (preg_match('/^ActionAC_/', $value)) { |
|
| 387 | + $qualifiedforclean=0; |
|
| 388 | + } |
|
| 389 | + if (preg_match('/^TypeLocaltax/', $value)) { |
|
| 390 | + $qualifiedforclean=0; |
|
| 391 | + } |
|
| 392 | + if (preg_match('/^StatusProspect/', $value)) { |
|
| 393 | + $qualifiedforclean=0; |
|
| 394 | + } |
|
| 395 | + if (preg_match('/^PL_/', $value)) { |
|
| 396 | + $qualifiedforclean=0; |
|
| 397 | + } |
|
| 398 | + if (preg_match('/^TE_/', $value)) { |
|
| 399 | + $qualifiedforclean=0; |
|
| 400 | + } |
|
| 401 | + if (preg_match('/^JuridicalStatus/', $value)) { |
|
| 402 | + $qualifiedforclean=0; |
|
| 403 | + } |
|
| 404 | + if (preg_match('/^CalcMode/', $value)) { |
|
| 405 | + $qualifiedforclean=0; |
|
| 406 | + } |
|
| 407 | + if (preg_match('/^newLT/', $value)) { |
|
| 408 | + $qualifiedforclean=0; |
|
| 409 | + } |
|
| 410 | + if (preg_match('/^LT[0-9]/', $value)) { |
|
| 411 | + $qualifiedforclean=0; |
|
| 412 | + } |
|
| 413 | + if (preg_match('/^TypeContact_contrat_/', $value)) { |
|
| 414 | + $qualifiedforclean=0; |
|
| 415 | + } |
|
| 416 | + if (preg_match('/^ErrorPriceExpression/', $value)) { |
|
| 417 | + $qualifiedforclean=0; |
|
| 418 | + } |
|
| 419 | + if (preg_match('/^Language_/', $value)) { |
|
| 420 | + $qualifiedforclean=0; |
|
| 421 | + } |
|
| 422 | + if (preg_match('/^DescADHERENT_/', $value)) { |
|
| 423 | + $qualifiedforclean=0; |
|
| 424 | + } |
|
| 425 | + if (preg_match('/^SubmitTranslation/', $value)) { |
|
| 426 | + $qualifiedforclean=0; |
|
| 427 | + } |
|
| 428 | + if (preg_match('/^ModuleCompanyCode/', $value)) { |
|
| 429 | + $qualifiedforclean=0; |
|
| 430 | + } |
|
| 431 | + if (preg_match('/InDolibarr$/', $value)) { |
|
| 432 | + $qualifiedforclean=0; |
|
| 433 | + } |
|
| 299 | 434 | // admin.lang |
| 300 | - if (preg_match('/^DAV_ALLOW_PUBLIC_DIR/i', $value)) $qualifiedforclean=0; |
|
| 301 | - if (preg_match('/^DAV_ALLOW_ECM_DIR/i', $value)) $qualifiedforclean=0; |
|
| 435 | + if (preg_match('/^DAV_ALLOW_PUBLIC_DIR/i', $value)) { |
|
| 436 | + $qualifiedforclean=0; |
|
| 437 | + } |
|
| 438 | + if (preg_match('/^DAV_ALLOW_ECM_DIR/i', $value)) { |
|
| 439 | + $qualifiedforclean=0; |
|
| 440 | + } |
|
| 302 | 441 | // boxes.lang |
| 303 | - if (preg_match('/^BoxTitleLast/', $value)) $qualifiedforclean=0; |
|
| 304 | - if (preg_match('/^BoxTitleLatest/', $value)) $qualifiedforclean=0; |
|
| 442 | + if (preg_match('/^BoxTitleLast/', $value)) { |
|
| 443 | + $qualifiedforclean=0; |
|
| 444 | + } |
|
| 445 | + if (preg_match('/^BoxTitleLatest/', $value)) { |
|
| 446 | + $qualifiedforclean=0; |
|
| 447 | + } |
|
| 305 | 448 | // install.lang |
| 306 | - if (preg_match('/^KeepDefaultValues/', $value)) $qualifiedforclean=0; |
|
| 449 | + if (preg_match('/^KeepDefaultValues/', $value)) { |
|
| 450 | + $qualifiedforclean=0; |
|
| 451 | + } |
|
| 307 | 452 | // mail.lang |
| 308 | - if (preg_match('/MailingModuleDesc/i', $value)) $qualifiedforclean=0; |
|
| 453 | + if (preg_match('/MailingModuleDesc/i', $value)) { |
|
| 454 | + $qualifiedforclean=0; |
|
| 455 | + } |
|
| 309 | 456 | // main.lang |
| 310 | - if (preg_match('/^Duration/', $value)) $qualifiedforclean=0; |
|
| 311 | - if (preg_match('/^FormatDate/', $value)) $qualifiedforclean=0; |
|
| 312 | - if (preg_match('/^DateFormat/', $value)) $qualifiedforclean=0; |
|
| 313 | - if (preg_match('/^.b$/', $value)) $qualifiedforclean=0; |
|
| 314 | - if (preg_match('/^.*Bytes$/', $value)) $qualifiedforclean=0; |
|
| 315 | - if (preg_match('/^NoteSomeFeaturesAreDisabled/', $value)) $qualifiedforclean=0; |
|
| 316 | - if (preg_match('/^(DoTest|Under|Limits|Cards|CurrentValue|DateLimit|DateAndHour|NbOfLines|NbOfObjects|NbOfReferes|TotalTTCShort|VATs)/', $value)) $qualifiedforclean=0; |
|
| 457 | + if (preg_match('/^Duration/', $value)) { |
|
| 458 | + $qualifiedforclean=0; |
|
| 459 | + } |
|
| 460 | + if (preg_match('/^FormatDate/', $value)) { |
|
| 461 | + $qualifiedforclean=0; |
|
| 462 | + } |
|
| 463 | + if (preg_match('/^DateFormat/', $value)) { |
|
| 464 | + $qualifiedforclean=0; |
|
| 465 | + } |
|
| 466 | + if (preg_match('/^.b$/', $value)) { |
|
| 467 | + $qualifiedforclean=0; |
|
| 468 | + } |
|
| 469 | + if (preg_match('/^.*Bytes$/', $value)) { |
|
| 470 | + $qualifiedforclean=0; |
|
| 471 | + } |
|
| 472 | + if (preg_match('/^NoteSomeFeaturesAreDisabled/', $value)) { |
|
| 473 | + $qualifiedforclean=0; |
|
| 474 | + } |
|
| 475 | + if (preg_match('/^(DoTest|Under|Limits|Cards|CurrentValue|DateLimit|DateAndHour|NbOfLines|NbOfObjects|NbOfReferes|TotalTTCShort|VATs)/', $value)) { |
|
| 476 | + $qualifiedforclean=0; |
|
| 477 | + } |
|
| 317 | 478 | // modulebuilder |
| 318 | - if (preg_match('/^ModuleBuilderDesc/', $value)) $qualifiedforclean=0; |
|
| 479 | + if (preg_match('/^ModuleBuilderDesc/', $value)) { |
|
| 480 | + $qualifiedforclean=0; |
|
| 481 | + } |
|
| 319 | 482 | // orders |
| 320 | - if (preg_match('/^OrderSource/', $value)) $qualifiedforclean=0; |
|
| 321 | - if (preg_match('/^TypeContact_/', $value)) $qualifiedforclean=0; |
|
| 483 | + if (preg_match('/^OrderSource/', $value)) { |
|
| 484 | + $qualifiedforclean=0; |
|
| 485 | + } |
|
| 486 | + if (preg_match('/^TypeContact_/', $value)) { |
|
| 487 | + $qualifiedforclean=0; |
|
| 488 | + } |
|
| 322 | 489 | // other.lang |
| 323 | - if (preg_match('/^Notify_/', $value)) $qualifiedforclean=0; |
|
| 324 | - if (preg_match('/^PredefinedMail/', $value)) $qualifiedforclean=0; |
|
| 325 | - if (preg_match('/^DemoCompany/', $value)) $qualifiedforclean=0; |
|
| 326 | - if (preg_match('/^WeightUnit/', $value)) $qualifiedforclean=0; |
|
| 327 | - if (preg_match('/^LengthUnit/', $value)) $qualifiedforclean=0; |
|
| 328 | - if (preg_match('/^SurfaceUnit/', $value)) $qualifiedforclean=0; |
|
| 329 | - if (preg_match('/^VolumeUnit/', $value)) $qualifiedforclean=0; |
|
| 330 | - if (preg_match('/^SizeUnit/', $value)) $qualifiedforclean=0; |
|
| 331 | - if (preg_match('/^EMailText/', $value)) $qualifiedforclean=0; |
|
| 332 | - if (preg_match('/ById$/', $value)) $qualifiedforclean=0; |
|
| 333 | - if (preg_match('/ByLogin$/', $value)) $qualifiedforclean=0; |
|
| 490 | + if (preg_match('/^Notify_/', $value)) { |
|
| 491 | + $qualifiedforclean=0; |
|
| 492 | + } |
|
| 493 | + if (preg_match('/^PredefinedMail/', $value)) { |
|
| 494 | + $qualifiedforclean=0; |
|
| 495 | + } |
|
| 496 | + if (preg_match('/^DemoCompany/', $value)) { |
|
| 497 | + $qualifiedforclean=0; |
|
| 498 | + } |
|
| 499 | + if (preg_match('/^WeightUnit/', $value)) { |
|
| 500 | + $qualifiedforclean=0; |
|
| 501 | + } |
|
| 502 | + if (preg_match('/^LengthUnit/', $value)) { |
|
| 503 | + $qualifiedforclean=0; |
|
| 504 | + } |
|
| 505 | + if (preg_match('/^SurfaceUnit/', $value)) { |
|
| 506 | + $qualifiedforclean=0; |
|
| 507 | + } |
|
| 508 | + if (preg_match('/^VolumeUnit/', $value)) { |
|
| 509 | + $qualifiedforclean=0; |
|
| 510 | + } |
|
| 511 | + if (preg_match('/^SizeUnit/', $value)) { |
|
| 512 | + $qualifiedforclean=0; |
|
| 513 | + } |
|
| 514 | + if (preg_match('/^EMailText/', $value)) { |
|
| 515 | + $qualifiedforclean=0; |
|
| 516 | + } |
|
| 517 | + if (preg_match('/ById$/', $value)) { |
|
| 518 | + $qualifiedforclean=0; |
|
| 519 | + } |
|
| 520 | + if (preg_match('/ByLogin$/', $value)) { |
|
| 521 | + $qualifiedforclean=0; |
|
| 522 | + } |
|
| 334 | 523 | // printing |
| 335 | - if (preg_match('/PrintingDriverDesc$/', $value)) $qualifiedforclean=0; |
|
| 336 | - if (preg_match('/PrintTestDesc$/', $value)) $qualifiedforclean=0; |
|
| 524 | + if (preg_match('/PrintingDriverDesc$/', $value)) { |
|
| 525 | + $qualifiedforclean=0; |
|
| 526 | + } |
|
| 527 | + if (preg_match('/PrintTestDesc$/', $value)) { |
|
| 528 | + $qualifiedforclean=0; |
|
| 529 | + } |
|
| 337 | 530 | // products |
| 338 | - if (preg_match('/GlobalVariableUpdaterType$/', $value)) $qualifiedforclean=0; |
|
| 339 | - if (preg_match('/GlobalVariableUpdaterHelp$/', $value)) $qualifiedforclean=0; |
|
| 340 | - if (preg_match('/OppStatus/', $value)) $qualifiedforclean=0; |
|
| 341 | - if (preg_match('/AvailabilityType/', $value)) $qualifiedforclean=0; |
|
| 342 | - if (preg_match('/CardProduct/', $value)) $qualifiedforclean=0; |
|
| 531 | + if (preg_match('/GlobalVariableUpdaterType$/', $value)) { |
|
| 532 | + $qualifiedforclean=0; |
|
| 533 | + } |
|
| 534 | + if (preg_match('/GlobalVariableUpdaterHelp$/', $value)) { |
|
| 535 | + $qualifiedforclean=0; |
|
| 536 | + } |
|
| 537 | + if (preg_match('/OppStatus/', $value)) { |
|
| 538 | + $qualifiedforclean=0; |
|
| 539 | + } |
|
| 540 | + if (preg_match('/AvailabilityType/', $value)) { |
|
| 541 | + $qualifiedforclean=0; |
|
| 542 | + } |
|
| 543 | + if (preg_match('/CardProduct/', $value)) { |
|
| 544 | + $qualifiedforclean=0; |
|
| 545 | + } |
|
| 343 | 546 | |
| 344 | - if (preg_match('/sms/i', $value)) $qualifiedforclean=0; |
|
| 345 | - if (preg_match('/TF_/i', $value)) $qualifiedforclean=0; |
|
| 346 | - if (preg_match('/WithBankUsing/i', $value)) $qualifiedforclean=0; |
|
| 347 | - if (preg_match('/descWORKFLOW_/i', $value)) $qualifiedforclean=0; |
|
| 547 | + if (preg_match('/sms/i', $value)) { |
|
| 548 | + $qualifiedforclean=0; |
|
| 549 | + } |
|
| 550 | + if (preg_match('/TF_/i', $value)) { |
|
| 551 | + $qualifiedforclean=0; |
|
| 552 | + } |
|
| 553 | + if (preg_match('/WithBankUsing/i', $value)) { |
|
| 554 | + $qualifiedforclean=0; |
|
| 555 | + } |
|
| 556 | + if (preg_match('/descWORKFLOW_/i', $value)) { |
|
| 557 | + $qualifiedforclean=0; |
|
| 558 | + } |
|
| 348 | 559 | |
| 349 | 560 | if (! $qualifiedforclean) |
| 350 | 561 | { |
@@ -359,24 +570,28 @@ discard block |
||
| 359 | 570 | if (empty($output)) { |
| 360 | 571 | $unused[$value] = $line; |
| 361 | 572 | echo $line; // $trad contains the \n |
| 362 | - } |
|
| 363 | - else |
|
| 573 | + } else |
|
| 364 | 574 | { |
| 365 | 575 | unset($output); |
| 366 | 576 | //print 'X'.$output.'Y'; |
| 367 | 577 | } |
| 368 | 578 | } |
| 369 | 579 | |
| 370 | - if (empty($unused)) print "No string not used found.\n"; |
|
| 371 | - else |
|
| 580 | + if (empty($unused)) { |
|
| 581 | + print "No string not used found.\n"; |
|
| 582 | + } else |
|
| 372 | 583 | { |
| 373 | 584 | $filetosave='/tmp/'.($argv[2]?$argv[2]:"").'notused.lang'; |
| 374 | 585 | print "Strings in en_US that are never used are saved into file ".$filetosave.":\n"; |
| 375 | 586 | file_put_contents($filetosave, implode("",$unused)); |
| 376 | 587 | print "To remove from original file, run command :\n"; |
| 377 | - if (($argv[2]?$argv[2]:"")) print 'cd htdocs/langs/en_US; mv '.($argv[2]?$argv[2]:"")." ".($argv[2]?$argv[2]:"").".tmp; "; |
|
| 588 | + if (($argv[2]?$argv[2]:"")) { |
|
| 589 | + print 'cd htdocs/langs/en_US; mv '.($argv[2]?$argv[2]:"")." ".($argv[2]?$argv[2]:"").".tmp; "; |
|
| 590 | + } |
|
| 378 | 591 | print "diff ".($argv[2]?$argv[2]:"").".tmp ".$filetosave." | grep \< | cut -b 3- > ".($argv[2]?$argv[2]:""); |
| 379 | - if (($argv[2]?$argv[2]:"")) print "; rm ".($argv[2]?$argv[2]:"").".tmp;\n"; |
|
| 592 | + if (($argv[2]?$argv[2]:"")) { |
|
| 593 | + print "; rm ".($argv[2]?$argv[2]:"").".tmp;\n"; |
|
| 594 | + } |
|
| 380 | 595 | } |
| 381 | 596 | } |
| 382 | 597 | |
@@ -27,17 +27,17 @@ discard block |
||
| 27 | 27 | */ |
| 28 | 28 | class autoTranslator |
| 29 | 29 | { |
| 30 | - private $_translatedFiles = array(); |
|
| 31 | - private $_destlang = ''; |
|
| 32 | - private $_refLang = ''; |
|
| 33 | - private $_langDir = ''; |
|
| 34 | - private $_limittofile = ''; |
|
| 35 | - private $_time; |
|
| 36 | - private $_time_end; |
|
| 37 | - private $_outputpagecode = 'UTF-8'; |
|
| 38 | - private $_apikey; |
|
| 39 | - //private $_outputpagecode = 'ISO-8859-1'; |
|
| 40 | - const DIR_SEPARATOR = '/'; |
|
| 30 | + private $_translatedFiles = array(); |
|
| 31 | + private $_destlang = ''; |
|
| 32 | + private $_refLang = ''; |
|
| 33 | + private $_langDir = ''; |
|
| 34 | + private $_limittofile = ''; |
|
| 35 | + private $_time; |
|
| 36 | + private $_time_end; |
|
| 37 | + private $_outputpagecode = 'UTF-8'; |
|
| 38 | + private $_apikey; |
|
| 39 | + //private $_outputpagecode = 'ISO-8859-1'; |
|
| 40 | + const DIR_SEPARATOR = '/'; |
|
| 41 | 41 | |
| 42 | 42 | |
| 43 | 43 | /** |
@@ -53,296 +53,296 @@ discard block |
||
| 53 | 53 | function __construct($_destlang,$_refLang,$_langDir,$_limittofile,$_apikey) |
| 54 | 54 | { |
| 55 | 55 | |
| 56 | - // Set enviorment variables |
|
| 57 | - $this->_destlang = $_destlang; |
|
| 58 | - $this->_refLang = $_refLang; |
|
| 59 | - $this->_langDir = $_langDir.self::DIR_SEPARATOR; |
|
| 60 | - $this->_time = date('Y-m-d H:i:s'); |
|
| 61 | - $this->_limittofile = $_limittofile; |
|
| 56 | + // Set enviorment variables |
|
| 57 | + $this->_destlang = $_destlang; |
|
| 58 | + $this->_refLang = $_refLang; |
|
| 59 | + $this->_langDir = $_langDir.self::DIR_SEPARATOR; |
|
| 60 | + $this->_time = date('Y-m-d H:i:s'); |
|
| 61 | + $this->_limittofile = $_limittofile; |
|
| 62 | 62 | $this->_apikey = $_apikey; |
| 63 | 63 | |
| 64 | - // Translate |
|
| 65 | - //ini_set('default_charset','UTF-8'); |
|
| 66 | - ini_set('default_charset',$this->_outputpagecode); |
|
| 67 | - $this->parseRefLangTranslationFiles(); |
|
| 68 | - } |
|
| 69 | - |
|
| 70 | - /** |
|
| 71 | - * Parse file |
|
| 72 | - * |
|
| 73 | - * @return void |
|
| 74 | - */ |
|
| 75 | - private function parseRefLangTranslationFiles() |
|
| 76 | - { |
|
| 77 | - |
|
| 78 | - $files = $this->getTranslationFilesArray($this->_refLang); |
|
| 79 | - $counter = 1; |
|
| 80 | - foreach($files as $file) |
|
| 81 | - { |
|
| 82 | - if ($this->_limittofile && $this->_limittofile != $file) continue; |
|
| 83 | - $counter++; |
|
| 84 | - $fileContent = null; |
|
| 85 | - $refPath = $this->_langDir.$this->_refLang.self::DIR_SEPARATOR.$file; |
|
| 86 | - $fileContent = file($refPath,FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES); |
|
| 87 | - print "Processing file " . $file . ", with ".count($fileContent)." lines<br>\n"; |
|
| 88 | - |
|
| 89 | - // Define target dirs |
|
| 90 | - $targetlangs=array($this->_destlang); |
|
| 91 | - if ($this->_destlang == 'all') |
|
| 92 | - { |
|
| 93 | - $targetlangs=array(); |
|
| 94 | - |
|
| 95 | - // If we must process all languages |
|
| 96 | - $arraytmp=dol_dir_list($this->_langDir,'directories',0); |
|
| 97 | - foreach($arraytmp as $dirtmp) |
|
| 98 | - { |
|
| 99 | - if ($dirtmp['name'] === $this->_refLang) continue; // We discard source language |
|
| 100 | - $tmppart=explode('_',$dirtmp['name']); |
|
| 101 | - if (preg_match('/^en/i',$dirtmp['name'])) continue; // We discard en_* languages |
|
| 102 | - if (preg_match('/^fr/i',$dirtmp['name'])) continue; // We discard fr_* languages |
|
| 103 | - if (preg_match('/^es/i',$dirtmp['name'])) continue; // We discard es_* languages |
|
| 104 | - if (preg_match('/ca_ES/i',$dirtmp['name'])) continue; // We discard es_CA language |
|
| 105 | - if (preg_match('/pt_BR/i',$dirtmp['name'])) continue; // We discard pt_BR language |
|
| 64 | + // Translate |
|
| 65 | + //ini_set('default_charset','UTF-8'); |
|
| 66 | + ini_set('default_charset',$this->_outputpagecode); |
|
| 67 | + $this->parseRefLangTranslationFiles(); |
|
| 68 | + } |
|
| 69 | + |
|
| 70 | + /** |
|
| 71 | + * Parse file |
|
| 72 | + * |
|
| 73 | + * @return void |
|
| 74 | + */ |
|
| 75 | + private function parseRefLangTranslationFiles() |
|
| 76 | + { |
|
| 77 | + |
|
| 78 | + $files = $this->getTranslationFilesArray($this->_refLang); |
|
| 79 | + $counter = 1; |
|
| 80 | + foreach($files as $file) |
|
| 81 | + { |
|
| 82 | + if ($this->_limittofile && $this->_limittofile != $file) continue; |
|
| 83 | + $counter++; |
|
| 84 | + $fileContent = null; |
|
| 85 | + $refPath = $this->_langDir.$this->_refLang.self::DIR_SEPARATOR.$file; |
|
| 86 | + $fileContent = file($refPath,FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES); |
|
| 87 | + print "Processing file " . $file . ", with ".count($fileContent)." lines<br>\n"; |
|
| 88 | + |
|
| 89 | + // Define target dirs |
|
| 90 | + $targetlangs=array($this->_destlang); |
|
| 91 | + if ($this->_destlang == 'all') |
|
| 92 | + { |
|
| 93 | + $targetlangs=array(); |
|
| 94 | + |
|
| 95 | + // If we must process all languages |
|
| 96 | + $arraytmp=dol_dir_list($this->_langDir,'directories',0); |
|
| 97 | + foreach($arraytmp as $dirtmp) |
|
| 98 | + { |
|
| 99 | + if ($dirtmp['name'] === $this->_refLang) continue; // We discard source language |
|
| 100 | + $tmppart=explode('_',$dirtmp['name']); |
|
| 101 | + if (preg_match('/^en/i',$dirtmp['name'])) continue; // We discard en_* languages |
|
| 102 | + if (preg_match('/^fr/i',$dirtmp['name'])) continue; // We discard fr_* languages |
|
| 103 | + if (preg_match('/^es/i',$dirtmp['name'])) continue; // We discard es_* languages |
|
| 104 | + if (preg_match('/ca_ES/i',$dirtmp['name'])) continue; // We discard es_CA language |
|
| 105 | + if (preg_match('/pt_BR/i',$dirtmp['name'])) continue; // We discard pt_BR language |
|
| 106 | 106 | if (preg_match('/nl_BE/i',$dirtmp['name'])) continue; // We discard nl_BE language |
| 107 | - if (preg_match('/^\./i',$dirtmp['name'])) continue; // We discard files .* |
|
| 108 | - if (preg_match('/^CVS/i',$dirtmp['name'])) continue; // We discard CVS |
|
| 109 | - $targetlangs[]=$dirtmp['name']; |
|
| 110 | - } |
|
| 111 | - //var_dump($targetlangs); |
|
| 112 | - } |
|
| 113 | - |
|
| 114 | - // Process translation of source file for each target languages |
|
| 115 | - foreach($targetlangs as $my_destlang) |
|
| 116 | - { |
|
| 117 | - $this->_translatedFiles = array(); |
|
| 118 | - |
|
| 119 | - $destPath = $this->_langDir.$my_destlang.self::DIR_SEPARATOR.$file; |
|
| 120 | - // Check destination file presence |
|
| 121 | - if (! file_exists($destPath)) |
|
| 122 | - { |
|
| 123 | - // No file present, we generate file |
|
| 124 | - echo "File not found: " . $destPath . ". We generate it.<br>\n"; |
|
| 125 | - $this->createTranslationFile($destPath,$my_destlang); |
|
| 126 | - } |
|
| 127 | - else |
|
| 128 | - { |
|
| 129 | - echo "Updating file: " . $destPath . "<br>\n"; |
|
| 130 | - } |
|
| 131 | - |
|
| 132 | - // Translate lines |
|
| 133 | - $fileContentDest = file($destPath,FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES); |
|
| 134 | - $newlines=0; |
|
| 135 | - foreach($fileContent as $line){ |
|
| 136 | - $key = $this->getLineKey($line); |
|
| 137 | - $value = $this->getLineValue($line); |
|
| 138 | - if ($key && $value) |
|
| 139 | - { |
|
| 140 | - $newlines+=$this->translateFileLine($fileContentDest,$file,$key,$value,$my_destlang); |
|
| 141 | - } |
|
| 142 | - } |
|
| 143 | - |
|
| 144 | - $this->updateTranslationFile($destPath,$file,$my_destlang); |
|
| 145 | - echo "New translated lines: " . $newlines . "<br>\n"; |
|
| 146 | - //if ($counter ==3) die('fim'); |
|
| 147 | - } |
|
| 148 | - } |
|
| 149 | - } |
|
| 150 | - |
|
| 151 | - /** |
|
| 152 | - * Update file with new translations |
|
| 153 | - * |
|
| 154 | - * @param string $destPath Target path |
|
| 155 | - * @param string $file File |
|
| 156 | - * @param string $my_destlang Target language code |
|
| 157 | - * @return void |
|
| 158 | - */ |
|
| 159 | - private function updateTranslationFile($destPath,$file,$my_destlang) |
|
| 160 | - { |
|
| 161 | - $this->_time_end = date('Y-m-d H:i:s'); |
|
| 162 | - |
|
| 163 | - if (isset($this->_translatedFiles[$file]) && count($this->_translatedFiles[$file])>0) |
|
| 164 | - { |
|
| 165 | - $fp = fopen($destPath, 'a'); |
|
| 166 | - fwrite($fp, "\n"); |
|
| 167 | - fwrite($fp, "\n"); |
|
| 168 | - fwrite($fp, "// START - Lines generated via autotranslator.php tool (".$this->_time.").\n"); |
|
| 169 | - fwrite($fp, "// Reference language: ".$this->_refLang." -> ".$my_destlang."\n"); |
|
| 170 | - foreach( $this->_translatedFiles[$file] as $line) { |
|
| 171 | - fwrite($fp, $line . "\n"); |
|
| 172 | - } |
|
| 173 | - fwrite($fp, "// STOP - Lines generated via autotranslator.php tool (".$this->_time_end.").\n"); |
|
| 174 | - fclose($fp); |
|
| 175 | - } |
|
| 176 | - return; |
|
| 177 | - } |
|
| 178 | - |
|
| 179 | - /** |
|
| 180 | - * Create a new translation file |
|
| 181 | - * |
|
| 182 | - * @param string $path Path |
|
| 183 | - * @param string $my_destlang Target language code |
|
| 184 | - * @return void |
|
| 185 | - */ |
|
| 186 | - private function createTranslationFile($path,$my_destlang) |
|
| 187 | - { |
|
| 188 | - $fp = fopen($path, 'w+'); |
|
| 189 | - fwrite($fp, "/*\n"); |
|
| 190 | - fwrite($fp, " * Language code: {$my_destlang}\n"); |
|
| 191 | - fwrite($fp, " * Automatic generated via autotranslator.php tool\n"); |
|
| 192 | - fwrite($fp, " * Generation date " . $this->_time. "\n"); |
|
| 193 | - fwrite($fp, " */\n"); |
|
| 194 | - fclose($fp); |
|
| 195 | - return; |
|
| 196 | - } |
|
| 197 | - |
|
| 198 | - /** |
|
| 199 | - * Put in array _translatedFiles[$file], line of a new tranlated pair |
|
| 200 | - * |
|
| 201 | - * @param string $content Existing content of dest file |
|
| 202 | - * @param string $file Target file name translated (xxxx.lang) |
|
| 203 | - * @param string $key Key to translate |
|
| 204 | - * @param string $value Existing value in source file |
|
| 205 | - * @param string $my_destlang Language code (ie: fr_FR) |
|
| 206 | - * @return int 0=Nothing translated, 1=Record translated |
|
| 207 | - */ |
|
| 208 | - private function translateFileLine($content,$file,$key,$value,$my_destlang) |
|
| 209 | - { |
|
| 210 | - |
|
| 211 | - //print "key =".$key."\n"; |
|
| 212 | - foreach( $content as $line ) { |
|
| 213 | - $destKey = $this->getLineKey($line); |
|
| 214 | - $destValue = $this->getLineValue($line); |
|
| 215 | - // If translated return |
|
| 216 | - //print "destKey=".$destKey."\n"; |
|
| 217 | - if ( trim($destKey) == trim($key) ) |
|
| 218 | - { // Found already existing translation (key already exits in dest file) |
|
| 219 | - return 0; |
|
| 220 | - } |
|
| 221 | - } |
|
| 222 | - |
|
| 223 | - if ($key == 'CHARSET') $val=$this->_outputpagecode; |
|
| 224 | - else if (preg_match('/^Format/',$key)) $val=$value; |
|
| 225 | - else if ($value=='-') $val=$value; |
|
| 226 | - else |
|
| 227 | - { |
|
| 228 | - // If not translated then translate |
|
| 229 | - if ($this->_outputpagecode == 'UTF-8') $val=$this->translateTexts(array($value),substr($this->_refLang,0,2),substr($my_destlang,0,2)); |
|
| 230 | - else $val=utf8_decode($this->translateTexts(array($value),substr($this->_refLang,0,2),substr($my_destlang,0,2))); |
|
| 231 | - } |
|
| 232 | - |
|
| 233 | - $val=trim($val); |
|
| 234 | - |
|
| 235 | - if (empty($val)) return 0; |
|
| 236 | - |
|
| 237 | - $this->_translatedFiles[$file][] = $key . '=' . $val ; |
|
| 238 | - return 1; |
|
| 239 | - } |
|
| 240 | - |
|
| 241 | - /** |
|
| 242 | - * getLineKey |
|
| 243 | - * |
|
| 244 | - * @param string $line Line found into file |
|
| 245 | - * @return string Key |
|
| 246 | - */ |
|
| 247 | - private function getLineKey($line) |
|
| 248 | - { |
|
| 249 | - $arraykey = explode('=',$line,2); |
|
| 250 | - return trim($arraykey[0]); |
|
| 251 | - } |
|
| 252 | - |
|
| 253 | - /** |
|
| 254 | - * getLineValue |
|
| 255 | - * |
|
| 256 | - * @param string $line Line found into file |
|
| 257 | - * @return string Value |
|
| 258 | - */ |
|
| 259 | - private function getLineValue($line) |
|
| 260 | - { |
|
| 261 | - $arraykey = explode('=',$line,2); |
|
| 262 | - return trim(isset($arraykey[1])?$arraykey[1]:''); |
|
| 263 | - } |
|
| 264 | - |
|
| 265 | - /** |
|
| 266 | - * getTranslationFilesArray |
|
| 267 | - * |
|
| 268 | - * @param string $lang Language code |
|
| 269 | - * @return array Array |
|
| 270 | - */ |
|
| 271 | - private function getTranslationFilesArray($lang) |
|
| 272 | - { |
|
| 273 | - $dir = new DirectoryIterator($this->_langDir.$lang); |
|
| 274 | - while($dir->valid()) { |
|
| 275 | - if(!$dir->isDot() && $dir->isFile() && ! preg_match('/^\./',$dir->getFilename())) { |
|
| 276 | - $files[] = $dir->getFilename(); |
|
| 277 | - } |
|
| 278 | - $dir->next(); |
|
| 279 | - } |
|
| 280 | - return $files; |
|
| 281 | - } |
|
| 282 | - |
|
| 283 | - /** |
|
| 284 | - * Return translation of a value |
|
| 285 | - * |
|
| 286 | - * @param array $src_texts Array with one value |
|
| 287 | - * @param string $src_lang Language code source (us, fr, it, ...) |
|
| 288 | - * @param string $dest_lang Language code target (es, de, ...) |
|
| 289 | - * @return string Value translated |
|
| 290 | - */ |
|
| 291 | - private function translateTexts($src_texts, $src_lang, $dest_lang) |
|
| 292 | - { |
|
| 293 | - // We want to be sure that src_lang and dest_lang are using 2 chars only |
|
| 294 | - $tmp=explode('_',$src_lang); |
|
| 295 | - if (! empty($tmp[1]) && $tmp[0] == $tmp[1]) $src_lang=$tmp[0]; |
|
| 296 | - $tmp=explode('_',$dest_lang); |
|
| 297 | - if (! empty($tmp[1]) && $tmp[0] == $tmp[1]) $dest_lang=$tmp[0]; |
|
| 298 | - |
|
| 299 | - //setting language pair |
|
| 300 | - $lang_pair = $src_lang.'|'.$dest_lang; |
|
| 301 | - |
|
| 302 | - $src_text_to_translate=preg_replace('/%s/','SSSSS',implode('',$src_texts)); |
|
| 303 | - $src_text_to_translate=preg_replace('/'.preg_quote('\n\n').'/',' NNNNN ',$src_text_to_translate); |
|
| 304 | - |
|
| 305 | - // Define GET URL v1 |
|
| 306 | - //$url = "http://ajax.googleapis.com/ajax/services/language/translate?v=1.0&q=".urlencode($src_text_to_translate)."&langpair=".urlencode($lang_pair); |
|
| 307 | - // Example: http://ajax.googleapis.com/ajax/services/language/translate?v=1.0&q=Setup%20area&langpair=en_US|fr_FR |
|
| 107 | + if (preg_match('/^\./i',$dirtmp['name'])) continue; // We discard files .* |
|
| 108 | + if (preg_match('/^CVS/i',$dirtmp['name'])) continue; // We discard CVS |
|
| 109 | + $targetlangs[]=$dirtmp['name']; |
|
| 110 | + } |
|
| 111 | + //var_dump($targetlangs); |
|
| 112 | + } |
|
| 113 | + |
|
| 114 | + // Process translation of source file for each target languages |
|
| 115 | + foreach($targetlangs as $my_destlang) |
|
| 116 | + { |
|
| 117 | + $this->_translatedFiles = array(); |
|
| 118 | + |
|
| 119 | + $destPath = $this->_langDir.$my_destlang.self::DIR_SEPARATOR.$file; |
|
| 120 | + // Check destination file presence |
|
| 121 | + if (! file_exists($destPath)) |
|
| 122 | + { |
|
| 123 | + // No file present, we generate file |
|
| 124 | + echo "File not found: " . $destPath . ". We generate it.<br>\n"; |
|
| 125 | + $this->createTranslationFile($destPath,$my_destlang); |
|
| 126 | + } |
|
| 127 | + else |
|
| 128 | + { |
|
| 129 | + echo "Updating file: " . $destPath . "<br>\n"; |
|
| 130 | + } |
|
| 131 | + |
|
| 132 | + // Translate lines |
|
| 133 | + $fileContentDest = file($destPath,FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES); |
|
| 134 | + $newlines=0; |
|
| 135 | + foreach($fileContent as $line){ |
|
| 136 | + $key = $this->getLineKey($line); |
|
| 137 | + $value = $this->getLineValue($line); |
|
| 138 | + if ($key && $value) |
|
| 139 | + { |
|
| 140 | + $newlines+=$this->translateFileLine($fileContentDest,$file,$key,$value,$my_destlang); |
|
| 141 | + } |
|
| 142 | + } |
|
| 143 | + |
|
| 144 | + $this->updateTranslationFile($destPath,$file,$my_destlang); |
|
| 145 | + echo "New translated lines: " . $newlines . "<br>\n"; |
|
| 146 | + //if ($counter ==3) die('fim'); |
|
| 147 | + } |
|
| 148 | + } |
|
| 149 | + } |
|
| 150 | + |
|
| 151 | + /** |
|
| 152 | + * Update file with new translations |
|
| 153 | + * |
|
| 154 | + * @param string $destPath Target path |
|
| 155 | + * @param string $file File |
|
| 156 | + * @param string $my_destlang Target language code |
|
| 157 | + * @return void |
|
| 158 | + */ |
|
| 159 | + private function updateTranslationFile($destPath,$file,$my_destlang) |
|
| 160 | + { |
|
| 161 | + $this->_time_end = date('Y-m-d H:i:s'); |
|
| 162 | + |
|
| 163 | + if (isset($this->_translatedFiles[$file]) && count($this->_translatedFiles[$file])>0) |
|
| 164 | + { |
|
| 165 | + $fp = fopen($destPath, 'a'); |
|
| 166 | + fwrite($fp, "\n"); |
|
| 167 | + fwrite($fp, "\n"); |
|
| 168 | + fwrite($fp, "// START - Lines generated via autotranslator.php tool (".$this->_time.").\n"); |
|
| 169 | + fwrite($fp, "// Reference language: ".$this->_refLang." -> ".$my_destlang."\n"); |
|
| 170 | + foreach( $this->_translatedFiles[$file] as $line) { |
|
| 171 | + fwrite($fp, $line . "\n"); |
|
| 172 | + } |
|
| 173 | + fwrite($fp, "// STOP - Lines generated via autotranslator.php tool (".$this->_time_end.").\n"); |
|
| 174 | + fclose($fp); |
|
| 175 | + } |
|
| 176 | + return; |
|
| 177 | + } |
|
| 178 | + |
|
| 179 | + /** |
|
| 180 | + * Create a new translation file |
|
| 181 | + * |
|
| 182 | + * @param string $path Path |
|
| 183 | + * @param string $my_destlang Target language code |
|
| 184 | + * @return void |
|
| 185 | + */ |
|
| 186 | + private function createTranslationFile($path,$my_destlang) |
|
| 187 | + { |
|
| 188 | + $fp = fopen($path, 'w+'); |
|
| 189 | + fwrite($fp, "/*\n"); |
|
| 190 | + fwrite($fp, " * Language code: {$my_destlang}\n"); |
|
| 191 | + fwrite($fp, " * Automatic generated via autotranslator.php tool\n"); |
|
| 192 | + fwrite($fp, " * Generation date " . $this->_time. "\n"); |
|
| 193 | + fwrite($fp, " */\n"); |
|
| 194 | + fclose($fp); |
|
| 195 | + return; |
|
| 196 | + } |
|
| 197 | + |
|
| 198 | + /** |
|
| 199 | + * Put in array _translatedFiles[$file], line of a new tranlated pair |
|
| 200 | + * |
|
| 201 | + * @param string $content Existing content of dest file |
|
| 202 | + * @param string $file Target file name translated (xxxx.lang) |
|
| 203 | + * @param string $key Key to translate |
|
| 204 | + * @param string $value Existing value in source file |
|
| 205 | + * @param string $my_destlang Language code (ie: fr_FR) |
|
| 206 | + * @return int 0=Nothing translated, 1=Record translated |
|
| 207 | + */ |
|
| 208 | + private function translateFileLine($content,$file,$key,$value,$my_destlang) |
|
| 209 | + { |
|
| 210 | + |
|
| 211 | + //print "key =".$key."\n"; |
|
| 212 | + foreach( $content as $line ) { |
|
| 213 | + $destKey = $this->getLineKey($line); |
|
| 214 | + $destValue = $this->getLineValue($line); |
|
| 215 | + // If translated return |
|
| 216 | + //print "destKey=".$destKey."\n"; |
|
| 217 | + if ( trim($destKey) == trim($key) ) |
|
| 218 | + { // Found already existing translation (key already exits in dest file) |
|
| 219 | + return 0; |
|
| 220 | + } |
|
| 221 | + } |
|
| 222 | + |
|
| 223 | + if ($key == 'CHARSET') $val=$this->_outputpagecode; |
|
| 224 | + else if (preg_match('/^Format/',$key)) $val=$value; |
|
| 225 | + else if ($value=='-') $val=$value; |
|
| 226 | + else |
|
| 227 | + { |
|
| 228 | + // If not translated then translate |
|
| 229 | + if ($this->_outputpagecode == 'UTF-8') $val=$this->translateTexts(array($value),substr($this->_refLang,0,2),substr($my_destlang,0,2)); |
|
| 230 | + else $val=utf8_decode($this->translateTexts(array($value),substr($this->_refLang,0,2),substr($my_destlang,0,2))); |
|
| 231 | + } |
|
| 232 | + |
|
| 233 | + $val=trim($val); |
|
| 234 | + |
|
| 235 | + if (empty($val)) return 0; |
|
| 236 | + |
|
| 237 | + $this->_translatedFiles[$file][] = $key . '=' . $val ; |
|
| 238 | + return 1; |
|
| 239 | + } |
|
| 240 | + |
|
| 241 | + /** |
|
| 242 | + * getLineKey |
|
| 243 | + * |
|
| 244 | + * @param string $line Line found into file |
|
| 245 | + * @return string Key |
|
| 246 | + */ |
|
| 247 | + private function getLineKey($line) |
|
| 248 | + { |
|
| 249 | + $arraykey = explode('=',$line,2); |
|
| 250 | + return trim($arraykey[0]); |
|
| 251 | + } |
|
| 252 | + |
|
| 253 | + /** |
|
| 254 | + * getLineValue |
|
| 255 | + * |
|
| 256 | + * @param string $line Line found into file |
|
| 257 | + * @return string Value |
|
| 258 | + */ |
|
| 259 | + private function getLineValue($line) |
|
| 260 | + { |
|
| 261 | + $arraykey = explode('=',$line,2); |
|
| 262 | + return trim(isset($arraykey[1])?$arraykey[1]:''); |
|
| 263 | + } |
|
| 264 | + |
|
| 265 | + /** |
|
| 266 | + * getTranslationFilesArray |
|
| 267 | + * |
|
| 268 | + * @param string $lang Language code |
|
| 269 | + * @return array Array |
|
| 270 | + */ |
|
| 271 | + private function getTranslationFilesArray($lang) |
|
| 272 | + { |
|
| 273 | + $dir = new DirectoryIterator($this->_langDir.$lang); |
|
| 274 | + while($dir->valid()) { |
|
| 275 | + if(!$dir->isDot() && $dir->isFile() && ! preg_match('/^\./',$dir->getFilename())) { |
|
| 276 | + $files[] = $dir->getFilename(); |
|
| 277 | + } |
|
| 278 | + $dir->next(); |
|
| 279 | + } |
|
| 280 | + return $files; |
|
| 281 | + } |
|
| 282 | + |
|
| 283 | + /** |
|
| 284 | + * Return translation of a value |
|
| 285 | + * |
|
| 286 | + * @param array $src_texts Array with one value |
|
| 287 | + * @param string $src_lang Language code source (us, fr, it, ...) |
|
| 288 | + * @param string $dest_lang Language code target (es, de, ...) |
|
| 289 | + * @return string Value translated |
|
| 290 | + */ |
|
| 291 | + private function translateTexts($src_texts, $src_lang, $dest_lang) |
|
| 292 | + { |
|
| 293 | + // We want to be sure that src_lang and dest_lang are using 2 chars only |
|
| 294 | + $tmp=explode('_',$src_lang); |
|
| 295 | + if (! empty($tmp[1]) && $tmp[0] == $tmp[1]) $src_lang=$tmp[0]; |
|
| 296 | + $tmp=explode('_',$dest_lang); |
|
| 297 | + if (! empty($tmp[1]) && $tmp[0] == $tmp[1]) $dest_lang=$tmp[0]; |
|
| 298 | + |
|
| 299 | + //setting language pair |
|
| 300 | + $lang_pair = $src_lang.'|'.$dest_lang; |
|
| 301 | + |
|
| 302 | + $src_text_to_translate=preg_replace('/%s/','SSSSS',implode('',$src_texts)); |
|
| 303 | + $src_text_to_translate=preg_replace('/'.preg_quote('\n\n').'/',' NNNNN ',$src_text_to_translate); |
|
| 304 | + |
|
| 305 | + // Define GET URL v1 |
|
| 306 | + //$url = "http://ajax.googleapis.com/ajax/services/language/translate?v=1.0&q=".urlencode($src_text_to_translate)."&langpair=".urlencode($lang_pair); |
|
| 307 | + // Example: http://ajax.googleapis.com/ajax/services/language/translate?v=1.0&q=Setup%20area&langpair=en_US|fr_FR |
|
| 308 | 308 | // Define GET URL v2 |
| 309 | - $url = "https://www.googleapis.com/language/translate/v2?key=".$this->_apikey."&q=".urlencode($src_text_to_translate)."&source=".urlencode($src_lang)."&target=".urlencode($dest_lang); |
|
| 310 | - // Example: https://www.googleapis.com/language/translate/v2?key=_apikey&q=Setup%20area&source=en_US&target=fr_FR |
|
| 311 | - |
|
| 312 | - // Send request |
|
| 313 | - //print "Url to translate: ".$url."\n"; |
|
| 314 | - |
|
| 315 | - if (! function_exists("curl_init")) |
|
| 316 | - { |
|
| 317 | - print "Error, your PHP does not support curl functions.\n"; |
|
| 318 | - die(); |
|
| 319 | - } |
|
| 320 | - |
|
| 321 | - $ch = curl_init(); |
|
| 322 | - curl_setopt($ch, CURLOPT_URL, $url); |
|
| 323 | - curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); |
|
| 324 | - curl_setopt($ch, CURLOPT_REFERER, "Mozilla"); |
|
| 325 | - $body = curl_exec($ch); |
|
| 326 | - curl_close($ch); |
|
| 327 | - //sleep(1); // This is to avoid to overload server. |
|
| 328 | - |
|
| 329 | - // now, process the JSON string |
|
| 330 | - $json = json_decode($body, true); |
|
| 331 | - |
|
| 332 | - if ((! empty($json['responseStatus']) && $json['responseStatus'] != 200) |
|
| 333 | - || count($json['data']['translations']) == 0) |
|
| 334 | - { |
|
| 335 | - print "Error: ".$json['responseStatus']." ".$url."\n"; |
|
| 336 | - return false; |
|
| 337 | - } |
|
| 338 | - |
|
| 339 | - $rep=$json['data']['translations'][0]['translatedText']; |
|
| 340 | - $rep=preg_replace('/SSSSS/i','%s',$rep); |
|
| 341 | - $rep=preg_replace('/NNNNN/i','\n\n',$rep); |
|
| 342 | - $rep=preg_replace('/'/i','\'',$rep); |
|
| 343 | - |
|
| 344 | - //print "OK ".join('',$src_texts).' => '.$rep."\n"; |
|
| 345 | - |
|
| 346 | - return $rep; |
|
| 347 | - } |
|
| 309 | + $url = "https://www.googleapis.com/language/translate/v2?key=".$this->_apikey."&q=".urlencode($src_text_to_translate)."&source=".urlencode($src_lang)."&target=".urlencode($dest_lang); |
|
| 310 | + // Example: https://www.googleapis.com/language/translate/v2?key=_apikey&q=Setup%20area&source=en_US&target=fr_FR |
|
| 311 | + |
|
| 312 | + // Send request |
|
| 313 | + //print "Url to translate: ".$url."\n"; |
|
| 314 | + |
|
| 315 | + if (! function_exists("curl_init")) |
|
| 316 | + { |
|
| 317 | + print "Error, your PHP does not support curl functions.\n"; |
|
| 318 | + die(); |
|
| 319 | + } |
|
| 320 | + |
|
| 321 | + $ch = curl_init(); |
|
| 322 | + curl_setopt($ch, CURLOPT_URL, $url); |
|
| 323 | + curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); |
|
| 324 | + curl_setopt($ch, CURLOPT_REFERER, "Mozilla"); |
|
| 325 | + $body = curl_exec($ch); |
|
| 326 | + curl_close($ch); |
|
| 327 | + //sleep(1); // This is to avoid to overload server. |
|
| 328 | + |
|
| 329 | + // now, process the JSON string |
|
| 330 | + $json = json_decode($body, true); |
|
| 331 | + |
|
| 332 | + if ((! empty($json['responseStatus']) && $json['responseStatus'] != 200) |
|
| 333 | + || count($json['data']['translations']) == 0) |
|
| 334 | + { |
|
| 335 | + print "Error: ".$json['responseStatus']." ".$url."\n"; |
|
| 336 | + return false; |
|
| 337 | + } |
|
| 338 | + |
|
| 339 | + $rep=$json['data']['translations'][0]['translatedText']; |
|
| 340 | + $rep=preg_replace('/SSSSS/i','%s',$rep); |
|
| 341 | + $rep=preg_replace('/NNNNN/i','\n\n',$rep); |
|
| 342 | + $rep=preg_replace('/'/i','\'',$rep); |
|
| 343 | + |
|
| 344 | + //print "OK ".join('',$src_texts).' => '.$rep."\n"; |
|
| 345 | + |
|
| 346 | + return $rep; |
|
| 347 | + } |
|
| 348 | 348 | } |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | * @param string $_apikey Api key |
| 51 | 51 | * @return void |
| 52 | 52 | */ |
| 53 | - function __construct($_destlang,$_refLang,$_langDir,$_limittofile,$_apikey) |
|
| 53 | + function __construct($_destlang, $_refLang, $_langDir, $_limittofile, $_apikey) |
|
| 54 | 54 | { |
| 55 | 55 | |
| 56 | 56 | // Set enviorment variables |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | |
| 64 | 64 | // Translate |
| 65 | 65 | //ini_set('default_charset','UTF-8'); |
| 66 | - ini_set('default_charset',$this->_outputpagecode); |
|
| 66 | + ini_set('default_charset', $this->_outputpagecode); |
|
| 67 | 67 | $this->parseRefLangTranslationFiles(); |
| 68 | 68 | } |
| 69 | 69 | |
@@ -77,72 +77,72 @@ discard block |
||
| 77 | 77 | |
| 78 | 78 | $files = $this->getTranslationFilesArray($this->_refLang); |
| 79 | 79 | $counter = 1; |
| 80 | - foreach($files as $file) |
|
| 80 | + foreach ($files as $file) |
|
| 81 | 81 | { |
| 82 | 82 | if ($this->_limittofile && $this->_limittofile != $file) continue; |
| 83 | 83 | $counter++; |
| 84 | 84 | $fileContent = null; |
| 85 | 85 | $refPath = $this->_langDir.$this->_refLang.self::DIR_SEPARATOR.$file; |
| 86 | - $fileContent = file($refPath,FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES); |
|
| 87 | - print "Processing file " . $file . ", with ".count($fileContent)." lines<br>\n"; |
|
| 86 | + $fileContent = file($refPath, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES); |
|
| 87 | + print "Processing file ".$file.", with ".count($fileContent)." lines<br>\n"; |
|
| 88 | 88 | |
| 89 | 89 | // Define target dirs |
| 90 | - $targetlangs=array($this->_destlang); |
|
| 90 | + $targetlangs = array($this->_destlang); |
|
| 91 | 91 | if ($this->_destlang == 'all') |
| 92 | 92 | { |
| 93 | - $targetlangs=array(); |
|
| 93 | + $targetlangs = array(); |
|
| 94 | 94 | |
| 95 | 95 | // If we must process all languages |
| 96 | - $arraytmp=dol_dir_list($this->_langDir,'directories',0); |
|
| 97 | - foreach($arraytmp as $dirtmp) |
|
| 96 | + $arraytmp = dol_dir_list($this->_langDir, 'directories', 0); |
|
| 97 | + foreach ($arraytmp as $dirtmp) |
|
| 98 | 98 | { |
| 99 | - if ($dirtmp['name'] === $this->_refLang) continue; // We discard source language |
|
| 100 | - $tmppart=explode('_',$dirtmp['name']); |
|
| 101 | - if (preg_match('/^en/i',$dirtmp['name'])) continue; // We discard en_* languages |
|
| 102 | - if (preg_match('/^fr/i',$dirtmp['name'])) continue; // We discard fr_* languages |
|
| 103 | - if (preg_match('/^es/i',$dirtmp['name'])) continue; // We discard es_* languages |
|
| 104 | - if (preg_match('/ca_ES/i',$dirtmp['name'])) continue; // We discard es_CA language |
|
| 105 | - if (preg_match('/pt_BR/i',$dirtmp['name'])) continue; // We discard pt_BR language |
|
| 106 | - if (preg_match('/nl_BE/i',$dirtmp['name'])) continue; // We discard nl_BE language |
|
| 107 | - if (preg_match('/^\./i',$dirtmp['name'])) continue; // We discard files .* |
|
| 108 | - if (preg_match('/^CVS/i',$dirtmp['name'])) continue; // We discard CVS |
|
| 109 | - $targetlangs[]=$dirtmp['name']; |
|
| 99 | + if ($dirtmp['name'] === $this->_refLang) continue; // We discard source language |
|
| 100 | + $tmppart = explode('_', $dirtmp['name']); |
|
| 101 | + if (preg_match('/^en/i', $dirtmp['name'])) continue; // We discard en_* languages |
|
| 102 | + if (preg_match('/^fr/i', $dirtmp['name'])) continue; // We discard fr_* languages |
|
| 103 | + if (preg_match('/^es/i', $dirtmp['name'])) continue; // We discard es_* languages |
|
| 104 | + if (preg_match('/ca_ES/i', $dirtmp['name'])) continue; // We discard es_CA language |
|
| 105 | + if (preg_match('/pt_BR/i', $dirtmp['name'])) continue; // We discard pt_BR language |
|
| 106 | + if (preg_match('/nl_BE/i', $dirtmp['name'])) continue; // We discard nl_BE language |
|
| 107 | + if (preg_match('/^\./i', $dirtmp['name'])) continue; // We discard files .* |
|
| 108 | + if (preg_match('/^CVS/i', $dirtmp['name'])) continue; // We discard CVS |
|
| 109 | + $targetlangs[] = $dirtmp['name']; |
|
| 110 | 110 | } |
| 111 | 111 | //var_dump($targetlangs); |
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | // Process translation of source file for each target languages |
| 115 | - foreach($targetlangs as $my_destlang) |
|
| 115 | + foreach ($targetlangs as $my_destlang) |
|
| 116 | 116 | { |
| 117 | 117 | $this->_translatedFiles = array(); |
| 118 | 118 | |
| 119 | 119 | $destPath = $this->_langDir.$my_destlang.self::DIR_SEPARATOR.$file; |
| 120 | 120 | // Check destination file presence |
| 121 | - if (! file_exists($destPath)) |
|
| 121 | + if (!file_exists($destPath)) |
|
| 122 | 122 | { |
| 123 | 123 | // No file present, we generate file |
| 124 | - echo "File not found: " . $destPath . ". We generate it.<br>\n"; |
|
| 125 | - $this->createTranslationFile($destPath,$my_destlang); |
|
| 124 | + echo "File not found: ".$destPath.". We generate it.<br>\n"; |
|
| 125 | + $this->createTranslationFile($destPath, $my_destlang); |
|
| 126 | 126 | } |
| 127 | 127 | else |
| 128 | 128 | { |
| 129 | - echo "Updating file: " . $destPath . "<br>\n"; |
|
| 129 | + echo "Updating file: ".$destPath."<br>\n"; |
|
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | // Translate lines |
| 133 | - $fileContentDest = file($destPath,FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES); |
|
| 134 | - $newlines=0; |
|
| 135 | - foreach($fileContent as $line){ |
|
| 133 | + $fileContentDest = file($destPath, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES); |
|
| 134 | + $newlines = 0; |
|
| 135 | + foreach ($fileContent as $line) { |
|
| 136 | 136 | $key = $this->getLineKey($line); |
| 137 | 137 | $value = $this->getLineValue($line); |
| 138 | 138 | if ($key && $value) |
| 139 | 139 | { |
| 140 | - $newlines+=$this->translateFileLine($fileContentDest,$file,$key,$value,$my_destlang); |
|
| 140 | + $newlines += $this->translateFileLine($fileContentDest, $file, $key, $value, $my_destlang); |
|
| 141 | 141 | } |
| 142 | 142 | } |
| 143 | 143 | |
| 144 | - $this->updateTranslationFile($destPath,$file,$my_destlang); |
|
| 145 | - echo "New translated lines: " . $newlines . "<br>\n"; |
|
| 144 | + $this->updateTranslationFile($destPath, $file, $my_destlang); |
|
| 145 | + echo "New translated lines: ".$newlines."<br>\n"; |
|
| 146 | 146 | //if ($counter ==3) die('fim'); |
| 147 | 147 | } |
| 148 | 148 | } |
@@ -156,19 +156,19 @@ discard block |
||
| 156 | 156 | * @param string $my_destlang Target language code |
| 157 | 157 | * @return void |
| 158 | 158 | */ |
| 159 | - private function updateTranslationFile($destPath,$file,$my_destlang) |
|
| 159 | + private function updateTranslationFile($destPath, $file, $my_destlang) |
|
| 160 | 160 | { |
| 161 | 161 | $this->_time_end = date('Y-m-d H:i:s'); |
| 162 | 162 | |
| 163 | - if (isset($this->_translatedFiles[$file]) && count($this->_translatedFiles[$file])>0) |
|
| 163 | + if (isset($this->_translatedFiles[$file]) && count($this->_translatedFiles[$file]) > 0) |
|
| 164 | 164 | { |
| 165 | 165 | $fp = fopen($destPath, 'a'); |
| 166 | 166 | fwrite($fp, "\n"); |
| 167 | 167 | fwrite($fp, "\n"); |
| 168 | 168 | fwrite($fp, "// START - Lines generated via autotranslator.php tool (".$this->_time.").\n"); |
| 169 | 169 | fwrite($fp, "// Reference language: ".$this->_refLang." -> ".$my_destlang."\n"); |
| 170 | - foreach( $this->_translatedFiles[$file] as $line) { |
|
| 171 | - fwrite($fp, $line . "\n"); |
|
| 170 | + foreach ($this->_translatedFiles[$file] as $line) { |
|
| 171 | + fwrite($fp, $line."\n"); |
|
| 172 | 172 | } |
| 173 | 173 | fwrite($fp, "// STOP - Lines generated via autotranslator.php tool (".$this->_time_end.").\n"); |
| 174 | 174 | fclose($fp); |
@@ -183,13 +183,13 @@ discard block |
||
| 183 | 183 | * @param string $my_destlang Target language code |
| 184 | 184 | * @return void |
| 185 | 185 | */ |
| 186 | - private function createTranslationFile($path,$my_destlang) |
|
| 186 | + private function createTranslationFile($path, $my_destlang) |
|
| 187 | 187 | { |
| 188 | 188 | $fp = fopen($path, 'w+'); |
| 189 | 189 | fwrite($fp, "/*\n"); |
| 190 | 190 | fwrite($fp, " * Language code: {$my_destlang}\n"); |
| 191 | 191 | fwrite($fp, " * Automatic generated via autotranslator.php tool\n"); |
| 192 | - fwrite($fp, " * Generation date " . $this->_time. "\n"); |
|
| 192 | + fwrite($fp, " * Generation date ".$this->_time."\n"); |
|
| 193 | 193 | fwrite($fp, " */\n"); |
| 194 | 194 | fclose($fp); |
| 195 | 195 | return; |
@@ -205,36 +205,36 @@ discard block |
||
| 205 | 205 | * @param string $my_destlang Language code (ie: fr_FR) |
| 206 | 206 | * @return int 0=Nothing translated, 1=Record translated |
| 207 | 207 | */ |
| 208 | - private function translateFileLine($content,$file,$key,$value,$my_destlang) |
|
| 208 | + private function translateFileLine($content, $file, $key, $value, $my_destlang) |
|
| 209 | 209 | { |
| 210 | 210 | |
| 211 | 211 | //print "key =".$key."\n"; |
| 212 | - foreach( $content as $line ) { |
|
| 212 | + foreach ($content as $line) { |
|
| 213 | 213 | $destKey = $this->getLineKey($line); |
| 214 | 214 | $destValue = $this->getLineValue($line); |
| 215 | 215 | // If translated return |
| 216 | 216 | //print "destKey=".$destKey."\n"; |
| 217 | - if ( trim($destKey) == trim($key) ) |
|
| 217 | + if (trim($destKey) == trim($key)) |
|
| 218 | 218 | { // Found already existing translation (key already exits in dest file) |
| 219 | 219 | return 0; |
| 220 | 220 | } |
| 221 | 221 | } |
| 222 | 222 | |
| 223 | - if ($key == 'CHARSET') $val=$this->_outputpagecode; |
|
| 224 | - else if (preg_match('/^Format/',$key)) $val=$value; |
|
| 225 | - else if ($value=='-') $val=$value; |
|
| 223 | + if ($key == 'CHARSET') $val = $this->_outputpagecode; |
|
| 224 | + else if (preg_match('/^Format/', $key)) $val = $value; |
|
| 225 | + else if ($value == '-') $val = $value; |
|
| 226 | 226 | else |
| 227 | 227 | { |
| 228 | 228 | // If not translated then translate |
| 229 | - if ($this->_outputpagecode == 'UTF-8') $val=$this->translateTexts(array($value),substr($this->_refLang,0,2),substr($my_destlang,0,2)); |
|
| 230 | - else $val=utf8_decode($this->translateTexts(array($value),substr($this->_refLang,0,2),substr($my_destlang,0,2))); |
|
| 229 | + if ($this->_outputpagecode == 'UTF-8') $val = $this->translateTexts(array($value), substr($this->_refLang, 0, 2), substr($my_destlang, 0, 2)); |
|
| 230 | + else $val = utf8_decode($this->translateTexts(array($value), substr($this->_refLang, 0, 2), substr($my_destlang, 0, 2))); |
|
| 231 | 231 | } |
| 232 | 232 | |
| 233 | - $val=trim($val); |
|
| 233 | + $val = trim($val); |
|
| 234 | 234 | |
| 235 | 235 | if (empty($val)) return 0; |
| 236 | 236 | |
| 237 | - $this->_translatedFiles[$file][] = $key . '=' . $val ; |
|
| 237 | + $this->_translatedFiles[$file][] = $key.'='.$val; |
|
| 238 | 238 | return 1; |
| 239 | 239 | } |
| 240 | 240 | |
@@ -246,7 +246,7 @@ discard block |
||
| 246 | 246 | */ |
| 247 | 247 | private function getLineKey($line) |
| 248 | 248 | { |
| 249 | - $arraykey = explode('=',$line,2); |
|
| 249 | + $arraykey = explode('=', $line, 2); |
|
| 250 | 250 | return trim($arraykey[0]); |
| 251 | 251 | } |
| 252 | 252 | |
@@ -258,8 +258,8 @@ discard block |
||
| 258 | 258 | */ |
| 259 | 259 | private function getLineValue($line) |
| 260 | 260 | { |
| 261 | - $arraykey = explode('=',$line,2); |
|
| 262 | - return trim(isset($arraykey[1])?$arraykey[1]:''); |
|
| 261 | + $arraykey = explode('=', $line, 2); |
|
| 262 | + return trim(isset($arraykey[1]) ? $arraykey[1] : ''); |
|
| 263 | 263 | } |
| 264 | 264 | |
| 265 | 265 | /** |
@@ -271,9 +271,9 @@ discard block |
||
| 271 | 271 | private function getTranslationFilesArray($lang) |
| 272 | 272 | { |
| 273 | 273 | $dir = new DirectoryIterator($this->_langDir.$lang); |
| 274 | - while($dir->valid()) { |
|
| 275 | - if(!$dir->isDot() && $dir->isFile() && ! preg_match('/^\./',$dir->getFilename())) { |
|
| 276 | - $files[] = $dir->getFilename(); |
|
| 274 | + while ($dir->valid()) { |
|
| 275 | + if (!$dir->isDot() && $dir->isFile() && !preg_match('/^\./', $dir->getFilename())) { |
|
| 276 | + $files[] = $dir->getFilename(); |
|
| 277 | 277 | } |
| 278 | 278 | $dir->next(); |
| 279 | 279 | } |
@@ -291,16 +291,16 @@ discard block |
||
| 291 | 291 | private function translateTexts($src_texts, $src_lang, $dest_lang) |
| 292 | 292 | { |
| 293 | 293 | // We want to be sure that src_lang and dest_lang are using 2 chars only |
| 294 | - $tmp=explode('_',$src_lang); |
|
| 295 | - if (! empty($tmp[1]) && $tmp[0] == $tmp[1]) $src_lang=$tmp[0]; |
|
| 296 | - $tmp=explode('_',$dest_lang); |
|
| 297 | - if (! empty($tmp[1]) && $tmp[0] == $tmp[1]) $dest_lang=$tmp[0]; |
|
| 294 | + $tmp = explode('_', $src_lang); |
|
| 295 | + if (!empty($tmp[1]) && $tmp[0] == $tmp[1]) $src_lang = $tmp[0]; |
|
| 296 | + $tmp = explode('_', $dest_lang); |
|
| 297 | + if (!empty($tmp[1]) && $tmp[0] == $tmp[1]) $dest_lang = $tmp[0]; |
|
| 298 | 298 | |
| 299 | 299 | //setting language pair |
| 300 | 300 | $lang_pair = $src_lang.'|'.$dest_lang; |
| 301 | 301 | |
| 302 | - $src_text_to_translate=preg_replace('/%s/','SSSSS',implode('',$src_texts)); |
|
| 303 | - $src_text_to_translate=preg_replace('/'.preg_quote('\n\n').'/',' NNNNN ',$src_text_to_translate); |
|
| 302 | + $src_text_to_translate = preg_replace('/%s/', 'SSSSS', implode('', $src_texts)); |
|
| 303 | + $src_text_to_translate = preg_replace('/'.preg_quote('\n\n').'/', ' NNNNN ', $src_text_to_translate); |
|
| 304 | 304 | |
| 305 | 305 | // Define GET URL v1 |
| 306 | 306 | //$url = "http://ajax.googleapis.com/ajax/services/language/translate?v=1.0&q=".urlencode($src_text_to_translate)."&langpair=".urlencode($lang_pair); |
@@ -312,7 +312,7 @@ discard block |
||
| 312 | 312 | // Send request |
| 313 | 313 | //print "Url to translate: ".$url."\n"; |
| 314 | 314 | |
| 315 | - if (! function_exists("curl_init")) |
|
| 315 | + if (!function_exists("curl_init")) |
|
| 316 | 316 | { |
| 317 | 317 | print "Error, your PHP does not support curl functions.\n"; |
| 318 | 318 | die(); |
@@ -329,17 +329,17 @@ discard block |
||
| 329 | 329 | // now, process the JSON string |
| 330 | 330 | $json = json_decode($body, true); |
| 331 | 331 | |
| 332 | - if ((! empty($json['responseStatus']) && $json['responseStatus'] != 200) |
|
| 332 | + if ((!empty($json['responseStatus']) && $json['responseStatus'] != 200) |
|
| 333 | 333 | || count($json['data']['translations']) == 0) |
| 334 | 334 | { |
| 335 | 335 | print "Error: ".$json['responseStatus']." ".$url."\n"; |
| 336 | 336 | return false; |
| 337 | 337 | } |
| 338 | 338 | |
| 339 | - $rep=$json['data']['translations'][0]['translatedText']; |
|
| 340 | - $rep=preg_replace('/SSSSS/i','%s',$rep); |
|
| 341 | - $rep=preg_replace('/NNNNN/i','\n\n',$rep); |
|
| 342 | - $rep=preg_replace('/'/i','\'',$rep); |
|
| 339 | + $rep = $json['data']['translations'][0]['translatedText']; |
|
| 340 | + $rep = preg_replace('/SSSSS/i', '%s', $rep); |
|
| 341 | + $rep = preg_replace('/NNNNN/i', '\n\n', $rep); |
|
| 342 | + $rep = preg_replace('/'/i', '\'', $rep); |
|
| 343 | 343 | |
| 344 | 344 | //print "OK ".join('',$src_texts).' => '.$rep."\n"; |
| 345 | 345 | |
@@ -79,7 +79,9 @@ discard block |
||
| 79 | 79 | $counter = 1; |
| 80 | 80 | foreach($files as $file) |
| 81 | 81 | { |
| 82 | - if ($this->_limittofile && $this->_limittofile != $file) continue; |
|
| 82 | + if ($this->_limittofile && $this->_limittofile != $file) { |
|
| 83 | + continue; |
|
| 84 | + } |
|
| 83 | 85 | $counter++; |
| 84 | 86 | $fileContent = null; |
| 85 | 87 | $refPath = $this->_langDir.$this->_refLang.self::DIR_SEPARATOR.$file; |
@@ -96,16 +98,43 @@ discard block |
||
| 96 | 98 | $arraytmp=dol_dir_list($this->_langDir,'directories',0); |
| 97 | 99 | foreach($arraytmp as $dirtmp) |
| 98 | 100 | { |
| 99 | - if ($dirtmp['name'] === $this->_refLang) continue; // We discard source language |
|
| 101 | + if ($dirtmp['name'] === $this->_refLang) { |
|
| 102 | + continue; |
|
| 103 | + } |
|
| 104 | + // We discard source language |
|
| 100 | 105 | $tmppart=explode('_',$dirtmp['name']); |
| 101 | - if (preg_match('/^en/i',$dirtmp['name'])) continue; // We discard en_* languages |
|
| 102 | - if (preg_match('/^fr/i',$dirtmp['name'])) continue; // We discard fr_* languages |
|
| 103 | - if (preg_match('/^es/i',$dirtmp['name'])) continue; // We discard es_* languages |
|
| 104 | - if (preg_match('/ca_ES/i',$dirtmp['name'])) continue; // We discard es_CA language |
|
| 105 | - if (preg_match('/pt_BR/i',$dirtmp['name'])) continue; // We discard pt_BR language |
|
| 106 | - if (preg_match('/nl_BE/i',$dirtmp['name'])) continue; // We discard nl_BE language |
|
| 107 | - if (preg_match('/^\./i',$dirtmp['name'])) continue; // We discard files .* |
|
| 108 | - if (preg_match('/^CVS/i',$dirtmp['name'])) continue; // We discard CVS |
|
| 106 | + if (preg_match('/^en/i',$dirtmp['name'])) { |
|
| 107 | + continue; |
|
| 108 | + } |
|
| 109 | + // We discard en_* languages |
|
| 110 | + if (preg_match('/^fr/i',$dirtmp['name'])) { |
|
| 111 | + continue; |
|
| 112 | + } |
|
| 113 | + // We discard fr_* languages |
|
| 114 | + if (preg_match('/^es/i',$dirtmp['name'])) { |
|
| 115 | + continue; |
|
| 116 | + } |
|
| 117 | + // We discard es_* languages |
|
| 118 | + if (preg_match('/ca_ES/i',$dirtmp['name'])) { |
|
| 119 | + continue; |
|
| 120 | + } |
|
| 121 | + // We discard es_CA language |
|
| 122 | + if (preg_match('/pt_BR/i',$dirtmp['name'])) { |
|
| 123 | + continue; |
|
| 124 | + } |
|
| 125 | + // We discard pt_BR language |
|
| 126 | + if (preg_match('/nl_BE/i',$dirtmp['name'])) { |
|
| 127 | + continue; |
|
| 128 | + } |
|
| 129 | + // We discard nl_BE language |
|
| 130 | + if (preg_match('/^\./i',$dirtmp['name'])) { |
|
| 131 | + continue; |
|
| 132 | + } |
|
| 133 | + // We discard files .* |
|
| 134 | + if (preg_match('/^CVS/i',$dirtmp['name'])) { |
|
| 135 | + continue; |
|
| 136 | + } |
|
| 137 | + // We discard CVS |
|
| 109 | 138 | $targetlangs[]=$dirtmp['name']; |
| 110 | 139 | } |
| 111 | 140 | //var_dump($targetlangs); |
@@ -123,8 +152,7 @@ discard block |
||
| 123 | 152 | // No file present, we generate file |
| 124 | 153 | echo "File not found: " . $destPath . ". We generate it.<br>\n"; |
| 125 | 154 | $this->createTranslationFile($destPath,$my_destlang); |
| 126 | - } |
|
| 127 | - else |
|
| 155 | + } else |
|
| 128 | 156 | { |
| 129 | 157 | echo "Updating file: " . $destPath . "<br>\n"; |
| 130 | 158 | } |
@@ -220,19 +248,27 @@ discard block |
||
| 220 | 248 | } |
| 221 | 249 | } |
| 222 | 250 | |
| 223 | - if ($key == 'CHARSET') $val=$this->_outputpagecode; |
|
| 224 | - else if (preg_match('/^Format/',$key)) $val=$value; |
|
| 225 | - else if ($value=='-') $val=$value; |
|
| 226 | - else |
|
| 251 | + if ($key == 'CHARSET') { |
|
| 252 | + $val=$this->_outputpagecode; |
|
| 253 | + } else if (preg_match('/^Format/',$key)) { |
|
| 254 | + $val=$value; |
|
| 255 | + } else if ($value=='-') { |
|
| 256 | + $val=$value; |
|
| 257 | + } else |
|
| 227 | 258 | { |
| 228 | 259 | // If not translated then translate |
| 229 | - if ($this->_outputpagecode == 'UTF-8') $val=$this->translateTexts(array($value),substr($this->_refLang,0,2),substr($my_destlang,0,2)); |
|
| 230 | - else $val=utf8_decode($this->translateTexts(array($value),substr($this->_refLang,0,2),substr($my_destlang,0,2))); |
|
| 260 | + if ($this->_outputpagecode == 'UTF-8') { |
|
| 261 | + $val=$this->translateTexts(array($value),substr($this->_refLang,0,2),substr($my_destlang,0,2)); |
|
| 262 | + } else { |
|
| 263 | + $val=utf8_decode($this->translateTexts(array($value),substr($this->_refLang,0,2),substr($my_destlang,0,2))); |
|
| 264 | + } |
|
| 231 | 265 | } |
| 232 | 266 | |
| 233 | 267 | $val=trim($val); |
| 234 | 268 | |
| 235 | - if (empty($val)) return 0; |
|
| 269 | + if (empty($val)) { |
|
| 270 | + return 0; |
|
| 271 | + } |
|
| 236 | 272 | |
| 237 | 273 | $this->_translatedFiles[$file][] = $key . '=' . $val ; |
| 238 | 274 | return 1; |
@@ -292,9 +328,13 @@ discard block |
||
| 292 | 328 | { |
| 293 | 329 | // We want to be sure that src_lang and dest_lang are using 2 chars only |
| 294 | 330 | $tmp=explode('_',$src_lang); |
| 295 | - if (! empty($tmp[1]) && $tmp[0] == $tmp[1]) $src_lang=$tmp[0]; |
|
| 331 | + if (! empty($tmp[1]) && $tmp[0] == $tmp[1]) { |
|
| 332 | + $src_lang=$tmp[0]; |
|
| 333 | + } |
|
| 296 | 334 | $tmp=explode('_',$dest_lang); |
| 297 | - if (! empty($tmp[1]) && $tmp[0] == $tmp[1]) $dest_lang=$tmp[0]; |
|
| 335 | + if (! empty($tmp[1]) && $tmp[0] == $tmp[1]) { |
|
| 336 | + $dest_lang=$tmp[0]; |
|
| 337 | + } |
|
| 298 | 338 | |
| 299 | 339 | //setting language pair |
| 300 | 340 | $lang_pair = $src_lang.'|'.$dest_lang; |
@@ -25,8 +25,8 @@ discard block |
||
| 25 | 25 | |
| 26 | 26 | // Test if batch mode |
| 27 | 27 | if (substr($sapi_type, 0, 3) == 'cgi') { |
| 28 | - echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n"; |
|
| 29 | - exit; |
|
| 28 | + echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n"; |
|
| 29 | + exit; |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | // Global variables |
@@ -60,17 +60,17 @@ discard block |
||
| 60 | 60 | $server=''; |
| 61 | 61 | if (preg_match('/^(.*)@(.*):(.*)$/',$sourceserver,$reg)) |
| 62 | 62 | { |
| 63 | - $login=$reg[1]; |
|
| 64 | - $server=$reg[2]; |
|
| 65 | - $sourcefile=$reg[3]; |
|
| 66 | - $targetfile=basename($sourcefile); |
|
| 63 | + $login=$reg[1]; |
|
| 64 | + $server=$reg[2]; |
|
| 65 | + $sourcefile=$reg[3]; |
|
| 66 | + $targetfile=basename($sourcefile); |
|
| 67 | 67 | } |
| 68 | 68 | if (empty($sourceserver) || empty($server) || empty($login) || empty($sourcefile) || empty($password) || empty($database) || empty($loginbase) || empty($passwordbase)) |
| 69 | 69 | { |
| 70 | - print "Usage: $script_file login@server:/src/file.(sql|gz|bz2) passssh databaseserver databasename loginbase passbase\n"; |
|
| 71 | - print "Return code: 0 if success, <>0 if error\n"; |
|
| 72 | - print "Warning, this script may take a long time.\n"; |
|
| 73 | - exit(-1); |
|
| 70 | + print "Usage: $script_file login@server:/src/file.(sql|gz|bz2) passssh databaseserver databasename loginbase passbase\n"; |
|
| 71 | + print "Return code: 0 if success, <>0 if error\n"; |
|
| 72 | + print "Warning, this script may take a long time.\n"; |
|
| 73 | + exit(-1); |
|
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | |
@@ -84,21 +84,21 @@ discard block |
||
| 84 | 84 | |
| 85 | 85 | // SFTP connect |
| 86 | 86 | if (! function_exists("ssh2_connect")) { |
| 87 | - dol_print_error('','ssh2_connect function does not exists'); exit(1); |
|
| 87 | + dol_print_error('','ssh2_connect function does not exists'); exit(1); |
|
| 88 | 88 | } |
| 89 | 89 | |
| 90 | 90 | $connection = ssh2_connect($server, 22); |
| 91 | 91 | if ($connection) |
| 92 | 92 | { |
| 93 | - if (! @ssh2_auth_password($connection, $login, $password)) |
|
| 94 | - { |
|
| 95 | - dol_syslog("Could not authenticate with username ".$login." . and password ".preg_replace('/./', '*', $password),LOG_ERR); |
|
| 96 | - exit(-5); |
|
| 97 | - } |
|
| 98 | - else |
|
| 99 | - { |
|
| 100 | - //$stream = ssh2_exec($connection, '/usr/bin/php -i'); |
|
| 101 | - /* |
|
| 93 | + if (! @ssh2_auth_password($connection, $login, $password)) |
|
| 94 | + { |
|
| 95 | + dol_syslog("Could not authenticate with username ".$login." . and password ".preg_replace('/./', '*', $password),LOG_ERR); |
|
| 96 | + exit(-5); |
|
| 97 | + } |
|
| 98 | + else |
|
| 99 | + { |
|
| 100 | + //$stream = ssh2_exec($connection, '/usr/bin/php -i'); |
|
| 101 | + /* |
|
| 102 | 102 | print "Generate dump ".$filesys1.'.bz2'."\n"; |
| 103 | 103 | $stream = ssh2_exec($connection, "mysqldump -u debian-sys-maint -p4k9Blxl2snq4FHXY -h 127.0.0.1 --single-transaction -K --tables -c -e --hex-blob --default-character-set=utf8 saasplex | bzip2 -1 > ".$filesys1.'.bz2'); |
| 104 | 104 | stream_set_blocking($stream, true); |
@@ -106,35 +106,35 @@ discard block |
||
| 106 | 106 | $output = stream_get_contents($stream); |
| 107 | 107 | */ |
| 108 | 108 | |
| 109 | - $sftp = ssh2_sftp($connection); |
|
| 110 | - |
|
| 111 | - print 'Get file '.$sourcefile.' into '.$targetdir.$targetfile."\n"; |
|
| 112 | - ssh2_scp_recv($connection, $sourcefile, $targetdir.$targetfile); |
|
| 113 | - |
|
| 114 | - $fullcommand="cat ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database; |
|
| 115 | - if (preg_match('/\.bz2$/',$targetfile)) |
|
| 116 | - { |
|
| 117 | - $fullcommand="bzip2 -c -d ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database; |
|
| 118 | - } |
|
| 119 | - if (preg_match('/\.gz$/',$targetfile)) |
|
| 120 | - { |
|
| 121 | - $fullcommand="gzip -d ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database; |
|
| 122 | - } |
|
| 123 | - print "Load dump with ".$fullcommand."\n"; |
|
| 124 | - $output=array(); |
|
| 125 | - $return_var=0; |
|
| 126 | - print strftime("%Y%m%d-%H%M%S").' '.$fullcommand."\n"; |
|
| 127 | - exec($fullcommand, $output, $return_var); |
|
| 128 | - foreach($output as $line) print $line."\n"; |
|
| 129 | - |
|
| 130 | - //ssh2_sftp_unlink($sftp, $fileinstalllock); |
|
| 131 | - //print $output; |
|
| 132 | - } |
|
| 109 | + $sftp = ssh2_sftp($connection); |
|
| 110 | + |
|
| 111 | + print 'Get file '.$sourcefile.' into '.$targetdir.$targetfile."\n"; |
|
| 112 | + ssh2_scp_recv($connection, $sourcefile, $targetdir.$targetfile); |
|
| 113 | + |
|
| 114 | + $fullcommand="cat ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database; |
|
| 115 | + if (preg_match('/\.bz2$/',$targetfile)) |
|
| 116 | + { |
|
| 117 | + $fullcommand="bzip2 -c -d ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database; |
|
| 118 | + } |
|
| 119 | + if (preg_match('/\.gz$/',$targetfile)) |
|
| 120 | + { |
|
| 121 | + $fullcommand="gzip -d ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database; |
|
| 122 | + } |
|
| 123 | + print "Load dump with ".$fullcommand."\n"; |
|
| 124 | + $output=array(); |
|
| 125 | + $return_var=0; |
|
| 126 | + print strftime("%Y%m%d-%H%M%S").' '.$fullcommand."\n"; |
|
| 127 | + exec($fullcommand, $output, $return_var); |
|
| 128 | + foreach($output as $line) print $line."\n"; |
|
| 129 | + |
|
| 130 | + //ssh2_sftp_unlink($sftp, $fileinstalllock); |
|
| 131 | + //print $output; |
|
| 132 | + } |
|
| 133 | 133 | } |
| 134 | 134 | else |
| 135 | 135 | { |
| 136 | - print 'Failed to connect to ssh2 to '.$server; |
|
| 137 | - exit(-6); |
|
| 136 | + print 'Failed to connect to ssh2 to '.$server; |
|
| 137 | + exit(-6); |
|
| 138 | 138 | } |
| 139 | 139 | |
| 140 | 140 | |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | |
| 22 | 22 | $sapi_type = php_sapi_name(); |
| 23 | 23 | $script_file = basename(__FILE__); |
| 24 | -$path=dirname(__FILE__).'/'; |
|
| 24 | +$path = dirname(__FILE__).'/'; |
|
| 25 | 25 | |
| 26 | 26 | // Test if batch mode |
| 27 | 27 | if (substr($sapi_type, 0, 3) == 'cgi') { |
@@ -30,25 +30,25 @@ discard block |
||
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | // Global variables |
| 33 | -$error=0; |
|
| 33 | +$error = 0; |
|
| 34 | 34 | |
| 35 | -$sourceserver=isset($argv[1])?$argv[1]:''; // user@server:/src/file |
|
| 36 | -$password=isset($argv[2])?$argv[2]:''; |
|
| 37 | -$dataserver=isset($argv[3])?$argv[3]:''; |
|
| 38 | -$database=isset($argv[4])?$argv[4]:''; |
|
| 39 | -$loginbase=isset($argv[5])?$argv[5]:''; |
|
| 40 | -$passwordbase=isset($argv[6])?$argv[6]:''; |
|
| 35 | +$sourceserver = isset($argv[1]) ? $argv[1] : ''; // user@server:/src/file |
|
| 36 | +$password = isset($argv[2]) ? $argv[2] : ''; |
|
| 37 | +$dataserver = isset($argv[3]) ? $argv[3] : ''; |
|
| 38 | +$database = isset($argv[4]) ? $argv[4] : ''; |
|
| 39 | +$loginbase = isset($argv[5]) ? $argv[5] : ''; |
|
| 40 | +$passwordbase = isset($argv[6]) ? $argv[6] : ''; |
|
| 41 | 41 | |
| 42 | 42 | // Include Dolibarr environment |
| 43 | -$res=0; |
|
| 44 | -if (! $res && file_exists($path."../../master.inc.php")) $res=@include $path."../../master.inc.php"; |
|
| 45 | -if (! $res && file_exists($path."../../htdocs/master.inc.php")) $res=@include $path."../../htdocs/master.inc.php"; |
|
| 46 | -if (! $res && file_exists("../master.inc.php")) $res=@include "../master.inc.php"; |
|
| 47 | -if (! $res && file_exists("../../master.inc.php")) $res=@include "../../master.inc.php"; |
|
| 48 | -if (! $res && file_exists("../../../master.inc.php")) $res=@include "../../../master.inc.php"; |
|
| 49 | -if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include $path."../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only |
|
| 50 | -if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include "../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only |
|
| 51 | -if (! $res) die ("Failed to include master.inc.php file\n"); |
|
| 43 | +$res = 0; |
|
| 44 | +if (!$res && file_exists($path."../../master.inc.php")) $res = @include $path."../../master.inc.php"; |
|
| 45 | +if (!$res && file_exists($path."../../htdocs/master.inc.php")) $res = @include $path."../../htdocs/master.inc.php"; |
|
| 46 | +if (!$res && file_exists("../master.inc.php")) $res = @include "../master.inc.php"; |
|
| 47 | +if (!$res && file_exists("../../master.inc.php")) $res = @include "../../master.inc.php"; |
|
| 48 | +if (!$res && file_exists("../../../master.inc.php")) $res = @include "../../../master.inc.php"; |
|
| 49 | +if (!$res && preg_match('/\/nltechno([^\/]*)\//', $_SERVER["PHP_SELF"], $reg)) $res = @include $path."../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only |
|
| 50 | +if (!$res && preg_match('/\/nltechno([^\/]*)\//', $_SERVER["PHP_SELF"], $reg)) $res = @include "../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only |
|
| 51 | +if (!$res) die ("Failed to include master.inc.php file\n"); |
|
| 52 | 52 | include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; |
| 53 | 53 | |
| 54 | 54 | |
@@ -56,14 +56,14 @@ discard block |
||
| 56 | 56 | * Main |
| 57 | 57 | */ |
| 58 | 58 | |
| 59 | -$login=''; |
|
| 60 | -$server=''; |
|
| 61 | -if (preg_match('/^(.*)@(.*):(.*)$/',$sourceserver,$reg)) |
|
| 59 | +$login = ''; |
|
| 60 | +$server = ''; |
|
| 61 | +if (preg_match('/^(.*)@(.*):(.*)$/', $sourceserver, $reg)) |
|
| 62 | 62 | { |
| 63 | - $login=$reg[1]; |
|
| 64 | - $server=$reg[2]; |
|
| 65 | - $sourcefile=$reg[3]; |
|
| 66 | - $targetfile=basename($sourcefile); |
|
| 63 | + $login = $reg[1]; |
|
| 64 | + $server = $reg[2]; |
|
| 65 | + $sourcefile = $reg[3]; |
|
| 66 | + $targetfile = basename($sourcefile); |
|
| 67 | 67 | } |
| 68 | 68 | if (empty($sourceserver) || empty($server) || empty($login) || empty($sourcefile) || empty($password) || empty($database) || empty($loginbase) || empty($passwordbase)) |
| 69 | 69 | { |
@@ -74,25 +74,25 @@ discard block |
||
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | |
| 77 | -$targetdir='/tmp'; |
|
| 77 | +$targetdir = '/tmp'; |
|
| 78 | 78 | print "Get dump file from server ".$server.", path ".$sourcefile.", connect with login ".$login." loaded into localhost\n"; |
| 79 | 79 | |
| 80 | -$sftpconnectstring=$sourceserver; |
|
| 80 | +$sftpconnectstring = $sourceserver; |
|
| 81 | 81 | print 'SFTP connect string : '.$sftpconnectstring."\n"; |
| 82 | 82 | //print 'SFTP password '.$password."\n"; |
| 83 | 83 | |
| 84 | 84 | |
| 85 | 85 | // SFTP connect |
| 86 | -if (! function_exists("ssh2_connect")) { |
|
| 87 | - dol_print_error('','ssh2_connect function does not exists'); exit(1); |
|
| 86 | +if (!function_exists("ssh2_connect")) { |
|
| 87 | + dol_print_error('', 'ssh2_connect function does not exists'); exit(1); |
|
| 88 | 88 | } |
| 89 | 89 | |
| 90 | 90 | $connection = ssh2_connect($server, 22); |
| 91 | 91 | if ($connection) |
| 92 | 92 | { |
| 93 | - if (! @ssh2_auth_password($connection, $login, $password)) |
|
| 93 | + if (!@ssh2_auth_password($connection, $login, $password)) |
|
| 94 | 94 | { |
| 95 | - dol_syslog("Could not authenticate with username ".$login." . and password ".preg_replace('/./', '*', $password),LOG_ERR); |
|
| 95 | + dol_syslog("Could not authenticate with username ".$login." . and password ".preg_replace('/./', '*', $password), LOG_ERR); |
|
| 96 | 96 | exit(-5); |
| 97 | 97 | } |
| 98 | 98 | else |
@@ -111,21 +111,21 @@ discard block |
||
| 111 | 111 | print 'Get file '.$sourcefile.' into '.$targetdir.$targetfile."\n"; |
| 112 | 112 | ssh2_scp_recv($connection, $sourcefile, $targetdir.$targetfile); |
| 113 | 113 | |
| 114 | - $fullcommand="cat ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database; |
|
| 115 | - if (preg_match('/\.bz2$/',$targetfile)) |
|
| 114 | + $fullcommand = "cat ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database; |
|
| 115 | + if (preg_match('/\.bz2$/', $targetfile)) |
|
| 116 | 116 | { |
| 117 | - $fullcommand="bzip2 -c -d ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database; |
|
| 117 | + $fullcommand = "bzip2 -c -d ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database; |
|
| 118 | 118 | } |
| 119 | - if (preg_match('/\.gz$/',$targetfile)) |
|
| 119 | + if (preg_match('/\.gz$/', $targetfile)) |
|
| 120 | 120 | { |
| 121 | - $fullcommand="gzip -d ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database; |
|
| 121 | + $fullcommand = "gzip -d ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database; |
|
| 122 | 122 | } |
| 123 | 123 | print "Load dump with ".$fullcommand."\n"; |
| 124 | - $output=array(); |
|
| 125 | - $return_var=0; |
|
| 124 | + $output = array(); |
|
| 125 | + $return_var = 0; |
|
| 126 | 126 | print strftime("%Y%m%d-%H%M%S").' '.$fullcommand."\n"; |
| 127 | 127 | exec($fullcommand, $output, $return_var); |
| 128 | - foreach($output as $line) print $line."\n"; |
|
| 128 | + foreach ($output as $line) print $line."\n"; |
|
| 129 | 129 | |
| 130 | 130 | //ssh2_sftp_unlink($sftp, $fileinstalllock); |
| 131 | 131 | //print $output; |
@@ -41,14 +41,32 @@ discard block |
||
| 41 | 41 | |
| 42 | 42 | // Include Dolibarr environment |
| 43 | 43 | $res=0; |
| 44 | -if (! $res && file_exists($path."../../master.inc.php")) $res=@include $path."../../master.inc.php"; |
|
| 45 | -if (! $res && file_exists($path."../../htdocs/master.inc.php")) $res=@include $path."../../htdocs/master.inc.php"; |
|
| 46 | -if (! $res && file_exists("../master.inc.php")) $res=@include "../master.inc.php"; |
|
| 47 | -if (! $res && file_exists("../../master.inc.php")) $res=@include "../../master.inc.php"; |
|
| 48 | -if (! $res && file_exists("../../../master.inc.php")) $res=@include "../../../master.inc.php"; |
|
| 49 | -if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include $path."../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only |
|
| 50 | -if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include "../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only |
|
| 51 | -if (! $res) die ("Failed to include master.inc.php file\n"); |
|
| 44 | +if (! $res && file_exists($path."../../master.inc.php")) { |
|
| 45 | + $res=@include $path."../../master.inc.php"; |
|
| 46 | +} |
|
| 47 | +if (! $res && file_exists($path."../../htdocs/master.inc.php")) { |
|
| 48 | + $res=@include $path."../../htdocs/master.inc.php"; |
|
| 49 | +} |
|
| 50 | +if (! $res && file_exists("../master.inc.php")) { |
|
| 51 | + $res=@include "../master.inc.php"; |
|
| 52 | +} |
|
| 53 | +if (! $res && file_exists("../../master.inc.php")) { |
|
| 54 | + $res=@include "../../master.inc.php"; |
|
| 55 | +} |
|
| 56 | +if (! $res && file_exists("../../../master.inc.php")) { |
|
| 57 | + $res=@include "../../../master.inc.php"; |
|
| 58 | +} |
|
| 59 | +if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) { |
|
| 60 | + $res=@include $path."../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; |
|
| 61 | +} |
|
| 62 | +// Used on dev env only |
|
| 63 | +if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) { |
|
| 64 | + $res=@include "../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; |
|
| 65 | +} |
|
| 66 | +// Used on dev env only |
|
| 67 | +if (! $res) { |
|
| 68 | + die ("Failed to include master.inc.php file\n"); |
|
| 69 | +} |
|
| 52 | 70 | include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; |
| 53 | 71 | |
| 54 | 72 | |
@@ -94,8 +112,7 @@ discard block |
||
| 94 | 112 | { |
| 95 | 113 | dol_syslog("Could not authenticate with username ".$login." . and password ".preg_replace('/./', '*', $password),LOG_ERR); |
| 96 | 114 | exit(-5); |
| 97 | - } |
|
| 98 | - else |
|
| 115 | + } else |
|
| 99 | 116 | { |
| 100 | 117 | //$stream = ssh2_exec($connection, '/usr/bin/php -i'); |
| 101 | 118 | /* |
@@ -125,13 +142,14 @@ discard block |
||
| 125 | 142 | $return_var=0; |
| 126 | 143 | print strftime("%Y%m%d-%H%M%S").' '.$fullcommand."\n"; |
| 127 | 144 | exec($fullcommand, $output, $return_var); |
| 128 | - foreach($output as $line) print $line."\n"; |
|
| 145 | + foreach($output as $line) { |
|
| 146 | + print $line."\n"; |
|
| 147 | + } |
|
| 129 | 148 | |
| 130 | 149 | //ssh2_sftp_unlink($sftp, $fileinstalllock); |
| 131 | 150 | //print $output; |
| 132 | 151 | } |
| 133 | -} |
|
| 134 | -else |
|
| 152 | +} else |
|
| 135 | 153 | { |
| 136 | 154 | print 'Failed to connect to ssh2 to '.$server; |
| 137 | 155 | exit(-6); |
@@ -25,8 +25,8 @@ discard block |
||
| 25 | 25 | |
| 26 | 26 | // Test if batch mode |
| 27 | 27 | if (substr($sapi_type, 0, 3) == 'cgi') { |
| 28 | - echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n"; |
|
| 29 | - exit; |
|
| 28 | + echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n"; |
|
| 29 | + exit; |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | // Global variables |
@@ -53,9 +53,9 @@ discard block |
||
| 53 | 53 | |
| 54 | 54 | if (empty($confirm)) |
| 55 | 55 | { |
| 56 | - print "Usage: $script_file confirm\n"; |
|
| 57 | - print "Return code: 0 if success, <>0 if error\n"; |
|
| 58 | - exit(-1); |
|
| 56 | + print "Usage: $script_file confirm\n"; |
|
| 57 | + print "Return code: 0 if success, <>0 if error\n"; |
|
| 58 | + exit(-1); |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | |
| 22 | 22 | $sapi_type = php_sapi_name(); |
| 23 | 23 | $script_file = basename(__FILE__); |
| 24 | -$path=dirname(__FILE__).'/'; |
|
| 24 | +$path = dirname(__FILE__).'/'; |
|
| 25 | 25 | |
| 26 | 26 | // Test if batch mode |
| 27 | 27 | if (substr($sapi_type, 0, 3) == 'cgi') { |
@@ -30,20 +30,20 @@ discard block |
||
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | // Global variables |
| 33 | -$error=0; |
|
| 33 | +$error = 0; |
|
| 34 | 34 | |
| 35 | -$confirm=isset($argv[1])?$argv[1]:''; |
|
| 35 | +$confirm = isset($argv[1]) ? $argv[1] : ''; |
|
| 36 | 36 | |
| 37 | 37 | // Include Dolibarr environment |
| 38 | -$res=0; |
|
| 39 | -if (! $res && file_exists($path."../../master.inc.php")) $res=@include $path."../../master.inc.php"; |
|
| 40 | -if (! $res && file_exists($path."../../htdocs/master.inc.php")) $res=@include $path."../../htdocs/master.inc.php"; |
|
| 41 | -if (! $res && file_exists("../master.inc.php")) $res=@include "../master.inc.php"; |
|
| 42 | -if (! $res && file_exists("../../master.inc.php")) $res=@include "../../master.inc.php"; |
|
| 43 | -if (! $res && file_exists("../../../master.inc.php")) $res=@include "../../../master.inc.php"; |
|
| 44 | -if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include $path."../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only |
|
| 45 | -if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include "../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only |
|
| 46 | -if (! $res) die ("Failed to include master.inc.php file\n"); |
|
| 38 | +$res = 0; |
|
| 39 | +if (!$res && file_exists($path."../../master.inc.php")) $res = @include $path."../../master.inc.php"; |
|
| 40 | +if (!$res && file_exists($path."../../htdocs/master.inc.php")) $res = @include $path."../../htdocs/master.inc.php"; |
|
| 41 | +if (!$res && file_exists("../master.inc.php")) $res = @include "../master.inc.php"; |
|
| 42 | +if (!$res && file_exists("../../master.inc.php")) $res = @include "../../master.inc.php"; |
|
| 43 | +if (!$res && file_exists("../../../master.inc.php")) $res = @include "../../../master.inc.php"; |
|
| 44 | +if (!$res && preg_match('/\/nltechno([^\/]*)\//', $_SERVER["PHP_SELF"], $reg)) $res = @include $path."../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only |
|
| 45 | +if (!$res && preg_match('/\/nltechno([^\/]*)\//', $_SERVER["PHP_SELF"], $reg)) $res = @include "../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only |
|
| 46 | +if (!$res) die ("Failed to include master.inc.php file\n"); |
|
| 47 | 47 | include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; |
| 48 | 48 | |
| 49 | 49 | |
@@ -59,10 +59,10 @@ discard block |
||
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | |
| 62 | -$tmp=dol_getdate(dol_now()); |
|
| 62 | +$tmp = dol_getdate(dol_now()); |
|
| 63 | 63 | |
| 64 | 64 | |
| 65 | -$tables=array( |
|
| 65 | +$tables = array( |
|
| 66 | 66 | 'propal'=>array(0=>'datep', 1=>'fin_validite', 2=>'date_valid', 3=>'date_cloture'), |
| 67 | 67 | 'commande'=>array(0=>'date_commande', 1=>'date_valid', 2=>'date_cloture'), |
| 68 | 68 | 'facture'=>array(0=>'datef', 1=>'date_valid', 2=>'date_lim_reglement'), |
@@ -72,44 +72,44 @@ discard block |
||
| 72 | 72 | 'supplier_proposal'=>array(0=>'datec', 1=>'date_valid', 2=>'date_cloture') |
| 73 | 73 | ); |
| 74 | 74 | |
| 75 | -$year=2010; |
|
| 76 | -$currentyear=$tmp['year']; |
|
| 75 | +$year = 2010; |
|
| 76 | +$currentyear = $tmp['year']; |
|
| 77 | 77 | while ($year <= $currentyear) |
| 78 | 78 | { |
| 79 | 79 | //$year=2021; |
| 80 | - $delta=($currentyear - $year); |
|
| 80 | + $delta = ($currentyear - $year); |
|
| 81 | 81 | //$delta=-1; |
| 82 | 82 | |
| 83 | 83 | if ($delta) |
| 84 | 84 | { |
| 85 | - foreach($tables as $tablekey => $tableval) |
|
| 85 | + foreach ($tables as $tablekey => $tableval) |
|
| 86 | 86 | { |
| 87 | 87 | print "\nCorrect ".$tablekey." for year ".$year." and move them to current year ".$currentyear." "; |
| 88 | - $sql="select rowid from ".MAIN_DB_PREFIX.$tablekey." where ".$tableval[0]." between '".$year."-01-01' and '".$year."-12-31' and ".$tableval[0]." < DATE_ADD(NOW(), INTERVAL -1 YEAR)"; |
|
| 88 | + $sql = "select rowid from ".MAIN_DB_PREFIX.$tablekey." where ".$tableval[0]." between '".$year."-01-01' and '".$year."-12-31' and ".$tableval[0]." < DATE_ADD(NOW(), INTERVAL -1 YEAR)"; |
|
| 89 | 89 | //$sql="select rowid from ".MAIN_DB_PREFIX.$tablekey." where ".$tableval[0]." between '".$year."-01-01' and '".$year."-12-31' and ".$tableval[0]." > NOW()"; |
| 90 | 90 | $resql = $db->query($sql); |
| 91 | 91 | if ($resql) |
| 92 | 92 | { |
| 93 | 93 | $num = $db->num_rows($resql); |
| 94 | - $i=0; |
|
| 94 | + $i = 0; |
|
| 95 | 95 | while ($i < $num) |
| 96 | 96 | { |
| 97 | - $obj=$db->fetch_object($resql); |
|
| 97 | + $obj = $db->fetch_object($resql); |
|
| 98 | 98 | if ($obj) |
| 99 | 99 | { |
| 100 | 100 | print "."; |
| 101 | - $sql2="UPDATE ".MAIN_DB_PREFIX.$tablekey." set "; |
|
| 102 | - $j=0; |
|
| 103 | - foreach($tableval as $field) |
|
| 101 | + $sql2 = "UPDATE ".MAIN_DB_PREFIX.$tablekey." set "; |
|
| 102 | + $j = 0; |
|
| 103 | + foreach ($tableval as $field) |
|
| 104 | 104 | { |
| 105 | - if ($j) $sql2.=", "; |
|
| 106 | - $sql2.= $field." = DATE_ADD(".$field.", INTERVAL ".$delta." YEAR)"; |
|
| 105 | + if ($j) $sql2 .= ", "; |
|
| 106 | + $sql2 .= $field." = DATE_ADD(".$field.", INTERVAL ".$delta." YEAR)"; |
|
| 107 | 107 | $j++; |
| 108 | 108 | } |
| 109 | - $sql2.=" WHERE rowid = ".$obj->rowid; |
|
| 109 | + $sql2 .= " WHERE rowid = ".$obj->rowid; |
|
| 110 | 110 | //print $sql2."\n"; |
| 111 | 111 | $resql2 = $db->query($sql2); |
| 112 | - if (! $resql2) dol_print_error($db); |
|
| 112 | + if (!$resql2) dol_print_error($db); |
|
| 113 | 113 | } |
| 114 | 114 | $i++; |
| 115 | 115 | } |
@@ -36,14 +36,32 @@ discard block |
||
| 36 | 36 | |
| 37 | 37 | // Include Dolibarr environment |
| 38 | 38 | $res=0; |
| 39 | -if (! $res && file_exists($path."../../master.inc.php")) $res=@include $path."../../master.inc.php"; |
|
| 40 | -if (! $res && file_exists($path."../../htdocs/master.inc.php")) $res=@include $path."../../htdocs/master.inc.php"; |
|
| 41 | -if (! $res && file_exists("../master.inc.php")) $res=@include "../master.inc.php"; |
|
| 42 | -if (! $res && file_exists("../../master.inc.php")) $res=@include "../../master.inc.php"; |
|
| 43 | -if (! $res && file_exists("../../../master.inc.php")) $res=@include "../../../master.inc.php"; |
|
| 44 | -if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include $path."../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only |
|
| 45 | -if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include "../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only |
|
| 46 | -if (! $res) die ("Failed to include master.inc.php file\n"); |
|
| 39 | +if (! $res && file_exists($path."../../master.inc.php")) { |
|
| 40 | + $res=@include $path."../../master.inc.php"; |
|
| 41 | +} |
|
| 42 | +if (! $res && file_exists($path."../../htdocs/master.inc.php")) { |
|
| 43 | + $res=@include $path."../../htdocs/master.inc.php"; |
|
| 44 | +} |
|
| 45 | +if (! $res && file_exists("../master.inc.php")) { |
|
| 46 | + $res=@include "../master.inc.php"; |
|
| 47 | +} |
|
| 48 | +if (! $res && file_exists("../../master.inc.php")) { |
|
| 49 | + $res=@include "../../master.inc.php"; |
|
| 50 | +} |
|
| 51 | +if (! $res && file_exists("../../../master.inc.php")) { |
|
| 52 | + $res=@include "../../../master.inc.php"; |
|
| 53 | +} |
|
| 54 | +if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) { |
|
| 55 | + $res=@include $path."../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; |
|
| 56 | +} |
|
| 57 | +// Used on dev env only |
|
| 58 | +if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) { |
|
| 59 | + $res=@include "../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; |
|
| 60 | +} |
|
| 61 | +// Used on dev env only |
|
| 62 | +if (! $res) { |
|
| 63 | + die ("Failed to include master.inc.php file\n"); |
|
| 64 | +} |
|
| 47 | 65 | include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; |
| 48 | 66 | |
| 49 | 67 | |
@@ -102,19 +120,24 @@ discard block |
||
| 102 | 120 | $j=0; |
| 103 | 121 | foreach($tableval as $field) |
| 104 | 122 | { |
| 105 | - if ($j) $sql2.=", "; |
|
| 123 | + if ($j) { |
|
| 124 | + $sql2.=", "; |
|
| 125 | + } |
|
| 106 | 126 | $sql2.= $field." = DATE_ADD(".$field.", INTERVAL ".$delta." YEAR)"; |
| 107 | 127 | $j++; |
| 108 | 128 | } |
| 109 | 129 | $sql2.=" WHERE rowid = ".$obj->rowid; |
| 110 | 130 | //print $sql2."\n"; |
| 111 | 131 | $resql2 = $db->query($sql2); |
| 112 | - if (! $resql2) dol_print_error($db); |
|
| 132 | + if (! $resql2) { |
|
| 133 | + dol_print_error($db); |
|
| 134 | + } |
|
| 113 | 135 | } |
| 114 | 136 | $i++; |
| 115 | 137 | } |
| 138 | + } else { |
|
| 139 | + dol_print_error($db); |
|
| 116 | 140 | } |
| 117 | - else dol_print_error($db); |
|
| 118 | 141 | } |
| 119 | 142 | } |
| 120 | 143 | |
@@ -113,13 +113,13 @@ discard block |
||
| 113 | 113 | $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe where client in (1, 3)"; |
| 114 | 114 | $resql=$db->query($sql); |
| 115 | 115 | if ($resql) { |
| 116 | - $num_thirdparties = $db->num_rows($resql); |
|
| 117 | - $i = 0; |
|
| 118 | - while ($i < $num_thirdparties) { |
|
| 119 | - $i++; |
|
| 120 | - $row = $db->fetch_row($resql); |
|
| 121 | - $societesid[$i] = $row[0]; |
|
| 122 | - } |
|
| 116 | + $num_thirdparties = $db->num_rows($resql); |
|
| 117 | + $i = 0; |
|
| 118 | + while ($i < $num_thirdparties) { |
|
| 119 | + $i++; |
|
| 120 | + $row = $db->fetch_row($resql); |
|
| 121 | + $societesid[$i] = $row[0]; |
|
| 122 | + } |
|
| 123 | 123 | } |
| 124 | 124 | else { print "err"; } |
| 125 | 125 | |
@@ -127,13 +127,13 @@ discard block |
||
| 127 | 127 | $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande"; |
| 128 | 128 | $resql=$db->query($sql); |
| 129 | 129 | if ($resql) { |
| 130 | - $num = $db->num_rows($resql); |
|
| 131 | - $i = 0; |
|
| 132 | - while ($i < $num) { |
|
| 133 | - $i++; |
|
| 134 | - $row = $db->fetch_row($resql); |
|
| 135 | - $commandesid[$i] = $row[0]; |
|
| 136 | - } |
|
| 130 | + $num = $db->num_rows($resql); |
|
| 131 | + $i = 0; |
|
| 132 | + while ($i < $num) { |
|
| 133 | + $i++; |
|
| 134 | + $row = $db->fetch_row($resql); |
|
| 135 | + $commandesid[$i] = $row[0]; |
|
| 136 | + } |
|
| 137 | 137 | } |
| 138 | 138 | else { print "err"; } |
| 139 | 139 | |
@@ -142,14 +142,14 @@ discard block |
||
| 142 | 142 | $resql = $db->query($sql); |
| 143 | 143 | if ($resql) |
| 144 | 144 | { |
| 145 | - $num_prods = $db->num_rows($resql); |
|
| 146 | - $i = 0; |
|
| 147 | - while ($i < $num_prods) |
|
| 145 | + $num_prods = $db->num_rows($resql); |
|
| 146 | + $i = 0; |
|
| 147 | + while ($i < $num_prods) |
|
| 148 | 148 | { |
| 149 | - $i++; |
|
| 149 | + $i++; |
|
| 150 | 150 | |
| 151 | - $row = $db->fetch_row($resql); |
|
| 152 | - $prodids[$i] = $row[0]; |
|
| 151 | + $row = $db->fetch_row($resql); |
|
| 152 | + $prodids[$i] = $row[0]; |
|
| 153 | 153 | } |
| 154 | 154 | } |
| 155 | 155 | |
@@ -183,8 +183,8 @@ discard block |
||
| 183 | 183 | $db->begin(); |
| 184 | 184 | |
| 185 | 185 | $result=$object->create($fuser); |
| 186 | - if ($result >= 0) |
|
| 187 | - { |
|
| 186 | + if ($result >= 0) |
|
| 187 | + { |
|
| 188 | 188 | $nbp = mt_rand(2, 5); |
| 189 | 189 | $xnbp = 0; |
| 190 | 190 | while ($xnbp < $nbp) |
@@ -200,24 +200,24 @@ discard block |
||
| 200 | 200 | $xnbp++; |
| 201 | 201 | } |
| 202 | 202 | |
| 203 | - $result=$object->valid($fuser); |
|
| 204 | - if ($result > 0) |
|
| 205 | - { |
|
| 203 | + $result=$object->valid($fuser); |
|
| 204 | + if ($result > 0) |
|
| 205 | + { |
|
| 206 | 206 | $db->commit(); |
| 207 | 207 | print " OK with ref ".$object->ref."\n"; |
| 208 | - } |
|
| 209 | - else |
|
| 210 | - { |
|
| 208 | + } |
|
| 209 | + else |
|
| 210 | + { |
|
| 211 | 211 | print " KO\n"; |
| 212 | - $db->rollback(); |
|
| 213 | - dol_print_error($db,$object->error); |
|
| 214 | - } |
|
| 215 | - } |
|
| 216 | - else |
|
| 217 | - { |
|
| 212 | + $db->rollback(); |
|
| 213 | + dol_print_error($db,$object->error); |
|
| 214 | + } |
|
| 215 | + } |
|
| 216 | + else |
|
| 217 | + { |
|
| 218 | 218 | print " KO\n"; |
| 219 | - $db->rollback(); |
|
| 220 | - dol_print_error($db,$object->error); |
|
| 221 | - } |
|
| 219 | + $db->rollback(); |
|
| 220 | + dol_print_error($db,$object->error); |
|
| 221 | + } |
|
| 222 | 222 | } |
| 223 | 223 | |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | |
| 34 | 34 | // Recupere root dolibarr |
| 35 | 35 | //$path=preg_replace('/generate-commande.php/i','',$_SERVER["PHP_SELF"]); |
| 36 | -require __DIR__. '/../../htdocs/master.inc.php'; |
|
| 36 | +require __DIR__.'/../../htdocs/master.inc.php'; |
|
| 37 | 37 | include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; |
| 38 | 38 | include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; |
| 39 | 39 | include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; |
@@ -49,59 +49,59 @@ discard block |
||
| 49 | 49 | |
| 50 | 50 | define(GEN_NUMBER_COMMANDE, 10); |
| 51 | 51 | $year = 2016; |
| 52 | -$dates = array (mktime(12,0,0,1,3,$year), |
|
| 53 | - mktime(12,0,0,1,9,$year), |
|
| 54 | - mktime(12,0,0,2,13,$year), |
|
| 55 | - mktime(12,0,0,2,23,$year), |
|
| 56 | - mktime(12,0,0,3,30,$year), |
|
| 57 | - mktime(12,0,0,4,3,$year), |
|
| 58 | - mktime(12,0,0,4,3,$year), |
|
| 59 | - mktime(12,0,0,5,9,$year), |
|
| 60 | - mktime(12,0,0,5,1,$year), |
|
| 61 | - mktime(12,0,0,5,13,$year), |
|
| 62 | - mktime(12,0,0,5,19,$year), |
|
| 63 | - mktime(12,0,0,5,23,$year), |
|
| 64 | - mktime(12,0,0,6,3,$year), |
|
| 65 | - mktime(12,0,0,6,19,$year), |
|
| 66 | - mktime(12,0,0,6,24,$year), |
|
| 67 | - mktime(12,0,0,7,3,$year), |
|
| 68 | - mktime(12,0,0,7,9,$year), |
|
| 69 | - mktime(12,0,0,7,23,$year), |
|
| 70 | - mktime(12,0,0,7,30,$year), |
|
| 71 | - mktime(12,0,0,8,9,$year), |
|
| 72 | - mktime(12,0,0,9,23,$year), |
|
| 73 | - mktime(12,0,0,10,3,$year), |
|
| 74 | - mktime(12,0,0,11,12,$year), |
|
| 75 | - mktime(12,0,0,11,13,$year), |
|
| 76 | - mktime(12,0,0,1,3,($year - 1)), |
|
| 77 | - mktime(12,0,0,1,9,($year - 1)), |
|
| 78 | - mktime(12,0,0,2,13,($year - 1)), |
|
| 79 | - mktime(12,0,0,2,23,($year - 1)), |
|
| 80 | - mktime(12,0,0,3,30,($year - 1)), |
|
| 81 | - mktime(12,0,0,4,3,($year - 1)), |
|
| 82 | - mktime(12,0,0,4,3,($year - 1)), |
|
| 83 | - mktime(12,0,0,5,9,($year - 1)), |
|
| 84 | - mktime(12,0,0,5,1,($year - 1)), |
|
| 85 | - mktime(12,0,0,5,13,($year - 1)), |
|
| 86 | - mktime(12,0,0,5,19,($year - 1)), |
|
| 87 | - mktime(12,0,0,5,23,($year - 1)), |
|
| 88 | - mktime(12,0,0,6,3,($year - 1)), |
|
| 89 | - mktime(12,0,0,6,19,($year - 1)), |
|
| 90 | - mktime(12,0,0,6,24,($year - 1)), |
|
| 91 | - mktime(12,0,0,7,3,($year - 1)), |
|
| 92 | - mktime(12,0,0,7,9,($year - 1)), |
|
| 93 | - mktime(12,0,0,7,23,($year - 1)), |
|
| 94 | - mktime(12,0,0,7,30,($year - 1)), |
|
| 95 | - mktime(12,0,0,8,9,($year - 1)), |
|
| 96 | - mktime(12,0,0,9,23,($year - 1)), |
|
| 97 | - mktime(12,0,0,10,3,($year - 1)), |
|
| 98 | - mktime(12,0,0,11,12,$year), |
|
| 99 | - mktime(12,0,0,11,13,$year), |
|
| 100 | - mktime(12,0,0,12,12,$year), |
|
| 101 | - mktime(12,0,0,12,13,$year), |
|
| 52 | +$dates = array(mktime(12, 0, 0, 1, 3, $year), |
|
| 53 | + mktime(12, 0, 0, 1, 9, $year), |
|
| 54 | + mktime(12, 0, 0, 2, 13, $year), |
|
| 55 | + mktime(12, 0, 0, 2, 23, $year), |
|
| 56 | + mktime(12, 0, 0, 3, 30, $year), |
|
| 57 | + mktime(12, 0, 0, 4, 3, $year), |
|
| 58 | + mktime(12, 0, 0, 4, 3, $year), |
|
| 59 | + mktime(12, 0, 0, 5, 9, $year), |
|
| 60 | + mktime(12, 0, 0, 5, 1, $year), |
|
| 61 | + mktime(12, 0, 0, 5, 13, $year), |
|
| 62 | + mktime(12, 0, 0, 5, 19, $year), |
|
| 63 | + mktime(12, 0, 0, 5, 23, $year), |
|
| 64 | + mktime(12, 0, 0, 6, 3, $year), |
|
| 65 | + mktime(12, 0, 0, 6, 19, $year), |
|
| 66 | + mktime(12, 0, 0, 6, 24, $year), |
|
| 67 | + mktime(12, 0, 0, 7, 3, $year), |
|
| 68 | + mktime(12, 0, 0, 7, 9, $year), |
|
| 69 | + mktime(12, 0, 0, 7, 23, $year), |
|
| 70 | + mktime(12, 0, 0, 7, 30, $year), |
|
| 71 | + mktime(12, 0, 0, 8, 9, $year), |
|
| 72 | + mktime(12, 0, 0, 9, 23, $year), |
|
| 73 | + mktime(12, 0, 0, 10, 3, $year), |
|
| 74 | + mktime(12, 0, 0, 11, 12, $year), |
|
| 75 | + mktime(12, 0, 0, 11, 13, $year), |
|
| 76 | + mktime(12, 0, 0, 1, 3, ($year - 1)), |
|
| 77 | + mktime(12, 0, 0, 1, 9, ($year - 1)), |
|
| 78 | + mktime(12, 0, 0, 2, 13, ($year - 1)), |
|
| 79 | + mktime(12, 0, 0, 2, 23, ($year - 1)), |
|
| 80 | + mktime(12, 0, 0, 3, 30, ($year - 1)), |
|
| 81 | + mktime(12, 0, 0, 4, 3, ($year - 1)), |
|
| 82 | + mktime(12, 0, 0, 4, 3, ($year - 1)), |
|
| 83 | + mktime(12, 0, 0, 5, 9, ($year - 1)), |
|
| 84 | + mktime(12, 0, 0, 5, 1, ($year - 1)), |
|
| 85 | + mktime(12, 0, 0, 5, 13, ($year - 1)), |
|
| 86 | + mktime(12, 0, 0, 5, 19, ($year - 1)), |
|
| 87 | + mktime(12, 0, 0, 5, 23, ($year - 1)), |
|
| 88 | + mktime(12, 0, 0, 6, 3, ($year - 1)), |
|
| 89 | + mktime(12, 0, 0, 6, 19, ($year - 1)), |
|
| 90 | + mktime(12, 0, 0, 6, 24, ($year - 1)), |
|
| 91 | + mktime(12, 0, 0, 7, 3, ($year - 1)), |
|
| 92 | + mktime(12, 0, 0, 7, 9, ($year - 1)), |
|
| 93 | + mktime(12, 0, 0, 7, 23, ($year - 1)), |
|
| 94 | + mktime(12, 0, 0, 7, 30, ($year - 1)), |
|
| 95 | + mktime(12, 0, 0, 8, 9, ($year - 1)), |
|
| 96 | + mktime(12, 0, 0, 9, 23, ($year - 1)), |
|
| 97 | + mktime(12, 0, 0, 10, 3, ($year - 1)), |
|
| 98 | + mktime(12, 0, 0, 11, 12, $year), |
|
| 99 | + mktime(12, 0, 0, 11, 13, $year), |
|
| 100 | + mktime(12, 0, 0, 12, 12, $year), |
|
| 101 | + mktime(12, 0, 0, 12, 13, $year), |
|
| 102 | 102 | ); |
| 103 | 103 | |
| 104 | -$ret=$user->fetch('','admin'); |
|
| 104 | +$ret = $user->fetch('', 'admin'); |
|
| 105 | 105 | if ($ret <= 0) |
| 106 | 106 | { |
| 107 | 107 | print 'A user with login "admin" and all permissions must be created to use this script.'."\n"; |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | |
| 112 | 112 | $societesid = array(); |
| 113 | 113 | $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe where client in (1, 3)"; |
| 114 | -$resql=$db->query($sql); |
|
| 114 | +$resql = $db->query($sql); |
|
| 115 | 115 | if ($resql) { |
| 116 | 116 | $num_thirdparties = $db->num_rows($resql); |
| 117 | 117 | $i = 0; |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | |
| 126 | 126 | $commandesid = array(); |
| 127 | 127 | $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande"; |
| 128 | -$resql=$db->query($sql); |
|
| 128 | +$resql = $db->query($sql); |
|
| 129 | 129 | if ($resql) { |
| 130 | 130 | $num = $db->num_rows($resql); |
| 131 | 131 | $i = 0; |
@@ -157,14 +157,14 @@ discard block |
||
| 157 | 157 | |
| 158 | 158 | |
| 159 | 159 | print "Build ".GEN_NUMBER_COMMANDE." orders\n"; |
| 160 | -for ($s = 0 ; $s < GEN_NUMBER_COMMANDE ; $s++) |
|
| 160 | +for ($s = 0; $s < GEN_NUMBER_COMMANDE; $s++) |
|
| 161 | 161 | { |
| 162 | 162 | print "Process order ".$s."\n"; |
| 163 | 163 | |
| 164 | 164 | $object = new Commande($db); |
| 165 | 165 | |
| 166 | 166 | $object->socid = $societesid[mt_rand(1, $num_thirdparties)]; |
| 167 | - $object->date_commande = $dates[mt_rand(1, count($dates)-1)]; |
|
| 167 | + $object->date_commande = $dates[mt_rand(1, count($dates) - 1)]; |
|
| 168 | 168 | $object->note = 'My small comment about this order. Hum. Nothing.'; |
| 169 | 169 | $object->source = 1; |
| 170 | 170 | $object->fk_project = 0; |
@@ -174,15 +174,15 @@ discard block |
||
| 174 | 174 | $object->more_reglement_id = mt_rand(0, 7); |
| 175 | 175 | $object->availability_id = mt_rand(0, 1); |
| 176 | 176 | |
| 177 | - $listofuserid=array(12,13,16); |
|
| 177 | + $listofuserid = array(12, 13, 16); |
|
| 178 | 178 | |
| 179 | 179 | $fuser = new User($db); |
| 180 | - $fuser->fetch($listofuserid[mt_rand(0,2)]); |
|
| 180 | + $fuser->fetch($listofuserid[mt_rand(0, 2)]); |
|
| 181 | 181 | $fuser->getRights(); |
| 182 | 182 | |
| 183 | 183 | $db->begin(); |
| 184 | 184 | |
| 185 | - $result=$object->create($fuser); |
|
| 185 | + $result = $object->create($fuser); |
|
| 186 | 186 | if ($result >= 0) |
| 187 | 187 | { |
| 188 | 188 | $nbp = mt_rand(2, 5); |
@@ -190,17 +190,17 @@ discard block |
||
| 190 | 190 | while ($xnbp < $nbp) |
| 191 | 191 | { |
| 192 | 192 | $prodid = mt_rand(1, $num_prods); |
| 193 | - $product=new Product($db); |
|
| 194 | - $result=$product->fetch($prodids[$prodid]); |
|
| 195 | - $result=$object->addline($product->description, $product->price, mt_rand(1,5), 0, 0, 0, $prodids[$prodid], 0, 0, 0, $product->price_base_type, $product->price_ttc, '', '', $product->type); |
|
| 193 | + $product = new Product($db); |
|
| 194 | + $result = $product->fetch($prodids[$prodid]); |
|
| 195 | + $result = $object->addline($product->description, $product->price, mt_rand(1, 5), 0, 0, 0, $prodids[$prodid], 0, 0, 0, $product->price_base_type, $product->price_ttc, '', '', $product->type); |
|
| 196 | 196 | if ($result <= 0) |
| 197 | 197 | { |
| 198 | - dol_print_error($db,$object->error); |
|
| 198 | + dol_print_error($db, $object->error); |
|
| 199 | 199 | } |
| 200 | 200 | $xnbp++; |
| 201 | 201 | } |
| 202 | 202 | |
| 203 | - $result=$object->valid($fuser); |
|
| 203 | + $result = $object->valid($fuser); |
|
| 204 | 204 | if ($result > 0) |
| 205 | 205 | { |
| 206 | 206 | $db->commit(); |
@@ -210,14 +210,14 @@ discard block |
||
| 210 | 210 | { |
| 211 | 211 | print " KO\n"; |
| 212 | 212 | $db->rollback(); |
| 213 | - dol_print_error($db,$object->error); |
|
| 213 | + dol_print_error($db, $object->error); |
|
| 214 | 214 | } |
| 215 | 215 | } |
| 216 | 216 | else |
| 217 | 217 | { |
| 218 | 218 | print " KO\n"; |
| 219 | 219 | $db->rollback(); |
| 220 | - dol_print_error($db,$object->error); |
|
| 220 | + dol_print_error($db, $object->error); |
|
| 221 | 221 | } |
| 222 | 222 | } |
| 223 | 223 | |
@@ -120,8 +120,7 @@ discard block |
||
| 120 | 120 | $row = $db->fetch_row($resql); |
| 121 | 121 | $societesid[$i] = $row[0]; |
| 122 | 122 | } |
| 123 | -} |
|
| 124 | -else { print "err"; } |
|
| 123 | +} else { print "err"; } |
|
| 125 | 124 | |
| 126 | 125 | $commandesid = array(); |
| 127 | 126 | $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande"; |
@@ -134,8 +133,7 @@ discard block |
||
| 134 | 133 | $row = $db->fetch_row($resql); |
| 135 | 134 | $commandesid[$i] = $row[0]; |
| 136 | 135 | } |
| 137 | -} |
|
| 138 | -else { print "err"; } |
|
| 136 | +} else { print "err"; } |
|
| 139 | 137 | |
| 140 | 138 | $prodids = array(); |
| 141 | 139 | $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product WHERE tosell=1"; |
@@ -205,15 +203,13 @@ discard block |
||
| 205 | 203 | { |
| 206 | 204 | $db->commit(); |
| 207 | 205 | print " OK with ref ".$object->ref."\n"; |
| 208 | - } |
|
| 209 | - else |
|
| 206 | + } else |
|
| 210 | 207 | { |
| 211 | 208 | print " KO\n"; |
| 212 | 209 | $db->rollback(); |
| 213 | 210 | dol_print_error($db,$object->error); |
| 214 | 211 | } |
| 215 | - } |
|
| 216 | - else |
|
| 212 | + } else |
|
| 217 | 213 | { |
| 218 | 214 | print " KO\n"; |
| 219 | 215 | $db->rollback(); |
@@ -81,11 +81,11 @@ discard block |
||
| 81 | 81 | 'DELETE FROM '.MAIN_DB_PREFIX.'supplier_proposaldet', |
| 82 | 82 | 'DELETE FROM '.MAIN_DB_PREFIX.'supplier_proposal', |
| 83 | 83 | ), |
| 84 | - 'supplier_order'=>array( |
|
| 84 | + 'supplier_order'=>array( |
|
| 85 | 85 | 'DELETE FROM '.MAIN_DB_PREFIX.'commande_fournisseurdet', |
| 86 | 86 | 'DELETE FROM '.MAIN_DB_PREFIX.'commande_fournisseur', |
| 87 | 87 | ), |
| 88 | - 'supplier_invoice'=>array( |
|
| 88 | + 'supplier_invoice'=>array( |
|
| 89 | 89 | 'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn_det', |
| 90 | 90 | 'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn', |
| 91 | 91 | ), |
@@ -116,9 +116,9 @@ discard block |
||
| 116 | 116 | 'DELETE FROM '.MAIN_DB_PREFIX.'product_price', |
| 117 | 117 | 'DELETE FROM '.MAIN_DB_PREFIX.'product_fournisseur_price', |
| 118 | 118 | 'DELETE FROM '.MAIN_DB_PREFIX.'product_batch', |
| 119 | - 'DELETE FROM '.MAIN_DB_PREFIX.'product_stock', |
|
| 119 | + 'DELETE FROM '.MAIN_DB_PREFIX.'product_stock', |
|
| 120 | 120 | 'DELETE FROM '.MAIN_DB_PREFIX.'product_lot', |
| 121 | - 'DELETE FROM '.MAIN_DB_PREFIX.'product', |
|
| 121 | + 'DELETE FROM '.MAIN_DB_PREFIX.'product', |
|
| 122 | 122 | ), |
| 123 | 123 | 'project'=>array( |
| 124 | 124 | 'DELETE FROM '.MAIN_DB_PREFIX.'projet_task_time', |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | 'DELETE FROM '.MAIN_DB_PREFIX.'categorie_societe', |
| 138 | 138 | 'DELETE FROM '.MAIN_DB_PREFIX.'societe_remise_except', |
| 139 | 139 | 'DELETE FROM '.MAIN_DB_PREFIX.'societe_rib', |
| 140 | - 'DELETE FROM '.MAIN_DB_PREFIX.'societe', |
|
| 140 | + 'DELETE FROM '.MAIN_DB_PREFIX.'societe', |
|
| 141 | 141 | ) |
| 142 | 142 | ); |
| 143 | 143 | |
@@ -172,18 +172,18 @@ discard block |
||
| 172 | 172 | // Replace database handler |
| 173 | 173 | if (! empty($argv[3])) |
| 174 | 174 | { |
| 175 | - $db->close(); |
|
| 176 | - unset($db); |
|
| 177 | - $db=getDoliDBInstance($argv[3], $argv[4], $argv[5], $argv[6], $argv[7], $argv[8]); |
|
| 178 | - $user=new User($db); |
|
| 175 | + $db->close(); |
|
| 176 | + unset($db); |
|
| 177 | + $db=getDoliDBInstance($argv[3], $argv[4], $argv[5], $argv[6], $argv[7], $argv[8]); |
|
| 178 | + $user=new User($db); |
|
| 179 | 179 | } |
| 180 | 180 | |
| 181 | 181 | //var_dump($user->db->database_name); |
| 182 | 182 | $ret=$user->fetch('','admin'); |
| 183 | 183 | if (! $ret > 0) |
| 184 | 184 | { |
| 185 | - print 'An admin user with login "admin" must exists to use this script.'."\n"; |
|
| 186 | - exit; |
|
| 185 | + print 'An admin user with login "admin" must exists to use this script.'."\n"; |
|
| 186 | + exit; |
|
| 187 | 187 | } |
| 188 | 188 | //$user->getrights(); |
| 189 | 189 | |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | |
| 27 | 27 | $sapi_type = php_sapi_name(); |
| 28 | 28 | $script_file = basename(__FILE__); |
| 29 | -$path=dirname(__FILE__).'/'; |
|
| 29 | +$path = dirname(__FILE__).'/'; |
|
| 30 | 30 | |
| 31 | 31 | // Test si mode batch |
| 32 | 32 | if (substr($sapi_type, 0, 3) == 'cgi') { |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | // Recupere root dolibarr |
| 38 | -$path=preg_replace('/purge-data.php/i','',$_SERVER["PHP_SELF"]); |
|
| 38 | +$path = preg_replace('/purge-data.php/i', '', $_SERVER["PHP_SELF"]); |
|
| 39 | 39 | require $path."../../htdocs/master.inc.php"; |
| 40 | 40 | include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; |
| 41 | 41 | include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; |
@@ -47,11 +47,11 @@ discard block |
||
| 47 | 47 | $langs->loadLangs(array("main", "errors")); |
| 48 | 48 | |
| 49 | 49 | // Global variables |
| 50 | -$version=DOL_VERSION; |
|
| 51 | -$error=0; |
|
| 50 | +$version = DOL_VERSION; |
|
| 51 | +$error = 0; |
|
| 52 | 52 | |
| 53 | 53 | // List of sql to execute |
| 54 | -$sqls=array( |
|
| 54 | +$sqls = array( |
|
| 55 | 55 | 'user'=>array( |
| 56 | 56 | 'DELETE FROM '.MAIN_DB_PREFIX."user_rights WHERE fk_user IN (SELECT rowid FROM ".MAIN_DB_PREFIX."user WHERE admin = 0 and login != 'admin')", |
| 57 | 57 | 'DELETE FROM '.MAIN_DB_PREFIX."user WHERE admin = 0 and login != 'admin'", |
@@ -150,37 +150,37 @@ discard block |
||
| 150 | 150 | |
| 151 | 151 | @set_time_limit(0); |
| 152 | 152 | print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n"; |
| 153 | -dol_syslog($script_file." launched with arg ".implode(',',$argv)); |
|
| 153 | +dol_syslog($script_file." launched with arg ".implode(',', $argv)); |
|
| 154 | 154 | |
| 155 | 155 | $mode = $argv[1]; |
| 156 | 156 | $option = $argv[2]; |
| 157 | 157 | |
| 158 | -if (empty($mode) || ! in_array($mode,array('test','confirm'))) { |
|
| 158 | +if (empty($mode) || !in_array($mode, array('test', 'confirm'))) { |
|
| 159 | 159 | print "Usage: $script_file (test|confirm) (all|option) [dbtype dbhost dbuser dbpassword dbname dbport]\n"; |
| 160 | 160 | print "\n"; |
| 161 | - print "option can be ".implode(',',array_keys($sqls))."\n"; |
|
| 161 | + print "option can be ".implode(',', array_keys($sqls))."\n"; |
|
| 162 | 162 | exit(-1); |
| 163 | 163 | } |
| 164 | 164 | |
| 165 | -if (empty($option) || ! in_array($option, array_merge(array('all'),array_keys($sqls))) ) { |
|
| 165 | +if (empty($option) || !in_array($option, array_merge(array('all'), array_keys($sqls)))) { |
|
| 166 | 166 | print "Usage: $script_file (test|confirm) (all|option) [dbtype dbhost dbuser dbpassword dbname dbport]\n"; |
| 167 | 167 | print "\n"; |
| 168 | - print "option can be ".implode(',',array_keys($sqls))."\n"; |
|
| 168 | + print "option can be ".implode(',', array_keys($sqls))."\n"; |
|
| 169 | 169 | exit(-1); |
| 170 | 170 | } |
| 171 | 171 | |
| 172 | 172 | // Replace database handler |
| 173 | -if (! empty($argv[3])) |
|
| 173 | +if (!empty($argv[3])) |
|
| 174 | 174 | { |
| 175 | 175 | $db->close(); |
| 176 | 176 | unset($db); |
| 177 | - $db=getDoliDBInstance($argv[3], $argv[4], $argv[5], $argv[6], $argv[7], $argv[8]); |
|
| 178 | - $user=new User($db); |
|
| 177 | + $db = getDoliDBInstance($argv[3], $argv[4], $argv[5], $argv[6], $argv[7], $argv[8]); |
|
| 178 | + $user = new User($db); |
|
| 179 | 179 | } |
| 180 | 180 | |
| 181 | 181 | //var_dump($user->db->database_name); |
| 182 | -$ret=$user->fetch('','admin'); |
|
| 183 | -if (! $ret > 0) |
|
| 182 | +$ret = $user->fetch('', 'admin'); |
|
| 183 | +if (!$ret > 0) |
|
| 184 | 184 | { |
| 185 | 185 | print 'An admin user with login "admin" must exists to use this script.'."\n"; |
| 186 | 186 | exit; |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | print "User = ".$db->database_user."\n"; |
| 196 | 196 | print "\n"; |
| 197 | 197 | |
| 198 | -if (! $confirmed) |
|
| 198 | +if (!$confirmed) |
|
| 199 | 199 | { |
| 200 | 200 | print "Hit Enter to continue or CTRL+C to stop...\n"; |
| 201 | 201 | $input = trim(fgets(STDIN)); |
@@ -212,19 +212,19 @@ discard block |
||
| 212 | 212 | { |
| 213 | 213 | global $db, $sqls; |
| 214 | 214 | |
| 215 | - $error=0; |
|
| 216 | - foreach($sqls[$family] as $sql) |
|
| 215 | + $error = 0; |
|
| 216 | + foreach ($sqls[$family] as $sql) |
|
| 217 | 217 | { |
| 218 | - if (preg_match('/^@/',$sql)) |
|
| 218 | + if (preg_match('/^@/', $sql)) |
|
| 219 | 219 | { |
| 220 | - $newfamily=preg_replace('/@/','',$sql); |
|
| 220 | + $newfamily = preg_replace('/@/', '', $sql); |
|
| 221 | 221 | processfamily($newfamily); |
| 222 | 222 | continue; |
| 223 | 223 | } |
| 224 | 224 | |
| 225 | 225 | print "Run sql: ".$sql."\n"; |
| 226 | - $resql=$db->query($sql); |
|
| 227 | - if (! $resql) |
|
| 226 | + $resql = $db->query($sql); |
|
| 227 | + if (!$resql) |
|
| 228 | 228 | { |
| 229 | 229 | if ($db->errno() != 'DB_ERROR_NOSUCHTABLE') |
| 230 | 230 | { |
@@ -247,15 +247,15 @@ discard block |
||
| 247 | 247 | |
| 248 | 248 | $db->begin(); |
| 249 | 249 | |
| 250 | -$oldfamily=''; |
|
| 251 | -foreach($sqls as $family => $familysql) |
|
| 250 | +$oldfamily = ''; |
|
| 251 | +foreach ($sqls as $family => $familysql) |
|
| 252 | 252 | { |
| 253 | 253 | if ($option && $option != 'all' && $option != $family) continue; |
| 254 | 254 | |
| 255 | 255 | if ($family != $oldfamily) print "Process action for family ".$family."\n"; |
| 256 | 256 | $oldfamily = $family; |
| 257 | 257 | |
| 258 | - $result=processfamily($family); |
|
| 258 | + $result = processfamily($family); |
|
| 259 | 259 | if ($result < 0) |
| 260 | 260 | { |
| 261 | 261 | $error++; |
@@ -240,9 +240,12 @@ discard block |
||
| 240 | 240 | } |
| 241 | 241 | } |
| 242 | 242 | |
| 243 | - if ($error) return -1; |
|
| 244 | - else return 1; |
|
| 245 | -} |
|
| 243 | + if ($error) { |
|
| 244 | + return -1; |
|
| 245 | + } else { |
|
| 246 | + return 1; |
|
| 247 | + } |
|
| 248 | + } |
|
| 246 | 249 | |
| 247 | 250 | |
| 248 | 251 | $db->begin(); |
@@ -250,9 +253,13 @@ discard block |
||
| 250 | 253 | $oldfamily=''; |
| 251 | 254 | foreach($sqls as $family => $familysql) |
| 252 | 255 | { |
| 253 | - if ($option && $option != 'all' && $option != $family) continue; |
|
| 256 | + if ($option && $option != 'all' && $option != $family) { |
|
| 257 | + continue; |
|
| 258 | + } |
|
| 254 | 259 | |
| 255 | - if ($family != $oldfamily) print "Process action for family ".$family."\n"; |
|
| 260 | + if ($family != $oldfamily) { |
|
| 261 | + print "Process action for family ".$family."\n"; |
|
| 262 | + } |
|
| 256 | 263 | $oldfamily = $family; |
| 257 | 264 | |
| 258 | 265 | $result=processfamily($family); |
@@ -267,8 +274,7 @@ discard block |
||
| 267 | 274 | { |
| 268 | 275 | print "Rollback any changes.\n"; |
| 269 | 276 | $db->rollback(); |
| 270 | -} |
|
| 271 | -else |
|
| 277 | +} else |
|
| 272 | 278 | { |
| 273 | 279 | print "Commit all changes.\n"; |
| 274 | 280 | $db->commit(); |
@@ -26,8 +26,8 @@ discard block |
||
| 26 | 26 | // Test si mode batch |
| 27 | 27 | $sapi_type = php_sapi_name(); |
| 28 | 28 | if (substr($sapi_type, 0, 3) == 'cgi') { |
| 29 | - echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n"; |
|
| 30 | - exit; |
|
| 29 | + echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n"; |
|
| 30 | + exit; |
|
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | // Recupere root dolibarr |
@@ -98,8 +98,8 @@ discard block |
||
| 98 | 98 | $ret=$user->fetch('','admin'); |
| 99 | 99 | if (! $ret > 0) |
| 100 | 100 | { |
| 101 | - print 'A user with login "admin" and all permissions must be created to use this script.'."\n"; |
|
| 102 | - exit; |
|
| 101 | + print 'A user with login "admin" and all permissions must be created to use this script.'."\n"; |
|
| 102 | + exit; |
|
| 103 | 103 | } |
| 104 | 104 | $user->getrights(); |
| 105 | 105 | |
@@ -109,14 +109,14 @@ discard block |
||
| 109 | 109 | $resql = $db->query($sql); |
| 110 | 110 | if ($resql) |
| 111 | 111 | { |
| 112 | - $num_thirdparties = $db->num_rows($resql); |
|
| 113 | - $i = 0; |
|
| 114 | - while ($i < $num_thirdparties) |
|
| 115 | - { |
|
| 116 | - $i++; |
|
| 117 | - $row = $db->fetch_row($resql); |
|
| 118 | - $socids[$i] = $row[0]; |
|
| 119 | - } |
|
| 112 | + $num_thirdparties = $db->num_rows($resql); |
|
| 113 | + $i = 0; |
|
| 114 | + while ($i < $num_thirdparties) |
|
| 115 | + { |
|
| 116 | + $i++; |
|
| 117 | + $row = $db->fetch_row($resql); |
|
| 118 | + $socids[$i] = $row[0]; |
|
| 119 | + } |
|
| 120 | 120 | } |
| 121 | 121 | |
| 122 | 122 | $prodids = array(); |
@@ -124,65 +124,65 @@ discard block |
||
| 124 | 124 | $resql = $db->query($sql); |
| 125 | 125 | if ($resql) |
| 126 | 126 | { |
| 127 | - $num_prods = $db->num_rows($resql); |
|
| 128 | - $i = 0; |
|
| 129 | - while ($i < $num_prods) |
|
| 130 | - { |
|
| 131 | - $i++; |
|
| 132 | - $row = $db->fetch_row($resql); |
|
| 133 | - $prodids[$i] = $row[0]; |
|
| 134 | - } |
|
| 127 | + $num_prods = $db->num_rows($resql); |
|
| 128 | + $i = 0; |
|
| 129 | + while ($i < $num_prods) |
|
| 130 | + { |
|
| 131 | + $i++; |
|
| 132 | + $row = $db->fetch_row($resql); |
|
| 133 | + $prodids[$i] = $row[0]; |
|
| 134 | + } |
|
| 135 | 135 | } |
| 136 | 136 | |
| 137 | 137 | $i=0; |
| 138 | 138 | $result=0; |
| 139 | 139 | while ($i < GEN_NUMBER_FACTURE && $result >= 0) |
| 140 | 140 | { |
| 141 | - $i++; |
|
| 142 | - $socid = mt_rand(1, $num_thirdparties); |
|
| 141 | + $i++; |
|
| 142 | + $socid = mt_rand(1, $num_thirdparties); |
|
| 143 | 143 | |
| 144 | - print "Invoice ".$i." for socid ".$socid; |
|
| 144 | + print "Invoice ".$i." for socid ".$socid; |
|
| 145 | 145 | |
| 146 | - $object = new Facture($db); |
|
| 147 | - $object->socid = $socids[$socid]; |
|
| 148 | - $object->date = $dates[mt_rand(1, count($dates)-1)]; |
|
| 149 | - $object->cond_reglement_id = 3; |
|
| 150 | - $object->mode_reglement_id = 3; |
|
| 146 | + $object = new Facture($db); |
|
| 147 | + $object->socid = $socids[$socid]; |
|
| 148 | + $object->date = $dates[mt_rand(1, count($dates)-1)]; |
|
| 149 | + $object->cond_reglement_id = 3; |
|
| 150 | + $object->mode_reglement_id = 3; |
|
| 151 | 151 | |
| 152 | 152 | $fuser = new User($db); |
| 153 | 153 | $fuser->fetch(mt_rand(1,2)); |
| 154 | 154 | $fuser->getRights(); |
| 155 | 155 | |
| 156 | - $result=$object->create($fuser); |
|
| 157 | - if ($result >= 0) |
|
| 158 | - { |
|
| 159 | - $nbp = mt_rand(2, 5); |
|
| 160 | - $xnbp = 0; |
|
| 161 | - while ($xnbp < $nbp) |
|
| 162 | - { |
|
| 163 | - $prodid = mt_rand(1, $num_prods); |
|
| 164 | - $product=new Product($db); |
|
| 165 | - $result=$product->fetch($prodids[$prodid]); |
|
| 166 | - $result=$object->addline($product->description, $product->price, mt_rand(1,5), 0, 0, 0, $prodids[$prodid], 0, '', '', 0, 0, '', $product->price_base_type, $product->price_ttc, $product->type); |
|
| 167 | - if ($result < 0) |
|
| 156 | + $result=$object->create($fuser); |
|
| 157 | + if ($result >= 0) |
|
| 158 | + { |
|
| 159 | + $nbp = mt_rand(2, 5); |
|
| 160 | + $xnbp = 0; |
|
| 161 | + while ($xnbp < $nbp) |
|
| 162 | + { |
|
| 163 | + $prodid = mt_rand(1, $num_prods); |
|
| 164 | + $product=new Product($db); |
|
| 165 | + $result=$product->fetch($prodids[$prodid]); |
|
| 166 | + $result=$object->addline($product->description, $product->price, mt_rand(1,5), 0, 0, 0, $prodids[$prodid], 0, '', '', 0, 0, '', $product->price_base_type, $product->price_ttc, $product->type); |
|
| 167 | + if ($result < 0) |
|
| 168 | 168 | { |
| 169 | 169 | dol_print_error($db,$propal->error); |
| 170 | 170 | } |
| 171 | 171 | $xnbp++; |
| 172 | - } |
|
| 172 | + } |
|
| 173 | 173 | |
| 174 | - $result=$object->validate($fuser); |
|
| 175 | - if ($result) |
|
| 176 | - { |
|
| 177 | - print " OK with ref ".$object->ref."\n";; |
|
| 178 | - } |
|
| 179 | - else |
|
| 180 | - { |
|
| 181 | - dol_print_error($db,$object->error); |
|
| 182 | - } |
|
| 183 | - } |
|
| 184 | - else |
|
| 185 | - { |
|
| 186 | - dol_print_error($db,$object->error); |
|
| 187 | - } |
|
| 174 | + $result=$object->validate($fuser); |
|
| 175 | + if ($result) |
|
| 176 | + { |
|
| 177 | + print " OK with ref ".$object->ref."\n";; |
|
| 178 | + } |
|
| 179 | + else |
|
| 180 | + { |
|
| 181 | + dol_print_error($db,$object->error); |
|
| 182 | + } |
|
| 183 | + } |
|
| 184 | + else |
|
| 185 | + { |
|
| 186 | + dol_print_error($db,$object->error); |
|
| 187 | + } |
|
| 188 | 188 | } |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | |
| 33 | 33 | // Recupere root dolibarr |
| 34 | 34 | //$path=preg_replace('/generate-produit.php/i','',$_SERVER["PHP_SELF"]); |
| 35 | -require __DIR__. '/../../htdocs/master.inc.php'; |
|
| 35 | +require __DIR__.'/../../htdocs/master.inc.php'; |
|
| 36 | 36 | require_once DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"; |
| 37 | 37 | require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"; |
| 38 | 38 | |
@@ -43,60 +43,60 @@ discard block |
||
| 43 | 43 | |
| 44 | 44 | define(GEN_NUMBER_FACTURE, 1); |
| 45 | 45 | $year = 2016; |
| 46 | -$dates = array (mktime(12,0,0,1,3,$year), |
|
| 47 | - mktime(12,0,0,1,9,$year), |
|
| 48 | - mktime(12,0,0,2,13,$year), |
|
| 49 | - mktime(12,0,0,2,23,$year), |
|
| 50 | - mktime(12,0,0,3,30,$year), |
|
| 51 | - mktime(12,0,0,4,3,$year), |
|
| 52 | - mktime(12,0,0,4,3,$year), |
|
| 53 | - mktime(12,0,0,5,9,$year), |
|
| 54 | - mktime(12,0,0,5,1,$year), |
|
| 55 | - mktime(12,0,0,5,13,$year), |
|
| 56 | - mktime(12,0,0,5,19,$year), |
|
| 57 | - mktime(12,0,0,5,23,$year), |
|
| 58 | - mktime(12,0,0,6,3,$year), |
|
| 59 | - mktime(12,0,0,6,19,$year), |
|
| 60 | - mktime(12,0,0,6,24,$year), |
|
| 61 | - mktime(12,0,0,7,3,$year), |
|
| 62 | - mktime(12,0,0,7,9,$year), |
|
| 63 | - mktime(12,0,0,7,23,$year), |
|
| 64 | - mktime(12,0,0,7,30,$year), |
|
| 65 | - mktime(12,0,0,8,9,$year), |
|
| 66 | - mktime(12,0,0,9,23,$year), |
|
| 67 | - mktime(12,0,0,10,3,$year), |
|
| 68 | - mktime(12,0,0,11,12,$year), |
|
| 69 | - mktime(12,0,0,11,13,$year), |
|
| 70 | - mktime(12,0,0,1,3,($year - 1)), |
|
| 71 | - mktime(12,0,0,1,9,($year - 1)), |
|
| 72 | - mktime(12,0,0,2,13,($year - 1)), |
|
| 73 | - mktime(12,0,0,2,23,($year - 1)), |
|
| 74 | - mktime(12,0,0,3,30,($year - 1)), |
|
| 75 | - mktime(12,0,0,4,3,($year - 1)), |
|
| 76 | - mktime(12,0,0,4,3,($year - 1)), |
|
| 77 | - mktime(12,0,0,5,9,($year - 1)), |
|
| 78 | - mktime(12,0,0,5,1,($year - 1)), |
|
| 79 | - mktime(12,0,0,5,13,($year - 1)), |
|
| 80 | - mktime(12,0,0,5,19,($year - 1)), |
|
| 81 | - mktime(12,0,0,5,23,($year - 1)), |
|
| 82 | - mktime(12,0,0,6,3,($year - 1)), |
|
| 83 | - mktime(12,0,0,6,19,($year - 1)), |
|
| 84 | - mktime(12,0,0,6,24,($year - 1)), |
|
| 85 | - mktime(12,0,0,7,3,($year - 1)), |
|
| 86 | - mktime(12,0,0,7,9,($year - 1)), |
|
| 87 | - mktime(12,0,0,7,23,($year - 1)), |
|
| 88 | - mktime(12,0,0,7,30,($year - 1)), |
|
| 89 | - mktime(12,0,0,8,9,($year - 1)), |
|
| 90 | - mktime(12,0,0,9,23,($year - 1)), |
|
| 91 | - mktime(12,0,0,10,3,($year - 1)), |
|
| 92 | - mktime(12,0,0,11,12,$year), |
|
| 93 | - mktime(12,0,0,11,13,$year), |
|
| 94 | - mktime(12,0,0,12,12,$year), |
|
| 95 | - mktime(12,0,0,12,13,$year), |
|
| 46 | +$dates = array(mktime(12, 0, 0, 1, 3, $year), |
|
| 47 | + mktime(12, 0, 0, 1, 9, $year), |
|
| 48 | + mktime(12, 0, 0, 2, 13, $year), |
|
| 49 | + mktime(12, 0, 0, 2, 23, $year), |
|
| 50 | + mktime(12, 0, 0, 3, 30, $year), |
|
| 51 | + mktime(12, 0, 0, 4, 3, $year), |
|
| 52 | + mktime(12, 0, 0, 4, 3, $year), |
|
| 53 | + mktime(12, 0, 0, 5, 9, $year), |
|
| 54 | + mktime(12, 0, 0, 5, 1, $year), |
|
| 55 | + mktime(12, 0, 0, 5, 13, $year), |
|
| 56 | + mktime(12, 0, 0, 5, 19, $year), |
|
| 57 | + mktime(12, 0, 0, 5, 23, $year), |
|
| 58 | + mktime(12, 0, 0, 6, 3, $year), |
|
| 59 | + mktime(12, 0, 0, 6, 19, $year), |
|
| 60 | + mktime(12, 0, 0, 6, 24, $year), |
|
| 61 | + mktime(12, 0, 0, 7, 3, $year), |
|
| 62 | + mktime(12, 0, 0, 7, 9, $year), |
|
| 63 | + mktime(12, 0, 0, 7, 23, $year), |
|
| 64 | + mktime(12, 0, 0, 7, 30, $year), |
|
| 65 | + mktime(12, 0, 0, 8, 9, $year), |
|
| 66 | + mktime(12, 0, 0, 9, 23, $year), |
|
| 67 | + mktime(12, 0, 0, 10, 3, $year), |
|
| 68 | + mktime(12, 0, 0, 11, 12, $year), |
|
| 69 | + mktime(12, 0, 0, 11, 13, $year), |
|
| 70 | + mktime(12, 0, 0, 1, 3, ($year - 1)), |
|
| 71 | + mktime(12, 0, 0, 1, 9, ($year - 1)), |
|
| 72 | + mktime(12, 0, 0, 2, 13, ($year - 1)), |
|
| 73 | + mktime(12, 0, 0, 2, 23, ($year - 1)), |
|
| 74 | + mktime(12, 0, 0, 3, 30, ($year - 1)), |
|
| 75 | + mktime(12, 0, 0, 4, 3, ($year - 1)), |
|
| 76 | + mktime(12, 0, 0, 4, 3, ($year - 1)), |
|
| 77 | + mktime(12, 0, 0, 5, 9, ($year - 1)), |
|
| 78 | + mktime(12, 0, 0, 5, 1, ($year - 1)), |
|
| 79 | + mktime(12, 0, 0, 5, 13, ($year - 1)), |
|
| 80 | + mktime(12, 0, 0, 5, 19, ($year - 1)), |
|
| 81 | + mktime(12, 0, 0, 5, 23, ($year - 1)), |
|
| 82 | + mktime(12, 0, 0, 6, 3, ($year - 1)), |
|
| 83 | + mktime(12, 0, 0, 6, 19, ($year - 1)), |
|
| 84 | + mktime(12, 0, 0, 6, 24, ($year - 1)), |
|
| 85 | + mktime(12, 0, 0, 7, 3, ($year - 1)), |
|
| 86 | + mktime(12, 0, 0, 7, 9, ($year - 1)), |
|
| 87 | + mktime(12, 0, 0, 7, 23, ($year - 1)), |
|
| 88 | + mktime(12, 0, 0, 7, 30, ($year - 1)), |
|
| 89 | + mktime(12, 0, 0, 8, 9, ($year - 1)), |
|
| 90 | + mktime(12, 0, 0, 9, 23, ($year - 1)), |
|
| 91 | + mktime(12, 0, 0, 10, 3, ($year - 1)), |
|
| 92 | + mktime(12, 0, 0, 11, 12, $year), |
|
| 93 | + mktime(12, 0, 0, 11, 13, $year), |
|
| 94 | + mktime(12, 0, 0, 12, 12, $year), |
|
| 95 | + mktime(12, 0, 0, 12, 13, $year), |
|
| 96 | 96 | ); |
| 97 | 97 | |
| 98 | -$ret=$user->fetch('','admin'); |
|
| 99 | -if (! $ret > 0) |
|
| 98 | +$ret = $user->fetch('', 'admin'); |
|
| 99 | +if (!$ret > 0) |
|
| 100 | 100 | { |
| 101 | 101 | print 'A user with login "admin" and all permissions must be created to use this script.'."\n"; |
| 102 | 102 | exit; |
@@ -134,8 +134,8 @@ discard block |
||
| 134 | 134 | } |
| 135 | 135 | } |
| 136 | 136 | |
| 137 | -$i=0; |
|
| 138 | -$result=0; |
|
| 137 | +$i = 0; |
|
| 138 | +$result = 0; |
|
| 139 | 139 | while ($i < GEN_NUMBER_FACTURE && $result >= 0) |
| 140 | 140 | { |
| 141 | 141 | $i++; |
@@ -145,15 +145,15 @@ discard block |
||
| 145 | 145 | |
| 146 | 146 | $object = new Facture($db); |
| 147 | 147 | $object->socid = $socids[$socid]; |
| 148 | - $object->date = $dates[mt_rand(1, count($dates)-1)]; |
|
| 148 | + $object->date = $dates[mt_rand(1, count($dates) - 1)]; |
|
| 149 | 149 | $object->cond_reglement_id = 3; |
| 150 | 150 | $object->mode_reglement_id = 3; |
| 151 | 151 | |
| 152 | 152 | $fuser = new User($db); |
| 153 | - $fuser->fetch(mt_rand(1,2)); |
|
| 153 | + $fuser->fetch(mt_rand(1, 2)); |
|
| 154 | 154 | $fuser->getRights(); |
| 155 | 155 | |
| 156 | - $result=$object->create($fuser); |
|
| 156 | + $result = $object->create($fuser); |
|
| 157 | 157 | if ($result >= 0) |
| 158 | 158 | { |
| 159 | 159 | $nbp = mt_rand(2, 5); |
@@ -161,28 +161,28 @@ discard block |
||
| 161 | 161 | while ($xnbp < $nbp) |
| 162 | 162 | { |
| 163 | 163 | $prodid = mt_rand(1, $num_prods); |
| 164 | - $product=new Product($db); |
|
| 165 | - $result=$product->fetch($prodids[$prodid]); |
|
| 166 | - $result=$object->addline($product->description, $product->price, mt_rand(1,5), 0, 0, 0, $prodids[$prodid], 0, '', '', 0, 0, '', $product->price_base_type, $product->price_ttc, $product->type); |
|
| 164 | + $product = new Product($db); |
|
| 165 | + $result = $product->fetch($prodids[$prodid]); |
|
| 166 | + $result = $object->addline($product->description, $product->price, mt_rand(1, 5), 0, 0, 0, $prodids[$prodid], 0, '', '', 0, 0, '', $product->price_base_type, $product->price_ttc, $product->type); |
|
| 167 | 167 | if ($result < 0) |
| 168 | 168 | { |
| 169 | - dol_print_error($db,$propal->error); |
|
| 169 | + dol_print_error($db, $propal->error); |
|
| 170 | 170 | } |
| 171 | 171 | $xnbp++; |
| 172 | 172 | } |
| 173 | 173 | |
| 174 | - $result=$object->validate($fuser); |
|
| 174 | + $result = $object->validate($fuser); |
|
| 175 | 175 | if ($result) |
| 176 | 176 | { |
| 177 | - print " OK with ref ".$object->ref."\n";; |
|
| 177 | + print " OK with ref ".$object->ref."\n"; ; |
|
| 178 | 178 | } |
| 179 | 179 | else |
| 180 | 180 | { |
| 181 | - dol_print_error($db,$object->error); |
|
| 181 | + dol_print_error($db, $object->error); |
|
| 182 | 182 | } |
| 183 | 183 | } |
| 184 | 184 | else |
| 185 | 185 | { |
| 186 | - dol_print_error($db,$object->error); |
|
| 186 | + dol_print_error($db, $object->error); |
|
| 187 | 187 | } |
| 188 | 188 | } |
@@ -175,13 +175,11 @@ |
||
| 175 | 175 | if ($result) |
| 176 | 176 | { |
| 177 | 177 | print " OK with ref ".$object->ref."\n";; |
| 178 | - } |
|
| 179 | - else |
|
| 178 | + } else |
|
| 180 | 179 | { |
| 181 | 180 | dol_print_error($db,$object->error); |
| 182 | 181 | } |
| 183 | - } |
|
| 184 | - else |
|
| 182 | + } else |
|
| 185 | 183 | { |
| 186 | 184 | dol_print_error($db,$object->error); |
| 187 | 185 | } |
