Changeset 224
- Timestamp:
- 11/30/07 00:39:35 (13 months ago)
- Location:
- trunk
- Files:
-
- 8 modified
-
ChangeLog (modified) (1 diff)
-
includes/func.inc.php (modified) (1 diff)
-
includes/sites/domain_forward.php (modified) (1 diff)
-
includes/sites/domain_view.php (modified) (1 diff)
-
sql_upgrades (modified) (1 diff)
-
templates/domain_view.tpl (modified) (4 diffs)
-
templates/index_admin.tpl (modified) (2 diffs)
-
web/index.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r220 r224 1 1 CpVES 0.11 YYYY-MM-DD - Jonas Genannt - <jonas.genannt@brachium-system.net> 2 o Added: internal domainforwarding feature 2 3 o Removed: fetchmail check from create_mailbox_size.pl (wrong) 3 4 o Fixed: recipient classes VIEW -
trunk/includes/func.inc.php
r221 r224 256 256 $do="p_spam_fwd"; 257 257 break; 258 case 'autores': 259 $do="p_autores"; 260 break; 258 261 default: 259 262 return false; -
trunk/includes/sites/domain_forward.php
r223 r224 19 19 if (isset($_SESSION['superadmin']) && 20 20 isset($_GET['did']) && 21 $_SESSION['superadmin']=='1'|| 22 $_SESSION['admin']=='1' && 23 isset($_GET['did']) && 24 $access_domain ) 21 $_SESSION['superadmin']=='1') 25 22 { 26 23 if (isset($_POST['domains_forward_save'])&& isset($_POST['to_domain']) && is_numeric($_POST['to_domain'])) { -
trunk/includes/sites/domain_view.php
r222 r224 155 155 // del domain_forward from domains_forward 156 156 if (isset($_GET['sub'])&& $_GET['sub']=="do_fwd" && isset($_GET['act']) && $_GET['act']=="del" && 157 isset($_GET['do_fwd_id']) && is_numeric($_GET['do_fwd_id']) ) {157 isset($_GET['do_fwd_id']) && is_numeric($_GET['do_fwd_id']) && $_SESSION['superadmin']== '1') { 158 158 $sql=sprintf("DELETE FROM domains_forward WHERE id='%s' AND fr_domain='%s'", 159 159 $db->escapeSimple($_GET['do_fwd_id']), -
trunk/sql_upgrades
r220 r224 185 185 INDEX ( `fr_domain` ) 186 186 ) ENGINE = MYISAM ; 187 ALTER TABLE `domains` ADD `p_autores` TINYINT( 1 ) NOT NULL DEFAULT '1'; 187 188 -
trunk/templates/domain_view.tpl
r222 r224 147 147 {if $domain_fwd==0} 148 148 <td colspan="4"> 149 {t 1=$dnsname}no internal domainforward for %1 configured.{/t}<br/><a href="?module=domain_forward&did={$did}">{t}click here to configure an domainfoward.{/t}</a> 149 {t 1=$dnsname}no internal domainforward for %1 configured.{/t} 150 {if $if_superadmin == 1}<br/><a href="?module=domain_forward&did={$did}">{t}click here to configure an domainfoward.{/t}</a>{/if} 150 151 </td> 151 152 </tr> … … 158 159 <tr> 159 160 <td style="padding-right:15px;">@{$dnsname}</td> 160 <td><a href="?module=domain_view&did={$domain_fwd.id}">@{$domain_fwd.dnsname}</a></td> 161 <td style="text-align:right;vertical-align:middle;"><a href="?module=domain_view&did={$did}&sub=do_fwd&act=del&do_fwd_id={$domain_fwd.do_id}"><img src="img/icons/delete.png" style="border:0px;" alt="" /></a></td> 161 <td> 162 {if $if_superadmin == 1} 163 <a href="?module=domain_view&did={$domain_fwd.id}">@{$domain_fwd.dnsname}</a> 164 {else} 165 @{$domain_fwd.dnsname} 166 {/if} 167 </td> 168 <td style="text-align:right;vertical-align:middle;"> 169 {if $if_superadmin == 1} 170 <a href="?module=domain_view&did={$did}&sub=do_fwd&act=del&do_fwd_id={$domain_fwd.do_id}"><img src="img/icons/delete.png" style="border:0px;" alt="" /></a> 171 {/if} 172 </td> 162 173 </tr> 163 174 {/if} … … 169 180 {foreach from=$table_domain_points item=row} 170 181 <tr> 171 <td><a href="?module=domain_view&did={$row.fr_domain}">@{$row.fr_domain_name}</a></td> 182 <td> 183 {if $if_superadmin == 1}<a href="?module=domain_view&did={$row.fr_domain}">@{$row.fr_domain_name}</a> 184 {else} 185 @{$row.fr_domain_name} 186 {/if}</td> 172 187 </tr> 173 188 {/foreach} 189 190 {if $if_superadmin == 1 } 191 {* superadmin can copy all addresses to the forwarding domains... *} 192 <tr> 193 <td colspan="4" style="text-align:right;"><a href="?module=domain_fwd_copy&did={$did}">{t}copy addresses to forwarding domains{/t}</a></td> 194 </tr> 195 {/if} 196 197 174 198 {/if} 175 199 … … 268 292 <a href="?module=domain_view&did={$did}&fstate=0&f=webinterface"> 269 293 <img src="img/icons/button_ok.png" style="border:0px;" title="{t}deactivate CpVES webinterface.{/t}" alt="" /></a> 294 {/if}</td> 295 </tr> 296 <tr> 297 <td>{t}vacation{/t}:</td> 298 <td></td> 299 <td style="text-align:right;"> 300 {if $domain.p_autores == 0 } 301 <a href="?module=domain_view&did={$did}&fstate=1&f=autores"> 302 <img src="img/icons/button_cancel.png" style="border:0px;" title="{t}activate CpVES vacation.{/t}" alt="" /></a> 303 {else} 304 <a href="?module=domain_view&did={$did}&fstate=0&f=autores"> 305 <img src="img/icons/button_ok.png" style="border:0px;" title="{t}deactivate CpVES vacation.{/t}" alt="" /></a> 270 306 {/if}</td> 271 307 </tr> -
trunk/templates/index_admin.tpl
r220 r224 8 8 {/if} 9 9 </tr> 10 { section name=row loop=$table_data}10 {foreach item=row from=$table_data} 11 11 <tr bgcolor="{cycle values="$color1,$color2"}"> 12 <td style="padding-left:3px; ">12 <td style="padding-left:3px;padding-right:10px;"> 13 13 <div style="float:left;"> 14 14 <a href="?module=domain_view&did={$row.id}">{$row.dnsname}</a></div> 15 15 {if $row.vacation == 1} 16 16 <div style="float:right;padding:0px;"> … … 21 21 {/if} 22 22 </td> 23 <td style="text-align:right;">{$ table_data[row].count_email}</td>24 <td style="text-align:right;">{$ table_data[row].count_forward}</td>23 <td style="text-align:right;">{$row.count_email}</td> 24 <td style="text-align:right;">{$row.count_forward}</td> 25 25 {if $config.display_mb_size == 1 } 26 26 <td>{$row.mb_size.size} {if $row.mb_size.unit == 'gb'}GB{else}MB{/if}</td> 27 27 {/if} 28 28 </tr> 29 {/ section}29 {/foreach} 30 30 </table> -
trunk/web/index.php
r221 r224 64 64 $site="domain_forward"; 65 65 break; 66 case 'domain_fwd_copy': 67 $site="domain_fwd_copy"; 68 break; 66 69 case 'list_add': 67 70 $site="list_add";
