Development

Wiki Start
Wishlist
Timeline
Roadmap
Browse Source
New Ticket
View Tickets

Changeset 1204

Show
Ignore:
Timestamp:
06/06/08 09:39:49 (4 months ago)
Author:
zothos
Message:

Fixed #1336, #1335 and #1337

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/CHANGELOG

    r1202 r1204  
    11ispCP ω 1.0.0 Changelog 
    22~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
     3 
     42008-06-06 Jochen Manz 
     5        - GUI: 
     6                * Fixed #1336: some better web accessability - (Part 3); and some more 
     7        - LANGUAGES: 
     8                * Fixed #1335: tiny german language file update (patch included) 
     9        - CONFIGS: 
     10                * Fixed #1337: freebsd ispcp.conf ajustment agains dev new ispcp.conf 
    311 
    4122008-06-04 Benedikt Heintel 

  • trunk/configs/freebsd/ispcp.conf

    r1201 r1204  
    3131CMD_AWK = /usr/bin/awk 
    3232 
    33 CMD_BZCAT = /bin/bzcat 
     33CMD_BZCAT = /usr/bin/bzcat 
    3434 
    3535CMD_BZIP = /usr/bin/bzip2 
    …… 
    4949CMD_ECHO = /bin/echo 
    5050 
    51 CMD_EGREP = /bin/egrep 
    52  
    53 CMD_GZCAT = /bin/zcat 
     51CMD_EGREP = /usr/bin/egrep 
     52 
     53CMD_GZCAT = /usr/bin/zcat 
    5454 
    5555CMD_GZIP = /usr/bin/gzip 
    …… 
    7777CMD_RM = /bin/rm 
    7878 
    79 CMD_SED = /bin/sed 
     79CMD_SED = /usr/bin/sed 
    8080 
    8181CMD_SHELL = /usr/local/bin/bash 
    8282 
    83 CMD_TAR = /bin/tar 
     83CMD_TAR = /usr/bin/tar 
    8484 
    8585CMD_TOUCH = /usr/bin/touch 

  • trunk/gui/include/database-update-functions.php

    r1199 r1204  
    9191                $functionName   = returnFunctionName($newRevision); 
    9292 
    93                 // Create some empty arrays 
    94                 $tmpArray               = array(); 
    95                 $queryArray             = array(); 
    96  
    97                 // Pull the query from the update function 
    98                 $tmpArray               = $functionName(); 
    99  
    100                 // Put each query into the queryArray 
    101                 foreach($tmpArray as $oneEntry) { 
    102                         $queryArray[] = $oneEntry; 
    103                 } 
    104                  
    105                 // Add the query to set the new Database Revision 
     93                // Pull the query from the update function using a variable function 
     94                $queryArray     = $functionName(); 
     95 
     96                // Add the query, to set the new Database Revision, to our queryArray 
    10697                $queryArray[]   = "UPDATE `config` SET `value` = '$newRevision' WHERE `name` = 'DATABASE_REVISION'"; 
    10798 
    …… 
    109100                $sql->StartTrans(); 
    110101 
    111                 // Execute every query in our queryarray 
     102                // Execute every query in our queryArray 
    112103                foreach($queryArray as $query) { 
    113104                        $sql->Execute($query); 
    114105                } 
    115106 
    116                 // Prompt an error and break while-loop when an update fails 
     107                // Set failedUpdate to true if an databaseUpdate failed 
    117108                if ($sql->HasFailedTrans())                      
    118109                        $failedUpdate = true; 
    …… 
    128119 
    129120/* 
    130  * Insert the update functions below this entry please. The revision has to be ascending and unique. 
     121 * Insert the update functions below this entry. The revision has to be ascending and unique. 
    131122 * Each databaseUpdate function has to return a array. Even if the array contains only one entry. 
    132  * Don't insert an update twice! 
    133123 */ 
    134124 

  • trunk/gui/themes/omega_original/admin/support_system.tpl

    r1172 r1204  
    7373            <td class="{CONTENT}" nowrap="nowrap"><img src="{THEME_COLOR_PATH}/images/icons/document.png" width="12" height="15" align="left" /> 
    7474                    <script type="text/javascript"> 
     75<!-- 
    7576                                                        document.write('<a href="view_ticket.php?ticket_id={ID}&screenwidth='+screen.width+'" class="link">'); 
     77//--> 
    7678                                                </script> 
    7779              {SUBJECT}</a></td> 

  • trunk/gui/themes/omega_original/client/add_mail_acc.tpl

    r1172 r1204  
    184184              <!-- EDP: page_message --> 
    185185              <tr> 
    186                 <td nowrap="nowrap" class="content2" width="200">{TR_USERNAME}</td> 
    187                 <td valign="middle" nowrap="nowrap" class="content"><input type="text" name="username" value="{USERNAME}" style="width:210px" class="textinput"></td> 
    188               </tr> 
    189               <tr> 
    190                 <td nowrap="nowrap" class="content2" width="200"><input type="radio" name="dmn_type" value="dmn" {MAIL_DMN_CHECKED} onclick="changeDom('real');">{TR_TO_MAIN_DOMAIN}</td> 
     186                <td nowrap="nowrap" class="content2" width="200"><label for="username">{TR_USERNAME}</label></td> 
     187                <td valign="middle" nowrap="nowrap" class="content"><input type="text" name="username" id="username" value="{USERNAME}" style="width:210px" class="textinput"></td> 
     188              </tr> 
     189              <tr> 
     190                <td nowrap="nowrap" class="content2" width="200"><input type="radio" name="dmn_type" id="dmn_type1" value="dmn" {MAIL_DMN_CHECKED} onclick="changeDom('real');"><label for="dmn_type1">{TR_TO_MAIN_DOMAIN}</label></td> 
    191191                <td nowrap="nowrap" class="content" colspan="2">@{DOMAIN_NAME}</td> 
    192192              </tr> 
    193193                          <!-- BDP: to_alias_domain --> 
    194194              <tr> 
    195                 <td nowrap="nowrap" class="content2" width="200"><input type="radio" name="dmn_type" value="als" {MAIL_ALS_CHECKED} onclick="changeDom('alias');">{TR_TO_DMN_ALIAS}</td> 
     195                <td nowrap="nowrap" class="content2" width="200"><input type="radio" name="dmn_type" id="dmn_type2" value="als" {MAIL_ALS_CHECKED} onclick="changeDom('alias');"><label for="dmn_type2">{TR_TO_DMN_ALIAS}</label></td> 
    196196                <td nowrap="nowrap" class="content"><select name="als_id"> 
    197197                    <!-- BDP: als_list --> 

  • trunk/gui/themes/omega_original/client/change_personal.tpl

    r1191 r1204  
    9999                      <tr> 
    100100                        <td>&nbsp;</td> 
    101                         <td class="content2"><label for="email">{TR_EMAIL}</label></td> 
    102                         <td class="content"><input type="text" name="email" id="email" value="{EMAIL}" style="width:210px" class="textinput"></td> 
     101                        <td class="content2"><label for="email1">{TR_EMAIL}</label></td> 
     102                        <td class="content"><input type="text" name="email" id="email1" value="{EMAIL}" style="width:210px" class="textinput"></td> 
    103103                      </tr> 
    104104                      <tr> 

  • trunk/gui/themes/omega_original/client/create_catchall.tpl

    r1172 r1204  
    100100                              //--> 
    101101                              </script> 
    102                               <td nowrap="nowrap" class="content2" width="200"><input type="radio" name="mail_type" value="normal" {NORMAL_MAIL} onclick="changeType('normal');"> 
    103                                 {TR_MAIL_LIST}</td> 
     102                              <td nowrap="nowrap" class="content2" width="200"><input type="radio" name="mail_type" id="mail_type1" value="normal" {NORMAL_MAIL} onclick="changeType('normal');"> 
     103                                <label for="mail_type1">{TR_MAIL_LIST}</label></td> 
    104104                              <td nowrap="nowrap" class="content"><select name="mail_id"> 
    105105                                  <!-- BDP: mail_list --> 
    …… 
    109109                            </tr> 
    110110                            <tr> 
    111                               <td nowrap="nowrap" class="content2" colspan="2"><input type="radio" name="mail_type" value="forward" {FORWARD_MAIL} onclick="changeType('forward');"> 
    112                                 {TR_FORWARD_MAIL}</td> 
     111                              <td nowrap="nowrap" class="content2" colspan="2"><input type="radio" name="mail_type" id="mail_type2" value="forward" {FORWARD_MAIL} onclick="changeType('forward');"> 
     112                                <label for="mail_type2">{TR_FORWARD_MAIL}</label></td> 
    113113                            </tr> 
    114114                            <tr> 
    115                               <td nowrap="nowrap" class="content2" width="200">{TR_FORWARD_TO}</td> 
    116                               <td nowrap="nowrap" class="content"><textarea name="forward_list" cols="35" rows="5" style="width:210px"></textarea></td> 
     115                              <td nowrap="nowrap" class="content2" width="200"><label for="forward_list">{TR_FORWARD_TO}</label></td> 
     116                              <td nowrap="nowrap" class="content"><textarea name="forward_list" id="forward_list" cols="35" rows="5" style="width:210px"></textarea></td> 
    117117                            </tr> 
    118118                          </table> 

  • trunk/gui/themes/omega_original/client/edit_alias.tpl

    r1191 r1204  
    7171                        <td width="200" class="content2" style="vertical-align:top;">{TR_ENABLE_FWD}</td> 
    7272                        <td class="content"> 
    73                             <input type="radio" name="status" {CHECK_EN} value="1" /> {TR_ENABLE}<br /> 
    74                             <input type="radio" name="status" {CHECK_DIS} value="0" /> {TR_DISABLE} 
     73                            <input type="radio" name="status" id="status1" {CHECK_EN} value="1" /> <label for="status1">{TR_ENABLE}</label><br /> 
     74                            <input type="radio" name="status" id="status2" {CHECK_DIS} value="0" /> <label for="status2">{TR_DISABLE}</label> 
    7575                        </td> 
    7676                      </tr> 

  • trunk/gui/themes/omega_original/client/support_system.tpl

    r1172 r1204  
    7272                            <td class="{CONTENT}" nowrap="nowrap"><img src="{THEME_COLOR_PATH}/images/icons/document.png" width="12" height="15" align="left"> 
    7373                                <script type="text/javascript"> 
     74<!-- 
    7475                                                        document.write('<a href="view_ticket.php?ticket_id={ID}&screenwidth='+screen.width+'" class="link">'); 
     76//--> 
    7577                                                </script> 
    7678                              {SUBJECT}</a></td> 

  • trunk/gui/themes/omega_original/lostpassword.tpl

    r1170 r1204  
    5858        </td> 
    5959    </tr> 
    60   <tr> 
     60    <tr> 
    6161    <td></td> 
    6262    </tr> 
    63  
    6463  </table> 
    6564 

  • trunk/gui/themes/omega_original/lostpassword_message.tpl

    r1169 r1204  
    4242        </td> 
    4343    </tr> 
    44   <tr> 
     44    <tr> 
    4545    <td></td> 
    4646    </tr> 
    47  
    4847  </table> 
    4948 

  • trunk/gui/themes/omega_original/maintenancemode.tpl

    r1172 r1204  
    2424           <table width="453" border="0" cellpadding="0" cellspacing="1"> 
    2525            <tr> 
    26              <td align="center" valign="middle" bgcolor="#FFFFFF"><strong><span class="message">&nbsp;{TR_MESSAGE}&nbsp;</span></strong></td> 
     26             <td align="center" valign="middle" bgcolor="#FFFFFF"><strong><span class="message">{TR_MESSAGE}</span></strong></td> 
    2727            </tr> 
    2828            <tr> 

  • trunk/gui/themes/omega_original/reseller/circular.tpl

    r1172 r1204  
    99<script type="text/javascript"> 
    1010<!-- 
    11  
    1211function change_status(dom_id) { 
    1312        if (!confirm("{TR_MESSAGE_CHANGE_STATUS}")) 
    1413                return false; 
    15  
    1614        location = ('change_status.php?domain_id=' + dom_id); 
    1715} 
    …… 
    2018        if (!confirm("{TR_MESSAGE_DELETE_ACCOUNT}")) 
    2119                return false; 
    22  
    2320        location = url; 
    2421} 
    2522//--> 
    2623</script> 
     24</head> 
    2725 
    28 </head> 
    2926<body onload="MM_preloadImages('{THEME_COLOR_PATH}/images/icons/database_a.gif','{THEME_COLOR_PATH}/images/icons/hosting_plans_a.gif','{THEME_COLOR_PATH}/images/icons/domains_a.gif','{THEME_COLOR_PATH}/images/icons/general_a.gif' ,'{THEME_COLOR_PATH}/images/icons/manage_users_a.gif','{THEME_COLOR_PATH}/images/icons/webtools_a.gif','{THEME_COLOR_PATH}/images/icons/statistics_a.gif','{THEME_COLOR_PATH}/images/icons/support_a.gif')"> 
    3027<!-- BDP: logged_from --><table width="100%" border="0" cellspacing="0" cellpadding="0"> 

  • trunk/gui/themes/omega_original/reseller/support_system.tpl

    r1172 r1204  
    7474                          <td class="{CONTENT}" nowrap="nowrap"><img src="{THEME_COLOR_PATH}/images/icons/document.png" width="12" height="15" align="left" /> 
    7575                              <script type="text/javascript"> 
     76<!-- 
    7677                                                        document.write('<a href="view_ticket.php?ticket_id={ID}&screenwidth='+screen.width+'" class="link">'); 
     78//--> 
    7779                                                </script> 
    7880                            {SUBJECT}</a></td> 

  • trunk/gui/themes/omega_original/system-message.tpl

    r1172 r1204  
    2323           <table width="453" border="0" cellpadding="0" cellspacing="1"> 
    2424            <tr> 
    25              <td align="center" valign="middle" bgcolor="#ffffff"><strong><span class="message">&nbsp;{MESSAGE}&nbsp;</span></strong></td> 
     25             <td align="center" valign="middle" bgcolor="#ffffff"><strong><span class="message">{MESSAGE}</span></strong></td> 
    2626            </tr> 
    2727            <tr> 

  • trunk/language-files/languages/german_germany

    r1194 r1204  
    925925Unknown type = Unbekannter Typ 
    926926Welcome {USERNAME} to ispCP! = Willkommen {USERNAME} auf ispCP! 
    927 \n\nHello {NAME}!\n\nA new ispCP account has been created for you.\nYour account information:\n\nUser type: {USERTYPE}\nUser name: {USERNAME}\nPassword: {PASSWORD}\n\nRemember to change your password often and the first time you login.\n\nYou can login right now at http://{BASE_SERVER_VHOST}\n\nBest wishes with ispCP!\nThe ispCP Team.\n\n = \n\nHallo {NAME}!\n\nEin neues ispCP-Konto wurde für Sie erstellt.\nIhre Kontozugangsdaten:\n\nBenutzertyp: {USERTYPE}\nBenutzername: {USERNAME}\nPassword: {PASSWORD}\n\nVergessen Sie nicht, Ihr Passwort nach dem ersten Login zu ändern.\n\nSie können sich nun über folgenden Link einloggen: http://{BASE_SERVER_VHOST}\n\nViel Spaß mit ispCP!\nDas ispCP-Team.\n\n 
     927\n\nHello {NAME}!\n\nA new ispCP account has been created for you.\nYour account information:\n\nUser type: {USERTYPE}\nUser name: {USERNAME}\nPassword: {PASSWORD}\n\nRemember to change your password often and the first time you login.\n\nYou can login right now at http://{BASE_SERVER_VHOST}\n\nBest wishes with ispCP!\nThe ispCP Team.\n\n = \n\nHallo {NAME}!\n\nEin neues ispCP-Konto wurde für Sie erstellt.\nIhre Kontozugangsdaten lauten:\n\nBenutzertyp: {USERTYPE}\nBenutzername: {USERNAME}\nPassword: {PASSWORD}\n\nVergessen Sie nicht, Ihr Passwort nach dem ersten Login zu ändern.\n\nSie können sich nun über den folgenden Link einloggen: http://{BASE_SERVER_VHOST}\n\nViel Spaß mit ispCP!\nDas ispCP-Team.\n\n 
    928928Please activate your new ispCP password! = Bitte aktivieren Sie Ihren ispCP-Zugang! 
    929 \n\nHello {NAME}!\nUse this link to activate your new ispCP password:\n\n{LINK}\n\nGood Luck with the ispCP System\nThe ispCP Team\n\n = \n\nHallo {NAME}!\nBenutzen Sie diesen Link um Ihr neues ispCP-Passwort zu aktivieren:\n\n{LINK}\n\nViel Erfolg mit dem ispCP-System!\nDas ispCP-Team.\n\n 
     929\n\nHello {NAME}!\nUse this link to activate your new ispCP password:\n\n{LINK}\n\nGood Luck with the ispCP System\nThe ispCP Team\n\n = \n\nHallo {NAME}!\n\nBenutzen Sie den folgenden Link um Ihr neues ispCP-Passwort zu aktivieren:\n\n{LINK}\n\nViel Erfolg mit dem ispCP-System!\nDas ispCP-Team.\n\n 
    930930Your new ispCP login! = Ihr neuer ispCP-Zugang 
    931931\n\nHello {NAME}!\n\nYour user name is: {USERNAME}\nYour password is: {PASSWORD}\n\nYou can login at http://{BASE_SERVER_VHOST}\n\nBest wishes with ispCP!\nThe ispCP Team\n\n = \n\nHallo {NAME}!\n\nIhr ispCP-Benutzername ist: {USERNAME}\nIhr ispCP-Passwort ist: {PASSWORD}\n\nSie können sich unter http://{BASE_SERVER_VHOST} anmelden.\n\nViel Erfolg mit dem ispCP-System!\nDas ispCP-Team.\n\n 
    932932Confirmation for domain order {DOMAIN}! = Bestellbestätigung für Ihre Domain {DOMAIN} 
    933 \n\nDear {NAME},\nThis is an automatic confirmation for the order of the domain:\n\n{DOMAIN}\n\nThank you for using ispCP services.\nThe ispCP Team\n\n = \n\nSehr geehrte(r) {NAME},\nDies ist eine automatische Bestellbestätigung für Ihre Domain\n\n{DOMAIN}\n\nVielen Dank, dass Sie den ispCP-Dienst benutzen.\nDas ispCP-Team\n\n 
     933\n\nDear {NAME},\nThis is an automatic confirmation for the order of the domain:\n\n{DOMAIN}\n\nThank you for using ispCP services.\nThe ispCP Team\n\n = \n\nSehr geehrte(r) {NAME},\n\nDies ist eine automatische Bestellbestätigung für Ihre Domain\n\n{DOMAIN}\n\nVielen Dank, dass Sie den ispCP-Dienst benutzen.\nDas ispCP-Team\n\n 
    934934New alias order for {CUSTOMER}! = Neue Alias-Bestellung von {CUSTOMER}! 
    935935\n\nDear {RESELLER},\nYour customer {CUSTOMER} is awaiting for the approval of his new alias:\n\n{ALIAS}\n\nOnce logged in, you can activate his new alias at\nhttp://{BASE_SERVER_VHOST}/reseller/domain_alias.php\n\nThank you for using ispCP services.\nThe ispCP Team\n\n = \n\nHallo {RESELLER},\nIhr Kunde {CUSTOMER} wartet auf die Freischaltung seines neuen Alias:\n\n{ALIAS}\n\nEinmal eingeloggt, können Sie den neuen Alias aktivieren \nhttp://{BASE_SERVER_VHOST}/reseller/domain_alias.php\n\nDas ispCP-Team\n\n 
    936936Catchall account = Catch-All-Konto 
    937 We are sorry, but the system is currently under maintenance.\nPlease try again later. = Bitte entschuldigen Sie, aber das System ist gerade im Wartungsmodus.\nBitte versuchen Sie es später wieder. 
     937We are sorry, but the system is currently under maintenance.\nPlease try again later. = Bitte entschuldigen Sie, aber das System ist gerade im Wartungsmodus.\nBitte versuchen Sie es später noch einmal. 
    938938Could not get config from database = Konnte die Konfiguration nicht aus der Datenbank laden 
    939939You have to wait %d seconds = Sie müssen noch %d Sekunden warten 

  • trunk/language-files/po/de_DE.po

    r1194 r1204  
    30583058"\n" 
    30593059"Ein neues ispCP-Konto wurde für Sie erstellt.\n" 
    3060 "Ihre Kontozugangsdaten:\n" 
     3060"Ihre Kontozugangsdaten lauten:\n" 
    30613061"\n" 
    30623062"Benutzertyp: {USERTYPE}\n" 
    …… 
    30663066"Vergessen Sie nicht, Ihr Passwort nach dem ersten Login zu ändern.\n" 
    30673067"\n" 
    3068 "Sie können sich nun über folgenden Link einloggen: http://{BASE_SERVER_VHOST}\n" 
     3068"Sie können sich nun über den folgenden Link einloggen: http://{BASE_SERVER_VHOST}\n" 
    30693069"\n" 
    30703070"Viel Spaß mit ispCP!\n" 
    …… 
    30903090"\n" 
    30913091"Hallo {NAME}!\n" 
    3092 "Benutzen Sie diesen Link um Ihr neues ispCP-Passwort zu aktivieren:\n" 
     3092"\n" 
     3093"Benutzen Sie den folgenden Link um Ihr neues ispCP-Passwort zu aktivieren:\n" 
    30933094"\n" 
    30943095"{LINK}\n" 
    …… 
    31463147"\n" 
    31473148"Sehr geehrte(r) {NAME},\n" 
     3149"\n" 
    31483150"Dies ist eine automatische Bestellbestätigung für Ihre Domain\n" 
    31493151"\n" 
    …… 
    31933195msgstr "" 
    31943196"Bitte entschuldigen Sie, aber das System ist gerade im Wartungsmodus.\n" 
    3195 "Bitte versuchen Sie es später wieder." 
     3197"Bitte versuchen Sie es später noch einmal." 
    31963198 
    31973199msgid "Could not get config from database"