svn: /web/doc-editor/trunk/php/ File.php LogManager.php NewsReader.php RepositoryFetcher.php RepositoryManager.php ToolsCheckEntities.php ToolsError.php TranslationStatistic.php TranslatorStatistic.php utility.php

Modified: web/doc-editor/trunk/php/File.php
===================================================================
--- web/doc-editor/trunk/php/File.php	2010-03-14 23:41:35 UTC (rev 296221)
+++ web/doc-editor/trunk/php/File.php	2010-03-15 00:19:32 UTC (rev 296222)
@@ -140,8 +140,9 @@
      */
     private function createFolder($path)
     {
-       $appConf = AccountManager::getInstance()->appConf;
-       $project = AccountManager::getInstance()->project;
+       $am      = AccountManager::getInstance();
+       $appConf = $am->appConf;
+       $project = $am->project;

        // We create this folder localy
        mkdir($appConf[$project]['vcs.path'].$this->lang.$path);
@@ -159,8 +160,9 @@
      */
     public function folderExist()
     {
-        $appConf = AccountManager::getInstance()->appConf;
-        $project = AccountManager::getInstance()->project;
+        $am      = AccountManager::getInstance();
+        $appConf = $am->appConf;
+        $project = $am->project;

         $folders = array();
         $_folders = explode("/", $this->path);
@@ -323,8 +325,9 @@
      */
     public function rawDiff($isPatch=false, $uniqID='')
     {
-        $appConf = AccountManager::getInstance()->appConf;
-        $project = AccountManager::getInstance()->project;
+        $am      = AccountManager::getInstance();
+        $appConf = $am->appConf;
+        $project = $am->project;

         $ext = ($isPatch) ? '.' . $uniqID . '.patch' : '.new';
         $cmd = 'cd '.$appConf[$project]['vcs.path'].$this->lang.$this->path.'; '
@@ -345,8 +348,9 @@
      */
     public function Diff($type, $options)
     {
-        $appConf = AccountManager::getInstance()->appConf;
-        $project = AccountManager::getInstance()->project;
+        $am      = AccountManager::getInstance();
+        $appConf = $am->appConf;
+        $project = $am->project;

         if( $type == 'vcs' ) {


Modified: web/doc-editor/trunk/php/LogManager.php
===================================================================
--- web/doc-editor/trunk/php/LogManager.php	2010-03-14 23:41:35 UTC (rev 296221)
+++ web/doc-editor/trunk/php/LogManager.php	2010-03-15 00:19:32 UTC (rev 296222)
@@ -50,21 +50,22 @@
      */
     public function addCommitLog($log)
     {
-        $log    = DBConnection::getInstance()->real_escape_string($log);
+        $db     = DBConnection::getInstance();
+        $log    = $db->real_escape_string($log);
         $userID = AccountManager::getInstance()->userID;

         $s = sprintf(
             'SELECT id FROM `commitMessage` WHERE `text`="%s" AND `userID`="%s"',
             $log, $userID
         );
-        $r = DBConnection::getInstance()->query($s);
+        $r = $db->query($s);

         if ($r->num_rows == 0 ) {
             $s = sprintf(
                 'INSERT INTO `commitMessage` (`text`,`userID`) VALUES ("%s", "%s")',
                 $log, $userID
             );
-            DBConnection::getInstance()->query($s);
+            $db->query($s);
         }
     }

@@ -76,11 +77,12 @@
      */
     public function updateCommitLog($logID, $log)
     {
+        $db= DBConnection::getInstance();
         $s = sprintf(
             'UPDATE `commitMessage` SET `text`="%s" WHERE `id`="%s"',
-            DBConnection::getInstance()->real_escape_string($log), $logID
+            $db->real_escape_string($log), $logID
         );
-        DBConnection::getInstance()->query($s);
+        $db->query($s);
     }

     /**
@@ -105,8 +107,9 @@
      */
     public function saveOutputLog($file, $output)
     {
-        $appConf = AccountManager::getInstance()->appConf;
-        $project = AccountManager::getInstance()->project;
+        $am      = AccountManager::getInstance();
+        $appConf = $am->appConf;
+        $project = $am->project;

         $fp = fopen($appConf[$project]['vcs.path'] . '../.' . $file, 'w');
         fwrite($fp, implode("<br>",$output));
@@ -121,8 +124,9 @@
      */
     public function readOutputLog($file)
     {
-        $appConf = AccountManager::getInstance()->appConf;
-        $project = AccountManager::getInstance()->project;
+        $am      = AccountManager::getInstance();
+        $appConf = $am->appConf;
+        $project = $am->project;

         return $this->highlightBuildLog(file_get_contents($appConf[$project]['vcs.path'] . '../.' . $file));
     }
@@ -135,14 +139,15 @@
      */
     public function saveFailedBuild($lang, $log)
     {
+        $db      = DBConnection::getInstance();
         $project = AccountManager::getInstance()->project;

         $s = sprintf(
             'INSERT INTO `failedBuildLog` (`project`, `lang`, `log`, `date`)
              VALUES ("%s","%s", "%s", now())',
-            $project, $lang, DBConnection::getInstance()->real_escape_string(json_encode($log))
+            $project, $lang, $db->real_escape_string(json_encode($log))
         );
-        DBConnection::getInstance()->query($s);
+        $db->query($s);
     }

     /**

Modified: web/doc-editor/trunk/php/NewsReader.php
===================================================================
--- web/doc-editor/trunk/php/NewsReader.php	2010-03-14 23:41:35 UTC (rev 296221)
+++ web/doc-editor/trunk/php/NewsReader.php	2010-03-15 00:19:32 UTC (rev 296222)
@@ -31,8 +31,9 @@
      */
     function getLastNews()
     {
-        $appConf = AccountManager::getInstance()->appConf;
-        $project = AccountManager::getInstance()->project;
+        $am      = AccountManager::getInstance();
+        $appConf = $am->appConf;
+        $project = $am->project;

         $result = array();

@@ -63,4 +64,5 @@

     }

-}
\ No newline at end of file
+}
+?>
\ No newline at end of file

Modified: web/doc-editor/trunk/php/RepositoryFetcher.php
===================================================================
--- web/doc-editor/trunk/php/RepositoryFetcher.php	2010-03-14 23:41:35 UTC (rev 296221)
+++ web/doc-editor/trunk/php/RepositoryFetcher.php	2010-03-15 00:19:32 UTC (rev 296222)
@@ -29,9 +29,9 @@
      */
     public function getLastUpdate()
     {
+        $am      = AccountManager::getInstance();
+        $project = $am->project;

-        $project = AccountManager::getInstance()->project;
-
         $return = array();
         $return["lastupdatedata"] = '-';
         $return["lastcheckentities"] = '-';
@@ -41,8 +41,6 @@
         $lock_apply    = new LockFile('project_'.$project.'_lock_apply_tools');
         $lock_entities = new LockFile('project_'.$project.'_lock_check_entities');

-        $project = AccountManager::getInstance()->project;
-
         if ( $lock_update->isLocked() || $lock_apply->isLocked() ) {
             $return["lastupdatedata"] = 'in_progress';
         } else {
@@ -58,8 +56,6 @@
         }

         return $return;
-
-
     }

     /**
@@ -132,10 +128,10 @@

     public function getNbPendingUpdate()
     {
-        $ac = AccountManager::getInstance();
+        $am = AccountManager::getInstance();

-        $vcsLang = $ac->vcsLang;
-        $project = $ac->project;
+        $vcsLang = $am->vcsLang;
+        $project = $am->project;

         $s = sprintf(
             'SELECT
@@ -153,7 +149,7 @@
         $r = DBConnection::getInstance()->query($s);
         $a = $r->fetch_object();

-        return ( $a->total > $ac->userConf->needUpdateNbDisplay && $ac->userConf->needUpdateNbDisplay != 0 ) ? $ac->userConf->needUpdateNbDisplay : $a->total;
+        return ( $a->total > $am->userConf->needUpdateNbDisplay && $am->userConf->needUpdateNbDisplay != 0 ) ? $am->userConf->needUpdateNbDisplay : $a->total;

     }
     /**
@@ -163,12 +159,12 @@
      */
     public function getPendingUpdate()
     {
-        $ac = AccountManager::getInstance();
+        $am = AccountManager::getInstance();

-        $vcsLang = $ac->vcsLang;
-        $project = $ac->project;
+        $vcsLang = $am->vcsLang;
+        $project = $am->project;

-        $limit = ( $ac->userConf->needUpdateNbDisplay ) ? 'LIMIT '.$ac->userConf->needUpdateNbDisplay : '';
+        $limit = ( $am->userConf->needUpdateNbDisplay ) ? 'LIMIT '.$am->userConf->needUpdateNbDisplay : '';

         $m = $this->getModifies();

@@ -239,10 +235,10 @@

     public function getNbPendingReview()
     {
-        $ac = AccountManager::getInstance();
+        $am = AccountManager::getInstance();

-        $vcsLang = $ac->vcsLang;
-        $project = $ac->project;
+        $vcsLang = $am->vcsLang;
+        $project = $am->project;

         $m = $this->getModifies();
         $s = sprintf(
@@ -260,7 +256,7 @@
         $r = DBConnection::getInstance()->query($s);
         $a = $r->fetch_object();

-        return ( $a->total > $ac->userConf->reviewedNbDisplay && $ac->userConf->reviewedNbDisplay != 0 ) ? $ac->userConf->reviewedNbDisplay : $a->total;
+        return ( $a->total > $am->userConf->reviewedNbDisplay && $am->userConf->reviewedNbDisplay != 0 ) ? $am->userConf->reviewedNbDisplay : $a->total;
     }
     /**
      * Get all files witch need to be reviewed.
@@ -269,12 +265,12 @@
      */
     public function getPendingReview()
     {
-        $ac = AccountManager::getInstance();
+        $am = AccountManager::getInstance();

-        $vcsLang = $ac->vcsLang;
-        $project = $ac->project;
+        $vcsLang = $am->vcsLang;
+        $project = $am->project;

-        $limit = ( $ac->userConf->reviewedNbDisplay ) ? 'LIMIT '.$ac->userConf->reviewedNbDisplay : '';
+        $limit = ( $am->userConf->reviewedNbDisplay ) ? 'LIMIT '.$am->userConf->reviewedNbDisplay : '';

         $m = $this->getModifies();
         $s = sprintf(
@@ -333,8 +329,9 @@

     public function getNbNotInEn()
     {
-        $vcsLang = AccountManager::getInstance()->vcsLang;
-        $project = AccountManager::getInstance()->project;
+        $am      = AccountManager::getInstance();
+        $vcsLang = $am->vcsLang;
+        $project = $am->project;

         $m = $this->getModifies();
         $s = sprintf('SELECT count(*) as total FROM `files` WHERE `project`="%s" AND `lang`="%s" AND `status`=\'NotInEN\'', $project, $vcsLang);
@@ -350,8 +347,9 @@
      */
     public function getNotInEn()
     {
-        $vcsLang = AccountManager::getInstance()->vcsLang;
-        $project = AccountManager::getInstance()->project;
+        $am      = AccountManager::getInstance();
+        $vcsLang = $am->vcsLang;
+        $project = $am->project;

         $m = $this->getModifies();
         $s = sprintf('SELECT `id`, `path`, `name` FROM `files` WHERE `project`="%s" AND `lang`="%s" AND `status`=\'NotInEN\'', $project, $vcsLang);
@@ -372,11 +370,10 @@

     public function getNbPendingTranslate()
     {
-        $ac = AccountManager::getInstance();
+        $am = AccountManager::getInstance();
+        $vcsLang = $am->vcsLang;
+        $project = $am->project;

-        $vcsLang = $ac->vcsLang;
-        $project = $ac->project;
-
         $s = sprintf('
             SELECT
                 count(*) as total
@@ -394,7 +391,7 @@
         $r = DBConnection::getInstance()->query($s);
         $a = $r->fetch_object();

-        return ( $a->total > $ac->userConf->newFileNbDisplay && $ac->userConf->newFileNbDisplay != 0 ) ? $ac->userConf->newFileNbDisplay : $a->total;
+        return ( $a->total > $am->userConf->newFileNbDisplay && $am->userConf->newFileNbDisplay != 0 ) ? $am->userConf->newFileNbDisplay : $a->total;
     }
     /**
      * Get all files which need to be translated
@@ -403,12 +400,12 @@
      */
     public function getPendingTranslate()
     {
-        $ac = AccountManager::getInstance();
+        $am = AccountManager::getInstance();

-        $vcsLang = $ac->vcsLang;
-        $project = $ac->project;
+        $vcsLang = $am->vcsLang;
+        $project = $am->project;

-        $limit = ( $ac->userConf->newFileNbDisplay ) ? 'LIMIT '.$ac->userConf->newFileNbDisplay : '';
+        $limit = ( $am->userConf->newFileNbDisplay ) ? 'LIMIT '.$am->userConf->newFileNbDisplay : '';

         $m = $this->getModifies();
         $s = sprintf('
@@ -445,8 +442,9 @@

     public function getNbPendingPatch()
     {
-        $vcsLang = AccountManager::getInstance()->vcsLang;
-        $project = AccountManager::getInstance()->project;
+        $am      = AccountManager::getInstance();
+        $vcsLang = $am->vcsLang;
+        $project = $am->project;

         $s = sprintf(
             'SELECT count(*) as total FROM `pendingPatch` WHERE `project`="%s" AND (`lang`="%s" OR `lang`=\'en\')',
@@ -464,8 +462,9 @@
      */
     public function getPendingPatch()
     {
-        $vcsLang = AccountManager::getInstance()->vcsLang;
-        $project = AccountManager::getInstance()->project;
+        $am      = AccountManager::getInstance();
+        $vcsLang = $am->vcsLang;
+        $project = $am->project;

         $s = sprintf(
             'SELECT `id`, CONCAT(`lang`, `path`) AS `path`, `name`, `posted_by` AS \'by\', `uniqID`, `date` FROM `pendingPatch` WHERE `project`="%s" AND (`lang`="%s" OR `lang`=\'en\')',
@@ -489,8 +488,9 @@
      */
     public function getPendingFoldersCommit()
     {
-        $vcsLang = AccountManager::getInstance()->vcsLang;
-        $project = AccountManager::getInstance()->project;
+        $am      = AccountManager::getInstance();
+        $vcsLang = $am->vcsLang;
+        $project = $am->project;

         $s = sprintf(
             'SELECT * FROM `pendingCommit` WHERE `project`="%s" AND (`lang`="%s" OR `lang`=\'en\') AND `name`=\'-\' ORDER BY id ASC',
@@ -515,8 +515,9 @@

     public function getNbPendingCommit()
     {
-        $vcsLang = AccountManager::getInstance()->vcsLang;
-        $project = AccountManager::getInstance()->project;
+        $am      = AccountManager::getInstance();
+        $vcsLang = $am->vcsLang;
+        $project = $am->project;

         // We exclude item witch name == '-' ; this is new folder ; We don't display it.
         $s = sprintf(
@@ -535,8 +536,9 @@
      */
     public function getPendingCommit()
     {
-        $vcsLang = AccountManager::getInstance()->vcsLang;
-        $project = AccountManager::getInstance()->project;
+        $am      = AccountManager::getInstance();
+        $vcsLang = $am->vcsLang;
+        $project = $am->project;

         // We exclude item witch name == '-' ; this is new folder ; We don't display it.
         $s = sprintf(
@@ -569,10 +571,14 @@
      */
     public function getFilesByExtension($ext)
     {
+        $am      = AccountManager::getInstance();
+        $vcsLang = $am->vcsLang;
+        $project = $am->project;
+
         $s = sprintf(
             'SELECT `path`, `name` FROM `files` WHERE `path`
              LIKE \'/reference/%s/%%\' AND `lang`="%s" AND `project`="%s" ORDER BY `path`, `name`',
-            $ext, AccountManager::getInstance()->vcsLang, AccountManager::getInstance()->project
+            $ext, $vcsLang, $project
         );
         $r = DBConnection::getInstance()->query($s);

@@ -611,10 +617,14 @@
      */
     public function getFileByKeyword($key)
     {
+        $am      = AccountManager::getInstance();
+        $vcsLang = $am->vcsLang;
+        $project = $am->project;
+
         $s = sprintf(
             'SELECT `lang`, `path`, `name` FROM `files` WHERE `project`="%s" AND  (`lang`="%s" OR `lang`=\'en\')
              AND ( `name` LIKE \'%%%s%%\' OR `xmlid` LIKE \'%%%s%%\' ) ORDER BY `lang`, `path`, `name`',
-            AccountManager::getInstance()->project, AccountManager::getInstance()->vcsLang, $key, $key
+            $project, $vcsLang, $key, $key
         );
         $r = DBConnection::getInstance()->query($s);

@@ -642,8 +652,9 @@
      */
     public function getFilesByDirectory($dir)
     {
-        $appConf = AccountManager::getInstance()->appConf;
-        $project = AccountManager::getInstance()->project;
+        $am      = AccountManager::getInstance();
+        $appConf = $am->appConf;
+        $project = $am->project;

         // Security
         $dir = str_replace('..', '', $dir);
@@ -660,7 +671,7 @@
             if (   $dir == '/'
                 && $f != 'en'
                 && $f != $appConf[$project]['entities.folder']
-                && $f != AccountManager::getInstance()->vcsLang
+                && $f != $am->vcsLang
             ) {
                 continue; // skip non-en and non-user-lang
             }

Modified: web/doc-editor/trunk/php/RepositoryManager.php
===================================================================
--- web/doc-editor/trunk/php/RepositoryManager.php	2010-03-14 23:41:35 UTC (rev 296221)
+++ web/doc-editor/trunk/php/RepositoryManager.php	2010-03-15 00:19:32 UTC (rev 296222)
@@ -69,8 +69,9 @@

     public function computeExistingLanguage()
     {
-        $appConf = AccountManager::getInstance()->appConf;
-        $project = AccountManager::getInstance()->project;
+        $am      = AccountManager::getInstance();
+        $appConf = $am->appConf;
+        $project = $am->project;

         $this->existingLanguage = array();

@@ -118,12 +119,13 @@
      */
     public function cleanUp()
     {
+        $db      = DBConnection::getInstance();
         $project = AccountManager::getInstance()->project;

         // We cleanUp the database before update vcs and apply again all tools
         foreach (array('files', 'translators', 'errorfiles') as $table) {
-            DBConnection::getInstance()->query("DELETE FROM `$table` WHERE `project`='$project'");
-            DBConnection::getInstance()->query("OPTIMIZE TABLE `$table` ");
+            $db->query("DELETE FROM `$table` WHERE `project`='$project'");
+            $db->query("OPTIMIZE TABLE `$table` ");
         }
     }

@@ -169,8 +171,9 @@
      */
     public function checkBuild($lang, $enable_xml_details="false")
     {
-        $appConf = AccountManager::getInstance()->appConf;
-        $project = AccountManager::getInstance()->project;
+        $am      = AccountManager::getInstance();
+        $appConf = $am->appConf;
+        $project = $am->project;

         $return = Array(
             "state"      => "ok",
@@ -221,24 +224,29 @@
      */
     public function addPendingCommit($file, $revision, $en_revision, $reviewed, $maintainer, $type='update')
     {
+        $db       = DBConnection::getInstance();
+        $am       = AccountManager::getInstance();
+        $vcsLogin = $am->vcsLogin;
+        $project  = $am->project;
+
         $s = sprintf(
             'SELECT id FROM `pendingCommit` WHERE `project`="%s" AND `lang`="%s" AND `path`="%s" AND `name`="%s"',
-            AccountManager::getInstance()->project,
+            $project,
             $file->lang, $file->path, $file->name
         );
-        $r = DBConnection::getInstance()->query($s);
+        $r = $db->query($s);

         // We insert or update the pendingCommit table
         if ($r->num_rows == 0) {

             $s = sprintf(
                 'INSERT into `pendingCommit` (`project`, `lang`, `path`, `name`, `revision`, `en_revision`, `reviewed`, `maintainer`, `modified_by`, `date`, `type`) VALUES ("%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", now(), "%s")',
-                AccountManager::getInstance()->project,
+                $project,
                 $file->lang, $file->path, $file->name, $revision, $en_revision,
-                $reviewed, $maintainer, AccountManager::getInstance()->vcsLogin, $type
+                $reviewed, $maintainer, $vcsLogin, $type
             );
-            DBConnection::getInstance()->query($s);
-            $fileID = DBConnection::getInstance()->insert_id();
+            $db->query($s);
+            $fileID = $db->insert_id();

         } else {

@@ -248,7 +256,7 @@
                 'UPDATE `pendingCommit` SET `revision`="%s", `en_revision`="%s", `reviewed`="%s", `maintainer`="%s" WHERE id="%s"',
                 $revision, $en_revision, $reviewed, $maintainer, $a->id
             );
-            DBConnection::getInstance()->query($s);
+            $db->query($s);
             $fileID = $a->id;
         }

@@ -263,6 +271,9 @@
      */
     public function delPendingCommit($files)
     {
+        $db       = DBConnection::getInstance();
+        $am       = AccountManager::getInstance();
+        $project  = $am->project;

         for ($i = 0; $i < count($files); $i++) {
             $query = sprintf('DELETE FROM `pendingCommit`
@@ -271,10 +282,10 @@
                     `lang` = "%s" AND
                     `path` = "%s" AND
                     `name` = "%s"',
-                AccountManager::getInstance()->project,
+                $project,
                 $files[$i]->lang, $files[$i]->path, $files[$i]->name
             );
-            DBConnection::getInstance()->query($query);
+            $db->query($query);
         }
     }

@@ -287,12 +298,16 @@
      */
     public function addPendingPatch($file, $email)
     {
+        $am       = AccountManager::getInstance();
+        $vcsLogin = $am->vcsLogin;
+        $project  = $am->project;
+
         $uniqID = md5(uniqid(rand(), true));

         $s = sprintf(
             'INSERT into `pendingPatch` (`project`, `lang`, `path`, `name`, `posted_by`, `date`, `email`, `uniqID`) VALUES ("%s", "%s", "%s", "%s", "%s", now(), "%s", "%s")',
-            AccountManager::getInstance()->project,
-            $file->lang, $file->path, $file->name, AccountManager::getInstance()->vcsLogin, $email, $uniqID
+            $project,
+            $file->lang, $file->path, $file->name, $vcsLogin, $email, $uniqID
         );
         DBConnection::getInstance()->query($s);

@@ -307,6 +322,11 @@
      */
     public function addPendingDelete($file)
     {
+        $db       = DBConnection::getInstance();
+        $am       = AccountManager::getInstance();
+        $vcsLogin = $am->vcsLogin;
+        $project  = $am->project;
+
         $date = @date("Y-m-d H:i:s");

         $s = sprintf(
@@ -314,16 +334,16 @@
                 (`project`, `lang`, `path`, `name`, `revision`, `en_revision`, `reviewed`, `maintainer`, `modified_by`, `date`, `type`)
             VALUES
                 ("%s", "%s", "%s", "%s", "-", "-", "-", "-", "%s", "%s", "delete")',
-            AccountManager::getInstance()->project,
+            $project,
             $file->lang, $file->path, $file->name,
-            AccountManager::getInstance()->vcsLogin,
+            $vcsLogin,
             $date
         );
-        DBConnection::getInstance()->query($s);
+        $db->query($s);

         return array(
-            'id'   => DBConnection::getInstance()->insert_id(),
-            'by'   => AccountManager::getInstance()->vcsLogin,
+            'id'   => $db->insert_id(),
+            'by'   => $vcsLogin,
             'date' => $date
         );
     }
@@ -338,8 +358,9 @@
      */
     public function beforeCommitChanges($files, $type)
     {
-        $appConf = AccountManager::getInstance()->appConf;
-        $project = AccountManager::getInstance()->project;
+        $am      = AccountManager::getInstance();
+        $appConf = $am->appConf;
+        $project = $am->project;

         $stack = Array();

@@ -492,11 +513,11 @@
      */
     public function commitChanges($ids, $log)
     {
-
+        $rf        = RepositoryFetcher::getInstance();
         $commitLog = Array();

         // Task for folders
-        $foldersInfos = RepositoryFetcher::getInstance()->getPendingFoldersCommit();
+        $foldersInfos = $rf->getPendingFoldersCommit();

         if( $foldersInfos ) {
             $c = VCSFactory::getInstance()->commitFolders($foldersInfos);
@@ -505,7 +526,7 @@
         }

         // Task for files
-        $fileInfos   = RepositoryFetcher::getInstance()->getModifiesById($ids);
+        $fileInfos   = $rf->getModifiesById($ids);
         // Loop over $fileInfos to find files to be create, update or delete
         $create_stack = array();
         $update_stack = array();
@@ -554,7 +575,7 @@
         );

         // We fetch again the file witch have been commited. All file witch have been skip from beforeCommitChanges haren't into DB for now.
-        $fileInfos   = RepositoryFetcher::getInstance()->getModifiesById($ids);
+        $fileInfos   = $rf->getModifiesById($ids);

         // Get all ids witch have been really commited
         $ids = Array();
@@ -577,8 +598,10 @@
      */
     public function clearLocalChange($type, $file)
     {
-        $appConf = AccountManager::getInstance()->appConf;
-        $project = AccountManager::getInstance()->project;
+        $db      = DBConnection::getInstance();
+        $am      = AccountManager::getInstance();
+        $appConf = $am->appConf;
+        $project = $am->project;

         $lang = $file->lang;
         $path = $file->path;
@@ -596,12 +619,12 @@
         // We need select row from pendingCommit table
         $s = "SELECT `id` FROM `pendingCommit`
               WHERE `project`='$project' AND `lang`='$lang' AND `path`='$path' AND `name`='$name'";
-        $r = DBConnection::getInstance()->query($s);
+        $r = $db->query($s);
         $a = $r->fetch_object();

         // We need delete row from pendingCommit table
         $s = 'DELETE FROM `pendingCommit` WHERE `id`="' .$a->id. '"';
-        DBConnection::getInstance()->query($s);
+        $db->query($s);

         // If type == delete, we stop here and return
         if ($type == 'delete') {
@@ -637,7 +660,7 @@
         // We need reload original information
         $s = "SELECT `revision`, `en_revision`, `maintainer`, `reviewed` FROM `files`
               WHERE `project`='$project' AND `lang`='$lang' AND `path`='$path' AND `name`='$name'";
-        $r = DBConnection::getInstance()->query($s);
+        $r = $db->query($s);
         $a = $r->fetch_object();

         $return['rev']        = $a->revision;
@@ -663,10 +686,12 @@
      */
     public function setLastUpdate($type)
     {
-        $project = AccountManager::getInstance()->project;
+        $am       = AccountManager::getInstance();
+        $vcsLogin = $am->vcsLogin;
+        $project  = $am->project;

-        $vcsLogin = isset(AccountManager::getInstance()->vcsLogin)
-                    ? AccountManager::getInstance()->vcsLogin : '-';
+        $vcsLogin = isset($vcsLogin)
+                    ? $vcsLogin : '-';

         $value = array();
         $value['date'] = @date("Y-m-d H:i:s");
@@ -682,11 +707,11 @@
      */
     public function postPatchAccept($uniqID)
     {
-        $appConf = AccountManager::getInstance()->appConf;
-        $project = AccountManager::getInstance()->project;
+        $am       = AccountManager::getInstance();
+        $appConf  = $am->appConf;
+        $project  = $am->project;
+        $vcsLogin = $am->vcsLogin;

-        $vcsLogin = AccountManager::getInstance()->vcsLogin;
-
         $s = "SELECT * FROM `pendingPatch` WHERE `uniqID` = '$uniqID'";
         $r = DBConnection::getInstance()->query($s);
         $a = $r->fetch_object();
@@ -715,7 +740,7 @@
 --
 {$vcsLogin}@php.net
 EOD;
-            AccountManager::getInstance()->email($to, $subject, $msg);
+            $am->email($to, $subject, $msg);
         }

         @unlink($appConf[$project]['vcs.path'].$a->lang.$a->path.$a->name.'.'.$a->uniqID.'.patch');
@@ -730,11 +755,11 @@
      */
     public function postPatchReject($uniqID)
     {
-        $appConf = AccountManager::getInstance()->appConf;
-        $project = AccountManager::getInstance()->project;
+        $am       = AccountManager::getInstance();
+        $appConf  = $am->appConf;
+        $project  = $am->project;
+        $vcsLogin = $am->vcsLogin;

-        $vcsLogin = AccountManager::getInstance()->vcsLogin;
-
         $s = "SELECT * FROM `pendingPatch` WHERE `uniqID` = '$uniqID'";
         $r = DBConnection::getInstance()->query($s);
         $a = $r->fetch_object();
@@ -760,7 +785,7 @@
 --
 {$vcsLogin}@php.net
 EOD;
-            AccountManager::getInstance()->email($to, $subject, $msg);
+            $am->email($to, $subject, $msg);
         }

         @unlink($appConf[$project]['vcs.path'].$a->lang.$a->path.$a->name.'.'.$a->uniqID.'.patch');
@@ -776,6 +801,7 @@
     public function updateFileInfo($files)
     {

+        $db = DBConnection::getInstance();
         $am = AccountManager::getInstance();

         foreach ($files as $file) {
@@ -800,7 +826,7 @@
                             `name` = "%s"',
                     $info['xmlid'], $info['rev'], $size, $date, $am->project, $file->lang, $file->path, $file->name
                 );
-                DBConnection::getInstance()->query($s);
+                $db->query($s);

                 // update LANG file info
                 $s = sprintf(
@@ -814,7 +840,7 @@
                             `name`  = "%s"',
                     $info['rev'], $am->project, $file->lang, $file->path, $file->name
                 );
-                DBConnection::getInstance()->query($s);
+                $db->query($s);

             } else { // lang file

@@ -855,7 +881,7 @@
                         trim($info['maintainer']), trim($info['status']),   $size_diff,
                         $date_diff, $am->project, $file->lang, $file->path, $file->name
                     );
-                    DBConnection::getInstance()->query($s);
+                    $db->query($s);

                     // Run the errorTools under this file
                     $tmpFile[0]['en_content']   = $en->read(true);
@@ -894,7 +920,7 @@
                         trim($info['maintainer']), trim($info['status']),   0,
                         0, $am->project, $file->lang, $file->path, $file->name
                     );
-                    DBConnection::getInstance()->query($s);
+                    $db->query($s);

                     // Run the errorTools under this file
                         // If the EN file don't exist, it's because we have a file witch only exist into LANG, for example, translator.xml
@@ -909,7 +935,6 @@
                     $errorTools = new ToolsError();
                     $errorTools->updateFilesError($tmpFile);

-
                 }
             }
         }
@@ -923,6 +948,7 @@
     {
         $ExistingLanguage = $this->getExistingLanguage();
         $db = DBConnection::getInstance();
+        $am = AccountManager::getInstance();

         foreach ($ExistingLanguage as $lang) {

@@ -966,7 +992,7 @@
                         // We try to remove this record if it exist
                         $query = sprintf(
                             'DELETE FROM `translators` WHERE `project`="%s" AND `lang`="%s" AND `nick`="%s"',
-                            AccountManager::getInstance()->project,
+                            $am->project,
                             $lang,
                             $db->real_escape_string($person['nick'])
                         );
@@ -975,7 +1001,7 @@
                         $query = sprintf(
                             'INSERT INTO `translators` (`project`, `lang`, `nick`, `name`, `mail`, `vcs`, `editor`)
                              VALUES ("%s", "%s", "%s", "%s", "%s", "%s", "%s")',
-                            AccountManager::getInstance()->project,
+                            $am->project,
                             $lang,
                             $db->real_escape_string($person['nick']),
                             $db->real_escape_string($name),
@@ -1038,8 +1064,9 @@
      */
     private function doUpdateNotInEN($path, $lang)
     {
-        $appConf = AccountManager::getInstance()->appConf;
-        $project = AccountManager::getInstance()->project;
+        $am      = AccountManager::getInstance();
+        $appConf = $am->appConf;
+        $project = $am->project;

         if ($dh = @opendir($appConf[$project]['vcs.path'].$lang.$path)) {

@@ -1068,7 +1095,7 @@
                     $query = sprintf(
                         'INSERT INTO `files` (`project`, `lang`, `path`, `name`, `status`)
                          VALUES ("%s", "%s", "%s", "%s", "%s")',
-                        AccountManager::getInstance()->project,
+                        $project,
                         $lang, $f->path, $f->name, 'NotInEN'
                     );
                     DBConnection::getInstance()->query($query);
@@ -1090,6 +1117,7 @@
      */
     public function applyRevCheck($path = '/')
     {
+        $db      = DBConnection::getInstance();
         $am      = AccountManager::getInstance();
         $appConf = $am->appConf;
         $project = $am->project;
@@ -1127,7 +1155,7 @@
                 $tmp = explode('/', $f->path);

                 // Only for Php project
-                if( $am->project == 'php' ) {
+                if( $project == 'php' ) {
                     $check_doc = new ToolsCheckDoc();
                     $ToolsCheckDocResult = $check_doc->checkDoc($infoEN['content'], $f->path);
                 } else {
@@ -1158,7 +1186,7 @@
                     $ToolsCheckDocResult['check_noexamples'],
                     $ToolsCheckDocResult['check_noerrors']
                 );
-                DBConnection::getInstance()->query($query);
+                $db->query($query);

                 $ExistingLanguage = $this->getExistingLanguage();

@@ -1192,13 +1220,13 @@
                         $query = sprintf(
                             'INSERT INTO `files` (`project`, `lang`, `xmlid`, `path`, `name`, `revision`, `en_revision`, `reviewed`, `size`, `size_diff`, `mdate`, `mdate_diff`, `maintainer`, `status`)
                                 VALUES ("%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", %s, %s, %s, %s, "%s", "%s")',
-                            $am->project,
+                            $project,
                             $lang, $xmlid, $lang_file->path, $lang_file->name,
                             $revision, $en_revision, $reviewed,
                             $size, $size_diff, $date, $date_diff,
                             $maintainer, $status
                         );
-                        DBConnection::getInstance()->query($query);
+                        $db->query($query);

                         // Check for error in this file ONLY if this file is uptodate
                         if ($revision == $en_revision &&  $revision != 0 ) {
@@ -1214,13 +1242,13 @@
                         $query = sprintf(
                             'INSERT INTO `files` (`project`, `lang`, `path`, `name`, `size`)
                                 VALUES ("%s", "%s", "%s", "%s", %s)',
-                            $am->project,
+                            $project,
                             $lang,
                             $lang_file->path,
                             $lang_file->name,
                             $en_size
                         );
-                        DBConnection::getInstance()->query($query);
+                        $db->query($query);
                     }
                 }
             }
@@ -1265,7 +1293,7 @@
      */
     public function setStaticValue($type, $field, $value)
     {
-
+        $db      = DBConnection::getInstance();
         $project = AccountManager::getInstance()->project;

         $s = "SELECT id FROM staticValue WHERE
@@ -1273,17 +1301,17 @@
               `type`    = '".$type."' AND
               `field`   = '".$field."'
              ";
-        $r = DBConnection::getInstance()->query($s);
+        $r = $db->query($s);

         if( $r->num_rows == 0 ) {
-            $s = "INSERT INTO staticValue (`project`, `type`, `field`, `value`) VALUES ('".$project."' , '".$type."' , '".$field."', '".DBConnection::getInstance()->real_escape_string($value)."')";
-            DBConnection::getInstance()->query($s);
+            $s = "INSERT INTO staticValue (`project`, `type`, `field`, `value`) VALUES ('".$project."' , '".$type."' , '".$field."', '".$db->real_escape_string($value)."')";
+            $db->query($s);
         } else {
             $a = $r->fetch_object();
-            $s = "UPDATE staticValue SET `value`= '".DBConnection::getInstance()->real_escape_string($value)."' WHERE `id`='".$a->id."'";
-            DBConnection::getInstance()->query($s);
+            $s = "UPDATE staticValue SET `value`= '".$db->real_escape_string($value)."' WHERE `id`='".$a->id."'";
+            $db->query($s);
         }
     }
 }

-?>
+?>
\ No newline at end of file

Modified: web/doc-editor/trunk/php/ToolsCheckEntities.php
===================================================================
--- web/doc-editor/trunk/php/ToolsCheckEntities.php	2010-03-14 23:41:35 UTC (rev 296221)
+++ web/doc-editor/trunk/php/ToolsCheckEntities.php	2010-03-15 00:19:32 UTC (rev 296222)
@@ -32,8 +32,9 @@
      */
     function __construct()
     {
-        $appConf = AccountManager::getInstance()->appConf;
-        $project = AccountManager::getInstance()->project;
+        $am      = AccountManager::getInstance();
+        $appConf = $am->appConf;
+        $project = $am->project;

         $this->urlConnectTimeout = 10;


Modified: web/doc-editor/trunk/php/ToolsError.php
===================================================================
--- web/doc-editor/trunk/php/ToolsError.php	2010-03-14 23:41:35 UTC (rev 296221)
+++ web/doc-editor/trunk/php/ToolsError.php	2010-03-15 00:19:32 UTC (rev 296222)
@@ -149,11 +149,12 @@
      *
      * @return An array of information
      */
-    function getInfo() {
+    function getInfo()
+    {
+        $am      = AccountManager::getInstance();
+        $project = $am->project;

-        $project = AccountManager::getInstance()->project;
-
-        if ( AccountManager::getInstance()->userConf->errorSkipNbLiteralTag ) {
+        if ( $am->userConf->errorSkipNbLiteralTag ) {
             $type = ' type != \'nbLiteralTag\' AND ';
         } else {
             $type = '';
@@ -194,11 +195,12 @@
      * @param array $ModifiedFiles An array containing all modified files in order to display them in red
      * @return An array of information
      */
-    function getFilesError($ModifiedFiles) {
+    function getFilesError($ModifiedFiles)
+    {
+        $am      = AccountManager::getInstance();
+        $project = $am->project;

-        $project = AccountManager::getInstance()->project;
-
-        if ( AccountManager::getInstance()->userConf->errorSkipNbLiteralTag ) {
+        if ( $am->userConf->errorSkipNbLiteralTag ) {
             $type = ' type != \'nbLiteralTag\' AND ';
         } else {
             $type = '';
@@ -268,7 +270,7 @@
      */
     function saveError()
     {
-
+        $db      = DBConnection::getInstance();
         $project = AccountManager::getInstance()->project;

         if( count($this->errorStack) > 0 ) {
@@ -277,12 +279,12 @@
             $pattern = ' ("%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s"),';

             foreach ($this->errorStack as $error) {
-                $sql .= sprintf($pattern, $project, $this->lang, $this->filePath, $this->fileName, trim($this->maintainer,"'"), DBConnection::getInstance()->real_escape_string($error['value_en']),
-                DBConnection::getInstance()->real_escape_string($error['value_lang']), $error['type']);
+                $sql .= sprintf($pattern, $project, $this->lang, $this->filePath, $this->fileName, trim($this->maintainer,"'"), $db->real_escape_string($error['value_en']),
+                $db->real_escape_string($error['value_lang']), $error['type']);
             }

             $sql = substr($sql, 0, -1);
-            DBConnection::getInstance()->query($sql);
+            $db->query($sql);

         }


Modified: web/doc-editor/trunk/php/TranslationStatistic.php
===================================================================
--- web/doc-editor/trunk/php/TranslationStatistic.php	2010-03-14 23:41:35 UTC (rev 296221)
+++ web/doc-editor/trunk/php/TranslationStatistic.php	2010-03-15 00:19:32 UTC (rev 296222)
@@ -154,6 +154,7 @@
      */
     public function getNoTransFileCount($lang='all')
     {
+        $db      = DBConnection::getInstance();
         $project = AccountManager::getInstance()->project;

         $result = $summary = array();
@@ -168,7 +169,7 @@

        $s = 'SELECT * FROM files WHERE `lang`=\'en\' AND `project`=\''.$project.'\'';

-       $r = DBConnection::getInstance()->query($s);
+       $r = $db->query($s);

        while( $a = $r->fetch_object() ) {
           $resultEN[$a->path.$a->name] = $a->size;
@@ -185,7 +186,7 @@
                  `project` = \''.$project.'\'
        ';

-       $r = DBConnection::getInstance()->query($s);
+       $r = $db->query($s);

        while( $a = $r->fetch_object() ) {
           $result[$a->lang][$a->path.$a->name] = 'exist';
@@ -214,14 +215,14 @@
      */
     public function computeSummary($lang='all')
     {
-
+        $rm        = RepositoryManager::getInstance();
         $nbFiles   = $this->getFileCount($lang);
         $uptodate  = $this->getTransFileCount($lang);
         $stale     = $this->getStaleFileCount($lang);
         $missFiles = $this->getNoTransFileCount($lang);

         if( $lang == 'all' ) {
-            $hereLang = RepositoryManager::getInstance()->getExistingLanguage();
+            $hereLang = $rm->getExistingLanguage();
         } else {
             $hereLang = array(0 => Array("code" => $lang));
         }
@@ -263,7 +264,7 @@
             $summary[3]['percentSize']   = '100%';

             // Save $summary into DB
-            RepositoryManager::getInstance()->setStaticValue('translation_summary', $lang, json_encode($summary));
+            $rm->setStaticValue('translation_summary', $lang, json_encode($summary));
         }
     }


Modified: web/doc-editor/trunk/php/TranslatorStatistic.php
===================================================================
--- web/doc-editor/trunk/php/TranslatorStatistic.php	2010-03-14 23:41:35 UTC (rev 296221)
+++ web/doc-editor/trunk/php/TranslatorStatistic.php	2010-03-15 00:19:32 UTC (rev 296222)
@@ -151,13 +151,13 @@
      */
     public function computeSummary($lang='all')
     {
-
+        $rm        = RepositoryManager::getInstance();
         $translators = $this->getTranslators($lang);
         $uptodate    = $this->getUptodateFileCount($lang);
         $stale       = $this->getStaleFileCount($lang);

         if( $lang == 'all' ) {
-            $hereLang = RepositoryManager::getInstance()->getExistingLanguage();
+            $hereLang = $rm->getExistingLanguage();
         } else {
             $hereLang = array(0 => Array("code" => $lang));
         }
@@ -171,15 +171,15 @@
                 $persons[$i]              = $data;
                 $persons[$i]['nick']      = $nick;
                 $persons[$i]['uptodate']  = isset($uptodate[$lang][$nick]) ? $uptodate[$lang][$nick] : '0';
-                $persons[$i]['stale']     = isset($stale[$lang][$nick])      ? $stale[$lang][$nick]      : '0';
+                $persons[$i]['stale']     = isset($stale[$lang][$nick])    ? $stale[$lang][$nick]    : '0';
                 $persons[$i]['sum']       = $persons[$i]['uptodate'] + $persons[$i]['stale'];
                 $i++;
             }

             // Save $summary into DB
-            RepositoryManager::getInstance()->setStaticValue('translator_summary', $lang, json_encode($persons));
+            $rm->setStaticValue('translator_summary', $lang, json_encode($persons));
         }
     }
 }

-?>
+?>
\ No newline at end of file

Modified: web/doc-editor/trunk/php/utility.php
===================================================================
--- web/doc-editor/trunk/php/utility.php	2010-03-14 23:41:35 UTC (rev 296221)
+++ web/doc-editor/trunk/php/utility.php	2010-03-15 00:19:32 UTC (rev 296222)
@@ -9,11 +9,12 @@
  */
 function debug($mess)
 {
-    $appConf = AccountManager::getInstance()->appConf;
-    $project = AccountManager::getInstance()->project;
+    $am      = AccountManager::getInstance();
+    $appConf = $am->appConf;
+    $project = $am->project;

     $mess = '['.@date('d/m/Y H:i:s').'] by '
-            .AccountManager::getInstance()->vcsLogin.' : '.str_replace("\r\n", " ", $mess)."\n";
+            .$am->vcsLogin.' : '.str_replace("\r\n", " ", $mess)."\n";

     $fp = fopen($appConf[$project]['vcs.path'].'../.debug', 'a+');
     fwrite($fp, $mess);