openrat-cms

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs

commit 24f6e43d0eed5ced9bbc0cea95950308a9a8fd2b
parent c9a3c883066ef0b9d58507fcc6141b575cebefed
Author: Jan Dankert <devnull@localhost>
Date:   Wed, 23 Nov 2011 22:35:46 +0100

Umbennung der Methoden \"...Action()\" in \"...Post()\", damit es zu keinen Verwechslungen mit dem Konstruktor (konkret bei der LoginAction) kommt.

Diffstat:
action/ElementAction.class.php | 8++++----
action/FileAction.class.php | 10+++++-----
action/FolderAction.class.php | 22+++++++++++-----------
action/GroupAction.class.php | 8++++----
action/LanguageAction.class.php | 8++++----
action/LinkAction.class.php | 4++--
action/LoginAction.class.php | 12++++++------
action/ModelAction.class.php | 6+++---
action/ObjectAction.class.php | 6+++---
action/PageAction.class.php | 12++++++------
action/PageelementAction.class.php | 2+-
action/ProfileAction.class.php | 10+++++-----
action/ProjectAction.class.php | 10+++++-----
action/StartAction.class.php | 10+++++-----
action/TemplateAction.class.php | 14+++++++-------
action/TreeAction.class.php | 2+-
action/UserAction.class.php | 10+++++-----
action/WebdavAction.class.php | 10+++++-----
dispatcher.php | 2+-
19 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/action/ElementAction.class.php b/action/ElementAction.class.php @@ -44,7 +44,7 @@ class ElementAction extends Action /** * Umbenennen des Elementes */ - function editAction() + function editPost() { $this->element->name = $this->getRequestVar('name' ,OR_FILTER_ALPHANUM); $this->element->desc = $this->getRequestVar('description','all' ); @@ -69,7 +69,7 @@ class ElementAction extends Action /** * Entfernen des Elementes */ - function deleteAction() + function deletePost() { if ( !$this->hasRequestVar('confirm') ) { @@ -96,7 +96,7 @@ class ElementAction extends Action /** * Aendern des Element-Typs */ - function typeAction() + function typePost() { if ( !$this->userIsAdmin() && $this->getRequestVar('type') == 'code' ) { @@ -589,7 +589,7 @@ class ElementAction extends Action /** * Speichern der Element-Eigenschaften */ - function propAction() + function propPost() { global $conf; $ini_date_format = $conf['date']['format']; diff --git a/action/FileAction.class.php b/action/FileAction.class.php @@ -95,7 +95,7 @@ class FileAction extends ObjectAction * Abspeichern der Eigenschaften zu dieser Datei. * */ - function propAction() + function propPost() { // Eigenschaften speichern $this->file->filename = $this->getRequestVar('filename' ,OR_FILTER_FILENAME); @@ -427,7 +427,7 @@ class FileAction extends ObjectAction /** * Anzeigen des Inhaltes */ - function uncompressAction() + function uncompressPost() { switch( $this->file->extension ) { @@ -493,7 +493,7 @@ class FileAction extends ObjectAction /** * Anzeigen des Inhaltes */ - function extractAction() + function extractPost() { switch( $this->file->extension ) { @@ -584,7 +584,7 @@ class FileAction extends ObjectAction /** * Anzeigen des Inhaltes */ - function compressAction() + function compressPost() { $format = $this->getRequestVar('format',OR_FILTER_ALPHANUM); @@ -651,7 +651,7 @@ class FileAction extends ObjectAction /** * Datei veroeffentlichen */ - function pubAction() + function pubPost() { $this->file->publish(); $this->file->publish->close(); diff --git a/action/FolderAction.class.php b/action/FolderAction.class.php @@ -61,7 +61,7 @@ class FolderAction extends ObjectAction * Neues Objekt anlegen.<br> * Dies kann ein(e) Verzeichnis, Seite, Verkn�pfung oder Datei sein.<br> */ - function createAction() + function createPost() { global $conf; $type = $this->getRequestVar('type' ); @@ -179,7 +179,7 @@ class FolderAction extends ObjectAction - function createfolderAction() + function createfolderPost() { $type = $this->getRequestVar('type' ); $name = $this->getRequestVar('name' ); @@ -208,7 +208,7 @@ class FolderAction extends ObjectAction - function createfileAction() + function createfilePost() { $type = $this->getRequestVar('type' ); $name = $this->getRequestVar('name' ); @@ -271,7 +271,7 @@ class FolderAction extends ObjectAction - function createlinkAction() + function createlinkPost() { $type = $this->getRequestVar('type' ); $name = $this->getRequestVar('name' ); @@ -304,7 +304,7 @@ class FolderAction extends ObjectAction - function createpageAction() + function createpagePost() { $type = $this->getRequestVar('type' ); $name = $this->getRequestVar('name' ); @@ -339,7 +339,7 @@ class FolderAction extends ObjectAction * Abspeichern der Ordner-Eigenschaften. Ist der Schalter "delete" gesetzt, wird * der Ordner stattdessen gel?scht. */ - function propAction() + function propPost() { // Ordnereigenschaften speichern if ( $this->getRequestVar('name') != '' ) @@ -377,7 +377,7 @@ class FolderAction extends ObjectAction // Reihenfolge von Objekten aendern - function changesequenceAction() + function changesequencePost() { $ids = $this->folder->getObjectIds(); $seq = 0; @@ -709,7 +709,7 @@ class FolderAction extends ObjectAction // Reihenfolge von Objekten aendern - function reorderAction() + function reorderPost() { $type = $this->getRequestVar('type'); @@ -754,7 +754,7 @@ class FolderAction extends ObjectAction } - function settopAction() + function settopPost() { $o = new Object( $this->getRequestVar('objectid1') ); $o->setOrderId( 1 ); @@ -783,7 +783,7 @@ class FolderAction extends ObjectAction } - function setbottomAction() + function setbottomPost() { $ids = $this->folder->getObjectIds(); $seq = 0; @@ -1175,7 +1175,7 @@ class FolderAction extends ObjectAction } - function pubAction() + function pubPost() { if ( !$this->folder->hasRight( ACL_PUBLISH ) ) die('no rights for publish'); diff --git a/action/GroupAction.class.php b/action/GroupAction.class.php @@ -53,7 +53,7 @@ class GroupAction extends Action - function removeAction() + function removePost() { if ( $this->hasRequestVar('confirm') ) { @@ -76,7 +76,7 @@ class GroupAction extends Action - function editAction() + function editPost() { if ( $this->getRequestVar('name') != '' ) { @@ -99,7 +99,7 @@ class GroupAction extends Action } - function addAction() + function addPost() { if ( $this->getRequestVar('name') != '') { @@ -228,7 +228,7 @@ class GroupAction extends Action } - function membershipsAction() + function membershipsPost() { $allUsers = User::listAll(); $groupUsers = $this->group->getUsers(); diff --git a/action/LanguageAction.class.php b/action/LanguageAction.class.php @@ -113,7 +113,7 @@ class LanguageAction extends Action } - function addAction() + function addPost() { global $conf; $countryList = $conf['countries']; @@ -152,7 +152,7 @@ class LanguageAction extends Action /** * L�schen der Sprache. */ - function removeAction() + function removePost() { if ( $this->getRequestVar('confirm') == '1' ) $this->language->delete(); @@ -162,7 +162,7 @@ class LanguageAction extends Action /** * Speichern der Sprache */ - function advancedAction() + function advancedPost() { global $conf; @@ -187,7 +187,7 @@ class LanguageAction extends Action /** * Speichern der Sprache */ - function editAction() + function editPost() { global $conf; diff --git a/action/LinkAction.class.php b/action/LinkAction.class.php @@ -104,7 +104,7 @@ class LinkAction extends ObjectAction /** * Abspeichern der Eigenschaften */ - function propAction() + function propPost() { // Wenn Name gefuellt, dann Datenbank-Update if ( $this->getRequestVar('name') != '' ) @@ -123,7 +123,7 @@ class LinkAction extends ObjectAction /** * Abspeichern der Eigenschaften */ - function editAction() + function editPost() { if( $this->getRequestVar('type') != '' ) { diff --git a/action/LoginAction.class.php b/action/LoginAction.class.php @@ -650,7 +650,7 @@ class LoginAction extends Action /** * Login. */ - function loginAction() + function loginPost() { global $conf; @@ -772,7 +772,7 @@ class LoginAction extends Action /** * Benutzer meldet sich ab. */ - function logoutAction() + function logoutPost() { global $conf; @@ -1375,7 +1375,7 @@ class LoginAction extends Action * Registriercode erzeugen und per E-Mail dem Benutzer mitteilen. * Maske anzeigen, damit Benuter Registriercode anzeigen kann. */ - function registerAction() + function registerPost() { $email_address = $this->getRequestVar('mail','mail'); @@ -1437,7 +1437,7 @@ class LoginAction extends Action * Benutzerregistierung. * Benutzer hat Best�tigungscode erhalten und eingegeben. */ - function registeruserdataAction() + function registeruserdataPost() { global $conf; $this->checkForDb(); @@ -1564,7 +1564,7 @@ class LoginAction extends Action /** * Einen Kennwort-Anforderungscode an den Benutzer senden. */ - function passwordAction() + function passwordPost() { if ( !$this->hasRequestVar('username') ) { @@ -1620,7 +1620,7 @@ class LoginAction extends Action /** * Neues Kennwort erzeugen und dem Benutzer zusenden. */ - function passwordinputcodeAction() + function passwordinputcodePost() { $username = $this->getSessionVar("password_commit_name"); diff --git a/action/ModelAction.class.php b/action/ModelAction.class.php @@ -82,7 +82,7 @@ class ModelAction extends Action } - function addAction() + function addPost() { $model = new Model(); $model->projectid = $this->project->projectid; @@ -115,7 +115,7 @@ class ModelAction extends Action /** * Löschen des Models. */ - function removeAction() + function removePost() { if ( $this->hasRequestVar('confirm') ) { @@ -131,7 +131,7 @@ class ModelAction extends Action // Speichern eines Modells - function editAction() + function editPost() { if ( $this->getRequestVar('name') != '' ) { diff --git a/action/ObjectAction.class.php b/action/ObjectAction.class.php @@ -103,7 +103,7 @@ class ObjectAction extends Action * * @access public */ - function aclformAction() + function aclformPost() { $acl = new Acl(); @@ -237,7 +237,7 @@ class ObjectAction extends Action * * @return unknown_type */ - function rightsAction() + function rightsPost() { $log = array(); @@ -324,7 +324,7 @@ class ObjectAction extends Action * * @access protected */ - function delaclAction() + function delaclPost() { $acl = new Acl($this->getRequestVar('aclid')); $acl->objectid = $this->getRequestId(); diff --git a/action/PageAction.class.php b/action/PageAction.class.php @@ -57,7 +57,7 @@ class PageAction extends ObjectAction /** * Alle Daten aus dem Formular speichern */ - function formAction() + function formPost() { $this->page->public = true; $this->page->simple = true; @@ -146,7 +146,7 @@ class PageAction extends ObjectAction * * Der Inhalt eines Elementes wird abgespeichert */ - function elAction() + function elPost() { $value = new Value(); $language = Session::getProjectLanguage(); @@ -303,7 +303,7 @@ class PageAction extends ObjectAction /** * Eigenschaften der Seite speichern */ - function propAction() + function propPost() { if ( $this->getRequestVar('name')!='' ) { @@ -377,7 +377,7 @@ class PageAction extends ObjectAction * * Die Vorlage wird ausgetauscht, die Inhalte werden gemaess der Benutzereingaben kopiert */ - public function changetemplateAction() + public function changetemplatePost() { Session::set('newtemplateid',intval($this->getRequestVar('templateid')) ); $this->nextView('changetemplateselectelements'); @@ -447,7 +447,7 @@ class PageAction extends ObjectAction * * Die Vorlage wird ausgetauscht, die Inhalte werden gemaess der Benutzereingaben kopiert */ - public function changetemplateselectelementsAction() + public function changetemplateselectelementsPost() { $newTemplateId = intval( Session::get('newtemplateid') ); $replaceElementMap = Array(); @@ -755,7 +755,7 @@ class PageAction extends ObjectAction * * Die Seite wird generiert. */ - function pubAction() + function pubPost() { if ( !$this->page->hasRight( ACL_PUBLISH ) ) Http::notAuthorized( 'no right for publish' ); diff --git a/action/PageelementAction.class.php b/action/PageelementAction.class.php @@ -799,7 +799,7 @@ class PageelementAction extends Action /** * Ein Element der Seite speichern. */ - public function editAction() + public function editPost() { $this->element->load(); $type = $this->element->type; diff --git a/action/ProfileAction.class.php b/action/ProfileAction.class.php @@ -45,7 +45,7 @@ class ProfileAction extends Action /** * Abspeichern des Profiles */ - function editAction() + function editPost() { $this->user->fullname = $this->getRequestVar('fullname'); $this->user->tel = $this->getRequestVar('tel' ); @@ -103,7 +103,7 @@ class ProfileAction extends Action /** * Speichern der Benutzereinstellungen. */ - function settingsAction() + function settingsPost() { foreach( array('always_edit','ignore_ok_notices','timezone_offset','language') as $name ) { @@ -148,7 +148,7 @@ class ProfileAction extends Action /* * Es wird eine E-Mail mit einem Freischaltcode an die eingegebene Adresse geschickt. */ - function mailAction() + function mailPost() { srand ((double)microtime()*1000003); $code = rand(); // Zufalls-Freischaltcode erzeugen @@ -199,7 +199,7 @@ class ProfileAction extends Action /** * Abspeichern der neuen E-Mail-Adresse */ - function confirmmailAction() + function confirmmailPost() { $sessionCode = Session::get('mailChangeCode'); $newMail = Session::get('mailChangeMail'); @@ -224,7 +224,7 @@ class ProfileAction extends Action - public function pwAction() + public function pwPost() { if ( ! $this->user->checkPassword( $this->getRequestVar('act_password') ) ) { diff --git a/action/ProjectAction.class.php b/action/ProjectAction.class.php @@ -41,7 +41,7 @@ class ProjectAction extends Action } - function editAction() + function editPost() { sleep(2); if ( $this->getRequestVar('name') != '') @@ -79,7 +79,7 @@ class ProjectAction extends Action * Projekt hinzufuegen. * */ - function addAction() + function addPost() { if ( !$this->hasRequestVar('type') ) { @@ -182,7 +182,7 @@ class ProjectAction extends Action } - function removeAction() + function removePost() { if ( !$this->hasRequestVar('delete') ) { @@ -211,7 +211,7 @@ class ProjectAction extends Action /** * Wartung durchfuehren. */ - function maintenanceAction() + function maintenancePost() { switch( $this->getRequestVar('type') ) { @@ -245,7 +245,7 @@ class ProjectAction extends Action /** * Projekt exportieren. */ - function exportAction() + function exportPost() { $db = db_connection(); $this->setTemplateVar( 'dbid',$db->id ); diff --git a/action/StartAction.class.php b/action/StartAction.class.php @@ -352,7 +352,7 @@ class StartAction extends Action * Setzt die neue Projekt-Id und lädt die Workbench neu. * */ - public function projectmenuAction() { + public function projectmenuPost() { //Session::setProject( $this->getRequestId() ); @@ -632,7 +632,7 @@ class StartAction extends Action /** * Login. */ - function loginAction() + function loginPost() { global $conf; @@ -750,7 +750,7 @@ class StartAction extends Action /** * Benutzer meldet sich ab. */ - function logoutAction() + function logoutPost() { global $conf; @@ -838,7 +838,7 @@ class StartAction extends Action /** * Ausw�hlen der Administration. */ - function administrationAction() + function administrationPost() { Session::setProject( new Project(-1) ); Session::set('perspective','administration'); @@ -850,7 +850,7 @@ class StartAction extends Action /** * Auswaehlen des Benutzer-Profiles. */ - function profileAction() + function profilePost() { Session::set('perspective','profile'); $this->refresh(); diff --git a/action/TemplateAction.class.php b/action/TemplateAction.class.php @@ -52,7 +52,7 @@ class TemplateAction extends Action } - function srcAction() + function srcPost() { // Speichern des Quelltextes // @@ -78,7 +78,7 @@ class TemplateAction extends Action - function srcelementAction() + function srcelementPost() { $text = $this->template->src; @@ -117,7 +117,7 @@ class TemplateAction extends Action // Speichern der Template-Eigenschaftens // - function nameAction() + function namePost() { if ($this->getRequestVar('name') == "") @@ -137,7 +137,7 @@ class TemplateAction extends Action // Speichern der Template-Eigenschaftens // - function removeAction() + function removePost() { if ( $this->getRequestVar('delete') != '' ) { @@ -182,7 +182,7 @@ class TemplateAction extends Action // Speichern der Dateiendung // - function extensionAction() + function extensionPost() { if ( $this->getRequestVar('type') == "list" ) $this->template->extension = $this->getRequestVar('extension'); @@ -216,7 +216,7 @@ class TemplateAction extends Action /* * Neues Element hinzufuegen. */ - function addelAction() + function addelPost() { $name = $this->getRequestVar('name',OR_FILTER_ALPHANUM); @@ -264,7 +264,7 @@ class TemplateAction extends Action - function addAction() + function addPost() { // Hinzufuegen eines Templates if ( $this->getRequestVar('name') == '' ) diff --git a/action/TreeAction.class.php b/action/TreeAction.class.php @@ -322,7 +322,7 @@ class TreeAction extends Action $this->setTemplateVar( 'modelid' ,Session::getProjectModel()->modelid ); } - public function settingsAction() + public function settingsPost() { $language = new Language( $this->getRequestVar(REQ_PARAM_LANGUAGE_ID,OR_FILTER_NUMBER) ); $language->load(); diff --git a/action/UserAction.class.php b/action/UserAction.class.php @@ -48,7 +48,7 @@ class UserAction extends Action } - function editAction() + function editPost() { if ( $this->getRequestVar('name') != '' ) { @@ -85,7 +85,7 @@ class UserAction extends Action - function removeAction() + function removePost() { if ( $this->hasRequestVar('confirm') ) { @@ -106,7 +106,7 @@ class UserAction extends Action - function addAction() + function addPost() { if ( $this->getRequestVar('name') != '' ) { @@ -166,7 +166,7 @@ class UserAction extends Action /** * Aendern des Kennwortes */ - function pwAction() + function pwPost() { global $conf; @@ -283,7 +283,7 @@ class UserAction extends Action } - function membershipsAction() + function membershipsPost() { $allGroups = Group::getAll(); $userGroups = $this->user->getGroups(); diff --git a/action/WebdavAction.class.php b/action/WebdavAction.class.php @@ -4,11 +4,11 @@ /** * Action-Klasse fuer WebDAV.<br> * - * Das virtuelle Ordnersystem dieses CMS kann ber das WebDAV-Protokoll + * Das virtuelle Ordnersystem dieses CMS kann �ber das WebDAV-Protokoll * dargestellt werden. * * Diese Klasse nimmt die Anfragen von WebDAV-Clients entgegen, zerlegt die - * Anfrage und erzeugt eine Antwort, die im HTTP-Body zurck bertragen + * Anfrage und erzeugt eine Antwort, die im HTTP-Body zur�ck �bertragen * wird. * <br> * WebDAV ist spezifiziert in der RFC 2518.<br> @@ -23,7 +23,7 @@ class WebdavAction extends Action { // Zahlreiche Instanzvariablen, die im Konstruktor - // beim Zerlegen der Anfrag gefllt werden. + // beim Zerlegen der Anfrag gef�llt werden. var $defaultSubAction = 'show'; var $database; var $depth; @@ -107,7 +107,7 @@ class WebdavAction extends Action // Pr�fen, ob Benutzer angemeldet ist. $user = $this->getUserFromSession(); - // Authentisierung erzwingen (auer bei Methode OPTIONS). + // Authentisierung erzwingen (au�er bei Methode OPTIONS). // For the motivation for not checking OPTIONS requests see // http://pear.php.net/bugs/bug.php?id=5363 if ( !is_object($user) && $_GET[REQ_PARAM_SUBACTION] != 'options' ) @@ -391,7 +391,7 @@ class WebdavAction extends Action header('Content-Transfer-Encoding: binary' ); header('Content-Description: '.$file->name ); - $file->write(); // Bild aus Datenbank laden und in temporre Datei schreiben + $file->write(); // Bild aus Datenbank laden und in tempor�re Datei schreiben // Groesse des Bildes in Bytes // Der Browser hat so die Moeglichkeit, einen Fortschrittsbalken zu zeigen diff --git a/dispatcher.php b/dispatcher.php @@ -267,7 +267,7 @@ $isAction = $_SERVER['REQUEST_METHOD'] == 'POST' || (isset($sConf['write']) && $ if ( $isAction ) - $subactionMethodName = $subaction.'Action'; + $subactionMethodName = $subaction.'Post'; else $subactionMethodName = $subaction.'View';