From 257016b2994616aa172f3c67a4af1bf9398bd115 Mon Sep 17 00:00:00 2001
From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Tue, 28 Dec 2010 21:52:36 +0000
Subject: [PATCH] Fixed bug #16840: Remove misc/ directory and deprecate
t3lib_superadmin
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@9959 709f56b5-9817-0410-a4d7-c38de5d9e867
---
ChangeLog | 4 +
misc/advanced.htaccess => _.htaccess | 0
misc/core_svn_rules.txt | 120 ---------------------------
misc/example_MM_relationTables.sql | 26 ------
misc/locallang_XML_dummy.xml | 13 ---
misc/superadmin.php | 99 ----------------------
misc/virtualdir.tgz | Bin 356 -> 0 bytes
t3lib/class.t3lib_superadmin.php | 3 +
8 files changed, 7 insertions(+), 258 deletions(-)
rename misc/advanced.htaccess => _.htaccess (100%)
delete mode 100644 misc/core_svn_rules.txt
delete mode 100755 misc/example_MM_relationTables.sql
delete mode 100755 misc/locallang_XML_dummy.xml
delete mode 100755 misc/superadmin.php
delete mode 100755 misc/virtualdir.tgz
diff --git a/ChangeLog b/ChangeLog
index 91c7ad39ce29..97e07f7903e4 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-28 Christian Kuuhn <lolli@schwarzbuch>
+
+ * Fixed bug #16840: Remove misc/ directory and deprecate t3lib_superadmin
+
2010-12-28 Steffen Gebert <steffen@steffen-gebert.de>
* Follow-up to #16852: Code clean-up
diff --git a/misc/advanced.htaccess b/_.htaccess
similarity index 100%
rename from misc/advanced.htaccess
rename to _.htaccess
diff --git a/misc/core_svn_rules.txt b/misc/core_svn_rules.txt
deleted file mode 100644
index bf93c48fb7ff..000000000000
--- a/misc/core_svn_rules.txt
+++ /dev/null
@@ -1,120 +0,0 @@
-*******************************************************
-Rules and Conditions for contributions to Core SVN
-(Core + System Extensions)
-*******************************************************
-
-[A] Development Principle: A bazaar of small cathedrals.
-- Each part of the system (System extensions, scripts, functions) has a person responsible and in charge of the development of that part.
-- All or nothing; If a part of the system is not maintained according to the "General Rules of Core Development" (see below) and we need to release the core, we will revert to previous stable version of that part of the system.
-- The Core Team Leader (Kasper) is ultimately in charge.
-Note: This makes it possible for many to work together while maintaining control and tracking responsibility more easily. Also it offers boths modes of development: Group and solo.
-
-
-[B] Committing changes to Core SVN
-- As long as changes follow the "General Rules of core development" (see below), the mode of commits is determined by the person responsible for that particular part.
-- Examples:
- - A developer of a certain class might want to maintain it all alone and not accept any commits by others.
- - A developer of an extension might want to collaborate in a larger group quite anarchical.
-
-
-[C] General Rules of Core Development:
-- 1: CGL Adherance.
- Code in the core must follow the Coding Guidelines for TYPO3 to appear as a unity and good examples. This includes (but is not limited to) code formatting, XHTML compliance and full inline code documentation.
-- 2: Pursue Stability.
- "Rather a stable bug than an unstable system". TYPO3 is known for being stable (even in beta versions and SVN) and we want it to stay that way. Give priority to stability, organize quality assurance, create unit-tests for mission critical parts of your code.
-- 3: Backwards Compatibility
- We aim at being very backwards compatible so even old websites can easily upgrade to most recent TYPO3 core source. Contrary to general extensions where people can easily choose to keep running an old version, all system extensions in the core (and the core code itself) has to respect that they are not (easily) downgradable. Hence they must respect backwards compatibility for the larger parts.
-- 4: No loose ends
- Do NOT implement things half-way. Begin, go through it, round it up, complete it - because you will never get back to it again!
-- 5: Document instantly!
- There are two extremes of documentation: References (list of options, eg. TSref) and tutorials (walk-throughs). Tutorials are nice but not mission critical as references are! *Always* maintain reference documentation along the work! You have forgotten tomorrow!
-- 6: Branches?
- Do not create branches/tags without getting permission from Kasper. By default he is the only one doing it unless expressly allowed.
-- 7: Adding / Removing files?
- You may NOT add or remove scripts to the core without asking Kasper first (unless inside a directory totally controlled by you, like for instance a system extension of course).
-
-
-[D] Rules of SVN Commits to Kaspers Core parts:
-Now, here comes the rules for commits to my parts of the core (which is everything you are not sure belongs to someone else.)
-These rules take offset in the presupposition that I'm the bottleneck and we all want to cut down my administration time as much as possible. Effectively it may mean that the "command-chain" for you as a contributer is getting longer and more cumbersome. If you disagree with this presupposition, just tell me why.
-
-Secret #1: I *will* check everything!
- - I require to be 100% in control of all commits to my parts of the core. This means you can easily step very hard on my toes if you break the rules below. So read them and commit with care!
-
-Rule #1: Ask me first!
- - 1) Always contact me by email first and present a summary of what you want to do. If it sounds reasonable I will probably say "Send me a unified diff-patch" and if that seems ok I will say "Yes, just commit". The point is that I get a chance to reject things which will just be a mess to clean up.
- - 2) Exception: If you are justified in thinking it wouldn't be necessary (for instance doing a second commit to something we have already discussed).
- - 3) If you ask first, we can prevent these past (bad) experiences:
- - a) My code overview is typically larger and I may see implications that were not clear to you. This prevents bugs and bad implementations.
- - b) Maybe another similar concept is planned. In that case we should wait for that.
- - 4) Balance is important. Juggling with a big project like TYPO3 is an act of balance and some changes/fixes will (potentially) disturb the balance. If I judge that to be the case, I will reject the suggestion with reference to my 6th sense... :-)
- - 5) I'm itchy; With SVN I have already experienced that commits meant that I was forced into bugfixing others code for a long time... This is very bad experience! I will do anything to avoid that.
-
-Rule #2: Reference Documentation instantly!
- - This is General Rules #5 emphasized! I'm very, very serious about this point. I really hate to preview some code and see that a new feature was added but not called to my notice! I'm not talking about writing 5 pages, I'm talking about making a small bulletlist with [option] - [description] and sending it to me so we don't forget it!
- - Specific Examples:
- - You add "inverseMenuItemOrder" property somewhere in TypoScript. Instantly you note down 5 things: a) property name, b) TS data type, c) Description, d) optional default value and e) Which table in TSref (or elsewhere) to put it!
- - You add new key in some global PHP array. Instantly you note down 3 things: a) variable name + new key, b) Description of what it does in an understanable way, c) pointer to where in the TYPO3 documents it should go. If you don't know where it belongs then still send it and just say so!!!
- - You add a new hook in the system. Since there is currently no place where hooks are documented you cannot really do anything. If it deserves a comment then send one for any future documentation. In any case, send me a notice about the situation.
-
-Rule #3: No loose ends
- - This is General Rules #4 emphasized! Before you begin core work, make sure you have allocated the time to finish it to an acceptable standard (by the measures given in this text)
- - It needs to be said although it should be obvious: Any code committed to SVN must be tested properly. Parsing errors in particular are not acceptable!
-
-SUMMARY:
-- General request for my opinion
-- If OK, sending an actual Patch-diff to me for approval
-- If approval,
- - send any necessary documentation to me
- - commit code to SVN
-
-
-[E] Rules of SVN Commits for parts of the core NOT maintained by Kasper
-... (yet to be filled in from other contributers, like Rene Fritz who is in charge of eg. Services)
-
-
-[F] Version number scheme
-Versioning scheme:
- - major.minor.patch[alpha/beta/RC][-dev]
- - major and minor: Incremented based on the extend of new features (in HEAD branch)
- - patch: incremented only for important bugfixes in a release branch.
- - dev is always used for intermediate SVN stuff.
- - [alpha/beta/RC] is used only for major releases where this procedure is necessary. These releases have always a trailing number, counting from 1 to n.
- - HEAD branch is the continuous development of TYPO3. We use only this branch for new development of the Core.
- - Each time we have a Release Candidate which is so stable we believe it to be the final release we will make a "release branch" tagged "TYPO3_[major]-[minor]". The Quality Ensurance team / Package team represented by Ingmar Schlecht and Michael Stucki are in charge of managing the release branches, make new patch releases, tag and merge bugfixes in the release branches.
- - In the release branches tagging is used for each release on the form "TYPO3_[major]-[minor]-[patch]"
-
-Examples of BRANCHES (major/minor releases):
-- Major releases where we feature-freeze before release and backport fixes to.
-TYPO3_3-6
-TYPO3_3-7
-TYPO3_4-0
-
-Examples of TAGS (patch releases):
-- Indicates release points in time.
-TYPO3_3-7-0RC2 (RC2 for main release)
-TYPO3_3-7-0 (main release)
-TYPO3_3-7-1 (patch release)
-TYPO3_3-7-2 (patch release)
-
-Example:
-For the 3.7.0 launch the RC2 event will be a feature freeze. Therefore the branch "TYPO3_3-7" is created there meaning:
-- Final fixes (and future hotfixes) is done in that branch
-- Development for 3.8.0 could go on in HEAD
-At the same time the tag "TYPO3_3-7-0RC2" was applied basically because the branch-point coincided with the RC2. If an RC3 would come that would be tagged in the "TYPO3_3-7-0RC3" branch. The final release gets the tag "TYPO3_3-7-0" to indicate the point of release.
-
-
-[G] Modifying / maintaining external projects which are merged into TYPO3core
-The following directories are merged from other sources and MUST NOT be modified unless there is a very good reason to do so:
-- typo3/sysext/dbal/
-- typo3/sysext/extbase/
-- typo3/sysext/fluid/
-
-In order to modify these extensions, contact the development team of the relevant extension.
-
-How to merge changes from external sources (only for maintainers!)
-1. Check the last synched version (noted in extname/last_synched_target)
-2. Merge from this target and the new version:
- $ svn merge [last_synched_target] [new_target] typo3/sysext/extbase/
-3. Before committing, update extname/last_synched_target
-4. Commit the changes. Commit message must be "Merge with [extension] [version]"
diff --git a/misc/example_MM_relationTables.sql b/misc/example_MM_relationTables.sql
deleted file mode 100755
index 538cd9e030a8..000000000000
--- a/misc/example_MM_relationTables.sql
+++ /dev/null
@@ -1,26 +0,0 @@
-
-#
-# Example MM table for database relations
-#
-
-CREATE TABLE example_db_mm (
- uid_local int(11) DEFAULT '0' NOT NULL,
- uid_foreign int(11) DEFAULT '0' NOT NULL,
- tablenames varchar(30) DEFAULT '' NOT NULL,
- sorting int(11) DEFAULT '0' NOT NULL,
- KEY uid_local (uid_local),
- KEY uid_foreign (uid_foreign)
-) TYPE=MyISAM;
-
-#
-# Example MM table for file attachments
-#
-
-CREATE TABLE example_files_mm (
- uid_local int(11) DEFAULT '0' NOT NULL,
- uid_foreign varchar(60) DEFAULT '' NOT NULL,
- sorting int(11) DEFAULT '0' NOT NULL,
- KEY uid_local (uid_local),
- KEY uid_foreign (uid_foreign)
-) TYPE=MyISAM;
-
diff --git a/misc/locallang_XML_dummy.xml b/misc/locallang_XML_dummy.xml
deleted file mode 100755
index e2f9f0182a81..000000000000
--- a/misc/locallang_XML_dummy.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<T3locallang>
- <meta type="array">
- <description>[Insert Title]</description>
- <type>[Insert type: module/CSH/database]</type>
- <csh_table>[first argument of the t3lib_extMgm::addLLrefForTCAdescr() function call including this file inside of ext_tables.php]</csh_table>
- </meta>
- <data type="array">
- <languageKey index="default" type="array">
- <label index="[item_key]">[item_value]</label>
- </languageKey>
- </data>
-</T3locallang>
\ No newline at end of file
diff --git a/misc/superadmin.php b/misc/superadmin.php
deleted file mode 100755
index d289e9086ae0..000000000000
--- a/misc/superadmin.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/***************************************************************
-* Copyright notice
-*
-* (c) 1999-2010 Kasper Skårhøj (kasperYYYY@typo3.com)
-* All rights reserved
-*
-* This script is part of the Typo3 project. The Typo3 project 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.
-*
-* The GNU General Public License can be found at
-* http://www.gnu.org/copyleft/gpl.html.
-* A copy is found in the textfile GPL.txt and important notices to the license
-* from the author is found in LICENSE.txt distributed with these scripts.
-*
-*
-* This script 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.
-*
-* This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-/**
- * Super admin configuration and main script (sample)
- *
- * $Id$
- *
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- */
-/*
- * WHAT IS IT:
- * This script is intended to provide administrator information and
- * relevant links to multiple Typo3 sites on a webserver.
- *
- * LOCATION:
- * This script must be located in a directory with the Typo3 source available in typo3_src/
- * The script includes the class t3lib/class.t3lib_superadmin.php
- *
- * IMPORTANT:
- * This script MUST be secured as it reads out password information an provides direct login links to sites!
- * It's recommended to use the script over a secure connection and to use the strongest webserver http-based authentication, you can.
- * Furthermore it's adviced to out-comment the 'die'-line below when you're not using the script.
- *
- * CONFIGURATION:
- * The point is that you configure one or more directories (parent directories) on the webserver to the script.
- * The script expects these directories (parents) to contain other directories (childs) exclusively with Typo3 sites in + any number of directories names 'typo3_src*' which will be ignored.
- * Every Typo3 site (child) in these parent directories will get listed in the interface.
- *
- * For each 'parent directory' you enter information like this:
- *
- * $parentDirs[] = array(
- * 'dir'=> '/www/htdocs/typo3/32/',
- * 'url' => 'http://192.168.1.4/typo3/32/'
- * );
- *
- * 'dir' is the absolute path of the parent directory where the sites are located in subdirs
- * 'url' is the web-accessible url of the parent directory.
- */
-
-
-// *****************
-// Security:
-// *****************
-die('Script secured by a die() function. Comment the line if you want to use the script!');
-
-
-// *****************
-// Including:
-// *****************
-require_once ('./typo3_src/t3lib/class.t3lib_superadmin.php');
-
-
-// *****************
-// Configuration:
-// This is just an example!
-// *****************
-$parentDirs = array();
-$parentDirs[] = array(
- 'dir'=> '/www/htdocs/typo3/commercial_sites/',
- 'url' => 'http://123.234.43.212/typo3/commercial_sites/'
-);
-$parentDirs[] = array(
- 'dir'=> '/www/htdocs/typo3/nonprofit_sites/',
- 'url' => 'http://123.234.43.212/typo3/nonprofit_sites/'
-);
-
-
-
-// *****************
-// Start
-// *****************
-$superadmin = t3lib_div::makeInstance('t3lib_superadmin');
-$superadmin->init($parentDirs);
-$superadmin->defaultSet();
-?>
\ No newline at end of file
diff --git a/misc/virtualdir.tgz b/misc/virtualdir.tgz
deleted file mode 100755
index 35f8b36121d9e13adac8b400178dfc89808cfaf3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 356
zcmV-q0h|6GiwFQtMQ=L*1MQewZi6roMOg|fpvK1bdR!pI5@5t5X?NccFhTif8^lPo
zz30c4j5Jp|8W?l7Z9kYYv+YYj1!D=*QeM{^kL$G8LI{;`Iqu_FCprivS)vs~*PAvB
zgVwqJtLMHu|D~Mo{?jryZS-bOd)HtwXIkqY`A^j7U&>epA&(-uP#*aA{-dHdX_|N4
z-Zi%PmwNI~7Rm$v-v7y7do8PMy?2cb{<UV4|0NXF=L!D3e_Lnyd(;%o-ZeJ(S6oc~
z$wGPH-}|rf%o>Us&-)+O$^R`B-DnE`cmG}CE{#q1Z?@<CD=Fsrk1Ui2{=NTRl=hXP
z#)kf9YJUHdh4R4v;=enNf4=yq3gv<S#s5d+MC$4z-2b(j=l>-X=6@0%{r7owfcalB
zzV<(cf`1ZL{)eV?CL{RKvZ4PupXdKM6x|KrpZf;@000000002M-{%vMkYWe`C;$LV
CxViHH
diff --git a/t3lib/class.t3lib_superadmin.php b/t3lib/class.t3lib_superadmin.php
index f4b47f0925ba..8dec8ff8ad1f 100644
--- a/t3lib/class.t3lib_superadmin.php
+++ b/t3lib/class.t3lib_superadmin.php
@@ -108,6 +108,9 @@ include_once($path_t3lib . 'class.t3lib_db.php');
$TYPO3_DB = t3lib_div::makeInstance('t3lib_DB');
+t3lib_div::deprecationLog('class.t3lib_superadmin.php is deprecated since TYPO3 4.5, this file will be removed in TYPO3 4.7.');
+
+
/**
* Debug function. Substitute since no config_default.php file is included anywhere
*
--
GitLab