Changeset 1075

Timestamp:

03/23/08 23:50:14 (8 months ago)

Author:

rats

Message:

Fixed: Reformated SSL switch
Fixed: Error in Circular Mail if no user set
Fixed: (OpenSuse?) proftpd.conf not working out of box

Files:

• trunk/CHANGELOG (modified) (1 diff)
• trunk/configs/dists/opensuse/proftpd/proftpd.conf (modified) (3 diffs)
• trunk/gui/admin/circular.php (modified) (3 diffs)
• trunk/gui/reseller/circular.php (modified) (3 diffs)
• trunk/gui/themes/omega_original/index.tpl (modified) (1 diff)
• trunk/language-files/portugues/portugues_brazil (moved) (moved from trunk/language-files/portugues/portuguese_brazilian) (1 diff)

trunk/CHANGELOG

@@ -5 +5 @@
-        - GUI:
-                * Fixed: Warnings and Notices if no Database found or no conection to it
+                * Fixed: Reformated SSL switch
+                * Fixed: Error in Circular Mail if no user set
-        - ENGINE:
-                * Fixed #836: Static awstats in user's language
+        - DISTS:
+                * Fixed: (OpenSuse) proftpd.conf not working out of box
-
-2008-03-22 Benedikt Heintel

trunk/configs/dists/opensuse/proftpd/proftpd.conf

@@ -18 +18 @@
-#
-################################################################################
-
-
+
+
-
-# Set off to disable IPv6 support which is annoying on IPv4 only boxes.
@@ -161 +161 @@
-
-# ispCP SQL Managment
+<IfModule mod_sql_mysql.c>
-SQLBackend                 mysql
-SQLAuthTypes               Crypt
@@ -168 +169 @@
-SQLGroupInfo               ftp_group groupname gid members
-SQLMinID                   2000
+</IfModule>
-
-# A basic anonymous configuration, no upload directories.

trunk/gui/admin/circular.php

@@ -67 +67 @@
-                $rs = exec_query($sql, $query, array($user_id));
-
+                if (isset($rs->fields['fname']) && isset($rs->fields['lname'])) {
+                        $sender_name = $rs->fields['fname'] . " " . $rs->fields['lname'];
+                } elseif(isset($rs->fields['fname']) && !isset($rs->fields['lname'])) {
+                        $sender_name = $rs->fields['fname'];
+                } elseif(!isset($rs->fields['fname']) && isset($rs->fields['lname'])) {
+                        $sender_name = $rs->fields['lname'];
+                } else {
+                        $sender_name = "";
+                }
+
-                $tpl->assign(
-                                array(
@@ -72 +82 @@
-                                        'MESSAGE_TEXT' => '',
-                                        'SENDER_EMAIL' => $rs->fields['email'],
-rs->fields['fname'] . " " . $rs->fields['lname']
+sender_name
-                                        )
-                                );
@@ -192 +202 @@
-        $subject = encode($subject);
-
-From: " . $from . "
-MIME-Version: 1.0\nContent-Type: text/plain; charset=utf-8\nContent-Transfer-Encoding: 8bit
+MIME-Version: 1.0\nContent-Type: text/plain; charset=utf-8\nContent-Transfer-Encoding: 8bit
+From: " . $from . "
-        $headers .= "X-Mailer: ispCP marketing mailer";
-

trunk/gui/reseller/circular.php

@@ -26 +26 @@
-        if (isset($_POST['uaction']) && $_POST['uaction'] === 'send_circular') {
-                $tpl->assign(
-
+
+
-                                'MESSAGE_TEXT' => clean_input($_POST['msg_text'], false),
-                                'SENDER_EMAIL' => clean_input($_POST['sender_email'], false),
@@ -48 +49 @@
-                $rs = exec_query($sql, $query, array($user_id));
-
+                if (isset($rs->fields['fname']) && isset($rs->fields['lname'])) {
+                        $sender_name = $rs->fields['fname'] . " " . $rs->fields['lname'];
+                } elseif(isset($rs->fields['fname']) && !isset($rs->fields['lname'])) {
+                        $sender_name = $rs->fields['fname'];
+                } elseif(!isset($rs->fields['fname']) && isset($rs->fields['lname'])) {
+                        $sender_name = $rs->fields['lname'];
+                } else {
+                        $sender_name = "";
+                }
+
-                $tpl->assign(
-
+
+
-                                'MESSAGE_TEXT' => '',
-                                'SENDER_EMAIL' => $rs->fields['email'],
-rs->fields['fname'] . " " . $rs->fields['lname']
+sender_name
-                                )
-                        );
@@ -139 +151 @@
-        $subject = encode($subject);
-
-From: " . $from . "
-MIME-Version: 1.0\nContent-Type: text/plain; charset=utf-8\nContent-Transfer-Encoding: 8bit
+MIME-Version: 1.0\nContent-Type: text/plain; charset=utf-8\nContent-Transfer-Encoding: 8bit
+From: " . $from . "
-        $headers .= "X-Mailer: ispCP marketing mailer";
-

trunk/gui/themes/omega_original/index.tpl

@@ -8 +8 @@
-  <script type="text/javascript" src="{THEME_COLOR_PATH}/css/ispcp.js"></script>
- </head>
-
-
-
+ 
+  
+ 
-    <td>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<td colspan="4">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+     
+    
+   
+        
+        
+       
+      
+       
+       
+       
+      
+       
+       
+       
+      
+     
+       
+      
+      
+      
+      
+       
+       
+      
+      
+      
+      
+      
+      
+       
+       
+      <td colspan="4">&nbsp;
+       
+       
+      
+      
+      
+      
+       
+       
+      
+      
+       
+       
+      
+      
+      
+      
+       
-<!-- /* Uncomment this, to use SSL-Switch */
-         <tr>
-
-
-
+
-         </tr>
-
-         <tr>
-
-
-
-
-
-
+
+
+
-         </tr>
-/* END SSL-Switch */ -->
+        </table>
+        </form>
+       </td>
+      </tr>
+     </table>
+     <table align="center" width="453">
+      <tr>
+       <td align="right" class="login">Powered by <a class="login" href="http://www.isp-control.net" target="_blank">ispCP Omega</a></td>
+      </tr>
+     </table>
+    </td>
+   </tr>
-  </table>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-</html>

trunk/language-files/portugues/portugues_brazil

@@ -1 @@
-eBrazilian
+Brazil
-ispcp_language = Portugues (Brazil)
-ispcp_languageSetlocaleValue = pt_BR