Menu
▾
▴
phpwiki-checkins
|
From: <var...@us...> - 2010-09-02 20:07:37
|
Revision: 7671
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7671&view=rev
Author: vargenau
Date: 2010-09-02 20:07:31 +0000 (Thu, 02 Sep 2010)
Log Message:
-----------
Use session_require_perm and session_require_global_perm
Modified Paths:
--------------
trunk/themes/fusionforge/themeinfo.php
Modified: trunk/themes/fusionforge/themeinfo.php
===================================================================
--- trunk/themes/fusionforge/themeinfo.php 2010-09-02 19:46:20 UTC (rev 7670)
+++ trunk/themes/fusionforge/themeinfo.php 2010-09-02 20:07:31 UTC (rev 7671)
@@ -23,13 +23,13 @@
//group is private
if (!$project->isPublic()) {
//if it's a private group, you must be a member of that group
- session_require(array('group'=>$group_id));
+ session_require_perm ('project_read', $group_id);
}
//for dead projects must be member of admin project
if (!$project->isActive()) {
//only SF group can view non-active, non-holding groups
- session_require(array('group'=>'1'));
+ session_require_global_perm ('forge_admin');
}
$HTML->header(array('title'=> $group_public_name.': '.htmlspecialchars($pagename),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2010-12-04 11:49:25
|
Revision: 7751
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7751&view=rev
Author: vargenau
Date: 2010-12-04 11:49:18 +0000 (Sat, 04 Dec 2010)
Log Message:
-----------
Whitespace only
Modified Paths:
--------------
trunk/themes/fusionforge/themeinfo.php
Modified: trunk/themes/fusionforge/themeinfo.php
===================================================================
--- trunk/themes/fusionforge/themeinfo.php 2010-12-04 11:40:09 UTC (rev 7750)
+++ trunk/themes/fusionforge/themeinfo.php 2010-12-04 11:49:18 UTC (rev 7751)
@@ -6,7 +6,7 @@
exit;
}
-// rcs_id('$Id$');
+// $Id$;
require_once('lib/WikiTheme.php');
require_once('themes/wikilens/themeinfo.php');
@@ -42,19 +42,19 @@
// Display a warning banner for internal users when the wiki is opened
// to external users.
if (method_exists($project, 'getIsExternal') && $project->getIsExternal()) {
- $external_user = false;
- if (session_loggedin()) {
- $user = session_get_user();
- $external_user = $user->getIsExternal();
- }
- if (!$external_user) {
- $page = $request->getPage();
- if ($page->get('external')) {
- $external_msg = _("This page is external.");
- }
- echo $HTML->warning_msg(_("This project is shared with third-party users (non Alcatel-Lucent users).") .
- (isset($external_msg) ? ' ' . $external_msg : ''));
- }
+ $external_user = false;
+ if (session_loggedin()) {
+ $user = session_get_user();
+ $external_user = $user->getIsExternal();
+ }
+ if (!$external_user) {
+ $page = $request->getPage();
+ if ($page->get('external')) {
+ $external_msg = _("This page is external.");
+ }
+ echo $HTML->warning_msg(_("This project is shared with third-party users (non Alcatel-Lucent users).") .
+ (isset($external_msg) ? ' ' . $external_msg : ''));
+ }
}
}
@@ -67,7 +67,7 @@
function initGlobals() {
global $request;
- static $already = 0;
+ static $already = 0;
if (!$already) {
$script_url = deduce_script_name();
$script_url .= '/'. $GLOBALS['group_name'] ;
@@ -78,13 +78,13 @@
$this->addMoreHeaders(JavaScript('', array('src' => $this->_findData("wikilens.js"))));
$js = "var data_path = '". javascript_quote_string(DATA_PATH) ."';\n"
// Temp remove pagename because of XSS warning
- // ."var pagename = '". javascript_quote_string($pagename) ."';\n"
+ // ."var pagename = '". javascript_quote_string($pagename) ."';\n"
."var script_url= '". javascript_quote_string($script_url) ."';\n"
."var stylepath = data_path+'/".javascript_quote_string($this->_theme)."/';\n"
."var folderArrowPath = '".javascript_quote_string($folderArrowPath)."';\n"
."var use_path_info = " . (USE_PATH_INFO ? "true" : "false") .";\n";
$this->addMoreHeaders(JavaScript($js));
- $already = 1;
+ $already = 1;
}
}
function load() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-03-03 10:32:32
|
Revision: 7950
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7950&view=rev
Author: vargenau
Date: 2011-03-03 10:32:23 +0000 (Thu, 03 Mar 2011)
Log Message:
-----------
Switch textdomain
Modified Paths:
--------------
trunk/themes/fusionforge/themeinfo.php
Modified: trunk/themes/fusionforge/themeinfo.php
===================================================================
--- trunk/themes/fusionforge/themeinfo.php 2011-03-03 09:16:52 UTC (rev 7949)
+++ trunk/themes/fusionforge/themeinfo.php 2011-03-03 10:32:23 UTC (rev 7950)
@@ -20,16 +20,23 @@
$submenu = Template('navbar');
+ $domain = textdomain(NULL);
+ textdomain('fusionforge');
+
//group is private
if (!$project->isPublic()) {
//if it's a private group, you must be a member of that group
- session_require_perm ('project_read', $group_id);
+ if (RBAC) {
+ session_require_perm('project_read', $group_id);
+ } else {
+ session_require(array('group'=>$group_id));
+ }
}
//for dead projects must be member of admin project
if (!$project->isActive()) {
//only SF group can view non-active, non-holding groups
- session_require_global_perm ('forge_admin');
+ session_require_global_perm('forge_admin');
}
$HTML->header(array('title'=> $group_public_name._(": ").htmlspecialchars($pagename),
@@ -56,13 +63,18 @@
(isset($external_msg) ? ' ' . $external_msg : ''));
}
}
+ textdomain($domain);
}
function footer() {
global $HTML;
+ $domain = textdomain(NULL);
+ textdomain('fusionforge');
+
$HTML->footer(array());
+ textdomain($domain);
}
function initGlobals() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-03-23 15:37:54
|
Revision: 8003
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8003&view=rev
Author: vargenau
Date: 2011-03-23 15:37:48 +0000 (Wed, 23 Mar 2011)
Log Message:
-----------
No <h1>
Modified Paths:
--------------
trunk/themes/fusionforge/themeinfo.php
Modified: trunk/themes/fusionforge/themeinfo.php
===================================================================
--- trunk/themes/fusionforge/themeinfo.php 2011-03-17 09:10:25 UTC (rev 8002)
+++ trunk/themes/fusionforge/themeinfo.php 2011-03-23 15:37:48 UTC (rev 8003)
@@ -39,7 +39,8 @@
session_require_global_perm('forge_admin');
}
- $HTML->header(array('title'=> $group_public_name._(": ").htmlspecialchars($pagename),
+ $HTML->header(array('h1' => '',
+ 'title'=> $group_public_name._(": ").htmlspecialchars($pagename),
'group' => $group_id,
'toptab' => 'wiki',
'submenu' => $submenu->asXML()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-04-08 12:52:32
|
Revision: 8023
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8023&view=rev
Author: vargenau
Date: 2011-04-08 12:52:26 +0000 (Fri, 08 Apr 2011)
Log Message:
-----------
Do not hardcode Alcatel-Lucent
Modified Paths:
--------------
trunk/themes/fusionforge/themeinfo.php
Modified: trunk/themes/fusionforge/themeinfo.php
===================================================================
--- trunk/themes/fusionforge/themeinfo.php 2011-04-08 12:38:32 UTC (rev 8022)
+++ trunk/themes/fusionforge/themeinfo.php 2011-04-08 12:52:26 UTC (rev 8023)
@@ -18,7 +18,7 @@
$pagename = $request->getArg('pagename');
- $submenu = Template('navbar');
+ $submenu = Template('navbar')->asXML();
$domain = textdomain(NULL);
textdomain('fusionforge');
@@ -43,7 +43,7 @@
'title'=> $group_public_name._(": ").htmlspecialchars($pagename),
'group' => $group_id,
'toptab' => 'wiki',
- 'submenu' => $submenu->asXML()
+ 'submenu' => $submenu
)
);
@@ -60,7 +60,8 @@
if ($page->get('external')) {
$external_msg = _("This page is external.");
}
- echo $HTML->warning_msg(_("This project is shared with third-party users (non Alcatel-Lucent users).") .
+ echo $HTML->warning_msg(_("This project is shared with third-party users") .
+ sprintf(_(" (non %s users)."), forge_get_config('company')) .
(isset($external_msg) ? ' ' . $external_msg : ''));
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-04-08 15:01:27
|
Revision: 8029
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8029&view=rev
Author: vargenau
Date: 2011-04-08 15:01:21 +0000 (Fri, 08 Apr 2011)
Log Message:
-----------
Add CSS files for wiki dump
Modified Paths:
--------------
trunk/themes/fusionforge/themeinfo.php
Modified: trunk/themes/fusionforge/themeinfo.php
===================================================================
--- trunk/themes/fusionforge/themeinfo.php 2011-04-08 13:57:12 UTC (rev 8028)
+++ trunk/themes/fusionforge/themeinfo.php 2011-04-08 15:01:21 UTC (rev 8029)
@@ -13,6 +13,16 @@
class WikiTheme_fusionforge extends WikiTheme_Wikilens {
+ function getCSS () {
+ $css = array();
+ $css[] = $this->_CSSlink("", "fusionforge.css", "");
+ $css[] = $this->_CSSlink("", "fusionforge-print.css", "print");
+ $css[] = $this->_CSSlink("Fullscreen", "fusionforge-fullscreen.css", "screen", true);
+ $css[] = $this->_CSSlink("Autonumbering", "fusionforge-autonumbering.css", "", true);
+ $css[] = $this->_CSSlink("Rereading Mode", "fusionforge-rereading.css", "", true);
+ return HTML($css);
+ }
+
function header() {
global $HTML, $group_id, $group_public_name, $request, $project;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-04-24 15:10:30
|
Revision: 8057
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8057&view=rev
Author: vargenau
Date: 2011-04-24 15:10:23 +0000 (Sun, 24 Apr 2011)
Log Message:
-----------
Test FUSIONFORGE to avoid nonexistent function warnings
Modified Paths:
--------------
trunk/themes/fusionforge/themeinfo.php
Modified: trunk/themes/fusionforge/themeinfo.php
===================================================================
--- trunk/themes/fusionforge/themeinfo.php 2011-04-17 10:56:17 UTC (rev 8056)
+++ trunk/themes/fusionforge/themeinfo.php 2011-04-24 15:10:23 UTC (rev 8057)
@@ -30,52 +30,55 @@
$submenu = Template('navbar')->asXML();
- $domain = textdomain(NULL);
- textdomain('fusionforge');
+ if (defined('FUSIONFORGE') and FUSIONFORGE) {
- //group is private
- if (!$project->isPublic()) {
- //if it's a private group, you must be a member of that group
- if (RBAC) {
- session_require_perm('project_read', $group_id);
- } else {
- session_require(array('group'=>$group_id));
+ $domain = textdomain(NULL);
+ textdomain('fusionforge');
+
+ //group is private
+ if (!$project->isPublic()) {
+ //if it's a private group, you must be a member of that group
+ if (RBAC) {
+ session_require_perm('project_read', $group_id);
+ } else {
+ session_require(array('group'=>$group_id));
+ }
}
- }
- //for dead projects must be member of admin project
- if (!$project->isActive()) {
- //only SF group can view non-active, non-holding groups
- session_require_global_perm('forge_admin');
- }
+ //for dead projects must be member of admin project
+ if (!$project->isActive()) {
+ //only SF group can view non-active, non-holding groups
+ session_require_global_perm('forge_admin');
+ }
- $HTML->header(array('h1' => '',
- 'title'=> $group_public_name._(": ").htmlspecialchars($pagename),
- 'group' => $group_id,
- 'toptab' => 'wiki',
- 'submenu' => $submenu
- )
- );
+ $HTML->header(array('h1' => '',
+ 'title'=> $group_public_name._(": ").htmlspecialchars($pagename),
+ 'group' => $group_id,
+ 'toptab' => 'wiki',
+ 'submenu' => $submenu
+ )
+ );
- // Display a warning banner for internal users when the wiki is opened
- // to external users.
- if (method_exists($project, 'getIsExternal') && $project->getIsExternal()) {
- $external_user = false;
- if (session_loggedin()) {
- $user = session_get_user();
- $external_user = $user->getIsExternal();
- }
- if (!$external_user) {
- $page = $request->getPage();
- if ($page->get('external')) {
- $external_msg = _("This page is external.");
+ // Display a warning banner for internal users when the wiki is opened
+ // to external users.
+ if (method_exists($project, 'getIsExternal') && $project->getIsExternal()) {
+ $external_user = false;
+ if (session_loggedin()) {
+ $user = session_get_user();
+ $external_user = $user->getIsExternal();
}
- echo $HTML->warning_msg(_("This project is shared with third-party users") .
- sprintf(_(" (non %s users)."), forge_get_config('company')) .
- (isset($external_msg) ? ' ' . $external_msg : ''));
+ if (!$external_user) {
+ $page = $request->getPage();
+ if ($page->get('external')) {
+ $external_msg = _("This page is external.");
+ }
+ echo $HTML->warning_msg(_("This project is shared with third-party users") .
+ sprintf(_(" (non %s users)."), forge_get_config('company')) .
+ (isset($external_msg) ? ' ' . $external_msg : ''));
+ }
}
+ textdomain($domain);
}
- textdomain($domain);
}
function footer() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-05-04 15:42:34
|
Revision: 8067
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8067&view=rev
Author: vargenau
Date: 2011-05-04 15:42:28 +0000 (Wed, 04 May 2011)
Log Message:
-----------
Protect footer with FUSIONFORGE
Modified Paths:
--------------
trunk/themes/fusionforge/themeinfo.php
Modified: trunk/themes/fusionforge/themeinfo.php
===================================================================
--- trunk/themes/fusionforge/themeinfo.php 2011-05-04 10:28:35 UTC (rev 8066)
+++ trunk/themes/fusionforge/themeinfo.php 2011-05-04 15:42:28 UTC (rev 8067)
@@ -82,14 +82,17 @@
}
function footer() {
- global $HTML;
- $domain = textdomain(NULL);
- textdomain('fusionforge');
+ if (defined('FUSIONFORGE') and FUSIONFORGE) {
+ global $HTML;
- $HTML->footer(array());
+ $domain = textdomain(NULL);
+ textdomain('fusionforge');
- textdomain($domain);
+ $HTML->footer(array());
+
+ textdomain($domain);
+ }
}
function initGlobals() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-05-04 15:54:15
|
Revision: 8069
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8069&view=rev
Author: vargenau
Date: 2011-05-04 15:54:09 +0000 (Wed, 04 May 2011)
Log Message:
-----------
warning_msg --> information
Modified Paths:
--------------
trunk/themes/fusionforge/themeinfo.php
Modified: trunk/themes/fusionforge/themeinfo.php
===================================================================
--- trunk/themes/fusionforge/themeinfo.php 2011-05-04 15:48:08 UTC (rev 8068)
+++ trunk/themes/fusionforge/themeinfo.php 2011-05-04 15:54:09 UTC (rev 8069)
@@ -72,7 +72,7 @@
if ($page->get('external')) {
$external_msg = _("This page is external.");
}
- echo $HTML->warning_msg(_("This project is shared with third-party users") .
+ echo $HTML->information(_("This project is shared with third-party users") .
sprintf(_(" (non %s users)."), forge_get_config('company')) .
(isset($external_msg) ? ' ' . $external_msg : ''));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-05-18 16:44:37
|
Revision: 8078
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8078&view=rev
Author: vargenau
Date: 2011-05-18 16:44:31 +0000 (Wed, 18 May 2011)
Log Message:
-----------
Test if defined
Modified Paths:
--------------
trunk/themes/fusionforge/themeinfo.php
Modified: trunk/themes/fusionforge/themeinfo.php
===================================================================
--- trunk/themes/fusionforge/themeinfo.php 2011-05-18 16:24:52 UTC (rev 8077)
+++ trunk/themes/fusionforge/themeinfo.php 2011-05-18 16:44:31 UTC (rev 8078)
@@ -38,7 +38,7 @@
//group is private
if (!$project->isPublic()) {
//if it's a private group, you must be a member of that group
- if (RBAC) {
+ if (defined('RBAC') and RBAC) {
session_require_perm('project_read', $group_id);
} else {
session_require(array('group'=>$group_id));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-05-19 19:27:41
|
Revision: 8081
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8081&view=rev
Author: vargenau
Date: 2011-05-19 19:27:35 +0000 (Thu, 19 May 2011)
Log Message:
-----------
Update from Phpwiki
Modified Paths:
--------------
trunk/themes/fusionforge/themeinfo.php
Modified: trunk/themes/fusionforge/themeinfo.php
===================================================================
--- trunk/themes/fusionforge/themeinfo.php 2011-05-19 19:14:34 UTC (rev 8080)
+++ trunk/themes/fusionforge/themeinfo.php 2011-05-19 19:27:35 UTC (rev 8081)
@@ -38,11 +38,7 @@
//group is private
if (!$project->isPublic()) {
//if it's a private group, you must be a member of that group
- if (defined('RBAC') and RBAC) {
- session_require_perm('project_read', $group_id);
- } else {
- session_require(array('group'=>$group_id));
- }
+ session_require_perm('project_read', $group_id);
}
//for dead projects must be member of admin project
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X