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 db6abd4f845b9a6d51393b28ddb53de38630cb7d (commit)
from f2da5063ae8dd1a8bb6e53b09eb5b027ba030d72 (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=db6abd4f845b9a6d51393b28ddb53de38630cb7d
commit db6abd4f845b9a6d51393b28ddb53de38630cb7d
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Mon May 17 15:41:35 2021 +0200
clean-up: remove empty statement/double semi-colon...
diff --git a/src/common/include/MonitorElement.class.php
b/src/common/include/MonitorElement.class.php
index 9283eae..69279a0 100644
--- a/src/common/include/MonitorElement.class.php
+++ b/src/common/include/MonitorElement.class.php
@@ -46,7 +46,7 @@ class MonitorElement extends FFError {
$this->_enableMonitoringByUserIdQuery = 'insert
into docdata_monitored_docman (doc_id, user_id) values ($1, $2)';
$this->_getAllEmailsInArrayQuery = 'select
users.email from users, docdata_monitored_docman where users.user_id =
docdata_monitored_docman.user_id and docdata_monitored_docman.doc_id = $1 and
users.status = $2';
$this->_getMonitorCounterIntegerQuery = 'select
count(docgroup_monitored_docman.user_id) as count from
docdata_monitored_docman, users where users.user_id =
docdata_monitored_docman.user_id and doc_id = $1 and users.status = $2';
- $this->_getMonitorUsersIdsInArrayQuery =
'select docdata_monitored_docman.user_id from docdata_monitored_docman, users
where users.user_id = docdata_monitored_docman.user_id and doc_id = $1 and
users.status = $2';;
+ $this->_getMonitorUsersIdsInArrayQuery =
'select docdata_monitored_docman.user_id from docdata_monitored_docman, users
where users.user_id = docdata_monitored_docman.user_id and doc_id = $1 and
users.status = $2';
$this->_getMonitoredByUserIdInArrayQuery =
'select doc_id from docdata_monitored_docman where user_id = $1';
$this->_getMonitoredDistinctGroupIdsByUserIdInArrayQuery = 'select distinct
doc_data.group_id from groups, doc_data, docdata_monitored_docman where
docdata_monitored_docman.doc_id = doc_data.docid and groups.group_id =
doc_data.group_id and docdata_monitored_docman.user_id = $1 and groups.status =
$2';
$this->_getMonitoredIdsByGroupIdByUserIdInArrayQuery = 'select doc_data.docid
from doc_data, docdata_monitored_docman where doc_data.docid =
docdata_monitored_docman.doc_id and doc_data.group_id = $1 and
docdata_monitored_docman.user_id = $2';
diff --git a/src/common/include/extras-debug.php
b/src/common/include/extras-debug.php
index 6115345..4681ae6 100644
--- a/src/common/include/extras-debug.php
+++ b/src/common/include/extras-debug.php
@@ -324,7 +324,7 @@ function ffExceptionHandler($e) {
/* drop output buffers and error handler */
$sysdebug__aborted = true;
while (ob_get_length() > 0 && ob_end_clean()) {
- /* loop */ ;
+ /* loop */
}
restore_error_handler();
diff --git a/src/common/include/utils.php b/src/common/include/utils.php
index 45f81ff..70fc8ce 100644
--- a/src/common/include/utils.php
+++ b/src/common/include/utils.php
@@ -1158,7 +1158,7 @@ function util_path_info_last_numeric_component() {
$rv = 0;
$ok = true;
} elseif ($ok == false) {
- ; /* need reset using slash */
+ /* need reset using slash */
} elseif ((ord($x) >= 48) && (ord($x) <= 57)) {
$rv = $rv * 10 + ord($x) - 48;
} else {
diff --git a/src/common/reporting/ReportDownloads.class.php
b/src/common/reporting/ReportDownloads.class.php
index 7a3a8d5..666b2b3 100644
--- a/src/common/reporting/ReportDownloads.class.php
+++ b/src/common/reporting/ReportDownloads.class.php
@@ -51,7 +51,7 @@ class ReportDownloads extends Report {
parent::__construct();
if (!$start) {
- $start=mktime(0,0,0,date('m'),1,date('Y'));;
+ $start=mktime(0,0,0,date('m'),1,date('Y'));
}
if (!$end) {
$end=time();
diff --git a/src/common/reporting/ReportGroupAdded.class.php
b/src/common/reporting/ReportGroupAdded.class.php
index 3fa09f0..9233b1e 100644
--- a/src/common/reporting/ReportGroupAdded.class.php
+++ b/src/common/reporting/ReportGroupAdded.class.php
@@ -29,7 +29,7 @@ function __construct($span,$start=0,$end=0) {
parent::__construct();
if (!$start) {
- $start=mktime(0,0,0,date('m'),1,date('Y'));;
+ $start=mktime(0,0,0,date('m'),1,date('Y'));
}
if (!$end) {
$end=time();
diff --git a/src/common/reporting/ReportGroupCum.class.php
b/src/common/reporting/ReportGroupCum.class.php
index 8c8cf41..000021c 100644
--- a/src/common/reporting/ReportGroupCum.class.php
+++ b/src/common/reporting/ReportGroupCum.class.php
@@ -29,7 +29,7 @@ function __construct($span,$start=0,$end=0) {
parent::__construct();
if (!$start) {
- $start=mktime(0,0,0,date('m'),1,date('Y'));;
+ $start=mktime(0,0,0,date('m'),1,date('Y'));
}
if (!$end) {
$end=time();
diff --git a/src/common/reporting/ReportProjectAct.class.php
b/src/common/reporting/ReportProjectAct.class.php
index 5282cee..efca465 100644
--- a/src/common/reporting/ReportProjectAct.class.php
+++ b/src/common/reporting/ReportProjectAct.class.php
@@ -32,7 +32,7 @@ function __construct($span,$group_id,$start=0,$end=0) {
parent::__construct();
if (!$start) {
- $start=mktime(0,0,0,date('m'),1,date('Y'));;
+ $start=mktime(0,0,0,date('m'),1,date('Y'));
}
if (!$end) {
$end=time();
diff --git a/src/common/reporting/ReportProjectTime.class.php
b/src/common/reporting/ReportProjectTime.class.php
index 336bdb8..2422876 100644
--- a/src/common/reporting/ReportProjectTime.class.php
+++ b/src/common/reporting/ReportProjectTime.class.php
@@ -29,7 +29,7 @@ function __construct($group_id,$type,$start=0,$end=0) {
parent::__construct();
if (!$start) {
- $start=mktime(0,0,0,date('m'),1,date('Y'));;
+ $start=mktime(0,0,0,date('m'),1,date('Y'));
}
if (!$end) {
$end=time();
diff --git a/src/common/reporting/ReportSiteAct.class.php
b/src/common/reporting/ReportSiteAct.class.php
index e28bf07..2d85b25 100644
--- a/src/common/reporting/ReportSiteAct.class.php
+++ b/src/common/reporting/ReportSiteAct.class.php
@@ -31,7 +31,7 @@ function __construct($span,$start=0,$end=0) {
parent::__construct();
if (!$start) {
- $start=mktime(0,0,0,date('m'),1,date('Y'));;
+ $start=mktime(0,0,0,date('m'),1,date('Y'));
}
if (!$end) {
$end=time();
diff --git a/src/common/reporting/ReportSiteTime.class.php
b/src/common/reporting/ReportSiteTime.class.php
index 040577c..4056e2c 100644
--- a/src/common/reporting/ReportSiteTime.class.php
+++ b/src/common/reporting/ReportSiteTime.class.php
@@ -29,7 +29,7 @@ function __construct($type,$start=0,$end=0) {
parent::__construct();
if (!$start) {
- $start=mktime(0,0,0,date('m'),1,date('Y'));;
+ $start=mktime(0,0,0,date('m'),1,date('Y'));
}
if (!$end) {
$end=time();
diff --git a/src/common/reporting/ReportUserAct.class.php
b/src/common/reporting/ReportUserAct.class.php
index 6979b8a..5a5b896 100644
--- a/src/common/reporting/ReportUserAct.class.php
+++ b/src/common/reporting/ReportUserAct.class.php
@@ -31,7 +31,7 @@ function __construct($span,$user_id,$start=0,$end=0) {
parent::__construct();
if (!$start) {
- $start=mktime(0,0,0,date('m'),1,date('Y'));;
+ $start=mktime(0,0,0,date('m'),1,date('Y'));
}
if (!$end) {
$end=time();
diff --git a/src/common/reporting/ReportUserAdded.class.php
b/src/common/reporting/ReportUserAdded.class.php
index eff6326..c40e45d 100644
--- a/src/common/reporting/ReportUserAdded.class.php
+++ b/src/common/reporting/ReportUserAdded.class.php
@@ -29,7 +29,7 @@ function __construct($span,$start=0,$end=0) {
parent::__construct();
if (!$start) {
- $start=mktime(0,0,0,date('m'),1,date('Y'));;
+ $start=mktime(0,0,0,date('m'),1,date('Y'));
}
if (!$end) {
$end=time();
diff --git a/src/common/reporting/ReportUserCum.class.php
b/src/common/reporting/ReportUserCum.class.php
index e6e05ad..a3d43f8 100644
--- a/src/common/reporting/ReportUserCum.class.php
+++ b/src/common/reporting/ReportUserCum.class.php
@@ -29,7 +29,7 @@ function __construct($span,$start=0,$end=0) {
parent::__construct();
if (!$start) {
- $start=mktime(0,0,0,date('m'),1,date('Y'));;
+ $start=mktime(0,0,0,date('m'),1,date('Y'));
}
if (!$end) {
$end=time();
diff --git a/src/common/reporting/ReportUserTime.class.php
b/src/common/reporting/ReportUserTime.class.php
index deb4522..b568276 100644
--- a/src/common/reporting/ReportUserTime.class.php
+++ b/src/common/reporting/ReportUserTime.class.php
@@ -29,7 +29,7 @@ function __construct($user_id,$type,$start=0,$end=0) {
parent::__construct();
if (!$start) {
- $start=mktime(0,0,0,date('m'),1,date('Y'));;
+ $start=mktime(0,0,0,date('m'),1,date('Y'));
}
if (!$end) {
$end=time();
diff --git a/src/common/tracker/actions/query.php
b/src/common/tracker/actions/query.php
index 3c7236c..3944724 100644
--- a/src/common/tracker/actions/query.php
+++ b/src/common/tracker/actions/query.php
@@ -151,7 +151,7 @@ if (getStringFromRequest('submit')) {
if (!$aq->delete()) {
$error_msg .= $aq->getErrorMessage();
} else {
- $feedback .= _('Query Deleted');;
+ $feedback .= _('Query Deleted');
}
session_redirect('/tracker/?atid='.$atid.'&group_id='.$group_id.'&func=browse');
} else {
diff --git a/src/common/tracker/views/form-editformula.php
b/src/common/tracker/views/form-editformula.php
index 6001baf..5ee62f0 100644
--- a/src/common/tracker/views/form-editformula.php
+++ b/src/common/tracker/views/form-editformula.php
@@ -32,7 +32,7 @@ if ($boxid) {
$ef_id = $boxid;
$efe_id = getIntFromRequest('id');
} else {
- $ef_id = getIntFromRequest('id');;
+ $ef_id = getIntFromRequest('id');
$efe_id = 0;
}
diff --git a/src/common/tracker/views/form-updateextrafieldelement.php
b/src/common/tracker/views/form-updateextrafieldelement.php
index 0233348..89b227c 100644
--- a/src/common/tracker/views/form-updateextrafieldelement.php
+++ b/src/common/tracker/views/form-updateextrafieldelement.php
@@ -93,7 +93,7 @@ if (!$ac || !is_object($ac)) {
echo html_ao('p');
echo html_e('label', array('for'=>'formula'), html_e('strong',
array(), _('Formula')._(':')).html_e('br'));
- echo html_e('textarea', array('type'=>'text', 'id'=>'formula',
'name'=>'formula', 'rows'=>4, 'cols'=>50), $ao->getFormula(),
false).html_e('br');;
+ echo html_e('textarea', array('type'=>'text', 'id'=>'formula',
'name'=>'formula', 'rows'=>4, 'cols'=>50), $ao->getFormula(),
false).html_e('br');
echo html_e('button',
array('onclick'=>'location.href="/tracker/admin/?edit_formula=1&group_id='.$group_id.'&id='.$id.'&atid='.$ath->getID().'&boxid='.$boxid.'";
return false;'),_('Edit formula'));
echo html_ac(html_ap()-1);
diff --git a/src/common/widget/Widget_MyArtifacts.class.php
b/src/common/widget/Widget_MyArtifacts.class.php
index d4e979a..ec31fce 100644
--- a/src/common/widget/Widget_MyArtifacts.class.php
+++ b/src/common/widget/Widget_MyArtifacts.class.php
@@ -123,7 +123,7 @@ class Widget_MyArtifacts extends Widget {
$my_artifacts = $atf->getAssignedArtifactsByGroup();
}
if ($this->_artifact_show== 'M') {
- $my_artifacts =
$atf->getArtifactsFromSQLwithParams('SELECT * FROM artifact_vw av where
(av.artifact_id IN (select artifact_monitor.artifact_id FROM artifact_monitor
WHERE artifact_monitor.user_id = $1)) AND av.status_id=1 ORDER BY
av.group_artifact_id, av.artifact_id
DESC',array(UserManager::instance()->getCurrentUser()->getID()));;
+ $my_artifacts =
$atf->getArtifactsFromSQLwithParams('SELECT * FROM artifact_vw av where
(av.artifact_id IN (select artifact_monitor.artifact_id FROM artifact_monitor
WHERE artifact_monitor.user_id = $1)) AND av.status_id=1 ORDER BY
av.group_artifact_id, av.artifact_id
DESC',array(UserManager::instance()->getCurrentUser()->getID()));
}
if (count($my_artifacts) > 0) {
diff --git a/src/plugins/mediawiki/bin/mw-wrapper.php
b/src/plugins/mediawiki/bin/mw-wrapper.php
index c00c431..bdac6a7 100755
--- a/src/plugins/mediawiki/bin/mw-wrapper.php
+++ b/src/plugins/mediawiki/bin/mw-wrapper.php
@@ -99,7 +99,7 @@ $mwscript = $src_path . '/maintenance/'.$mwscript ;
array_unshift($argv, $mwscript, '--conf', $ff_localsettings);
-while (@ob_end_flush())
- /* nothing */;
-
+while (@ob_end_flush()) {
+ /* nothing */
+}
require_once $mwscript ;
diff --git a/src/plugins/mediawiki/www/plugin_admin.php
b/src/plugins/mediawiki/www/plugin_admin.php
index aa8b937..c11443d 100644
--- a/src/plugins/mediawiki/www/plugin_admin.php
+++ b/src/plugins/mediawiki/www/plugin_admin.php
@@ -172,7 +172,7 @@ echo html_e('p', array(), sprintf(_('<a
href="%s">Download</a> the nightly creat
util_make_url("/plugins/mediawiki/dumps/" .
$group_unix_name . ".xml")));
echo html_e('h2', array(), _("This project's wiki logo : \$wgLogo"));
-echo html_ao('div', array('style' => 'border:solid 1px black; margin:3px;
padding:3px'));;
+echo html_ao('div', array('style' => 'border:solid 1px black; margin:3px;
padding:3px'));
if (file_exists($group_logo)) {
echo html_e('p', array(), _("Current logo:") . ' (<a href="' .
$group_logo_url .
'">' . _("Download") . '</a>)<br /><img
alt="wgLogo.png" ' .
diff --git a/src/plugins/oauthprovider/include/access_token_api.php
b/src/plugins/oauthprovider/include/access_token_api.php
index 678be3d..4e0c78a 100644
--- a/src/plugins/oauthprovider/include/access_token_api.php
+++ b/src/plugins/oauthprovider/include/access_token_api.php
@@ -34,112 +34,107 @@ require_once 'token_api.php';
*/
class OauthAuthzAccessToken extends OauthAuthzToken {
- const TOKEN_TYPE = 'access';
- protected $role_id;
-
- /**
- * @param int $p_consumer_id
- * @param string $p_key
- * @param string $p_secret
- * @param int $p_user_id
- * @param int $p_time_stamp
- */
- function __construct( $p_consumer_id, $p_key, $p_secret, $p_user_id=null,
$p_role_id, $p_time_stamp=null) {
- parent::__construct($p_consumer_id, $p_key, $p_secret, $p_user_id,
$p_time_stamp);
-
- $this->role_id = $p_role_id;
- }
-
- /**
- * Converts a row returned by select * into an object
- *
- * @param array $t_row
- * @return OauthAuthzRequestToken
- */
- static function row_to_new_token ($t_row) {
- $t_token = new OauthAuthzAccessToken( $t_row['consumer_id'],
$t_row['token_key'], $t_row['token_secret'], $t_row['user_id'],
$t_row['role_id'], $t_row['time_stamp'] );
- $t_token->id = $t_row['id'];
- return $t_token;
- }
-
- static function load( $p_id ) {
- $row = parent::load($p_id, self::TOKEN_TYPE);
- return self::row_to_new_token($row);
- }
-
- static function load_all($user_id=null) {
- $rows = parent::load_all($user_id, self::TOKEN_TYPE);
- $tokens = array();
-
- foreach ($rows as $row) {
- $token = self::row_to_new_token($row);
-
- $tokens[] = $token;
- }
-
- return $tokens;
- }
-
- static function load_by_key( $p_token_key ) {
- $row = parent::load_by_key($p_token_key, self::TOKEN_TYPE);
- return self::row_to_new_token($row);
- }
-
- function delete() {
- parent::delete(self::TOKEN_TYPE);
- }
-
- /**
- * Loads tokens related to a particular consumer (and a particular user, if
specified)
- *
- * @param int $consumer_id
- * @param int $user_id (may be null)
- * @return array of OauthAuthzAccessToken
- */
- static function load_by_consumer($consumer_id, $user_id=null) {
-
- $DBSTORE = FFDbOAuthDataStore::singleton();
-
- // this is a hack to retrieve the table name from the base class
- $t_rows = $DBSTORE->find_tokens_by_consumer(self::TOKEN_TYPE,
$consumer_id, $user_id);
-
- $t_tokens = array();
-
- foreach ($t_rows as $t_row) {
- $t_token = self::row_to_new_token($t_row);
-
- $t_tokens[] = $t_token;
- }
-
- return $t_tokens;
-
- }
+ const TOKEN_TYPE = 'access';
+ protected $role_id;
+
+ /**
+ * @param int $p_consumer_id
+ * @param string $p_key
+ * @param string $p_secret
+ * @param int $p_user_id
+ * @param int $p_time_stamp
+ */
+ function __construct( $p_consumer_id, $p_key, $p_secret,
$p_user_id=null, $p_role_id, $p_time_stamp=null) {
+ parent::__construct($p_consumer_id, $p_key, $p_secret,
$p_user_id, $p_time_stamp);
+
+ $this->role_id = $p_role_id;
+ }
+
+ /**
+ * Converts a row returned by select * into an object
+ *
+ * @param array $t_row
+ * @return OauthAuthzRequestToken
+ */
+ static function row_to_new_token ($t_row) {
+ $t_token = new OauthAuthzAccessToken( $t_row['consumer_id'],
$t_row['token_key'], $t_row['token_secret'], $t_row['user_id'],
$t_row['role_id'], $t_row['time_stamp'] );
+ $t_token->id = $t_row['id'];
+ return $t_token;
+ }
+
+ static function load( $p_id ) {
+ $row = parent::load($p_id, self::TOKEN_TYPE);
+ return self::row_to_new_token($row);
+ }
+
+ static function load_all($user_id=null) {
+ $rows = parent::load_all($user_id, self::TOKEN_TYPE);
+ $tokens = array();
+
+ foreach ($rows as $row) {
+ $token = self::row_to_new_token($row);
+ $tokens[] = $token;
+ }
+
+ return $tokens;
+ }
+
+ static function load_by_key( $p_token_key ) {
+ $row = parent::load_by_key($p_token_key, self::TOKEN_TYPE);
+ return self::row_to_new_token($row);
+ }
+
+ function delete() {
+ parent::delete(self::TOKEN_TYPE);
+ }
+
+ /**
+ * Loads tokens related to a particular consumer (and a particular
user, if specified)
+ *
+ * @param int $consumer_id
+ * @param int $user_id (may be null)
+ * @return array of OauthAuthzAccessToken
+ */
+ static function load_by_consumer($consumer_id, $user_id=null) {
+
+ $DBSTORE = FFDbOAuthDataStore::singleton();
+
+ // this is a hack to retrieve the table name from the base class
+ $t_rows = $DBSTORE->find_tokens_by_consumer(self::TOKEN_TYPE,
$consumer_id, $user_id);
+
+ $t_tokens = array();
+
+ foreach ($t_rows as $t_row) {
+ $t_token = self::row_to_new_token($t_row);
+ $t_tokens[] = $t_token;
+ }
+
+ return $t_tokens;
+ }
public function getRoleId() {
return $this->role_id;
}
- /**
- * Check that mandatory values are OK
- */
- function check_mandatory() {
- parent::check_mandatory();
-
- // all access tokens should be on behalf of a user
- if ( strlen(trim( $this->user_id ))==0 ) {
- throw new OAuthException('Mandatory "user_id" Access Token attribute
not set.');
- }
- }
-
- /**
- * Insert or update the token into the DB
- */
- function save() {
-
- $this->check_mandatory();
-
- $DBSTORE = FFDbOAuthDataStore::singleton();
- $this->id = $DBSTORE->save_access_token($this);
- }
-
-};
+ /**
+ * Check that mandatory values are OK
+ */
+ function check_mandatory() {
+ parent::check_mandatory();
+
+ // all access tokens should be on behalf of a user
+ if ( strlen(trim( $this->user_id ))==0 ) {
+ throw new OAuthException('Mandatory "user_id" Access
Token attribute not set.');
+ }
+ }
+
+ /**
+ * Insert or update the token into the DB
+ */
+ function save() {
+ $this->check_mandatory();
+
+ $DBSTORE = FFDbOAuthDataStore::singleton();
+ $this->id = $DBSTORE->save_access_token($this);
+ }
+}
diff --git a/src/plugins/oauthprovider/include/consumer_api.php
b/src/plugins/oauthprovider/include/consumer_api.php
index 61ad1e3..0f226af 100644
--- a/src/plugins/oauthprovider/include/consumer_api.php
+++ b/src/plugins/oauthprovider/include/consumer_api.php
@@ -38,12 +38,12 @@ class OauthAuthzConsumer extends OAuthConsumer {
protected $email;
function __construct( $p_name, $p_key, $p_secret, $p_url, $p_desc,
$p_email) {
- parent::__construct($p_key, $p_secret);
- $this->id = 0;
- $this->name = $p_name;
- $this->url = $p_url;
- $this->desc = $p_desc;
- $this->email = $p_email;
+ parent::__construct($p_key, $p_secret);
+ $this->id = 0;
+ $this->name = $p_name;
+ $this->url = $p_url;
+ $this->desc = $p_desc;
+ $this->email = $p_email;
}
public function setId($p_id) {
@@ -91,69 +91,56 @@ class OauthAuthzConsumer extends OAuthConsumer {
//$missing_params[] = _('"Consumer Name"');
return "The field 'Consumer Name' is empty! ";
//exit_missing_param('',
$missing_params,'oauthprovider');
- }
- elseif ((!trim($p_consumer_url))) {
+ } elseif ((!trim($p_consumer_url))) {
return "The field 'Consumer URL' is empty! ";
- }
- elseif ((!trim($p_consumer_desc))) {
+ } elseif ((!trim($p_consumer_desc))) {
return "The field 'Consumer Description' is empty! ";
- }
- elseif ((!trim($p_consumer_email))) {
+ } elseif ((!trim($p_consumer_email))) {
return "The field 'Consumer Email' is empty! ";
- }
- elseif(strlen($p_consumer_name)<5) {
+ } elseif(strlen($p_consumer_name)<5) {
return "The Consumer Name cannot be less than 5
characters!";
- }
- elseif(strlen($p_consumer_name)>15) {
+ } elseif(strlen($p_consumer_name)>15) {
return "The Consumer Name cannot be more than 15
characters!";
- }
- elseif(is_numeric(substr($p_consumer_name, 0, 1))) {
+ } elseif(is_numeric(substr($p_consumer_name, 0, 1))) {
return "The Consumer Name cannot begin with a numeral!";
- }
- elseif((substr($p_consumer_name, 0, 1))=="_") {
+ } elseif((substr($p_consumer_name, 0, 1))=="_") {
return "The Consumer Name cannot begin with an
underscore!";
- }
- elseif(preg_match('/^[A-z][A-z_0-9]{4,}/',
$p_consumer_name)==0) {
+ } elseif(preg_match('/^[A-z][A-z_0-9]{4,}/',
$p_consumer_name)==0) {
return "The Consumer Name can only contain alphabets
(a-z,A-Z), numbers (0-9) and underscores (_). Please choose a Consumer Name
accordingly!";
- }
- elseif(OauthAuthzConsumer::consumer_exists($p_consumer_name))
{
+ } elseif(OauthAuthzConsumer::consumer_exists($p_consumer_name))
{
return "The name '".$p_consumer_name."' has already
been taken. Please choose another!";
-
- }
-
elseif(!preg_match('|^http(s)?://[a-z0-9-]+(.[a-z0-9-]+)*(:[0-9]+)?(/.*)?$|i',
$p_consumer_url)) {
+ }
elseif(!preg_match('|^http(s)?://[a-z0-9-]+(.[a-z0-9-]+)*(:[0-9]+)?(/.*)?$|i',
$p_consumer_url)) {
return "The Consumer URL is not valid.";
- }
- else {
+ } else {
return null;
}
- }
+ }
- /**
- * Converts a row returned by select * into an object
- *
- * @param array $t_row
- * @return OauthAuthzRequestToken
- */
+ /**
+ * Converts a row returned by select * into an object
+ *
+ * @param array $t_row
+ * @return OauthAuthzRequestToken
+ */
static function row_to_new_consumer ($t_row) {
- if($t_row!=null) {
+ if($t_row!=null) {
$t_consumer = new OauthAuthzConsumer( $t_row['name'],
$t_row['consumer_key'], $t_row['consumer_secret'], $t_row['consumer_url'],
$t_row['consumer_desc'], $t_row['consumer_email'] );
- $t_consumer->setId($t_row['id']);
- return $t_consumer;
- }else {
- return null;
- }
-
- }
+ $t_consumer->setId($t_row['id']);
+ return $t_consumer;
+ } else {
+ return null;
+ }
+ }
/**
- * returns a newly generated consumer key and secret
- *
- * @return array
- */
- static function new_consumer_keys_generate () {
- $DBSTORE = FFDbOAuthDataStore::singleton();
- return $DBSTORE->new_consumer_keys();
- }
+ * returns a newly generated consumer key and secret
+ *
+ * @return array
+ */
+ static function new_consumer_keys_generate () {
+ $DBSTORE = FFDbOAuthDataStore::singleton();
+ return $DBSTORE->new_consumer_keys();
+ }
/**
* Loads an OauthAuthzConsumer from its ID in the DB
@@ -198,10 +185,9 @@ class OauthAuthzConsumer extends OAuthConsumer {
static function load_by_key( $p_consumer_key ) {
$DBSTORE = FFDbOAuthDataStore::singleton();
$t_row = $DBSTORE->find_consumer_from_key($p_consumer_key);
- if($t_row==null) {
+ if ($t_row==null) {
return null;
- }
- else {
+ } else {
$t_consumer =
OauthAuthzConsumer::row_to_new_consumer($t_row);
return $t_consumer;
}
@@ -216,10 +202,9 @@ class OauthAuthzConsumer extends OAuthConsumer {
static function consumer_exists( $p_consumer_name ) {
$DBSTORE = FFDbOAuthDataStore::singleton();
$t_row = $DBSTORE->find_consumer_from_name($p_consumer_name);
- if($t_row==null) {
+ if ($t_row==null) {
return false;
- }
- else {
+ } else {
return true;
}
@@ -234,12 +219,11 @@ class OauthAuthzConsumer extends OAuthConsumer {
}
$DBSTORE = FFDbOAuthDataStore::singleton();
$id=$DBSTORE->save_consumer($this);
- if(!$id) {
+ if(!$id) {
exit_error("Error trying to create new consumer in DB",
'oauthprovider');
- }else {
+ } else {
$this->setId($id);
}
-
}
/**
@@ -247,9 +231,8 @@ class OauthAuthzConsumer extends OAuthConsumer {
*/
function delete() {
$DBSTORE = FFDbOAuthDataStore::singleton();
- if(!($DBSTORE->delete_consumer($this->id))) {
+ if(!($DBSTORE->delete_consumer($this->id))) {
exit_error("Error trying to delete consumer from DB",
'oauthprovider');
}
}
-
- };
+}
diff --git a/src/plugins/oauthprovider/include/request_token_api.php
b/src/plugins/oauthprovider/include/request_token_api.php
index 44bb996..77fa274 100644
--- a/src/plugins/oauthprovider/include/request_token_api.php
+++ b/src/plugins/oauthprovider/include/request_token_api.php
@@ -35,108 +35,102 @@ require_once 'token_api.php';
*/
class OauthAuthzRequestToken extends OauthAuthzToken {
- protected $authorized; // if a user has authorized the token
- protected $verifier; //the oauth verifier code
- protected $role_id; //access level granted
-
- const TOKEN_TYPE = 'request';
-
- /**
- * @param int $p_consumer_id
- * @param string $p_key
- * @param string $p_secret
- * @param bool $p_authorized
- * @param int $p_user_id
- * @param int $p_time_stamp
- */
- function __construct( $p_consumer_id, $p_key, $p_secret,
$p_authorized=false, $p_verifier=FALSE, $p_user_id=null, $p_role_id=null,
$p_time_stamp=null) {
- parent::__construct( $p_consumer_id, $p_key, $p_secret, $p_user_id,
$p_time_stamp);
-
- $this->authorized = $p_authorized;
- $this->verifier = $p_verifier;
- $this->role_id = $p_role_id;
- }
-
- public function getAuthorized() {
- return $this->authorized;
- }
-
- public function getVerifier() {
- return $this->verifier;
- }
-
- public function getRoleId() {
- return $this->role_id;
- }
-
- /**
- * Converts a row returned by select * into an object
- * @param array $t_row
- * @return OauthAuthzRequestToken
- */
- static function row_to_new_token ($t_row) {
- $t_token = new OauthAuthzRequestToken( $t_row['consumer_id'],
$t_row['token_key'], $t_row['token_secret'], $t_row['authorized'],
$t_row['verifier'], $t_row['user_id'], $t_row['role_id'], $t_row['time_stamp']
);
-
- $t_token->id = $t_row['id'];
-
- return $t_token;
- }
-
- static function load( $p_id ) {
- $row = parent::load($p_id, self::TOKEN_TYPE);
- return self::row_to_new_token($row);
- }
-
- static function load_all($user_id=null) {
- $rows = parent::load_all($user_id=null, self::TOKEN_TYPE);
- $tokens = array();
-
- foreach ($rows as $row) {
- $token = self::row_to_new_token($row);
-
- $tokens[] = $token;
- }
-
- return $tokens;
- }
-
- static function load_by_key( $p_token_key ) {
- $row = parent::load_by_key($p_token_key, self::TOKEN_TYPE);
- return self::row_to_new_token($row);
- }
-
- function delete() {
- parent::delete(self::TOKEN_TYPE);
- }
-
- /**
- * Saves the token properly to the DB (insert or update with proper columns)
- */
- function save() {
-
- $this->check_mandatory();
-
- if ( $this->authorized && strlen(trim( $this->user_id ))==0 ) {
- exit_error( "Error trying to save request token!", 'oauthprovider' );
- }
-
- $DBSTORE = FFDbOAuthDataStore::singleton();
- $this->id = $DBSTORE->save_request_token($this);
- }
-
- public function authorize($user_id, $role_id) {
- $this->authorized = 1;
- $this->verifier = substr(sha1(util_randbytes(32)),-10,12);
- $this->user_id = $user_id;
- $this->role_id = $role_id;
- $this->save();
- return $this->verifier;
- }
-
- public function check_verifier($verifier) {
- if(!$this->verifier || ($this->verifier!=$verifier)) {
- throw new OAuthException("Incorrect OAuth verification code
provided.");
- }
- }
-
-};
+ protected $authorized; // if a user has authorized the token
+ protected $verifier; //the oauth verifier code
+ protected $role_id; //access level granted
+
+ const TOKEN_TYPE = 'request';
+
+ /**
+ * @param int $p_consumer_id
+ * @param string $p_key
+ * @param string $p_secret
+ * @param bool $p_authorized
+ * @param int $p_user_id
+ * @param int $p_time_stamp
+ */
+ function __construct( $p_consumer_id, $p_key, $p_secret,
$p_authorized=false, $p_verifier=FALSE, $p_user_id=null, $p_role_id=null,
$p_time_stamp=null) {
+ parent::__construct( $p_consumer_id, $p_key, $p_secret,
$p_user_id, $p_time_stamp);
+
+ $this->authorized = $p_authorized;
+ $this->verifier = $p_verifier;
+ $this->role_id = $p_role_id;
+ }
+
+ public function getAuthorized() {
+ return $this->authorized;
+ }
+
+ public function getVerifier() {
+ return $this->verifier;
+ }
+
+ public function getRoleId() {
+ return $this->role_id;
+ }
+
+ /**
+ * Converts a row returned by select * into an object
+ * @param array $t_row
+ * @return OauthAuthzRequestToken
+ */
+ static function row_to_new_token ($t_row) {
+ $t_token = new OauthAuthzRequestToken( $t_row['consumer_id'],
$t_row['token_key'], $t_row['token_secret'], $t_row['authorized'],
$t_row['verifier'], $t_row['user_id'], $t_row['role_id'], $t_row['time_stamp']
);
+ $t_token->id = $t_row['id'];
+ return $t_token;
+ }
+
+ static function load( $p_id ) {
+ $row = parent::load($p_id, self::TOKEN_TYPE);
+ return self::row_to_new_token($row);
+ }
+
+ static function load_all($user_id=null) {
+ $rows = parent::load_all($user_id=null, self::TOKEN_TYPE);
+ $tokens = array();
+
+ foreach ($rows as $row) {
+ $token = self::row_to_new_token($row);
+ $tokens[] = $token;
+ }
+
+ return $tokens;
+ }
+
+ static function load_by_key( $p_token_key ) {
+ $row = parent::load_by_key($p_token_key, self::TOKEN_TYPE);
+ return self::row_to_new_token($row);
+ }
+
+ function delete() {
+ parent::delete(self::TOKEN_TYPE);
+ }
+
+ /**
+ * Saves the token properly to the DB (insert or update with proper
columns)
+ */
+ function save() {
+ $this->check_mandatory();
+ if ( $this->authorized && strlen(trim( $this->user_id ))==0 ) {
+ exit_error( "Error trying to save request token!",
'oauthprovider' );
+ }
+
+ $DBSTORE = FFDbOAuthDataStore::singleton();
+ $this->id = $DBSTORE->save_request_token($this);
+ }
+
+ public function authorize($user_id, $role_id) {
+ $this->authorized = 1;
+ $this->verifier = substr(sha1(util_randbytes(32)),-10,12);
+ $this->user_id = $user_id;
+ $this->role_id = $role_id;
+ $this->save();
+ return $this->verifier;
+ }
+
+ public function check_verifier($verifier) {
+ if(!$this->verifier || ($this->verifier!=$verifier)) {
+ throw new OAuthException("Incorrect OAuth verification
code provided.");
+ }
+ }
+}
diff --git a/src/plugins/oauthprovider/include/token_api.php
b/src/plugins/oauthprovider/include/token_api.php
index c33c11b..919588a 100644
--- a/src/plugins/oauthprovider/include/token_api.php
+++ b/src/plugins/oauthprovider/include/token_api.php
@@ -38,120 +38,112 @@ require_once 'OAuth.php';
*/
class OauthAuthzToken extends OAuthToken {
- protected $id; // in the table
-
- protected $consumer_id; // consumer for which the token was issued
- protected $user_id; // user for which the token is (or will be) authorized
- protected $time_stamp; // time of creation of the token
-
- const TOKEN_TYPE = 'null';
-
- /**
- * @param int $p_consumer_id
- * @param string $p_key
- * @param string $p_secret
- * @param int $p_user_id
- * @param int $p_time_stamp
- */
- function __construct( $p_consumer_id, $p_key, $p_secret, $p_user_id=null,
$p_time_stamp=null) {
- // parent only stores key and secret
- parent::__construct($p_key, $p_secret);
-
- // will be set once inserted in the DB
- $this->id = 0;
-
- $this->consumer_id = $p_consumer_id;
- $this->user_id = $p_user_id;
- $this->time_stamp = $p_time_stamp;
- }
-
- public function getId() {
- return $this->id;
- }
-
- public function getConsumerId() {
- return $this->consumer_id;
- }
-
- public function getUserId() {
- return $this->user_id;
- }
-
- public function gettime_stamp() {
- return $this->time_stamp;
- }
-
- /* TO BE SUBCLASSED
- static function row_to_new_token ($t_row) {
- $t_token = new OauthAuthzToken( $t_row['consumer_id'],
$t_row['token_key'], $t_row['token_secret'] );
- $t_token->id = $t_row['id'];
- return $t_token;
- }
- */
-
- /**
- * Loads a particular token from the DB knowing its ID
- *
- * @param int $p_id
- */
- static function load( $p_id, $token_type ) {
-
- $DBSTORE = FFDbOAuthDataStore::singleton();
-
- $t_row = $DBSTORE->find_token_from_id($token_type, $p_id);
-
- if(!$t_row) {
- exit_error( "Error trying to load token!", 'oauthprovider' );
- }
- return $t_row;
- }
-
- /**
- * @param int $user_id
- * @return Ambigous <multitype:, unknown>
- */
- static function load_all($user_id=null, $token_type) {
-
- $DBSTORE = FFDbOAuthDataStore::singleton();
- $t_rows = $DBSTORE->find_all_tokens($token_type, $user_id);
- return $t_rows;
- }
-
- /**
- * Loads a token by its token key
- *
- * @param string $p_token_key
- * @return OauthAuthzToken subclass
- */
- static function load_by_key( $p_token_key, $token_type ) {
-
- $DBSTORE = FFDbOAuthDataStore::singleton();
-
- $t_row = $DBSTORE->find_token_from_key($token_type, $p_token_key);
-
- if(!$t_row) {
- exit_error( "Error trying to load ".$token_type." token!",
'oauthprovider' );
- }
- return $t_row;
- }
-
- /**
- * Check that mandatory values are OK
- */
- function check_mandatory() {
- if ( strlen(trim( $this->consumer_id ))==0 || strlen(trim( $this->key
))==0 || strlen(trim( $this->secret ))==0 ) {
- throw new OAuthException('Mandatory "consumer_id", "key" or "secret"
Token attribute(s) not set.');
- }
- }
-
- /**
- * @param int $p_id
- */
- function delete($token_type) {
-
- $DBSTORE = FFDbOAuthDataStore::singleton();
-
- $DBSTORE->delete_token( $token_type, $this->id);
- }
-
-};
+ protected $id; // in the table
+
+ protected $consumer_id; // consumer for which the token was issued
+ protected $user_id; // user for which the token is (or will be)
authorized
+ protected $time_stamp; // time of creation of the token
+
+ const TOKEN_TYPE = 'null';
+
+ /**
+ * @param int $p_consumer_id
+ * @param string $p_key
+ * @param string $p_secret
+ * @param int $p_user_id
+ * @param int $p_time_stamp
+ */
+ function __construct( $p_consumer_id, $p_key, $p_secret,
$p_user_id=null, $p_time_stamp=null) {
+ // parent only stores key and secret
+ parent::__construct($p_key, $p_secret);
+
+ // will be set once inserted in the DB
+ $this->id = 0;
+
+ $this->consumer_id = $p_consumer_id;
+ $this->user_id = $p_user_id;
+ $this->time_stamp = $p_time_stamp;
+ }
+
+ public function getId() {
+ return $this->id;
+ }
+
+ public function getConsumerId() {
+ return $this->consumer_id;
+ }
+
+ public function getUserId() {
+ return $this->user_id;
+ }
+
+ public function gettime_stamp() {
+ return $this->time_stamp;
+ }
+
+ /* TO BE SUBCLASSED
+ static function row_to_new_token ($t_row) {
+ $t_token = new OauthAuthzToken( $t_row['consumer_id'],
$t_row['token_key'], $t_row['token_secret'] );
+ $t_token->id = $t_row['id'];
+ return $t_token;
+ }
+ */
+
+ /**
+ * Loads a particular token from the DB knowing its ID
+ *
+ * @param int $p_id
+ */
+ static function load( $p_id, $token_type ) {
+
+ $DBSTORE = FFDbOAuthDataStore::singleton();
+ $t_row = $DBSTORE->find_token_from_id($token_type, $p_id);
+ if(!$t_row) {
+ exit_error( "Error trying to load token!",
'oauthprovider' );
+ }
+ return $t_row;
+ }
+
+ /**
+ * @param int $user_id
+ * @return Ambigous <multitype:, unknown>
+ */
+ static function load_all($user_id=null, $token_type) {
+ $DBSTORE = FFDbOAuthDataStore::singleton();
+ $t_rows = $DBSTORE->find_all_tokens($token_type, $user_id);
+ return $t_rows;
+ }
+
+ /**
+ * Loads a token by its token key
+ *
+ * @param string $p_token_key
+ * @return OauthAuthzToken subclass
+ */
+ static function load_by_key( $p_token_key, $token_type ) {
+
+ $DBSTORE = FFDbOAuthDataStore::singleton();
+ $t_row = $DBSTORE->find_token_from_key($token_type,
$p_token_key);
+ if(!$t_row) {
+ exit_error( "Error trying to load ".$token_type."
token!", 'oauthprovider' );
+ }
+ return $t_row;
+ }
+
+ /**
+ * Check that mandatory values are OK
+ */
+ function check_mandatory() {
+ if ( strlen(trim( $this->consumer_id ))==0 || strlen(trim(
$this->key ))==0 || strlen(trim( $this->secret ))==0 ) {
+ throw new OAuthException('Mandatory "consumer_id",
"key" or "secret" Token attribute(s) not set.');
+ }
+ }
+
+ /**
+ * @param int $p_id
+ */
+ function delete($token_type) {
+ $DBSTORE = FFDbOAuthDataStore::singleton();
+ $DBSTORE->delete_token( $token_type, $this->id);
+ }
+}
diff --git a/src/plugins/oauthprovider/www/checks.php
b/src/plugins/oauthprovider/www/checks.php
index 724af41..20c9c59 100644
--- a/src/plugins/oauthprovider/www/checks.php
+++ b/src/plugins/oauthprovider/www/checks.php
@@ -129,11 +129,12 @@ function oauthprovider_CheckAdmin() {
exit_error("Invalid User, Cannot Process your request for this
user.", 'oauthprovider');
}
- if($name) {
+ if ($name) {
$group = group_get_object_by_name($name);
$id = $group->getID();
+ } else if ($id) {
+ $group = group_get_object($id);
}
- else if($id) $group = group_get_object($id);
if ( !$group) {
exit_error("Invalid Project", $pluginname);
@@ -151,16 +152,14 @@ function oauthprovider_CheckAdmin() {
if ($userperm->isAdmin() || forge_check_global_perm ('forge_admin')) {
if($userperm->isAdmin()) {
oauthprovider_Project_Header(array('group'=>$id,
'title'=>_('OAuth Provider'),
'pagename'=>"$pluginname",'sectionvals'=>array(group_getname($id))));
- }else {
+ } else {
oauthprovider_Admin_Header();
}
return 0;
- }
- else if(! forge_check_global_perm ('forge_admin')) {
+ } else if (! forge_check_global_perm ('forge_admin')) {
//exit_error("Access Denied, You are not a forge Admin",
'oauthprovider');
return 1;
- }
- else {
+ } else {
//exit_error("Access Denied, You are not a project Admin",
'oauthprovider');
return 2;
}
@@ -170,23 +169,21 @@ function oauthprovider_CheckAdmin() {
* exits with error if user is ot a forge or project admin
*/
function oauthprovider_CheckAdminExit() {
- switch(oauthprovider_CheckAdmin()) {
+ switch(oauthprovider_CheckAdmin()) {
case 1: exit_error("Access Denied, You are not a forge Admin",
'oauthprovider');
break;
case 2: exit_error("Access Denied, You are not a project
Admin", 'oauthprovider');
break;
- };
+ }
}
/*
* checks whether the user is a forge admin
*/
function oauthprovider_CheckForgeAdmin() {
-
- if(! forge_check_global_perm ('forge_admin')) {
+ if (! forge_check_global_perm ('forge_admin')) {
return false;
}
-
oauthprovider_Admin_Header();
return true;
}
@@ -195,11 +192,8 @@ function oauthprovider_CheckForgeAdmin() {
* checks whether the user is a forge admin and exits
*/
function oauthprovider_CheckForgeAdminExit() {
-
if(! forge_check_global_perm ('forge_admin')) {
exit_error("Access Denied, You are not a forge Admin",
'oauthprovider');
}
-
oauthprovider_Admin_Header();
-
}
diff --git a/src/plugins/scmgit/common/GitPlugin.class.php
b/src/plugins/scmgit/common/GitPlugin.class.php
index 3940e40..bb5e064 100644
--- a/src/plugins/scmgit/common/GitPlugin.class.php
+++ b/src/plugins/scmgit/common/GitPlugin.class.php
@@ -111,7 +111,7 @@ control over it to the project's administrator.");
$htmlRepo = '';
foreach ($clone_commands as $cmd) {
- $htmlRepo .= html_e('kbd', array(), $cmd).html_e('br');;
+ $htmlRepo .= html_e('kbd', array(), $cmd).html_e('br');
}
$b .= html_e('p', array(), $htmlRepo);
diff --git a/src/plugins/taskboard/common/TaskBoard.class.php
b/src/plugins/taskboard/common/TaskBoard.class.php
index a2c99b1..eaf9ecc 100644
--- a/src/plugins/taskboard/common/TaskBoard.class.php
+++ b/src/plugins/taskboard/common/TaskBoard.class.php
@@ -640,7 +640,7 @@ class TaskBoard extends FFError {
foreach($tasks_trackers as $tasks_tracker_data)
{
$tasks =
$this->TrackersAdapter->getTasks($tasks_tracker_data['group_artifact_id'],
$assigned_to, NULL, $story->getID());
foreach($tasks as $task) {
-
$stories[$story->getID()]['tasks'][] = $this->getMappedTask($task);;
+
$stories[$story->getID()]['tasks'][] = $this->getMappedTask($task);
}
}
}
diff --git a/src/www/pm/msproject/xmlparser.php
b/src/www/pm/msproject/xmlparser.php
index 1691311..8ab24ab 100644
--- a/src/www/pm/msproject/xmlparser.php
+++ b/src/www/pm/msproject/xmlparser.php
@@ -96,18 +96,18 @@ $task_count = 0;
$tasks = false;
$fdependenton = false;
-function startElement($parser, $name, $attrib){
- global $principal_tag;
- global $subproject_id;
- global $tasks;
- global $fdependenton;
- global $result;
- global $tag_aux;
- global $iddependenton;
- global $projectiddependenton;
- global $linktypedependenton;
+function startElement($parser, $name, $attrib) {
+ global $principal_tag;
+ global $subproject_id;
+ global $tasks;
+ global $fdependenton;
+ global $result;
+ global $tag_aux;
+ global $iddependenton;
+ global $projectiddependenton;
+ global $linktypedependenton;
- $tag_aux = $name;
+ $tag_aux = $name;
if ($tasks == true){
//ID TASK
if ($name == "TASK") {
@@ -129,9 +129,9 @@ function startElement($parser, $name, $attrib){
return;
}
- switch ($name){
- case $name=="REQUEST" : {
- switch ($attrib["HANDLE"]){
+ switch ($name) {
+ case $name=="REQUEST" : {
+ switch ($attrib["HANDLE"]){
case $attrib["HANDLE"] == "GetSubprojects": {
$principal_tag = $attrib["HANDLE"];
$result[$name] = $principal_tag;
@@ -140,7 +140,7 @@ function startElement($parser, $name, $attrib){
case $attrib["HANDLE"] == "upload": {
$principal_tag = $attrib["HANDLE"];
$result[$name] = $principal_tag;
- $result["ACTION"] = $attrib["ACTION"];;
+ $result["ACTION"] = $attrib["ACTION"];
break;
}
case $attrib["HANDLE"] == "download": {
@@ -161,16 +161,16 @@ function startElement($parser, $name, $attrib){
break;
}
}
- break;
- }
+ break;
+ }
case $name=="SUBPROJECT" : {
$subproject_id = $attrib["ID"];
break;
}
- case $name=="TASKS" : {
- $tasks = true;
+ case $name=="TASKS" : {
+ $tasks = true;
break;
}
}
diff --git a/src/www/project/report/index.php b/src/www/project/report/index.php
index 04b005d..8db9648 100644
--- a/src/www/project/report/index.php
+++ b/src/www/project/report/index.php
@@ -179,7 +179,7 @@ foreach ($group->getUsers() as $member) {
if (db_numrows($messages)) {
$cells[][] = GetTime(time() -
db_result($messages, 0, 'adddate'));
} else {
- $cells[][] = GetTime(time() -
$artifact->getOpenDate());;
+ $cells[][] = GetTime(time() -
$artifact->getOpenDate());
}
echo $HTML->multiTableRow(array('class' =>
'priority'.$artifact->getPriority()), $cells);
}
diff --git a/src/www/reporting/sitetimebar.php
b/src/www/reporting/sitetimebar.php
index f6afe91..b4b5098 100644
--- a/src/www/reporting/sitetimebar.php
+++ b/src/www/reporting/sitetimebar.php
@@ -40,16 +40,18 @@ $typ = getStringFromRequest('typ');
$start = getIntFromRequest('start');
$end = getIntFromRequest('end');
-if (!$start || !$end) $z =& $report->getMonthStartArr();
-
+if (!$start || !$end) {
+ $z =& $report->getMonthStartArr();
+}
if (!$start) {
$start = $z[0];
}
if (!$end) {
$end = $z[count($z)-1];
}
-if ($end < $start) list($start, $end) = array($end, $start);
-
+if ($end < $start) {
+ list($start, $end) = array($end, $start);
+}
if ($typ != 'r' && $start == $end) {
$error_msg .= _('Start and end dates must be different');
}
@@ -75,7 +77,7 @@ echo $HTML->closeForm();
if ($typ=='r') {
if (!$start) {
- $start=mktime(0,0,0,date('m'),1,date('Y'));;
+ $start=mktime(0,0,0,date('m'),1,date('Y'));
}
if (!$end) {
$end=time();
@@ -110,8 +112,3 @@ if ($typ=='r') {
}
report_footer();
-
-// Local Variables:
-// mode: php
-// c-file-style: "bsd"
-// End:
diff --git a/src/www/survey/survey_resp.php b/src/www/survey/survey_resp.php
index b3ad27d..ff19b8f 100644
--- a/src/www/survey/survey_resp.php
+++ b/src/www/survey/survey_resp.php
@@ -85,7 +85,7 @@ for ($i=0; $i<$count; $i++) {
/* Insert each form value into the responses table */
$val="_" . $quest_array[$i];
- $response = getStringFromRequest($val);;
+ $response = getStringFromRequest($val);
$sr->create(user_getid(), $survey_id, $quest_array[$i], $response);
if ($sr->isError()) {
-----------------------------------------------------------------------
Summary of changes:
src/common/include/MonitorElement.class.php | 2 +-
src/common/include/extras-debug.php | 2 +-
src/common/include/utils.php | 2 +-
src/common/reporting/ReportDownloads.class.php | 2 +-
src/common/reporting/ReportGroupAdded.class.php | 2 +-
src/common/reporting/ReportGroupCum.class.php | 2 +-
src/common/reporting/ReportProjectAct.class.php | 2 +-
src/common/reporting/ReportProjectTime.class.php | 2 +-
src/common/reporting/ReportSiteAct.class.php | 2 +-
src/common/reporting/ReportSiteTime.class.php | 2 +-
src/common/reporting/ReportUserAct.class.php | 2 +-
src/common/reporting/ReportUserAdded.class.php | 2 +-
src/common/reporting/ReportUserCum.class.php | 2 +-
src/common/reporting/ReportUserTime.class.php | 2 +-
src/common/tracker/actions/query.php | 2 +-
src/common/tracker/views/form-editformula.php | 2 +-
.../tracker/views/form-updateextrafieldelement.php | 2 +-
src/common/widget/Widget_MyArtifacts.class.php | 2 +-
src/plugins/mediawiki/bin/mw-wrapper.php | 6 +-
src/plugins/mediawiki/www/plugin_admin.php | 2 +-
.../oauthprovider/include/access_token_api.php | 203 +++++++++---------
src/plugins/oauthprovider/include/consumer_api.php | 111 +++++-----
.../oauthprovider/include/request_token_api.php | 204 +++++++++----------
src/plugins/oauthprovider/include/token_api.php | 226 ++++++++++-----------
src/plugins/oauthprovider/www/checks.php | 24 +--
src/plugins/scmgit/common/GitPlugin.class.php | 2 +-
src/plugins/taskboard/common/TaskBoard.class.php | 2 +-
src/www/pm/msproject/xmlparser.php | 38 ++--
src/www/project/report/index.php | 2 +-
src/www/reporting/sitetimebar.php | 17 +-
src/www/survey/survey_resp.php | 2 +-
31 files changed, 415 insertions(+), 460 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
Fusionforge-commits@lists.fusionforge.org
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
