[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] [20857] Delete obsolete
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] [20857] Delete obsolete |
|
Date: |
Fri, 20 Nov 2009 12:23:27 +0000 |
Revision: 20857
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=20857
Author: sigurdne
Date: 2009-11-20 12:23:26 +0000 (Fri, 20 Nov 2009)
Log Message:
-----------
Delete obsolete
Removed Paths:
-------------
people/sigurdne/modules/admin/trunk/inc/class.soaccounts.inc.php
people/sigurdne/modules/admin/trunk/inc/hook_view_account.inc.php
people/sigurdne/modules/admin/trunk/templates/base/app_delete.xsl
people/sigurdne/modules/admin/trunk/templates/desktop/app_data.xsl
people/sigurdne/modules/admin/trunk/templates/desktop/groups.xsl
people/sigurdne/modules/admin/trunk/templates/probusiness/mainscreen_message.tpl
Deleted: people/sigurdne/modules/admin/trunk/inc/class.soaccounts.inc.php
===================================================================
--- people/sigurdne/modules/admin/trunk/inc/class.soaccounts.inc.php
2009-11-20 12:21:55 UTC (rev 20856)
+++ people/sigurdne/modules/admin/trunk/inc/class.soaccounts.inc.php
2009-11-20 12:23:26 UTC (rev 20857)
@@ -1,143 +0,0 @@
-<?php
-
/**************************************************************************\
- * phpGroupWare - account administration
*
- * http://www.phpgroupware.org
*
- * --------------------------------------------
*
- * This program 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.
*
-
\**************************************************************************/
-
- /* $Id$ */
-
- class soaccounts
- {
- function soaccounts()
- {
- }
-
- function delete_user($id)
- {
- if((int)$id)
- {
- return $GLOBALS['phpgw']->accounts->delete($id);
- }
- else
- {
- return false;
- }
- }
-
- function update_user($userData)
- {
- $GLOBALS['phpgw']->accounts->update_data($userData);
- $GLOBALS['phpgw']->accounts->save_repository();
- }
-
- function add_user($userData)
- {
- $GLOBALS['phpgw']->db->lock
- (
- array
- (
- 'phpgw_accounts',
- 'phpgw_nextid',
- 'phpgw_preferences',
- 'phpgw_sessions',
- 'phpgw_acl',
- 'phpgw_applications',
- 'phpgw_app_sessions',
- 'phpgw_hooks'
- )
- );
-
- $userData['account_id'] =
$GLOBALS['phpgw']->accounts->create($userData);
-
- $apps =&
CreateObject('phpgwapi.applications',array($userData['account_id'],'u'));
- $apps->read_installed_apps();
-
- // Read Group Apps
- if ($userData['account_groups'])
- {
- $apps->account_type = 'g';
- reset($userData['account_groups']);
- while($groups =
each($userData['account_groups']))
- {
- $apps->account_id = $groups[0];
- $old_app_groups =
$apps->read_account_specific();
- @reset($old_app_groups);
- while($old_group_app =
each($old_app_groups))
- {
- if
(!$apps_after[$old_group_app[0]])
- {
-
$apps_after[$old_group_app[0]] = $old_app_groups[$old_group_app[0]];
- }
- }
- }
- }
-
- $apps->account_type = 'u';
- $apps->set_account_id($userData['account_id']);
- $apps->account_apps = Array(Array());
-
-/* moved to bo
- if ($userData['account_permissions'])
- {
- @reset($userData['account_permissions']);
- while (list($app,$turned_on) =
each($userData['account_permissions']))
- {
- if ($turned_on)
- {
- $apps->add($app);
- if (!$apps_after[$app])
- {
- $apps_after[] = $app;
- }
- }
- }
- }
- $apps->save_repository();
-*/
-
-
$GLOBALS['phpgw']->acl->add_repository('preferences','changepassword',$userData['account_id'],1);
-
- // Assign user to groups
- if ($userData['groups'])
- {
- for ($i=0; $i < count($userData['groups']);
$i++)
- {
-
$GLOBALS['phpgw']->acl->add_repository('phpgw_group',$userData['groups'][$i],$userData['account_id'],1);
- }
- }
-
-/* if ($apps_after)
- {
- $GLOBALS['pref'] =&
CreateObject('phpgwapi.preferences',$userData['account_id']);
-
$GLOBALS['phpgw']->hooks->single('add_def_pref','admin');
- while ($apps = each($apps_after))
- {
- if (strcasecmp ($apps[0], 'admin') != 0)
- {
-
$GLOBALS['phpgw']->hooks->single('add_def_pref', $apps[1]);
- }
- }
- $GLOBALS['pref']->save_repository(False);
- } */
-
- $apps->account_apps = array(array());
- $apps_after = array(array());
-
- $GLOBALS['phpgw']->db->unlock();
-
-/*
- // start inlcuding other admin tools
- while($app = each($apps_after))
- {
-
$GLOBALS['phpgw']->hooks->single('add_user_data', $value);
- }
-*/
- return $userData['account_id'];
- }
- }
-?>
Deleted: people/sigurdne/modules/admin/trunk/inc/hook_view_account.inc.php
===================================================================
--- people/sigurdne/modules/admin/trunk/inc/hook_view_account.inc.php
2009-11-20 12:21:55 UTC (rev 20856)
+++ people/sigurdne/modules/admin/trunk/inc/hook_view_account.inc.php
2009-11-20 12:23:26 UTC (rev 20857)
@@ -1,30 +0,0 @@
-<?php
-
/**************************************************************************\
- * phpGroupWare - Administration
*
- * http://www.phpgroupware.org
*
- * --------------------------------------------
*
- * This program 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.
*
-
\**************************************************************************/
-
- /* $Id$ */
-
- $GLOBALS['menuData'][] = array(
- 'description' => 'Login History',
- 'url' => '/index.php',
- 'extradata' =>
'menuaction=admin.uiaccess_history.list_history'
- );
-
- $GLOBALS['menuData'][] = array(
- 'description' => 'ACL Rights',
- 'url' => '/index.php',
- 'extradata' => 'menuaction=admin.uiaclmanager.list_apps'
- );
-
- //Do not modify below this line
-// global $menuData;
-
-// $GLOBALS['menuData'][] = $data;
-?>
\ No newline at end of file
Deleted: people/sigurdne/modules/admin/trunk/templates/base/app_delete.xsl
===================================================================
--- people/sigurdne/modules/admin/trunk/templates/base/app_delete.xsl
2009-11-20 12:21:55 UTC (rev 20856)
+++ people/sigurdne/modules/admin/trunk/templates/base/app_delete.xsl
2009-11-20 12:23:26 UTC (rev 20857)
@@ -1,29 +0,0 @@
-<!-- $Id$ -->
-
- <xsl:template name="app_delete">
- <xsl:apply-templates select="delete"/>
- </xsl:template>
-
- <xsl:template match="delete">
- <table cellpadding="2" cellspacing="2" align="center">
- <tr>
- <td align="center"
colspan="2"><xsl:value-of select="lang_confirm_msg"/></td>
- </tr>
- <tr>
- <td>
- <xsl:variable
name="done_action"><xsl:value-of select="done_action"/></xsl:variable>
- <xsl:variable
name="lang_no"><xsl:value-of select="lang_no"/></xsl:variable>
- <form method="post"
action="{$done_action}">
- <input type="submit"
class="forms" name="cancel" value="{$lang_no}" />
- </form>
- </td>
- <td align="right">
- <xsl:variable
name="delete_action"><xsl:value-of select="delete_action"/></xsl:variable>
- <xsl:variable
name="lang_yes"><xsl:value-of select="lang_yes"/></xsl:variable>
- <form method="post"
action="{$delete_action}">
- <input type="submit"
class="forms" name="confirm" value="{$lang_yes}"/>
- </form>
- </td>
- </tr>
- </table>
- </xsl:template>
\ No newline at end of file
Deleted: people/sigurdne/modules/admin/trunk/templates/desktop/app_data.xsl
===================================================================
--- people/sigurdne/modules/admin/trunk/templates/desktop/app_data.xsl
2009-11-20 12:21:55 UTC (rev 20856)
+++ people/sigurdne/modules/admin/trunk/templates/desktop/app_data.xsl
2009-11-20 12:23:26 UTC (rev 20857)
@@ -1,138 +0,0 @@
-<!-- $Id$ -->
-
- <xsl:template name="app_data">
- <xsl:choose>
- <xsl:when test="list">
- <xsl:apply-templates select="list"/>
- </xsl:when>
- <xsl:when test="cat_list">
- <xsl:call-template name="cats"/>
- </xsl:when>
- <xsl:when test="cat_edit">
- <xsl:call-template name="cats"/>
- </xsl:when>
- <xsl:when test="group_list">
- <xsl:call-template name="groups"/>
- </xsl:when>
- <xsl:when test="group_edit">
- <xsl:call-template name="groups"/>
- </xsl:when>
- <xsl:when test="account_list">
- <xsl:call-template name="users"/>
- </xsl:when>
- <xsl:when test="account_edit">
- <xsl:call-template name="users"/>
- </xsl:when>
- <xsl:when test="account_view">
- <xsl:call-template name="users"/>
- </xsl:when>
- <xsl:when test="new_owner_list">
- <xsl:apply-templates select="new_owner_list"/>
- </xsl:when>
- <xsl:when test="delete">
- <xsl:call-template name="app_delete"/>
- </xsl:when>
- <xsl:when test="addressmaster_list">
- <xsl:call-template name="addressmaster"/>
- </xsl:when>
- <xsl:when test="addressmaster_edit">
- <xsl:call-template name="addressmaster"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:apply-templates select="list"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
-<!-- BEGIN mainscreen -->
-
- <xsl:template match="list">
- <ul class="admin_list">
- <xsl:choose>
- <xsl:when test="app_row_icon">
- <xsl:apply-templates
select="app_row_icon"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:apply-templates
select="app_row_noicon"/>
- </xsl:otherwise>
- </xsl:choose>
- </ul>
- </xsl:template>
-
- <xsl:template match="app_row_icon">
- <xsl:variable name="app_icon" select="app_icon"/>
- <xsl:variable name="app_title" select="app_title"/>
- <xsl:variable name="app_name" select="app_name"/>
- <li class="th_bright">
- <img src="{$app_icon}" alt="{$app_title}"
name="{$app_title}"/>
- <xsl:value-of select="app_title"/>
- </li>
- <ul>
- <xsl:apply-templates select="link_row"/>
- </ul>
- </xsl:template>
-
- <xsl:template match="app_row_noicon">
- <li class="th_bright">
- <xsl:value-of select="app_title"/>
- </li>
- <ul>
- <xsl:apply-templates select="link_row"/>
- </ul>
- </xsl:template>
-
- <xsl:template match="link_row">
- <xsl:variable name="pref_link" select="pref_link"/>
- <li>
- <xsl:attribute name="class">
- <xsl:choose>
- <xsl:when test="@class">
- <xsl:value-of select="@class"/>
- </xsl:when>
- <xsl:when test="position() mod 2 = 0">
- <xsl:text>row_off</xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text>row_on</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- <a href="{$pref_link}"><xsl:value-of
select="pref_text"/></a>
- </li>
- </xsl:template>
-
-<!-- BEGIN newOwnerList -->
-
- <xsl:template match="new_owner_list">
- <form method="post">
- <input type="hidden" name="account_id"
value="{account_id}" />
- <table id="admin_new_owner_list">
- <tr>
- <td colspan="2">
- <xsl:value-of
select="lang_new_owner"/><br />
- </td>
- </tr>
- <tr>
- <td colspan="2">
- <select name="account">
- <xsl:apply-templates
select="accountlist"/>
- </select><br />
- </td>
- </tr>
- <tr>
- <td>
- <input type="submit"
name="deleteAccount" value="{l_delete}" />
- </td>
- <td>
- <input type="submit"
name="cancel" value="{l_cancel}" />
- </td>
- </tr>
- </table>
- </form>
- </xsl:template>
-
- <xsl:template match="accountlist">
- <xsl:variable name="account_id" select="account_id"/>
- <option value="{$account_id}"><xsl:value-of
select="account_name"/></option>
- </xsl:template>
-
Deleted: people/sigurdne/modules/admin/trunk/templates/desktop/groups.xsl
===================================================================
--- people/sigurdne/modules/admin/trunk/templates/desktop/groups.xsl
2009-11-20 12:21:55 UTC (rev 20856)
+++ people/sigurdne/modules/admin/trunk/templates/desktop/groups.xsl
2009-11-20 12:23:26 UTC (rev 20857)
@@ -1,282 +0,0 @@
-<!-- $Id$ -->
-
-<xsl:template name="groups">
- <xsl:choose>
- <xsl:when test="group_list">
- <xsl:apply-templates select="group_list" />
- </xsl:when>
- <xsl:when test="group_edit">
- <xsl:apply-templates select="group_edit" />
- </xsl:when>
- </xsl:choose>
-</xsl:template>
-
-<!-- BEGIN group_list -->
-
-<xsl:template match="group_list">
- <xsl:call-template name="nextmatchs" />
- <xsl:choose>
- <xsl:when test="search_access = 'yes'">
- <xsl:call-template name="search_field" />
- </xsl:when>
- </xsl:choose>
- <table>
- <col class="admin_group_name" />
- <col class="admin_action" />
- <col class="admin_action" />
- <thead>
- <xsl:apply-templates select="group_header" />
- </thead>
- <tbody>
- <xsl:apply-templates select="group_data" />
- </tbody>
- </table>
- <div class="btngrp">
- <xsl:apply-templates select="group_add" />
- </div>
-</xsl:template>
-
-<!-- BEGIN group_header -->
-<xsl:template match="group_header">
- <xsl:variable name="sort_name" select="sort_name" />
- <xsl:variable name="lang_sort_statustext"
- select="lang_sort_statustext" />
- <tr>
- <td>
- <a href="{$sort_name}">
- <xsl:value-of select="lang_name" />
- </a>
- </td>
- <td>
- <xsl:value-of select="lang_edit" />
- </td>
- <td>
- <xsl:value-of select="lang_delete" />
- </td>
- </tr>
-</xsl:template>
-
-<!-- BEGIN group_data -->
-<xsl:template match="group_data">
- <xsl:variable name="lang_edit_statustext">
- <xsl:value-of select="lang_edit_statustext" />
- </xsl:variable>
- <xsl:variable name="lang_delete_statustext">
- <xsl:value-of select="lang_delete_statustext" />
- </xsl:variable>
- <tr>
- <xsl:attribute name="class">
- <xsl:choose>
- <xsl:when test="@class">
- <xsl:value-of select="@class" />
- </xsl:when>
- <xsl:when test="position() mod 2 = 0">
- <xsl:text>row_off</xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text>row_on</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- <td>
- <xsl:value-of select="group_name" />
- </td>
- <td>
- <xsl:variable name="edit_url" select="edit_url" />
- <a href="{$edit_url}">
- <xsl:value-of select="lang_edit" />
- </a>
- </td>
- <td>
- <xsl:variable name="delete_url" select="delete_url" />
- <a href="{$delete_url}">
- <xsl:value-of select="lang_delete" />
- </a>
- </td>
- </tr>
-</xsl:template>
-
-<!-- BEGIN group_add -->
-<xsl:template match="group_add">
- <form method="post" action="{action_url}">
- <xsl:choose>
- <xsl:when test="add_access = 'yes'">
- <button type="submit" name="add"
- onclick="this.value=1;">
- <xsl:value-of select="lang_add" />
- </button>
- </xsl:when>
- </xsl:choose>
- <xsl:variable name="lang_done">
- <xsl:value-of select="lang_done" />
- </xsl:variable>
- <button type="submit" name="done" onclick="this.value=1;">
- <xsl:value-of select="$lang_done" />
- </button>
- <input type="hidden" class="hidden" name="account_id" value="0"
/>
- </form>
-</xsl:template>
-<!-- END group_list -->
-
-<!-- BEGIN group_edit -->
-<xsl:template match="group_edit">
- <xsl:choose>
- <xsl:when test="msgbox_data != ''">
- <p class="msg">
- <xsl:call-template name="msgbox" />
- </p>
- </xsl:when>
- </xsl:choose>
- <xsl:variable name="edit_url">
- <xsl:value-of select="edit_url" />
- </xsl:variable>
- <xsl:variable name="account_id" select="account_id" />
- <xsl:variable name="select_size" select="select_size" />
- <form action="{$edit_url}" method="post">
- <input type="hidden" name="values[account_id]"
- value="{$account_id}" class="hidden" />
- <br />
-
- <label for="account_name">
- <xsl:value-of select="lang_account_name" />
- </label>
- <input type="text" name="values[account_name]"
- id="account_name">
- <xsl:attribute name="value">
- <xsl:value-of select="value_account_name" />
- </xsl:attribute>
- </input>
- <br />
-
- <label for="account_user">
- <xsl:value-of select="lang_include_user" />
- </label>
- <select id="account_user" name="account_user[]"
- multiple="multiple" size="{$select_size}"
- onchange="updateManager()">
- <xsl:apply-templates select="guser_list" />
- </select>
- <br />
-
- <label for="group_manager">
- <xsl:value-of select="lang_group_manager" />
- </label>
- <select id="group_manager" name="group_manager">
- <xsl:apply-templates select="group_manager" />
- </select>
- <br />
-
- <label for="quota">
- <xsl:value-of select="lang_file_space" />
- </label>
- <!-- {account_file_space}{account_file_space_select} -->
- <span class="mock_label">
- <xsl:value-of select="lang_permissions" />
- </span>
- <ul class="admin_apps_list">
- <li class="th">
- <span>
- <xsl:value-of select="lang_application"
/>
- </span>
- <xsl:value-of select="lang_acl" />
- </li>
- <xsl:apply-templates select="app_list" />
- </ul>
- <div class="btngrp">
- <button type="submit" name="values[cancel]"
- onclick="this.value=1;">
- <img src="{img_close}" alt="{lang_close}" />
- <xsl:value-of select="lang_close" />
- </button>
-
- <button type="submit" name="values[save]"
- onclick="this.value=1;">
- <img src="{img_save}" alt="{lang_save}" />
- <xsl:value-of select="lang_save" />
- </button>
- </div>
- </form>
-</xsl:template>
-
-<xsl:template match="guser_list">
- <xsl:variable name="account_id" select="account_id" />
- <xsl:choose>
- <xsl:when test="selected != ''">
- <option value="{$account_id}" selected="selected">
- <xsl:value-of select="account_name" />
- </option>
- </xsl:when>
- <xsl:otherwise>
- <option value="{$account_id}">
- <xsl:value-of select="account_name" />
- </option>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template match="group_manager">
- <xsl:choose>
- <xsl:when test="selected != ''">
- <option value="{account_id}" selected="selected">
- <xsl:value-of select="account_name" />
- </option>
- </xsl:when>
- <xsl:otherwise>
- <option value="{account_id}">
- <xsl:value-of select="account_name" />
- </option>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template match="app_list">
- <li>
- <xsl:attribute name="class">
- <xsl:choose>
- <xsl:when test="@class">
- <xsl:value-of select="@class" />
- <xsl:text>even</xsl:text>
- </xsl:when>
- <xsl:when test="position() mod 2 = 0">
- <xsl:text>row_off even</xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text>row_on even</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- <label for="app_{app_name}">
- <xsl:value-of select="app_title" />
- </label>
- <xsl:choose>
- <xsl:when test="checked != ''">
- <input type="checkbox" id="app_{app_name}"
- name="{checkbox_name}" value="1"
checked="checked"
- class="cbStyled" />
- </xsl:when>
- <xsl:otherwise>
- <input type="checkbox" id="app_{app_name}"
- name="{checkbox_name}" value="1"
class="cbStyled" />
- </xsl:otherwise>
- </xsl:choose>
- <xsl:choose>
- <xsl:when test="acl_url != ''">
- <xsl:variable name="acl_url" select="acl_url" />
- <xsl:variable name="acl_img" select="acl_img" />
- <xsl:variable name="img_name" select="img_name"
/>
- <a href="{$acl_url}">
- <img src="{$acl_img}" alt="{$img_name}"
/>
- </a>
- </xsl:when>
- </xsl:choose>
- <xsl:choose>
- <xsl:when test="grant_url != ''">
- <a href="{grant_url}">
- <img src="{acl_img}"
alt="{grant_img_name}" />
- </a>
- </xsl:when>
- </xsl:choose>
-
- <br />
- </li>
-</xsl:template>
Deleted:
people/sigurdne/modules/admin/trunk/templates/probusiness/mainscreen_message.tpl
===================================================================
---
people/sigurdne/modules/admin/trunk/templates/probusiness/mainscreen_message.tpl
2009-11-20 12:21:55 UTC (rev 20856)
+++
people/sigurdne/modules/admin/trunk/templates/probusiness/mainscreen_message.tpl
2009-11-20 12:23:26 UTC (rev 20857)
@@ -1,22 +0,0 @@
-<!-- BEGIN form -->
-<p class="center">{error_message}</p>
-<form method="post" action="{form_action}">
- <table class="padding" align="center">
- <input type="hidden" name="select_lang" value="{select_lang}" />
- <input type="hidden" name="section" value="{section}" />
- {rows}
- </table>
-</form>
-<!-- END form -->
-
-<!-- BEGIN row -->
- <tr class="bg_view">
- <td class="center">{label}</td>
- <td class="center">{value}</td>
- </tr>
-<!-- END row -->
-
-<!-- BEGIN row_2 -->
- <tr><td colspan="2" class="center">{value}</td></tr>
-<!-- END row_2 -->
-
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] [20857] Delete obsolete,
Sigurd Nes <=