This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via 763043b23e26ee4a3581085c4d8371efa1de93f8 (commit)
via 774da65772127ebf804d6a0ef98e466585a7a239 (commit)
from 1cd0ef02cc808c8742afcc1fe0205ad031d039c1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=763043b23e26ee4a3581085c4d8371efa1de93f8
commit 763043b23e26ee4a3581085c4d8371efa1de93f8
Author: Franck Villaume <[email protected]>
Date: Fri May 26 13:01:51 2017 +0200
clean-up & fix __construct
diff --git a/src/common/dao/CodendiDataAccess.class.php
b/src/common/dao/CodendiDataAccess.class.php
index cdffefc..f8b4b79 100644
--- a/src/common/dao/CodendiDataAccess.class.php
+++ b/src/common/dao/CodendiDataAccess.class.php
@@ -1,5 +1,5 @@
<?php
-/*
+/**
* Copyright (c) Xerox, 2009. All Rights Reserved.
*
* Originally written by Nicolas Terray, 2005. Xerox Codendi Team.
@@ -24,18 +24,17 @@ require_once 'include/DataAccess.class.php';
class CodendiDataAccess extends DataAccess {
- protected function __construct() {
+ function __construct() {
+ parent::__construct();
+ }
- parent::__construct();
- }
-
- protected static $_instance;
- public static function instance() {
- if (!isset(self::$_instance)) {
- $c = __CLASS__;
- self::$_instance = new $c;
- }
- return self::$_instance;
- }
+ protected static $_instance;
+ public static function instance() {
+ if (!isset(self::$_instance)) {
+ $c = __CLASS__;
+ self::$_instance = new $c;
+ }
+ return self::$_instance;
+ }
}
diff --git a/src/common/dao/include/DataAccess.class.php
b/src/common/dao/include/DataAccess.class.php
index 3835878..edbfa32 100644
--- a/src/common/dao/include/DataAccess.class.php
+++ b/src/common/dao/include/DataAccess.class.php
@@ -23,9 +23,9 @@ require_once 'DataAccessException.class.php';
class DataAccess {
- function quoteSmart($value, $params = array()) {
-
- return $value;
- }
+ function __construct() {}
+ function quoteSmart($value, $params = array()) {
+ return $value;
+ }
}
diff --git a/src/common/dao/include/DataAccessObject.class.php
b/src/common/dao/include/DataAccessObject.class.php
index 53593ec..975212b 100644
--- a/src/common/dao/include/DataAccessObject.class.php
+++ b/src/common/dao/include/DataAccessObject.class.php
@@ -1,20 +1,35 @@
<?php
/**
- * Base class for data access objects
+ * Base class for data access objects
+ * Copyright (c) Xerox Corporation, Codendi Team, 2001-2009. All rights
reserved
+ *
+ * This file is a part of Fusionforge.
+ *
+ * Fusionforge is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Fusionforge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Codendi. If not, see <http://www.gnu.org/licenses/>.
*/
class DataAccessObject {
var $da;
- /**
- * @param DataAccess $da Instance of the DataAccess class
- */
- function __construct(&$da) {
- $this->table_name = 'CLASSNAME_MUST_BE_DEFINE_FOR_EACH_CLASS';
-
- $this->da=$da;
- }
+ /**
+ * @param DataAccess $da Instance of the DataAccess class
+ */
+ function __construct(&$da) {
+ $this->table_name = 'CLASSNAME_MUST_BE_DEFINE_FOR_EACH_CLASS';
+ $this->da=$da;
+ }
- //! An accessor
+ //! An accessor
/**
* For SELECT queries
*
@@ -22,21 +37,20 @@ class DataAccessObject {
* @param array $params The arguments
* @return mixed Either false if error or object DataAccessResult
*/
- function &retrieve($sql,$params) {
- $result = new DataAccessResult(db_query_params($sql,$params));
+ function &retrieve($sql,$params) {
+ $result = new DataAccessResult(db_query_params($sql,$params));
+ return $result;
+ }
- return $result;
- }
-
- //! An accessor
- /**
- * For INSERT, UPDATE and DELETE queries
- * @param string $sql the query string
+ //! An accessor
+ /**
+ * For INSERT, UPDATE and DELETE queries
+ * @param string $sql the query string
* @param array $params The arguments
* @return boolean true if success
- */
- function update($sql,$params) {
- $result = db_query_params($sql,$params);
- return $result;
- }
+ */
+ function update($sql,$params) {
+ $result = db_query_params($sql,$params);
+ return $result;
+ }
}
diff --git a/src/common/dao/include/DataAccessResult.class.php
b/src/common/dao/include/DataAccessResult.class.php
index 5c1af9c..0d04998 100644
--- a/src/common/dao/include/DataAccessResult.class.php
+++ b/src/common/dao/include/DataAccessResult.class.php
@@ -1,91 +1,108 @@
<?php
/**
- * Fetches MySQL database rows as objects
+ * Fetches MySQL database rows as objects
+ * Copyright (c) Xerox Corporation, Codendi Team, 2001-2009. All rights
reserved
+ *
+ * This file is a part of Fusionforge.
+ *
+ * Fusionforge is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Fusionforge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Codendi. If not, see <http://www.gnu.org/licenses/>.
*/
+
class DataAccessResult implements Iterator {
- /**
- * @access protected
- * $da stores data access object
- */
- var $da;
- /**
- * @access protected
- * $query stores a query resource
- */
- var $query;
+ /**
+ * @access protected
+ * $da stores data access object
+ */
+ var $da;
+ /**
+ * @access protected
+ * $query stores a query resource
+ */
+ var $query;
- var $_current;
- var $_row;
- var $nb_rows;
+ var $_current;
+ var $_row;
+ var $nb_rows;
- function __construct($result) {
+ function __construct($result) {
$this->result = $result;
$this->_current = -1;
$this->_row = false;
$this->rewind();
- }
+ }
- /**
- * Returns an array from query row or false if no more rows
- * @return mixed
- */
- function &getRow() {
- $row = $this->current();
- $this->next();
- return $row;
- }
+ /**
+ * Returns an array from query row or false if no more rows
+ * @return mixed
+ */
+ function &getRow() {
+ $row = $this->current();
+ $this->next();
+ return $row;
+ }
- /**
- * Returns the number of rows affected
- * @return int
- */
- function rowCount() {
- if (!isset($this->nb_rows)) {
- $this->nb_rows = db_numrows($this->result);
- }
- return $this->nb_rows;
- }
+ /**
+ * Returns the number of rows affected
+ * @return int
+ */
+ function rowCount() {
+ if (!isset($this->nb_rows)) {
+ $this->nb_rows = db_numrows($this->result);
+ }
+ return $this->nb_rows;
+ }
- /**
- * Returns false if no errors or returns a MySQL error message
- * @return mixed
- */
- function isError() {
- $error=db_error();
- if (!empty($error)) {
- return $error;
- } else {
- return false;
+ /**
+ * Returns false if no errors or returns a MySQL error message
+ * @return mixed
+ */
+ function isError() {
+ $error=db_error();
+ if (!empty($error)) {
+ return $error;
+ } else {
+ return false;
}
- }
+ }
- // {{{ Iterator
- function ¤t() {
- return $this->_row;
- }
+ // {{{ Iterator
+ function ¤t() {
+ return $this->_row;
+ }
- function next() {
- $this->_current++;
- if ($this->_current < $this->rowCount()) {
- $this->_row = db_fetch_array_by_row($this->result, $this->_current);
- } else {
- $this->_row = false;
- }
- }
+ function next() {
+ $this->_current++;
+ if ($this->_current < $this->rowCount()) {
+ $this->_row = db_fetch_array_by_row($this->result,
$this->_current);
+ } else {
+ $this->_row = false;
+ }
+ }
- function valid() {
- return $this->_row !== false;
- }
+ function valid() {
+ return $this->_row !== false;
+ }
- function rewind() {
- if ($this->rowCount() > 0) {
- $this->_current = -1;
- $this->next();
- }
- }
+ function rewind() {
+ if ($this->rowCount() > 0) {
+ $this->_current = -1;
+ $this->next();
+ }
+ }
- function key() {
- return $this->_current;
- }
- // }}}
+ function key() {
+ return $this->_current;
+ }
+ // }}}
}
diff --git a/src/common/mvc/Actions.class.php b/src/common/mvc/Actions.class.php
index eaed210..3b1e4cf 100644
--- a/src/common/mvc/Actions.class.php
+++ b/src/common/mvc/Actions.class.php
@@ -1,5 +1,5 @@
<?php
-/*
+/**
* Copyright 2005, STMicroelectronics
*
* Originally written by Manuel Vacelet
@@ -36,7 +36,7 @@ class Actions {
function __construct(&$controler) {
$this->_controler =& $controler;
- }
+ }
function getControler() {
return $this->_controler;
diff --git a/src/common/mvc/Controler.class.php
b/src/common/mvc/Controler.class.php
index c314566..75c1266 100644
--- a/src/common/mvc/Controler.class.php
+++ b/src/common/mvc/Controler.class.php
@@ -1,5 +1,5 @@
<?php
-/*
+/**
* Copyright 2005, STMicroelectronics
*
* Originally written by Manuel Vacelet
@@ -31,34 +31,33 @@
* @license http://opensource.org/licenses/gpl-license.php GPL
*/
class Controler {
- /* protected */ var $gid;
- /* protected */ var $view;
- /* protected */ var $action;
- /* protected */ var $_viewParams = array();
- /* protected */ var $_actionParams = array();
-
- function request() {
- }
-
- function viewsManagement() {
- $className = get_class($this).'Views';
- $wv = new $className($this, $this->gid, $this->view, $this->_viewParams);
- return $wv->display($this->view);
- }
-
- function actionsManagement() {
- $className = get_class($this).'Actions';
- $wa = new $className($this, $this->gid);
- $wa->process($this->action, $this->_actionParams);
- }
-
- function process() {
- $this->request();
-
- if($this->action)
- $this->actionsManagement();
-
- return $this->viewsManagement();
- }
+ /* protected */ var $gid;
+ /* protected */ var $view;
+ /* protected */ var $action;
+ /* protected */ var $_viewParams = array();
+ /* protected */ var $_actionParams = array();
+
+ function request() {
+ }
+
+ function viewsManagement() {
+ $className = get_class($this).'Views';
+ $wv = new $className($this, $this->gid, $this->view,
$this->_viewParams);
+ return $wv->display($this->view);
+ }
+
+ function actionsManagement() {
+ $className = get_class($this).'Actions';
+ $wa = new $className($this, $this->gid);
+ $wa->process($this->action, $this->_actionParams);
+ }
+
+ function process() {
+ $this->request();
+ if($this->action) {
+ $this->actionsManagement();
+ }
+ return $this->viewsManagement();
+ }
}
diff --git a/src/common/mvc/Views.class.php b/src/common/mvc/Views.class.php
index 2b883b4..5429695 100644
--- a/src/common/mvc/Views.class.php
+++ b/src/common/mvc/Views.class.php
@@ -1,5 +1,5 @@
<?php
-/*
+/**
* Copyright 2005, STMicroelectronics
*
* Originally written by Manuel Vacelet
@@ -31,35 +31,35 @@
* @license http://opensource.org/licenses/gpl-license.php GPL
*/
class Views {
- /* protected array */ var $html_params;
- /* protected string */ var $view;
- /* protected Controler */ var $_controler;
-
- function View(&$controler, $view = null, $params = array()) {
- $this->_controler =& $controler;
- $this->view=$view;
- $this->html_params = $params;
- }
+ /* protected array */ var $html_params;
+ /* protected string */ var $view;
+ /* protected Controler */ var $_controler;
- function getControler() {
- return $this->_controler;
- }
+ function View(&$controler, $view = null, $params = array()) {
+ $this->_controler =& $controler;
+ $this->view=$view;
+ $this->html_params = $params;
+ }
- function header() {
- site_project_header($this->html_params);
- }
+ function getControler() {
+ return $this->_controler;
+ }
- function footer() {
- site_project_footer($this->html_params);
- }
+ function header() {
+ site_project_header($this->html_params);
+ }
- function main() {
+ function footer() {
+ site_project_footer($this->html_params);
+ }
- }
+ function main() {}
- function display($view='') {
- $this->header();
- if(!empty($view)) $this->$view();
- $this->footer();
- }
+ function display($view = '') {
+ $this->header();
+ if(!empty($view)) {
+ $this->$view();
+ }
+ $this->footer();
+ }
}
diff --git a/src/plugins/hudson/common/hudson-init.php
b/src/plugins/hudson/common/hudson-init.php
index c7c0050..0f42d29 100644
--- a/src/plugins/hudson/common/hudson-init.php
+++ b/src/plugins/hudson/common/hudson-init.php
@@ -1,5 +1,4 @@
<?php
-
/**
*
* This file is part of FusionForge.
@@ -24,9 +23,9 @@
global $gfplugins;
require_once $gfplugins.'hudson/include/hudsonPlugin.class.php' ;
//define('SEARCH__TYPE_IS_LIST', 'hudson');
-$hudsonPluginObject = new hudsonPlugin() ;
+$hudsonPluginObject = new hudsonPlugin();
-register_plugin ($hudsonPluginObject) ;
+register_plugin($hudsonPluginObject);
// Local Variables:
// mode: php
diff --git a/src/plugins/hudson/cronjobs/manage_hudson.php
b/src/plugins/hudson/cronjobs/manage_hudson.php
index 88eb368..889b57d 100755
--- a/src/plugins/hudson/cronjobs/manage_hudson.php
+++ b/src/plugins/hudson/cronjobs/manage_hudson.php
@@ -63,5 +63,3 @@ if(isset($events)) {
// mode: php
// c-file-style: "bsd"
// End:
-
-?>
diff --git a/src/plugins/hudson/include/hudson.class.php
b/src/plugins/hudson/include/hudson.class.php
index b4c134e..87d1057 100644
--- a/src/plugins/hudson/include/hudson.class.php
+++ b/src/plugins/hudson/include/hudson.class.php
@@ -38,7 +38,7 @@ class hudson extends Controler {
return $this->themePath;
}
function getIconsPath() {
- return $this->themePath . "/images/ic/";
+ return $this->themePath.'/images/ic/';
}
function request() {
@@ -59,11 +59,11 @@ class hudson extends Controler {
if (
$request->exist('hudson_job_url') && trim($request->get('hudson_job_url') !=
'') ) {
$this->action = 'addJob';
} else {
-
$error_msg .= _("Missing Hudson job url (eg:
http://myCIserver:8080/hudson/job/MyJob)");
+
$error_msg .= _('Missing Hudson job url (eg:
http://myCIserver:8080/hudson/job/MyJob)');
}
$this->view =
'projectOverview';
} else {
- $error_msg .=
_("Permission denied.");
+ $error_msg .=
_('Permission denied.');
$this->view =
'projectOverview';
}
break;
@@ -72,10 +72,10 @@ class hudson extends Controler {
if
($request->exist('job_id')) {
$this->view = 'editJob';
} else {
-
$error_msg .= _("Missing Hudson job ID");
+
$error_msg .= _('Missing Hudson job ID');
}
} else {
- $error_msg .=
_("Permission denied.");
+ $error_msg .=
_('Permission denied.');
$this->view =
'projectOverview';
}
break;
@@ -85,14 +85,14 @@ class hudson extends Controler {
if
($request->exist('new_hudson_job_url') && $request->get('new_hudson_job_url')
!= '') {
$this->action = 'updateJob';
} else {
-
$error_msg .= _("Missing Hudson job url (eg:
http://myCIserver:8080/hudson/job/MyJob)");
+
$error_msg .= _('Missing Hudson job url (eg:
http://myCIserver:8080/hudson/job/MyJob)');
}
} else {
-
$error_msg .= _("Missing Hudson job ID");
+
$error_msg .= _('Missing Hudson job ID');
}
$this->view =
'projectOverview';
} else {
- $error_msg .=
_("Permission denied.");
+ $error_msg .=
_('Permission denied.');
$this->view =
'projectOverview';
}
break;
@@ -101,11 +101,11 @@ class hudson extends Controler {
if
($request->exist('job_id')) {
$this->action = 'deleteJob';
} else {
-
$error_msg .= _("Missing Hudson job ID");
+
$error_msg .= _('Missing Hudson job ID');
}
$this->view =
'projectOverview';
} else {
- $error_msg .=
_("Permission denied.");
+ $error_msg .=
_('Permission denied.');
$this->view =
'projectOverview';
}
break;
@@ -129,13 +129,13 @@ class hudson extends Controler {
break;
}
} else {
- $error_msg .= _("Permission denied.");
+ $error_msg .= _('Permission denied.');
}
} else {
- $error_msg .= _("Hudson service is not
enabled");
+ $error_msg .= _('Hudson service is not
enabled.');
}
} else {
- $error_msg .= _("Missing group_id parameter.");
+ $error_msg .= _('Missing group_id parameter.');
}
}
}
diff --git a/src/plugins/hudson/include/hudson_Widget_JobBuildHistory.class.php
b/src/plugins/hudson/include/hudson_Widget_JobBuildHistory.class.php
index f4a3334..92d4dda 100644
--- a/src/plugins/hudson/include/hudson_Widget_JobBuildHistory.class.php
+++ b/src/plugins/hudson/include/hudson_Widget_JobBuildHistory.class.php
@@ -21,7 +21,6 @@
require_once 'HudsonJobWidget.class.php';
require_once 'common/include/HTTPRequest.class.php';
-require_once 'PluginHudsonJobDao.class.php';
require_once 'HudsonJob.class.php';
class hudson_Widget_JobBuildHistory extends HudsonJobWidget {
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=774da65772127ebf804d6a0ef98e466585a7a239
commit 774da65772127ebf804d6a0ef98e466585a7a239
Author: Franck Villaume <[email protected]>
Date: Fri May 26 12:50:14 2017 +0200
force css class
diff --git a/src/www/softwaremap/tag_cloud.php
b/src/www/softwaremap/tag_cloud.php
index 62f0f3a..b5b1ce6 100644
--- a/src/www/softwaremap/tag_cloud.php
+++ b/src/www/softwaremap/tag_cloud.php
@@ -103,7 +103,7 @@ if ($selected_tag) {
for ($i_proj = 0; $i_proj < count($projects); $i_proj++) {
$row_grp = $projects[$i_proj];
- echo $HTML->listTableTop();
+ echo $HTML->listTableTop(array(), array(), 'full');
$cells = array();
$content = util_make_link ('/projects/'.
strtolower($row_grp['unix_group_name']).'/',
'<strong>'.$row_grp['group_name'].'</strong> ');
-----------------------------------------------------------------------
Summary of changes:
src/common/dao/CodendiDataAccess.class.php | 25 ++--
src/common/dao/include/DataAccess.class.php | 8 +-
src/common/dao/include/DataAccessObject.class.php | 62 ++++----
src/common/dao/include/DataAccessResult.class.php | 159 ++++++++++++---------
src/common/mvc/Actions.class.php | 4 +-
src/common/mvc/Controler.class.php | 59 ++++----
src/common/mvc/Views.class.php | 52 +++----
src/plugins/hudson/common/hudson-init.php | 5 +-
src/plugins/hudson/cronjobs/manage_hudson.php | 2 -
src/plugins/hudson/include/hudson.class.php | 26 ++--
.../hudson_Widget_JobBuildHistory.class.php | 1 -
src/www/softwaremap/tag_cloud.php | 2 +-
12 files changed, 215 insertions(+), 190 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
