From: Roland Mas
Date: Fri, 14 Oct 2011 16:06:56 +0000 (+0000)
Subject: Removed leftover files coming from MediaWiki plugin
X-Git-Tag: v5_2_rc1~615
X-Git-Url: https://scm.fusionforge.org/anonscm/gitweb?p=fusionforge%2Ffusionforge.git;a=commitdiff_plain;h=1be4d2ba66b471a83e07c8a31b2b366f9577fc88
Removed leftover files coming from MediaWiki plugin
---
diff --git a/.gitattributes b/.gitattributes
index 778b2ede34..996208415f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2106,9 +2106,7 @@ src/plugins/moinmoin/packaging/dirs/plugin-moinmoin -text
src/plugins/moinmoin/packaging/install/plugin-moinmoin -text
src/plugins/moinmoin/packaging/links/plugin-moinmoin -text
src/plugins/moinmoin/wsgi/moin.wsgi -text
-src/plugins/moinmoin/www/LocalSettings.php -text
src/plugins/moinmoin/www/frame.php -text
-src/plugins/moinmoin/www/plugin_admin.php -text
src/plugins/oauthconsumer/NAME -text
src/plugins/oauthconsumer/README -text
src/plugins/oauthconsumer/common/oauthconsumer-init.php -text
diff --git a/src/plugins/moinmoin/www/LocalSettings.php b/src/plugins/moinmoin/www/LocalSettings.php
deleted file mode 100644
index 2af2dd8610..0000000000
--- a/src/plugins/moinmoin/www/LocalSettings.php
+++ /dev/null
@@ -1,365 +0,0 @@
-= 4) {
- if (($exppath[0] == 'plugins') &&
- ($exppath[1] == 'mediawiki') &&
- ($exppath[2] == 'wiki') &&
- (($exppath[4] == 'index.php') || ($exppath[4] == 'api.php'))
- ) {
- $fusionforgeproject = $exppath[3] ;
- break ;
- } else {
- array_shift ($exppath) ;
- }
-}
-
-$gconfig_dir = forge_get_config('mwdata_path', 'mediawiki');
-$project_dir = forge_get_config('projects_path', 'mediawiki') . "/"
- . $fusionforgeproject ;
-
-if (!is_dir($project_dir)) {
- exit_error (sprintf(_('Mediawiki for project %s not created yet, please wait for a few minutes.'), $fusionforgeproject)) ;
-}
-
-
-$path = array( $IP, "$IP/includes", "$IP/languages" );
-set_include_path( implode( PATH_SEPARATOR, $path ) . PATH_SEPARATOR . get_include_path() );
-
-require_once( "$IP/includes/DefaultSettings.php" );
-
-if ( $wgCommandLineMode ) {
- if ( isset( $_SERVER ) && array_key_exists( 'REQUEST_METHOD', $_SERVER ) ) {
- die( "This script must be run from the command line\n" );
- }
-}
-$g = group_get_object_by_name($fusionforgeproject) ;
-$wgSitename = $g->getPublicName() . " Wiki";
-$wgScriptPath = "/plugins/mediawiki/wiki/$fusionforgeproject" ;
-
-$wgEmergencyContact = forge_get_config('admin_email');
-$wgPasswordSender = forge_get_config('admin_email');
-
-$wgDBtype = "postgres";
-$wgDBserver = forge_get_config('database_host') ;
-$wgDBname = forge_get_config('database_name');
-$wgDBuser = forge_get_config('database_user') ;
-$wgDBpassword = forge_get_config('database_password') ;
-$wgDBadminuser = forge_get_config('database_user') ;
-$wgDBadminpassword = forge_get_config('database_password') ;
-$wgDBport = forge_get_config('database_port') ;
-$wgDBmwschema = str_replace ('-', '_', "plugin_mediawiki_$fusionforgeproject") ;
-$wgDBts2schema = str_replace ('-', '_', "plugin_mediawiki_$fusionforgeproject") ;
-$wgMainCacheType = CACHE_NONE;
-$wgMemCachedServers = array();
-
-$wgEnableUploads = forge_get_config('enable_uploads', 'mediawiki');
-$wgUploadDirectory = "$project_dir/images";
-$wgUseImageMagick = true;
-$wgImageMagickConvertCommand = "/usr/bin/convert";
-$wgLocalInterwiki = $wgSitename;
-$wgShowExceptionDetails = true ;
-
-$wgLanguageCode = strtolower(forge_get_config('default_country_code'));
-
-$wgDefaultSkin = 'fusionforge';
-
-$GLOBALS['sys_dbhost'] = forge_get_config('database_host') ;
-$GLOBALS['sys_dbport'] = forge_get_config('database_port') ;
-$GLOBALS['sys_dbname'] = forge_get_config('database_name') ;
-$GLOBALS['sys_dbuser'] = forge_get_config('database_user') ;
-$GLOBALS['sys_dbpasswd'] = forge_get_config('database_password') ;
-$GLOBALS['sys_plugins_path'] = forge_get_config('plugins_path') ;
-$GLOBALS['sys_urlprefix'] = forge_get_config('url_prefix') ;
-$GLOBALS['sys_use_ssl'] = forge_get_config('use_ssl') ;
-$GLOBALS['sys_default_domain'] = forge_get_config('web_host') ;
-$GLOBALS['sys_custom_path'] = forge_get_config('custom_path') ;
-$GLOBALS['gfwww'] = $gfwww ;
-$GLOBALS['gfplugins'] = $gfplugins ;
-$GLOBALS['sys_lang'] = forge_get_config('default_language') ;
-$GLOBALS['sys_urlroot'] = forge_get_config('url_root');
-$GLOBALS['sys_session_key'] = forge_get_config('session_key');
-$GLOBALS['sys_session_expire'] = forge_get_config('session_expire');
-$GLOBALS['REMOTE_ADDR'] = getStringFromServer('REMOTE_ADDR') ;
-$GLOBALS['HTTP_USER_AGENT'] = getStringFromServer('HTTP_USER_AGENT') ;
-
-function FusionForgeRoleToMediawikiGroupName ($role, $project) {
- if ($role instanceof RoleAnonymous) {
- return '*';
- } elseif ($role instanceof RoleLoggedIn) {
- return 'user';
- } elseif ($role->getHomeProject() == NULL) {
- return sprintf ('ForgeRole:%s [global]',
- $role->getName ()) ;
- } elseif ($role->getHomeProject()->getID() != $project->getID()) {
- return sprintf ('ForgeRole:%s [project %s]',
- $role->getName (),
- $role->getHomeProject()->getUnixName()) ;
- } else {
- return sprintf ('ForgeRole:%s',
- $role->getName ()) ;
- }
-}
-
-function FusionForgeMWAuth( $user, &$result ) {
- global $fusionforgeproject, $wgGroupPermissions ;
-
- $cookie = getStringFromCookie ('session_ser') ;
- if ($cookie != '') {
- $s = session_check_session_cookie ($cookie);
- } else {
- $s = false ;
- }
- if ($s) {
- $u = user_get_object ($s);
- $g = group_get_object_by_name ($fusionforgeproject) ;
-
- $mwname = ucfirst($u->getUnixName ()) ;
- $mwu = User::newFromName ($mwname);
- if($mwu->getID() == 0) {
- $mwu->addToDatabase ();
- $mwu->setPassword (User::randomPassword());
- $mwu->setRealName ($u->getRealName ()) ;
- $mwu->setToken ();
- $mwu->loadFromDatabase ();
- }
- $user->mId=$mwu->getID();
- $user->loadFromId() ;
-
- $user->loadGroups() ;
- $current_groups = $user->getGroups() ;
-
- if (USE_PFO_RBAC) {
- $available_roles = RBACEngine::getInstance()->getAvailableRoles() ;
- $rs = array () ;
- foreach ($available_roles as $r) {
- $linked_projects = $r->getLinkedProjects () ;
-
- foreach ($linked_projects as $lp) {
- if ($lp->getID() == $g->getID()) {
- $rs[] = $r ;
- }
- }
- }
- } else {
- $perm =& $g->getPermission ();
- $r = $u->getRole($g) ;
- if (isset ($r) && $r && !$r->isError()) {
- $rs = array ($r) ;
- }
- }
-
- // Sync MW groups for current user with FF roles
- $rnames = array () ;
- foreach ($rs as $r) {
- $rnames[] = FusionForgeRoleToMediawikiGroupName ($r, $g) ;
- }
- $role_groups = preg_grep ("/^ForgeRole:/", $current_groups) ;
-
- foreach ($rnames as $rname) {
- if (!in_array ($rname, $current_groups)) {
- $user->addGroup ($rname) ;
- }
- }
- foreach ($role_groups as $cg) {
- if (!in_array ($cg, $rnames)) {
- $user->removeGroup ($cg) ;
- }
- }
-
- $user->setCookies ();
- $user->saveSettings ();
- wfSetupSession ();
- } else {
- $user->logout ();
- }
-
- $result = true;
- return true ;
-}
-
-function SetupPermissionsFromRoles () {
- global $fusionforgeproject, $wgGroupPermissions ;
-
- $g = group_get_object_by_name ($fusionforgeproject) ;
- // Setup rights for all roles referenced by project
- $rs = $g->getRoles() ;
- foreach ($rs as $r) {
- $gr = FusionForgeRoleToMediawikiGroupName ($r, $g) ;
-
- // Read access
- $wgGroupPermissions[$gr]['read'] = $r->hasPermission ('plugin_mediawiki_read', $g->getID()) ;
-
- // Day-to-day edit privileges
- $wgGroupPermissions[$gr]['edit'] = $r->hasPermission ('plugin_mediawiki_edit', $g->getID(), 'editexisting') ;
- $wgGroupPermissions[$gr]['writeapi'] = $r->hasPermission ('plugin_mediawiki_edit', $g->getID(), 'editexisting') ;
- $wgGroupPermissions[$gr]['createpage'] = $r->hasPermission ('plugin_mediawiki_edit', $g->getID(), 'editnew') ;
- $wgGroupPermissions[$gr]['createtalk'] = $r->hasPermission ('plugin_mediawiki_edit', $g->getID(), 'editnew') ;
- $wgGroupPermissions[$gr]['minoredit'] = $r->hasPermission ('plugin_mediawiki_edit', $g->getID(), 'editnew') ;
- $wgGroupPermissions[$gr]['move'] = $r->hasPermission ('plugin_mediawiki_edit', $g->getID(), 'editmove') ;
- $wgGroupPermissions[$gr]['move-subpages'] = $r->hasPermission ('plugin_mediawiki_edit', $g->getID(), 'editmove') ;
- $wgGroupPermissions[$gr]['move-rootuserpages'] = $r->hasPermission ('plugin_mediawiki_edit', $g->getID(), 'editmove') ;
- $wgGroupPermissions[$gr]['delete'] = $r->hasPermission ('plugin_mediawiki_edit', $g->getID(), 'editmove') ;
- $wgGroupPermissions[$gr]['undelete'] = $r->hasPermission ('plugin_mediawiki_edit', $g->getID(), 'editmove') ;
-
- // File upload privileges
- $wgGroupPermissions[$gr]['upload'] = $r->hasPermission ('plugin_mediawiki_upload', $g->getID(), 'upload') ;
- $wgGroupPermissions[$gr]['reupload-own'] = $r->hasPermission ('plugin_mediawiki_upload', $g->getID(), 'upload') ;
- $wgGroupPermissions[$gr]['reupload'] = $r->hasPermission ('plugin_mediawiki_upload', $g->getID(), 'reupload') ;
- $wgGroupPermissions[$gr]['reupload-shared'] = $r->hasPermission ('plugin_mediawiki_upload', $g->getID(), 'reupload') ;
- $wgGroupPermissions[$gr]['upload_by_url'] = $r->hasPermission ('plugin_mediawiki_upload', $g->getID(), 'reupload') ;
-
- // Administrative tasks
- $wgGroupPermissions[$gr]['editinterface'] = $r->hasPermission ('plugin_mediawiki_admin', $g->getID()) ;
- $wgGroupPermissions[$gr]['import'] = $r->hasPermission ('plugin_mediawiki_admin', $g->getID()) ;
- $wgGroupPermissions[$gr]['importupload'] = $r->hasPermission ('plugin_mediawiki_admin', $g->getID()) ;
- $wgGroupPermissions[$gr]['siteadmin'] = $r->hasPermission ('plugin_mediawiki_admin', $g->getID()) ;
- }
-
- $rs = RBACEngine::getInstance()->getGlobalRoles();
- foreach ($rs as $r) {
- $gr = FusionForgeRoleToMediawikiGroupName ($r, $g) ;
-
- // Interwiki management restricted to forge admins
- $wgGroupPermissions[$gr]['interwiki'] = $r->hasGlobalPermission ('forge_admin') ;
- }
-}
-
-function NoLinkOnMainPage(&$personal_urls){
- unset($personal_urls['anonlogin']);
- unset($personal_urls['anontalk']);
- unset($personal_urls['logout']);
- unset($personal_urls['login']);
- return true;
-}
-$wgHooks['PersonalUrls'][]='NoLinkOnMainPage';
-
-if (isset($_SERVER['SERVER_SOFTWARE'])) {
- class SpecialForgeRedir extends SpecialPage {
- var $dstappendself = false;
-
- function getTitle($subpage="") {
- return 'SpecialForgeRedir';
- }
-
- function getRedirect($subpage="") {
- return $this;
- }
-
- function getRedirectQuery() {
- return $this;
- }
-
- function getFullUrl() {
- $u = $this->dst;
- if ($this->dstappendself) {
- $u .= urlencode(getStringFromServer('REQUEST_URI'));
- }
- return util_make_url($u);
- }
- }
-
- class SpecialForgeRedirLogin extends SpecialForgeRedir {
- var $dstappendself = true;
- var $dst = '/account/login.php?return_to=';
- }
-
- class SpecialForgeRedirCreateAccount extends SpecialForgeRedir {
- var $dst = '/account/register.php';
- }
-
- class SpecialForgeRedirResetPass extends SpecialForgeRedir {
- var $dst = '/account/lostpw.php';
- }
-
- class SpecialForgeRedirLogout extends SpecialForgeRedir {
- var $dstappendself = true;
- var $dst = '/account/logout.php?return_to=';
- }
-
- function DisableLogInOut(&$mList) {
- $mList['Userlogin'] = 'SpecialForgeRedirLogin';
- $mList['CreateAccount'] = 'SpecialForgeRedirCreateAccount';
- $mList['Resetpass'] = 'SpecialForgeRedirResetPass';
- $mList['Userlogout'] = 'SpecialForgeRedirLogout';
- return true;
- }
- $GLOBALS['wgHooks']['SpecialPage_initList'][] = 'DisableLogInOut';
-}
-
-$GLOBALS['wgHooks']['UserLoadFromSession'][]='FusionForgeMWAuth';
-
-$zeroperms = array ('read', 'writeapi', 'edit', 'move-subpages', 'move-rootuserpages', 'reupload-shared', 'createaccount');
-
-foreach ($zeroperms as $i) {
- $wgGroupPermissions['user'][$i] = false;
- $wgGroupPermissions['*'][$i] = false;
-}
-
-SetupPermissionsFromRoles();
-
-$wgFavicon = '/images/icon.png' ;
-$wgBreakFrames = false ;
-ini_set ('memory_limit', '50M') ;
-
-// LOAD THE SITE-WIDE AND PROJECT-SPECIFIC EXTRA-SETTINGS
-if (is_file(forge_get_config('config_path')."/plugins/mediawiki/LocalSettings.php")) {
- include(forge_get_config('config_path')."/plugins/mediawiki/LocalSettings.php");
-}
-
-// debian style system-wide mediawiki extensions
-if (is_file("/etc/mediawiki-extensions/extensions.php")) {
- include( "/etc/mediawiki-extensions/extensions.php" );
-}
-
-if (file_exists("$wgUploadDirectory/.wgLogo.png")) {
- $wgLogo = "$wgScriptPath/images/.wgLogo.png";
-}
-
-// forge global settings
-if (is_file("$gconfig_dir/ForgeSettings.php")) {
- include ("$gconfig_dir/ForgeSettings.php") ;
-}
-// project specific settings
-if (is_file("$project_dir/ProjectSettings.php")) {
- include ("$project_dir/ProjectSettings.php") ;
-}
-
-// Local Variables:
-// mode: php
-// c-file-style: "bsd"
-// End:
diff --git a/src/plugins/moinmoin/www/plugin_admin.php b/src/plugins/moinmoin/www/plugin_admin.php
deleted file mode 100644
index 1abbb6cb99..0000000000
--- a/src/plugins/moinmoin/www/plugin_admin.php
+++ /dev/null
@@ -1,188 +0,0 @@
-
- * All rights reserved.
- *
- * This file is 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 Licence, 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 FusionForge; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *-
- * Admin page for the plugin
- */
-
-require_once('../../env.inc.php');
-require_once $gfcommon.'include/pre.php';
-
-function logo_create($file_location, $wgUploadDirectory) {
- $logofile = $wgUploadDirectory . "/.wgLogo.png";
-
- if (!is_file($file_location) || !file_exists($file_location))
- return _("Invalid file upload");
-
- $img = getimagesize($file_location);
- if (!$img || ($img[2] != IMAGETYPE_PNG))
- return _("Not a valid PNG image");
- if ($img[0] != 135 || $img[1] != 135)
- return sprintf(_("Image size is %dx%d pixels, expected %dx%d instead"),
- $img[0], $img[1], 135, 135);
-
- if (!is_writable($wgUploadDirectory))
- return _("Cannot copy file to target directory");
-
- if (file_exists($logofile) && !is_writable($logofile))
- return _("Cannot overwrite existing file");
-
- $cmd = "/bin/mv " . escapeshellcmd($file_location) .
- " " . escapeshellcmd($logofile);
- exec($cmd,$out);
- if (!file_exists($logofile))
- return _("Cannot move file to target location");
-
- return _("New file installed successfully");
-}
-
-$user = session_get_user();
-if (!$user || !is_object($user) || $user->isError() || !$user->isActive())
- exit_error("Invalid User", "Cannot process your request for this user.");
-
-$gid = getIntFromRequest("group_id", -1);
-if ($gid == -1)
- $group = false;
-else
- $group = group_get_object($gid);
-if (!$group)
- exit_error("Invalid Project", "Nonexistent Project");
-if (!$group->usesPlugin("mediawiki"))
- exit_error("Invalid Project", "Project does not use MediaWiki Plugin");
-
-$userperm = $group->getPermission($user);
-if (!$userperm->IsMember())
- exit_error("Access Denied", "You are not a member of this project");
-if (!$userperm->IsAdmin())
- exit_error("Access Denied", "You are not an admin of this project");
-
-$group_unix_name = $group->getUnixName();
-$wgUploadDirectory = "/var/lib/gforge/plugins/mediawiki/wikidata/" .
- $group_unix_name . "/images";
-$group_logo = $wgUploadDirectory . "/.wgLogo.png";
-$group_logo_url = util_make_url("/plugins/mediawiki/wiki/" .
- $group_unix_name . "/images/.wgLogo.png");
-
-if (getStringFromRequest("logo_submit")) {
- $userfile = getUploadedFile('userfile');
- $userfile_name = $userfile['name'];
- $manual_filename = getStringFromRequest('manual_filename');
-
- $feedback = "";
-
- if (getIntFromRequest("logo_nuke") == 1) {
- if (unlink($wgUploadDirectory . "/.wgLogo.png"))
- $feedback = _("File successfully removed");
- else
- $feedback = _("File removal error");
- } else if ($userfile && is_uploaded_file($userfile['tmp_name']) &&
- util_is_valid_filename($userfile['name'])) {
- $infile = $userfile['tmp_name'];
- $fname = $userfile['name'];
- $move = true;
- } else if ($userfile && $userfile['error'] != UPLOAD_ERR_OK &&
- $userfile['error'] != UPLOAD_ERR_NO_FILE) {
- switch ($userfile['error']) {
- case UPLOAD_ERR_INI_SIZE:
- case UPLOAD_ERR_FORM_SIZE:
- $feedback = _('The uploaded file exceeds the maximum file size. Contact to the site admin to upload this big file, or use an alternate upload method (if available).');
- break;
- case UPLOAD_ERR_PARTIAL:
- $feedback = _('The uploaded file was only partially uploaded.');
- break;
- default:
- $feedback = _('Unknown file upload error.');
- break;
- }
- } else if (forge_get_config ('use_manual_uploads') && $manual_filename &&
- util_is_valid_filename($manual_filename) &&
- is_file($incoming.'/'.$manual_filename)) {
- $incoming = forge_get_config('groupdir_prefix')."/$group_unix_name/incoming";
- $infile = $incoming.'/'.$manual_filename;
- $fname = $manual_filename;
- $move = false;
- } else {
- $feedback = _('Unknown file upload error.');
- }
-
- if (!$feedback) {
- if (!$move) {
- $tmp = tempnam('', '');
- copy($infile, $tmp);
- $infile = $tmp;
- }
- $feedback = logo_create($infile, $wgUploadDirectory);
- }
-}
-
-site_project_header(array(
- "title" => "MediaWiki Plugin Admin",
- "pagename" => "MediaWiki Project Admin",
- "sectionvals" => array($group->getPublicName()),
- "toptab" => "admin",
- "group" => $gid,
- ));
-
-echo "MediaWiki Plugin Admin for ".$group->getPublicName()."
\n\n";
-
-echo "\$wgLogo
\n";
-echo '';
-if (file_exists($group_logo)) {
- echo "\n
" . _("Current logo:") . ' (' . _("Download") . ')
' .
- "
\n";
-} else {
- echo "\n
" . _("No per-project logo currently installed.") . "
\n";
-}
-echo "
\n\n";
-
-?>
-
-
-
-" />
-
-
-