ftimme
2013-05-23 241c4461e655d12933b917b64b0688f1656714da
- Added form to edit software packages.
- Corrected some German translations.
5 files added
11 files modified
246 ■■■■■ changed files
interface/web/admin/form/software_package.tform.php 116 ●●●●● patch | view | raw | blame | history
interface/web/admin/form/software_repo.tform.php 2 ●●● patch | view | raw | blame | history
interface/web/admin/lib/lang/de.lng 2 ●●● patch | view | raw | blame | history
interface/web/admin/lib/lang/de_software_package.lng 6 ●●●●● patch | view | raw | blame | history
interface/web/admin/lib/lang/de_software_package_install.lng 2 ●●● patch | view | raw | blame | history
interface/web/admin/lib/lang/de_software_package_list.lng 4 ●●● patch | view | raw | blame | history
interface/web/admin/lib/lang/de_software_repo.lng 3 ●●●● patch | view | raw | blame | history
interface/web/admin/lib/lang/de_software_repo_list.lng 4 ●●●● patch | view | raw | blame | history
interface/web/admin/lib/lang/de_software_update_list.lng 2 ●●● patch | view | raw | blame | history
interface/web/admin/lib/lang/en_software_package.lng 6 ●●●●● patch | view | raw | blame | history
interface/web/admin/lib/lang/en_software_package_list.lng 2 ●●●●● patch | view | raw | blame | history
interface/web/admin/lib/lang/en_software_repo.lng 1 ●●●● patch | view | raw | blame | history
interface/web/admin/software_package_edit.php 59 ●●●●● patch | view | raw | blame | history
interface/web/admin/software_package_list.php 3 ●●●● patch | view | raw | blame | history
interface/web/admin/templates/software_package_edit.htm 27 ●●●●● patch | view | raw | blame | history
interface/web/admin/templates/software_package_list.htm 7 ●●●●● patch | view | raw | blame | history
interface/web/admin/form/software_package.tform.php
New file
@@ -0,0 +1,116 @@
<?php
/*
Copyright (c) 2008, Till Brehm, projektfarm Gmbh
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
    * Redistributions of source code must retain the above copyright notice,
      this list of conditions and the following disclaimer.
    * Redistributions in binary form must reproduce the above copyright notice,
      this list of conditions and the following disclaimer in the documentation
      and/or other materials provided with the distribution.
    * Neither the name of ISPConfig nor the names of its contributors
      may be used to endorse or promote products derived from this software without
      specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/*
    Form Definition
    Tabellendefinition
    Datentypen:
    - INTEGER (Wandelt Ausdrücke in Int um)
    - DOUBLE
    - CURRENCY (Formatiert Zahlen nach Währungsnotation)
    - VARCHAR (kein weiterer Format Check)
    - TEXT (kein weiterer Format Check)
    - DATE (Datumsformat, Timestamp Umwandlung)
    Formtype:
    - TEXT (normales Textfeld)
    - TEXTAREA (normales Textfeld)
    - PASSWORD (Feldinhalt wird nicht angezeigt)
    - SELECT (Gibt Werte als option Feld aus)
    - RADIO
    - CHECKBOX
    - FILE
    VALUE:
    - Wert oder Array
    Hinweis:
    Das ID-Feld ist nicht bei den Table Values einzufügen.
*/
$form["title"]             = "Software Package";
$form["description"]     = "Modify software package details";
$form["name"]             = "software_package";
$form["action"]            = "software_package_edit.php";
$form["db_table"]        = "software_package";
$form["db_table_idx"]    = "package_id";
$form["db_history"]        = "no";
$form["tab_default"]    = "software_package";
$form["list_default"]    = "software_package_list.php";
$form["auth"]            = 'yes';
$form["auth_preset"]["userid"]  = 0; // 0 = id of the user, > 0 id must match with id of current user
$form["auth_preset"]["groupid"] = 0; // 0 = default groupid of the user, > 0 id must match with groupid of current user
$form["auth_preset"]["perm_user"] = 'riud'; //r = read, i = insert, u = update, d = delete
$form["auth_preset"]["perm_group"] = 'riud'; //r = read, i = insert, u = update, d = delete
$form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete
$form["tabs"]['software_package'] = array (
    'title'     => "Software Package",
    'width'     => 80,
    'template'     => "templates/software_package_edit.htm",
    'fields'     => array (
    ##################################
    # Beginn Datenbankfelder
    ##################################
        'package_title' => array (
            'datatype'    => 'VARCHAR',
            'formtype'    => 'TEXT',
            'validators'    => '',
            'default'    => '',
            'value'        => '',
            'separator'    => '',
            'width'        => '40',
            'maxlength'    => '40',
            'rows'        => '',
            'cols'        => ''
        ),
        'package_key' => array (
            'datatype'    => 'VARCHAR',
            'formtype'    => 'TEXT',
            'validators'    => '',
            'default'    => '',
            'value'        => '',
            'separator'    => '',
            'width'        => '40',
            'maxlength'    => '40',
            'rows'        => '',
            'cols'        => ''
        ),
    ##################################
    # ENDE Datenbankfelder
    ##################################
    )
);
?>
interface/web/admin/form/software_repo.tform.php
@@ -60,7 +60,7 @@
*/
$form["title"]             = "Software Repository";
$form["description"]     = "Software Repositoy which may contain addons or updates";
$form["description"]     = "Software Repository which may contain addons or updates";
$form["name"]             = "software_repo";
$form["action"]            = "software_repo_edit.php";
$form["db_table"]        = "software_repo";
interface/web/admin/lib/lang/de.lng
@@ -35,7 +35,7 @@
$wb['Domains'] = 'Domains';
$wb['Misc'] = 'Diverses';
$wb['Software'] = 'Apps & Add-Ons';
$wb['Repositories'] = 'Bibliotheken';
$wb['Repositories'] = 'Repositories';
$wb['Packages'] = 'Pakete';
$wb['Updates'] = 'Updates';
$wb['Language Editor'] = 'Sprachen Editor';
interface/web/admin/lib/lang/de_software_package.lng
New file
@@ -0,0 +1,6 @@
<?php
$wb["package_title_txt"] = 'Paket-Titel';
$wb["package_key_txt"] = 'Paket-Key';
$wb["Software Package"] = 'Software-Paket';
$wb['Modify software package details'] = 'Software-Paket-Einstellungen bearbeiten';
?>
interface/web/admin/lib/lang/de_software_package_install.lng
@@ -1,6 +1,6 @@
<?php
$wb['head_txt'] = 'Softwarepaket installieren';
$wb['install_key_txt'] = 'Installations Key eingeben';
$wb['install_key_txt'] = 'Installationskey eingeben';
$wb['btn_save_txt'] = 'Installation starten';
$wb['btn_cancel_txt'] = 'Abbrechen';
?>
interface/web/admin/lib/lang/de_software_package_list.lng
@@ -7,5 +7,7 @@
$wb['toolsarea_head_txt'] = 'Pakete';
$wb['repoupdate_txt'] = 'Softwarepakete Liste updaten';
$wb['package_id_txt'] = 'Lokale App ID';
$wb['no_packages_txt'] = 'No packages available';
$wb['no_packages_txt'] = 'Keine Pakete verfügbar';
$wb['edit_txt'] = 'Bearbeiten';
$wb['delete_txt'] = 'Löschen';
?>
interface/web/admin/lib/lang/de_software_repo.lng
@@ -1,7 +1,8 @@
<?php
$wb['repo_name_txt'] = 'Bibliothek';
$wb['repo_name_txt'] = 'Repository';
$wb['repo_url_txt'] = 'URL';
$wb['repo_username_txt'] = 'Benutzername (optional)';
$wb['repo_password_txt'] = 'Passwort (optional)';
$wb['active_txt'] = 'Aktiv';
$wb['Software Repository which may contain addons or updates'] = 'Software-Repository, das Add-Ons oder Updates enthalten kann';
?>
interface/web/admin/lib/lang/de_software_repo_list.lng
@@ -1,6 +1,6 @@
<?php
$wb['list_head_txt'] = 'Bibliothek';
$wb['list_head_txt'] = 'Repository';
$wb['active_txt'] = 'Aktiv';
$wb['repo_name_txt'] = 'Bibliothek';
$wb['repo_name_txt'] = 'Repository';
$wb['repo_url_txt'] = 'URL';
?>
interface/web/admin/lib/lang/de_software_update_list.lng
@@ -5,5 +5,5 @@
$wb['update_title_txt'] = 'Update';
$wb['version_txt'] = 'Version';
$wb['action_txt'] = 'Aktion';
$wb['no_updates_txt'] = 'No updates available';
$wb['no_updates_txt'] = 'Keine Updates verfügbar';
?>
interface/web/admin/lib/lang/en_software_package.lng
New file
@@ -0,0 +1,6 @@
<?php
$wb["package_title_txt"] = 'Package Title';
$wb["package_key_txt"] = 'Package Key';
$wb["Software Package"] = 'Software Package';
$wb['Modify software package details'] = 'Modify software package details';
?>
interface/web/admin/lib/lang/en_software_package_list.lng
@@ -8,4 +8,6 @@
$wb['repoupdate_txt'] = 'Update package list';
$wb['package_id_txt'] = 'local App-ID';
$wb['no_packages_txt'] = 'No packages available';
$wb['edit_txt'] = 'Edit';
$wb['delete_txt'] = 'Delete';
?>
interface/web/admin/lib/lang/en_software_repo.lng
@@ -4,4 +4,5 @@
$wb["repo_username_txt"] = 'User (optional)';
$wb["repo_password_txt"] = 'Password (optional)';
$wb["active_txt"] = 'Active';
$wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
?>
interface/web/admin/software_package_edit.php
New file
@@ -0,0 +1,59 @@
<?php
/*
Copyright (c) 2008, Till Brehm, projektfarm Gmbh
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
    * Redistributions of source code must retain the above copyright notice,
      this list of conditions and the following disclaimer.
    * Redistributions in binary form must reproduce the above copyright notice,
      this list of conditions and the following disclaimer in the documentation
      and/or other materials provided with the distribution.
    * Neither the name of ISPConfig nor the names of its contributors
      may be used to endorse or promote products derived from this software without
      specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/******************************************
* Begin Form configuration
******************************************/
$tform_def_file = "form/software_package.tform.php";
/******************************************
* End Form configuration
******************************************/
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
//* Check permissions for module
$app->auth->check_module_permissions('admin');
if($conf['demo_mode'] == true) $app->error('This function is disabled in demo mode.');
// Loading classes
$app->uses('tpl,tform,tform_actions');
$app->load('tform_actions');
class page_action extends tform_actions {
}
$page = new page_action;
$page->onLoad();
?>
interface/web/admin/software_package_list.php
@@ -181,7 +181,8 @@
$app->tpl->setLoop('records',$packages);
include_once('lib/lang/en_software_package_list.lng');
$language = (isset($_SESSION['s']['language']))?$_SESSION['s']['language']:$conf['language'];
include_once('lib/lang/'.$language.'_software_package_list.lng');
$app->tpl->setVar($wb);
interface/web/admin/templates/software_package_edit.htm
New file
@@ -0,0 +1,27 @@
<h2><tmpl_var name="list_head_txt"></h2>
<p><tmpl_var name="list_desc_txt"></p>
<div class="panel panel_software_package">
    <div class="pnl_formsarea">
        <fieldset class="inlineLabels">
            <div class="ctrlHolder">
                <label for="package_title">{tmpl_var name='package_title_txt'}</label>
                {tmpl_var name='package_title'}<input name="package_title" id="package_title" value="{tmpl_var name='package_title'}" size="40" maxlength="40" type="hidden" class="textInput" />
            </div>
            <div class="ctrlHolder">
                <label for="package_key">{tmpl_var name='package_key_txt'}</label>
                <input name="package_key" id="package_key" value="{tmpl_var name='package_key'}" size="40" maxlength="40" type="text" class="textInput" />
            </div>
        <input type="hidden" name="id" value="{tmpl_var name='id'}">
        <div class="buttonHolder buttons">
            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/software_package_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/software_package_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
        </div>
        </fieldset>
    </div>
