[git] web/doc-editor.git branch GIT_READY updated. 445f9a3
| From: | irker@php.net | Date: | Sat, 11 Feb 2012 11:10:18 +0000 |
| Subject: | [git] web/doc-editor.git branch GIT_READY updated. 445f9a3 | ||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-9574@lists.php.net to get a copy of this message | ||
The branch, GIT_READY on web/doc-editor.git has been updated
via 445f9a3a5335006f04836d5b21c7c1ef25ebff14 (commit)
from 8cbc93fa54861a5ae89eb9f544679ffd997b5112 (commit)
http://git.php.net/?p=web/doc-editor.git;a=log;h=445f9a3a5335006f04836d5b21c7c1ef25ebff14;hp=8cbc93fa54861a5ae89eb9f544679ffd997b5112
Summary of changes:
php/File.php | 1183 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 591 insertions(+), 592 deletions(-)
-- Log ----------------------------------------
commit 445f9a3a5335006f04836d5b21c7c1ef25ebff14
Author: Alexander Moskaliov <irker@php.net>
Date: Sat Feb 11 15:02:48 2012 +0400
fix linending
diff --git a/php/File.php b/php/File.php
index e4136f1..a51035d 100644
--- a/php/File.php
+++ b/php/File.php
@@ -1,592 +1,591 @@
-<?php
-
-
-class File
-{
- public $lang;
- public $name;
-
- public $path;
-
- public $full_path;
- public $full_new_path;
-
- public $full_path_fallback;
-
- public $full_path_dir;
- public $full_new_path_dir;
-
- public $isDir;
- public $isFile;
-
- private $conn;
-
- /**
- * Constructor will normalize the lang and the path as specified as parameters.
- * The path can be a folder or a file.
- *
- * @param $lang '/' netural
- * @param $path with leading and tailing '/'
- * @param $name '/' netural
- */
- public function __construct($lang='', $path='')
- {
- $appConf = AccountManager::getInstance()->appConf;
- $project = AccountManager::getInstance()->project;
-
- // Security
- $path = str_replace('..', '', $path);
- $path = str_replace('//', '/', $path);
-
- $this->lang = $lang = trim($lang, '/');
- $path = trim($path, '.');
- $path = trim($path, '/');
-
- // Find if the path is a folder or a file. As it, if the path contains an extension, we
assume the path is a file.
- // Else, it's a folder.
- $path_parts = pathinfo($path);
-
- if( !isset($path_parts['extension']) ) {
- $this->isDir = true;
- $this->isFile = false;
- $this->name = '';
- $path_parts['dirname'] = isset($path_parts['dirname']) ?
$path_parts['dirname'] : '';
- $path =
$path_parts['dirname'].'/'.$path_parts['basename'];
- } else {
- $this->isDir = false;
- $this->isFile = true;
- $this->name = $path_parts['basename'];
- $path = $path_parts['dirname'];
- }
-
- $path = trim($path, '.');
- $path = trim($path, '/');
- $path = trim($path, '.');
-
- if (strlen($path) > 0) {
- $this->path = "/$path/";
-
- $this->full_path =
$appConf[$project]['vcs.path'].$lang.'/'.$path.'/'.$this->name;
- $this->full_new_path =
$appConf['GLOBAL_CONFIGURATION']['data.path'].$appConf[$project]['vcs.module'].'-new/'.$lang.'/'.$path.'/'.$this->name;
-
- $this->full_path_dir =
$appConf[$project]['vcs.path'].$lang.'/'.$path.'/';
- $this->full_new_path_dir =
$appConf['GLOBAL_CONFIGURATION']['data.path'].$appConf[$project]['vcs.module'].'-new/'.$lang.'/'.$path.'/';
-
- // The fallback file : if the file don't exist, we fallback to the EN file witch
should always exist
- $this->full_path_fallback =
$appConf[$project]['vcs.path'].'en/'.$path.'/'.$this->name;
- } else {
- $this->path = '/';
-
- $this->full_path =
$appConf[$project]['vcs.path'].$lang.'/'.$this->name;
- $this->full_new_path =
$appConf['GLOBAL_CONFIGURATION']['data.path'].$appConf[$project]['vcs.module'].'-new/'.$lang.'/'.$this->name;
-
- $this->full_path_dir = $appConf[$project]['vcs.path'].$lang.'/';
- $this->full_new_path_dir =
$appConf['GLOBAL_CONFIGURATION']['data.path'].$appConf[$project]['vcs.module'].'-new/'.$lang.'/';
-
- $this->full_path_fallback =
$appConf[$project]['vcs.path'].'en/'.$this->name;
- }
-
- $this->conn = DBConnection::getInstance();
- }
-
- public function exist()
- {
- if( $this->isDir ) return is_dir($this->full_path_dir);
- else return is_file($this->full_path);
- }
-
-
- /**
- * Translate the content of a file with Google Translate API.
- *
- * @return The automatic translation.
- */
- public function translate()
- {
- // We must check if the file exist.
- // For example, when we start a translation, save it, and then open it from work in
progress module, the path don't exist and we must use the fallback path for translation
-
- $originalContent = ( is_file($this->full_path) ) ?
file_get_contents($this->full_path) : file_get_contents($this->full_path_fallback);
-
- // We search for new line caracters and mark it ! (Google API delete new line)
- $originalContent = str_replace("\n", "[@]", $originalContent);
-
- $lang = AccountManager::getInstance()->vcsLang;
-
- $translation = false;
- $gt = new Gtranslate;
- $gt->setRequestType('curl');
- $translation = $gt->translate('en', $lang, $originalContent);
-
- // Replace new line mark
- $translation = str_replace("[@]", "\n", $translation);
-
- // Few substitutions
- $translation = str_replace("&" , "&", $translation);
- $translation = str_replace("& ", "&", $translation);
- $translation = str_replace("'" , "'", $translation);
- $translation = str_replace(""", '"', $translation);
- $translation = str_replace("<" , '<', $translation);
- $translation = str_replace(">" , '>', $translation);
-
- // CLeanUp entities. Google return it like this : & Reftitle.parameters;. We convert it
like this : &reftitle.parameters;
- $translation = preg_replace_callback("/(&)\s(.)(.[^;]*?)(;)/s",
- create_function(
- '$matches',
- 'return $matches[1].strtolower($matches[2]).$matches[3].$matches[4];'
- ),
- $translation);
-
- // We remove extra space after :: operator
- $translation = preg_replace("/(\w+)(::)(\s)(\w+)/s", "$1$2$4",
$translation);
-
- // We delete space into tab like this </ b>
- $translation = preg_replace("/(<\/\s(\w+[^>]*)>)/s",
"</$2>", $translation);
-
- // We delete space just after an open tag, and just before a close tag, like this <b>
foo </b>
- $translation =
preg_replace("/(<(\w+[^>]*)>)(\s?)(.[^>]*?)(\s?)(<\/(\\2)>)/s",
"<$2>$4</$7>", $translation);
-
- return $translation;
- }
-
- /**
- * Read the content of a file.
- *
- * @param $readOriginal true to read the original content of the file, false to read the
modified file (if any). By default, false.
- * @return The content of the file.
- */
- public function read($readOriginal=false)
- {
- $isModified = $this->isModified();
- $isModified = (bool) $isModified;
-
- $path = ($readOriginal || !$isModified)
- ? $this->full_path
- : $this->full_new_path;
-
- if( is_file($path) ) {
- return file_get_contents($path);
- } elseif( is_file($this->full_path_fallback) ) {
- // usefull for a patch from the FNT module.
- return file_get_contents($this->full_path_fallback);
- } else {
- return false;
- }
-
- }
-
- /**
- * Save a file after modification.
- *
- * @param $content The new content.
- * @return The path to the new file successfully created.
- */
- public function save($content)
- {
-
- // Ensure the folder exist.
- if( ! is_dir($this->full_new_path_dir) ) {
- mkdir( $this->full_new_path_dir, 0777, true );
- }
-
- // Open in w+ mode
- $h = @fopen($this->full_new_path, 'w+');
- if( $h ) {
- fwrite($h, $content);
- fclose($h);
- return $this->full_new_path;
- } else {
- return array(
- 'state' => false
- );
- }
- }
-
- /**
- * Create a new folder locally & register it to pendingCommit
- * If $path is provided, it is used to create the according path. Else, we use the current
folder's path.
- *
- * @param string $path The path to create. By default, we use the current path.
- * @return boolean TRUE if the path have been created successfully, FALSE otherwise.
- */
- public function createFolder($path=false)
- {
- $am = AccountManager::getInstance();
- $appConf = $am->appConf;
- $project = $am->project;
-
- if( !$path ) {
- $path = $this->path;
- }
-
- $parentFolder = dirname($path);
- if(!is_dir($parentFolder)) {
- $this->createFolder($parentFolder);
- }
-
- // We create this folder localy
- if( !
@mkdir($appConf['GLOBAL_CONFIGURATION']['data.path'].$appConf[$project]['vcs.module'].'-new/'.$this->lang.'/'.$path,
0777, true) ) {
- return false;
- }
-
- // We register this new folder to be committed
- $obj = (object) array('lang' => $this->lang, 'path' => $path,
'name' => '-');
- RepositoryManager::getInstance()->addProgressWork($obj, '-', '-',
'-', '-', '-', 'new');
-
- return true;
-
- }
-
- /**
- * Check if the path of this $file exist or not. If not, try to create it
- *
- * @return true
- */
- public function folderExist()
- {
- $am = AccountManager::getInstance();
- $appConf = $am->appConf;
- $project = $am->project;
-
- if( !is_dir($this->full_new_path_dir) ) {
- $this->createFolder();
- }
-
- return true;
- }
-
- /**
- * Parse an array of string to find all attributes in form of (key=value) pairs.
- *
- * @param $key_value_pairs Array of key-value pair strings to be parsed.
- * @return An associated array whos key is the name of the attribute, and value, the value of
the attribute.
- */
- public function parseAttribute($key_value_pairs)
- {
- $processed = array();
-
- foreach ($key_value_pairs as $pair) {
-
- // Get attr name and values
- $attributes = array();
- preg_match_all('!(.+)=\\s*(["\'])\\s*(.+)\\2!U', $pair,
$attributes);
-
- // Assign all attributes to one associative array
- $key_value = array();
- foreach ($attributes[1] as $k => $name) {
- $key_value[trim($name)] = trim($attributes[3][$k]);
- }
- // Collect in order of tags received
- $processed[] = $key_value;
- }
-
- return $processed;
- }
-
- /**
- * Test if the file is a modified file.
- *
- * @return Mixed FALSE if the file haven't been modified, otherwise, some information
about the user how have modified it.
- */
- public function isModified()
- {
- $am = AccountManager::getInstance();
- $project = $am->project;
-
- $s = 'SELECT
-
id as fidDB,
- user,
- anonymousIdent,
- module as fromModule,
- type as ftype
- FROM
- work
- WHERE
- project = "%s" AND
- lang="%s" AND
- path="%s" AND
- name="%s"';
- $params = array(
- $project,
- $this->lang,
- $this->path,
- $this->name
- );
-
- $r = $this->conn->query($s, $params);
-
- if( $r->num_rows == 0 ) {
- return false;
- } else {
- $a = $r->fetch_assoc();
- $a['isAnonymous'] = $am->anonymous($a['user'],
$a['anonymousIdent']);
- return json_encode($a);
- }
- }
-
- /**
- * Get encoding of a file, regarding his XML's header.
- *
- * @param $content The content of the file
- * @return The charset as a string.
- */
- public function getEncoding($content=false)
- {
- if (!$content) {
- $content = @file_get_contents($this->full_path);
- }
-
- $content = preg_replace('/\\s+/', ' ', $content);
-
- $match = array();
- preg_match('!<\?xml(.+)\?>!U', $content, $match);
- $xmlinfo = $this->parseAttribute($match);
-
- $charset = isset($xmlinfo[1]['encoding'])
- ? strtolower($xmlinfo[1]['encoding'])
- : 'iso-8859-1';
-
- return $charset;
- }
-
- /**
- * Get the information from the content of a file.
- *
- * @param $content The content of the file.
- * @return An associated array of informations.
- */
- public function getInfo($content=false)
- {
- if (!$content) {
- $content = file_get_contents($this->full_path);
- }
-
- $info = array(
- 'rev' => 0,
- 'en-rev' => 0,
- 'maintainer' => 'NULL',
- 'reviewed' => 'NULL',
- 'reviewed_maintainer' => 'NULL',
- 'status' => '-',
- 'xmlid' => 'NULL',
- 'content' => $content
- );
-
- // revision tag
- $match = array();
- preg_match('/<!-- .Revision: ([0-9a-f]+) . -->/', $content, $match);
- if (!empty($match)) {
- $info['rev'] = $match[1];
- }
-
- // Rev tag
- $match = array();
-
preg_match('/<!--\s*EN-Revision:\s*(([0-9a-f]+)|(n\/a))\s*Maintainer:\s*(\\S*)\s*Status:\s*(.+)\s*-->/U',
$content, $match);
- if (!empty($match)) {
- $info['en-rev'] = ($match[1] == 'n/a') ? 0 : $match[1];
- $info['maintainer'] = $match[4];
- $info['status'] = $match[5];
- }
-
- // Reviewed tag
- $match = array();
- if
(preg_match('/<!--\s*Reviewed:\s*(.*?)\s*(Maintainer:\s*(\\S*)\s*)?-->/i', $content,
$match)) {
- $info['reviewed'] = ( isset($match[1]) ) ? trim($match[1]) : NULL;
- $info['reviewed_maintainer'] = ( isset($match[3]) ) ? trim($match[3]) : NULL;
- }
-
- // All xmlid
- $match = array();
- if (preg_match_all('/xml:id=("|\')(.*?)("|\')/', $content,
$match)) {
- $info['xmlid'] = implode('|',$match[2]);
- }
-
- return $info;
- }
-
- /**
- * Get a raw diff between a file and its modified file.
- *
- * @param $patchID If set, indicate the ID of the patch from witch we have to retrieve all
files diff
- * @return The diff of the file with its modified version.
- */
- public function rawDiff($patchID=false)
- {
- $am = AccountManager::getInstance();
- $appConf = $am->appConf;
- $project = $am->project;
-
- if( $patchID ) {
-
- $return='';
- $output = array();
-
- $patchFiles = RepositoryManager::getInstance()->getPatchFilesByID($patchID);
- for( $i=0; $i < count($patchFiles); $i++ )
- {
-
- $pathFileOrigin = $appConf[$project]['vcs.path'] .
$patchFiles[$i]->lang . $patchFiles[$i]->path . $patchFiles[$i]->name;
- $pathFileModified =
$appConf['GLOBAL_CONFIGURATION']['data.path'].$appConf[$project]['vcs.module'].'-new/'
. $patchFiles[$i]->lang . $patchFiles[$i]->path . $patchFiles[$i]->name;
-
- $commands = array(
- new ExecStatement('diff -uN %s %s', array($pathFileOrigin,
$pathFileModified))
- );
-
- $trial_threshold = 3;
- while ($trial_threshold-- > 0)
- {
- $_output = array();
- SaferExec::execMulti($commands, $_output);
- if (strlen(trim(implode('', $_output))) != 0) break;
- }
-
- $output = array_merge($output, $_output);
- }
-
- return implode("\r\n", $output);
-
- } else {
-
- $pathFileOrigin = $appConf[$project]['vcs.path'] . $this->lang .
$this->path . $this->name;
- $pathFileModified =
$appConf['GLOBAL_CONFIGURATION']['data.path'].$appConf[$project]['vcs.module'].'-new/'
. $this->lang . $this->path . $this->name;
-
- $commands = array(
- new ExecStatement('diff -uN %s %s', array($pathFileOrigin,
$pathFileModified))
- );
-
- $output = array();
- SaferExec::execMulti($commands, $output);
-
- return implode("\r\n", $output);
- }
- }
-
- /**
- * Get the diff of a file with his modified version.
- *
- * @param $rev1 First revison.
- * @param $rev2 Second revision.
- * @return The diff a the file with his modified version, as HTML, ready to be display.
- */
- public function Diff($type, $options)
- {
- $am = AccountManager::getInstance();
- $appConf = $am->appConf;
- $project = $am->project;
- $return = '';
- $output = array();
-
- if( $type == 'vcs' ) {
-
- $output = VCSFactory::getInstance()->diff(
- $this->lang.$this->path,
- $this->name, $options['rev1'], $options['rev2']
- );
-
- $return = $this->DiffGenHTMLOutput($output);
-
- } elseif( $type == 'file' || $type == 'patch' ) {
-
- //$ext = ( $options['type'] == 'patch' ) ? '.' .
$options['uniqID'] . '.patch' : '.new';
-
- // If this patch is for new file, we only display "This is a new file."
- if( $type == 'patch' &&
!is_file($appConf[$project]['vcs.path'].$this->lang.$this->path.$this->name) ) {
- return '<div style="size: 10px;
text-align:center;margin-top:10px;">This is a new file.</div>';
- } else {
-
- if( $options['patchID'] == '' )
- {
-
- $pathFileOrigin = $appConf[$project]['vcs.path'] . $this->lang .
$this->path . $this->name;
- $pathFileModified =
$appConf['GLOBAL_CONFIGURATION']['data.path'].$appConf[$project]['vcs.module'].'-new/'
. $this->lang . $this->path . $this->name;
-
- $commands = array(
- new ExecStatement('diff -uN %s %s', array($pathFileOrigin,
$pathFileModified))
- );
-
- $trial_threshold = 3;
- while ($trial_threshold-- > 0) {
- $output = array();
- SaferExec::execMulti($commands, $output);
- if (strlen(trim(implode('', $output))) != 0) break;
- }
-
- $return = $this->DiffGenHTMLOutput($output);
-
- }
- else
- {
- // We get all files from this patch
- $patchFiles =
RepositoryManager::getInstance()->getPatchFilesByID($options['patchID']);
-
- for( $i=0; $i < count($patchFiles); $i++ )
- {
-
- $pathFileOrigin = $appConf[$project]['vcs.path'] .
$patchFiles[$i]->lang . $patchFiles[$i]->path . $patchFiles[$i]->name;
- $pathFileModified =
$appConf['GLOBAL_CONFIGURATION']['data.path'].$appConf[$project]['vcs.module'].'-new/'
. $patchFiles[$i]->lang . $patchFiles[$i]->path . $patchFiles[$i]->name;
-
- $commands = array(
- new ExecStatement('diff -uN %s %s', array($pathFileOrigin,
$pathFileModified))
- );
-
- $trial_threshold = 3;
- while ($trial_threshold-- > 0)
- {
- $output = array();
- SaferExec::execMulti($commands, $output);
- if (strlen(trim(implode('', $output))) != 0) break;
- }
-
- $return .= $this->DiffGenHTMLOutput($output);
- }
- }
- }
- }
-
- return $return;
- }
-
- public function DiffGenHTMLOutput($content) {
-
- $header = array_shift($content)."<br>".array_shift($content);
- $return = '<table class="code">
- <tr>
- <td class="header">'.$header.'</td>
- </tr>
- ';
-
- $classes = array(
- '+' => 'ins',
- '-' => 'del',
- ' ' => '',
- '@' => 'line'
- );
- $first = true;
- foreach ($content as $string) {
- if ($string[0] == '@' && !$first) $return .= '<tr><td
class="truncated"> </td></tr>';
- $first = false;
- $return .= '<tr><td
class="'.$classes[$string[0]].'">'.str_replace(' ',
' ', htmlentities($string, ENT_QUOTES,
'UTF-8')).'</td></tr>';
- }
- $return .= '<tr><td
class="truncated"> </td></tr>';
- $return .= '<table>';
-
- return $return;
- }
-
- /**
- * Get the image content.
- *
- * @return An associative array with 'content-type' and 'content' keys
- */
- public function getImageContent()
- {
- $t = explode('.', $this->full_path);
-
- $return['content-type'] = 'image/'.$t[count($t)-1];
- $return['content'] = file_get_contents($this->full_path);
-
- return $return;
- }
-}
-
-?>
+<?php
+
+
+class File
+{
+ public $lang;
+ public $name;
+
+ public $path;
+
+ public $full_path;
+ public $full_new_path;
+
+ public $full_path_fallback;
+
+ public $full_path_dir;
+ public $full_new_path_dir;
+
+ public $isDir;
+ public $isFile;
+
+ private $conn;
+
+ /**
+ * Constructor will normalize the lang and the path as specified as parameters.
+ * The path can be a folder or a file.
+ *
+ * @param $lang '/' netural
+ * @param $path with leading and tailing '/'
+ * @param $name '/' netural
+ */
+ public function __construct($lang='', $path='')
+ {
+ $appConf = AccountManager::getInstance()->appConf;
+ $project = AccountManager::getInstance()->project;
+
+ // Security
+ $path = str_replace('..', '', $path);
+ $path = str_replace('//', '/', $path);
+
+ $this->lang = $lang = trim($lang, '/');
+ $path = trim($path, '.');
+ $path = trim($path, '/');
+
+ // Find if the path is a folder or a file. As it, if the path contains an extension, we
assume the path is a file.
+ // Else, it's a folder.
+ $path_parts = pathinfo($path);
+
+ if( !isset($path_parts['extension']) ) {
+ $this->isDir = true;
+ $this->isFile = false;
+ $this->name = '';
+ $path_parts['dirname'] = isset($path_parts['dirname']) ?
$path_parts['dirname'] : '';
+ $path =
$path_parts['dirname'].'/'.$path_parts['basename'];
+ } else {
+ $this->isDir = false;
+ $this->isFile = true;
+ $this->name = $path_parts['basename'];
+ $path = $path_parts['dirname'];
+ }
+
+ $path = trim($path, '.');
+ $path = trim($path, '/');
+ $path = trim($path, '.');
+
+ if (strlen($path) > 0) {
+ $this->path = "/$path/";
+
+ $this->full_path =
$appConf[$project]['vcs.path'].$lang.'/'.$path.'/'.$this->name;
+ $this->full_new_path =
$appConf['GLOBAL_CONFIGURATION']['data.path'].$appConf[$project]['vcs.module'].'-new/'.$lang.'/'.$path.'/'.$this->name;
+
+ $this->full_path_dir =
$appConf[$project]['vcs.path'].$lang.'/'.$path.'/';
+ $this->full_new_path_dir =
$appConf['GLOBAL_CONFIGURATION']['data.path'].$appConf[$project]['vcs.module'].'-new/'.$lang.'/'.$path.'/';
+
+ // The fallback file : if the file don't exist, we fallback to the EN file witch
should always exist
+ $this->full_path_fallback =
$appConf[$project]['vcs.path'].'en/'.$path.'/'.$this->name;
+ } else {
+ $this->path = '/';
+
+ $this->full_path =
$appConf[$project]['vcs.path'].$lang.'/'.$this->name;
+ $this->full_new_path =
$appConf['GLOBAL_CONFIGURATION']['data.path'].$appConf[$project]['vcs.module'].'-new/'.$lang.'/'.$this->name;
+
+ $this->full_path_dir = $appConf[$project]['vcs.path'].$lang.'/';
+ $this->full_new_path_dir =
$appConf['GLOBAL_CONFIGURATION']['data.path'].$appConf[$project]['vcs.module'].'-new/'.$lang.'/';
+
+ $this->full_path_fallback =
$appConf[$project]['vcs.path'].'en/'.$this->name;
+ }
+
+ $this->conn = DBConnection::getInstance();
+ }
+
+ public function exist()
+ {
+ if( $this->isDir ) return is_dir($this->full_path_dir);
+ else return is_file($this->full_path);
+ }
+
+
+ /**
+ * Translate the content of a file with Google Translate API.
+ *
+ * @return The automatic translation.
+ */
+ public function translate()
+ {
+ // We must check if the file exist.
+ // For example, when we start a translation, save it, and then open it from work in
progress module, the path don't exist and we must use the fallback path for translation
+
+ $originalContent = ( is_file($this->full_path) ) ?
file_get_contents($this->full_path) : file_get_contents($this->full_path_fallback);
+
+ // We search for new line caracters and mark it ! (Google API delete new line)
+ $originalContent = str_replace("\n", "[@]", $originalContent);
+
+ $lang = AccountManager::getInstance()->vcsLang;
+
+ $translation = false;
+ $gt = new Gtranslate;
+ $gt->setRequestType('curl');
+ $translation = $gt->translate('en', $lang, $originalContent);
+
+ // Replace new line mark
+ $translation = str_replace("[@]", "\n", $translation);
+
+ // Few substitutions
+ $translation = str_replace("&" , "&", $translation);
+ $translation = str_replace("& ", "&", $translation);
+ $translation = str_replace("'" , "'", $translation);
+ $translation = str_replace(""", '"', $translation);
+ $translation = str_replace("<" , '<', $translation);
+ $translation = str_replace(">" , '>', $translation);
+
+ // CLeanUp entities. Google return it like this : & Reftitle.parameters;. We convert it
like this : &reftitle.parameters;
+ $translation = preg_replace_callback("/(&)\s(.)(.[^;]*?)(;)/s",
+ create_function(
+ '$matches',
+ 'return $matches[1].strtolower($matches[2]).$matches[3].$matches[4];'
+ ),
+ $translation);
+
+ // We remove extra space after :: operator
+ $translation = preg_replace("/(\w+)(::)(\s)(\w+)/s", "$1$2$4",
$translation);
+
+ // We delete space into tab like this </ b>
+ $translation = preg_replace("/(<\/\s(\w+[^>]*)>)/s",
"</$2>", $translation);
+
+ // We delete space just after an open tag, and just before a close tag, like this <b>
foo </b>
+ $translation =
preg_replace("/(<(\w+[^>]*)>)(\s?)(.[^>]*?)(\s?)(<\/(\\2)>)/s",
"<$2>$4</$7>", $translation);
+
+ return $translation;
+ }
+
+ /**
+ * Read the content of a file.
+ *
+ * @param $readOriginal true to read the original content of the file, false to read the
modified file (if any). By default, false.
+ * @return The content of the file.
+ */
+ public function read($readOriginal=false)
+ {
+ $isModified = $this->isModified();
+ $isModified = (bool) $isModified;
+
+ $path = ($readOriginal || !$isModified)
+ ? $this->full_path
+ : $this->full_new_path;
+
+ if( is_file($path) ) {
+ return file_get_contents($path);
+ } elseif( is_file($this->full_path_fallback) ) {
+ // usefull for a patch from the FNT module.
+ return file_get_contents($this->full_path_fallback);
+ } else {
+ return false;
+ }
+
+ }
+
+ /**
+ * Save a file after modification.
+ *
+ * @param $content The new content.
+ * @return The path to the new file successfully created.
+ */
+ public function save($content)
+ {
+
+ // Ensure the folder exist.
+ if( ! is_dir($this->full_new_path_dir) ) {
+ mkdir( $this->full_new_path_dir, 0777, true );
+ }
+
+ // Open in w+ mode
+ $h = @fopen($this->full_new_path, 'w+');
+ if( $h ) {
+ fwrite($h, $content);
+ fclose($h);
+ return $this->full_new_path;
+ } else {
+ return array(
+ 'state' => false
+ );
+ }
+ }
+
+ /**
+ * Create a new folder locally & register it to pendingCommit
+ * If $path is provided, it is used to create the according path. Else, we use the current
folder's path.
+ *
+ * @param string $path The path to create. By default, we use the current path.
+ * @return boolean TRUE if the path have been created successfully, FALSE otherwise.
+ */
+ public function createFolder($path=false)
+ {
+ $am = AccountManager::getInstance();
+ $appConf = $am->appConf;
+ $project = $am->project;
+
+ if( !$path ) {
+ $path = $this->path;
+ }
+
+ $parentFolder = dirname($path);
+ if(!is_dir($parentFolder)) {
+ $this->createFolder($parentFolder);
+ }
+
+ // We create this folder localy
+ if( !
@mkdir($appConf['GLOBAL_CONFIGURATION']['data.path'].$appConf[$project]['vcs.module'].'-new/'.$this->lang.'/'.$path,
0777, true) ) {
+ return false;
+ }
+
+ // We register this new folder to be committed
+ $obj = (object) array('lang' => $this->lang, 'path' => $path,
'name' => '-');
+ RepositoryManager::getInstance()->addProgressWork($obj, '-', '-',
'-', '-', '-', 'new');
+
+ return true;
+
+ }
+
+ /**
+ * Check if the path of this $file exist or not. If not, try to create it
+ *
+ * @return true
+ */
+ public function folderExist()
+ {
+ $am = AccountManager::getInstance();
+ $appConf = $am->appConf;
+ $project = $am->project;
+
+ if( !is_dir($this->full_new_path_dir) ) {
+ $this->createFolder();
+ }
+
+ return true;
+ }
+
+ /**
+ * Parse an array of string to find all attributes in form of (key=value) pairs.
+ *
+ * @param $key_value_pairs Array of key-value pair strings to be parsed.
+ * @return An associated array whos key is the name of the attribute, and value, the value of
the attribute.
+ */
+ public function parseAttribute($key_value_pairs)
+ {
+ $processed = array();
+
+ foreach ($key_value_pairs as $pair) {
+
+ // Get attr name and values
+ $attributes = array();
+ preg_match_all('!(.+)=\\s*(["\'])\\s*(.+)\\2!U', $pair,
$attributes);
+
+ // Assign all attributes to one associative array
+ $key_value = array();
+ foreach ($attributes[1] as $k => $name) {
+ $key_value[trim($name)] = trim($attributes[3][$k]);
+ }
+ // Collect in order of tags received
+ $processed[] = $key_value;
+ }
+
+ return $processed;
+ }
+
+ /**
+ * Test if the file is a modified file.
+ *
+ * @return Mixed FALSE if the file haven't been modified, otherwise, some information
about the user how have modified it.
+ */
+ public function isModified()
+ {
+ $am = AccountManager::getInstance();
+ $project = $am->project;
+
+ $s = 'SELECT
+ id as fidDB,
+ user,
+ anonymousIdent,
+ module as fromModule,
+ type as ftype
+ FROM
+ work
+ WHERE
+ project = "%s" AND
+ lang="%s" AND
+ path="%s" AND
+ name="%s"';
+ $params = array(
+ $project,
+ $this->lang,
+ $this->path,
+ $this->name
+ );
+
+ $r = $this->conn->query($s, $params);
+
+ if( $r->num_rows == 0 ) {
+ return false;
+ } else {
+ $a = $r->fetch_assoc();
+ $a['isAnonymous'] = $am->anonymous($a['user'],
$a['anonymousIdent']);
+ return json_encode($a);
+ }
+ }
+
+ /**
+ * Get encoding of a file, regarding his XML's header.
+ *
+ * @param $content The content of the file
+ * @return The charset as a string.
+ */
+ public function getEncoding($content=false)
+ {
+ if (!$content) {
+ $content = @file_get_contents($this->full_path);
+ }
+
+ $content = preg_replace('/\\s+/', ' ', $content);
+
+ $match = array();
+ preg_match('!<\?xml(.+)\?>!U', $content, $match);
+ $xmlinfo = $this->parseAttribute($match);
+
+ $charset = isset($xmlinfo[1]['encoding'])
+ ? strtolower($xmlinfo[1]['encoding'])
+ : 'iso-8859-1';
+
+ return $charset;
+ }
+
+ /**
+ * Get the information from the content of a file.
+ *
+ * @param $content The content of the file.
+ * @return An associated array of informations.
+ */
+ public function getInfo($content=false)
+ {
+ if (!$content) {
+ $content = file_get_contents($this->full_path);
+ }
+
+ $info = array(
+ 'rev' => 0,
+ 'en-rev' => 0,
+ 'maintainer' => 'NULL',
+ 'reviewed' => 'NULL',
+ 'reviewed_maintainer' => 'NULL',
+ 'status' => '-',
+ 'xmlid' => 'NULL',
+ 'content' => $content
+ );
+
+ // revision tag
+ $match = array();
+ preg_match('/<!-- .Revision: ([0-9a-f]+) . -->/', $content, $match);
+ if (!empty($match)) {
+ $info['rev'] = $match[1];
+ }
+
+ // Rev tag
+ $match = array();
+
preg_match('/<!--\s*EN-Revision:\s*(([0-9a-f]+)|(n\/a))\s*Maintainer:\s*(\\S*)\s*Status:\s*(.+)\s*-->/U',
$content, $match);
+ if (!empty($match)) {
+ $info['en-rev'] = ($match[1] == 'n/a') ? 0 : $match[1];
+ $info['maintainer'] = $match[4];
+ $info['status'] = $match[5];
+ }
+
+ // Reviewed tag
+ $match = array();
+ if
(preg_match('/<!--\s*Reviewed:\s*(.*?)\s*(Maintainer:\s*(\\S*)\s*)?-->/i', $content,
$match)) {
+ $info['reviewed'] = ( isset($match[1]) ) ? trim($match[1]) : NULL;
+ $info['reviewed_maintainer'] = ( isset($match[3]) ) ? trim($match[3]) : NULL;
+ }
+
+ // All xmlid
+ $match = array();
+ if (preg_match_all('/xml:id=("|\')(.*?)("|\')/', $content,
$match)) {
+ $info['xmlid'] = implode('|',$match[2]);
+ }
+
+ return $info;
+ }
+
+ /**
+ * Get a raw diff between a file and its modified file.
+ *
+ * @param $patchID If set, indicate the ID of the patch from witch we have to retrieve all
files diff
+ * @return The diff of the file with its modified version.
+ */
+ public function rawDiff($patchID=false)
+ {
+ $am = AccountManager::getInstance();
+ $appConf = $am->appConf;
+ $project = $am->project;
+
+ if( $patchID ) {
+
+ $output = array();
+
+ $patchFiles = RepositoryManager::getInstance()->getPatchFilesByID($patchID);
+ for( $i=0; $i < count($patchFiles); $i++ )
+ {
+
+ $pathFileOrigin = $appConf[$project]['vcs.path'] .
$patchFiles[$i]->lang . $patchFiles[$i]->path . $patchFiles[$i]->name;
+ $pathFileModified =
$appConf['GLOBAL_CONFIGURATION']['data.path'].$appConf[$project]['vcs.module'].'-new/'
. $patchFiles[$i]->lang . $patchFiles[$i]->path . $patchFiles[$i]->name;
+
+ $commands = array(
+ new ExecStatement('diff -uN %s %s', array($pathFileOrigin,
$pathFileModified))
+ );
+
+ $trial_threshold = 3;
+ while ($trial_threshold-- > 0)
+ {
+ $_output = array();
+ SaferExec::execMulti($commands, $_output);
+ if (strlen(trim(implode('', $_output))) != 0) break;
+ }
+
+ $output = array_merge($output, $_output);
+ }
+
+ return implode("\r\n", $output);
+
+ } else {
+
+ $pathFileOrigin = $appConf[$project]['vcs.path'] . $this->lang .
$this->path . $this->name;
+ $pathFileModified =
$appConf['GLOBAL_CONFIGURATION']['data.path'].$appConf[$project]['vcs.module'].'-new/'
. $this->lang . $this->path . $this->name;
+
+ $commands = array(
+ new ExecStatement('diff -uN %s %s', array($pathFileOrigin,
$pathFileModified))
+ );
+
+ $output = array();
+ SaferExec::execMulti($commands, $output);
+
+ return implode("\r\n", $output);
+ }
+ }
+
+ /**
+ * Get the diff of a file with his modified version.
+ *
+ * @param $rev1 First revison.
+ * @param $rev2 Second revision.
+ * @return The diff a the file with his modified version, as HTML, ready to be display.
+ */
+ public function Diff($type, $options)
+ {
+ $am = AccountManager::getInstance();
+ $appConf = $am->appConf;
+ $project = $am->project;
+ $return = '';
+ $output = array();
+
+ if( $type == 'vcs' ) {
+
+ $output = VCSFactory::getInstance()->diff(
+ $this->lang.$this->path,
+ $this->name, $options['rev1'], $options['rev2']
+ );
+
+ $return = $this->DiffGenHTMLOutput($output);
+
+ } elseif( $type == 'file' || $type == 'patch' ) {
+
+ //$ext = ( $options['type'] == 'patch' ) ? '.' .
$options['uniqID'] . '.patch' : '.new';
+
+ // If this patch is for new file, we only display "This is a new file."
+ if( $type == 'patch' &&
!is_file($appConf[$project]['vcs.path'].$this->lang.$this->path.$this->name) ) {
+ return '<div style="size: 10px;
text-align:center;margin-top:10px;">This is a new file.</div>';
+ } else {
+
+ if( $options['patchID'] == '' )
+ {
+
+ $pathFileOrigin = $appConf[$project]['vcs.path'] . $this->lang .
$this->path . $this->name;
+ $pathFileModified =
$appConf['GLOBAL_CONFIGURATION']['data.path'].$appConf[$project]['vcs.module'].'-new/'
. $this->lang . $this->path . $this->name;
+
+ $commands = array(
+ new ExecStatement('diff -uN %s %s', array($pathFileOrigin,
$pathFileModified))
+ );
+
+ $trial_threshold = 3;
+ while ($trial_threshold-- > 0) {
+ $output = array();
+ SaferExec::execMulti($commands, $output);
+ if (strlen(trim(implode('', $output))) != 0) break;
+ }
+
+ $return = $this->DiffGenHTMLOutput($output);
+
+ }
+ else
+ {
+ // We get all files from this patch
+ $patchFiles =
RepositoryManager::getInstance()->getPatchFilesByID($options['patchID']);
+
+ for( $i=0; $i < count($patchFiles); $i++ )
+ {
+
+ $pathFileOrigin = $appConf[$project]['vcs.path'] .
$patchFiles[$i]->lang . $patchFiles[$i]->path . $patchFiles[$i]->name;
+ $pathFileModified =
$appConf['GLOBAL_CONFIGURATION']['data.path'].$appConf[$project]['vcs.module'].'-new/'
. $patchFiles[$i]->lang . $patchFiles[$i]->path . $patchFiles[$i]->name;
+
+ $commands = array(
+ new ExecStatement('diff -uN %s %s', array($pathFileOrigin,
$pathFileModified))
+ );
+
+ $trial_threshold = 3;
+ while ($trial_threshold-- > 0)
+ {
+ $output = array();
+ SaferExec::execMulti($commands, $output);
+ if (strlen(trim(implode('', $output))) != 0) break;
+ }
+
+ $return .= $this->DiffGenHTMLOutput($output);
+ }
+ }
+ }
+ }
+
+ return $return;
+ }
+
+ public function DiffGenHTMLOutput($content) {
+
+ $header = array_shift($content)."<br>".array_shift($content);
+ $return = '<table class="code">
+ <tr>
+ <td class="header">'.$header.'</td>
+ </tr>
+ ';
+
+ $classes = array(
+ '+' => 'ins',
+ '-' => 'del',
+ ' ' => '',
+ '@' => 'line'
+ );
+ $first = true;
+ foreach ($content as $string) {
+ if ($string[0] == '@' && !$first) $return .= '<tr><td
class="truncated"> </td></tr>';
+ $first = false;
+ $return .= '<tr><td
class="'.$classes[$string[0]].'">'.str_replace(' ',
' ', htmlentities($string, ENT_QUOTES,
'UTF-8')).'</td></tr>';
+ }
+ $return .= '<tr><td
class="truncated"> </td></tr>';
+ $return .= '<table>';
+
+ return $return;
+ }
+
+ /**
+ * Get the image content.
+ *
+ * @return An associative array with 'content-type' and 'content' keys
+ */
+ public function getImageContent()
+ {
+ $t = explode('.', $this->full_path);
+
+ $return['content-type'] = 'image/'.$t[count($t)-1];
+ $return['content'] = file_get_contents($this->full_path);
+
+ return $return;
+ }
+}
+
+?>
Thank you for your contribution.