svn: /web/doc-editor/trunk/ install/firstRun.php php/ProjectManager.php php/RepositoryManager.php php/TranslationStatistic.php php/conf.inc.php
php/conf.pear.inc.php php/conf.php.inc.php

From: Date: Mon, 04 Jan 2010 19:50:02 +0000
Subject: svn: /web/doc-editor/trunk/ install/firstRun.php php/ProjectManager.php php/RepositoryManager.php php/TranslationStatistic.php php/conf.inc.php
php/conf.pear.inc.php php/conf.php.inc.php
Groups: php.doc.web 
Request: Send a blank email to doc-web+get-1473@lists.php.net to get a copy of this message
yannick Mon, 04 Jan 2010 19:50:02 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=293091 Log: Change the way to checkout a repository. Activate the Peardoc project Changed paths: U web/doc-editor/trunk/install/firstRun.php U web/doc-editor/trunk/php/ProjectManager.php U web/doc-editor/trunk/php/RepositoryManager.php U web/doc-editor/trunk/php/TranslationStatistic.php U web/doc-editor/trunk/php/conf.inc.php U web/doc-editor/trunk/php/conf.pear.inc.php U web/doc-editor/trunk/php/conf.php.inc.php Modified: web/doc-editor/trunk/install/firstRun.php =================================================================== --- web/doc-editor/trunk/install/firstRun.php 2010-01-04 17:26:34 UTC (rev 293090) +++ web/doc-editor/trunk/install/firstRun.php 2010-01-04 19:50:02 UTC (rev 293091) @@ -73,7 +73,7 @@ TranslatorStatistic::getInstance()->computeSummary('all'); // We update the last update date/time into DB - $rm->setLastUpdate(); + $rm->setLastUpdate('data'); } Modified: web/doc-editor/trunk/php/ProjectManager.php =================================================================== --- web/doc-editor/trunk/php/ProjectManager.php 2010-01-04 17:26:34 UTC (rev 293090) +++ web/doc-editor/trunk/php/ProjectManager.php 2010-01-04 19:50:02 UTC (rev 293091) @@ -19,8 +19,8 @@ public $project; public $availableProject = array( - 0 => Array('code' => 'php', 'iconCls' => 'project-php', 'name' => 'Php Documentation') - //1 => Array('code' => 'pear', 'iconCls' => 'project-pear', 'name' => 'Pear Documentation') + 0 => Array('code' => 'php', 'iconCls' => 'project-php', 'name' => 'Php Documentation'), + 1 => Array('code' => 'pear', 'iconCls' => 'project-pear', 'name' => 'Pear Documentation') ); @@ -58,6 +58,7 @@ // This project must have a conf file if( is_file(dirname(__FILE__) . '/conf.'. $project .'.inc.php') ) { + include_once dirname(__FILE__) . '/conf.inc.php'; include_once dirname(__FILE__) . '/conf.'. $project .'.inc.php'; $this->project = $project; Modified: web/doc-editor/trunk/php/RepositoryManager.php =================================================================== --- web/doc-editor/trunk/php/RepositoryManager.php 2010-01-04 17:26:34 UTC (rev 293090) +++ web/doc-editor/trunk/php/RepositoryManager.php 2010-01-04 19:50:02 UTC (rev 293091) @@ -481,7 +481,7 @@ ? AccountManager::getInstance()->vcsLogin : '-'; $value = array(); - $value['date'] = date("Y-m-d H:i:s"); + $value['date'] = @date("Y-m-d H:i:s"); $value['by'] = $vcsLogin; $this->setStaticValue('last_update_'.$type, '-', json_encode($value)); Modified: web/doc-editor/trunk/php/TranslationStatistic.php =================================================================== --- web/doc-editor/trunk/php/TranslationStatistic.php 2010-01-04 17:26:34 UTC (rev 293090) +++ web/doc-editor/trunk/php/TranslationStatistic.php 2010-01-04 19:50:02 UTC (rev 293091) @@ -70,6 +70,8 @@ { $project = AccountManager::getInstance()->project; + $result = array(); + if( $lang == 'all' ) { $where = ''; $groupBy = 'GROUP BY lang'; @@ -225,6 +227,8 @@ $lang = $lang["code"]; + if( $lang == 'en' ) { continue; } + $summary = array(); $summary[0]['id'] = 1; @@ -237,8 +241,8 @@ $summary[1]['id'] = 2; $summary[1]['libel'] = 'Stale files'; $summary[1]['nbFiles'] = ( isset($stale[$lang]['total']) ) ? $stale[$lang]['total'] : 0; - $summary[1]['percentFiles'] = round(($stale[$lang]['total']*100)/$nbFiles[$lang]['total'], 2); - $summary[1]['sizeFiles'] = ($stale[$lang]['total_size'] == '' ) ? 0 : $stale[$lang]['total_size']; + $summary[1]['percentFiles'] = ( !isset($nbFiles[$lang]['total']) || !isset($stale[$lang]['total']) || $nbFiles[$lang]['total'] == 0 ) ? 0 : round(($stale[$lang]['total']*100)/$nbFiles[$lang]['total'], 2); + $summary[1]['sizeFiles'] = ( !isset($stale[$lang]['total_size']) || $stale[$lang]['total_size'] == '' ) ? 0 : $stale[$lang]['total_size']; $summary[1]['percentSize'] = (!isset($stale[$lang]['total_size']) || $stale[$lang]['total_size'] == 0 ) ? 0 : round(($stale[$lang]['total_size']*100)/$nbFiles[$lang]['total_size'], 2); $summary[2]['id'] = 3; Modified: web/doc-editor/trunk/php/conf.inc.php =================================================================== --- web/doc-editor/trunk/php/conf.inc.php 2010-01-04 17:26:34 UTC (rev 293090) +++ web/doc-editor/trunk/php/conf.inc.php 2010-01-04 19:50:02 UTC (rev 293091) @@ -36,6 +36,11 @@ */ $DOC_EDITOR_VCS = 'svn'; + /** + * Data path + */ + $DOC_EDITOR_DATA_PATH = dirname(__FILE__).'/../' . 'data/'; + } ?> Modified: web/doc-editor/trunk/php/conf.pear.inc.php =================================================================== --- web/doc-editor/trunk/php/conf.pear.inc.php 2010-01-04 17:26:34 UTC (rev 293090) +++ web/doc-editor/trunk/php/conf.pear.inc.php 2010-01-04 19:50:02 UTC (rev 293091) @@ -15,7 +15,7 @@ * VCS project path * */ -$DOC_EDITOR_VCS_SERVER_PATH = $DOC_EDITOR_VCS_SERVER_REPOS . 'pear/'; +$DOC_EDITOR_VCS_SERVER_PATH = $DOC_EDITOR_VCS_SERVER_REPOS . 'pear/peardoc/trunk/'; /** * VCS server port @@ -43,14 +43,10 @@ $DOC_EDITOR_VCS_KARMA_FILE = 'http://svn.php.net/viewvc/SVNROOT/global_avail?view=co'; /** - * Data path + * VCS path */ -$DOC_EDITOR_DATA_PATH = dirname(__FILE__).'/../' . 'data/'; +$DOC_EDITOR_VCS_PATH = $DOC_EDITOR_DATA_PATH . $DOC_EDITOR_VCS_MODULE . '/'; -/** - * VCS checkout path - */ -$DOC_EDITOR_VCS_PATH = $DOC_EDITOR_DATA_PATH . $DOC_EDITOR_VCS_MODULE . '/peardoc/trunk/'; /** * VCS configure.php path Modified: web/doc-editor/trunk/php/conf.php.inc.php =================================================================== --- web/doc-editor/trunk/php/conf.php.inc.php 2010-01-04 17:26:34 UTC (rev 293090) +++ web/doc-editor/trunk/php/conf.php.inc.php 2010-01-04 19:50:02 UTC (rev 293091) @@ -43,13 +43,8 @@ $DOC_EDITOR_VCS_KARMA_FILE = 'http://svn.php.net/viewvc/SVNROOT/global_avail?view=co'; /** - * Data path + * VCS path */ -$DOC_EDITOR_DATA_PATH = dirname(__FILE__).'/../' . 'data/'; - -/** - * VCS checkout path - */ $DOC_EDITOR_VCS_PATH = $DOC_EDITOR_DATA_PATH . $DOC_EDITOR_VCS_MODULE . '/'; /**

« previous php.doc.web (#1473) next »