</div>
interface/web/admin/templates/software_package_list.htm
@@ -21,7 +21,7 @@
                        <th class="tbl_col_installed" scope="col"><tmpl_var name="installed_txt"></th>
                        <th class="tbl_col_package_title" scope="col"><tmpl_var name="package_title_txt"></th>
                        <th class="tbl_col_package_description" scope="col"><tmpl_var name="package_description_txt"></th>
                        <th class="tbl_col_package_description" scope="col"><tmpl_var name="package_id_txt"></th>
                        <th class="tbl_col_package_id" scope="col"><tmpl_var name="package_id_txt"></th>
                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                    </tr>
                </thead>
@@ -32,8 +32,9 @@
                            <td class="tbl_col_installed">{tmpl_var name="installed"}</td>
                            <td class="tbl_col_package_title">{tmpl_var name="package_title"}</td>
                            <td class="tbl_col_package_description">{tmpl_var name="package_description"}</td>
                            <td class="tbl_col_package_description">ispapp{tmpl_var name="package_id"}</td>
                            <td class="tbl_col_buttons">
                            <td class="tbl_col_package_id">ispapp{tmpl_var name="package_id"}</td>
                            <td class="tbl_col_buttons">
                                <a class="button icons16 icoEdit" href="javascript: loadContent('admin/software_package_edit.php?id={tmpl_var name='package_id'}');"><span>{tmpl_var name='edit_txt'}</span></a>
                                <a class="button icons16 icoDelete" href="javascript: del_record('admin/software_package_del.php?software_update_inst_id={tmpl_var name='software_update_inst_id'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
                            </td>
                        </tr>