Changeset 840 in ExiteCMS


Ignore:
Timestamp:
09/26/07 00:39:24 (4 years ago)
Author:
hverton
Message:

minor bugfixes
further work on Gallery integration

Location:
modules/common
Files:
24 deleted
48 edited

Legend:

Unmodified
Added
Removed

  • modules/common/gallery/php-files/modules/gallery/administer_startpage.php

    r833 r840  
    9696 
    9797<input type="hidden" name="sort" value="1"> 
    98 <input type="submit" name="confirm" value="<?php echo gTranslate('core', "Sort") ?>"> 
    99 <input type="button" name="cancel" value="<?php echo gTranslate('core', "Close Window") ?>" onclick='parent.close()'> 
     98<input type="submit" class="button" name="confirm" value="<?php echo gTranslate('core', "Sort") ?>"> 
     99<input type="button" class="button" name="cancel" value="<?php echo gTranslate('core', "Close Window") ?>" onclick='parent.close()'> 
    100100</form> 
    101101<?php 
    … …  
    107107    dismissAndReload(); 
    108108?> 
    109     <input type="button" name="cancel" value="<?php echo gTranslate('core', "Close Window") ?>" onclick='parent.close()'> 
     109    <input type="button" class="button" name="cancel" value="<?php echo gTranslate('core', "Close Window") ?>" onclick='parent.close()'> 
    110110<?php 
    111111} 

  • modules/common/gallery/php-files/modules/gallery/album_permissions.php

    r833 r840  
    146146    $permsTable->addElement( 
    147147       array('content' => 
    148         "\n\t<input type=\"submit\" name=\"submit[$perm]\" value=\"-->\"><br>". 
    149         "\n\t<input type=\"submit\" name=\"submit[$perm]\" value=\"<--\">" 
     148        "\n\t<input type=\"submit\" class=\"button\" name=\"submit[$perm]\" value=\"-->\"><br>". 
     149        "\n\t<input type=\"submit\" class=\"button\" name=\"submit[$perm]\" value=\"<--\">" 
    150150    )); 
    151151    $permsTable->addElement( 
    … …  
    162162<input type="checkbox" id="setNested" name="setNested" value="setNested" <?php if (getRequestVar('setNested')) echo 'CHECKED'; ?>> 
    163163<br><br> 
    164 <input type="submit" name="save" value="<?php echo gTranslate('core', "Save") ?>"> 
    165 <input type="button" name="done" value="<?php echo gTranslate('core', "Done") ?>" onclick='parent.close()'> 
     164<input type="submit" class="button" name="save" value="<?php echo gTranslate('core', "Save") ?>"> 
     165<input type="button" class="button" name="done" value="<?php echo gTranslate('core', "Done") ?>" onclick='parent.close()'> 
    166166</form> 
    167167</div> 

  • modules/common/gallery/php-files/modules/gallery/albums.php

    r836 r840  
    353353        <td class="leftspacer"></td> 
    354354        <td> 
    355           <table cellspacing="0" cellpadding="0" border="0" class="mod_title_bg"> 
     355          <table cellspacing="0" cellpadding="0" border="0" width='100%' class="mod_title_bg"> 
    356356            <tr> 
    357357              <td class="mod_title_left"></td> 
    358358              <td class="title"> 
    359359                <?php 
    360             echo editField($gallery->album, "title", $albumURL); 
    361             if ($gallery->user->canDownloadAlbum($gallery->album) && $gallery->album->numPhotos(1)) { 
    362                 $iconText = getIconText('compressed.png', gTranslate('core', "Download entire album as archive"), 'yes'); 
    363                 echo popup_link($iconText, "download.php?set_albumName=$tmpAlbumName",false,false,500,500); 
    364             } 
     360            echo editField($gallery->album, "title", $albumURL),"&nbsp;"; 
     361        ?> 
     362              </td> 
     363              <td class="" style='white-space:nowrap;text-align:right;'> 
     364                <?php 
     365            include(dirname(__FILE__) . '/layout/adminAlbumCommands.inc'); 
    365366        ?> 
    366367              </td> 
    … …  
    378379 
    379380  <?php 
    380     include(dirname(__FILE__) . '/layout/adminAlbumCommands.inc'); 
    381  
    382381    /* 
    383382    * Description 
    … …  
    403402    */ 
    404403    if ($gallery->user->isAdmin() || $gallery->user->isOwnerOfAlbum($gallery->album)) { 
    405         echo gTranslate('core', "URL:") . ' <a href="'. $albumURL . '">'; 
     404        echo "<br>",gTranslate('core', "URL:") . ' <a href="'. $albumURL . '">'; 
    406405        if (!$gallery->session->offline) { 
    407406            echo breakString(urldecode($albumURL), 60, '&', 5); 
    … …  
    423422    } 
    424423 
    425     echo "\n<br><span class=\"fineprint\">"; 
     424    echo "\n<br><br><span class=\"fineprint\">"; 
    426425 
    427426    /* 

  • modules/common/gallery/php-files/modules/gallery/captionator.php

    r833 r840  
    5353        echo gallery_error(gTranslate('core', "Captioned album does not match current album - aborting changes!")); 
    5454        echo '<br><br>'; 
    55         echo '<input type="submit" onclick="window.location=\'' . makeAlbumUrl($captionedAlbum) . '\'" value="Exit">'; 
     55        echo '<input type="submit" class="button" onclick="window.location=\'' . makeAlbumUrl($captionedAlbum) . '\'" value="Exit">'; 
    5656        exit; 
    5757    } 
    … …  
    168168    $borderwidth = 0; 
    169169} else { 
    170     $bordercolor = "black"; 
     170    $bordercolor = $gallery->album->fields["bordercolor"]; 
    171171} 
    172172 
    … …  
    179179} 
    180180else { 
    181     $adminText .= gTranslate('core', "One item in this album.", "%d items in this album.", $numPhoto); 
     181    $adminText .= gTranslate('core', "One item in this album.", "%d items in this album.", $numPhotos); 
    182182} 
    183183 
    … …  
    207207 
    208208<div align="right"> 
    209     <input type="submit" name="save" value="<?php echo gTranslate('core', "Save and Exit") ?>"> 
     209    <input type="submit" class="button" name="save" value="<?php echo gTranslate('core', "Save and Exit") ?>"> 
    210210<?php 
    211211if (!isset($last)) { 
    212     echo '<input type="submit" name="next" value="'. sprintf(gTranslate('core', "Save and Edit Next %d"),$perPage) .'">'; 
     212    echo '<input type="submit" class="button" name="next" value="'. sprintf(gTranslate('core', "Save and Edit Next %d"),$perPage) .'">'; 
    213213} 
    214214 
    215215if ($page != 1) { 
    216     echo '<input type="submit" name="prev" value="'. sprintf(gTranslate('core', "Save and Edit Previous %d"), $perPage) .'">'; 
    217 } 
    218 ?> 
    219  
    220 <input type="submit" name="cancel" value="<?php echo gTranslate('core', "Exit") ?>"> 
     216    echo '<input type="submit" class="button" name="prev" value="'. sprintf(gTranslate('core', "Save and Edit Previous %d"), $perPage) .'">'; 
     217} 
     218?> 
     219 
     220<input type="submit" class="button" name="cancel" value="<?php echo gTranslate('core', "Exit") ?>"> 
    221221</div> 
    222222 
    … …  
    320320 
    321321<p align="right"> 
    322     <input type="submit" name="save" value="<?php echo gTranslate('core', "Save and Exit") ?>"> 
     322    <input type="submit" class="button" name="save" value="<?php echo gTranslate('core', "Save and Exit") ?>"> 
    323323<?php 
    324324if (!isset($last)) { 
    325     echo '<input type="submit" name="next" value="'. sprintf(gTranslate('core', "Save and Edit Next %d"),$perPage) .'">'; 
     325    echo '<input type="submit" class="button" name="next" value="'. sprintf(gTranslate('core', "Save and Edit Next %d"),$perPage) .'">'; 
    326326} 
    327327 
    328328if ($page != 1) { 
    329     echo '<input type="submit" name="prev" value="'. sprintf(gTranslate('core', "Save and Edit Previous %d"), $perPage) .'">'; 
    330 } 
    331 ?> 
    332  
    333 <input type="submit" name="cancel" value="<?php echo gTranslate('core', "Exit") ?>"> 
     329    echo '<input type="submit" class="button" name="prev" value="'. sprintf(gTranslate('core', "Save and Edit Previous %d"), $perPage) .'">'; 
     330} 
     331?> 
     332 
     333<input type="submit" class="button" name="cancel" value="<?php echo gTranslate('core', "Exit") ?>"> 
    334334</p> 
    335335 

  • modules/common/gallery/php-files/modules/gallery/config.php

    r836 r840  
    4444/* Constants */ 
    4545$gallery->app->galleryTitle = ""; 
    46 $gallery->app->useIcons = "no"; 
     46$gallery->app->useIcons = "yes"; 
    4747$gallery->app->skinname = "none"; 
    4848$gallery->app->uploadMode = "form"; 
    … …  
    154154$gallery->app->default["cols"] = "3"; 
    155155$gallery->app->default["rows"] = "4"; 
    156 $gallery->app->default["bordercolor"] = "black"; 
     156$gallery->app->default["bordercolor"] = "#0C386F"; 
    157157$gallery->app->default["border"] = "1"; 
    158158$gallery->app->default["font"] = "arial"; 

  • modules/common/gallery/php-files/modules/gallery/copy_photo.php

    r833 r840  
    130130                ?> 
    131131            <form> 
    132             <input type="button" value="<?php echo _("Dismiss") ?>" onclick='parent.close()'> 
     132            <input type="button" class="button" value="<?php echo _("Dismiss") ?>" onclick='parent.close()'> 
    133133            </form> 
    134134                <?php 
    … …  
    211211?> 
    212212<p> 
    213 <input type="submit" value="<?php echo gTranslate('core', "Copy to Album!") ?>"> 
    214 <input type="button" name="close" value="<?php echo _("Cancel") ?>" onclick='parent.close()'> 
     213<input type="submit" class="button" value="<?php echo gTranslate('core', "Copy to Album!") ?>"> 
     214<input type="button" class="button" name="close" value="<?php echo _("Cancel") ?>" onclick='parent.close()'> 
    215215</form> 
    216216<?php 

  • modules/common/gallery/php-files/modules/gallery/create_user.php

    r833 r840  
    110110    <br><br> 
    111111    <form> 
    112         <input type="submit" name="moreuser" value="<?php echo _("Create another user") ?>"> 
    113         <input type="submit" name="dismiss" value="<?php echo _("Back to usermanagement") ?>"> 
     112        <input type="submit" class="button" name="moreuser" value="<?php echo _("Create another user") ?>"> 
     113        <input type="submit" class="button" name="dismiss" value="<?php echo _("Back to usermanagement") ?>"> 
    114114    </form> 
    115115    </div> 
    … …  
    162162 
    163163<input type="hidden" name="formaction" value=""> 
    164 <input type="submit" name="create" value="<?php echo _("Create user") ?>" onclick="usercreate_form.formaction.value='create'"> 
    165 <input type="submit" name="cancel" value="<?php echo _("Back to usermanagement") ?>" onclick="usercreate_form.formaction.value='cancel'"> 
     164<input type="submit" class="button" name="create" value="<?php echo _("Create user") ?>" onclick="usercreate_form.formaction.value='create'"> 
     165<input type="submit" class="button" name="cancel" value="<?php echo _("Back to usermanagement") ?>" onclick="usercreate_form.formaction.value='cancel'"> 
    166166</form> 
    167167</div> 

  • modules/common/gallery/php-files/modules/gallery/css/base.css

    r836 r840  
    2121    font-size: 1.4em; 
    2222    font-weight: bold; 
    23     white-space: nowrap; 
    2423} 
    2524 
    … …  
    4544.desc                           /* album descriptions on main page */ 
    4645    { 
    47       font-size: 1em; 
     46      font-size: 1.2em; 
    4847    } 
    4948.caption                        /* photo captions on all pages */ 
    … …  
    124123    font-size: 1.4em; 
    125124    font-weight: bold; 
     125    color:#0c386f; 
    126126    white-space: nowrap; 
    127127} 
    … …  
    361361#adminbox { 
    362362    width: 100%; 
     363     color:#0c386f; font-size: 1em; 
    363364} 
    364365 
    … …  
    370371 
    371372#adminbox a { 
    372     font-size: 10px; 
    373373} 
    374374 

  • modules/common/gallery/php-files/modules/gallery/delete_album.php

    r833 r840  
    6969<input type="hidden" name="guid" value="<?php echo $gallery->album->fields['guid']; ?>"> 
    7070<input type="hidden" name="formaction" value=""> 
    71 <input type="submit" name="deleteButton" value="<?php echo _("Delete") ?>" onclick="deletealbum_form.formaction.value='delete'"> 
    72 <input type="button" name="cancel" value="<?php echo _("Cancel") ?>" onclick='parent.close()'> 
     71<input type="submit" class="button" name="deleteButton" value="<?php echo _("Delete") ?>" onclick="deletealbum_form.formaction.value='delete'"> 
     72<input type="button" class="button" name="cancel" value="<?php echo _("Cancel") ?>" onclick='parent.close()'> 
    7373</form> 
    7474<?php 

  • modules/common/gallery/php-files/modules/gallery/delete_photo.php

    r833 r840  
    142142?> 
    143143<input type="hidden" name="formaction" value=""> 
    144 <input type="submit" name="confirm" value="<?php echo gTranslate('core', "Delete") ?>" onclick="deletephoto_form.formaction.value='delete'"> 
    145 <input type="button" name="cancel" value="<?php echo gTranslate('core', "Cancel") ?>" onclick='parent.close()'> 
     144<input type="submit" class="button" name="confirm" value="<?php echo gTranslate('core', "Delete") ?>" onclick="deletephoto_form.formaction.value='delete'"> 
     145<input type="button" class="button" name="cancel" value="<?php echo gTranslate('core', "Cancel") ?>" onclick='parent.close()'> 
    146146</form> 
    147147<br> 

  • modules/common/gallery/php-files/modules/gallery/delete_user.php

    r833 r840  
    7878?> 
    7979<br><br> 
    80 <input type="submit" name="deleteButton" value="<?php echo gTranslate('core', "Delete") ?>" onclick="deleteuser_form.formaction.value='delete'"> 
     80<input type="submit" class="button" name="deleteButton" value="<?php echo gTranslate('core', "Delete") ?>" onclick="deleteuser_form.formaction.value='delete'"> 
    8181<?php 
    8282} 
    8383?> 
    8484<input type="hidden" name="formaction" value=""> 
    85 <input type="submit" name="cancel" value="<?php echo gTranslate('core', "Cancel") ?>" onclick="deleteuser_form.formaction.value='cancel'"> 
     85<input type="submit" class="button" name="cancel" value="<?php echo gTranslate('core', "Cancel") ?>" onclick="deleteuser_form.formaction.value='cancel'"> 
    8686</form> 
    8787</div> 

  • modules/common/gallery/php-files/modules/gallery/do_command.php

    r833 r840  
    9090        <input type="radio" name="rebuild_type" value="single" checked><?php echo gTranslate('core', "No"); ?> 
    9191        <br><br> 
    92         <input type="submit" value="<?php echo gTranslate('core', "Start") ?>"><br><br> 
     92        <input type="submit" class="button" value="<?php echo gTranslate('core', "Start") ?>"><br><br> 
    9393    </form> 
    9494<?php 
    … …  
    260260    <form> 
    261261<?php if (isset($backUrl)) :?> 
    262         <input type="button" value="<?php echo gTranslate('core', "Dismiss") ?>" onclick="document.location='<?php echo $backUrl; ?>'"> 
     262        <input type="button" class="button" value="<?php echo gTranslate('core', "Dismiss") ?>" onclick="document.location='<?php echo $backUrl; ?>'"> 
    263263<?php else : ?> 
    264         <input type="button" value="<?php echo gTranslate('core', "Dismiss") ?>" onclick="parent.close()"> 
     264        <input type="button" class="button" value="<?php echo gTranslate('core', "Dismiss") ?>" onclick="parent.close()"> 
    265265<?php endif ?> 
    266266    </form> 

  • modules/common/gallery/php-files/modules/gallery/download.php

    r833 r840  
    8181        echo "\n". '<input type="radio" name="full" value="0"'. (!$full ? ' checked' : '') .'>'. gTranslate('core', "Resized Version") .'<br>'; 
    8282        echo "\n<br>"; 
    83         echo "\n". '<input type="submit" name="doit" value="'. gTranslate('core', "Download") .'">'; 
    84         echo "\n". '<input type="button" value="'. gTranslate('core', "Cancel") .'" onclick="parent.close()">'; 
     83        echo "\n". '<input type="submit" class="button" name="doit" value="'. gTranslate('core', "Download") .'">'; 
     84        echo "\n". '<input type="button" class="button" value="'. gTranslate('core', "Cancel") .'" onclick="parent.close()">'; 
    8585        echo "\n</form>"; 
    8686    } 
    … …  
    8989    echo gTranslate('core', "This album is not empty, but contains no photo or movie! Download wouldn't make sense."); 
    9090    echo "<br><br>"; 
    91         echo "\n". '<input type="button" value="'. gTranslate('core', "Close Window") .'" onclick="parent.close()">'; 
     91        echo "\n". '<input type="button" class="button" value="'. gTranslate('core', "Close Window") .'" onclick="parent.close()">'; 
    9292    } 
    9393} 

  • modules/common/gallery/php-files/modules/gallery/edit_appearance.php

    r833 r840  
    300300<br> 
    301301<br> 
    302 <input type="submit" name="apply" value="<?php echo gTranslate('core', "Apply") ?>"> 
    303 <input type="reset" value="<?php echo gTranslate('core', "Undo") ?>"> 
    304 <input type="button" name="close" value="<?php echo gTranslate('core', "Close") ?>" onclick='parent.close()'> 
     302<input type="submit" class="button" name="apply" value="<?php echo gTranslate('core', "Apply") ?>"> 
     303<input type="reset" class="button" value="<?php echo gTranslate('core', "Undo") ?>"> 
     304<input type="button" class="button" name="close" value="<?php echo gTranslate('core', "Close") ?>" onclick='parent.close()'> 
    305305 
    306306</form> 

  • modules/common/gallery/php-files/modules/gallery/edit_caption.php

    r833 r840  
    181181 
    182182<p> 
    183     <input type="submit" name="save" value="<?php echo gTranslate('core', "Save") ?>"> 
    184     <input type="button" name="cancel" value="<?php echo gTranslate('core', "Cancel") ?>" onclick='parent.close()'> 
     183    <input type="submit" class="button" name="save" value="<?php echo gTranslate('core', "Save") ?>"> 
     184    <input type="button" class="button" name="cancel" value="<?php echo gTranslate('core', "Cancel") ?>" onclick='parent.close()'> 
    185185</p> 
    186186 

  • modules/common/gallery/php-files/modules/gallery/edit_field.php

    r833 r840  
    7474    <textarea name="data" rows="10" cols="50"><?php echo $gallery->album->fields[$field] ?></textarea> 
    7575    <p> 
    76         <input type="submit" name="save" value="<?php echo gTranslate('core', "Save") ?>"> 
    77         <input type="button" name="cancel" value="<?php echo gTranslate('core', "Close Window") ?>" onclick='parent.close()'> 
     76        <input type="submit" class="button" name="save" value="<?php echo gTranslate('core', "Save") ?>"> 
     77        <input type="button" class="button" name="cancel" value="<?php echo gTranslate('core', "Close Window") ?>" onclick='parent.close()'> 
    7878    </p> 
    7979    </form> 

  • modules/common/gallery/php-files/modules/gallery/edit_watermark.php

    r833 r840  
    117117<p> 
    118118    <input type="hidden" name="index" value="<?php echo $index ?>"> 
    119     <input type="submit" name="save" value="<?php echo gTranslate('core', "Save") ?>"> 
    120     <input type="submit" name="preview" value="<?php echo gTranslate('core', "Preview") ?>"> 
    121     <input type="button" name="cancel" value="<?php echo gTranslate('core', "Cancel") ?>" onclick='parent.close()'> 
     119    <input type="submit" class="button" name="save" value="<?php echo gTranslate('core', "Save") ?>"> 
     120    <input type="submit" class="button" name="preview" value="<?php echo gTranslate('core', "Preview") ?>"> 
     121    <input type="button" class="button" name="cancel" value="<?php echo gTranslate('core', "Cancel") ?>" onclick='parent.close()'> 
    122122</p> 
    123123</form> 

  • modules/common/gallery/php-files/modules/gallery/extra_fields.php

    r833 r840  
    170170</p> 
    171171<p> 
    172     <input type="submit" name="apply" value="<?php echo gTranslate('core', "Apply") ?>"> 
    173     <input type="reset" value="<?php echo gTranslate('core', "Undo") ?>"> 
    174     <input type="button" name="close" value="<?php echo gTranslate('core', "Close") ?>" onclick='parent.close()'> 
     172    <input type="submit" class="button" name="apply" value="<?php echo gTranslate('core', "Apply") ?>"> 
     173    <input type="reset" class="button" value="<?php echo gTranslate('core', "Undo") ?>"> 
     174    <input type="button" class="button" name="close" value="<?php echo gTranslate('core', "Close") ?>" onclick='parent.close()'> 
    175175</p> 
    176176</form> 

  • modules/common/gallery/php-files/modules/gallery/imagemap.php

    r833 r840  
    238238    <input type="<?php echo $type; ?>" name="yvals"> 
    239239    <br> 
    240     <input type="button" onClick="resetAndClear();" value="<?php echo gTranslate('core', "Clear and reset canvas"); ?>"> 
     240    <input type="button" class="button" onClick="resetAndClear();" value="<?php echo gTranslate('core', "Clear and reset canvas"); ?>"> 
    241241    <hr> 
    242242    <?php echo gTranslate('core', "Optional link-url"); ?><br> 
    … …  
    249249    <?php } ?> 
    250250 
    251     <input type="submit" value="<?php echo gTranslate('core', "Save Imagemap") ?>" onclick="document.areas.formaction.value='create'"> 
     251    <input type="submit" class="button" value="<?php echo gTranslate('core', "Save Imagemap") ?>" onclick="document.areas.formaction.value='create'"> 
    252252    <hr> 
    253253<?php 
    … …  
    264264 
    265265    echo "\n<hr>"; 
    266     echo "<input type=\"submit\" value=\"". gTranslate('core', "Delete selected ImageMap(s)") ."\" onclick=\"document.areas.formaction.value='delete'\">"; 
     266    echo "<input type=\"submit\" class=\"button\" value=\"". gTranslate('core', "Delete selected ImageMap(s)") ."\" onclick=\"document.areas.formaction.value='delete'\">"; 
    267267 
    268268    echo "\n<hr>"; 
    269     echo "<input type=\"submit\" value=\"". gTranslate('core', "Update selected ImageMap(s)") ."\" onclick=\"document.areas.formaction.value='update'\">"; 
     269    echo "<input type=\"submit\" class=\"button\" value=\"". gTranslate('core', "Update selected ImageMap(s)") ."\" onclick=\"document.areas.formaction.value='update'\">"; 
    270270 
    271271    echo '<div class="attention">'. gTranslate('core', "Be aware, that the text of ALL selected entries will be updated!") .'</div>'; 

  • modules/common/gallery/php-files/modules/gallery/layout/adminAlbumCommands.inc

    r833 r840  
    66?> 
    77<!-- Begin adminAlbumCommands --> 
    8 <div class="admin"><?php 
     8<?php 
    99 
    1010/* User is allowed to delete the album */ 
    1111if ($gallery->user->canDeleteAlbum($gallery->album)) { 
    12     echo "\n\t". popup_link("[". gTranslate('core',"Delete album") ."]", "delete_album.php?set_albumName={$tmpAlbumName}"); 
     12    $iconText = getIconText('page_delete.gif', gTranslate('core',"Delete album"), 'yes'); 
     13    echo "\n\t". popup_link($iconText, "delete_album.php?set_albumName={$tmpAlbumName}"); 
    1314} 
    1415 
    1516/* User is allowed to change the album */ 
    1617if ($gallery->user->canWriteToAlbum($gallery->album)) { 
    17     echo "\n\t". popup_link("[". gTranslate('core',"Move album") ."]", "move_album.php?set_albumName={$tmpAlbumName}&index=$i&reorder=0"); 
    18     echo "\n\t". popup_link("[". gTranslate('core',"Reorder album") ."]", "move_album.php?set_albumName={$tmpAlbumName}&index=$i&reorder=1"); 
    19     echo "\n\t". popup_link("[". gTranslate('core',"Rename album") ."]", "rename_album.php?set_albumName={$tmpAlbumName}&index=$i"); 
     18    $iconText = getIconText('page_go.gif', gTranslate('core',"Move album"), 'yes'); 
     19    echo "\n\t". popup_link($iconText, "move_album.php?set_albumName={$tmpAlbumName}&index=$i&reorder=0"); 
     20    $iconText = getIconText('page_refresh.gif', gTranslate('core',"Reorder album"), 'yes'); 
     21    echo "\n\t". popup_link($iconText, "move_album.php?set_albumName={$tmpAlbumName}&index=$i&reorder=1"); 
     22    $iconText = getIconText('page_save.gif', gTranslate('core',"Rename album"), 'yes'); 
     23    echo "\n\t". popup_link($iconText, "rename_album.php?set_albumName={$tmpAlbumName}&index=$i"); 
    2024} 
    2125 
    … …  
    2428if ($gallery->user->canChangeTextOfAlbum($gallery->album) && !$gallery->session->offline) { 
    2529    echo "\n\t". '<a href="'. makeGalleryUrl("captionator.php", array("set_albumName" => $tmpAlbumName)) . '">' .  
    26         '['. gTranslate('core',"Edit captions") . ']</a>'; 
     30        getIconText('picture_edit.gif', gTranslate('core',"Edit captions"), 'yes') . '</a>'; 
    2731} 
    2832 
    … …  
    3135 
    3236    /* User is allowed to change Album Permissions */ 
    33     echo "\n\t". popup_link("[" . gTranslate('core',"Permissions") ."]", "album_permissions.php?set_albumName={$tmpAlbumName}"); 
    34     echo "\n\t". popup_link("[" . gTranslate('core',"Properties") ."]", "edit_appearance.php?set_albumName={$tmpAlbumName}", 0, true, 500, 600); 
     37    $iconText = getIconText('lock_edit.gif', gTranslate('core',"Permissions"), 'yes'); 
     38    echo "\n\t". popup_link($iconText, "album_permissions.php?set_albumName={$tmpAlbumName}"); 
     39    $iconText = getIconText('table_edit.gif', gTranslate('core',"Properties"), 'yes'); 
     40    echo "\n\t". popup_link($iconText, "edit_appearance.php?set_albumName={$tmpAlbumName}", 0, true, 500, 600); 
    3541 
    3642    /* User is allowed to view ALL comments */ 
    … …  
    3945        && ($gallery->album->lastCommentDate("no") != -1)) { 
    4046            echo "\n\t". '<a href="'. makeGalleryUrl("view_comments.php", array("set_albumName" => $tmpAlbumName)) . '">' . 
    41             '[' . gTranslate('core',"View&nbsp;comments") . ']</a>'; 
     47                getIconText('comments.gif', gTranslate('core',"View&nbsp;comments"), 'yes') . '</a>'; 
    4248    } 
    4349 
    4450    /* Watermarking support is enabled and user is allowed to watermark images/albums */ 
    4551    if (!empty($gallery->app->watermarkDir) && $gallery->album->numPhotos(1)) { 
    46         echo "\n\t". popup_link("[" . gTranslate('core',"Watermark&nbsp;album") . "]", "watermark_album.php?set_albumName={$tmpAlbumName}"); 
     52        $iconText = getIconText('image_edit.gif', gTranslate('core',"Watermark&nbsp;album"), 'yes'); 
     53        echo "\n\t". popup_link($iconText, "watermark_album.php?set_albumName={$tmpAlbumName}"); 
    4754    } 
    4855} 
     56 
     57/* user can download this album */ 
     58if ($gallery->user->canDownloadAlbum($gallery->album) && $gallery->album->numPhotos(1)) { 
     59    $iconText = getIconText('compress.gif', gTranslate('core', "Download entire album as archive"), 'yes'); 
     60    echo "\n\t". popup_link($iconText, "download.php?set_albumName=$tmpAlbumName",false,false,500,500); 
     61} 
    4962?> 
    50  
    51 </div> 
    5263<!-- End adminAlbumCommands --> 

  • modules/common/gallery/php-files/modules/gallery/lib/Form.php

    r833 r840  
    336336    $attrList['type'] = 'submit'; 
    337337    $attrList['value'] = $value; 
    338     $attrList['class'] = 'g-button'; 
     338    $attrList['class'] = 'button'; 
    339339    $attrList['title'] = isset($additionalAttrs['title']) ? $additionalAttrs['title'] : $value; 
    340340 
    … …  
    351351    $attrList['type'] = 'button'; 
    352352    $attrList['value'] = $value; 
    353     $attrList['class'] = 'g-button'; 
     353    $attrList['class'] = 'button'; 
    354354    $attrList['onClick'] = $onClick; 
    355355    $attrList['title'] = isset($additionalAttrs['title']) ? $additionalAttrs['title'] : $value; 

  • modules/common/gallery/php-files/modules/gallery/lib/content.php

    r833 r840  
    4040        $buf .= '</a>'; 
    4141    } 
     42    $buf .= '&nbsp;'; 
    4243 
    4344    if ($gallery->user->canChangeTextOfAlbum($album)) { 
    … …  
    4546            $buf = "<i>&lt;". gTranslate('common', "Empty") . "&gt;</i>"; 
    4647        } 
    47         $url = "edit_field.php?set_albumName={$album->fields['name']}&field=$field"; // should replace with &amp; for validatation 
    48         $buf .= ' <span class="editlink">'; 
    49         $buf .= popup_link( "[". sprintf(gTranslate('common', "edit %s"), gTranslate('common', $field)) . "]", $url) ; 
    50         $buf .= '</span>'; 
     48        $iconText = getIconText('page_edit.gif', gTranslate('core', sprintf(gTranslate('common', "edit %s"), gTranslate('common', $field))), 'yes'); 
     49        $buf .= popup_link($iconText, "edit_field.php?set_albumName={$album->fields['name']}&field=$field"); 
     50 
    5151    } 
    5252 
    … …  
    149149</tr> 
    150150<tr> 
    151     <td colspan="2" class="commentboxfooter" align="right"><input name="save" type="submit" value="<?php echo gTranslate('common', "Post comment") ?>"></td> 
     151    <td colspan="2" class="commentboxfooter" align="right"><input name="save" type="submit" class="button" value="<?php echo gTranslate('common', "Post comment") ?>"></td> 
    152152</tr> 
    153153</table> 
    … …  
    557557        } 
    558558 
    559         if (file_exists("$base/images/icons/$iconName")) { 
     559        if (file_exists(PATH_THEME."images/$iconName")) { 
     560            $imgSrc = THEME .'images/'. $iconName; 
     561            $linkText = "<img src=\"$imgSrc\" title=\"$altText\" alt=\"$altText\" style=\"border: none;\">"; 
     562 
     563            if ($iconMode == "both") { 
     564                $linkText .= "<br>$text"; 
     565            } 
     566        } elseif (file_exists("$base/images/icons/$iconName")) { 
    560567            $imgSrc = $gallery->app->photoAlbumURL .'/images/icons/'. $iconName; 
    561568            $linkText = "<img src=\"$imgSrc\" title=\"$altText\" alt=\"$altText\" style=\"border: none;\">"; 

  • modules/common/gallery/php-files/modules/gallery/manage_users.php

    r833 r840  
    9090 
    9191<p> 
    92 <input type="submit" name="create" value="<?php echo _("Create new user") ?>"> 
     92<input type="submit" class="button" name="create" value="<?php echo _("Create new user") ?>"> 
    9393<?php if ($gallery->app->multiple_create == "yes") { ?> 
    94     <input type="submit" name="bulk_create" value="<?php echo _("Bulk Create") ?>">  
     94    <input type="submit" class="button" name="bulk_create" value="<?php echo _("Bulk Create") ?>">  
    9595<?php } 
    9696if (count($displayUsers)) { ?> 
    97 <input type="submit" name="modify" value="<?php echo _("Modify") ?>"> 
    98 <input type="submit" name="delete" value="<?php echo _("Delete") ?>"> 
     97<input type="submit" class="button" name="modify" value="<?php echo _("Modify") ?>"> 
     98<input type="submit" class="button" name="delete" value="<?php echo _("Delete") ?>"> 
    9999<?php } ?> 
    100 <input type="button" value="<?php echo _("Done") ?>" onclick='parent.close()'> 
     100<input type="button" class="button" value="<?php echo _("Done") ?>" onclick='parent.close()'> 
    101101</form> 
    102102 

  • modules/common/gallery/php-files/modules/gallery/modify_user.php

    r833 r840  
    161161 
    162162<br> 
    163 <input type="submit" name="save" value="<?php echo gTranslate('core', "Save") ?>"> 
    164 <input type="submit" name="dismiss" value="<?php echo gTranslate('core', "Back to usermanagement") ?>"> 
    165 <input type="button" value="<?php echo gTranslate('core', "Done") ?>" onclick='parent.close()'> 
     163<input type="submit" class="button" name="save" value="<?php echo gTranslate('core', "Save") ?>"> 
     164<input type="submit" class="button" name="dismiss" value="<?php echo gTranslate('core', "Back to usermanagement") ?>"> 
     165<input type="button" class="button" value="<?php echo gTranslate('core', "Done") ?>" onclick='parent.close()'> 
    166166</form> 
    167167</div> 

  • modules/common/gallery/php-files/modules/gallery/move_album.php

    r833 r840  
    114114?> 
    115115        </select> 
    116         <input type="submit" name="move" value="<?php echo gTranslate('core', "Move it!") ?>"> 
    117         <input type="button" name="cancel" value="<?php echo gTranslate('core', "Cancel") ?>" onclick='parent.close()'> 
     116        <input type="submit" class="button" name="move" value="<?php echo gTranslate('core', "Move it!") ?>"> 
     117        <input type="button" class="button" name="cancel" value="<?php echo gTranslate('core', "Cancel") ?>" onclick='parent.close()'> 
    118118</form> 
    119119 
    … …  
    131131</select> 
    132132        <br><br> 
    133         <input type="submit" name="move" value="<?php echo gTranslate('core', "Move to Album!") ?>"> 
    134         <input type="button" name="cancel" value="<?php echo gTranslate('core', "Cancel") ?>" onclick='parent.close()'> 
     133        <input type="submit" class="button" name="move" value="<?php echo gTranslate('core', "Move to Album!") ?>"> 
     134        <input type="button" class="button" name="cancel" value="<?php echo gTranslate('core', "Cancel") ?>" onclick='parent.close()'> 
    135135</form> 
    136136<?php 

  • modules/common/gallery/php-files/modules/gallery/move_photo.php

    r833 r840  
    265265</select> 
    266266<p> 
    267 <input type="submit" value=<?php echo '"' . $reorder ? gTranslate('core', 'Reorder it!') : gTranslate('core', 'Move it!') . '"' ?>> 
    268 <input type="button" name="close" value="<?php echo gTranslate('core', "Cancel") ?>" onclick='parent.close()'> 
     267<input type="submit" class="button" value=<?php echo '"' . $reorder ? gTranslate('core', 'Reorder it!') : gTranslate('core', 'Move it!') . '"' ?>> 
     268<input type="button" class="button" name="close" value="<?php echo gTranslate('core', "Cancel") ?>" onclick='parent.close()'> 
    269269</form> 
    270270 
    … …  
    353353?> 
    354354<p> 
    355 <input type="submit" value="<?php echo $title ?>"> 
    356 <input type="button" name="close" value="<?php echo gTranslate('core', "Cancel") ?>" onclick='parent.close()'> 
     355<input type="submit" class="button" value="<?php echo $title ?>"> 
     356<input type="button" class="button" name="close" value="<?php echo gTranslate('core', "Cancel") ?>" onclick='parent.close()'> 
    357357</form> 
    358358<?php 

  • modules/common/gallery/php-files/modules/gallery/multi_create_user.php

    r833 r840  
    146146 
    147147<center> 
    148     <form><input type="submit" name="dismiss" value="<?php echo _("Back to usermanagement") ?>"></form> 
     148    <form><input type="submit" class="button" name="dismiss" value="<?php echo _("Back to usermanagement") ?>"></form> 
    149149</center> 
    150150</div> 
    … …  
    196196<br> 
    197197    <input type="hidden" name="formaction" value=""> 
    198     <input type="submit" name="create" value="<?php echo _("Create") ?>" onclick="usercreate_form.formaction.value='create'">    
    199     <input type="submit" name="cancel" value="<?php echo _("Back to usermanagement") ?>" onclick="usercreate_form.formaction.value='cancel'"> 
     198    <input type="submit" class="button" name="create" value="<?php echo _("Create") ?>" onclick="usercreate_form.formaction.value='create'">    
     199    <input type="submit" class="button" name="cancel" value="<?php echo _("Back to usermanagement") ?>" onclick="usercreate_form.formaction.value='cancel'"> 
    200200</form> 
    201201 

  • modules/common/gallery/php-files/modules/gallery/photo_owner.php

    r833 r840  
    101101<p> 
    102102    <input type="hidden" name="id" value="<?php echo $id ?>"> 
    103     <input type="submit" name="save" value="<?php echo _("Save") ?>"> 
    104     <input type="button" name="done" value="<?php echo _("Done") ?>" onclick='parent.close()'> 
     103    <input type="submit" class="button" name="save" value="<?php echo _("Save") ?>"> 
     104    <input type="button" class="button" name="done" value="<?php echo _("Done") ?>" onclick='parent.close()'> 
    105105</p> 
    106106</form> 

  • modules/common/gallery/php-files/modules/gallery/poll_properties.php

    r833 r840  
    138138</p> 
    139139 
    140 <input type="submit" name="apply" value="<?php echo _("Apply") ?>"> 
    141 <input type="reset" value="<?php echo _("Undo") ?>"> 
    142 <input type="submit" value="<?php echo _("Close") ?>" onclick='parent.close()'> 
     140<input type="submit" class="button" name="apply" value="<?php echo _("Apply") ?>"> 
     141<input type="reset" class="button" value="<?php echo _("Undo") ?>"> 
     142<input type="submit" class="button" value="<?php echo _("Close") ?>" onclick='parent.close()'> 
    143143 
    144144</form> 

  • modules/common/gallery/php-files/modules/gallery/rename_album.php

    r833 r840  
    128128<input type="hidden" name="useLoad" value="<?php echo $useLoad?>">     
    129129<p> 
    130 <input type="submit" name="rename" value="<?php echo _("Rename") ?>"> 
    131 <input type="button" name="cancel" value="<?php echo _("Cancel") ?>" onclick='parent.close()'> 
     130<input type="submit" class="button" name="rename" value="<?php echo _("Rename") ?>"> 
     131<input type="button" class="button" name="cancel" value="<?php echo _("Cancel") ?>" onclick='parent.close()'> 
    132132</form> 
    133133 

  • modules/common/gallery/php-files/modules/gallery/resize_photo.php

    r833 r840  
    131131<p> 
    132132    <input type="hidden" name="index" value="<?php echo $index ?>"> 
    133     <input type="submit" name="remove_resized" value="<?php echo gTranslate('core', "Get rid of resized") ?>"> 
     133    <input type="submit" class="button" name="remove_resized" value="<?php echo gTranslate('core', "Get rid of resized") ?>"> 
    134134    <?php echo gTranslate('core', "(Use only the original picture)"); ?> 
    135135 
    … …  
    137137<br> 
    138138 
    139 <input type="submit" name="change_size" value="<?php echo gTranslate('core', "Change Size") ?>"> 
    140 <input type="button" value="<?php echo gTranslate('core', "Cancel") ?>" onclick="parent.close()"> 
     139<input type="submit" class="button" name="change_size" value="<?php echo gTranslate('core', "Change Size") ?>"> 
     140<input type="button" class="button" value="<?php echo gTranslate('core', "Cancel") ?>" onclick="parent.close()"> 
    141141 
    142142</form> 

  • modules/common/gallery/php-files/modules/gallery/setup/backup_albums.php

    r833 r840  
    151151 
    152152<p> 
    153 <input type="submit" name="backup" value=<?php echo  _("Backup") ?>> 
     153<input type="submit" class="button" name="backup" value=<?php echo  _("Backup") ?>> 
    154154<?php if ($showForce) { ?> 
    155 <input type="submit" name="force" value=<?php echo  _("Force Backup") ?>> 
     155<input type="submit" class="button" name="force" value=<?php echo  _("Force Backup") ?>> 
    156156<?php } ?> 
    157 <input type="button" value=<?php echo  _("Cancel") ?> onclick='parent.close()'> 
     157<input type="button" class="button" value=<?php echo  _("Cancel") ?> onclick='parent.close()'> 
    158158 
    159159</form> 

  • modules/common/gallery/php-files/modules/gallery/setup/check_mail.php

    r833 r840  
    9898        <td style="white-space:nowrap;"><?php echo _("Your email address:") ?></td> 
    9999        <td><input name="email_address" width="50"></td> 
    100         <td><input type="submit" name="submit" value="<?php echo _("Send Email") ?>"></td> 
     100        <td><input type="submit" class="button" name="submit" value="<?php echo _("Send Email") ?>"></td> 
    101101        <td width="100%">&nbsp;</td> 
    102102    </tr> 

  • modules/common/gallery/php-files/modules/gallery/sort_album.php

    r833 r840  
    118118</table> 
    119119<br> 
    120 <input type="submit" name="confirm" value="<?php echo _("Sort") ?>"> 
    121 <input type="button" name="cancel" value="<?php echo _("Cancel") ?>" onclick='parent.close()'> 
     120<input type="submit" class="button" name="confirm" value="<?php echo _("Sort") ?>"> 
     121<input type="button" class="button" name="cancel" value="<?php echo _("Cancel") ?>" onclick='parent.close()'> 
    122122</form> 
    123123<?php 

  • modules/common/gallery/php-files/modules/gallery/stats-wizard.php

    r833 r840  
    138138    echo "\n</tr>"; 
    139139    echo "\n</table>"; 
    140     echo "\n". '<input type="submit" name="submitbutton" value="'. _("Show statistics") . '">'; 
     140    echo "\n". '<input type="submit" class="button" name="submitbutton" value="'. _("Show statistics") . '">'; 
    141141    echo "\n</form>"; 
    142142 

  • modules/common/gallery/php-files/modules/gallery/tools/find_orphans.php

    r833 r840  
    252252        <?php echo makeFormIntro("tools/find_orphans.php", array("method" => "GET")); ?> 
    253253        <input type="hidden" name="action" value="albums"> 
    254         <input type="submit" value="<?php echo _("Re-Attach Orphaned Albums!") ?>"> 
     254        <input type="submit" class="button" value="<?php echo _("Re-Attach Orphaned Albums!") ?>"> 
    255255        </form> 
    256256        </center> 
    … …  
    289289        <?php echo makeFormIntro("tools/find_orphans.php", array("method" => "GET")); ?> 
    290290        <input type="hidden" name="action" value="images"> 
    291         <input type="submit" value="<?php echo _("Delete Orphaned Files!") ?>"> 
     291        <input type="submit" class="button" value="<?php echo _("Delete Orphaned Files!") ?>"> 
    292292        </form> 
    293293        </center> 

  • modules/common/gallery/php-files/modules/gallery/upgrade_users.php

    r833 r840  
    6565    <center> 
    6666    <form> 
    67     <input type="submit" value="<?php echo $button ?>" onclick='location.reload()'> 
     67    <input type="submit" class="button" value="<?php echo $button ?>" onclick='location.reload()'> 
    6868    </form> 
    6969    </center> 

  • modules/common/gallery/php-files/modules/gallery/user_preferences.php

    r833 r840  
    143143<br> 
    144144<div align="center"> 
    145     <input type="submit" name="save" value="<?php echo gTranslate('core', "Save") ?>"> 
    146     <input type="button" name="close" value="<?php echo gTranslate('core', "Close Window") ?>" onclick="parent.close()"> 
     145    <input type="submit" class="button" name="save" value="<?php echo gTranslate('core', "Save") ?>"> 
     146    <input type="button" class="button" name="close" value="<?php echo gTranslate('core', "Close Window") ?>" onclick="parent.close()"> 
    147147</div> 
    148148</form> 

  • modules/common/gallery/php-files/modules/gallery/watermark_album.php

    r833 r840  
    146146<p> 
    147147    <input type="hidden" name="index" value="<?php echo $index ?>"> 
    148     <input type="submit" name="save" value="<?php echo _("Save") ?>"> 
     148    <input type="submit" class="button" name="save" value="<?php echo _("Save") ?>"> 
    149149<?php // only allow preview if there is a highlight 
    150150 if (isset($highlightIndex)) { ?> 
    151     <input type="submit" name="preview" value="<?php echo _("Preview") ?>"> 
     151    <input type="submit" class="button" name="preview" value="<?php echo _("Preview") ?>"> 
    152152<?php } ?> 
    153     <input type="button" name="cancel" value="<?php echo _("Cancel") ?>" onclick='parent.close()'> 
     153    <input type="button" class="button" name="cancel" value="<?php echo _("Cancel") ?>" onclick='parent.close()'> 
    154154</p> 
    155155</form> 

  • modules/common/last_seen_users_panel/php-files/modules/last_seen_users_panel/module_installer.php

    r836 r840  
    1212| the included gpl.txt file or visit http://gnu.org  | 
    1313+----------------------------------------------------*/ 
    14 if (!checkrights("I") || !defined("iAUTH") || $aid != iAUTH || !defined('IN_FUSION')) fallback(BASEDIR."index.php"); 
     14if (!checkrights("I") || !defined("iAUTH") || $aid != iAUTH || !defined('ExiteCMS_INIT')) fallback(BASEDIR."index.php"); 
    1515 
    1616/*---------------------------------------------------+ 

  • modules/common/latest_articles_panel/php-files/modules/latest_articles_panel/module_installer.php

    r836 r840  
    1212| the included gpl.txt file or visit http://gnu.org  | 
    1313+----------------------------------------------------*/ 
    14 if (!checkrights("I") || !defined("iAUTH") || $aid != iAUTH || !defined('IN_FUSION')) fallback(BASEDIR."index.php"); 
     14if (!checkrights("I") || !defined("iAUTH") || $aid != iAUTH || !defined('ExiteCMS_INIT')) fallback(BASEDIR."index.php"); 
    1515 
    1616/*---------------------------------------------------+ 

  • modules/common/latest_news_panel/php-files/modules/latest_news_panel/module_installer.php

    r836 r840  
    1212| the included gpl.txt file or visit http://gnu.org  | 
    1313+----------------------------------------------------*/ 
    14 if (!checkrights("I") || !defined("iAUTH") || $aid != iAUTH || !defined('IN_FUSION')) fallback(BASEDIR."index.php"); 
     14if (!checkrights("I") || !defined("iAUTH") || $aid != iAUTH || !defined('ExiteCMS_INIT')) fallback(BASEDIR."index.php"); 
    1515 
    1616/*---------------------------------------------------+ 

  • modules/common/login_panel/php-files/modules/login_panel/module_installer.php

    r836 r840  
    1212| the included gpl.txt file or visit http://gnu.org  | 
    1313+----------------------------------------------------*/ 
    14 if (!checkrights("I") || !defined("iAUTH") || $aid != iAUTH || !defined('IN_FUSION')) fallback(BASEDIR."index.php"); 
     14if (!checkrights("I") || !defined("iAUTH") || $aid != iAUTH || !defined('ExiteCMS_INIT')) fallback(BASEDIR."index.php"); 
    1515 
    1616/*---------------------------------------------------+ 

  • modules/common/mail2forum/php-files/modules/mail2forum/module_installer.php

    r836 r840  
    1010| the included gpl.txt file or visit http://gnu.org  | 
    1111+----------------------------------------------------*/ 
    12 if (!checkrights("I") || !defined("iAUTH") || $aid != iAUTH || !defined('IN_FUSION')) fallback(BASEDIR."index.php"); 
     12if (!checkrights("I") || !defined("iAUTH") || $aid != iAUTH || !defined('ExiteCMS_INIT')) fallback(BASEDIR."index.php"); 
    1313 
    1414/*---------------------------------------------------+ 

  • modules/common/newsletters/php-files/modules/newsletters/module_installer.php

    r836 r840  
    1212| the included gpl.txt file or visit http://gnu.org  | 
    1313+----------------------------------------------------*/ 
    14 if (!checkrights("I") || !defined("iAUTH") || $aid != iAUTH || !defined('IN_FUSION')) fallback(BASEDIR."index.php"); 
     14if (!checkrights("I") || !defined("iAUTH") || $aid != iAUTH || !defined('ExiteCMS_INIT')) fallback(BASEDIR."index.php"); 
    1515 
    1616/*---------------------------------------------------+ 

  • modules/common/online_users_panel/php-files/modules/online_users_panel/module_installer.php

    r836 r840  
    1212| the included gpl.txt file or visit http://gnu.org  | 
    1313+----------------------------------------------------*/ 
    14 if (!checkrights("I") || !defined("iAUTH") || $aid != iAUTH || !defined('IN_FUSION')) fallback(BASEDIR."index.php"); 
     14if (!checkrights("I") || !defined("iAUTH") || $aid != iAUTH || !defined('ExiteCMS_INIT')) fallback(BASEDIR."index.php"); 
    1515 
    1616/*---------------------------------------------------+ 

  • modules/common/shoutbox_panel/php-files/modules/shoutbox_panel/module_installer.php

    r836 r840  
    1010| the included gpl.txt file or visit http://gnu.org  | 
    1111+----------------------------------------------------*/ 
    12 if (!checkrights("I") || !defined("iAUTH") || $aid != iAUTH || !defined('IN_FUSION')) fallback(BASEDIR."index.php"); 
     12if (!checkrights("I") || !defined("iAUTH") || $aid != iAUTH || !defined('ExiteCMS_INIT')) fallback(BASEDIR."index.php"); 
    1313 
    1414/*---------------------------------------------------+ 

  • modules/common/wiki/php-files/modules/wiki/module_installer.php

    r836 r840  
    1212| the included gpl.txt file or visit http://gnu.org  | 
    1313+----------------------------------------------------*/ 
    14 if (!checkrights("I") || !defined("iAUTH") || $aid != iAUTH || !defined('IN_FUSION')) fallback(BASEDIR."index.php"); 
     14if (!checkrights("I") || !defined("iAUTH") || $aid != iAUTH || !defined('ExiteCMS_INIT')) fallback(BASEDIR."index.php"); 
    1515 
    1616/*---------------------------------------------------+ 
Note: See TracChangeset for help on using the changeset viewer.